March 2006 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Add WINED3DDEVTYPE to wined3d_types.h.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 6a8578f84762de8d601bb7f0ef1b6a8d31fbbdeb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a8578f84762de8d601bb7f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 30 00:16:08 2006 +0200 wined3d: Add WINED3DDEVTYPE to wined3d_types.h. --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/wined3d/directx.c | 20 ++++++++++---------- include/wine/wined3d_interface.h | 14 +++++++------- include/wine/wined3d_types.h | 19 ++++++++++++++----- 5 files changed, 33 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6a8578f84762de8d601…

1 0

Henning Gerhardt : twain: Add German resource.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: eacc0e3bf74985424d30aa9498736982a96f4251 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eacc0e3bf74985424d30aa9… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Thu Mar 30 08:58:09 2006 +0200 twain: Add German resource. --- dlls/twain/rsrc.rc | 1 + dlls/twain/twain_De.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) create mode 100644 dlls/twain/twain_De.rc diff --git a/dlls/twain/rsrc.rc b/dlls/twain/rsrc.rc index 455cac2..94e1da0 100644 --- a/dlls/twain/rsrc.rc +++ b/dlls/twain/rsrc.rc @@ -25,4 +25,5 @@ #include "resource.h" +#include "twain_De.rc" #include "twain_En.rc" diff --git a/dlls/twain/twain_De.rc b/dlls/twain/twain_De.rc new file mode 100644 index 0000000..b378c29 --- /dev/null +++ b/dlls/twain/twain_De.rc @@ -0,0 +1,40 @@ +/* + * German resources for Twain + * + * Copyright 2006 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Scanne" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "SCANNE.... Bitte warten",IDC_STATIC,53,19,85,8 +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0

Detlef Riekenberg : kernel32: Display the parameter that caused a page fault in GlobalFree().
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 464b35522b5443ac0a4f388a93e2d470a0ba3253 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=464b35522b5443ac0a4f388… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 30 10:37:52 2006 +0200 kernel32: Display the parameter that caused a page fault in GlobalFree(). --- dlls/kernel/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 1f1e479..c76f876 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -736,7 +736,7 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) } __EXCEPT_PAGE_FAULT { - ERR("page fault occurred ! Caused by bug ?\n"); + ERR("(%p): Page fault occurred ! Caused by bug ?\n", hmem); SetLastError( ERROR_INVALID_PARAMETER ); hreturned = hmem; }

1 0

Detlef Riekenberg : kernel: Fix handling of invalid parameter in GlobalFlags().
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 1a81f4ff8ae34b0321c5e89d00542d76bd68d555 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a81f4ff8ae34b0321c5e89… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 29 20:48:39 2006 +0200 kernel: Fix handling of invalid parameter in GlobalFlags(). --- dlls/kernel/heap.c | 19 ++++++++++--------- dlls/kernel/tests/heap.c | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index a5849ed..1f1e479 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -837,16 +837,16 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) * * Get information about a global memory object. * - * NOTES - * Should this return GMEM_INVALID_HANDLE on invalid handle? + * PARAMS + * hmem [I] Handle of the global memory object * * RETURNS - * Value specifying allocation flags and lock count - * GMEM_INVALID_HANDLE: Failure + * Failure: GMEM_INVALID_HANDLE, when the provided handle is invalid + * Success: Value specifying allocation flags and lock count + * */ -UINT WINAPI GlobalFlags( - HGLOBAL hmem /* [in] Handle to global memory object */ -) { +UINT WINAPI GlobalFlags(HGLOBAL hmem) +{ DWORD retval; PGLOBAL32_INTERN pintern; @@ -866,8 +866,9 @@ UINT WINAPI GlobalFlags( } else { - WARN("Invalid handle: %p\n", hmem); - retval=0; + WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); + SetLastError(ERROR_INVALID_HANDLE); + retval = GMEM_INVALID_HANDLE; } RtlUnlockHeap(GetProcessHeap()); } diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index e1a535c..fee1830 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -36,6 +36,7 @@ static SIZE_T resize_9x(SIZE_T size) START_TEST(heap) { void *mem; + UINT flags; HGLOBAL gbl; HGLOBAL hsecond; SIZE_T size; @@ -86,6 +87,12 @@ START_TEST(heap) ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); + SetLastError(MAGIC_DEAD); + flags = GlobalFlags(gbl); + ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " \ + "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); + /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0); @@ -109,13 +116,19 @@ START_TEST(heap) ok(gbl == NULL, "local realloc allocated memory\n"); /* invalid handles are catched in windows */ - gbl = LocalAlloc(GMEM_MOVEABLE, 256); + gbl = LocalAlloc(LMEM_MOVEABLE, 256); LocalFree(gbl); SetLastError(MAGIC_DEAD); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); + SetLastError(MAGIC_DEAD); + flags = LocalFlags(gbl); + ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " \ + "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); + /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0);

