December 2009 - Wine-commits

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

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

Nikolay Sivov : comctl32/comboex: Use subclass chain for internally used controls.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: ecc89bf6eff47d21a54b208fc2e7a646e06db2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc89bf6eff47d21a54b208fc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 23 22:50:26 2009 +0300 comctl32/comboex: Use subclass chain for internally used controls. --- dlls/comctl32/comboex.c | 94 ++++++++++++++++------------------------- dlls/comctl32/tests/comboex.c | 25 +++++++++++ 2 files changed, 61 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc89bf6eff47d21a54b2…

1 0

Nikolay Sivov : comctl32/comboex: Add test for internally sent Edit messages, remove corresponding comments.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 96d965f29575c8fd6e7561236bbf1dcb9901fd9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d965f29575c8fd6e7561236… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 23 22:51:54 2009 +0300 comctl32/comboex: Add test for internally sent Edit messages, remove corresponding comments. --- dlls/comctl32/comboex.c | 5 +-- dlls/comctl32/tests/comboex.c | 87 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 62178f1..d423527 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -451,10 +451,7 @@ static void COMBOEX_ReSize (const COMBOEX_INFO *infoPtr) static void COMBOEX_SetEditText (const COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) { if (!infoPtr->hwndEdit) return; - /* native issues the following messages to the {Edit} control */ - /* WM_SETTEXT (0,addr) */ - /* EM_SETSEL32 (0,0) */ - /* EM_SETSEL32 (0,-1) */ + if (item->mask & CBEIF_TEXT) { SendMessageW (infoPtr->hwndEdit, WM_SETTEXT, 0, (LPARAM)COMBOEX_GetText(infoPtr, item)); SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0); diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index a8d7f79..f732af5 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -22,6 +22,14 @@ #include <commctrl.h> #include "wine/test.h" +#include "msg.h" + +#define EDITBOX_SEQ_INDEX 0 +#define NUM_MSG_SEQUENCES 1 + +#define EDITBOX_ID 0 + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND hComboExParentWnd; static HINSTANCE hMainHinst; @@ -70,6 +78,50 @@ static LONG getItem(HWND cbex, int idx, COMBOBOXEXITEM *cbItem) { return (LONG)SendMessage(cbex, CBEM_GETITEM, 0, (LPARAM)cbItem); } +static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = EDITBOX_ID; + + if (message != WM_PAINT && + message != WM_ERASEBKGND && + message != WM_NCPAINT && + message != WM_NCHITTEST && + message != WM_GETTEXT && + message != WM_GETICON && + message != WM_DEVICECHANGE) + { + add_message(sequences, EDITBOX_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + return ret; +} + +static HWND subclass_editbox(HWND hwndComboEx) +{ + WNDPROC oldproc; + HWND hwnd; + + hwnd = (HWND)SendMessage(hwndComboEx, CBEM_GETEDITCONTROL, 0, 0); + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)editbox_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + + return hwnd; +} + static void test_comboboxex(void) { HWND myHwnd = 0; LONG res = -1; @@ -414,15 +466,50 @@ static void test_comboboxex_subclass(void) DestroyWindow(hComboEx); } +static const struct message test_setitem_edit_seq[] = { + { WM_SETTEXT, sent|id, 0, 0, EDITBOX_ID }, + { EM_SETSEL, sent|id|wparam|lparam, 0, 0, EDITBOX_ID }, + { EM_SETSEL, sent|id|wparam|lparam, 0, -1, EDITBOX_ID }, + { 0 } +}; + +static void test_get_set_item(void) +{ + char textA[] = "test"; + HWND hComboEx; + COMBOBOXEXITEMA item; + BOOL ret; + + hComboEx = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + + subclass_editbox(hComboEx); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_TEXT; + item.pszText = textA; + item.iItem = -1; + ret = SendMessage(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); + ok(ret, "CBEM_SETITEMA failed\n"); + + ok_sequence(sequences, EDITBOX_SEQ_INDEX, test_setitem_edit_seq, "set item data for edit", FALSE); + + DestroyWindow(hComboEx); +} + START_TEST(comboex) { if (!init()) return; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + test_comboboxex(); test_WM_LBUTTONDOWN(); test_CB_GETLBTEXT(); test_comboboxex_subclass(); + test_get_set_item(); cleanup(); }

1 0

Alexandre Julliard : user32: Remove the no longer used WIN_ISWIN32 flag.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 5e640271f2d36a19912a164673d6774ccccc8c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e640271f2d36a19912a16467… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 20:19:43 2009 +0100 user32: Remove the no longer used WIN_ISWIN32 flag. --- dlls/user32/controls.h | 6 +++--- dlls/user32/msg16.c | 4 ++-- dlls/user32/win.c | 10 ++++------ dlls/user32/win.h | 3 +-- dlls/user32/wnd16.c | 4 ++-- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index ae964b8..e8c7bdb 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -96,7 +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); - HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT); + 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*); HICON (*alloc_icon_handle)(UINT); @@ -114,7 +114,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); - HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT); + HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); @@ -133,7 +133,7 @@ extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE /* 16-bit support */ extern struct wow_handlers32 wow_handlers32 DECLSPEC_HIDDEN; -extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT) DECLSPEC_HIDDEN; +extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL) DECLSPEC_HIDDEN; extern void free_module_classes(HINSTANCE16) DECLSPEC_HIDDEN; extern void register_wow_handlers(void) DECLSPEC_HIDDEN; extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 698fb61..cbaab4b 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2571,13 +2571,13 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, /*********************************************************************** * create_window16 */ -HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, UINT flags ) +HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, BOOL unicode ) { /* map to module handle */ if (instance && !((ULONG_PTR)instance >> 16)) instance = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) )); - return wow_handlers32.create_window( cs, className, instance, flags ); + return wow_handlers32.create_window( cs, className, instance, unicode ); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 6ce524c..f37f8f4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1069,14 +1069,13 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) * * Implementation of CreateWindowEx(). */ -HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, UINT flags ) +HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) { INT cx, cy, style, sw = SW_SHOW; LRESULT result; RECT rect; WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; - BOOL unicode = (flags & WIN_ISUNICODE) != 0; MDICREATESTRUCTW mdi_cs; CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; @@ -1217,7 +1216,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->hIcon = 0; wndPtr->hIconSmall = 0; wndPtr->hSysMenu = 0; - wndPtr->flags |= (flags & WIN_ISWIN32); wndPtr->min_pos.x = wndPtr->min_pos.y = -1; wndPtr->max_pos.x = wndPtr->max_pos.y = -1; @@ -1465,11 +1463,11 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, WCHAR bufferW[256]; if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) return 0; - return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, WIN_ISWIN32 ); + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, FALSE ); } /* Note: we rely on the fact that CREATESTRUCTA and */ /* CREATESTRUCTW have the same layout. */ - return wow_handlers.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, WIN_ISWIN32 ); + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, FALSE ); } @@ -1497,7 +1495,7 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, cs.lpszClass = className; cs.dwExStyle = exStyle; - return wow_handlers.create_window( &cs, className, instance, WIN_ISWIN32 | WIN_ISUNICODE ); + return wow_handlers.create_window( &cs, className, instance, TRUE ); } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index f764d89..bd8381e 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -71,7 +71,6 @@ typedef struct tagWND #define WIN_NCACTIVATED 0x0004 /* last WM_NCACTIVATE was positive */ #define WIN_ISMDICLIENT 0x0008 /* Window is an MDIClient */ #define WIN_ISDIALOG 0x0010 /* Window is a dialog */ -#define WIN_ISWIN32 0x0020 /* Understands Win32 messages */ #define WIN_ISUNICODE 0x0040 /* Window is Unicode */ #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0080 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ @@ -87,7 +86,7 @@ extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPE extern BOOL WIN_GetRectangles( HWND hwnd, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN; extern LRESULT WIN_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void WIN_DestroyThreadWindows( HWND hwnd ) DECLSPEC_HIDDEN; -extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, UINT flags ) DECLSPEC_HIDDEN; +extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) DECLSPEC_HIDDEN; extern BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL ) DECLSPEC_HIDDEN; extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN; extern LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOOL unicode ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 9509bd0..7cca331 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -1892,13 +1892,13 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) return 0; - hwnd = create_window16( (CREATESTRUCTW *)&cs, bufferW, HINSTANCE_32(instance), 0 ); + hwnd = create_window16( (CREATESTRUCTW *)&cs, bufferW, HINSTANCE_32(instance), FALSE ); } else { if (!GlobalGetAtomNameA( LOWORD(className), buffer, sizeof(buffer) )) return 0; cs.lpszClass = buffer; - hwnd = create_window16( (CREATESTRUCTW *)&cs, (LPCWSTR)className, HINSTANCE_32(instance), 0 ); + hwnd = create_window16( (CREATESTRUCTW *)&cs, (LPCWSTR)className, HINSTANCE_32(instance), FALSE ); } return HWND_16( hwnd ); }

