[ros-diffs] [jimtabor] 41735: - wine sync dde.c and dde_private.h to 1.1.24.
jimtabor at svn.reactos.org
jimtabor at svn.reactos.org
Thu Jul 2 07:07:14 CEST 2009
Author: jimtabor
Date: Thu Jul 2 09:07:12 2009
New Revision: 41735
URL: http://svn.reactos.org/svn/reactos?rev=41735&view=rev
Log:
- wine sync dde.c and dde_private.h to 1.1.24.
Modified:
trunk/reactos/dll/win32/user32/include/dde_private.h
trunk/reactos/dll/win32/user32/misc/dde.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/user32/include/dde_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/dde_private.h?rev=41735&r1=41734&r2=41735&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] Thu Jul 2 09:07:12 2009
@@ -157,7 +157,6 @@
BOOL monitor; /* have these two as full Booleans cos they'll be tested frequently */
BOOL clientOnly; /* bit wasteful of space but it will be faster */
BOOL unicode; /* Flag to indicate Win32 API used to initialise */
- BOOL win16; /* flag to indicate Win16 API used to initialize */
HSZNode* nodeList; /* for cleaning upon exit */
PFNCALLBACK callback;
DWORD CBFflags;
@@ -191,9 +190,6 @@
extern HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInst, UINT uType, UINT uFmt, HCONV hConv,
HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
ULONG_PTR dwData1, ULONG_PTR dwData2);
-extern HDDEDATA WDML_InvokeCallback16(PFNCALLBACK pfn, UINT uType, UINT uFmt, HCONV hConv,
- HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
- DWORD dwData1, DWORD dwData2);
extern WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic);
extern void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic);
extern WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic);
@@ -203,7 +199,7 @@
HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, LPDWORD pdwResult) DECLSPEC_HIDDEN;
/* called both in DdeClientTransaction and server side. */
extern UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback,
- DWORD afCmd, DWORD ulRes, BOOL bUnicode, BOOL b16);
+ DWORD afCmd, DWORD ulRes, BOOL bUnicode);
extern WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side,
HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer);
extern void WDML_RemoveConv(WDML_CONV* pConv, WDML_SIDE side);
Modified: trunk/reactos/dll/win32/user32/misc/dde.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.c?rev=41735&r1=41734&r2=41735&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Thu Jul 2 09:07:12 2009
@@ -329,7 +329,7 @@
*
*/
UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback,
- DWORD afCmd, DWORD ulRes, BOOL bUnicode, BOOL b16)
+ DWORD afCmd, DWORD ulRes, BOOL bUnicode)
{
WDML_INSTANCE* pInstance;
WDML_INSTANCE* reference_inst;
@@ -365,7 +365,6 @@
pInstance->threadID = GetCurrentThreadId();
pInstance->callback = *pfnCallback;
pInstance->unicode = bUnicode;
- pInstance->win16 = b16;
pInstance->nodeList = NULL; /* node will be added later */
pInstance->monitorFlags = afCmd & MF_MASK;
pInstance->wStatus = 0;
@@ -579,7 +578,7 @@
UINT WINAPI DdeInitializeA(LPDWORD pidInst, PFNCALLBACK pfnCallback,
DWORD afCmd, DWORD ulRes)
{
- return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, FALSE, FALSE);
+ return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, FALSE);
}
/******************************************************************************
@@ -599,7 +598,7 @@
UINT WINAPI DdeInitializeW(LPDWORD pidInst, PFNCALLBACK pfnCallback,
DWORD afCmd, DWORD ulRes)
{
- return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, TRUE, FALSE);
+ return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, TRUE);
}
/*****************************************************************
@@ -716,12 +715,10 @@
if (pInstance == NULL)
return NULL;
- TRACE("invoking CB%d[%p] (%x %x %p %p %p %p %lx %lx)\n",
- pInstance->win16 ? 16 : 32, pInstance->callback, uType, uFmt,
+ TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n",
+ pInstance->callback, uType, uFmt,
hConv, hsz1, hsz2, hdata, dwData1, dwData2);
-
ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2);
-
TRACE("done => %p\n", ret);
return ret;
}
@@ -1629,7 +1626,7 @@
*/
WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic)
{
- static const WCHAR fmtW[] = {'%','s','(','0','x','%','0','8','l','x',')',0};
+ static const WCHAR fmtW[] = {'%','s','(','0','x','%','*','x',')',0};
WDML_SERVER* pServer;
WCHAR buf1[256];
WCHAR buf2[256];
Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=41735&r1=41734&r2=41735&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Jul 2 09:07:12 2009
@@ -231,7 +231,9 @@
reactos/dll/win32/user32/controls/scrollbar.c # Forked
reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_22
- reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.17 (dde_misc.c)
+ reactos/dll/win32/user32/include/dde_private.h # Synced to wine 1.1.24
+
+ reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.24 (dde_misc.c)
reactos/dll/win32/user32/misc/ddeclient.c # Synced to Wine-1_1_23
reactos/dll/win32/user32/misc/ddeserver.c # Synced to Wine-1_1_23
reactos/dll/win32/user32/misc/exticon.c # Synced to Wine-1_1_22
More information about the Ros-diffs
mailing list