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

Tag wine-1.7.38 : Alexandre Julliard : Release 1.7.38
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: refs/tags/wine-1.7.38 Tag: a6ed54068259111cda554cc7773770334e7bf569 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a6ed54068259111cda554cc77737… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 6 22:27:36 2015 +0900 Release 1.7.38

1 0

Alexandre Julliard : Release 1.7.38.
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: d1578d8f1911b3248fc9bcfe4b4dc0ce3304e509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1578d8f1911b3248fc9bcfe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 6 22:27:36 2015 +0900 Release 1.7.38. --- ANNOUNCE | 728 +++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 446 insertions(+), 302 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1578d8f1911b3248fc9b…

1 0

Sebastian Lackner : ws2_32: Avoid kernel32 functions in system APC calls.
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 49cdebad4bc3373f2a5723fd5868e3c35e606d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cdebad4bc3373f2a5723fd5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 6 07:12:11 2015 +0100 ws2_32: Avoid kernel32 functions in system APC calls. kernel32 functions might modify the last error, which should be avoided here. --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7e875e7..760e184 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2079,7 +2079,7 @@ static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, return status; if (wsa->user_overlapped->hEvent) - SetEvent(wsa->user_overlapped->hEvent); + NtSetEvent(wsa->user_overlapped->hEvent, NULL); if (wsa->cvalue) WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information ); @@ -2165,7 +2165,7 @@ finish: iosb->Information = 0; if (wsa->user_overlapped->hEvent) - SetEvent(wsa->user_overlapped->hEvent); + NtSetEvent(wsa->user_overlapped->hEvent, NULL); if (wsa->read) release_async_io( &wsa->read->io ); release_async_io( &wsa->io );

1 0

Jacek Caban : mshtml: Return S_OK in IHTMLPluginsCollection::refresh.
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 10fba143f797b493cbd9b8f87df0f4422892e53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fba143f797b493cbd9b8f87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 6 13:01:29 2015 +0100 mshtml: Return S_OK in IHTMLPluginsCollection::refresh. --- dlls/mshtml/omnavigator.c | 7 +++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e943b70..c70fac6 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -459,8 +459,11 @@ static HRESULT WINAPI HTMLPluginsCollection_get_length(IHTMLPluginsCollection *i static HRESULT WINAPI HTMLPluginsCollection_refresh(IHTMLPluginsCollection *iface, VARIANT_BOOL reload) { HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); - FIXME("(%p)->(%x)\n", This, reload); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, reload); + + /* Nothing to do here. */ + return S_OK; } static const IHTMLPluginsCollectionVtbl HTMLPluginsCollectionVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d164f1b..37749a0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5295,6 +5295,12 @@ static void test_plugins_col(IHTMLDocument2 *doc) ok(hres == S_OK, "get_length failed: %08x\n", hres); ok(!len, "length = %d\n", len); + hres = IHTMLPluginsCollection_refresh(col, VARIANT_FALSE); + ok(hres == S_OK, "refresh failed: %08x\n", hres); + + hres = IHTMLPluginsCollection_refresh(col, VARIANT_TRUE); + ok(hres == S_OK, "refresh failed: %08x\n", hres); + ref = IHTMLPluginsCollection_Release(col); ok(!ref, "ref=%d\n", ref);

1 0

Michael Stefaniuc : d3d9/tests: Remove no-op binary & with all 1's ( PVS-Studio).
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 3730c99c2895dbe7ce23f99aa09a95ac3eb45f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3730c99c2895dbe7ce23f99aa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:24:36 2015 +0100 d3d9/tests: Remove no-op binary & with all 1's (PVS-Studio). --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fcafb37..e7fdc94 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -99,7 +99,7 @@ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y switch(desc.Format) { case D3DFMT_A8R8G8B8: { - color = ((DWORD *) lockedRect.pBits)[0] & 0xffffffff; + color = ((DWORD *) lockedRect.pBits)[0]; break; } default:

1 0

Michael Stefaniuc : msxml3/tests: Merge two adjacent if blocks with identical condition (PVS-Studio).
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 7c4d45c00b362913501ec081fbd06b1f94e18117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4d45c00b362913501ec081f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:23:15 2015 +0100 msxml3/tests: Merge two adjacent if blocks with identical condition (PVS-Studio). --- dlls/msxml3/tests/domdoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e669de4..f7f57ac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2235,10 +2235,9 @@ static void test_domnode( void ) ok( tag != NULL, "tag was null\n"); ok( !lstrcmpW( tag, szSSearch ), "incorrect tag name\n"); SysFreeString( tag ); - } - if (element) IXMLDOMElement_Release( element ); + } ok(IXMLDOMDocument_Release( doc ) == 0, "document is not destroyed\n"); free_bstrs();

1 0

