October 2008 - Wine-Commits

Henri Verbeet : dxgi: Add some stubs for IDXGIAdapter.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 0cea969608d9c5fa54fbabaebb42831bc567100f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cea969608d9c5fa54fbabaeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 29 09:00:26 2008 +0100 dxgi: Add some stubs for IDXGIAdapter. --- dlls/dxgi/Makefile.in | 1 + dlls/dxgi/adapter.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 8 +++ 3 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 3a48994..e304884 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = dxgi IMPORTS = dxguid uuid kernel32 C_SRCS = \ + adapter.c \ device.c \ dxgi_main.c \ factory.c \ diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c new file mode 100644 index 0000000..1d6169f --- /dev/null +++ b/dlls/dxgi/adapter.c @@ -0,0 +1,145 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "dxgi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxgi); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDXGIObject) + || IsEqualGUID(riid, &IID_IDXGIAdapter)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IDXGIAdapter *iface) +{ + struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter *iface) +{ + struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* IDXGIObject methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter *iface, + REFGUID guid, const IUnknown *object) +{ + FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter *iface, REFIID riid, void **parent) +{ + FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + + return E_NOTIMPL; +} + +/* IDXGIAdapter methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IDXGIAdapter *iface, UINT output_idx, IDXGIOutput **output) +{ + FIXME("iface %p, output_idx %u, output %p stub!\n", iface, output_idx, output); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter *iface, + REFGUID guid, LARGE_INTEGER *umd_version) +{ + FIXME("iface %p, guid %s, umd_version %p stub!\n", iface, debugstr_guid(guid), umd_version); + + return E_NOTIMPL; +} + +const struct IDXGIAdapterVtbl dxgi_adapter_vtbl = +{ + /* IUnknown methods */ + dxgi_adapter_QueryInterface, + dxgi_adapter_AddRef, + dxgi_adapter_Release, + /* IDXGIObject methods */ + dxgi_adapter_SetPrivateData, + dxgi_adapter_SetPrivateDataInterface, + dxgi_adapter_GetPrivateData, + dxgi_adapter_GetParent, + /* IDXGIAdapter methods */ + dxgi_adapter_EnumOutputs, + dxgi_adapter_GetDesc, + dxgi_adapter_CheckInterfaceSupport, +}; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 110c9c0..5493ed3 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -47,4 +47,12 @@ struct dxgi_device LONG refcount; }; +/* IDXGIAdapter */ +extern const struct IDXGIAdapterVtbl dxgi_adapter_vtbl; +struct dxgi_adapter +{ + const struct IDXGIAdapterVtbl *vtbl; + LONG refcount; +}; + #endif /* __WINE_DXGI_PRIVATE_H */

1 0

Lei Zhang : comctl32: Only update comboex edit box if the mask has CBEIF_TEXT set.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 913373d2e6fb7b53b5c482748b59fa5bb5630920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=913373d2e6fb7b53b5c482748… Author: Lei Zhang <thestig(a)google.com> Date: Wed Oct 29 02:23:41 2008 -0700 comctl32: Only update comboex edit box if the mask has CBEIF_TEXT set. --- dlls/comctl32/comboex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index aa5af6e..a5dfc01 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -808,7 +808,7 @@ static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) if (TRACE_ON(comboex)) COMBOEX_DumpItem (item); /* if original request was to update edit control, do some fast foot work */ - if (cit->iItem == -1) { + if (cit->iItem == -1 && cit->mask & CBEIF_TEXT) { COMBOEX_SetEditText (infoPtr, item); RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | RDW_INVALIDATE); }

1 0

