From 33d8bb15e28b1a2ef0d4ae3a8bf305230c913182 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 4 Jul 2008 12:45:24 +0000 Subject: [PATCH] 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 ++---------------- ...endfirm.exe.manifest => sendfirm.manifest} | 0 utils/MTP/sendfirm_win.c | 0 4 files changed, 3 insertions(+), 32 deletions(-) rename utils/MTP/{sendfirm.exe.manifest => sendfirm.manifest} (100%) mode change 100755 => 100644 mode change 100755 => 100644 utils/MTP/sendfirm_win.c diff --git a/utils/MTP/MTP_DLL.dll b/utils/MTP/MTP_DLL.dll index f3436e049cd57f0fe7c55ffd13c237a3979ff062..3f9b6c7a501e475d59d7171a091f4767e91d43dd 100755 GIT binary patch delta 8374 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 GMEo14Z-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.manifest old mode 100755 new mode 100644 similarity index 100% rename from utils/MTP/sendfirm.exe.manifest rename to utils/MTP/sendfirm.manifest diff --git a/utils/MTP/sendfirm_win.c b/utils/MTP/sendfirm_win.c old mode 100755 new mode 100644