1 0

Alexandre Julliard : user32: Remove the no longer needed WIN_ISDIALOG flag.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 2ea73fd7092a87d818a51baa8b58d52879fe64b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea73fd7092a87d818a51baa8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 20:25:04 2009 +0100 user32: Remove the no longer needed WIN_ISDIALOG flag. --- dlls/user32/defdlg.c | 1 - dlls/user32/dialog.c | 4 ++-- dlls/user32/win.c | 4 ++-- dlls/user32/win.h | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index faf5026..373260a 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -342,7 +342,6 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->idResult = 0; dlgInfo->flags = 0; wndPtr->dlgInfo = dlgInfo; - wndPtr->flags |= WIN_ISDIALOG; } out: diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index bce2684..2df58a7 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1027,7 +1027,7 @@ static HWND DIALOG_FindMsgDestination( HWND hwndDlg ) pParent = WIN_GetPtr(hParent); if (!pParent || pParent == WND_OTHER_PROCESS || pParent == WND_DESKTOP) break; - if (!(pParent->flags & WIN_ISDIALOG)) + if (!pParent->dlgInfo) { WIN_ReleasePtr(pParent); break; @@ -1135,7 +1135,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) if (pWnd && pWnd != WND_OTHER_PROCESS) { - fIsDialog = (pWnd->flags & WIN_ISDIALOG) != 0; + fIsDialog = (pWnd->dlgInfo != NULL); WIN_ReleasePtr(pWnd); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f37f8f4..acf70a3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1986,7 +1986,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod retvalue = get_win_data( (char *)wndPtr->wExtra + offset, size ); /* Special case for dialog window procedure */ - if ((offset == DWLP_DLGPROC) && (size == sizeof(LONG_PTR)) && (wndPtr->flags & WIN_ISDIALOG)) + if ((offset == DWLP_DLGPROC) && (size == sizeof(LONG_PTR)) && wndPtr->dlgInfo) retvalue = (LONG_PTR)WINPROC_GetProc( (WNDPROC)retvalue, unicode ); WIN_ReleasePtr( wndPtr ); return retvalue; @@ -2115,7 +2115,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B break; case DWLP_DLGPROC: if ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && - (size == sizeof(LONG_PTR)) && (wndPtr->flags & WIN_ISDIALOG)) + (size == sizeof(LONG_PTR)) && wndPtr->dlgInfo) { WNDPROC *ptr = (WNDPROC *)((char *)wndPtr->wExtra + DWLP_DLGPROC); retval = (ULONG_PTR)WINPROC_GetProc( *ptr, unicode ); diff --git a/dlls/user32/win.h b/dlls/user32/win.h index bd8381e..58d5972 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -70,9 +70,8 @@ typedef struct tagWND #define WIN_NEED_SIZE 0x0002 /* Internal WM_SIZE is needed */ #define WIN_NCACTIVATED 0x0004 /* last WM_NCACTIVATE was positive */ #define WIN_ISMDICLIENT 0x0008 /* Window is an MDIClient */ -#define WIN_ISDIALOG 0x0010 /* Window is a dialog */ -#define WIN_ISUNICODE 0x0040 /* Window is Unicode */ -#define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0080 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ +#define WIN_ISUNICODE 0x0010 /* Window is Unicode */ +#define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN;

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

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: 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 : 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