Lei Zhang : comctl32: Reset nEditLabelItem in LISTVIEW_EndEditLabelT.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 2881b171df8bcd39449e7226099ee7157a695d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2881b171df8bcd39449e72260… Author: Lei Zhang <thestig(a)google.com> Date: Wed Oct 29 01:59:14 2008 -0700 comctl32: Reset nEditLabelItem in LISTVIEW_EndEditLabelT. --- dlls/comctl32/listview.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ad48403..0c5ec3e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4833,18 +4833,20 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL { HWND hwndSelf = infoPtr->hwndSelf; NMLVDISPINFOW dispInfo; + INT editedItem = infoPtr->nEditLabelItem; BOOL bSame; TRACE("(pszText=%s, isW=%d)\n", debugtext_t(pszText, isW), isW); + infoPtr->nEditLabelItem = -1; + ZeroMemory(&dispInfo, sizeof(dispInfo)); dispInfo.item.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT; - dispInfo.item.iItem = infoPtr->nEditLabelItem; + dispInfo.item.iItem = editedItem; dispInfo.item.iSubItem = 0; dispInfo.item.stateMask = ~0; if (!LISTVIEW_GetItemW(infoPtr, &dispInfo.item)) return FALSE; - /* Don't bother continuing if text has not changed */ if (isW) bSame = (lstrcmpW(dispInfo.item.pszText, pszText) == 0); else @@ -4868,18 +4870,18 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL if (!(infoPtr->dwStyle & LVS_OWNERDATA)) { - HDPA hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nEditLabelItem); + HDPA hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, editedItem); ITEM_INFO* lpItem = DPA_GetPtr(hdpaSubItems, 0); if (lpItem && lpItem->hdr.pszText == LPSTR_TEXTCALLBACKW) { - LISTVIEW_InvalidateItem(infoPtr, infoPtr->nEditLabelItem); + LISTVIEW_InvalidateItem(infoPtr, editedItem); return TRUE; } } ZeroMemory(&dispInfo, sizeof(dispInfo)); dispInfo.item.mask = LVIF_TEXT; - dispInfo.item.iItem = infoPtr->nEditLabelItem; + dispInfo.item.iItem = editedItem; dispInfo.item.iSubItem = 0; dispInfo.item.pszText = pszText; dispInfo.item.cchTextMax = textlenT(pszText, isW); @@ -8614,7 +8616,6 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN { LVHITTESTINFO lvHitTestInfo; static BOOL bGroupSelect = TRUE; - BOOL bReceivedFocus = FALSE; POINT pt = { x, y }; INT nItem; @@ -8623,9 +8624,6 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN /* send NM_RELEASEDCAPTURE notification */ if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; - if (!infoPtr->bFocus) - bReceivedFocus = TRUE; - /* set left button down flag and record the click position */ infoPtr->bLButtonDown = TRUE; infoPtr->ptClickPos = pt; @@ -8636,7 +8634,6 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN nItem = LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); TRACE("at %s, nItem=%d\n", wine_dbgstr_point(&pt), nItem); - infoPtr->nEditLabelItem = -1; if ((nItem >= 0) && (nItem < infoPtr->nItemCount)) { if ((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && (lvHitTestInfo.flags & LVHT_ONITEMSTATEICON)) @@ -8705,9 +8702,6 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN ReleaseCapture(); } - if (bReceivedFocus) - infoPtr->nEditLabelItem = -1; - return 0; }

1 0

