Updated to ver. 1.9.1.0

Author: HerMajestyDrMona

Windows11DragAndDropToTaskbarFix/Windows11DragAndDropToTaskbarFix.cpp

@@ -1541,8 +1541,8 @@ static BOOL CALLBACK enumWindowCallback_SecondaryTrayWnd(HWND hWnd, LPARAM lpara
 	wstring ClassNameLower = Mona_toLowerWs(ClassName);
 	if (ClassNameLower == L"shell_secondarytraywnd") {
 		CurrentSecondaryScreen = windowsHWNDs();
-		TmpWorkerW = 0;
-		TmpTaskList = 0;
+		TmpWorkerW = NULL;
+		TmpTaskList = NULL;
 		CurrentSecondaryScreen.hWndTray = hWnd;
 		EnumChildWindows(hWnd, enumChildWindowCallback_SecondaryTrayWnd, NULL);
 		CurrentSecondaryScreen.hWndMSTaskSwWClass = TmpTaskList;
@@ -1954,9 +1954,6 @@ int APIENTRY wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpCmdLine, int nS
 
 
 					if (!DetectedHWNDsForThisMouseClick) {
-						DetectedHWNDsForThisMouseClick = true;
-
-						Array_Windows_by_Screen.clear();
 						//Primary screen variables:
 						Update_Primary_Screen_Windows_HWNDSs();
 
@@ -1965,6 +1962,7 @@ int APIENTRY wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpCmdLine, int nS
 							if (PrimaryScreen.hWndMSTaskSwWClass) {
 								if (Fix_Taskbar_Size_Bug(PrimaryScreen.hWndMSTaskSwWClass)) {
 									//Fixed. Ignore this loop to get potentially new HWND and RECTs.
+									DetectedHWNDsForThisMouseClick = false;//IMPORTANT ver. 1.9.1 to fix program crash after the sleep mode.
 									if (UseFixForBugAfterSleepMode) {
 										SleepModeFix_Previous_TimeNow = TimeNow;
 									}
@@ -1974,13 +1972,17 @@ int APIENTRY wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpCmdLine, int nS
 							}
 						}
 
+						Array_Windows_by_Screen.clear();
+						//Before version 1.9.1 this array could be empty after the sleep mode bug fix, causing program crashes.
 						Array_Windows_by_Screen.push_back(PrimaryScreen);
 						//Shell_SecondaryTrayWnd:
 						EnumWindows(enumWindowCallback_SecondaryTrayWnd, NULL);
 
 						hDesktop = GetDesktopWindow();
 						GetWindowRect(hDesktop, &desktop);
 						ShowDesktopStartPosition = desktop.right - DefaultShowDesktopButtonWidth;
+
+						DetectedHWNDsForThisMouseClick = true;//Moved from top to bottom.
 					}
 
 					//Unfortunately we can't optimize it at the moment since cursor might move with dragged file from screen-to-screen.
@@ -1991,7 +1993,7 @@ int APIENTRY wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpCmdLine, int nS
 					GetClassNameW(WindowUnderMouse, WindowClassName, MAX_PATH);
 					//std::wcout << L"Class Name Under Mouse: " << WindowClassName << L"\n";
 					if (_wcsicmp(WindowClassName, L"MSTaskListWClass") == 0) {
-						if (WindowUnderMouse != hWndMSTaskSwWClass) {
+						if (WindowUnderMouse != PrimaryScreen.hWndMSTaskSwWClass) {
 							if (PrintDebugInfo) {
 								std::wcout << L"Found Taskbar Window on Secondary Screen. Switching HWNDs to the other monitor mode. " << WindowUnderMouse << "\n";
 							}
@@ -2017,30 +2019,58 @@ int APIENTRY wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpCmdLine, int nS
 					}
 
 					//ver 1.5 continued:
-					hWndTray = Array_Windows_by_Screen[WindowsScreenSet].hWndTray;
+					//WARNING: Detected some program crashes at this location. Attempting to code it more securely.
+
+					if (Array_Windows_by_Screen[WindowsScreenSet].hWndTray) {
+						hWndTray = Array_Windows_by_Screen[WindowsScreenSet].hWndTray;
+					}
+					else {
+						hWndTray = NULL;
+					}
+
 					if (hWndTray) {
-						hWndTrayNotify = Array_Windows_by_Screen[0].hWndTrayNotify;
+						if (Array_Windows_by_Screen[0].hWndTrayNotify) {
+							hWndTrayNotify = Array_Windows_by_Screen[0].hWndTrayNotify;
+						}
+						else {
+							hWndTrayNotify = NULL;
+						}
 					}
 					else {
-						hWndTrayNotify = 0;
+						hWndTrayNotify = NULL;
 					}
 
 					if (hWndTray) {
-						hWndRebar = Array_Windows_by_Screen[0].hWndRebar;
+						if (Array_Windows_by_Screen[0].hWndRebar) {
+							hWndRebar = Array_Windows_by_Screen[0].hWndRebar;
+						}
+						else {
+							hWndRebar = NULL;
+						}
 					}
 					else {
-						hWndRebar = 0;
+						hWndRebar = NULL;
 					}
 
 					if (hWndRebar) {
-						hWndMSTaskSwWClass = Array_Windows_by_Screen[WindowsScreenSet].hWndMSTaskSwWClass;
+						if (Array_Windows_by_Screen[WindowsScreenSet].hWndMSTaskSwWClass) {
+							hWndMSTaskSwWClass = Array_Windows_by_Screen[WindowsScreenSet].hWndMSTaskSwWClass;
+						}
+						else {
+							hWndMSTaskSwWClass = NULL;
+						}
 					}
 					else {
-						hWndMSTaskSwWClass = 0;
+						hWndMSTaskSwWClass = NULL;
 					}
 
 					//Find a window that should be invisible when app has no active window!
-					TaskListThumbnailWnd = Array_Windows_by_Screen[0].TaskListThumbnailWnd;
+					if (Array_Windows_by_Screen[0].TaskListThumbnailWnd) {
+						TaskListThumbnailWnd = Array_Windows_by_Screen[0].TaskListThumbnailWnd;
+					}
+					else {
+						TaskListThumbnailWnd = NULL;
+					}
 
 					if (PrintDebugInfo) {
 						std::wcout << L"Found Taskbar Window: " << hWndMSTaskSwWClass << "\n";

Windows11DragAndDropToTaskbarFix/Windows11DragAndDropToTaskbarFix.h

@@ -66,7 +66,7 @@ int SleepTimeButtonsElevenPlusMilliseconds = 5;//Unused by default
 int AnimationLagButtonsElevenPlusMilliseconds = 100;//Unused by default
 
 //Dynamic variables:
-wstring ProgramVersion = L"1.9.0.0";
+wstring ProgramVersion = L"1.9.1.0";
 wstring GitHubConfiguration = L"https://github.com/HerMajestyDrMona/Windows11DragAndDropToTaskbarFix/blob/main/CONFIGURATION.md";
 wstring GitHubReleases = L"https://github.com/HerMajestyDrMona/Windows11DragAndDropToTaskbarFix/releases";
 wstring GitHubAbout = L"https://github.com/HerMajestyDrMona/Windows11DragAndDropToTaskbarFix";
@@ -155,14 +155,14 @@ const std::vector<std::pair<WPARAM, LPARAM>> New_WM_HOTKEY_Array_LogoWin_CTRL_Nu
 };
 bool CurrentlyLeftMouseButtonIsPressed = false;
 bool DetectedHWNDsForThisMouseClick = false;
-HWND hWndTray = 0;
-HWND hWndTrayNotify = 0;
-HWND hWndRebar = 0;
-HWND hWndMSTaskSwWClass = 0;
-HWND hWndWindowForShowDesktopArea = 0;
-HWND TaskListThumbnailWnd = 0;
+HWND hWndTray = NULL;
+HWND hWndTrayNotify = NULL;
+HWND hWndRebar = NULL;
+HWND hWndMSTaskSwWClass = NULL;
+HWND hWndWindowForShowDesktopArea = NULL;
+HWND TaskListThumbnailWnd = NULL;
 RECT desktop;
-HWND hDesktop = 0;
+HWND hDesktop = NULL;
 int ShowDesktopStartPosition = 0;
 int TaskbarWindowWidth = 0;
 int NumberOfItemsOnTaskbar = 0;
@@ -189,18 +189,18 @@ std::chrono::milliseconds AwaitingForEnterClickSince = std::chrono::milliseconds
 wchar_t WindowClassName[MAX_PATH];
 class windowsHWNDs {
 public:
-	HWND hWndTray = 0;
-	HWND hWndTrayNotify = 0;
-	HWND hWndRebar = 0;
-	HWND hWndMSTaskSwWClass = 0;
-	HWND TaskListThumbnailWnd = 0;
+	HWND hWndTray = NULL;
+	HWND hWndTrayNotify = NULL;
+	HWND hWndRebar = NULL;
+	HWND hWndMSTaskSwWClass = NULL;
+	HWND TaskListThumbnailWnd = NULL;
 
 };
 windowsHWNDs PrimaryScreen;
 windowsHWNDs CurrentSecondaryScreen;
 std::vector<windowsHWNDs> Array_Windows_by_Screen;
-HWND TmpWorkerW = 0;
-HWND TmpTaskList = 0;
+HWND TmpWorkerW = NULL;
+HWND TmpTaskList = NULL;
 int Current_Mouse_Button_Zero_Left_One_Right = -1;
 int Previous_Mouse_Button_Zero_Left_One_Right = -1;
 std::wstring Current_Button_Name = L"Unknown";

Windows11DragAndDropToTaskbarFix/Windows11DragAndDropToTaskbarFix.rc

@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,0,0
- PRODUCTVERSION 1,9,0,0
+ FILEVERSION 1,9,1,0
+ PRODUCTVERSION 1,9,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dr Mona Lisa"
             VALUE "FileDescription", "Windows 11 Drag & Drop to the Taskbar (Fix)"
-            VALUE "FileVersion", "1.9.0.0"
+            VALUE "FileVersion", "1.9.1.0"
             VALUE "InternalName", "Windows11DragAndDropToTaskbarFix.exe"
             VALUE "LegalCopyright", "(C) 2021 Copyright by Dr.MonaLisa. All Rights Reserved."
             VALUE "OriginalFilename", "Windows11DragAndDropToTaskbarFix.exe"
             VALUE "ProductName", "Windows 11 Drag & Drop to the Taskbar (Fix)"
-            VALUE "ProductVersion", "1.9.0.0"
+            VALUE "ProductVersion", "1.9.1.0"
         END
     END
     BLOCK "VarFileInfo"