Skip to content

Commit 788a015

Browse files
payalordpayalord
committed
Merge branch 'dev'
2 parents 17658a1 + df417e7 commit 788a015

16 files changed

+85
-33
lines changed

‎CompleteDistroNT.bat

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
set PATH=%PATH%;"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE";"C:\Program Files (x86)\Inno Setup 6";"C:\Program Files (x86)\HTML Help Workshop";"C:\Program Files (x86)\Borland\CBuilder6\Bin\";"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86"
2+
3+
rmdir /S /Q DistroNT
4+
mkdir DistroNT
5+
6+
copy default.cfg DistroNT
7+
copy matrix.exe DistroNT
8+
copy zsMatrix.dll DistroNT
9+
copy Config.dll DistroNT
10+
copy MsgHook.dll DistroNT
11+
copy readme.txt DistroNT
12+
copy LICENSE.TXT DistroNT
13+
copy ORIGINALREADME.md DistroNT
14+
copy JapaneseSet.txt DistroNT
15+
copy MatrixCodeFontSet.txt DistroNT
16+
copy "Matrix Code Font.ttf" DistroNT
17+
copy ZMatrixHelp.chm DistroNT
18+
copy WinampVis\vis_zmx.dll DistroNT
19+
20+
mkdir DistroNT\ScreenSaver
21+
22+
copy ScreenSaver\ZMatrixSS.scr DistroNT\ScreenSaver
23+
24+
if exist Setup (
25+
cd Setup
26+
iscc ZMatrix_payalord.iss
27+
REM isppcc ZMatrix.iss /dUPGRADE
28+
cd ..
29+
)
30+
31+
echo 

‎Config/Config.bpr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<FILELIST>
5252
<FILE FILENAME="Config.cpp" FORMNAME="" UNITNAME="Config" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
5353
<FILE FILENAME="ConfigForm.cpp" FORMNAME="ConfigurationForm" UNITNAME="ConfigForm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
54-
<FILE FILENAME="..\zsMatrix_Borland.lib" FORMNAME="" UNITNAME="zsMatrix_Borland" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
5554
<FILE FILENAME="CharSetForm.cpp" FORMNAME="CharacterSetForm" UNITNAME="CharSetForm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
5655
<FILE FILENAME="AboutUnit.cpp" FORMNAME="AboutForm" UNITNAME="AboutUnit" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
5756
<FILE FILENAME="ConfigResources.res" FORMNAME="" UNITNAME="ConfigResources.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>

‎Config/ConfigResources.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//
88
// Generated from the TEXTINCLUDE 2 resource.
99
//
10-
#include "afxres.h"
10+
// #include "afxres.h"
11+
#include "windows.h"
1112

1213
/////////////////////////////////////////////////////////////////////////////
1314
#undef APSTUDIO_READONLY_SYMBOLS

‎Config/ConfigResources.res

0 Bytes
Binary file not shown.

‎Config/comments.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<body>
1717
<p>This is forked and fixed version for Windows 7(Aero), done by <a href="https://github.com/payalord" target="_blank">Payalord</a>. Available at <a href="https://github.com/payalord/ZMatrix" target="_blank">https://github.com/payalord/ZMatrix</a></p>
18-
<p>I didn't tested it on Windows 8, 10 yet, but probably it will work on them too. Next goes original authors comments.</p>
18+
<p>I didn't tested it on Windows 8, 10 yet, but probably it will work on them too. Next goes original author's comments.</p>
1919
<hr>
2020
<p>That's right, happiness is only $1 away. &nbsp;Send 1 unit of your local currency (paper form only, no coins, shells, cigarettes, or cattle) to:</p>
2121

‎CreateDistroNT.bat

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set PATH=%PATH%;"C:\Program Files\My Inno Setup Extensions 3";"C:\Program Files\HTML Help Workshop"
1+
set PATH=%PATH%;"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE";"C:\Program Files (x86)\Inno Setup 6";"C:\Program Files (x86)\HTML Help Workshop";"C:\Program Files (x86)\Borland\CBuilder6\Bin\";"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86"
22