Lei Zhang : comctl32: Don' t notify if listview edit box contents have not changed.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 10d3ea30b766aa63ed9590a1a90ac913b9875f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d3ea30b766aa63ed9590a1a… Author: Lei Zhang <thestig(a)google.com> Date: Wed Oct 29 01:58:46 2008 -0700 comctl32: Don't notify if listview edit box contents have not changed. --- dlls/comctl32/listview.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d218a5c..ad48403 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4833,15 +4833,28 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL { HWND hwndSelf = infoPtr->hwndSelf; NMLVDISPINFOW dispInfo; + BOOL bSame; TRACE("(pszText=%s, isW=%d)\n", debugtext_t(pszText, isW), isW); ZeroMemory(&dispInfo, sizeof(dispInfo)); - dispInfo.item.mask = LVIF_PARAM | LVIF_STATE; + dispInfo.item.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT; dispInfo.item.iItem = infoPtr->nEditLabelItem; dispInfo.item.iSubItem = 0; dispInfo.item.stateMask = ~0; if (!LISTVIEW_GetItemW(infoPtr, &dispInfo.item)) return FALSE; + + /* Don't bother continuing if text has not changed */ + if (isW) + bSame = (lstrcmpW(dispInfo.item.pszText, pszText) == 0); + else + { + LPWSTR tmp = textdupTtoW(pszText, FALSE); + bSame = (lstrcmpW(dispInfo.item.pszText, tmp) == 0); + textfreeT(tmp, FALSE); + } + if (bSame) return TRUE; + /* add the text from the edit in */ dispInfo.item.mask |= LVIF_TEXT; dispInfo.item.pszText = pszText;

1 0

Lei Zhang : comctl32: Get rid of DragDetect.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 9b057494d082094162ac796cbc7f059d9b21e9ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b057494d082094162ac796cb… Author: Lei Zhang <thestig(a)google.com> Date: Wed Oct 29 01:57:54 2008 -0700 comctl32: Get rid of DragDetect. --- dlls/comctl32/listview.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 55fb848..d218a5c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3326,16 +3326,20 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (infoPtr->bLButtonDown) { - MSG msg; - BOOL skip = FALSE; - /* Check to see if we got a WM_LBUTTONUP, and skip the DragDetect. - * Otherwise, DragDetect will eat it. - */ - if (PeekMessageW(&msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_NOREMOVE)) - if (msg.message == WM_LBUTTONUP) - skip = TRUE; + POINT tmp; + RECT rect; + WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); + WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); + + rect.left = infoPtr->ptClickPos.x - wDragWidth; + rect.right = infoPtr->ptClickPos.x + wDragWidth; + rect.top = infoPtr->ptClickPos.y - wDragHeight; + rect.bottom = infoPtr->ptClickPos.y + wDragHeight; + + tmp.x = x; + tmp.y = y; - if (!skip && DragDetect(infoPtr->hwndSelf, infoPtr->ptClickPos)) + if (!PtInRect(&rect, tmp)) { LVHITTESTINFO lvHitTestInfo; NMLISTVIEW nmlv;

1 0

Alexandre Julliard : user32: Add a bunch of tests for GetQueueStatus and GetMessage combinations.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 929dcfaad5fd0d8726a82fb73ef165da5aaea344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929dcfaad5fd0d8726a82fb73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 29 12:13:57 2008 +0100 user32: Add a bunch of tests for GetQueueStatus and GetMessage combinations. --- dlls/user32/tests/msg.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4cb8d61..c30331f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9212,6 +9212,82 @@ todo_wine { ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + /* some GetMessage tests */ + + keybd_event('N', 0, 0, 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_KEY, QS_KEY), "wrong qstatus %08x\n", qstatus); + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), "wrong qstatus %08x\n", qstatus); + + ret = GetMessageA( &msg, 0, 0, 0 ); + ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', + "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(0, QS_KEY), "wrong qstatus %08x\n", qstatus); + + ret = GetMessageA( &msg, 0, 0, 0 ); + ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', + "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + + keybd_event('N', 0, 0, 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_KEY, QS_KEY), "wrong qstatus %08x\n", qstatus); + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), "wrong qstatus %08x\n", qstatus); + + ret = GetMessageA( &msg, 0, WM_KEYDOWN, WM_KEYUP ); + ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', + "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), "wrong qstatus %08x\n", qstatus); + + ret = GetMessageA( &msg, 0, WM_CHAR, WM_CHAR ); + ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', + "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + + keybd_event('N', 0, KEYEVENTF_KEYUP, 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_KEY, QS_KEY), "wrong qstatus %08x\n", qstatus); + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), "wrong qstatus %08x\n", qstatus); + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08x\n", qstatus); + + ret = GetMessageA( &msg, 0, WM_KEYDOWN, WM_KEYUP ); + ok(ret && msg.message == WM_KEYUP && msg.wParam == 'N', + "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n", + ret, msg.message, msg.wParam); + ok_sequence(WmUser, "WmUser", FALSE); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), "wrong qstatus %08x\n", qstatus); + + ret = GetMessageA( &msg, 0, WM_CHAR, WM_CHAR ); + ok(ret && msg.message == WM_CHAR && msg.wParam == 'z', + "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n", + ret, msg.message, msg.wParam); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); + done: trace("signalling to exit\n"); SetEvent(info.hevent[EV_STOP]);

1 0

