February 2012 - Wine-Commits

Jacek Caban : mshtml: Properly handle out of memory in IHTMLElement:: get_outerHTML.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: f09e4ce269d98b82516a9d7938dfa59271d0c61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09e4ce269d98b82516a9d793… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 1 13:58:54 2012 +0100 mshtml: Properly handle out of memory in IHTMLElement::get_outerHTML. --- dlls/mshtml/htmlelem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 030a0d2..c245c11 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1170,7 +1170,7 @@ static HRESULT WINAPI HTMLElement_get_outerHTML(IHTMLElement *iface, BSTR *p) nsAString_Finish(&html_str); TRACE("ret %s\n", debugstr_w(*p)); - return S_OK; + return hres; } static HRESULT WINAPI HTMLElement_put_outerText(IHTMLElement *iface, BSTR v)

1 0

Alexandre Julliard : dinput: Clip to the client area instead of the whole window in exclusive mode.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: a1580bba704d0bbf7a6353a41442f8886ea5a113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1580bba704d0bbf7a6353a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 1 14:33:06 2012 +0100 dinput: Clip to the client area instead of the whole window in exclusive mode. --- dlls/dinput/mouse.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index ead6c25..f78ae23 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -426,7 +426,8 @@ static void warp_check( SysMouseImpl* This, BOOL force ) This->last_warped = now; This->need_warp = FALSE; - if (!GetWindowRect(This->base.win, &rect)) return; + if (!GetClientRect(This->base.win, &rect)) return; + MapWindowPoints( This->base.win, 0, (POINT *)&rect, 2 ); if (!This->clipped) { mapped_center.x = (rect.left + rect.right) / 2;

1 0

Aric Stewart : gdi32: In update_system_links if the font we are trying to link has already been substituted or localized we need to check against that name also .
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: a8a2f87135183a12c531f847efd1ab595ed89f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a2f87135183a12c531f847e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 31 13:24:58 2012 -0600 gdi32: In update_system_links if the font we are trying to link has already been substituted or localized we need to check against that name also. --- dlls/gdi32/freetype.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 37725a1..afbc971 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2903,7 +2903,10 @@ static void update_system_links(void) for (i = 0; i < sizeof(font_links_defaults_list)/sizeof(font_links_defaults_list[0]); i++) { - if (!strcmpiW(font_links_defaults_list[i].shelldlg, psub->to.name)) + const FontSubst *psub2; + psub2 = get_font_subst(&font_subst_list, font_links_defaults_list[i].shelldlg, -1); + + if ((!strcmpiW(font_links_defaults_list[i].shelldlg, psub->to.name) || (psub2 && !strcmpiW(psub2->to.name,psub->to.name)))) { for (j = 0; j < sizeof(font_links_list)/sizeof(font_links_list[0]); j++) populate_system_links(hkey, font_links_list[j], font_links_defaults_list[i].substitutes);

1 0

Andrew Eikum : winecoreaudio: Improve underrun handling.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 57bb0898f353d34a22a2d895a1433877e9a61ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57bb0898f353d34a22a2d895a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 1 09:08:51 2012 -0600 winecoreaudio: Improve underrun handling. --- dlls/winecoreaudio.drv/mmdevdrv.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a940cbf..42d8d18 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -138,7 +138,7 @@ struct ACImpl { UINT32 getbuf_last; int playing; - Float64 highest_sampletime; + Float64 highest_sampletime, next_sampletime; AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -564,8 +564,13 @@ static UINT64 get_current_aqbuffer_position(ACImpl *This, int mode) else ret = This->highest_sampletime - bufinfo->start_sampletime; - if(mode == BUFPOS_ABSOLUTE) - ret += bufinfo->start_pos; + if(mode == BUFPOS_ABSOLUTE){ + ret = This->written_frames - (bufinfo->len_frames - ret); + while((head = list_next(&This->queued_bufinfos, &bufinfo->entry))){ + bufinfo = LIST_ENTRY(head, QueuedBufInfo, entry); + ret -= bufinfo->len_frames; + } + } TRACE("%llu frames (%s)\n", ret, mode == BUFPOS_ABSOLUTE ? "absolute" : "relative"); @@ -1851,7 +1856,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( { ACImpl *This = impl_from_IAudioRenderClient(iface); AQBuffer *buf; - AudioTimeStamp start_time; + AudioTimeStamp start_time, req_time = {0}, *passed_time = NULL; OSStatus sc; TRACE("(%p)->(%u, %x)\n", This, frames, flags); @@ -1896,8 +1901,22 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buf = This->public_buffer->mUserData; buf->used = TRUE; + + if(list_empty(&This->queued_bufinfos)){ + sc = AudioQueueGetCurrentTime(This->aqueue, NULL, &req_time, NULL); + if(sc == noErr) + passed_time = &req_time; + else + TRACE("AudioQueueGetCurrentTime failed: %lx\n", sc); + }else{ + req_time.mSampleTime = This->next_sampletime; + req_time.mFlags = kAudioTimeStampSampleTimeValid; + passed_time = &req_time; + } + sc = AudioQueueEnqueueBufferWithParameters(This->aqueue, - This->public_buffer, 0, NULL, 0, 0, 0, NULL, NULL, &start_time); + This->public_buffer, 0, NULL, 0, 0, 0, NULL, passed_time, + &start_time); if(sc != noErr){ OSSpinLockUnlock(&This->lock); ERR("Unable to enqueue buffer: %lx\n", sc); @@ -1914,6 +1933,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( bufinfo->len_frames = frames; list_add_tail(&This->queued_bufinfos, &bufinfo->entry); + + This->next_sampletime = start_time.mSampleTime + bufinfo->len_frames; }else WARN("Start time didn't contain valid SampleTime member\n");

1 0

Aric Stewart : quartz: If the MediaSeeking is not implemented all the way up the passthru chain fall back to the filtergraph 's clock to find position.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 53bd62737c3f1ad1237a8c47d1319c64abc7a7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bd62737c3f1ad1237a8c47d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 31 13:52:27 2012 -0600 quartz: If the MediaSeeking is not implemented all the way up the passthru chain fall back to the filtergraph's clock to find position. --- dlls/quartz/filtergraph.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 32aa569..911e68c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2456,7 +2456,14 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG *pCurrent = -1; hr = all_renderers_seek(This, FoundCurrentPosition, (DWORD_PTR)pCurrent); if (hr == E_NOTIMPL) { - *pCurrent = 0; + LONGLONG time = 0; + if (This->refClock) + { + IReferenceClock_GetTime(This->refClock, &time); + if (time) + time -= This->start_time; + } + *pCurrent = time; hr = S_OK; } LeaveCriticalSection(&This->cs);

1 0

Nikolay Sivov : comctl32: More tests for Toolbar window style handling.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 1c1b1c0073c3dea34ff4096d749a459accf5e337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1b1c0073c3dea34ff4096d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 00:07:00 2012 +0300 comctl32: More tests for Toolbar window style handling. --- dlls/comctl32/tests/toolbar.c | 147 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 2 +- 2 files changed, 148 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 5049ef6..f1579b7 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -54,6 +54,24 @@ static const struct message ttgetdispinfo_parent_seq[] = { { 0 } }; +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define check_rect(name, val, exp, ...) ok(val.top == exp.top && val.bottom == exp.bottom && \ @@ -1610,6 +1628,7 @@ static void test_tooltip(void) {0, 21, TBSTATE_ENABLED, 0, {0, }, 0, -1}, }; NMTTDISPINFOW nmtti; + HWND tooltip; rebuild_toolbar(&hToolbar); @@ -1632,6 +1651,13 @@ static void test_tooltip(void) g_ResetDispTextPtr = FALSE; DestroyWindow(hToolbar); + + /* TBSTYLE_TOOLTIPS */ + hToolbar = CreateWindowExA(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); + tooltip = (HWND)SendMessageA(hToolbar, TB_GETTOOLTIPS, 0, 0); + ok(tooltip == NULL, "got %p\n", tooltip); + DestroyWindow(hToolbar); } static void test_get_set_style(void) @@ -1658,6 +1684,7 @@ static void test_get_set_style(void) style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); style2 = GetWindowLongA(hToolbar, GWL_STYLE); +todo_wine ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); /* try to alter common window bits */ @@ -1681,6 +1708,125 @@ static void test_get_set_style(void) DestroyWindow(hToolbar); } +static HHOOK g_tbhook; +static HWND g_toolbar; + +DEFINE_EXPECT(g_hook_create); +DEFINE_EXPECT(g_hook_WM_NCCREATE); +DEFINE_EXPECT(g_hook_WM_CREATE); + +static LRESULT WINAPI toolbar_subclass_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + LRESULT ret; + DWORD style; + + if (msg == WM_NCCREATE) + { + if (g_toolbar == hwnd) + { + CHECK_EXPECT2(g_hook_WM_NCCREATE); + g_toolbar = hwnd; + ret = CallWindowProcA(oldproc, hwnd, msg, wParam, lParam); + + /* control is already set up */ + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok(style != 0, "got %x\n", style); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == 0, "got 0x%08x\n", style); + SetWindowLongA(hwnd, GWL_STYLE, style|TBSTYLE_TOOLTIPS); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + + return ret; + } + } + else if (msg == WM_CREATE) + { + CREATESTRUCTA *cs = (CREATESTRUCTA*)lParam; + + if (g_toolbar == hwnd) + { + CHECK_EXPECT2(g_hook_WM_CREATE); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + + /* test if toolbar-specific messages are already working before WM_CREATE */ + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok(style != 0, "got %x\n", style); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%x\n", style); + ok((cs->style & TBSTYLE_TOOLTIPS) == 0, "0x%08x\n", cs->style); + + ret = CallWindowProcA(oldproc, hwnd, msg, wParam, lParam); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + + /* test if toolbar-specific messages are already working before WM_CREATE */ + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok(style != 0, "got %x\n", style); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%x\n", style); + + return ret; + } + } + + return CallWindowProcA(oldproc, hwnd, msg, wParam, lParam); +} + +LRESULT CALLBACK cbt_hook_proc(int code, WPARAM wParam, LPARAM lParam) +{ + if (code == HCBT_CREATEWND) + { + HWND hwnd = (HWND)wParam; + + if (!g_toolbar) + { + WNDPROC oldproc; + + CHECK_EXPECT2(g_hook_create); + g_toolbar = hwnd; + /* subclass */ + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)toolbar_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + } + return 0; + } + + return CallNextHookEx(g_tbhook, code, wParam, lParam); +} + +static void test_create(void) +{ + HWND hwnd, tooltip; + DWORD style; + + g_tbhook = SetWindowsHookA(WH_CBT, cbt_hook_proc); + + SET_EXPECT(g_hook_create); + SET_EXPECT(g_hook_WM_NCCREATE); + SET_EXPECT(g_hook_WM_CREATE); + + hwnd = CreateWindowExA(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); + + CHECK_CALLED(g_hook_create); + CHECK_CALLED(g_hook_WM_NCCREATE); + CHECK_CALLED(g_hook_WM_CREATE); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + + tooltip = (HWND)SendMessageA(hwnd, TB_GETTOOLTIPS, 0, 0); + ok(tooltip != NULL, "got %p\n", tooltip); + ok(GetParent(tooltip) == hMainWnd, "got %p, %p\n", hMainWnd, hwnd); + + DestroyWindow(hwnd); + UnhookWindowsHook(WH_CBT, cbt_hook_proc); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -1721,6 +1867,7 @@ START_TEST(toolbar) test_getstring(); test_tooltip(); test_get_set_style(); + test_create(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index bd35533..7c1815c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5155,7 +5155,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style); - infoPtr->dwStyle = lpcs->style; + infoPtr->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); GetClientRect(hwnd, &infoPtr->client_rect); infoPtr->bUnicode = infoPtr->hwndNotify && (NFR_UNICODE == SendMessageW(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_REQUERY));