Nikolay Sivov : rpcrt4: Added inline helper to test for Oicf stub descriptions.
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: ecda8fd501854b12acb52f757070ae1c20c76192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecda8fd501854b12acb52f757… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 14:35:42 2015 +0300 rpcrt4: Added inline helper to test for Oicf stub descriptions. --- dlls/rpcrt4/ndr_stubless.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index cce0840..030bfb3 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -50,6 +50,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); #define NDR_TABLE_MASK 127 +static inline BOOL is_oicf_stubdesc(const PMIDL_STUB_DESC pStubDesc) +{ + return pStubDesc->Version >= 0x20000; +} + static inline void call_buffer_sizer(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, const NDR_PARAM_OIF *param) { @@ -670,7 +675,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if (!pFormat) goto done; } - if (pStubDesc->Version >= 0x20000) /* -Oicf format */ + if (is_oicf_stubdesc(pStubDesc)) /* -Oicf format */ { const NDR_PROC_PARTIAL_OIF_HEADER *pOIFHeader = (const NDR_PROC_PARTIAL_OIF_HEADER *)pFormat; @@ -1311,7 +1316,7 @@ LONG WINAPI NdrStubCall2( if (pThis) *(void **)args = ((CStdStubBuffer *)pThis)->pvServerObject; - if (pStubDesc->Version >= 0x20000) /* -Oicf format */ + if (is_oicf_stubdesc(pStubDesc)) { const NDR_PROC_PARTIAL_OIF_HEADER *pOIFHeader = (const NDR_PROC_PARTIAL_OIF_HEADER *)pFormat; @@ -1502,8 +1507,6 @@ LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING INTERPRETER_OPT_FLAGS2 ext_flags = { 0 }; /* header for procedure string */ const NDR_PROC_HEADER * pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; - /* -Oif or -Oicf generated format */ - BOOL bV2Format = FALSE; RPC_STATUS status; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -1565,9 +1568,7 @@ LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat = client_get_handle(pStubMsg, pProcHeader, async_call_data->pHandleFormat, &async_call_data->hBinding); if (!pFormat) goto done; - bV2Format = (pStubDesc->Version >= 0x20000); - - if (bV2Format) + if (is_oicf_stubdesc(pStubDesc)) { const NDR_PROC_PARTIAL_OIF_HEADER *pOIFHeader = (const NDR_PROC_PARTIAL_OIF_HEADER *)pFormat;

1 0

Michael Stefaniuc : ieframe/tests: Merge adjacent identical if's ( PVS-Studio).
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 8a755f37d8949375997c21cd9d7789de412f1536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a755f37d8949375997c21cd9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:21:07 2015 +0100 ieframe/tests: Merge adjacent identical if's (PVS-Studio). --- dlls/ieframe/tests/webbrowser.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index d86faf8..3dae2b6 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2684,9 +2684,11 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) SET_EXPECT(GetOptionKeyPath); SET_EXPECT(GetOverridesKeyPath); } - if (use_container_olecmd) SET_EXPECT(QueryStatus_SETPROGRESSTEXT); - if (use_container_olecmd) SET_EXPECT(Exec_SETPROGRESSMAX); - if (use_container_olecmd) SET_EXPECT(Exec_SETPROGRESSPOS); + if (use_container_olecmd) { + SET_EXPECT(QueryStatus_SETPROGRESSTEXT); + SET_EXPECT(Exec_SETPROGRESSMAX); + SET_EXPECT(Exec_SETPROGRESSPOS); + } SET_EXPECT(Invoke_SETSECURELOCKICON); SET_EXPECT(Invoke_FILEDOWNLOAD); if (use_container_olecmd) SET_EXPECT(Exec_SETDOWNLOADSTATE_0); @@ -2725,9 +2727,11 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) CLEAR_CALLED(GetOptionKeyPath); CHECK_CALLED(GetOverridesKeyPath); } - if (use_container_olecmd) todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); - if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); - if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); + if (use_container_olecmd) { + todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); + todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); + todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); + } todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); todo_wine CHECK_CALLED(Invoke_FILEDOWNLOAD);

1 0

Michael Stefaniuc : winhlp32: Simplify code that happened to work by chance (PVS-Studio).
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 9bf064a67a9e884d2b6766a065a0a3e50a542ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf064a67a9e884d2b6766a06… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:17:21 2015 +0100 winhlp32: Simplify code that happened to work by chance (PVS-Studio). --- programs/winhlp32/winhelp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index ee5eecd..17fe90c 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1519,11 +1519,11 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_INITMENUPOPUP: win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0); CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_SMALL, - MF_BYCOMMAND | (win->font_scale == 0) ? MF_CHECKED : 0); + (win->font_scale == 0) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_NORMAL, - MF_BYCOMMAND | (win->font_scale == 1) ? MF_CHECKED : 0); + (win->font_scale == 1) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE, - MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0); + (win->font_scale == 2) ? MF_CHECKED : MF_UNCHECKED); break; case WM_DESTROY: win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0);

1 0

Michael Stefaniuc : msctf/tests: Remove an unsused assignment (PVS-Studio) .
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 5c9d24702f0199ed3b73f151b478349ecfe8152d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9d24702f0199ed3b73f151b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:01:03 2015 +0100 msctf/tests: Remove an unsused assignment (PVS-Studio). --- dlls/msctf/tests/inputprocessor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index dfa8731..2cc172d 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2174,7 +2174,6 @@ static void test_AssociateFocus(void) test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); DestroyWindow(wnd2); - test_OnSetFocus = SINK_UNEXPECTED; test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus);

1 0