Generalize focus fix to all dialogs

Author: aubymori

src/OpenWithEx.vcxproj.user

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>"C:\Users\Aubrey\lol.somefake"</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>"C:\shit.fuckassbitch"</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>"C:\Users\Aubrey\lol.somefake"</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>"C:\shit.fuckassbitch"</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>"D:\0e\Pictures\Profile Pictures\zhen.jpg"</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>"C:\shit.fuckassbitch"</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerCommandArguments>"D:\0e\Pictures\Profile Pictures\zhen.jpg"</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>"C:\shit.fuckassbitch"</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup>

src/baseopenasdlg.cpp

@@ -165,22 +165,6 @@ INT_PTR CALLBACK CBaseOpenAsDlg::v_DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam,
 
 			return TRUE;
 		}
-		// For some reason, initializing through the server doesn't activate the window.
-		// Let's activate it manually when it's shown.
-		case WM_WINDOWPOSCHANGED:
-			if (((LPWINDOWPOS)lParam)->flags & SWP_SHOWWINDOW && !m_fShown)
-			{
-				m_fShown = true;
-				SetForegroundWindow(hWnd);
-				if (GetForegroundWindow() != hWnd)
-				{
-					SwitchToThisWindow(hWnd, TRUE);
-					Sleep(2);
-					SetForegroundWindow(hWnd);
-				}
-				SetActiveWindow(hWnd);
-			}
-			return TRUE;
 		case WM_CLOSE:
 			EndDialog(hWnd, IDCANCEL);
 			return TRUE;

src/baseopenasdlg.h

@@ -20,7 +20,6 @@ class CBaseOpenAsDlg : public CImpDialog
 	UINT   m_uBrowseTitleId;
 	IMMERSIVE_OPENWITH_FLAGS m_flags;
 	bool   m_fPreregistered;
-	bool   m_fShown;
 
 	INT_PTR CALLBACK v_DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 	int _FindItemIndex(LPCWSTR lpszPath);

src/impdialog.cpp

@@ -20,6 +20,24 @@ INT_PTR CALLBACK CImpDialog::s_DlgProc(
 			);
 		}
 	}
+	// For some reason, initializing through the server doesn't activate the window.
+	// Let's activate it manually when it's shown.
+	else if (uMsg == WM_WINDOWPOSCHANGED)
+	{	
+		CImpDialog *pThis = (CImpDialog *)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
+		if (pThis && ((LPWINDOWPOS)lParam)->flags & SWP_SHOWWINDOW && !pThis->m_fShown)
+		{
+			pThis->m_fShown = true;
+			SetForegroundWindow(hWnd);
+			if (GetForegroundWindow() != hWnd)
+			{
+				SwitchToThisWindow(hWnd, TRUE);
+				Sleep(2);
+				SetForegroundWindow(hWnd);
+			}
+			SetActiveWindow(hWnd);
+		}
+	}
 
 	CImpDialog *pThis = (CImpDialog *)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
 	if (pThis)

src/impdialog.h

@@ -11,6 +11,7 @@ class CImpDialog
 	HWND m_hWnd;
 	HINSTANCE m_hInst;
 	UINT m_uDlgId;
+	bool m_fShown;
 
 	virtual INT_PTR CALLBACK v_DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) = 0;