wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

André Hentschel : kernel32/nls: Fix German translation .
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: b67820cea6fa90ce82c060bd6f330bccadac11eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67820cea6fa90ce82c060bd6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 23 20:02:39 2009 +0100 kernel32/nls: Fix German translation. --- dlls/kernel32/nls/winerr_deu.mc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/nls/winerr_deu.mc b/dlls/kernel32/nls/winerr_deu.mc index e0d70d5..8b1d75a 100644 --- a/dlls/kernel32/nls/winerr_deu.mc +++ b/dlls/kernel32/nls/winerr_deu.mc @@ -227,7 +227,7 @@ Doppelter Netzwerkname MessageId=53 SymbolicName=ERROR_BAD_NETPATH Language=DEU -Fehlerhafter Netzpfad +Fehlerhafter Netzwerkpfad . MessageId=54 SymbolicName=ERROR_NETWORK_BUSY @@ -487,7 +487,7 @@ Ungültige Ebene MessageId=125 SymbolicName=ERROR_NO_VOLUME_LABEL Language=DEU -Keine Volumen-Bezeichnung +Keine Datenträgerbezeichnung . MessageId=126 SymbolicName=ERROR_MOD_NOT_FOUND @@ -502,12 +502,12 @@ Prozedur nicht gefunden MessageId=128 SymbolicName=ERROR_WAIT_NO_CHILDREN Language=DEU -Keine Kinder auf die gewartet werden kann +Keine Unterprogramme auf die gewartet werden kann . MessageId=129 SymbolicName=ERROR_CHILD_NOT_COMPLETE Language=DEU -Kind-Prozess ist nicht abgeschlossen +Unterprogramm ist nicht abgeschlossen . MessageId=130 SymbolicName=ERROR_DIRECT_ACCESS_HANDLE @@ -622,7 +622,7 @@ Event-Anzahl für DosMuxSemWait nicht korrekt MessageId=152 SymbolicName=ERROR_TOO_MANY_MUXWAITERS Language=DEU -Zu viele Warter für DosMuxSemWait +Zu viele Wartende für DosMuxSemWait . MessageId=153 SymbolicName=ERROR_INVALID_LIST_FORMAT @@ -632,7 +632,7 @@ DosSemMuxWait-Liste ungültig MessageId=154 SymbolicName=ERROR_LABEL_TOO_LONG Language=DEU -Volumen-Bezeichnung zu lang +Datenträgerbezeichnung zu lang . MessageId=155 SymbolicName=ERROR_TOO_MANY_TCBS @@ -687,7 +687,7 @@ Sperre fehlgeschlagen MessageId=170 SymbolicName=ERROR_BUSY Language=DEU -Resource benutzt +Resource in Benutzung . MessageId=173 SymbolicName=ERROR_CANCEL_VIOLATION @@ -1687,7 +1687,7 @@ Ungültiger Ereignisname MessageId=1212 SymbolicName=ERROR_INVALID_DOMAINNAME Language=DEU -Ungültiger Domain-Name +Ungültiger Domänenname . MessageId=1213 SymbolicName=ERROR_INVALID_SERVICENAME @@ -1702,7 +1702,7 @@ Ungültiger Netzwerkname MessageId=1215 SymbolicName=ERROR_INVALID_SHARENAME Language=DEU -Ungültiger Freigabenname +Ungültiger Freigabename . MessageId=1216 SymbolicName=ERROR_INVALID_PASSWORDNAME @@ -3492,7 +3492,7 @@ Nicht genügend Quota MessageId=1817 SymbolicName=RPC_S_NO_INTERFACES Language=DEU -Keine Interfaces +Keine Schnittstellen . MessageId=1818 SymbolicName=RPC_S_CALL_CANCELLED @@ -3527,7 +3527,7 @@ Kein RPC-Fehler MessageId=1824 SymbolicName=RPC_S_UUID_LOCAL_ONLY Language=DEU -UUID isr nur lokal +UUID ist nur lokal . MessageId=1825 SymbolicName=RPC_S_SEC_PKG_ERROR

1 0

