May 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : rpcrt4: Added missing marshalling calls for FC_INT3264/ FC_UINT3264 types.
by Alexandre Julliard May 7, 2015

May 7, 2015

Module: wine Branch: master Commit: 15ff762bd55579e048a2b0c8ae1e23a1f891448c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ff762bd55579e048a2b0c8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 11:56:02 2015 +0300 rpcrt4: Added missing marshalling calls for FC_INT3264/FC_UINT3264 types. --- dlls/rpcrt4/ndr_marshall.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8a84ed7..0ba5b00 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -201,7 +201,9 @@ const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { NdrUserMarshalMarshall, 0, 0, /* 0xb7 */ - NdrRangeMarshall + NdrRangeMarshall, + NdrBaseTypeMarshall, + NdrBaseTypeMarshall }; const NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { 0, @@ -243,7 +245,9 @@ const NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { NdrUserMarshalUnmarshall, 0, 0, /* 0xb7 */ - NdrRangeUnmarshall + NdrRangeUnmarshall, + NdrBaseTypeUnmarshall, + NdrBaseTypeUnmarshall }; const NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { 0, @@ -285,7 +289,9 @@ const NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { NdrUserMarshalBufferSize, 0, 0, /* 0xb7 */ - NdrRangeBufferSize + NdrRangeBufferSize, + NdrBaseTypeBufferSize, + NdrBaseTypeBufferSize }; const NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = { 0, @@ -327,7 +333,9 @@ const NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = { NdrUserMarshalMemorySize, 0, 0, /* 0xb7 */ - NdrRangeMemorySize + NdrRangeMemorySize, + NdrBaseTypeMemorySize, + NdrBaseTypeMemorySize }; const NDR_FREE NdrFreer[NDR_TABLE_SIZE] = { 0, @@ -368,7 +376,9 @@ const NDR_FREE NdrFreer[NDR_TABLE_SIZE] = { NdrUserMarshalFree, 0, 0, /* 0xb7 */ - NdrRangeFree + NdrRangeFree, + NdrBaseTypeFree, + NdrBaseTypeFree }; typedef struct _NDR_MEMORY_LIST

1 0

Nikolay Sivov : oleaut32: Implement proxy/stub for IEnumConnections::Next( ).
by Alexandre Julliard May 7, 2015

May 7, 2015

Module: wine Branch: master Commit: 25b689cf1cc79c4be2f58b4db1135cc7e6691416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b689cf1cc79c4be2f58b4db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 11:05:26 2015 +0300 oleaut32: Implement proxy/stub for IEnumConnections::Next(). --- dlls/oleaut32/usrmarshal.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 3187ca2..4db2b76 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2201,8 +2201,14 @@ HRESULT CALLBACK IEnumConnections_Next_Proxy( LPCONNECTDATA rgcd, ULONG *pcFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + ULONG fetched; + + TRACE("(%u, %p %p)\n", cConnections, rgcd, pcFetched); + + if (!pcFetched) + pcFetched = &fetched; + + return IEnumConnections_RemoteNext_Proxy(This, cConnections, rgcd, pcFetched); } HRESULT __RPC_STUB IEnumConnections_Next_Stub( @@ -2211,8 +2217,16 @@ HRESULT __RPC_STUB IEnumConnections_Next_Stub( LPCONNECTDATA rgcd, ULONG *pcFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%u, %p, %p)\n", cConnections, rgcd, pcFetched); + + *pcFetched = 0; + hr = IEnumConnections_Next(This, cConnections, rgcd, pcFetched); + if (hr == S_OK) + *pcFetched = cConnections; + + return hr; } HRESULT CALLBACK IEnumConnectionPoints_Next_Proxy(

1 0

Nikolay Sivov : include: Fix IAccessible definition.
by Alexandre Julliard May 7, 2015

May 7, 2015

Module: wine Branch: master Commit: 39a5a1c6969f6d8013ba5a153d6df9bf3a7ff46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a5a1c6969f6d8013ba5a153… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 09:13:30 2015 +0300 include: Fix IAccessible definition. --- include/oleacc.idl | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index dc7af15..9edfdda 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -154,10 +154,11 @@ typedef enum AnnoScope } AnnoScope; [ - local, - object, - uuid(618736e0-3c3d-11cf-810c-00aa00389b71), - pointer_default(unique) + object, + hidden, + dual, + uuid(618736e0-3c3d-11cf-810c-00aa00389b71), + pointer_default(unique) ] interface IAccessible : IDispatch { @@ -185,26 +186,26 @@ interface IAccessible : IDispatch [hidden, propget, id(DISPID_ACC_PARENT)] HRESULT accParent([out, retval]IDispatch** ppdispParent); [hidden, propget, id(DISPID_ACC_CHILDCOUNT)] HRESULT accChildCount([out, retval] long* pcountChildren); [hidden, propget, id(DISPID_ACC_CHILD)] HRESULT accChild([in] VARIANT varChildID, [out, retval]IDispatch **ppdispChild); - [hidden, propget, id(DISPID_ACC_NAME)] HRESULT accName([in]VARIANT varID, [out, retval] BSTR* pszName); - [hidden, propget, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval] BSTR* pszValue); - [hidden, propget, id(DISPID_ACC_DESCRIPTION)] HRESULT accDescription([in]VARIANT varID, [out, retval] BSTR* pszDescription); - [hidden, propget, id(DISPID_ACC_ROLE)] HRESULT accRole([in]VARIANT varID, [out, retval]VARIANT* pvarRole); - [hidden, propget, id(DISPID_ACC_STATE)] HRESULT accState([in]VARIANT varID, [out, retval]VARIANT* pvarState); - [hidden, propget, id(DISPID_ACC_HELP)] HRESULT accHelp([in]VARIANT varID, [out, retval]BSTR* pszHelp); - [hidden, propget, id(DISPID_ACC_HELPTOPIC)] HRESULT accHelpTopic([out]BSTR* pszHelpFile, [in]VARIANT varID, [out, retval] long* pidTopic); - [hidden, propget, id(DISPID_ACC_KEYBOARDSHORTCUT)] HRESULT accKeyboardShortcut([in]VARIANT varID, [out, retval] BSTR* pszKeyboardShortcut); + [hidden, propget, id(DISPID_ACC_NAME)] HRESULT accName([in, optional] VARIANT varID, [out, retval] BSTR* pszName); + [hidden, propget, id(DISPID_ACC_VALUE)] HRESULT accValue([in, optional] VARIANT varID, [out, retval] BSTR* pszValue); + [hidden, propget, id(DISPID_ACC_DESCRIPTION)] HRESULT accDescription([in, optional] VARIANT varID, [out, retval] BSTR *description); + [hidden, propget, id(DISPID_ACC_ROLE)] HRESULT accRole([in, optional] VARIANT varID, [out, retval] VARIANT *role); + [hidden, propget, id(DISPID_ACC_STATE)] HRESULT accState([in, optional] VARIANT varID, [out, retval] VARIANT *state); + [hidden, propget, id(DISPID_ACC_HELP)] HRESULT accHelp([in, optional] VARIANT varID, [out, retval] BSTR *help); + [hidden, propget, id(DISPID_ACC_HELPTOPIC)] HRESULT accHelpTopic([out] BSTR *helpfile, [in, optional] VARIANT varID, [out, retval] long* pidTopic); + [hidden, propget, id(DISPID_ACC_KEYBOARDSHORTCUT)] HRESULT accKeyboardShortcut([in, optional] VARIANT varID, [out, retval] BSTR *shortcut); [hidden, propget, id(DISPID_ACC_FOCUS)] HRESULT accFocus([out, retval] VARIANT* pvarID); [hidden, propget, id(DISPID_ACC_SELECTION)] HRESULT accSelection([out, retval] VARIANT* pvarID); - [hidden, propget, id(DISPID_ACC_DEFAULTACTION)] HRESULT accDefaultAction([in]VARIANT varID, [out, retval] BSTR* pszDefaultAction); + [hidden, propget, id(DISPID_ACC_DEFAULTACTION)] HRESULT accDefaultAction([in, optional] VARIANT varID, [out, retval] BSTR *action); - [hidden, id(DISPID_ACC_SELECT)] HRESULT accSelect([in]long flagsSelect, [in]VARIANT varID); - [hidden, id(DISPID_ACC_LOCATION)] HRESULT accLocation([out]long* pxLeft, [out]long* pyTop, [out]long* pcxWidth, [out]long* pcyHeight, [in]VARIANT varID); - [hidden, id(DISPID_ACC_NAVIGATE)] HRESULT accNavigate([in]long navDir, [in]VARIANT varStart, [out, retval] VARIANT* pvarEnd); - [hidden, id(DISPID_ACC_HITTEST)] HRESULT accHitTest([in]long xLeft, [in]long yTop, [out,retval] VARIANT* pvarID); - [hidden, id(DISPID_ACC_DODEFAULTACTION)] HRESULT accDoDefaultAction([in]VARIANT varID); + [hidden, id(DISPID_ACC_SELECT)] HRESULT accSelect([in] long flagsSelect, [in, optional] VARIANT varID); + [hidden, id(DISPID_ACC_LOCATION)] HRESULT accLocation([out] long *left, [out] long *top, [out] long *width, [out] long *height, [in, optional] VARIANT varID); + [hidden, id(DISPID_ACC_NAVIGATE)] HRESULT accNavigate([in] long dir, [in, optional] VARIANT varStart, [out, retval] VARIANT *pvarEnd); + [hidden, id(DISPID_ACC_HITTEST)] HRESULT accHitTest([in] long left, [in] long top, [out, retval] VARIANT *pvarID); + [hidden, id(DISPID_ACC_DODEFAULTACTION)] HRESULT accDoDefaultAction([in, optional] VARIANT varID); - [hidden, propput, id(DISPID_ACC_NAME)] HRESULT accName([in]VARIANT varID, [in]BSTR pszName); - [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval]BSTR pszValue); + [hidden, propput, id(DISPID_ACC_NAME)] HRESULT accName([in, optional] VARIANT varID, [in] BSTR name); + [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in, optional] VARIANT varID, [in] BSTR value); } [

1 0

Qian Hong : server: Remove useless trailing comma in array.
by Alexandre Julliard May 7, 2015

May 7, 2015

Module: wine Branch: master Commit: 10d35121db5973c7dec8f4deeca771feb131875c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d35121db5973c7dec8f4dee… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu May 7 14:31:12 2015 +0800 server: Remove useless trailing comma in array. --- server/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/directory.c b/server/directory.c index e5e82b0..7c5e7db 100644 --- a/server/directory.c +++ b/server/directory.c @@ -369,7 +369,7 @@ void init_directories(void) static const WCHAR dir_basenamedW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s'}; static const WCHAR dir_named_pipeW[] = {'\\','D','e','v','i','c','e','\\','N','a','m','e','d','P','i','p','e'}; static const WCHAR dir_mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t'}; - static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s',}; + static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s'}; static const WCHAR dir_sessionsW[] = {'S','e','s','s','i','o','n','s'}; static const WCHAR dir_kernelW[] = {'K','e','r','n','e','l','O','b','j','e','c','t','s'}; static const struct unicode_str dir_global_str = {dir_globalW, sizeof(dir_globalW)};

