Merge branch 'dev'

payalord · Feb 10, 2020 · 788a015 · 788a015
2 parents 17658a1 + df417e7
commit 788a015
Show file tree

Hide file tree

Showing 16 changed files with 85 additions and 33 deletions.
diff --git a/CompleteDistroNT.bat b/CompleteDistroNT.bat
@@ -0,0 +1,31 @@
+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"
+
+rmdir /S /Q DistroNT
+mkdir DistroNT
+
+copy default.cfg DistroNT
+copy matrix.exe DistroNT
+copy zsMatrix.dll DistroNT
+copy Config.dll DistroNT
+copy MsgHook.dll DistroNT
+copy readme.txt DistroNT
+copy LICENSE.TXT DistroNT
+copy ORIGINALREADME.md DistroNT
+copy JapaneseSet.txt DistroNT
+copy MatrixCodeFontSet.txt DistroNT
+copy "Matrix Code Font.ttf" DistroNT
+copy ZMatrixHelp.chm DistroNT
+copy WinampVis\vis_zmx.dll DistroNT
+
+mkdir DistroNT\ScreenSaver
+
+copy ScreenSaver\ZMatrixSS.scr DistroNT\ScreenSaver
+
+if exist Setup (
+cd Setup
+iscc ZMatrix_payalord.iss
+REM isppcc ZMatrix.iss /dUPGRADE
+cd ..
+)
+
+echo 
diff --git a/Config/Config.bpr b/Config/Config.bpr
@@ -51,7 +51,6 @@
   <FILELIST>
       <FILE FILENAME="Config.cpp" FORMNAME="" UNITNAME="Config" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="ConfigForm.cpp" FORMNAME="ConfigurationForm" UNITNAME="ConfigForm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\zsMatrix_Borland.lib" FORMNAME="" UNITNAME="zsMatrix_Borland" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="CharSetForm.cpp" FORMNAME="CharacterSetForm" UNITNAME="CharSetForm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="AboutUnit.cpp" FORMNAME="AboutForm" UNITNAME="AboutUnit" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="ConfigResources.res" FORMNAME="" UNITNAME="ConfigResources.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>

diff --git a/Config/ConfigResources.rc b/Config/ConfigResources.rc
@@ -7,7 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+// #include "afxres.h"
+#include "windows.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

diff --git a/Config/ConfigResources.res b/Config/ConfigResources.res
diff --git a/Config/comments.html b/Config/comments.html
@@ -15,7 +15,7 @@
 
 <body>
 <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>
-<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>
+<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>
 <hr>
 <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>
 

diff --git a/CreateDistroNT.bat b/CreateDistroNT.bat
@@ -1,4 +1,4 @@
-set PATH=%PATH%;"C:\Program Files\My Inno Setup Extensions 3";"C:\Program Files\HTML Help Workshop"
+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"
 
 if not "%1" == "" (
 	if exist scripts (
@@ -8,7 +8,7 @@ if not "%1" == "" (
 	)
 )
 
-msdev matrix.dsw /MAKE "ZMatrixSS - Win32 Release" /REBUILD
+devenv matrix.sln /rebuild Release /project "ZMatrixSS"
 
 if exist Config (
 cd Config
@@ -37,21 +37,23 @@ copy Config.dll DistroNT
 copy MsgHook.dll DistroNT
 copy readme.txt DistroNT
 copy LICENSE.TXT DistroNT
+copy ORIGINALREADME.md DistroNT
 copy JapaneseSet.txt DistroNT
 copy MatrixCodeFontSet.txt DistroNT
 copy "Matrix Code Font.ttf" DistroNT
 copy ZMatrixHelp.chm DistroNT
+copy WinampVis\vis_zmx.dll DistroNT
 
 mkdir DistroNT\ScreenSaver
 
 copy ScreenSaver\ZMatrixSS.scr DistroNT\ScreenSaver
 
-msdev matrix.dsw /MAKE "ZMatrixSS - Win32 Release" /CLEAN
-del /Q Config.dll
+devenv matrix.sln /clean Release /project "ZMatrixSS"
+REM del /Q Config.dll
 
 if exist Setup (
 cd Setup
-isppcc ZMatrix.iss
+iscc ZMatrix_payalord.iss
 REM isppcc ZMatrix.iss /dUPGRADE
 cd ..
 )

diff --git a/MsgHook/MsgHook.rc b/MsgHook/MsgHook.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,3,0
- PRODUCTVERSION 1,5,3,0
+ FILEVERSION 1,5,4,0
+ PRODUCTVERSION 1,5,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
             VALUE "Comments", "This component is for catching mouse and keyboard motion in screensave mode."
             VALUE "CompanyName", "Happy Dude, Payalord"
             VALUE "FileDescription", "MsgHook DLL"
-            VALUE "FileVersion", "1.5.3.0"
+            VALUE "FileVersion", "1.5.4.0"
             VALUE "InternalName", "MsgHook"
             VALUE "LegalCopyright", "Copyright � 2003"
             VALUE "OriginalFilename", "MsgHook.dll"
             VALUE "ProductName", "ZMatrix"
-            VALUE "ProductVersion", "1.5.3.0"
+            VALUE "ProductVersion", "1.5.4.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/ScreenSaver/ZMatrixSS.rc b/ScreenSaver/ZMatrixSS.rc
@@ -61,8 +61,8 @@ IDI_MATRIX_ICON         ICON                    "ZMatrix.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,3,0
- PRODUCTVERSION 1,5,3,0
+ FILEVERSION 1,5,4,0
+ PRODUCTVERSION 1,5,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
             VALUE "Comments", "Launches the ZMatrix screensaver."
             VALUE "CompanyName", "Happy Dude, Payalord"
             VALUE "FileDescription", "ZMatrix screensaver launcher."
-            VALUE "FileVersion", "1.5.3.0"
+            VALUE "FileVersion", "1.5.4.0"
             VALUE "InternalName", "ZMatrixSS"
             VALUE "LegalCopyright", "Copyright � 2003"
             VALUE "OriginalFilename", "ZMatrixSS.scr"
             VALUE "ProductName", "ZMatrix"
-            VALUE "ProductVersion", "1.5.3.0"
+            VALUE "ProductVersion", "1.5.4.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Setup/ZMatrix_payalord.iss b/Setup/ZMatrix_payalord.iss
@@ -6,7 +6,7 @@
 
 #define MAJOR_VER "1"
 #define MINOR_VER "5"
-#define RELEASE_VER "3"
+#define RELEASE_VER "4"
 
 #define VIS_INSTALLER_NAME "ZMatrixVizModule_"+MAJOR_VER+"_"+MINOR_VER+"_"+RELEASE_VER+".exe"
 #define VIS_INSTALLER_PATH "..\DistroVis\Output\"
@@ -25,7 +25,7 @@ AllowNoIcons=yes
 #ifdef WIN9X
 MinVersion=4.0,0
 #else
-MinVersion=0,5.0
+MinVersion=0,6.1
 #endif
 PrivilegesRequired=poweruser
 LicenseFile=LICENSE.TXT

diff --git a/ZMatrixHelp.chm b/ZMatrixHelp.chm
diff --git a/globals.h b/globals.h
@@ -34,13 +34,6 @@
 #ifndef __globals_h
 #define __globals_h
 
-
-
-
-
-
-
-
 #include <windows.h>
 #include <windowsx.h>
 #include <stdio.h>
@@ -91,6 +84,8 @@ using namespace std;
 #define WM_GET_COEFF_B1 (WM_USER + 17)
 #define WM_SET_COEFF_B1 (WM_USER + 18)
 
+#define WM_DPICHANGED 0x02E0
+
 
 #ifndef WM_UPDATEUISTATE
 	#define WM_UPDATEUISTATE 0x0128

diff --git a/manifest.xml b/manifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>
diff --git a/matrix.cpp b/matrix.cpp
@@ -842,6 +842,19 @@ LRESULT CALLBACK WindowProc(HWND hWnd,UINT message,WPARAM wParam,LPARAM lParam)
 			}
 		}
 		break;
