Alexandre Julliard : comctl32: Dialog procedures should be called with CallWindowProc.

Alexandre Julliard julliard at wine.codeweavers.com
Fri May 26 13:55:10 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: ac30d46b69b05feb42aeec83e741388fd8719d88
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=ac30d46b69b05feb42aeec83e741388fd8719d88

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri May 26 16:34:09 2006 +0200

comctl32: Dialog procedures should be called with CallWindowProc.

---

 dlls/comctl32/theme_dialog.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c
index d9a0a05..cfcb56f 100644
--- a/dlls/comctl32/theme_dialog.c
+++ b/dlls/comctl32/theme_dialog.c
@@ -74,8 +74,8 @@ LRESULT CALLBACK THEMING_DialogSubclassP
 	if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam);
         {
             RECT rc;
-            DLGPROC dlgp = (DLGPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC);
-            if (!dlgp (hWnd, msg, wParam, lParam))
+            WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC);
+            if (!CallWindowProcW(dlgp, hWnd, msg, wParam, lParam))
             {
                 /* Draw background*/
                 GetClientRect (hWnd, &rc);
@@ -104,8 +104,8 @@ #endif
     case WM_CTLCOLORSTATIC:
         if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam);
         {
-            DLGPROC dlgp = (DLGPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC);
-            LRESULT result = (LRESULT)dlgp (hWnd, msg, wParam, lParam);
+            WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC);
+            LRESULT result = CallWindowProcW(dlgp, hWnd, msg, wParam, lParam);
             if (!result)
             {
                 /* Override defaults with more suitable values when themed */




More information about the wine-cvs mailing list