Paul Chitescu : quartz: Only wait in IMediaEvent:: WaitForCompletion if the filter is running.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: e03b98ec68806a69e17c57e6cbe2aefee4910adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03b98ec68806a69e17c57e6c… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Dec 23 19:55:13 2009 +0200 quartz: Only wait in IMediaEvent::WaitForCompletion if the filter is running. --- dlls/quartz/filtergraph.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5377281..3e9a1da 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4899,6 +4899,9 @@ static HRESULT WINAPI MediaEvent_WaitForCompletion(IMediaEventEx *iface, TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pEvCode); + if (This->state != State_Running) + return VFW_E_WRONG_STATE; + if (WaitForSingleObject(This->hEventCompletion, msTimeout) == WAIT_OBJECT_0) { *pEvCode = This->CompletionStatus;

1 0

Jeremy White : winspool: Correctly zero printer driver buffer on failure, with tests.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: b806e13001b6908e3aa1180a8a32c55431e79f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b806e13001b6908e3aa1180a8… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Dec 23 11:21:32 2009 -0600 winspool: Correctly zero printer driver buffer on failure, with tests. --- dlls/winspool.drv/info.c | 7 ++++++- dlls/winspool.drv/tests/info.c | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a2dd798..4993a78 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4388,6 +4388,8 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment), Level,pDriverInfo,cbBuf, pcbNeeded); + if (cbBuf > 0) + ZeroMemory(pDriverInfo, cbBuf); if (!(name = get_opened_printer_name(hPrinter))) { SetLastError(ERROR_INVALID_HANDLE); @@ -4465,8 +4467,11 @@ BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, LPBYTE buf = NULL; if (cbBuf) + { + ZeroMemory(pDriverInfo, cbBuf); buf = HeapAlloc(GetProcessHeap(), 0, cbBuf); - + } + pwstrEnvW = asciitounicode(&pEnvW, pEnvironment); ret = GetPrinterDriverW(hPrinter, pwstrEnvW, Level, buf, cbBuf, pcbNeeded); diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 5ab0ccd..f3b2d78 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2414,6 +2414,14 @@ static void test_GetPrinterDriver(void) /* XP allocates memory for both ANSI and unicode names */ ok(filled >= calculated,"calculated %d != filled %d\n", calculated, filled); + + /* Obscure test - demonstrate that Windows zero fills the buffer, even on failure */ + if (di_2->pDataFile) + { + ret = GetPrinterDriver(hprn, NULL, level, buf, needed - 2, &filled); + ok(!ret, "level %d: GetPrinterDriver succeeded with less buffer than it should\n", level); + ok(di_2->pDataFile == NULL, "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); + } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Jeremy White : winspool: Test for failure using correct size.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 09401dd4b14cd7164e767d025f4d52c85a8dcaad URL: http://source.winehq.org/git/wine.git/?a=commit;h=09401dd4b14cd7164e767d025… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Dec 23 11:21:17 2009 -0600 winspool: Test for failure using correct size. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8e4d714..a2dd798 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4447,7 +4447,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, if(pcbNeeded) *pcbNeeded = size + needed; TRACE("buffer space %d required %d\n", cbBuf, size + needed); - if(cbBuf >= needed) return TRUE; + if(cbBuf >= size + needed) return TRUE; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }

1 0

Paul Chitescu : quartz: Implement NullRenderer's IBaseFilter::FindPin.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 7251e91d4da20617badd27c6b87163bfb0f749a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7251e91d4da20617badd27c6b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Dec 23 18:17:38 2009 +0200 quartz: Implement NullRenderer's IBaseFilter::FindPin. --- dlls/quartz/nullrenderer.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index f774012..d2aedfa 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; +static const WCHAR wcsAltInputPinName[] = {'I','n',0}; static const IBaseFilterVtbl NullRenderer_Vtbl; static const IUnknownVtbl IInner_VTable; @@ -472,11 +473,17 @@ static HRESULT WINAPI NullRenderer_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin); - FIXME("NullRenderer::FindPin(...)\n"); + if (!Id || !ppPin) + return E_POINTER; - /* FIXME: critical section */ - - return E_NOTIMPL; + if (!lstrcmpiW(Id,wcsInputPinName) || !lstrcmpiW(Id,wcsAltInputPinName)) + { + *ppPin = (IPin *)This->pInputPin; + IPin_AddRef(*ppPin); + return S_OK; + } + *ppPin = NULL; + return VFW_E_NOT_FOUND; } static HRESULT WINAPI NullRenderer_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo)

1 0

