Fix the window class and window name to work separately.

Author: SAM1430B

WinSplitPlusApp/main.cpp

@@ -47,6 +47,7 @@ int wmain(int argc, wchar_t* argv[])
     std::wstring gameArgs;
     std::wstring baseMutexName;
     int playerNumber = 1;
+    bool changeWindowName = false;
 
     if (argc < 2) {
         print_usage();
@@ -72,10 +73,11 @@ int wmain(int argc, wchar_t* argv[])
             }
         }
         else if (lower_arg == L"-winclass") {
-            injectionInfo.injectionFlags = injectionInfo.injectionFlags | InjectionFlags::HOOK_WND_PROC;
+            injectionInfo.injectionFlags = injectionInfo.injectionFlags | InjectionFlags::HOOK_WND_PROC | InjectionFlags::HOOK_CREATE_WINDOW;
         }
         else if (lower_arg == L"-winname") {
             injectionInfo.injectionFlags = injectionInfo.injectionFlags | InjectionFlags::HOOK_CREATE_WINDOW;
+            changeWindowName = true;
         }
         else if (lower_arg == L"-mutex" && i + 1 < argc) {
             injectionInfo.injectionFlags = injectionInfo.injectionFlags | InjectionFlags::HOOK_CREATE_MUTEX;
@@ -120,7 +122,7 @@ int wmain(int argc, wchar_t* argv[])
         wcscpy_s(injectionInfo.windowClassName, CLASS_NAME_MAX_LENGTH, finalClassName.c_str());
     }
 
-    if ((injectionInfo.injectionFlags & InjectionFlags::HOOK_CREATE_WINDOW) == InjectionFlags::HOOK_CREATE_WINDOW) {
+    if (changeWindowName) {
         std::wstring finalWindowName = L"WinSplitPlus " + std::to_wstring(playerNumber);
         wcscpy_s(injectionInfo.windowName, WINDOW_NAME_MAX_LENGTH, finalWindowName.c_str());
     }
@@ -136,10 +138,6 @@ int wmain(int argc, wchar_t* argv[])
         wcscpy_s(injectionInfo.mutexNewName, MUTEX_NAME_MAX_LENGTH, finalMutexName.c_str());
     }
 
-    if (injectionInfo.windowSizeX > 0 || injectionInfo.windowSizeY > 0 || injectionInfo.windowPosX > 0 || injectionInfo.windowPosY > 0) {
-        injectionInfo.injectionFlags = injectionInfo.injectionFlags | InjectionFlags::HOOK_SET_WINDOW_POS;
-    }
-
     // Inject the DLL
     WCHAR exePath[MAX_PATH];
     GetModuleFileName(NULL, exePath, MAX_PATH);

WinSplitPlusIJ/WinSplitPlusIJ.cpp

@@ -108,17 +108,17 @@ HWND WINAPI CreateWindowExAHook(
     if (gInjectionInfo.windowClassName[0] != L'\0')
     {
         static char ansiClassName[CLASS_NAME_MAX_LENGTH];
-        size_t convertedCount;
-        wcstombs_s(&convertedCount, ansiClassName, CLASS_NAME_MAX_LENGTH, gInjectionInfo.windowClassName, CLASS_NAME_MAX_LENGTH);
+        //size_t convertedCount;
+        wcstombs_s(nullptr, ansiClassName, CLASS_NAME_MAX_LENGTH, gInjectionInfo.windowClassName, _TRUNCATE);
         finalClassName = ansiClassName;
     }
 
     LPCSTR finalWindowName = lpWindowName;
     if (gInjectionInfo.windowName[0] != L'\0')
     {
         static char ansiWindowName[WINDOW_NAME_MAX_LENGTH];
-        size_t convertedCount;
-        wcstombs_s(&convertedCount, ansiWindowName, WINDOW_NAME_MAX_LENGTH, gInjectionInfo.windowName, WINDOW_NAME_MAX_LENGTH);
+        //size_t convertedCount;
+        wcstombs_s(nullptr, ansiWindowName, WINDOW_NAME_MAX_LENGTH, gInjectionInfo.windowName, _TRUNCATE);
         finalWindowName = ansiWindowName;
     }