summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author(no author) <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>2010-04-19 05:09:53 +0000
committer(no author) <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>2010-04-19 05:09:53 +0000
commit00a1cef967087b7c85b9ef39b63ba0662fa13080 (patch)
treebf70408a9ef71036c7b693c7623191ead6be0f4d
parentfd215b11baee74952e38d31cc5fce3cc27b1c9fb (diff)
Fixed VC2008 project and warnings
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@508 4f64403b-2f21-0410-a795-97e2b3489a10
-rw-r--r--updater/progress_dialog.cpp3
-rw-r--r--updater/updater_9.vcproj3
-rw-r--r--updater/zbin/minizip/ioapi.c2
3 files changed, 1 insertions, 7 deletions
diff --git a/updater/progress_dialog.cpp b/updater/progress_dialog.cpp
index a66a6e6..cbe7380 100644
--- a/updater/progress_dialog.cpp
+++ b/updater/progress_dialog.cpp
@@ -16,9 +16,6 @@ INT_PTR CALLBACK DlgProcProgress(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
case WM_INITDIALOG:
TranslateDialogDefault( hwndDlg );
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);
- // these change icons for all system dialogs!
- //SetClassLong(hwndDlg, GCL_HICON, (LONG)hIconCheck);
- //SetClassLong(hwndDlg, GCL_HICONSM, (LONG)hIconCheck);
SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadIconEx(I_CHKUPD));
SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadIconEx(I_CHKUPD, true));
diff --git a/updater/updater_9.vcproj b/updater/updater_9.vcproj
index afd820d..f4c05c9 100644
--- a/updater/updater_9.vcproj
+++ b/updater/updater_9.vcproj
@@ -472,7 +472,6 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="zbin/x32"
- GenerateManifest="false"
ModuleDefinitionFile="updater.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
@@ -677,7 +676,6 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="zbin/x32"
- GenerateManifest="false"
ModuleDefinitionFile="updater.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
@@ -783,7 +781,6 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="zbin/x64"
- GenerateManifest="false"
ModuleDefinitionFile="updater.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
diff --git a/updater/zbin/minizip/ioapi.c b/updater/zbin/minizip/ioapi.c
index 49958f6..c3f75ce 100644
--- a/updater/zbin/minizip/ioapi.c
+++ b/updater/zbin/minizip/ioapi.c
@@ -10,7 +10,7 @@
*/
-#if (defined(_WIN32))
+#if (defined(_WIN32) && !defined(_CRT_SECURE_NO_WARNINGS))
#define _CRT_SECURE_NO_WARNINGS
#endif