Alexandre Julliard : wininet: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 5ded71ff43e5c895c961b91ac52b70a40f80a6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ded71ff43e5c895c961b91ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 21:25:48 2009 +0100 wininet: Fix pointer cast warnings on 64-bit. --- dlls/wininet/netconnection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index db57e1d..0e7b62a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -318,7 +318,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) if (!endCert) ret = FALSE; if (ret) { - DWORD err = netconn_verify_cert(endCert, store, server); + DWORD_PTR err = netconn_verify_cert(endCert, store, server); if (err) { @@ -660,7 +660,7 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) if (pSSL_connect(connection->ssl_s) <= 0) { - res = (DWORD)pSSL_get_ex_data(connection->ssl_s, error_idx); + res = (DWORD_PTR)pSSL_get_ex_data(connection->ssl_s, error_idx); if (!res) res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; ERR("SSL_connect failed: %d\n", res);

1 0

Alexandre Julliard : winhttp: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 07062b03405dc6621dbf32b3f6c4e8ee306f5975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07062b03405dc6621dbf32b3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 21:25:42 2009 +0100 winhttp: Fix pointer cast warnings on 64-bit. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 3faa41c..dd8b56c 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -361,7 +361,7 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) if (!endCert) ret = FALSE; if (ret) { - DWORD err = netconn_verify_cert( endCert, store, server ); + DWORD_PTR err = netconn_verify_cert( endCert, store, server ); if (err) { @@ -641,7 +641,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) { DWORD err; - err = (DWORD)pSSL_get_ex_data( conn->ssl_conn, error_idx ); + err = (DWORD_PTR)pSSL_get_ex_data( conn->ssl_conn, error_idx ); if (!err) err = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; ERR("couldn't verify server certificate (%d)\n", err); set_last_error( err );

1 0

Alexandre Julliard : user32: Make user.exe into a stand-alone 16-bit module .
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 8aa83d326abd7822a47fcbf3045f5179abd49b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa83d326abd7822a47fcbf30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 20:01:37 2009 +0100 user32: Make user.exe into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++ configure.ac | 1 + dlls/Makefile.in | 4 - dlls/user.exe16/Makefile.in | 24 ++++ dlls/{user32/bidi16.c => user.exe16/bidi.c} | 0 dlls/{user32/comm16.c => user.exe16/comm.c} | 33 +++--- dlls/{user32/dialog16.c => user.exe16/dialog.c} | 3 +- dlls/{user32/hook16.c => user.exe16/hook.c} | 1 - dlls/{user32/msg16.c => user.exe16/message.c} | 2 - dlls/{user32 => user.exe16}/network.c | 0 dlls/{user32/user16.c => user.exe16/user.c} | 6 - .../user.exe.spec => user.exe16/user.exe16.spec} | 0 dlls/user.exe16/user_private.h | 132 ++++++++++++++++++++ .../version16.rc => user.exe16/version.rc} | 0 dlls/{user32/wnd16.c => user.exe16/window.c} | 4 +- dlls/user32/Makefile.in | 24 ---- dlls/user32/controls.h | 17 +--- dlls/user32/desktop.c | 1 + dlls/user32/edit.c | 4 +- dlls/user32/listbox.c | 1 + dlls/user32/nonclient.c | 1 + dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 22 ---- dlls/user32/win.h | 1 - 25 files changed, 193 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8aa83d326abd7822a47fc…

1 0

Alexandre Julliard : user32: Use the wait message handler for the yield in PeekMessageW too.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 4b4b6a48cb49465319f8c9838d463e34abfa5ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4b6a48cb49465319f8c9838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 12:03:45 2009 +0100 user32: Use the wait message handler for the yield in PeekMessageW too. --- dlls/user32/message.c | 8 +------- dlls/user32/winproc.c | 4 +++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 48c8068..d85eabb 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2887,13 +2887,7 @@ BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT f if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { - if (!(flags & PM_NOYIELD)) - { - DWORD count; - ReleaseThunkLock(&count); - NtYieldExecution(); - if (count) RestoreThunkLock(count); - } + if (!(flags & PM_NOYIELD)) wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); return FALSE; } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index c73a40e..396ae87 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1123,7 +1123,9 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - return USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); + DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); + if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); + return ret; } static HICON alloc_icon_handle( unsigned int size )

1 0

