[PATCH 0/3] MR3113: comctl32/listview: Reset the value of bNoItemMetrics in LISTVIEW_DeleteAllItems().

[Zhao Yi (＠Zhaoyi)]

Reset the valuse of bNoItemMetrics to TRUE in LISTVIEW_DeleteAllItems() to Fix
"2345 picture viewer" not displaying all files.

Signed-off-by: Zhao Yi

[PATCH 1/3] comctl32/listview: Reset the value of bNoItemMetrics in LISTVIEW_DeleteAllItems().

[Zhao Yi]

From: Zhao Yi

Reset the valuse of bNoItemMetrics to TRUE in LISTVIEW_DeleteAllItems() to Fix
"2345 picture viewer" not displaying all files.

Signed-off-by: Zhao Yi 
---
 dlls/comctl32/listview.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 750e447dbef..026884372aa 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -5590,7 +5590,7 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy)
         LISTVIEW_UpdateScroll(infoPtr);
     }
     LISTVIEW_InvalidateList(infoPtr);
-    
+    infoPtr->bNoItemMetrics = TRUE;
     return TRUE;
 }

[PATCH 2/3] comctl32: Make the correct linkid from fun SYSLINK_LinkAtPt.

[Zhaoyi]

From: Zhaoyi

Add a check condition for whether the type is slLink.

Signed-off-by: Zhaoyi 
---
 dlls/comctl32/syslink.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 8130bf19641..5302b95dccb 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -1329,7 +1329,8 @@ static PDOC_ITEM SYSLINK_LinkAtPt (const SYSLINK_INFO *infoPtr, const POINT *pt,
             }
             return Current;
         }
-        id++;
+        if (Current->Type == slLink)
+            id++;
     }

return NULL;

[PATCH 3/3] Revert "comctl32: Make the correct linkid from fun SYSLINK_LinkAtPt."

[Zhao Yi]

From: Zhao Yi

This reverts commit 26b26161fd0b06b9f8c14d4c97b1df1cb0e82ea6
---
 dlls/comctl32/syslink.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 5302b95dccb..8130bf19641 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -1329,8 +1329,7 @@ static PDOC_ITEM SYSLINK_LinkAtPt (const SYSLINK_INFO *infoPtr, const POINT *pt,
             }
             return Current;
         }
-        if (Current->Type == slLink)
-            id++;
+        id++;
     }

return NULL;

[PATCH 0/3] MR3113: comctl32/listview: Reset the value of bNoItemMetrics in LISTVIEW_DeleteAllItems(). - closed

[Zhao Yi (＠Zhaoyi)]

This merge request was closed by Zhao Yi.