[PATCH 0/1] MR10093: comctl32: Fix zero-sized label for empty text in LISTVIEW_GetItemMetrics.

[Maotong Zhang (＠xiaotong)]

DrawTextW(..., DT_CALCRECT)  returns a zero rectangle for empty strings, resulting in incorrect label size.

Faststone Image Viewer does not show file names.
Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=48872

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10093

[PATCH 1/1] comctl32: Fix zero-sized label for empty text in LISTVIEW_GetItemMetrics.

[Maotong Zhang]

From: Maotong Zhang <[e-mail]>

DrawTextW(..., DT_CALCRECT)  returns a zero rectangle for empty strings, resulting in incorrect label size.

Faststone Image Viewer does not show file names.
Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=48872
---
 dlls/comctl32/listview.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index f91e63f1f5b..461100ccb73 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -2499,9 +2499,15 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW
 		uFormat = oversizedBox ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS;
 	    else
 		uFormat = LV_SL_DT_FLAGS;
-	    
-    	    DrawTextW (hdc, lpLVItem->pszText, -1, &rcText, uFormat | DT_CALCRECT);
 
+	    if (!lpLVItem->pszText || lpLVItem->pszText[0] == L'\0')
+	    {
+		static WCHAR dummy[] = L" ";
+		DrawTextW(hdc, dummy, -1, &rcText, uFormat | DT_CALCRECT);
+	    }
+	    else
+		DrawTextW(hdc, lpLVItem->pszText, -1, &rcText, uFormat | DT_CALCRECT);
+ 
 	    if (rcText.right != rcText.left)
 	        labelSize.cx = min(rcText.right - rcText.left + TRAILING_LABEL_PADDING, infoPtr->nItemWidth);
 
@@ -2560,7 +2566,11 @@ calc_label:
 	    SelectBox.bottom = Box.bottom;
 
 	    if (labelSize.cx)
-	        SelectBox.right = min(Label.left + labelSize.cx, Label.right);
+	    {
+		SelectBox.right = min(Label.left + labelSize.cx, Label.right);
+		if (!lpLVItem->pszText || lpLVItem->pszText[0] == L'\0')
+		    SelectBox.right = min(Label.left + MAX_EMPTYTEXT_SELECT_WIDTH, Label.right);
+	    }
 	    else
 	        SelectBox.right = min(Label.left + MAX_EMPTYTEXT_SELECT_WIDTH, Label.right);
 	}
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10093

[Maotong Zhang (＠xiaotong)]

Fix the issue with the icon file names display.

https://gitlab.winehq.org/wine/wine/-/merge_requests/10017 Fix the issue with the icon  borders display.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10093#note_129575

[Nikolay Sivov (＠nsivov)]

Same as !10017 this needs a test.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10093#note_129611