Call appropriate DefWindowProc in DDE client/server window procs

Dmitry Timoshkov dmitry at baikal.ru
Sat Apr 24 01:41:56 CDT 2004


Hello,

DDE client and server windows are either unicode or ANSI,
so they have to call appropriate DefWindowProc flavour.

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Call appropriate DefWindowProc in DDE client/server window procs
    depending on whether a window proc is unicode or ANSI.

diff -u cvs/hq/wine/dlls/user/dde/client.c wine/dlls/user/dde/client.c
--- cvs/hq/wine/dlls/user/dde/client.c	2003-11-03 15:35:36.000000000 +0800
+++ wine/dlls/user/dde/client.c	2004-04-24 15:25:21.000000000 +0900
@@ -1343,7 +1343,7 @@ static LRESULT CALLBACK WDML_ClientProc(
     }
 
     return (IsWindowUnicode(hwnd)) ?
-	DefWindowProcA(hwnd, iMsg, wParam, lParam) : DefWindowProcW(hwnd, iMsg, wParam, lParam);
+	DefWindowProcW(hwnd, iMsg, wParam, lParam) : DefWindowProcA(hwnd, iMsg, wParam, lParam);
 }
 
 /*****************************************************************
diff -u cvs/hq/wine/dlls/user/dde/server.c wine/dlls/user/dde/server.c
--- cvs/hq/wine/dlls/user/dde/server.c	2003-09-09 15:36:27.000000000 +0900
+++ wine/dlls/user/dde/server.c	2004-04-24 15:29:36.000000000 +0900
@@ -997,7 +997,8 @@ static LRESULT CALLBACK WDML_ServerConvP
     }
     if (iMsg < WM_DDE_FIRST || iMsg > WM_DDE_LAST)
     {
-	return DefWindowProcA(hwndServer, iMsg, wParam, lParam);
+        return IsWindowUnicode(hwndServer) ? DefWindowProcW(hwndServer, iMsg, wParam, lParam) :
+                                             DefWindowProcA(hwndServer, iMsg, wParam, lParam);
     }
 
     EnterCriticalSection(&WDML_CritSect);






More information about the wine-patches mailing list