From 33d8bb15e28b1a2ef0d4ae3a8bf305230c913182 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 4 Jul 2008 12:45:24 +0000 Subject: Fix infinite loop in sendfirm_win.cpp and other minor fixes git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17939 a1c6a512-1295-4272-9138-f99709370657 --- utils/MTP/MTP_DLL.dll | Bin 86016 -> 90112 bytes utils/MTP/MTP_DLL/sendfirm_win.cpp | 35 +++-------------------------------- utils/MTP/sendfirm.exe.manifest | 8 -------- utils/MTP/sendfirm.manifest | 8 ++++++++ utils/MTP/sendfirm_win.c | 0 5 files changed, 11 insertions(+), 40 deletions(-) delete mode 100755 utils/MTP/sendfirm.exe.manifest create mode 100644 utils/MTP/sendfirm.manifest mode change 100755 => 100644 utils/MTP/sendfirm_win.c (limited to 'utils/MTP') diff --git a/utils/MTP/MTP_DLL.dll b/utils/MTP/MTP_DLL.dll index f3436e049c..3f9b6c7a50 100755 Binary files a/utils/MTP/MTP_DLL.dll and b/utils/MTP/MTP_DLL.dll differ diff --git a/utils/MTP/MTP_DLL/sendfirm_win.cpp b/utils/MTP/MTP_DLL/sendfirm_win.cpp index 9a46e51cbd..e895c024fd 100644 --- a/utils/MTP/MTP_DLL/sendfirm_win.cpp +++ b/utils/MTP/MTP_DLL/sendfirm_win.cpp @@ -127,15 +127,15 @@ __declspec(dllexport) bool send_fw(LPWSTR file, int filesize) if(SUCCEEDED(hr) || hr == WMDM_S_NOT_ALL_PROPERTIES_APPLIED || hr == WMDM_S_NOT_ALL_PROPERTIES_RETRIEVED) + { return_value = true; + hr = S_FALSE; + } } } } } } - /* move to next Storage */ - if(!return_value) - hr = pIEnumStorage->Next(1, (IWMDMStorage **)&pIStorage, &ulNumFetched); } pIEnumStorage->Release(); } @@ -159,32 +159,3 @@ __declspec(dllexport) bool send_fw(LPWSTR file, int filesize) return return_value; } } - -/* - * Example code: - -#include -int filesize(char* filename) -{ - FILE* fd; - int tmp; - fopen_s(&fd, filename, "r"); - fseek(fd, 0, SEEK_END); - tmp = ftell(fd); - fclose(fd); - return tmp; -} - -__declspec(dllimport) bool send_fw(LPWSTR file, int filesize); - -int _tmain(int argc, char* argv[]) -{ - printf("Sending %s [%d]...\n", "Zlant.bin", filesize("Zlant.bin")); - if(send_fw(L"Zlant.bin", filesize("Zlant.bin"))) - printf("Transmitting succesfull!\n"); - else - printf("Transmitting failed!\n"); - return 0; -} - - */ diff --git a/utils/MTP/sendfirm.exe.manifest b/utils/MTP/sendfirm.exe.manifest deleted file mode 100755 index 324c707e1c..0000000000 --- a/utils/MTP/sendfirm.exe.manifest +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/utils/MTP/sendfirm.manifest b/utils/MTP/sendfirm.manifest new file mode 100644 index 0000000000..324c707e1c --- /dev/null +++ b/utils/MTP/sendfirm.manifest @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/utils/MTP/sendfirm_win.c b/utils/MTP/sendfirm_win.c old mode 100755 new mode 100644 -- cgit v1.2.3