call remove_wndproc on child windows too (otya128#1285)

jdymss · Mar 25, 2023 · d33cd50 · d33cd50
1 parent ceb92fb
commit d33cd50
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/user/window.c b/user/window.c
@@ -119,7 +119,8 @@ BOOL CALLBACK remove_wndproc(HWND hwnd, LPARAM lparam)
 {
     if (GetExePtr(GetWindowWord16(HWND_16(hwnd), GWL_HINSTANCE)) == lparam)
     {
-        TRACE("HWND %p WNDPROC removed\n");
+        TRACE("HWND %x WNDPROC removed\n", hwnd);
+        EnumChildWindows(hwnd, remove_wndproc, lparam);
         SetWindowLongPtrA(hwnd, GWLP_WNDPROC, DefWindowProcA);
     }
     return TRUE;
@@ -132,10 +133,10 @@ BOOL CALLBACK enum_thread_window(HWND hwnd, LPARAM lparam)
     {
         if (GetWindowLongPtrA(hwnd, GWLP_WNDPROC) != DefWindowProcA)
         {
-            TRACE("HWND %p WNDPROC removed\n");
+            TRACE("HWND %x WNDPROC removed\n", hwnd);
             SetWindowLongPtrA(hwnd, GWLP_WNDPROC, DefWindowProcA);
         }
-        TRACE("HWND %p destroyed\n");
+        TRACE("HWND %x destroyed\n", hwnd);
         DestroyWindow(hwnd);
     }
     return TRUE;