Alexandre Julliard : user32: Use a local buffer in peek_message to save a server call for small buffer sizes .
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 7804129e68a0b25549b729854c15706827140b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7804129e68a0b25549b729854… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 29 12:13:51 2008 +0100 user32: Use a local buffer in peek_message to save a server call for small buffer sizes. --- dlls/user32/message.c | 95 +++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 49 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7330030..aeda7b3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2029,54 +2029,53 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags struct user_thread_info *thread_info = get_user_thread_info(); struct received_message_info info, *old_info; unsigned int hw_id = 0; /* id of previous hardware message */ + char local_buffer[256]; + void *buffer = local_buffer; + size_t buffer_size = sizeof(local_buffer); if (!first && !last) last = ~0; for (;;) { NTSTATUS res; - void *buffer = NULL; - size_t size = 0, buffer_size = 0; + size_t size = 0; - do /* loop while buffer is too small */ + SERVER_START_REQ( get_message ) { - if (buffer_size && !(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) - return FALSE; - SERVER_START_REQ( get_message ) + req->flags = flags; + req->get_win = hwnd; + req->get_first = first; + req->get_last = last; + req->hw_id = hw_id; + req->wake_mask = changed_mask & (QS_SENDMESSAGE | QS_SMRESULT); + req->changed_mask = changed_mask; + wine_server_set_reply( req, buffer, buffer_size ); + if (!(res = wine_server_call( req ))) { - req->flags = flags; - req->get_win = hwnd; - req->get_first = first; - req->get_last = last; - req->hw_id = hw_id; - req->wake_mask = changed_mask & (QS_SENDMESSAGE | QS_SMRESULT); - req->changed_mask = changed_mask; - if (buffer_size) wine_server_set_reply( req, buffer, buffer_size ); - if (!(res = wine_server_call( req ))) - { - size = wine_server_reply_size( reply ); - info.type = reply->type; - info.msg.hwnd = reply->win; - info.msg.message = reply->msg; - info.msg.wParam = reply->wparam; - info.msg.lParam = reply->lparam; - info.msg.time = reply->time; - info.msg.pt.x = reply->x; - info.msg.pt.y = reply->y; - hw_id = reply->hw_id; - extra_info = reply->info; - thread_info->active_hooks = reply->active_hooks; - } - else - { - HeapFree( GetProcessHeap(), 0, buffer ); - buffer_size = reply->total; - } + size = wine_server_reply_size( reply ); + info.type = reply->type; + info.msg.hwnd = reply->win; + info.msg.message = reply->msg; + info.msg.wParam = reply->wparam; + info.msg.lParam = reply->lparam; + info.msg.time = reply->time; + info.msg.pt.x = reply->x; + info.msg.pt.y = reply->y; + hw_id = reply->hw_id; + extra_info = reply->info; + thread_info->active_hooks = reply->active_hooks; } - SERVER_END_REQ; - } while (res == STATUS_BUFFER_OVERFLOW); + else buffer_size = reply->total; + } + SERVER_END_REQ; - if (res) return FALSE; + if (res) + { + if (buffer != local_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + if (res != STATUS_BUFFER_OVERFLOW) return FALSE; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; + continue; + } TRACE( "got type %d msg %x (%s) hwnd %p wp %lx lp %lx\n", info.type, info.msg.message, @@ -2098,16 +2097,16 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags case MSG_CALLBACK_RESULT: if (size >= sizeof(struct callback_msg_data)) { - const struct callback_msg_data *data = (const struct callback_msg_data *)buffer; + const struct callback_msg_data *data = buffer; call_sendmsg_callback( data->callback, info.msg.hwnd, info.msg.message, data->data, data->result ); } - goto next; + continue; case MSG_WINEVENT: if (size >= sizeof(struct winevent_msg_data)) { WINEVENTPROC hook_proc; - const struct winevent_msg_data *data = (const struct winevent_msg_data *)buffer; + const struct winevent_msg_data *data = buffer; hook_proc = data->hook_proc; size -= sizeof(*data); @@ -2121,7 +2120,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (!(hook_proc = get_hook_proc( hook_proc, module ))) { ERR( "invalid winevent hook module name %s\n", debugstr_w(module) ); - goto next; + continue; } } @@ -2140,7 +2139,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags data->hook, info.msg.message, info.msg.hwnd, info.msg.wParam, info.msg.lParam, data->tid, info.msg.time); } - goto next; + continue; case MSG_OTHER_PROCESS: info.flags = ISMEX_SEND; if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, @@ -2148,7 +2147,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags { /* ignore it */ reply_message( &info, 0, TRUE ); - goto next; + continue; } break; case MSG_HARDWARE: @@ -2156,7 +2155,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags hwnd, first, last, flags & PM_REMOVE )) { TRACE("dropping msg %x\n", info.msg.message ); - goto next; /* ignore it */ + continue; /* ignore it */ } thread_info->GetMessagePosVal = MAKELONG( info.msg.pt.x, info.msg.pt.y ); /* fall through */ @@ -2169,20 +2168,20 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags else peek_message( msg, info.msg.hwnd, info.msg.message, info.msg.message, flags | PM_REMOVE, changed_mask ); - goto next; + continue; } if (info.msg.message >= WM_DDE_FIRST && info.msg.message <= WM_DDE_LAST) { if (!unpack_dde_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, &info.msg.lParam, &buffer, size )) - goto next; /* ignore it */ + continue; /* ignore it */ } *msg = info.msg; msg->pt.x = (short)LOWORD( thread_info->GetMessagePosVal ); msg->pt.y = (short)HIWORD( thread_info->GetMessagePosVal ); thread_info->GetMessageTimeVal = info.msg.time; thread_info->GetMessageExtraInfoVal = extra_info; - HeapFree( GetProcessHeap(), 0, buffer ); + if (buffer != local_buffer) HeapFree( GetProcessHeap(), 0, buffer ); HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)msg, TRUE ); return TRUE; } @@ -2198,8 +2197,6 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags /* if some PM_QS* flags were specified, only handle sent messages from now on */ if (HIWORD(flags) && !changed_mask) flags = PM_QS_SENDMESSAGE | LOWORD(flags); - next: - HeapFree( GetProcessHeap(), 0, buffer ); } }

