Merge branch 'valinet:master' into master

creeper-0910 · web-flow · commit 83a6ad78cb0f · 2023-10-21T19:03:09.000+09:00
diff --git a/ExplorerPatcher/GUI.c b/ExplorerPatcher/GUI.c
@@ -1619,7 +1619,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                                         }
                                         else
                                         {
-                                            BeginExplorerRestart();
+                                            BeginExplorerRestart(NULL);
                                         }
                                     }
                                     Sleep(100);
diff --git a/ExplorerPatcher/StartMenuSettings.cpp b/ExplorerPatcher/StartMenuSettings.cpp
@@ -26,7 +26,7 @@ static std::vector<winrt::guid> GlobalStartData_GetPlacesFromRegistry()
     std::vector<winrt::guid> places;
 
     DWORD dwSize;
-    HRESULT hr = RegGetValueW(
+    LSTATUS lRes = RegGetValueW(
         HKEY_CURRENT_USER,
         L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Start",
         L"VisiblePlaces",
@@ -35,11 +35,11 @@ static std::vector<winrt::guid> GlobalStartData_GetPlacesFromRegistry()
         nullptr,
         &dwSize
     );
-    if (FAILED(hr) || dwSize == 0)
+    if (lRes != ERROR_SUCCESS || dwSize == 0)
         return places;
 
     places.resize(dwSize / sizeof(winrt::guid));
-    hr = RegGetValueW(
+    lRes = RegGetValueW(
         HKEY_CURRENT_USER,
         L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Start",
         L"VisiblePlaces",
@@ -48,7 +48,7 @@ static std::vector<winrt::guid> GlobalStartData_GetPlacesFromRegistry()
         places.data(),
         &dwSize
     );
-    if (FAILED(hr))
+    if (lRes != ERROR_SUCCESS)
         places.clear();
 
     return places;
diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
@@ -11001,16 +11001,16 @@ BOOL FixStartMenuAnimation(LPMODULEINFO mi)
     }
 
     DWORD dwOldProtect = 0;
-    if (VirtualProtect(match7a + 11, 3, PAGE_EXECUTE_READWRITE, &dwOldProtect))
+    if (VirtualProtect(match7a + 11, 1, PAGE_EXECUTE_READWRITE, &dwOldProtect))
     {
         match7a[0] = 0xEB;
-        VirtualProtect(match7a + 11, 3, dwOldProtect, &dwOldProtect);
+        VirtualProtect(match7a + 11, 1, dwOldProtect, &dwOldProtect);
 
         dwOldProtect = 0;
-        if (VirtualProtect(match7b + 11, 3, PAGE_EXECUTE_READWRITE, &dwOldProtect))
+        if (VirtualProtect(match7b + 11, 1, PAGE_EXECUTE_READWRITE, &dwOldProtect))
         {
             match7b[0] = 0xEB;
-            VirtualProtect(match7b + 11, 3, dwOldProtect, &dwOldProtect);
+            VirtualProtect(match7b + 11, 1, dwOldProtect, &dwOldProtect);
         }
     }
 
diff --git a/ExplorerPatcher/fmemopen.h b/ExplorerPatcher/fmemopen.h
@@ -5,5 +5,15 @@
 #include <fcntl.h>
 #include <windows.h>
 #include <sys/stat.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FILE* fmemopen(void* buf, size_t len, const char* type);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/ExplorerPatcher/getline.h b/ExplorerPatcher/getline.h
@@ -5,8 +5,16 @@
 #include <BaseTsd.h>
 typedef SSIZE_T ssize_t;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 ssize_t getdelim(char** buf, size_t* bufsiz, int delimiter, FILE* fp);
 
 ssize_t getline(char** buf, size_t* bufsiz, FILE* fp);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/ExplorerPatcher/osutility.h b/ExplorerPatcher/osutility.h
@@ -20,6 +20,10 @@
 #endif
 #define DWMWA_MICA_EFFFECT 1029
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern RTL_OSVERSIONINFOW global_rovi;
 extern DWORD32 global_ubr;
 
@@ -94,4 +98,9 @@ inline BOOL IsWindows11Version22H2Build2361OrHigher()
     if (global_rovi.dwBuildNumber > 22621) return TRUE;
     return global_rovi.dwBuildNumber == 22621 && global_ubr >= 2361;
 }
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/ExplorerPatcher/utility.c b/ExplorerPatcher/utility.c
@@ -163,7 +163,7 @@ LRESULT CALLBACK BalloonWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara
     return 0;
 }
 