Alexandre Julliard : user32: Add a WoW wrapper for message waiting to allow releasing the Win16 lock in the 16-bit code .
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: b33c5f163aa3d3d86502eac769600e3c98fb57ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33c5f163aa3d3d86502eac76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 12:02:10 2009 +0100 user32: Add a WoW wrapper for message waiting to allow releasing the Win16 lock in the 16-bit code. --- dlls/user32/controls.h | 2 ++ dlls/user32/message.c | 21 ++++----------------- dlls/user32/msg16.c | 15 +++++++++++++++ dlls/user32/winproc.c | 7 +++++++ 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index e8c7bdb..f4d814b 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -96,6 +96,7 @@ struct wow_handlers16 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); @@ -114,6 +115,7 @@ struct wow_handlers32 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d6fd5af..48c8068 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2266,7 +2266,6 @@ static void wait_message_reply( UINT flags ) for (;;) { unsigned int wake_bits = 0; - DWORD dwlc, res; SERVER_START_REQ( set_queue_mask ) { @@ -2286,12 +2285,7 @@ static void wait_message_reply( UINT flags ) continue; } - /* now wait for it */ - - ReleaseThunkLock( &dwlc ); - res = USER_Driver->pMsgWaitForMultipleObjectsEx( 1, &server_queue, - INFINITE, QS_SENDMESSAGE, 0 ); - if (dwlc) RestoreThunkLock( dwlc ); + wow_handlers.wait_message( 1, &server_queue, INFINITE, QS_SENDMESSAGE, 0 ); } } @@ -2955,11 +2949,7 @@ BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) while (!peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask )) { - DWORD dwlc; - - ReleaseThunkLock( &dwlc ); - USER_Driver->pMsgWaitForMultipleObjectsEx( 1, &server_queue, INFINITE, mask, 0 ); - if (dwlc) RestoreThunkLock( dwlc ); + wow_handlers.wait_message( 1, &server_queue, INFINITE, mask, 0 ); } return (msg->message != WM_QUIT); @@ -3269,7 +3259,7 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, CONST HANDLE *pHandles, DWORD timeout, DWORD mask, DWORD flags ) { HANDLE handles[MAXIMUM_WAIT_OBJECTS]; - DWORD i, ret, lock; + DWORD i; if (count > MAXIMUM_WAIT_OBJECTS-1) { @@ -3291,10 +3281,7 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, CONST HANDLE *pHandles, for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); - ReleaseThunkLock( &lock ); - ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count+1, handles, timeout, mask, flags ); - if (lock) RestoreThunkLock( lock ); - return ret; + return wow_handlers.wait_message( count+1, handles, timeout, mask, flags ); } diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index cbaab4b..27a94c5 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2569,6 +2569,20 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, /*********************************************************************** + * wait_message16 + */ +static DWORD wait_message16( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) +{ + DWORD lock, ret; + + ReleaseThunkLock( &lock ); + ret = wow_handlers32.wait_message( count, handles, timeout, mask, flags ); + RestoreThunkLock( lock ); + return ret; +} + + +/*********************************************************************** * create_window16 */ HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, BOOL unicode ) @@ -2619,6 +2633,7 @@ void register_wow_handlers(void) mdiclient_proc16, scrollbar_proc16, static_proc16, + wait_message16, create_window16, call_window_proc_Ato16, call_dialog_proc_Ato16, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index b84abb5..c73a40e 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1121,6 +1121,11 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM return wow_handlers.static_proc( hwnd, msg, wParam, lParam, TRUE ); } +static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) +{ + return USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); +} + static HICON alloc_icon_handle( unsigned int size ) { struct user_object *obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) + size ); @@ -1167,6 +1172,7 @@ void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wo orig->mdiclient_proc = MDIClientWndProc_common; orig->scrollbar_proc = ScrollBarWndProc_common; orig->static_proc = StaticWndProc_common; + orig->wait_message = wait_message; orig->create_window = WIN_CreateWindowEx; orig->get_win_handle = WIN_GetFullHandle; orig->alloc_winproc = WINPROC_AllocProc; @@ -1185,6 +1191,7 @@ struct wow_handlers16 wow_handlers = MDIClientWndProc_common, ScrollBarWndProc_common, StaticWndProc_common, + wait_message, WIN_CreateWindowEx, NULL, /* call_window_proc */ NULL, /* call_dialog_proc */

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 December 2009