1 0

Detlef Riekenberg : tools: Remove wineconf.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 5ca18a11355f64739040cc81403df13fdb12b866 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ca18a11355f64739040cc8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 30 00:52:26 2006 +0200 tools: Remove wineconf. --- tools/wineconf | 492 -------------------------------------------------------- 1 files changed, 0 insertions(+), 492 deletions(-) delete mode 100755 tools/wineconf Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5ca18a11355f6473904…

1 0

Detlef Riekenberg : DEVELOPER-HINTS: Some directories are renamed / removed / added.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 3f567ce0e05f198ae19b1ff88ef22e0e71486f7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f567ce0e05f198ae19b1ff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 29 23:34:42 2006 +0200 DEVELOPER-HINTS: Some directories are renamed / removed / added. --- DEVELOPERS-HINTS | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index 0326ab9..40f6ce1 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -31,7 +31,7 @@ DLLs (under dlls/): crtdll/ - Old C runtime library crypt32/ - Cryptography cryptdll/ - Cryptography Manager - ctl3d/ - 3D Effects for Common GUI Components + ctl3d32/ - 3D Effects for Common GUI Components d3d8/ - Direct3D (3D graphics) d3d9/ - Direct3D (3D graphics) d3dim/ - Direct3D Immediate Mode @@ -67,25 +67,28 @@ DLLs (under dlls/): iccvid/ - Radius Cinepak Video Decoder icmp/ - ICMP protocol (networking) ifsmgr.vxd/ - IFSMGR VxD implementation + imaadp32.acm/ - IMA ADPCM Audio Codec imagehlp/ - PE (Portable Executable) Image Helper lib imm32/ - Input Method Manager iphlpapi/ - IP Helper API itss/ - Infotech Structured Storage (HTML Help) kernel/ - The Windows kernel - lzexpand/ - Lempel-Ziv compression/decompression + lz32/ - Lempel-Ziv compression/decompression mapi32/ - Mail interface + mciavi32/ - MCI video driver + mcicda/ - MCI audio CD driver + mciseq/ - MCI MIDI driver midimap/ - MIDI mapper mlang/ - Multi Language Support mmdevldr.vxd/ - MMDEVLDR VxD implementation monodebg.vxd/ - MONODEBG VxD implementation mpr/ - Multi-Protocol Router (networking) msacm/ - Audio Compression Manager (multimedia) - msacm/imaadp32/ - IMA ADPCM Audio Codec - msacm/msadp32/ - MS ADPCM Audio Codec - msacm/msg711/ - MS G711 Audio Codec (includes A-Law & MU-Law) - msacm/winemp3/ - Mpeg Layer 3 Audio Codec + msadp32.acm/ - MS ADPCM Audio Codec mscms/ - Color Management System msdmo/ - DirectX Media Objects + msftedit/ - Rich text editing control (Version 4.1) + msg711.acm/ - MS G711 Audio Codec (includes A-Law & MU-Law) mshtml/ - MS HTML component msi/ - Microsoft Installer msimg32/ - Gradient and transparency (graphics) @@ -96,8 +99,8 @@ DLLs (under dlls/): msvcrt20/ - C runtime library version 2.0 msvcrt40/ - C runtime library version 4.0 msvcrtd/ - C runtime library debugging + msvfw32/ - 16 bit video manager msvidc32/ - Microsoft Video-1 Decoder - msvideo/ - 16 bit video manager mswsock/ - Misc networking msxml3/ - MSXML Class Factory netapi32/ - Network interface @@ -109,22 +112,23 @@ DLLs (under dlls/): ole32/ - 32 bit OLE 2.0 libraries oleacc/ - OLE accessibility support oleaut32/ - 32 bit OLE 2.0 automation - olecli/ - 16 bit OLE client + olecli32/ - 16 bit OLE client oledlg/ - OLE 2.0 user interface support olepro32/ - 32 bit OLE 2.0 automation - olesvr/ - 16 bit OLE server + olesvr32/ - 16 bit OLE server opengl32/ - OpenGL implementation (graphics) powrprof/ - Power Management and Profiling psapi/ - Process Status interface qcap/ - DirectShow runtime quartz/ - DirectShow runtime rasapi32/ - Remote Access Server interface - riched20/ - Rich text editing control version 2.0 + riched20/ - Rich text editing control (Version 2.0 and 3.0) richedit/ - Rich text editing control rpcrt4/ - Remote Procedure Call runtime rsabase/ - RSA encryption rsaenh/ - Crypto API (DES, 3DES, RSA, etc.) secur32/ - Contains Windows Security functions + security/ - Security Support Provider Interface sensapi/ - System Event Notification Service serialui/ - Serial port property pages setupapi/ - Setup interface @@ -153,18 +157,14 @@ DLLs (under dlls/): vnetbios.vxd/ - VNETBIOS VxD implementation vtdapi.vxd/ - VTDAPI VxD implementation vwin32.vxd/ - VWIN32 VxD implementation - win32s/ - 32-bit function access for 16-bit systems - winaspi/ - 16 bit Advanced SCSI Peripheral Interface + win32skrnl/ - 32-bit function access for 16-bit systems wined3d/ - Wine internal Direct3D helper winedos/ - DOS features and BIOS calls (Wine specific) + winemp3.acm/ - Mpeg Layer 3 Audio Codec wineps/ - Postscript driver (Wine specific) wininet/ - Internet extensions winmm/ - Multimedia (16 & 32 bit) winmm/joystick/ - Joystick driver - winmm/mcianim/ - MCI animation driver - winmm/mciavi/ - MCI video driver - winmm/mcicda/ - MCI audio CD driver - winmm/mciseq/ - MCI MIDI driver winmm/mciwave/ - MCI wave driver winmm/wavemap/ - Audio mapper winmm/winealsa/ - ALSA audio driver @@ -173,13 +173,14 @@ DLLs (under dlls/): winmm/winejack/ - JACK audio server driver winmm/winenas/ - NAS audio driver winmm/wineoss/ - OSS audio driver - winnls/ - National Language Support - winsock/ - Sockets 2.0 (networking) + winnls32/ - National Language Support winspool/ - Printing & Print Spooler wintab32/ - Tablet device interface wintrust/ - Trust verification interface wldap32/ - LDAP support + wnaspi32/ - 16 bit Advanced SCSI Peripheral Interface wow32/ - WOW subsystem + ws2_32/ - Sockets 2.0 (networking) wsock32/ - Sockets 1.1 (networking) wtsapi32/ - Terminal Services x11drv/ - X11 display driver (Wine specific)