-__declspec(dllexport) CALLBACK ZZTestBalloon(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
+__declspec(dllexport) int CALLBACK ZZTestBalloon(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
 {
     TCHAR* lpwszCmdLine = calloc((strlen(lpszCmdLine) + 1), sizeof(TCHAR));
     if (!lpwszCmdLine) exit(0);
@@ -199,6 +199,8 @@ __declspec(dllexport) CALLBACK ZZTestBalloon(HWND hWnd, HINSTANCE hInstance, LPS
         TranslateMessage(&msg);
         DispatchMessage(&msg);
     }
+
+    return 0;
 }
 
 const wchar_t TestToastXML[] =
@@ -212,7 +214,7 @@ L"		</binding>\r\n"
 L"	</visual>\r\n"
 L"	<audio src=\"ms-winsoundevent:Notification.Default\" loop=\"false\" silent=\"false\"/>\r\n"
 L"</toast>\r\n";
-__declspec(dllexport) CALLBACK ZZTestToast(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
+__declspec(dllexport) int CALLBACK ZZTestToast(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
 {
     TCHAR* lpwszCmdLine = calloc((strlen(lpszCmdLine) + 1), sizeof(TCHAR));
     if (!lpwszCmdLine) exit(0);
@@ -252,9 +254,10 @@ __declspec(dllexport) CALLBACK ZZTestToast(HWND hWnd, HINSTANCE hInstance, LPSTR
         free(buffer);
     }
     free(lpwszCmdLine);
+    return 0;
 }
 
-__declspec(dllexport) CALLBACK ZZLaunchExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
+__declspec(dllexport) int CALLBACK ZZLaunchExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
 {
     Sleep(100);
     TCHAR wszExplorerPath[MAX_PATH + 1];
@@ -283,18 +286,21 @@ __declspec(dllexport) CALLBACK ZZLaunchExplorer(HWND hWnd, HINSTANCE hInstance,
         ),
         0
     );
+    return 0;
 }
 
-__declspec(dllexport) CALLBACK ZZLaunchExplorerDelayed(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
+__declspec(dllexport) int CALLBACK ZZLaunchExplorerDelayed(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
 {
     Sleep(2000);
     ZZLaunchExplorer(hWnd, hInstance, lpszCmdLine, nCmdShow);
+    return 0;
 }
 
-__declspec(dllexport) CALLBACK ZZRestartExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
+__declspec(dllexport) int CALLBACK ZZRestartExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)
 {
-    BeginExplorerRestart();
+    BeginExplorerRestart(NULL);
     FinishExplorerRestart();
+    return 0;
 }
 
 void* ReadFromFile(wchar_t* wszFileName, DWORD* dwSize)
diff --git a/ExplorerPatcher/utility.h b/ExplorerPatcher/utility.h
@@ -15,18 +15,25 @@
 #include <restartmanager.h>
 #pragma comment(lib, "Rstrtmgr.lib")
 #define _LIBVALINET_INCLUDE_UNIVERSAL
+#ifndef __cplusplus
 #include <valinet/universal/toast/toast.h>
+#endif
 #include "osutility.h"
 #include "queryversion.h"
 #pragma comment(lib, "Psapi.lib")
 #include <activscp.h>
 #include <netlistmgr.h>
+#include <Psapi.h>
 
 #include "def.h"
 
 #define WM_MSG_GUI_SECTION WM_USER + 1
 #define WM_MSG_GUI_SECTION_GET 1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 DEFINE_GUID(CLSID_ImmersiveShell,
     0xc2f03a33,
     0x21f5, 0x47fa, 0xb4, 0xbb,
@@ -245,15 +252,15 @@ void printf_guid(GUID guid);
 
 LRESULT CALLBACK BalloonWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
-__declspec(dllexport) CALLBACK ZZTestBalloon(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
+__declspec(dllexport) int CALLBACK ZZTestBalloon(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
 
-__declspec(dllexport) CALLBACK ZZTestToast(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
+__declspec(dllexport) int CALLBACK ZZTestToast(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
 
-__declspec(dllexport) CALLBACK ZZLaunchExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
+__declspec(dllexport) int CALLBACK ZZLaunchExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
 
-__declspec(dllexport) CALLBACK ZZLaunchExplorerDelayed(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
+__declspec(dllexport) int CALLBACK ZZLaunchExplorerDelayed(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
 
-__declspec(dllexport) CALLBACK ZZRestartExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
+__declspec(dllexport) int CALLBACK ZZRestartExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow);
 
 #define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
 #define MAX(X, Y) (((X) > (Y)) ? (X) : (Y))
@@ -297,7 +304,7 @@ inline LSTATUS SHRegGetValueFromHKCUHKLMWithOpt(
             pwszValue,
             0,
             NULL,
-            pvData,
+            (LPBYTE)pvData,
             pcbData
         );
         RegCloseKey(hKey);
@@ -324,7 +331,7 @@ inline LSTATUS SHRegGetValueFromHKCUHKLMWithOpt(
             pwszValue,
             0,
             NULL,
-            pvData,
+            (LPBYTE)pvData,
             pcbData
         );
         RegCloseKey(hKey);
@@ -517,7 +524,7 @@ static DWORD RmSession = -1;
 static wchar_t RmSessionKey[CCH_RM_SESSION_KEY + 1];
 
 // shuts down the explorer and is ready for explorer restart
-inline void BeginExplorerRestart()
+inline DWORD WINAPI BeginExplorerRestart(LPVOID lpUnused)
 {
     if (RmStartSession(&RmSession, 0, RmSessionKey) == ERROR_SUCCESS)
     {
@@ -535,6 +542,7 @@ inline void BeginExplorerRestart()
             RmShutdown(RmSession, RmForceShutdown, 0);
         }
     }
+    return 0;
 }
 // restarts the explorer
 inline void FinishExplorerRestart()
@@ -673,8 +681,9 @@ inline BOOL IncrementDLLReferenceCount(HINSTANCE hinst)
     HMODULE hMod;
     GetModuleHandleExW(
         GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
-        hinst,
+        (LPCWSTR)hinst,
         &hMod);
+    return TRUE;
 }
 
 inline BOOL WINAPI PatchContextMenuOfNewMicrosoftIME(BOOL* bFound)
@@ -786,7 +795,7 @@ BOOL ExtractMonitorByIndex(HMONITOR hMonitor, HDC hDC, LPRECT lpRect, MonitorOve
 
 inline BOOL MaskCompare(PVOID pBuffer, LPCSTR lpPattern, LPCSTR lpMask)
 {
-    for (PBYTE value = pBuffer; *lpMask; ++lpPattern, ++lpMask, ++value)
+    for (PBYTE value = (PBYTE)pBuffer; *lpMask; ++lpPattern, ++lpMask, ++value)
     {
         if (*lpMask == 'x' && *(LPCBYTE)lpPattern != *value)
             return FALSE;
@@ -810,3 +819,7 @@ inline PVOID FindPattern(PVOID pBase, SIZE_T dwSize, LPCSTR lpPattern, LPCSTR lp
     return NULL;
 }
 #endif
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/ep_setup/ep_setup.c b/ep_setup/ep_setup.c
@@ -673,7 +673,7 @@ int WINAPI wWinMain(
                 }
                 else
                 {
-                    BeginExplorerRestart();
+                    BeginExplorerRestart(NULL);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1619,7 +1619,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)`
`1619`	`1619`	`}`
`1620`	`1620`	`else`
`1621`	`1621`	`{`
`1622`		`- BeginExplorerRestart();`
	`1622`	`+ BeginExplorerRestart(NULL);`
`1623`	`1623`	`}`
`1624`	`1624`	`}`
`1625`	`1625`	`Sleep(100);`
Original file line number	Diff line number	Diff line change
`@@ -11001,16 +11001,16 @@ BOOL FixStartMenuAnimation(LPMODULEINFO mi)`
`11001`	`11001`	`}`
`11002`	`11002`
`11003`	`11003`	`DWORD dwOldProtect = 0;`
`11004`		`- if (VirtualProtect(match7a + 11, 3, PAGE_EXECUTE_READWRITE, &dwOldProtect))`
	`11004`	`+ if (VirtualProtect(match7a + 11, 1, PAGE_EXECUTE_READWRITE, &dwOldProtect))`
`11005`	`11005`	`{`
`11006`	`11006`	`match7a[0] = 0xEB;`
`11007`		`- VirtualProtect(match7a + 11, 3, dwOldProtect, &dwOldProtect);`
	`11007`	`+ VirtualProtect(match7a + 11, 1, dwOldProtect, &dwOldProtect);`
`11008`	`11008`
`11009`	`11009`	`dwOldProtect = 0;`
`11010`		`- if (VirtualProtect(match7b + 11, 3, PAGE_EXECUTE_READWRITE, &dwOldProtect))`
	`11010`	`+ if (VirtualProtect(match7b + 11, 1, PAGE_EXECUTE_READWRITE, &dwOldProtect))`
`11011`	`11011`	`{`
`11012`	`11012`	`match7b[0] = 0xEB;`
`11013`		`- VirtualProtect(match7b + 11, 3, dwOldProtect, &dwOldProtect);`
	`11013`	`+ VirtualProtect(match7b + 11, 1, dwOldProtect, &dwOldProtect);`
`11014`	`11014`	`}`
`11015`	`11015`	`}`
`11016`	`11016`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ LRESULT CALLBACK BalloonWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara`
`163`	`163`	`return 0;`
`164`	`164`	`}`
`165`	`165`
`166`		`-__declspec(dllexport) CALLBACK ZZTestBalloon(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
	`166`	`+__declspec(dllexport) int CALLBACK ZZTestBalloon(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
`167`	`167`	`{`
`168`	`168`	`TCHAR* lpwszCmdLine = calloc((strlen(lpszCmdLine) + 1), sizeof(TCHAR));`
`169`	`169`	`if (!lpwszCmdLine) exit(0);`
`@@ -199,6 +199,8 @@ __declspec(dllexport) CALLBACK ZZTestBalloon(HWND hWnd, HINSTANCE hInstance, LPS`
`199`	`199`	`TranslateMessage(&msg);`
`200`	`200`	`DispatchMessage(&msg);`
`201`	`201`	`}`
	`202`	`+`
	`203`	`+ return 0;`
`202`	`204`	`}`
`203`	`205`
`204`	`206`	`const wchar_t TestToastXML[] =`
`@@ -212,7 +214,7 @@ L" </binding>\r\n"`
`212`	`214`	`L" </visual>\r\n"`
`213`	`215`	`L" <audio src=\"ms-winsoundevent:Notification.Default\" loop=\"false\" silent=\"false\"/>\r\n"`
`214`	`216`	`L"</toast>\r\n";`
`215`		`-__declspec(dllexport) CALLBACK ZZTestToast(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
	`217`	`+__declspec(dllexport) int CALLBACK ZZTestToast(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
`216`	`218`	`{`
`217`	`219`	`TCHAR* lpwszCmdLine = calloc((strlen(lpszCmdLine) + 1), sizeof(TCHAR));`
`218`	`220`	`if (!lpwszCmdLine) exit(0);`
`@@ -252,9 +254,10 @@ __declspec(dllexport) CALLBACK ZZTestToast(HWND hWnd, HINSTANCE hInstance, LPSTR`
`252`	`254`	`free(buffer);`
`253`	`255`	`}`
`254`	`256`	`free(lpwszCmdLine);`
	`257`	`+ return 0;`
`255`	`258`	`}`
`256`	`259`
`257`		`-__declspec(dllexport) CALLBACK ZZLaunchExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
	`260`	`+__declspec(dllexport) int CALLBACK ZZLaunchExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
`258`	`261`	`{`
`259`	`262`	`Sleep(100);`
`260`	`263`	`TCHAR wszExplorerPath[MAX_PATH + 1];`
`@@ -283,18 +286,21 @@ __declspec(dllexport) CALLBACK ZZLaunchExplorer(HWND hWnd, HINSTANCE hInstance,`
`283`	`286`	`),`
`284`	`287`	`0`
`285`	`288`	`);`
	`289`	`+ return 0;`
`286`	`290`	`}`
`287`	`291`
`288`		`-__declspec(dllexport) CALLBACK ZZLaunchExplorerDelayed(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
	`292`	`+__declspec(dllexport) int CALLBACK ZZLaunchExplorerDelayed(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
`289`	`293`	`{`
`290`	`294`	`Sleep(2000);`
`291`	`295`	`ZZLaunchExplorer(hWnd, hInstance, lpszCmdLine, nCmdShow);`
	`296`	`+ return 0;`
`292`	`297`	`}`
`293`	`298`
`294`		`-__declspec(dllexport) CALLBACK ZZRestartExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
	`299`	`+__declspec(dllexport) int CALLBACK ZZRestartExplorer(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, int nCmdShow)`
`295`	`300`	`{`
`296`		`- BeginExplorerRestart();`
	`301`	`+ BeginExplorerRestart(NULL);`
`297`	`302`	`FinishExplorerRestart();`
	`303`	`+ return 0;`
`298`	`304`	`}`
`299`	`305`
`300`	`306`	`void* ReadFromFile(wchar_t* wszFileName, DWORD* dwSize)`
Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ int WINAPI wWinMain(`
`673`	`673`	`}`
`674`	`674`	`else`
`675`	`675`	`{`
`676`		`- BeginExplorerRestart();`
	`676`	`+ BeginExplorerRestart(NULL);`
`677`	`677`	`}`
`678`	`678`	`}`
`679`	`679`	`}`