[PATCH 0/2] MR1875: regedit.exe redraw fixes

[Jinoh Kang (＠iamahuman)]

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

[PATCH 1/2] regedit: Use the default WM_PAINT implementation for REGEDIT window.

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 programs/regedit/childwnd.c | 14 --------------
 programs/regedit/main.c     |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c
index c243a76c807..3f1797d31a0 100644
--- a/programs/regedit/childwnd.c
+++ b/programs/regedit/childwnd.c
@@ -79,17 +79,6 @@ static void ResizeWnd(int cx, int cy)
     EndDeferWindowPos(hdwp);
 }
 
-static void OnPaint(HWND hWnd)
-{
-    PAINTSTRUCT ps;
-    RECT rt;
-
-    GetClientRect(hWnd, &rt);
-    BeginPaint(hWnd, &ps);
-    FillRect(ps.hdc, &rt, GetSysColorBrush(COLOR_BTNFACE));
-    EndPaint(hWnd, &ps);
-}
-
 static LPWSTR CombinePaths(LPCWSTR pPaths[], int nPaths) {
     int i, len, pos;
     LPWSTR combined;
@@ -455,9 +444,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
             goto def;
         }
         break;
-    case WM_PAINT:
-        OnPaint(hWnd);
-        return 0;
     case WM_SETCURSOR:
         if (LOWORD(lParam) == HTCLIENT) {
             POINT pt;
diff --git a/programs/regedit/main.c b/programs/regedit/main.c
index b1035629726..4cc00d730a7 100644
--- a/programs/regedit/main.c
+++ b/programs/regedit/main.c
@@ -75,6 +75,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
     wndclass.lpfnWndProc = ChildWndProc;
     wndclass.cbWndExtra = sizeof(HANDLE);
     wndclass.lpszClassName = szChildClass;
+    wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     RegisterClassExW(&wndclass);
 
     hMenuFrame = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_REGEDIT_MENU));
-- 
GitLab


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

[PATCH 2/2] regedit: Clip siblings when drawing list and tree views.

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 programs/regedit/listview.c | 3 ++-
 programs/regedit/treeview.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c
index 159efc0218f..c7a301929c2 100644
--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -361,7 +361,8 @@ HWND CreateListView(HWND hwndParent, UINT id)
     /* Get the dimensions of the parent window's client area, and create the list view control.  */
     GetClientRect(hwndParent, &rcClient);
     hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, L"List View",
-                            WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS,
+                            WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS |
+                            LVS_REPORT | LVS_EDITLABELS,
                             0, 0, rcClient.right, rcClient.bottom,
                             hwndParent, ULongToHandle(id), hInst, NULL);
     if (!hwndLV) return NULL;
diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c
index cd80449999a..e0cac006090 100644
--- a/programs/regedit/treeview.c
+++ b/programs/regedit/treeview.c
@@ -696,7 +696,8 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id)
     /* Get the dimensions of the parent window's client area, and create the tree view control.  */
     GetClientRect(hwndParent, &rcClient);
     hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, L"Tree View",
-                            WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS |
+                            WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS |
+                            TVS_HASLINES | TVS_HASBUTTONS |
                             TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS,
                             0, 0, rcClient.right, rcClient.bottom,
                             hwndParent, ULongToHandle(id), hInst, NULL);
-- 
GitLab

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

[PATCH 0/2] MR1875: regedit.exe redraw fixes - approved

[Hugh McMaster (＠hmc)]

This merge request was approved by Hugh McMaster.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1875

[Hugh McMaster (＠hmc)]

Thanks, Jinoh. Looks good to me.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1875#note_20126