DDEML 16bit: handle width messup (attempt #3)

[Andreas Mohr]

Hi all,

after my first already committed DDEML .spec patch, I'm now sending
the REAL, very nice fix, for the *third* time now...
(I strongly suspect WineHQ discards mails with the same message ID or so,
since I simply did an Esc-E in mutt and re-edited my old mail to contain new
content, twice - but WineHQ is probably correct in doing so after all).

HCONV and HCONVLIST are *32bit* handles. Using "word" for that kinda hurts... A LOT.
Now getting further and getting stuck in a nice Win16Mutex deadlock...
(possibly due to doing "semi-illegal" things inside a WOWCallback16Ex(), but I haven't
investigated that excessively)

Andreas Mohr
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at rhlx01.fht-esslingen.de:/home/wine
Index: dlls/user/ddeml.spec
===================================================================
RCS file: /home/wine/wine/dlls/user/ddeml.spec,v
retrieving revision 1.6
diff -u -r1.6 ddeml.spec
--- dlls/user/ddeml.spec	25 Jun 2005 18:32:36 -0000	1.6
+++ dlls/user/ddeml.spec	1 Jul 2005 17:31:19 -0000
@@ -1,14 +1,14 @@
 2 pascal -ret16 DdeInitialize(ptr segptr long long) DdeInitialize16
 3 pascal -ret16 DdeUninitialize(long) DdeUninitialize16
 4 pascal DdeConnectList(long word word word ptr) DdeConnectList16
-5 pascal DdeQueryNextServer(word word) DdeQueryNextServer16
-6 pascal -ret16 DdeDisconnectList(word) DdeDisconnectList16
+5 pascal DdeQueryNextServer(long long) DdeQueryNextServer16
+6 pascal -ret16 DdeDisconnectList(long) DdeDisconnectList16
 7 pascal DdeConnect(long long long ptr) DdeConnect16
 8 pascal -ret16 DdeDisconnect(long) DdeDisconnect16
-9 pascal -ret16 DdeQueryConvInfo (word long ptr) DdeQueryConvInfo16
-10 pascal -ret16 DdeSetUserHandle(word long long) DdeSetUserHandle16
+9 pascal -ret16 DdeQueryConvInfo (long long ptr) DdeQueryConvInfo16
+10 pascal -ret16 DdeSetUserHandle(long long long) DdeSetUserHandle16
 11 pascal DdeClientTransaction(ptr long long long s_word s_word long ptr) DdeClientTransaction16
-12 pascal -ret16 DdeAbandonTransaction(long word long) DdeAbandonTransaction16
+12 pascal -ret16 DdeAbandonTransaction(long long long) DdeAbandonTransaction16
 13 pascal -ret16 DdePostAdvise(long word word) DdePostAdvise16
 14 pascal DdeCreateDataHandle(long ptr long long word word word) DdeCreateDataHandle16
 15 pascal DdeAddData(word ptr long long) DdeAddData16
@@ -19,10 +19,10 @@
 20 pascal -ret16 DdeGetLastError(long) DdeGetLastError16
 21 pascal DdeCreateStringHandle(long str s_word) DdeCreateStringHandle16
 22 pascal -ret16 DdeFreeStringHandle(long long) DdeFreeStringHandle16
-23 pascal DdeQueryString (long word ptr long word) DdeQueryString16
+23 pascal  DdeQueryString (long word ptr long word) DdeQueryString16
 24 pascal -ret16 DdeKeepStringHandle(long long) DdeKeepStringHandle16
 
-26 pascal -ret16 DdeEnableCallback(long word word) DdeEnableCallback16
+26 pascal -ret16 DdeEnableCallback(long long word) DdeEnableCallback16
 27 pascal DdeNameService(long long long s_word) DdeNameService16
 
 36 pascal -ret16 DdeCmpStringHandles(word word) DdeCmpStringHandles16