+	case (WM_DPICHANGED):
+		{
+		RECT* const rect = (RECT*)lParam;
+		// auto rect = *reinterpret_cast<RECT *>(lParam);
+		SetWindowPos(hWnd,
+			0, // or NULL
+			rect->left,
+			rect->top,
+			rect->right - rect->left,
+			rect->bottom - rect->top,
+			SWP_NOSIZE | SWP_NOMOVE);
+		}
+		break;
 	case(WM_SYSCOLORCHANGE):
 		{
 

diff --git a/matrix.rc b/matrix.rc
@@ -96,8 +96,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,3,0
- PRODUCTVERSION 1,5,3,0
+ FILEVERSION 1,5,4,0
+ PRODUCTVERSION 1,5,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -115,12 +115,12 @@ BEGIN
             VALUE "Comments", "This is the core ZMatrix component."
             VALUE "CompanyName", "Happy Dude, Payalord"
             VALUE "FileDescription", "matrix"
-            VALUE "FileVersion", "1.5.3.0"
+            VALUE "FileVersion", "1.5.4.0"
             VALUE "InternalName", "matrix"
             VALUE "LegalCopyright", "Copyright � 2003"
             VALUE "OriginalFilename", "matrix.exe"
             VALUE "ProductName", "ZMatrix"
-            VALUE "ProductVersion", "1.5.3.0"
+            VALUE "ProductVersion", "1.5.4.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/matrix.vcxproj b/matrix.vcxproj
@@ -150,6 +150,9 @@
       <AdditionalDependencies>MsgHook.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>manifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Win9x|Win32'">
     <ClCompile>

diff --git a/zsMatrix/zsMatrix.rc b/zsMatrix/zsMatrix.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,3,0
- PRODUCTVERSION 1,5,3,0
+ FILEVERSION 1,5,4,0
+ PRODUCTVERSION 1,5,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
             VALUE "Comments", "This is the rendering component for ZMatrix."
             VALUE "CompanyName", " Happy Dude, Payalord"
             VALUE "FileDescription", "zsMatrix COM Object"
-            VALUE "FileVersion", "1.5.3.0"
+            VALUE "FileVersion", "1.5.4.0"
             VALUE "InternalName", "zsMatrix"
             VALUE "LegalCopyright", "Copyright � 2003"
             VALUE "OriginalFilename", "zsMatrix.dll"
             VALUE "ProductName", "ZMatrix"
-            VALUE "ProductVersion", "1.5.3.0"
+            VALUE "ProductVersion", "1.5.4.0"
         END
     END
     BLOCK "VarFileInfo"