Re: wine/include ddeml.h

* Alexandre Julliard (Mon, 14 Jun 2004 11:58:02 -0500) wrote:
| 	Dmitry Timoshkov 
| 	Fix CBR_BLOCK definition.
| 
| Patch: http://cvs.winehq.org/patch.py?id=12591
| 
| Old revision  New revision  Changes     Path
|  1.29          1.30          +1 -1       wine/include/ddeml.h

This one causes a compile failure:

dde/server.c: In function `WDML_ServerHandleRequest':
dde/server.c:580: error: pointers are not permitted as case values

switch ((ULONG_PTR)hDdeData)
[...]
    case CBR_BLOCK:

The patch below fixes it by casting to an ULONG_PTR, which is what the
switch variable is casted to.

Index: dlls/user/dde/server.c
===================================================================
RCS file: /home/wine/wine/dlls/user/dde/server.c,v
retrieving revision 1.16
diff -u -w -p -r1.16 server.c
--- dlls/user/dde/server.c      26 Apr 2004 23:29:44 -0000      1.16
+++ dlls/user/dde/server.c      14 Jun 2004 19:18:52 -0000
@@ -577,7 +577,7 @@ static      WDML_QUEUE_STATE WDML_ServerHandl
        WDML_PostAck(pConv, WDML_SERVER_SIDE, 0, FALSE, FALSE, pXAct->atom,
                      pXAct->lParam, WM_DDE_REQUEST);
        break;
-    case CBR_BLOCK:
+    case (ULONG_PTR)CBR_BLOCK:
        ret = WDML_QS_BLOCK;
        break;
     default: