wine-commits October 2006

wine-commits@winehq.org

3 participants
1032 discussions

Paul Vriens : crypt32: More tests for CryptSIPLoad.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: f99efa38351dddb52b2f1d99be33fb75ac8d42c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99efa38351dddb52b2f1d99b… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Oct 4 12:15:35 2006 +0200 crypt32: More tests for CryptSIPLoad. --- dlls/crypt32/tests/sip.c | 97 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 80 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 866951f..faff684 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -261,7 +261,10 @@ static void test_SIPLoad(void) BOOL ret; GUID subject; static GUID dummySubject = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; - static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ + static GUID unknown2 = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ + /* The next SIP is available on Windows (not on a clean Wine install) */ + static GUID unknown3 = { 0x000C10F1, 0x0000, 0x0000, { 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 }}; /* MSISIP.DLL */ SIP_DISPATCH_INFO sdi; HMODULE hCrypt; @@ -293,6 +296,18 @@ static void test_SIPLoad(void) "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); + hCrypt = LoadLibraryA("crypt32.dll"); + if (hCrypt) + { + funcCryptSIPGetSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPGetSignedDataMsg"); + funcCryptSIPPutSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPPutSignedDataMsg"); + funcCryptSIPCreateIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPCreateIndirectData"); + funcCryptSIPVerifyIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPVerifyIndirectData"); + funcCryptSIPRemoveSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPRemoveSignedDataMsg"); + } + /* We're not going to use the functions, so we can free already here */ + FreeLibrary(hCrypt); + /* All OK */ SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); @@ -304,7 +319,8 @@ static void test_SIPLoad(void) ok ( ret, "Expected CryptSIPLoad to succeed\n"); /* This error will always be there as native searches for the function DllCanUnloadNow * in WINTRUST.DLL (in this case). This function is not available in WINTRUST.DLL. - * For now there's no need to implement this is Wine. + * For now there's no need to implement this is Wine as I doubt any program will rely on + * this last error when the call succeeded. */ ok ( GetLastError() == ERROR_PROC_NOT_FOUND, "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError()); @@ -316,27 +332,70 @@ static void test_SIPLoad(void) * calling crypt32 functions which in it's turn call the equivalent in the SIP * as dictated by the given GUID. */ - hCrypt = LoadLibrary("crypt32.dll"); - if (hCrypt) + if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && + funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) + todo_wine + ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg && + sdi.pfPut == funcCryptSIPPutSignedDataMsg && + sdi.pfCreate == funcCryptSIPCreateIndirectData && + sdi.pfVerify == funcCryptSIPVerifyIndirectData && + sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg, + "Expected function addresses to be from crypt32\n"); + else + trace("Couldn't load function pointers\n"); + + /* All OK, but different GUID (same SIP though) */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; + ret = CryptSIPLoad(&unknown2, 0, &sdi); + todo_wine { - funcCryptSIPGetSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPGetSignedDataMsg"); - funcCryptSIPPutSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPPutSignedDataMsg"); - funcCryptSIPCreateIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPCreateIndirectData"); - funcCryptSIPVerifyIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPVerifyIndirectData"); - funcCryptSIPRemoveSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPRemoveSignedDataMsg"); - if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && - funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) - todo_wine + ok ( ret, "Expected CryptSIPLoad to succeed\n"); + /* This call on it's own would have resulted in a ERROR_PROC_NOT_FOUND, but the previous + * call to CryptSIPLoad already loaded wintrust.dll. As this information is cached, + * CryptSIPLoad will not try to search for the already mentioned DllCanUnloadNow. + */ + } + ok ( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); + todo_wine + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); + + /* All OK, but other SIP */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; + ret = CryptSIPLoad(&unknown3, 0, &sdi); + if (ret) + { + /* The SIP is known so we can safely assume that the next tests can be done */ + + /* As msisip.dll is not checked yet by any of the previous calls, the + * function DllCanUnloadNow will be checked again in msisip.dll (it's not present) + */ + todo_wine + { + ok ( GetLastError() == ERROR_PROC_NOT_FOUND, + "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError()); + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); + + /* This is another SIP but this test proves the function addresses are the same as + * in the previous test. + */ + if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && + funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg && sdi.pfPut == funcCryptSIPPutSignedDataMsg && sdi.pfCreate == funcCryptSIPCreateIndirectData && sdi.pfVerify == funcCryptSIPVerifyIndirectData && sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg, "Expected function addresses to be from crypt32\n"); - else - trace("Couldn't load function pointers\n"); - - FreeLibrary(hCrypt); + else + trace("Couldn't load function pointers\n"); + } } /* Reserved parameter not 0 */ @@ -355,6 +414,10 @@ static void test_SIPLoad(void) START_TEST(sip) { test_AddRemoveProvider(); - test_SIPRetrieveSubjectGUID(); + /* It seems that the caching for loaded dlls is shared between CryptSIPRetrieveSubjectGUID + * and CryptSIPLoad. The tests have to be in this order to succeed. This is because in the last + * test for CryptSIPRetrieveSubjectGUID, several SIPs will be loaded (on Windows). + */ test_SIPLoad(); + test_SIPRetrieveSubjectGUID(); }

1 0

Michael Stefaniuc : infosoft: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 05a4f7e9e36b97577fe37369619666498b2b79e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a4f7e9e36b97577fe373696… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 4 11:50:42 2006 +0200 infosoft: Win64 printf format warning fixes. --- dlls/infosoft/Makefile.in | 2 +- dlls/infosoft/wordbreaker.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index 1034e39..206545b 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = infosoft.dll IMPORTS = ole32 advapi32 kernel32 ntdll EXTRALIBS = -luuid -EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT +EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ infosoft_main.c \ diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index d2fa5b6..f656653 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -82,7 +82,7 @@ static ULONG WINAPI wb_Release(IWordBrea static HRESULT WINAPI wb_Init( IWordBreaker *iface, BOOL fQuery, ULONG ulMaxTokenSize, BOOL *pfLicense ) { - TRACE("%d %lu\n", fQuery, ulMaxTokenSize); + TRACE("%d %u\n", fQuery, ulMaxTokenSize); *pfLicense = FALSE; return S_OK; } @@ -156,7 +156,7 @@ static HRESULT WINAPI wb_ComposePhrase( const WCHAR *pwcModifier, ULONG cwcModifier, ULONG ulAttachmentType, WCHAR *pwcPhrase, ULONG *pcwcPhrase) { - FIXME("%p %lu %p %lu %lu %p %p\n", pwcNoun, cwcNoun, + FIXME("%p %u %p %u %u %p %p\n", pwcNoun, cwcNoun, pwcModifier, cwcModifier, ulAttachmentType, pwcPhrase, pcwcPhrase); return S_OK; }

1 0

Michael Stefaniuc : ifsmgr.vxd: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 5e8c71669a6f414cf0f25ce56865097282304a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e8c71669a6f414cf0f25ce56… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 4 11:50:32 2006 +0200 ifsmgr.vxd: Win64 printf format warning fixes. --- dlls/ifsmgr.vxd/Makefile.in | 1 - dlls/ifsmgr.vxd/ifsmgr.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ifsmgr.vxd/Makefile.in b/dlls/ifsmgr.vxd/Makefile.in index c0ae7d2..9a2a914 100644 --- a/dlls/ifsmgr.vxd/Makefile.in +++ b/dlls/ifsmgr.vxd/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ifsmgr.vxd IMPORTS = winedos kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ ifsmgr.c diff --git a/dlls/ifsmgr.vxd/ifsmgr.c b/dlls/ifsmgr.vxd/ifsmgr.c index 181c5cc..3086039 100644 --- a/dlls/ifsmgr.vxd/ifsmgr.c +++ b/dlls/ifsmgr.vxd/ifsmgr.c @@ -107,7 +107,7 @@ BOOL WINAPI IFSMGR_DeviceIoControl(DWORD LPDWORD lpcbBytesReturned, LPOVERLAPPED lpOverlapped) { - TRACE("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", + TRACE("(%d,%p,%d,%p,%d,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer, lpcbBytesReturned, lpOverlapped); @@ -146,7 +146,7 @@ BOOL WINAPI IFSMGR_DeviceIoControl(DWORD FIXME( "Control 'IFS_IOCTL_GET_NETPRO_NAME_A' not implemented\n"); return FALSE; default: - FIXME( "Control %ld not implemented\n", dwIoControlCode); + FIXME( "Control %d not implemented\n", dwIoControlCode); return FALSE; } }

1 0

Michael Stefaniuc : comcat: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 276d0900a8f834b267b218abc7b3728b1a1cf26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=276d0900a8f834b267b218abc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 4 11:50:15 2006 +0200 comcat: Win64 printf format warning fixes. --- dlls/comcat/Makefile.in | 1 - dlls/comcat/information.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index cbc1296..2eeee63 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = comcat.dll IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ comcat_main.c \ diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c index 90d14ec..1cc6e35 100644 --- a/dlls/comcat/information.c +++ b/dlls/comcat/information.c @@ -120,7 +120,7 @@ static HRESULT WINAPI COMCAT_ICatInforma HKEY key; HRESULT res; - TRACE("\n\tCATID:\t%s\n\tLCID:\t%lX\n",debugstr_guid(rcatid), lcid); + TRACE("\n\tCATID:\t%s\n\tLCID:\t%X\n",debugstr_guid(rcatid), lcid); if (rcatid == NULL || ppszDesc == NULL) return E_INVALIDARG; @@ -203,10 +203,10 @@ static HRESULT WINAPI COMCAT_ICatInforma if (WINE_TRACE_ON(ole)) { ULONG count; - TRACE("\n\tCLSID:\t%s\n\tImplemented %lu\n",debugstr_guid(rclsid),cImplemented); + TRACE("\n\tCLSID:\t%s\n\tImplemented %u\n",debugstr_guid(rclsid),cImplemented); for (count = 0; count < cImplemented; ++count) TRACE("\t\t%s\n",debugstr_guid(&rgcatidImpl[count])); - TRACE("\tRequired %lu\n",cRequired); + TRACE("\tRequired %u\n",cRequired); for (count = 0; count < cRequired; ++count) TRACE("\t\t%s\n",debugstr_guid(&rgcatidReq[count])); }

1 0

Michael Stefaniuc : activeds: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: e71c802c3fef8b6c45b208e6ad0cdc1f03918bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71c802c3fef8b6c45b208e6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 4 11:50:01 2006 +0200 activeds: Win64 printf format warning fixes. --- dlls/activeds/Makefile.in | 1 - dlls/activeds/activeds_main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index 4efa658..de1de42 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = activeds.dll IMPORTLIB = libactiveds.$(IMPLIBEXT) IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = activeds_main.c diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 0234029..ba829d1 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(activeds); */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); switch(fdwReason) { @@ -83,7 +83,7 @@ HRESULT WINAPI ADsBuildEnumerator(IADsCo */ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VARIANT* pvar, ULONG * pcElementsFetched) { - FIXME("(%p)->(%lu, %p, %p)!stub\n",pEnumVariant, cElements, pvar, pcElementsFetched); + FIXME("(%p)->(%u, %p, %p)!stub\n",pEnumVariant, cElements, pvar, pcElementsFetched); return E_NOTIMPL; } @@ -92,7 +92,7 @@ HRESULT WINAPI ADsEnumerateNext(IEnumVAR */ HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject) { - FIXME("(%s,%s,%lu,%p,%p)!stub\n", debugstr_w(lpszPathName), + FIXME("(%s,%s,%u,%p,%p)!stub\n", debugstr_w(lpszPathName), debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject); return E_NOTIMPL; }

1 0

Mikołaj Zalewski : regedit: Update Polish translation.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 2d01734e6c3f95bd0ba6fad255c3efa5dbc0bb3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d01734e6c3f95bd0ba6fad25… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 4 11:43:03 2006 +0200 regedit: Update Polish translation. --- programs/regedit/Pl.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Pl.rc b/programs/regedit/Pl.rc index c623337..e8f8379 100644 --- a/programs/regedit/Pl.rc +++ b/programs/regedit/Pl.rc @@ -139,6 +139,17 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Eksportuj registr", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + AUTORADIOBUTTON "&Ca�y rejestr", IDC_EXPORT_ALL, 12, 15, 244, 12 + AUTORADIOBUTTON "&Wybran� ga��:", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 +END + IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Wyszukaj w rejestrze"

1 0

Hans Leidekker : mscms: Restore the preprocessor hack.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: eeb206c615cd580a1773640f29c7143b21636e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb206c615cd580a1773640f2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Oct 4 11:19:38 2006 +0200 mscms: Restore the preprocessor hack. --- dlls/mscms/mscms_priv.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index 201b497..74ceb95 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -52,6 +52,18 @@ #else #include <lcms.h> #endif +/* Funny thing is lcms.h defines DWORD as an 'unsigned long' whereas Wine + * defines it as an 'unsigned int'. To avoid compiler warnings we use a + * preprocessor define for DWORD and LPDWORD to get back Wine's orginal + * (typedef) definitions. + */ + +#undef DWORD +#undef LPDWORD + +#define DWORD DWORD +#define LPDWORD LPDWORD + extern DWORD MSCMS_hprofile2access( HPROFILE ); extern HPROFILE MSCMS_handle2hprofile( HANDLE file ); extern HPROFILE MSCMS_cmsprofile2hprofile( cmsHPROFILE cmsprofile );

1 0

Alexandre Julliard : server: Pass the data for message callbacks as vararg from the client side.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 3ad9798263e817d001a3fc8a866ac8b0e0b7e855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad9798263e817d001a3fc8a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 20:25:42 2006 +0200 server: Pass the data for message callbacks as vararg from the client side. --- dlls/user/message.c | 17 +++++++------ include/wine/server_protocol.h | 6 +--- server/protocol.def | 4 +-- server/queue.c | 54 +++++++++++++--------------------------- server/trace.c | 4 +-- 5 files changed, 32 insertions(+), 53 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 0b4da22..ccef67b 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -2169,6 +2169,7 @@ static void wait_message_reply( UINT fla static BOOL put_message_in_queue( const struct send_message_info *info, size_t *reply_size ) { struct packed_message data; + message_data_t msg_data; unsigned int res; int i, timeout = 0; @@ -2191,6 +2192,15 @@ static BOOL put_message_in_queue( const return FALSE; } } + else if (info->type == MSG_CALLBACK) + { + msg_data.callback.callback = info->callback; + msg_data.callback.data = info->data; + msg_data.callback.result = 0; + data.data[0] = &msg_data; + data.size[0] = sizeof(msg_data.callback); + data.count = 1; + } else if (info->type == MSG_POSTED && info->msg >= WM_DDE_FIRST && info->msg <= WM_DDE_LAST) { return post_dde_message( &data, info ); @@ -2207,12 +2217,6 @@ static BOOL put_message_in_queue( const req->lparam = info->lparam; req->timeout = timeout; - if (info->type == MSG_CALLBACK) - { - req->callback = info->callback; - req->info = info->data; - } - if (info->flags & SMTO_ABORTIFHUNG) req->flags |= SEND_MSG_ABORT_IF_HUNG; for (i = 0; i < data.count; i++) wine_server_add_data( req, data.data[i], data.size[i] ); if ((res = wine_server_call( req ))) @@ -2569,7 +2573,6 @@ BOOL WINAPI SendMessageCallbackW( HWND h call_sendmsg_callback( callback, hwnd, msg, data, result ); return TRUE; } - FIXME( "callback will not be called\n" ); return send_inter_thread_message( &info, &result ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 29aa6b3..1b7a920 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2224,10 +2224,8 @@ struct send_message_request unsigned int msg; unsigned long wparam; unsigned long lparam; - unsigned long info; int timeout; - void* callback; - /* VARARG(data,bytes); */ + /* VARARG(data,message_data); */ }; struct send_message_reply { @@ -4428,6 +4426,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 249 +#define SERVER_PROTOCOL_VERSION 250 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 6358efe..caddcc2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1596,10 +1596,8 @@ #define SNAP_MODULE 0x00000008 unsigned int msg; /* message code */ unsigned long wparam; /* parameters */ unsigned long lparam; /* parameters */ - unsigned long info; /* extra info */ int timeout; /* timeout for reply */ - void* callback; /* callback address */ - VARARG(data,bytes); /* message data for sent messages */ + VARARG(data,message_data); /* message data for sent messages */ @END @REQ(post_quit_message) diff --git a/server/queue.c b/server/queue.c index 64c29fd..37cc250 100644 --- a/server/queue.c +++ b/server/queue.c @@ -180,6 +180,7 @@ static const struct object_ops thread_in static struct thread_input *foreground_input; static unsigned int last_input_time; +static void free_message( struct message *msg ); /* set the caret window in a given thread input */ static void set_caret_window( struct thread_input *input, user_handle_t win ) @@ -404,11 +405,7 @@ static void free_result( struct message_ { if (result->timeout) remove_timeout_user( result->timeout ); if (result->data) free( result->data ); - if (result->callback_msg) - { - free( result->callback_msg->data ); - free( result->callback_msg ); - } + if (result->callback_msg) free_message( result->callback_msg ); free( result ); } @@ -522,8 +519,7 @@ static void result_timeout( void *privat /* allocate and fill a message result structure */ static struct message_result *alloc_message_result( struct msg_queue *send_queue, struct msg_queue *recv_queue, - struct message *msg, int timeout, - void *callback, unsigned long callback_data ) + struct message *msg, int timeout ) { struct message_result *result = mem_alloc( sizeof(*result) ); if (result) @@ -538,7 +534,6 @@ static struct message_result *alloc_mess if (msg->type == MSG_CALLBACK) { - struct callback_msg_data *data; struct message *callback_msg = mem_alloc( sizeof(*callback_msg) ); if (!callback_msg) @@ -546,12 +541,6 @@ static struct message_result *alloc_mess free( result ); return NULL; } - if (!(data = mem_alloc( sizeof(*data )))) - { - free( callback_msg ); - free( result ); - return NULL; - } callback_msg->type = MSG_CALLBACK_RESULT; callback_msg->win = msg->win; callback_msg->msg = msg->msg; @@ -562,10 +551,11 @@ static struct message_result *alloc_mess callback_msg->y = 0; callback_msg->info = 0; callback_msg->result = NULL; - callback_msg->data = data; - callback_msg->data_size = sizeof(*data); - data->callback = callback; - data->data = callback_data; + /* steal the data from the original message */ + callback_msg->data = msg->data; + callback_msg->data_size = msg->data_size; + msg->data = NULL; + msg->data_size = 0; result->callback_msg = callback_msg; list_add_head( &send_queue->callback_result, &result->sender_entry ); @@ -1600,26 +1590,25 @@ DECL_HANDLER(send_message) msg->time = get_tick_count(); msg->x = 0; msg->y = 0; - msg->info = req->info; + msg->info = 0; msg->result = NULL; msg->data = NULL; - msg->data_size = 0; + msg->data_size = get_req_data_size(); + + if (msg->data_size && !(msg->data = memdup( get_req_data(), msg->data_size ))) + { + free( msg ); + release_object( thread ); + return; + } switch(msg->type) { case MSG_OTHER_PROCESS: - msg->data_size = get_req_data_size(); - if (msg->data_size && !(msg->data = memdup( get_req_data(), msg->data_size ))) - { - free( msg ); - break; - } - /* fall through */ case MSG_ASCII: case MSG_UNICODE: case MSG_CALLBACK: - if (!(msg->result = alloc_message_result( send_queue, recv_queue, msg, - req->timeout, req->callback, req->info ))) + if (!(msg->result = alloc_message_result( send_queue, recv_queue, msg, req->timeout ))) { free_message( msg ); break; @@ -1630,13 +1619,6 @@ DECL_HANDLER(send_message) set_queue_bits( recv_queue, QS_SENDMESSAGE ); break; case MSG_POSTED: - /* needed for posted DDE messages */ - msg->data_size = get_req_data_size(); - if (msg->data_size && !(msg->data = memdup( get_req_data(), msg->data_size ))) - { - free( msg ); - break; - } list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry ); set_queue_bits( recv_queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); break; diff --git a/server/trace.c b/server/trace.c index 03c6a3f..1ca9b61 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2098,11 +2098,9 @@ static void dump_send_message_request( c fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " wparam=%lx,", req->wparam ); fprintf( stderr, " lparam=%lx,", req->lparam ); - fprintf( stderr, " info=%lx,", req->info ); fprintf( stderr, " timeout=%d,", req->timeout ); - fprintf( stderr, " callback=%p,", req->callback ); fprintf( stderr, " data=" ); - dump_varargs_bytes( cur_size ); + dump_varargs_message_data( cur_size ); } static void dump_post_quit_message_request( const struct post_quit_message_request *req )

1 0

Alexandre Julliard : server: Return the data for callback results in the varargs part of the get_message request .
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 29a3ce9f3a455bec5d2d9cba7c709e08a53aa3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a3ce9f3a455bec5d2d9cba7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 16:29:45 2006 +0200 server: Return the data for callback results in the varargs part of the get_message request. --- dlls/user/message.c | 8 ++++++-- include/wine/server_protocol.h | 11 ++++++++++- server/protocol.def | 15 ++++++++++++--- server/queue.c | 27 +++++++++++++++++++++------ 4 files changed, 49 insertions(+), 12 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 7ed5b6e..0b4da22 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -1989,8 +1989,12 @@ static BOOL peek_message( MSG *msg, HWND info.flags = ISMEX_CALLBACK; break; case MSG_CALLBACK_RESULT: - call_sendmsg_callback( (SENDASYNCPROC)info.msg.wParam, info.msg.hwnd, - info.msg.message, extra_info, info.msg.lParam ); + if (size >= sizeof(struct callback_msg_data)) + { + const struct callback_msg_data *data = (const struct callback_msg_data *)buffer; + call_sendmsg_callback( data->callback, info.msg.hwnd, + info.msg.message, data->data, data->result ); + } goto next; case MSG_WINEVENT: if (size >= sizeof(struct winevent_msg_data)) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3c902e9..29aa6b3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -157,6 +157,14 @@ typedef struct } rectangle_t; + +struct callback_msg_data +{ + void *callback; + unsigned long data; + unsigned long result; +}; + struct winevent_msg_data { user_handle_t hook; @@ -168,6 +176,7 @@ struct winevent_msg_data typedef union { unsigned char bytes[1]; + struct callback_msg_data callback; struct winevent_msg_data winevent; } message_data_t; @@ -4419,6 +4428,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 248 +#define SERVER_PROTOCOL_VERSION 249 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 02a95c0..6358efe 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -173,6 +173,14 @@ typedef struct } rectangle_t; /* structures for extra message data */ + +struct callback_msg_data +{ + void *callback; /* callback function */ + unsigned long data; /* user data for callback */ + unsigned long result; /* message result */ +}; + struct winevent_msg_data { user_handle_t hook; /* hook handle */ @@ -184,6 +192,7 @@ struct winevent_msg_data typedef union { unsigned char bytes[1]; /* raw data for sent messages */ + struct callback_msg_data callback; struct winevent_msg_data winevent; } message_data_t; @@ -1637,9 +1646,9 @@ #define SEND_MSG_ABORT_IF_HUNG 0x01 int type; /* message type */ user_handle_t win; /* window handle */ unsigned int msg; /* message code */ - unsigned long wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */ - unsigned long lparam; /* parameters (result for MSG_CALLBACK_RESULT) */ - unsigned long info; /* extra info (callback argument for MSG_CALLBACK_RESULT) */ + unsigned long wparam; /* parameters */ + unsigned long lparam; /* parameters */ + unsigned long info; /* extra info */ int x; /* x position */ int y; /* y position */ unsigned int time; /* message time */ diff --git a/server/queue.c b/server/queue.c index a7aa5c8..64c29fd 100644 --- a/server/queue.c +++ b/server/queue.c @@ -404,7 +404,11 @@ static void free_result( struct message_ { if (result->timeout) remove_timeout_user( result->timeout ); if (result->data) free( result->data ); - if (result->callback_msg) free( result->callback_msg ); + if (result->callback_msg) + { + free( result->callback_msg->data ); + free( result->callback_msg ); + } free( result ); } @@ -435,7 +439,8 @@ static void store_message_result( struct if (res->callback_msg) { /* queue the callback message in the sender queue */ - res->callback_msg->lparam = result; + struct callback_msg_data *data = res->callback_msg->data; + data->result = result; list_add_tail( &res->sender->msg_list[SEND_MESSAGE], &res->callback_msg->entry ); set_queue_bits( res->sender, QS_SENDMESSAGE ); res->callback_msg = NULL; @@ -533,24 +538,34 @@ static struct message_result *alloc_mess if (msg->type == MSG_CALLBACK) { + struct callback_msg_data *data; struct message *callback_msg = mem_alloc( sizeof(*callback_msg) ); + if (!callback_msg) { free( result ); return NULL; } + if (!(data = mem_alloc( sizeof(*data )))) + { + free( callback_msg ); + free( result ); + return NULL; + } callback_msg->type = MSG_CALLBACK_RESULT; callback_msg->win = msg->win; callback_msg->msg = msg->msg; - callback_msg->wparam = (unsigned long)callback; + callback_msg->wparam = 0; callback_msg->lparam = 0; callback_msg->time = get_tick_count(); callback_msg->x = 0; callback_msg->y = 0; - callback_msg->info = callback_data; + callback_msg->info = 0; callback_msg->result = NULL; - callback_msg->data = NULL; - callback_msg->data_size = 0; + callback_msg->data = data; + callback_msg->data_size = sizeof(*data); + data->callback = callback; + data->data = callback_data; result->callback_msg = callback_msg; list_add_head( &send_queue->callback_result, &result->sender_entry );

1 0

Alexandre Julliard : server: Return the data for winevent hooks in the varargs part of the get_message request .
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 59dc456822800ae286cf5a7dc336778d73f283cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=59dc456822800ae286cf5a7dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 16:04:53 2006 +0200 server: Return the data for winevent hooks in the varargs part of the get_message request. --- dlls/user/message.c | 58 ++++++++++++++++++++++------------------ include/wine/server_protocol.h | 21 ++++++++++++-- server/protocol.def | 19 +++++++++++-- server/queue.c | 29 ++++++++------------ server/trace.c | 10 +++++-- 5 files changed, 83 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59dc456822800ae286cf5…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2006