1 0

Robert Shearman : oleaut32: Add IPersist to QueryInterface.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 22e7eeb2a3366667e2a1ac9a582fa7e97a4c927b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22e7eeb2a3366667e2a1ac9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:41:24 2006 +0100 oleaut32: Add IPersist to QueryInterface. --- dlls/oleaut32/olefont.c | 2 +- dlls/oleaut32/olepicture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index a9110e7..a73ceb5 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -586,7 +586,7 @@ HRESULT WINAPI OLEFontImpl_QueryInterfac *ppvObject = (IDispatch*)&(this->lpvtblIDispatch); if (IsEqualGUID(&IID_IFontDisp, riid)) *ppvObject = (IDispatch*)&(this->lpvtblIDispatch); - if (IsEqualGUID(&IID_IPersistStream, riid)) + if (IsEqualIID(&IID_IPersist, riid) || IsEqualGUID(&IID_IPersistStream, riid)) *ppvObject = (IPersistStream*)&(this->lpvtblIPersistStream); if (IsEqualGUID(&IID_IConnectionPointContainer, riid)) *ppvObject = (IConnectionPointContainer*)&(this->lpvtblIConnectionPointContainer); diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 74c7fa0..7e2acab 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -457,7 +457,7 @@ static HRESULT WINAPI OLEPictureImpl_Que *ppvObject = (IDispatch*)&(This->lpvtblIDispatch); else if (IsEqualIID(&IID_IPictureDisp, riid)) *ppvObject = (IDispatch*)&(This->lpvtblIDispatch); - else if (IsEqualIID(&IID_IPersistStream, riid)) + else if (IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid)) *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); else if (IsEqualIID(&IID_IConnectionPointContainer, riid)) *ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer);

