Improve Wine tab/caption sizing and add diagnostic logging

Add Wine-only logging for tab bar, caption, and layout geometry to help
diagnose tiny UI under Wine. Log wine: true/false and monitor DPI at
startup.

Use GetDpiForMonitor via DynGetDpiForMonitor (shcore.dll) so MSVC builds
with WINVER=0x0601 compile. Apply GDK_SCALE/QT_SCALE_FACTOR/ELM_SCALE as
a Wine DPI override when Linux desktop scaling is not reflected in Win32
DPI APIs.

Author: kjk

src/SumatraPDF.cpp

@@ -1604,6 +1604,13 @@ static void ReplaceDocumentInCurrentTab(LoadArgs* args, DocController* ctrl, Fil
         }
         if (args->showWin) {
             ShowWindow(win->hwndFrame, showType);
+            if (IsRunningOnWine()) {
+                Rect wr = WindowRect(win->hwndFrame);
+                Rect cr = ClientRect(win->hwndFrame);
+                logf("LoadDocument: showWin windowRect=(%d,%d,%d,%d) clientRect=(%d,%d,%d,%d) captionRect=(%d,%d,%d,%d)\n",
+                     wr.x, wr.y, wr.dx, wr.dy, cr.x, cr.y, cr.dx, cr.dy, win->captionRect.x, win->captionRect.y,
+                     win->captionRect.dx, win->captionRect.dy);
+            }
         }
 
 #if 0