1 0

Josh DuBois : ntdll: Avoid movs between rcx, rdx and xmm registers.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 44182ffb5b199893dfe3a4647efe1e8571599ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44182ffb5b199893dfe3a4647… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Tue Apr 28 09:20:13 2015 -0500 ntdll: Avoid movs between rcx, rdx and xmm registers. Apple's version of as chokes on movs between rcx and rdx and the xmm registers. --- dlls/ntdll/relay.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 57ad2e1..0ba2731 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -624,10 +624,10 @@ __ASM_GLOBAL_FUNC( relay_call, "movq 8(%rsp),%rdx\n\t" "movq 16(%rsp),%r8\n\t" "movq 24(%rsp),%r9\n\t" - "movq %rcx,%xmm0\n\t" - "movq %rdx,%xmm1\n\t" - "movq %r8,%xmm2\n\t" - "movq %r9,%xmm3\n\t" + "movq 0(%rsp),%xmm0\n\t" + "movq 8(%rsp),%xmm1\n\t" + "movq 16(%rsp),%xmm2\n\t" + "movq 24(%rsp),%xmm3\n\t" "callq *%rax\n\t" /* trace the return value */ "leaq -0x30(%rbp),%rsp\n\t"

1 0

Aric Stewart : server: Fixup input windows on thread_detach.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 3599f956e2bfe3dd76d7134ddd06b1e5cf5be4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3599f956e2bfe3dd76d7134dd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 5 09:14:25 2015 -0500 server: Fixup input windows on thread_detach. --- dlls/user32/tests/input.c | 80 +++++++++++++++++++++++++++++++++++++++++------ server/queue.c | 21 ++++++++++++- 2 files changed, 90 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 78f4d8b..30b91a0 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2028,6 +2028,12 @@ static void test_Input_mouse(void) static LRESULT WINAPI MsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { + if (message == WM_USER+1) + { + HWND hwnd = (HWND)lParam; + ok(GetFocus() == hwnd, "thread expected focus %p, got %p\n", hwnd, GetFocus()); + ok(GetActiveWindow() == hwnd, "thread expected active %p, got %p\n", hwnd, GetActiveWindow()); + } return DefWindowProcA(hwnd, message, wParam, lParam); } @@ -2067,7 +2073,7 @@ static DWORD WINAPI thread_proc(void *param) static void test_attach_input(void) { HANDLE hThread; - HWND ourWnd; + HWND ourWnd, Wnd2; DWORD ret, tid; struct wnd_event wnd_event; WNDCLASSA cls; @@ -2102,6 +2108,10 @@ static void test_attach_input(void) 0, 0, 0, 0, 0, 0, 0, NULL); ok(ourWnd!= 0, "failed to create ourWnd window\n"); + Wnd2 = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, 0, 0, 0, NULL); + ok(Wnd2!= 0, "failed to create Wnd2 window\n"); + SetFocus(ourWnd); SetActiveWindow(ourWnd); @@ -2111,8 +2121,35 @@ static void test_attach_input(void) ok(GetActiveWindow() == ourWnd, "expected active %p, got %p\n", ourWnd, GetActiveWindow()); ok(GetFocus() == ourWnd, "expected focus %p, got %p\n", ourWnd, GetFocus()); + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, (LPARAM)ourWnd); + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); ok(ret, "AttachThreadInput error %d\n", GetLastError()); + ok(GetActiveWindow() == ourWnd, "expected active %p, got %p\n", ourWnd, GetActiveWindow()); + ok(GetFocus() == ourWnd, "expected focus %p, got %p\n", ourWnd, GetFocus()); + + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, 0); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ok(GetActiveWindow() == ourWnd, "expected active %p, got %p\n", ourWnd, GetActiveWindow()); + ok(GetFocus() == ourWnd, "expected focus %p, got %p\n", ourWnd, GetFocus()); + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, (LPARAM)ourWnd); + + SetActiveWindow(Wnd2); + SetFocus(Wnd2); + ok(GetActiveWindow() == Wnd2, "expected active %p, got %p\n", Wnd2, GetActiveWindow()); + ok(GetFocus() == Wnd2, "expected focus %p, got %p\n", Wnd2, GetFocus()); + + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, (LPARAM)Wnd2); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + ok(GetActiveWindow() == Wnd2, "expected active %p, got %p\n", Wnd2, GetActiveWindow()); + ok(GetFocus() == Wnd2, "expected focus %p, got %p\n", Wnd2, GetFocus()); + + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, 0); ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); @@ -2122,11 +2159,6 @@ static void test_attach_input(void) wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); wnd_event.setWindows = TRUE; - if (!wnd_event.start_event) - { - win_skip("skipping interthread message test under win9x\n"); - return; - } hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); @@ -2134,10 +2166,6 @@ static void test_attach_input(void) ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(wnd_event.start_event); - ourWnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, - 100, 100, 200, 200, 0, 0, 0, NULL); - ok(ourWnd!= 0, "failed to create ourWnd window\n"); - SetFocus(ourWnd); SetActiveWindow(ourWnd); @@ -2147,14 +2175,46 @@ static void test_attach_input(void) ok(GetActiveWindow() == wnd_event.hwnd, "expected active %p, got %p\n", wnd_event.hwnd, GetActiveWindow()); ok(GetFocus() == wnd_event.hwnd, "expected focus %p, got %p\n", wnd_event.hwnd, GetFocus()); + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, (LPARAM)wnd_event.hwnd); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ok(GetActiveWindow() == 0, "expected active 0, got %p\n", GetActiveWindow()); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); + + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, (LPARAM)wnd_event.hwnd); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ok(GetActiveWindow() == wnd_event.hwnd, "expected active %p, got %p\n", wnd_event.hwnd, GetActiveWindow()); + ok(GetFocus() == wnd_event.hwnd, "expected focus %p, got %p\n", wnd_event.hwnd, GetFocus()); + + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, (LPARAM)wnd_event.hwnd); + + SetFocus(Wnd2); + SetActiveWindow(Wnd2); + ok(GetActiveWindow() == Wnd2, "expected active %p, got %p\n", Wnd2, GetActiveWindow()); + ok(GetFocus() == Wnd2, "expected focus %p, got %p\n", Wnd2, GetFocus()); + + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, (LPARAM)Wnd2); + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); ok(ret, "AttachThreadInput error %d\n", GetLastError()); + ok(GetActiveWindow() == Wnd2, "expected active %p, got %p\n", Wnd2, GetActiveWindow()); + ok(GetFocus() == Wnd2, "expected focus %p, got %p\n", Wnd2, GetFocus()); + + SendMessageA(wnd_event.hwnd, WM_USER+1, 0, 0); + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(hThread); + DestroyWindow(ourWnd); + DestroyWindow(Wnd2); } START_TEST(input) diff --git a/server/queue.c b/server/queue.c index 350d45a..30869a0 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1095,10 +1095,29 @@ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) /* detach two thread input data structures */ void detach_thread_input( struct thread *thread_from ) { - struct thread_input *input; + struct thread *thread; + struct thread_input *input, *old_input = thread_from->queue->input; if ((input = create_thread_input( thread_from ))) { + if (old_input->focus && (thread = get_window_thread( old_input->focus ))) + { + if (thread == thread_from) + { + input->focus = old_input->focus; + old_input->focus = 0; + } + release_object( thread ); + } + if (old_input->active && (thread = get_window_thread( old_input->active ))) + { + if (thread == thread_from) + { + input->active = old_input->active; + old_input->active = 0; + } + release_object( thread ); + } assign_thread_input( thread_from, input ); release_object( input ); }

1 0

Marcus Meissner : wined3d: Remove superflous check (Coverity).
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: d8a0f77c2b3cf1a8dc60aab1377ad561f0d71f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a0f77c2b3cf1a8dc60aab13… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 6 08:53:33 2015 +0200 wined3d: Remove superflous check (Coverity). --- dlls/wined3d/surface.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6b5f771..359db9b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4291,9 +4291,6 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } case WINED3D_BLIT_OP_COLOR_BLIT: - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) - return FALSE; - if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) { TRACE("Checking support for fixup:\n");

1 0

Marcus Meissner : dmime: Check return code of create_dmgraph (Coverity).
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 59efc5ce64327e15d93cb99acda44d5d475ab9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=59efc5ce64327e15d93cb99ac… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 6 08:49:33 2015 +0200 dmime: Check return code of create_dmgraph (Coverity). --- dlls/dmime/audiopath.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 3dff0c9..e6654a4 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -132,6 +132,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void** ppObject) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); + HRESULT hr; FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); @@ -169,7 +170,9 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud if (IsEqualIID (iidInterface, &IID_IDirectMusicGraph)) { if (NULL == This->pToolGraph) { IDirectMusicGraphImpl* pGraph; - create_dmgraph(&IID_IDirectMusicGraph, (void**)&pGraph); + hr = create_dmgraph(&IID_IDirectMusicGraph, (void**)&pGraph); + if (FAILED(hr)) + return hr; This->pToolGraph = (IDirectMusicGraph*) pGraph; } *ppObject = This->pToolGraph; @@ -200,7 +203,9 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IDirectMusicPerformance8_GetGraph(This->pPerf, &pPerfoGraph); if (NULL == pPerfoGraph) { IDirectMusicGraphImpl* pGraph = NULL; - create_dmgraph(&IID_IDirectMusicGraph, (void**)&pGraph); + hr = create_dmgraph(&IID_IDirectMusicGraph, (void**)&pGraph); + if (FAILED(hr)) + return hr; IDirectMusicPerformance8_SetGraph(This->pPerf, (IDirectMusicGraph*) pGraph); /* we need release as SetGraph do an AddRef */ IDirectMusicGraph_Release((LPDIRECTMUSICGRAPH) pGraph);

1 0

Josh DuBois : oleaut32: Avoid movs between rcx, rdx and xmm registers.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: ee3bb31a6fb32a2ad4e01ba3ef373562241165ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3bb31a6fb32a2ad4e01ba3e… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Tue Apr 28 09:20:13 2015 -0500 oleaut32: Avoid movs between rcx, rdx and xmm registers. Apple's version of as chokes on movs between rcx and rdx and the xmm registers. --- dlls/oleaut32/typelib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b8325c0..29bab33 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6456,10 +6456,10 @@ __ASM_GLOBAL_FUNC( call_method, "movq 8(%rsp),%rdx\n\t" "movq 16(%rsp),%r8\n\t" "movq 24(%rsp),%r9\n\t" - "movq %rcx,%xmm0\n\t" - "movq %rdx,%xmm1\n\t" - "movq %r8,%xmm2\n\t" - "movq %r9,%xmm3\n\t" + "movq 0(%rsp),%xmm0\n\t" + "movq 8(%rsp),%xmm1\n\t" + "movq 16(%rsp),%xmm2\n\t" + "movq 24(%rsp),%xmm3\n\t" "callq *%rax\n\t" "leaq -16(%rbp),%rsp\n\t" "popq %rdi\n\t"

1 0

Josh DuBois : rpcrt4: Avoid movs between rcx, rdx and xmm registers.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 1f34f193b69d28d2fdcc97c139463312a12829fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f34f193b69d28d2fdcc97c13… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Tue Apr 28 09:20:13 2015 -0500 rpcrt4: Avoid movs between rcx, rdx and xmm registers. Apple's version of as chokes on movs between rcx and rdx and the xmm registers. --- dlls/rpcrt4/ndr_stubless.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 030bfb3..c9d9930 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1077,10 +1077,10 @@ __ASM_GLOBAL_FUNC( call_server_func, "movq 8(%rsp),%rdx\n\t" "movq 16(%rsp),%r8\n\t" "movq 24(%rsp),%r9\n\t" - "movq %rcx,%xmm0\n\t" - "movq %rdx,%xmm1\n\t" - "movq %r8,%xmm2\n\t" - "movq %r9,%xmm3\n\t" + "movq 0(%rsp),%xmm0\n\t" + "movq 8(%rsp),%xmm1\n\t" + "movq 16(%rsp),%xmm2\n\t" + "movq 24(%rsp),%xmm3\n\t" "callq *%rax\n\t" "leaq -16(%rbp),%rsp\n\t" /* restore stack */ "popq %rdi\n\t"

1 0