Merge branch 'dev/lvengesanam/refactor_swapChain_window_changes' into 'main'

Refactor bridge code with respect to latest DXVK changes

See merge request lightspeedrtx/bridge-remix-nv!140

Author: lvengesanam

src/client/d3d9_swapchain.cpp

@@ -95,26 +95,6 @@ HRESULT Direct3DSwapChain9_LSS::reset(const D3DPRESENT_PARAMETERS &pPresentParam
 
       m_monitor = nullptr;
     }
-    if (modifyWindow && (
-      pPresentParams.BackBufferWidth != prevPresentParams.BackBufferWidth ||
-      pPresentParams.BackBufferHeight != prevPresentParams.BackBufferHeight)) {
-
-      // Adjust window position and size
-      RECT newRect = { 0, 0, 0, 0 };
-      RECT oldRect = { 0, 0, 0, 0 };
-      ::GetWindowRect(m_window, &oldRect);
-      ::MapWindowPoints(HWND_DESKTOP, ::GetParent(m_window), reinterpret_cast<POINT*>(&oldRect), 1);
-      ::SetRect(&newRect, 0, 0, pPresentParams.BackBufferWidth, pPresentParams.BackBufferHeight);
-      ::AdjustWindowRectEx(&newRect,
-        ::GetWindowLongW(m_window, GWL_STYLE), FALSE,
-        ::GetWindowLongW(m_window, GWL_EXSTYLE));
-      ::SetRect(&newRect, 0, 0, newRect.right - newRect.left, newRect.bottom - newRect.top);
-      ::OffsetRect(&newRect, oldRect.left, oldRect.top);
-      // Should use SetWindowPos rather than MoveWindow to avoid cross process deadlock
-      ::SetWindowPos(m_window, nullptr, newRect.left, newRect.top,
-          newRect.right - newRect.left, newRect.bottom - newRect.top, SWP_NOACTIVATE | SWP_NOZORDER | SWP_ASYNCWINDOWPOS);
-      Logger::info(format_string("Window's position is reset with change in backbuffer metrics. PreviousBackBufferWidth: %d, PreviousBackBufferHeight: %d, CurrentBackBufferWidth: %d, CurrentBackBufferHeight: %d", prevPresentParams.BackBufferWidth, prevPresentParams.BackBufferHeight, pPresentParams.BackBufferWidth, pPresentParams.BackBufferHeight));
-    }
   }
   else {
     if (modifyWindow) {

src/client/window.cpp

@@ -47,6 +47,7 @@ namespace {
 
 HWND g_hwnd = nullptr;
 WNDPROC g_gameWndProc = nullptr;
+bool g_bActivateProcessed = false;
 
 // reinterpret_cast wrappers
 template<typename T>
@@ -164,15 +165,17 @@ void windowMsg(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
       if (msg == WM_ACTIVATEAPP && !presParams.Windowed && !(msg == WM_NCCALCSIZE && wParam == TRUE)) {
         D3DDEVICE_CREATION_PARAMETERS create_parms = data.createParam;
         if (!(create_parms.BehaviorFlags & D3DCREATE_NOWINDOWCHANGES)) {
-          if (wParam) {
+          if (wParam && !g_bActivateProcessed) {
             RECT rect;
             GetMonitorRect(GetDefaultMonitor(), &rect);
             SetWindowPos(hWnd, HWND_TOP, rect.left, rect.top, presParams.BackBufferWidth, presParams.BackBufferHeight,
               SWP_NOACTIVATE | SWP_NOZORDER | SWP_ASYNCWINDOWPOS);
             Logger::info(format_string("Window's position is reset. Left: %d, Top: %d, Width: %d, Height: %d", rect.left, rect.top, presParams.BackBufferWidth, presParams.BackBufferHeight));
-          } else {
+            g_bActivateProcessed = true;
+          } else if (!wParam) {
             if (IsWindowVisible(hWnd))
               ShowWindowAsync(hWnd, SW_MINIMIZE);
+            g_bActivateProcessed = false;
           }
         }
       } else if (msg == WM_SIZE) {