33
if not "%1" == "" (
44
if exist scripts (
@@ -8,7 +8,7 @@ if not "%1" == "" (
88
)
99
)
1010

11-
msdev matrix.dsw /MAKE "ZMatrixSS - Win32 Release" /REBUILD
11+
devenv matrix.sln /rebuild Release /project "ZMatrixSS"
1212

1313
if exist Config (
1414
cd Config
@@ -37,21 +37,23 @@ copy Config.dll DistroNT
3737
copy MsgHook.dll DistroNT
3838
copy readme.txt DistroNT
3939
copy LICENSE.TXT DistroNT
40+
copy ORIGINALREADME.md DistroNT
4041
copy JapaneseSet.txt DistroNT
4142
copy MatrixCodeFontSet.txt DistroNT
4243
copy "Matrix Code Font.ttf" DistroNT
4344
copy ZMatrixHelp.chm DistroNT
45+
copy WinampVis\vis_zmx.dll DistroNT
4446

4547
mkdir DistroNT\ScreenSaver
4648

4749
copy ScreenSaver\ZMatrixSS.scr DistroNT\ScreenSaver
4850

49-
msdev matrix.dsw /MAKE "ZMatrixSS - Win32 Release" /CLEAN
50-
del /Q Config.dll
51+
devenv matrix.sln /clean Release /project "ZMatrixSS"
52+
REM del /Q Config.dll
5153

5254
if exist Setup (
5355
cd Setup
54-
isppcc ZMatrix.iss
56+
iscc ZMatrix_payalord.iss
5557
REM isppcc ZMatrix.iss /dUPGRADE
5658
cd ..
5759
)

‎MsgHook/MsgHook.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ END
5151
//
5252

5353
VS_VERSION_INFO VERSIONINFO
54-
FILEVERSION 1,5,3,0
55-
PRODUCTVERSION 1,5,3,0
54+
FILEVERSION 1,5,4,0
55+
PRODUCTVERSION 1,5,4,0
5656
FILEFLAGSMASK 0x3fL
5757
#ifdef _DEBUG
5858
FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
7070
VALUE "Comments", "This component is for catching mouse and keyboard motion in screensave mode."
7171
VALUE "CompanyName", "Happy Dude, Payalord"
7272
VALUE "FileDescription", "MsgHook DLL"
73-
VALUE "FileVersion", "1.5.3.0"
73+
VALUE "FileVersion", "1.5.4.0"
7474
VALUE "InternalName", "MsgHook"
7575
VALUE "LegalCopyright", "Copyright � 2003"
7676
VALUE "OriginalFilename", "MsgHook.dll"
7777
VALUE "ProductName", "ZMatrix"
78-
VALUE "ProductVersion", "1.5.3.0"
78+
VALUE "ProductVersion", "1.5.4.0"
7979
END
8080
END
8181
BLOCK "VarFileInfo"

‎ScreenSaver/ZMatrixSS.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ IDI_MATRIX_ICON ICON "ZMatrix.ico"
6161
//
6262

6363
VS_VERSION_INFO VERSIONINFO
64-
FILEVERSION 1,5,3,0
65-
PRODUCTVERSION 1,5,3,0
64+
FILEVERSION 1,5,4,0
65+
PRODUCTVERSION 1,5,4,0
6666
FILEFLAGSMASK 0x3fL
6767
#ifdef _DEBUG
6868
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
8080
VALUE "Comments", "Launches the ZMatrix screensaver."
8181
VALUE "CompanyName", "Happy Dude, Payalord"
8282
VALUE "FileDescription", "ZMatrix screensaver launcher."
83-
VALUE "FileVersion", "1.5.3.0"
83+
VALUE "FileVersion", "1.5.4.0"
8484
VALUE "InternalName", "ZMatrixSS"
8585
VALUE "LegalCopyright", "Copyright � 2003"
8686
VALUE "OriginalFilename", "ZMatrixSS.scr"
8787
VALUE "ProductName", "ZMatrix"
88-
VALUE "ProductVersion", "1.5.3.0"
88+
VALUE "ProductVersion", "1.5.4.0"
8989
END
9090
END
9191
BLOCK "VarFileInfo"

‎Setup/ZMatrix_payalord.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#define MAJOR_VER "1"
88
#define MINOR_VER "5"
9-
#define RELEASE_VER "3"
9+
#define RELEASE_VER "4"
1010

1111
#define VIS_INSTALLER_NAME "ZMatrixVizModule_"+MAJOR_VER+"_"+MINOR_VER+"_"+RELEASE_VER+".exe"
1212
#define VIS_INSTALLER_PATH "..\DistroVis\Output\"
@@ -25,7 +25,7 @@ AllowNoIcons=yes
2525
#ifdef WIN9X
2626
MinVersion=4.0,0
2727
#else
28-
MinVersion=0,5.0
28+
MinVersion=0,6.1
2929
#endif
3030
PrivilegesRequired=poweruser
3131
LicenseFile=LICENSE.TXT

‎ZMatrixHelp.chm

11.3 KB
Binary file not shown.

‎globals.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@
3434
#ifndef __globals_h
3535
#define __globals_h
3636

37-
38-
39-
40-
41-
42-
43-
4437
#include <windows.h>
4538
#include <windowsx.h>
4639
#include <stdio.h>
@@ -91,6 +84,8 @@ using namespace std;
9184
#define WM_GET_COEFF_B1 (WM_USER + 17)
9285
#define WM_SET_COEFF_B1 (WM_USER + 18)
9386

87+
#define WM_DPICHANGED 0x02E0
88+
9489

9590
#ifndef WM_UPDATEUISTATE
9691
#define WM_UPDATEUISTATE 0x0128

‎manifest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3+
  <application xmlns="urn:schemas-microsoft-com:asm.v3">
4+
    <windowsSettings>
5+
      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
6+
    </windowsSettings>
7+
  </application>
8+
</assembly>

‎matrix.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,19 @@ LRESULT CALLBACK WindowProc(HWND hWnd,UINT message,WPARAM wParam,LPARAM lParam)
842842
}
843843
}
844844
break;
845+
case (WM_DPICHANGED):
846+
{
847+
RECT* const rect = (RECT*)lParam;
848+
// auto rect = *reinterpret_cast<RECT *>(lParam);
849+
SetWindowPos(hWnd,
850+
0, // or NULL
851+
rect->left,
852+
rect->top,
853+
rect->right - rect->left,
854+
rect->bottom - rect->top,
855+
SWP_NOSIZE | SWP_NOMOVE);
856+
}
857+
break;
845858
case(WM_SYSCOLORCHANGE):
846859
{
847860

‎matrix.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ END
9696
//
9797

9898
VS_VERSION_INFO VERSIONINFO
99-
FILEVERSION 1,5,3,0
100-
PRODUCTVERSION 1,5,3,0
99+
FILEVERSION 1,5,4,0
100+
PRODUCTVERSION 1,5,4,0
101101
FILEFLAGSMASK 0x3fL
102102
#ifdef _DEBUG
103103
FILEFLAGS 0x1L
@@ -115,12 +115,12 @@ BEGIN
115115
VALUE "Comments", "This is the core ZMatrix component."
116116
VALUE "CompanyName", "Happy Dude, Payalord"
117117
VALUE "FileDescription", "matrix"
118-
VALUE "FileVersion", "1.5.3.0"
118+
VALUE "FileVersion", "1.5.4.0"
119119
VALUE "InternalName", "matrix"
120120
VALUE "LegalCopyright", "Copyright � 2003"
121121
VALUE "OriginalFilename", "matrix.exe"
122122
VALUE "ProductName", "ZMatrix"
123-
VALUE "ProductVersion", "1.5.3.0"
123+
VALUE "ProductVersion", "1.5.4.0"
124124
END
125125
END
126126
BLOCK "VarFileInfo"

‎matrix.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@
150150
<AdditionalDependencies>MsgHook.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
151151
<EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
152152
</Link>
153+
<Manifest>
154+
<AdditionalManifestFiles>manifest.xml</AdditionalManifestFiles>
155+
</Manifest>
153156
</ItemDefinitionGroup>
154157
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Win9x|Win32'">
155158
<ClCompile>

‎zsMatrix/zsMatrix.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ END
5151
//
5252

5353
VS_VERSION_INFO VERSIONINFO
54-
FILEVERSION 1,5,3,0
55-
PRODUCTVERSION 1,5,3,0
54+
FILEVERSION 1,5,4,0
55+
PRODUCTVERSION 1,5,4,0
5656
FILEFLAGSMASK 0x3fL
5757
#ifdef _DEBUG
5858
FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
7070
VALUE "Comments", "This is the rendering component for ZMatrix."
7171
VALUE "CompanyName", " Happy Dude, Payalord"
7272
VALUE "FileDescription", "zsMatrix COM Object"
73-
VALUE "FileVersion", "1.5.3.0"
73+
VALUE "FileVersion", "1.5.4.0"
7474
VALUE "InternalName", "zsMatrix"
7575
VALUE "LegalCopyright", "Copyright � 2003"
7676
VALUE "OriginalFilename", "zsMatrix.dll"
7777
VALUE "ProductName", "ZMatrix"
78-
VALUE "ProductVersion", "1.5.3.0"
78+
VALUE "ProductVersion", "1.5.4.0"
7979
END
8080
END
8181
BLOCK "VarFileInfo"

0 commit comments

Comments
 (0)