Skip to content

Commit bbf64e9

Browse files
committed
workaround for windows 10, so x64 does the workaround and win32 does not
1 parent 2f38fd5 commit bbf64e9

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

DebugView++/LogView.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "MainFrame.h"
2424
#include "LogView.h"
2525
#include "RenameProcessDlg.h"
26-
#include "VersionHelpers.h"
26+
//#include "VersionHelpers.h" // IsWindows10OrGreater ??
2727

2828
namespace fusion {
2929
namespace debugviewpp {
@@ -1262,8 +1262,10 @@ LRESULT CLogView::OnCustomDraw(NMHDR* pnmh)
12621262
{
12631263
//bool isWin10 = IsWindows10OrGreater();
12641264

1265+
#ifndef _WIN64
12651266
//if (!isWin10)
1266-
// return CDRF_DODEFAULT;
1267+
return CDRF_DODEFAULT;
1268+
#endif
12671269

12681270
LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)pnmh;
12691271
if (lplvcd->nmcd.dwDrawStage == CDDS_PREPAINT)

DebugView++/version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#define VERSION 1,8,0,41
2-
#define VERSION_STR "1.8.0.41"
1+
#define VERSION 1,8,0,44
2+
#define VERSION_STR "1.8.0.44"

DebugView++/version.wxi

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<?define ProductVersion.Major="1" ?>
44
<?define ProductVersion.Minor="8" ?>
55
<?define ProductVersion.Revision="0" ?>
6-
<?define ProductVersion.Build="41" ?>
7-
<?define ProductVersion="1.8.0.41" ?>
6+
<?define ProductVersion.Build="44" ?>
7+
<?define ProductVersion="1.8.0.44" ?>
88
</Include>

createzip.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ if not exist %upx_bin% (
3636
:: notice we pack the win32 .vsix in any case (so also in x64 builds), and this is correct.
3737

3838
:zip
39-
%zip_bin% -j %bin_dir%\DebugView++.zip %bin_dir%\DebugView++.exe %bin_dir%\DebugViewConsole.exe %project_dir%\release\*.vsix
39+
%zip_bin% -j %bin_dir%\DebugView++.zip %bin_dir%\DebugView++.exe %bin_dir%\DebugView++*.pdb %bin_dir%\DebugViewConsole.exe %project_dir%\release\*.vsix
4040

4141
:exit

0 commit comments

Comments
 (0)