workaround for windows 10, so x64 does the workaround and win32 does not

CobaltFusion · Jan 3, 2019 · bbf64e9 · bbf64e9
1 parent 2f38fd5
commit bbf64e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/DebugView++/LogView.cpp b/DebugView++/LogView.cpp
@@ -23,7 +23,7 @@
 #include "MainFrame.h"
 #include "LogView.h"
 #include "RenameProcessDlg.h"
-#include "VersionHelpers.h"
+//#include "VersionHelpers.h"  // IsWindows10OrGreater ??
 
 namespace fusion {
 namespace debugviewpp {
@@ -1262,8 +1262,10 @@ LRESULT CLogView::OnCustomDraw(NMHDR* pnmh)
 {
 	//bool isWin10 = IsWindows10OrGreater();
 
+#ifndef _WIN64
 	//if (!isWin10)
-	//	return CDRF_DODEFAULT;
+	return CDRF_DODEFAULT;
+#endif
 
 	LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)pnmh;
 	if (lplvcd->nmcd.dwDrawStage == CDDS_PREPAINT)

diff --git a/DebugView++/version.h b/DebugView++/version.h
@@ -1,2 +1,2 @@
-#define VERSION 1,8,0,41 
-#define VERSION_STR "1.8.0.41" 
+#define VERSION 1,8,0,44 
+#define VERSION_STR "1.8.0.44" 
diff --git a/DebugView++/version.wxi b/DebugView++/version.wxi
@@ -3,6 +3,6 @@
     <?define ProductVersion.Major="1" ?> 
     <?define ProductVersion.Minor="8" ?> 
     <?define ProductVersion.Revision="0" ?> 
-    <?define ProductVersion.Build="41" ?> 
-    <?define ProductVersion="1.8.0.41" ?> 
+    <?define ProductVersion.Build="44" ?> 
+    <?define ProductVersion="1.8.0.44" ?> 
 </Include> 
diff --git a/createzip.bat b/createzip.bat
@@ -36,6 +36,6 @@ if not exist %upx_bin% (
 :: notice we pack the win32 .vsix in any case (so also in x64 builds), and this is correct.
 
 :zip
-%zip_bin% -j %bin_dir%\DebugView++.zip %bin_dir%\DebugView++.exe %bin_dir%\DebugViewConsole.exe %project_dir%\release\*.vsix
+%zip_bin% -j %bin_dir%\DebugView++.zip %bin_dir%\DebugView++.exe %bin_dir%\DebugView++*.pdb %bin_dir%\DebugViewConsole.exe %project_dir%\release\*.vsix
 
 :exit