@@ -2007,6 +2014,14 @@ void ShowMainWindow(MainWindow* win, int windowState) {
     UpdateToolbarFindText(win);
     HwndEnsureVisible(win->hwndFrame);
 
+    if (IsRunningOnWine()) {
+        Rect wr = WindowRect(win->hwndFrame);
+        Rect cr = ClientRect(win->hwndFrame);
+        logf("ShowMainWindow: windowRect=(%d,%d,%d,%d) clientRect=(%d,%d,%d,%d) captionRect=(%d,%d,%d,%d)\n", wr.x,
+             wr.y, wr.dx, wr.dy, cr.x, cr.y, cr.dx, cr.dy, win->captionRect.x, win->captionRect.y, win->captionRect.dx,
+             win->captionRect.dy);
+    }
+
     if (gWindows.Size() == 1 && (true || IsDebuggerPresent())) {
         HwndToForeground(win->hwndFrame);
     }
@@ -4410,13 +4425,22 @@ static void RelayoutFrame(MainWindow* win, bool updateToolbars, int sidebarDx) {
                 captionHeight = menuBarDy + (hasFileTabs ? tabHeight : 0);
             }
             win->captionRect = {rc.x, rc.y, rc.dx, captionHeight};
+            if (IsRunningOnWine()) {
+                logf("RelayoutFrame: tabsInTitlebar tabHeight=%d captionHeight=%d captionRect=(%d,%d,%d,%d) "
+                     "showingMenuBar=%d\n",
+                     tabHeight, captionHeight, win->captionRect.x, win->captionRect.y, win->captionRect.dx,
+                     win->captionRect.dy, (int)showingMenuBar);
+            }
             if (updateToolbars) {
                 RelayoutCaption(win);
             }
             rc.y += captionHeight;
             rc.dy -= captionHeight;
         } else if (win->tabsVisible) {
             int tabHeight = GetTabbarHeight(win->hwndFrame);
+            if (IsRunningOnWine()) {
+                logf("RelayoutFrame: tabsVisible tabHeight=%d\n", tabHeight);
+            }
             if (updateToolbars) {
                 int tabX = MapChildXForRtlParent(win->hwndFrame, rc.x, rc.dx);
                 dh.SetWindowPos(win->tabsCtrl->hwnd, nullptr, tabX, rc.y, rc.dx, tabHeight, SWP_NOZORDER);
@@ -8049,6 +8073,10 @@ void RelayoutCaption(MainWindow* win) {
     bool showingMenuBar = IsShowingMenuBarRebar(win);
     int tabHeight = GetTabbarHeight(win->hwndFrame);
     bool isRtl = IsUIRtl();
+    if (IsRunningOnWine()) {
+        logf("RelayoutCaption: captionRect=(%d,%d,%d,%d) tabHeight=%d showingMenuBar=%d maximized=%d\n", rc.x, rc.y,
+             rc.dx, rc.dy, tabHeight, (int)showingMenuBar, (int)maximized);
+    }
 
     if (showingMenuBar) {
         // Two-row layout:
@@ -8249,6 +8277,9 @@ void RelayoutCaption(MainWindow* win) {
         int tabBarX = MapChildXForRtlParent(win->hwndFrame, tabsX, tabsDx);
         dh.SetWindowPos(win->tabsCtrl->hwnd, nullptr, tabBarX, tabY, tabsDx, tabDy, SWP_NOZORDER);
         dh.End();
+        if (IsRunningOnWine()) {
+            logf("RelayoutCaption: singleRow btnDy=%d tabY=%d tabDy=%d tabsDx=%d\n", btnDy, tabY, tabDy, tabsDx);
+        }
     }
 
     UpdateTabWidth(win);
@@ -8510,6 +8541,10 @@ static LRESULT CustomCaptionFrameProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
 
         case WM_NCCALCSIZE: {
             RECT* r = wp == TRUE ? &((NCCALCSIZE_PARAMS*)lp)->rgrc[0] : (RECT*)lp;
+            if (IsRunningOnWine()) {
+                logf("WM_NCCALCSIZE: before=(%ld,%ld,%ld,%ld) zoomed=%d\n", r->left, r->top, r->right, r->bottom,
+                     (int)IsZoomed(hwnd));
+            }
             bool isFullScreen = win->isFullScreen || win->presentation;
             if (IsZoomed(hwnd) && !isFullScreen) {
                 int frameX = GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER);
@@ -8524,6 +8559,11 @@ static LRESULT CustomCaptionFrameProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
                 // during resize (returning 0 makes DWM clear the surface)
                 r->top += 1;
             }
+            if (IsRunningOnWine()) {
+                logf("WM_NCCALCSIZE: after=(%ld,%ld,%ld,%ld) clientDy=%ld cyFrame=%d cyCaption=%d\n", r->left, r->top,
+                     r->right, r->bottom, r->bottom - r->top, GetSystemMetrics(SM_CYFRAME),
+                     GetSystemMetrics(SM_CYCAPTION));
+            }
             *callDef = false;
             return 0;
         }

src/SumatraStartup.cpp

@@ -1211,6 +1211,52 @@ static bool IsNoAdminToAdmin(HWND hPrevWnd) {
     return false;
 }
 
+static int WineDpiFromEnv() {
+    static const char* scaleVars[] = {"GDK_SCALE", "QT_SCALE_FACTOR", "ELM_SCALE"};
+    int bestDpi = 0;
+    for (const char* var : scaleVars) {
+        const char* val = getenv(var);
+        if (!val || !*val) {
+            continue;
+        }
+        float scale = (float)atof(val);
+        if (scale < 1.f) {
+            continue;
+        }
+        int dpi = (int)(96.f * scale + 0.5f);
+        if (dpi > bestDpi) {
+            bestDpi = dpi;
+        }
+    }
+    return bestDpi;
+}
+
+static void LogWineDpiInfo() {
+    if (!IsRunningOnWine()) {
+        return;
+    }
+    HDC screenDC = GetDC(nullptr);
+    int screenDpi = screenDC ? GetDeviceCaps(screenDC, LOGPIXELSX) : 0;
+    if (screenDC) {
+        ReleaseDC(nullptr, screenDC);
+    }
+    uint monitorDpiX = 0, monitorDpiY = 0;
+    HMONITOR mon = MonitorFromWindow(nullptr, MONITOR_DEFAULTTOPRIMARY);
+    HRESULT hr = E_FAIL;
+    if (mon && DynGetDpiForMonitor) {
+        hr = DynGetDpiForMonitor(mon, 0, &monitorDpiX, &monitorDpiY);
+    }
+    int envDpi = WineDpiFromEnv();
+    if (envDpi > 0) {
+        DpiSetWineOverride(envDpi);
+    }
+    logf("WineDpi: screenDpi=%d monitorDpi=(%u,%u) GetDpiForMonitor hr=0x%lx envDpi=%d overrideDpi=%d "
+         "SM_CYCAPTION=%d SM_CYFRAME=%d SM_CXPADDEDBORDER=%d screen=(%d,%d)\n",
+         screenDpi, monitorDpiX, monitorDpiY, (unsigned long)hr, envDpi, DpiGet(HWND_DESKTOP),
+         GetSystemMetrics(SM_CYCAPTION), GetSystemMetrics(SM_CYFRAME), GetSystemMetrics(SM_CXPADDEDBORDER),
+         GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
+}
+
 #if 0
 static void LogDpiAwareness() {
     if (!DynGetThreadDpiAwarenessContext) {
@@ -1604,6 +1650,8 @@ int APIENTRY WinMain(_In_ HINSTANCE /*hInstance*/, _In_opt_ HINSTANCE, _In_ LPST
         // TODO: only if AttachConsole() succeeds?
         gLogToConsole = true;
     }
+    logf("wine: %s\n", IsRunningOnWine() ? "true" : "false");
+    LogWineDpiInfo();
 
     Flags flags;
     if (ExeHasNameOfStoreInstaller()) {
@@ -1670,6 +1718,7 @@ int APIENTRY WinMain(_In_ HINSTANCE /*hInstance*/, _In_opt_ HINSTANCE, _In_ LPST
         if (logFilePath) {
             StartLogToFile(logFilePath, true);
             LogCommandLine();
+            logf("wine: %s\n", IsRunningOnWine() ? "true" : "false");
         }
         // gRedrawLog = true;
     }

src/Tabs.cpp

@@ -70,7 +70,15 @@ int GetTabbarHeight(HWND hwnd, float factor) {
     if (tabDy < minDy) {
         tabDy = minDy;
     }
-    return (int)((float)tabDy * factor);
+    int res = (int)((float)tabDy * factor);
+    if (IsRunningOnWine()) {
+        int dpi = DpiGet(hwnd);
+        int desktopDpi = DpiGet(HWND_DESKTOP);
+        logf("GetTabbarHeight: hwnd=%p factor=%g dpi=%d desktopDpi=%d tabDyScaled=%d fontDy=%d "
+             "minDy=%d result=%d\n",
+             hwnd, factor, dpi, desktopDpi, DpiScale(hwnd, kTabBarDy), fontDyWithPadding, minDy, res);
+    }
+    return res;
 }
 
 #if 0

src/Toolbar.cpp

@@ -1366,9 +1366,17 @@ int GetMenuBarRebarHeight(MainWindow* win) {
     // RB_GETBARHEIGHT underreports by 1px without WS_BORDER
     int dy = (int)SendMessageW(win->hwndMenuReBar, RB_GETBARHEIGHT, 0, 0) + 1;
     if (dy > 1) {
+        if (IsRunningOnWine()) {
+            logf("GetMenuBarRebarHeight: rebar=%p RB_GETBARHEIGHT=%d\n", win->hwndMenuReBar, dy);
+        }
         return dy;
     }
-    return MenuBarToolbarIdealDy(win);
+    int ideal = MenuBarToolbarIdealDy(win);
+    if (IsRunningOnWine()) {
+        logf("GetMenuBarRebarHeight: rebar=%p RB_GETBARHEIGHT=%d fallbackIdeal=%d\n", win->hwndMenuReBar, dy,
+             ideal);
+    }
+    return ideal;
 }
 
 // --- Menu bar as rebar control (used when tabs are in titlebar) ---

src/utils/Dpi.cpp

@@ -20,36 +20,46 @@ Per-Monitor DPI Aware:
  (as indicated by the WM_DPICHANGED window message).
 */
 
-#include <shellscalingapi.h>
+constexpr int kMdtEffectiveDpi = 0;
+
+static int gWineDpiOverride = 0;
+
+void DpiSetWineOverride(int dpi) {
+    gWineDpiOverride = dpi;
+}
+
+static int DpiApplyWineOverride(int dpi) {
+    if (gWineDpiOverride > dpi) {
+        return gWineDpiOverride;
+    }
+    return dpi;
+}
 
 // get uncached dpi
 int DpiGetForHwnd(HWND hwnd) {
     // GetDpiForWindow() returns defult 96 DPI for desktop window
     // (most likely desktop has DPI_AWARENESS set to UNAWARE)
-    if (!hwnd || (hwnd == HWND_DESKTOP) || (hwnd == GetDesktopWindow())) {
-        goto GetGlobalDpi;
-    }
-
-    if (DynGetDpiForWindow) {
-        uint dpi = DynGetDpiForWindow(hwnd);
-        // returns 0 for HWND_DESKTOP
-        if (dpi >= 72) {
-            return (int)dpi;
+    if (hwnd && hwnd != HWND_DESKTOP && hwnd != GetDesktopWindow()) {
+        if (DynGetDpiForWindow) {
+            uint dpiWin = DynGetDpiForWindow(hwnd);
+            // returns 0 for HWND_DESKTOP
+            if (dpiWin >= 72) {
+                return DpiApplyWineOverride((int)dpiWin);
+            }
         }
-    }
 
-#if 0
-    // TODO: only available in 8.1
-    uint dpiX = 96, dpiY = 96;
-    HMONITOR h = MonitorFromWindow(hwnd, 0);
-    if (h != nullptr) {
-        HRESULT hr = GetDpiForMonitor(h, MDT_EFFECTIVE_DPI, &dpiX, &dpiY);
-        if (hr == S_OK) {
-            return (int)dpiX;
+        if (DynGetDpiForMonitor) {
+            uint dpiX = 96, dpiY = 96;
+            HMONITOR h = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+            if (h != nullptr) {
+                HRESULT hr = DynGetDpiForMonitor(h, kMdtEffectiveDpi, &dpiX, &dpiY);
+                if (hr == S_OK && dpiX >= 72) {
+                    return DpiApplyWineOverride((int)dpiX);
+                }
+            }
         }
     }
-#endif
-GetGlobalDpi:
+
     ScopedGetDC dc(hwnd);
     int dpi = GetDeviceCaps(dc, LOGPIXELSX);
     if (dpi < 72) {
@@ -65,7 +75,7 @@ int DpiGetForHwnd(HWND hwnd) {
     if (dpi < 72) {
         dpi = 96;
     }
-    return dpi;
+    return DpiApplyWineOverride(dpi);
 }
 
 int DpiGet(HWND hwnd) {

src/utils/Dpi.h

@@ -3,6 +3,7 @@
 
 int DpiGetForHwnd(HWND);
 int DpiGet(HWND);
+void DpiSetWineOverride(int dpi);
 int DpiScale(HWND, int);
 void DpiScale(HWND, int&, int&);
 

src/utils/WinDynCalls.cpp

@@ -25,6 +25,7 @@ Sig_GetDpiForWindow DynGetDpiForWindow = nullptr;
 Sig_GetThreadDpiAwarenessContext DynGetThreadDpiAwarenessContext = nullptr;
 Sig_GetAwarenessFromDpiAwarenessContext DynGetAwarenessFromDpiAwarenessContext = nullptr;
 Sig_SetThreadDpiAwarenessContext DynSetThreadDpiAwarenessContext = nullptr;
+Sig_GetDpiForMonitor DynGetDpiForMonitor = nullptr;
 
 #define API_LOAD(name) Dyn##name = (Sig_##name)GetProcAddress(h, #name);
 
@@ -65,6 +66,11 @@ void InitDynCalls() {
     DynSetThreadDpiAwarenessContext =
         (Sig_SetThreadDpiAwarenessContext)GetProcAddress(h, "SetThreadDpiAwarenessContext");
 
+    h = SafeLoadLibrary("shcore.dll");
+    if (h) {
+        DynGetDpiForMonitor = (Sig_GetDpiForMonitor)GetProcAddress(h, "GetDpiForMonitor");
+    }
+
     h = SafeLoadLibrary("uxtheme.dll");
     if (h) {
         UXTHEME_API_LIST(API_LOAD);

src/utils/WinDynCalls.h

@@ -100,6 +100,10 @@ extern Sig_GetThreadDpiAwarenessContext DynGetThreadDpiAwarenessContext;
 extern Sig_GetAwarenessFromDpiAwarenessContext DynGetAwarenessFromDpiAwarenessContext;
 extern Sig_SetThreadDpiAwarenessContext DynSetThreadDpiAwarenessContext;
 
+// shcore.dll
+typedef HRESULT(WINAPI* Sig_GetDpiForMonitor)(HMONITOR, int, UINT*, UINT*);
+extern Sig_GetDpiForMonitor DynGetDpiForMonitor;
+
 // uxtheme.dll
 #define UXTHEME_API_LIST(V)                  \
     V(IsAppThemed)                           \

src/wingui/TabsCtrl.cpp

@@ -84,7 +84,10 @@ void TabsCtrl::LayoutTabs() {
         dx = std::min(tabDefaultDx, maxDx);
     }
     tabSize = {dx, dy};
-    // logfa("TabsCtrl::Layout size: (%d, %d), tab size: (%d, %d)\n", rect.dx, rect.dy, tabSize.dx, tabSize.dy);
+    if (IsRunningOnWine()) {
+        logf("TabsCtrl::LayoutTabs: hwnd=%p client=(%d,%d) tabSize=(%d,%d) nTabs=%d\n", hwnd, rect.dx, rect.dy,
+             tabSize.dx, tabSize.dy, nTabs);
+    }
 
     int closeDy = DpiScale(hwnd, 16);
     int closeDx = closeDy;
@@ -112,6 +115,10 @@ void TabsCtrl::LayoutTabs() {
             ti->rCloseHit = {xEnd - closeDx - 2 * closePad, 0, closeDx + 2 * closePad, dy};
         }
         ti->titleSize = HwndMeasureText(hwnd, ti->text, hfont);
+        if (IsRunningOnWine() && i == 0) {
+            logf("TabsCtrl::LayoutTabs: titleSize=(%d,%d) fontDyPx=%d\n", ti->titleSize.dx, ti->titleSize.dy,
+                 FontDyPx(hwnd, hfont));
+        }
         int y = (dy - ti->titleSize.dy) / 2;
         // logfa("  ti->titleSize.dy: %d\n", ti->titleSize.dy);
         if (y < 0) {