1 0

Robert Shearman : oleaut32: Zero out parameter in LoadRegTypeLib in case of failure.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 11c83c5d5ebf8456b2dcd74ee9ea5f283efae20a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11c83c5d5ebf8456b2dcd74… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:41:37 2006 +0100 oleaut32: Zero out parameter in LoadRegTypeLib in case of failure. --- dlls/oleaut32/typelib.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cfb17ba..61403a6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -392,7 +392,11 @@ HRESULT WINAPI LoadRegTypeLib( ITypeLib **ppTLib) { BSTR bstr=NULL; - HRESULT res=QueryPathOfRegTypeLib( rguid, wVerMajor, wVerMinor, lcid, &bstr); + HRESULT res; + + *ppTLib = NULL; + + res = QueryPathOfRegTypeLib( rguid, wVerMajor, wVerMinor, lcid, &bstr); if(SUCCEEDED(res)) {

1 0

Robert Shearman : oleaut32: Replace memcmp with IsEqualIID macro.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: aa2214626eb7e698c61bb1bc044b9e21d12f983b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa2214626eb7e698c61bb1b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:41:01 2006 +0100 oleaut32: Replace memcmp with IsEqualIID macro. Replace memcmp with IsEqualIID macro that doesn't require a size parameter and remove the unneeded brackets to give more compact and more readable code. --- dlls/oleaut32/olepicture.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 0441235..74c7fa0 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -451,30 +451,17 @@ static HRESULT WINAPI OLEPictureImpl_Que /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { - *ppvObject = (IPicture*)This; - } - else if (memcmp(&IID_IPicture, riid, sizeof(IID_IPicture)) == 0) - { + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid)) *ppvObject = (IPicture*)This; - } - else if (memcmp(&IID_IDispatch, riid, sizeof(IID_IDispatch)) == 0) - { + else if (IsEqualIID(&IID_IDispatch, riid)) *ppvObject = (IDispatch*)&(This->lpvtblIDispatch); - } - else if (memcmp(&IID_IPictureDisp, riid, sizeof(IID_IPictureDisp)) == 0) - { + else if (IsEqualIID(&IID_IPictureDisp, riid)) *ppvObject = (IDispatch*)&(This->lpvtblIDispatch); - } - else if (memcmp(&IID_IPersistStream, riid, sizeof(IID_IPersistStream)) == 0) - { - *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); - } - else if (memcmp(&IID_IConnectionPointContainer, riid, sizeof(IID_IConnectionPointContainer)) == 0) - { - *ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer); - } + else if (IsEqualIID(&IID_IPersistStream, riid)) + *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); + else if (IsEqualIID(&IID_IConnectionPointContainer, riid)) + *ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer); + /* * Check that we obtained an interface. */

1 0

Robert Shearman : ole32: Put the PeekMessage call of CoWaitForMultipleHandles into a separate function .
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: a1548b45d8c3d19fad5632f997da65e5deb4ce0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1548b45d8c3d19fad5632f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:39:03 2006 +0100 ole32: Put the PeekMessage call of CoWaitForMultipleHandles into a separate function. Put the PeekMessage call of CoWaitForMultipleHandles into a separate function so that the order and type of the messages retrieved can be customised in the future. --- dlls/ole32/compobj.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 32d7a73..9ab9478 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2643,6 +2643,11 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pPr } +static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) +{ + return PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD); +} + /*********************************************************************** * CoWaitForMultipleHandles [OLE32.@] * @@ -2704,7 +2709,7 @@ HRESULT WINAPI CoWaitForMultipleHandles( if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD)) + while (COM_PeekMessage(apt, &msg)) { /* FIXME: filter the messages here */ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message);

1 0