1 0

Piotr Caban : mshtml: Make cookie parameter optional in ConnectionPoint_Advise.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 43b38e1420801cb34ed6a6ca98af95bf658bb8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b38e1420801cb34ed6a6ca9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 1 10:41:58 2012 +0100 mshtml: Make cookie parameter optional in ConnectionPoint_Advise. --- dlls/mshtml/conpoint.c | 3 ++- dlls/mshtml/tests/htmldoc.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index ca45524..691a8c9 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -158,7 +158,8 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * } This->sinks[i].unk = sink; - *pdwCookie = i+1; + if(pdwCookie) + *pdwCookie = i+1; if(!i && This->data && This->data->on_advise) This->data->on_advise(This->container->outer, This->data); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3f356e4..53e463a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4790,6 +4790,10 @@ static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID ri if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, &cookie); ok(hres == S_OK, "Advise failed: %08x\n", hres); + hres = IConnectionPoint_Unadvise(cp, cookie); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, NULL); + ok(hres == S_OK, "Advise failed: %08x\n", hres); } else if(IsEqualGUID(&IID_IDispatch, riid)) { hres = IConnectionPoint_Advise(cp, (IUnknown*)&EventDispatch, &cookie); ok(hres == S_OK, "Advise failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Properly handle GetScheme failure.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 90f7c8f848f492fc38d0dca8987c821ac61cf49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f7c8f848f492fc38d0dca89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 1 13:58:42 2012 +0100 mshtml: Properly handle GetScheme failure. --- dlls/mshtml/navigate.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9950511..e5262ef 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1941,8 +1941,7 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE prepare_for_binding(&window->doc_obj->basedoc, mon, TRUE); hres = IUri_GetScheme(uri, &scheme); - - if(scheme != URL_SCHEME_JAVASCRIPT) { + if(SUCCEEDED(hres) && scheme != URL_SCHEME_JAVASCRIPT) { navigate_task_t *task; task = heap_alloc(sizeof(*task));

1 0

Alexandre Julliard : winex11: Don't give focus to zero-size windows.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 002f85a275c81e0797ffd244942c938643ececf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=002f85a275c81e0797ffd2449… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 1 15:33:51 2012 +0100 winex11: Don't give focus to zero-size windows. --- dlls/winex11.drv/event.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1b3478d..99c47c8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -520,12 +520,15 @@ DWORD EVENT_x11_time_to_win32_time(Time time) */ static inline BOOL can_activate_window( HWND hwnd ) { + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; if (style & WS_MINIMIZE) return FALSE; if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOACTIVATE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; + if (data && IsRectEmpty( &data->window_rect )) return FALSE; return !(style & WS_DISABLED); }

1 0

Alexandre Julliard : winex11: Move the window resizing support to mouse.c.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: abfed909b2d96f8b3fb2acfcb916b6395bb24e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfed909b2d96f8b3fb2acfcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 1 15:46:52 2012 +0100 winex11: Move the window resizing support to mouse.c. --- dlls/winex11.drv/mouse.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 30 ++---------------------------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 85df63b..060b4c8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1327,6 +1327,48 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) } /*********************************************************************** + * move_resize_window + */ +void move_resize_window( Display *display, struct x11drv_win_data *data, int dir ) +{ + DWORD pt; + int x, y, button = 0; + XEvent xev; + + pt = GetMessagePos(); + x = (short)LOWORD( pt ); + y = (short)HIWORD( pt ); + + if (GetKeyState( VK_LBUTTON ) & 0x8000) button = 1; + else if (GetKeyState( VK_MBUTTON ) & 0x8000) button = 2; + else if (GetKeyState( VK_RBUTTON ) & 0x8000) button = 3; + + TRACE( "hwnd %p/%lx, x %d, y %d, dir %d, button %d\n", + data->hwnd, data->whole_window, x, y, dir, button ); + + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_MOVERESIZE); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[0] = x - virtual_screen_rect.left; /* x coord */ + xev.xclient.data.l[1] = y - virtual_screen_rect.top; /* y coord */ + xev.xclient.data.l[2] = dir; /* direction */ + xev.xclient.data.l[3] = button; /* button */ + xev.xclient.data.l[4] = 0; /* unused */ + + /* need to ungrab the pointer that may have been automatically grabbed + * with a ButtonPress event */ + wine_tsx11_lock(); + XUngrabPointer( display, CurrentTime ); + XSendEvent(display, root_window, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); + wine_tsx11_unlock(); +} + + +/*********************************************************************** * X11DRV_ButtonPress */ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a172cd2..fa5022b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2779,9 +2779,7 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { WPARAM hittest = wparam & 0x0f; - DWORD dwPoint; - int x, y, dir; - XEvent xev; + int dir; Display *display = thread_display(); struct x11drv_win_data *data; @@ -2833,30 +2831,6 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) return -1; } - dwPoint = GetMessagePos(); - x = (short)LOWORD(dwPoint); - y = (short)HIWORD(dwPoint); - - TRACE("hwnd %p, x %d, y %d, dir %d\n", hwnd, x, y, dir); - - xev.xclient.type = ClientMessage; - xev.xclient.window = X11DRV_get_whole_window(hwnd); - xev.xclient.message_type = x11drv_atom(_NET_WM_MOVERESIZE); - xev.xclient.serial = 0; - xev.xclient.display = display; - xev.xclient.send_event = True; - xev.xclient.format = 32; - xev.xclient.data.l[0] = x - virtual_screen_rect.left; /* x coord */ - xev.xclient.data.l[1] = y - virtual_screen_rect.top; /* y coord */ - xev.xclient.data.l[2] = dir; /* direction */ - xev.xclient.data.l[3] = 1; /* button */ - xev.xclient.data.l[4] = 0; /* unused */ - - /* need to ungrab the pointer that may have been automatically grabbed - * with a ButtonPress event */ - wine_tsx11_lock(); - XUngrabPointer( display, CurrentTime ); - XSendEvent(display, root_window, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); - wine_tsx11_unlock(); + move_resize_window( display, data, dir ); return 0; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 78e7cd0..15fac6f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -674,6 +674,7 @@ extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDD extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; +extern void move_resize_window( Display *display, struct x11drv_win_data *data, int dir ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN; extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) DECLSPEC_HIDDEN;

1 0