1 0

Alexandre Julliard : user32: Specify the new queue mask separately from the PeekMessage flags.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 06dbbdd09b393dd1613cab0b488380f46c8bdb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06dbbdd09b393dd1613cab0b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 29 12:13:06 2008 +0100 user32: Specify the new queue mask separately from the PeekMessage flags. --- dlls/user32/message.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 82350a3..7330030 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2022,18 +2022,15 @@ static inline void call_sendmsg_callback( SENDASYNCPROC callback, HWND hwnd, UIN * Peek for a message matching the given parameters. Return FALSE if none available. * All pending sent messages are processed before returning. */ -static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags ) +static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, UINT changed_mask ) { LRESULT result; ULONG_PTR extra_info = 0; struct user_thread_info *thread_info = get_user_thread_info(); struct received_message_info info, *old_info; - unsigned int wake_mask, changed_mask = HIWORD(flags); unsigned int hw_id = 0; /* id of previous hardware message */ if (!first && !last) last = ~0; - if (!changed_mask) changed_mask = QS_ALLINPUT; - wake_mask = changed_mask & (QS_SENDMESSAGE | QS_SMRESULT); for (;;) { @@ -2052,7 +2049,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags req->get_first = first; req->get_last = last; req->hw_id = hw_id; - req->wake_mask = wake_mask; + req->wake_mask = changed_mask & (QS_SENDMESSAGE | QS_SMRESULT); req->changed_mask = changed_mask; if (buffer_size) wine_server_set_reply( req, buffer, buffer_size ); if (!(res = wine_server_call( req ))) @@ -2171,7 +2168,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags info.msg.wParam, info.msg.lParam ); else peek_message( msg, info.msg.hwnd, info.msg.message, - info.msg.message, flags | PM_REMOVE ); + info.msg.message, flags | PM_REMOVE, changed_mask ); goto next; } if (info.msg.message >= WM_DDE_FIRST && info.msg.message <= WM_DDE_LAST) @@ -2200,7 +2197,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags thread_info->receive_info = old_info; /* if some PM_QS* flags were specified, only handle sent messages from now on */ - if (HIWORD(flags)) flags = PM_QS_SENDMESSAGE | LOWORD(flags); + if (HIWORD(flags) && !changed_mask) flags = PM_QS_SENDMESSAGE | LOWORD(flags); next: HeapFree( GetProcessHeap(), 0, buffer ); } @@ -2215,7 +2212,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags static inline void process_sent_messages(void) { MSG msg; - peek_message( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); + peek_message( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE, 0 ); } @@ -2881,7 +2878,7 @@ BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT f /* check for graphics events */ USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); - if (!peek_message( &msg, hwnd, first, last, flags )) + if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { if (!(flags & PM_NOYIELD)) { @@ -2925,7 +2922,12 @@ BOOL WINAPI PeekMessageA( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) { HANDLE server_queue = get_server_queue_handle(); - int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + + USER_CheckNotLock(); + + /* check for graphics events */ + USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); if (first || last) { @@ -2938,7 +2940,7 @@ BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) } else mask = QS_ALLINPUT; - while (!PeekMessageW( msg, hwnd, first, last, PM_REMOVE | PM_NOYIELD | (mask << 16) )) + while (!peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask )) { DWORD dwlc;

1 0

Alexandre Julliard : user32: Move thread info setting and WH_GETMESSAGE call into peek_message.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 641cc6402f35396c560458427527f0df09b7b6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=641cc6402f35396c560458427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 29 12:12:21 2008 +0100 user32: Move thread info setting and WH_GETMESSAGE call into peek_message. --- dlls/user32/message.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 597ad71..82350a3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2174,7 +2174,6 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags info.msg.message, flags | PM_REMOVE ); goto next; } - thread_info->GetMessageExtraInfoVal = extra_info; if (info.msg.message >= WM_DDE_FIRST && info.msg.message <= WM_DDE_LAST) { if (!unpack_dde_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, @@ -2182,7 +2181,12 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags goto next; /* ignore it */ } *msg = info.msg; + msg->pt.x = (short)LOWORD( thread_info->GetMessagePosVal ); + msg->pt.y = (short)HIWORD( thread_info->GetMessagePosVal ); + thread_info->GetMessageTimeVal = info.msg.time; + thread_info->GetMessageExtraInfoVal = extra_info; HeapFree( GetProcessHeap(), 0, buffer ); + HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)msg, TRUE ); return TRUE; } @@ -2870,7 +2874,6 @@ void WINAPI PostQuitMessage( INT exit_code ) */ BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ) { - struct user_thread_info *thread_info = get_user_thread_info(); MSG msg; USER_CheckNotLock(); @@ -2890,12 +2893,6 @@ BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT f return FALSE; } - thread_info->GetMessageTimeVal = msg.time; - msg.pt.x = (short)LOWORD( thread_info->GetMessagePosVal ); - msg.pt.y = (short)HIWORD( thread_info->GetMessagePosVal ); - - HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)&msg, TRUE ); - /* copy back our internal safe copy of message data to msg_out. * msg_out is a variable from the *program*, so it can't be used * internally as it can get "corrupted" by our use of SendMessage()

1 0

Alexandre Julliard : user32: Move handling of internal messages into peek_message.
by Alexandre Julliard Oct. 29, 2008

Oct. 29, 2008

Module: wine Branch: master Commit: 142708face9a1d6960ec9af61269b916c53eb5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142708face9a1d6960ec9af61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 29 12:12:04 2008 +0100 user32: Move handling of internal messages into peek_message. --- dlls/user32/message.c | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 5990133..597ad71 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2164,6 +2164,16 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags thread_info->GetMessagePosVal = MAKELONG( info.msg.pt.x, info.msg.pt.y ); /* fall through */ case MSG_POSTED: + if (info.msg.message & 0x80000000) /* internal message */ + { + if (flags & PM_REMOVE) + handle_internal_message( info.msg.hwnd, info.msg.message, + info.msg.wParam, info.msg.lParam ); + else + peek_message( msg, info.msg.hwnd, info.msg.message, + info.msg.message, flags | PM_REMOVE ); + goto next; + } thread_info->GetMessageExtraInfoVal = extra_info; if (info.msg.message >= WM_DDE_FIRST && info.msg.message <= WM_DDE_LAST) { @@ -2868,33 +2878,16 @@ BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT f /* check for graphics events */ USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); - hwnd = WIN_GetFullHandle( hwnd ); - - for (;;) + if (!peek_message( &msg, hwnd, first, last, flags )) { - if (!peek_message( &msg, hwnd, first, last, flags )) + if (!(flags & PM_NOYIELD)) { - if (!(flags & PM_NOYIELD)) - { - DWORD count; - ReleaseThunkLock(&count); - NtYieldExecution(); - if (count) RestoreThunkLock(count); - } - return FALSE; + DWORD count; + ReleaseThunkLock(&count); + NtYieldExecution(); + if (count) RestoreThunkLock(count); } - if (msg.message & 0x80000000) - { - if (!(flags & PM_REMOVE)) - { - /* Have to remove the message explicitly. - Do this before handling it, because the message handler may - call PeekMessage again */ - peek_message( &msg, msg.hwnd, msg.message, msg.message, flags | PM_REMOVE ); - } - handle_internal_message( msg.hwnd, msg.message, msg.wParam, msg.lParam ); - } - else break; + return FALSE; } thread_info->GetMessageTimeVal = msg.time;

1 0