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

Nikolay Sivov : shell32: Forward AutoArrange() to IFolderView2.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: 7e0e82bc9c4d598cce883af232d2efdcc7bfe9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0e82bc9c4d598cce883af23… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:20:45 2015 +0300 shell32: Forward AutoArrange() to IFolderView2. --- dlls/shell32/shlview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f0e153c..549ba01 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3145,8 +3145,8 @@ static HRESULT WINAPI IShellFolderView_fnArrangeGrid(IShellFolderView *iface) static HRESULT WINAPI IShellFolderView_fnAutoArrange(IShellFolderView *iface) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p) stub\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return IFolderView2_SetCurrentFolderFlags(&This->IFolderView2_iface, FWF_AUTOARRANGE, FWF_AUTOARRANGE); } static HRESULT WINAPI IShellFolderView_fnGetAutoArrange(IShellFolderView *iface)

1 0

Sebastian Lackner : wbemprox/tests: Actually test the return value of IEnumWbemClassObject_Next.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: a5414e8bed17fca54b25d14f291fd20b31513787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5414e8bed17fca54b25d14f2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 06:49:55 2015 +0200 wbemprox/tests: Actually test the return value of IEnumWbemClassObject_Next. --- dlls/wbemprox/tests/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index eb3bd58..8fd027e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -383,7 +383,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) return; } - IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); ok( hr == S_OK, "got %08x\n", hr ); type = 0xdeadbeef;

1 0

Sebastian Lackner : ws2_32: Properly handle closing sockets during a select call.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: 0d2817b161e7c363c1fab523b6645002e980597a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2817b161e7c363c1fab523b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 30 05:43:26 2015 +0200 ws2_32: Properly handle closing sockets during a select call. Based on a patch by Bruno Jesus. --- dlls/ws2_32/socket.c | 13 ++++++++++++- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ef43186..10bfd9d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4773,7 +4773,18 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd if (exceptfds) { for (i = 0; i < exceptfds->fd_count; i++, j++) - if (fds[j].fd != -1) release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + { + if (fds[j].fd == -1) continue; + release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + if (fds[j].revents & POLLHUP) + { + int fd = get_sock_fd( exceptfds->fd_array[i], 0, NULL ); + if (fd != -1) + release_sock_fd( exceptfds->fd_array[i], fd ); + else + fds[j].revents = 0; + } + } } } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f31539f..d67a47d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3834,7 +3834,6 @@ todo_wine FD_ZERO_ALL(); FD_SET_ALL(fdWrite); ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); -todo_wine ok(ret == 1, "expected 1, got %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); WaitForSingleObject (thread_handle, 1000);

1 0

Matteo Bruni : wined3d: Fix the TIMESTAMP_DISJOINT query.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: 4b35cf730f12f993176be85aa9aabf9b532aed6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b35cf730f12f993176be85aa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:15 2015 +0200 wined3d: Fix the TIMESTAMP_DISJOINT query. Spotted by Patrick Rudolph. --- dlls/wined3d/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 0ec578d..9e6f21a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -650,7 +650,7 @@ static HRESULT wined3d_timestamp_disjoint_query_ops_get_data(struct wined3d_quer if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT) { - static const struct wined3d_query_data_timestamp_disjoint disjoint_data = {FALSE, 1000 * 1000 * 1000}; + static const struct wined3d_query_data_timestamp_disjoint disjoint_data = {1000 * 1000 * 1000, FALSE}; if (query->state == QUERY_BUILDING) {

1 0

Matteo Bruni : ddraw/tests: Add a ddraw2 specular lighting test.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: 0cc7daebd84cc8cad79b4dd16a829cb5a3457418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc7daebd84cc8cad79b4dd16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:14 2015 +0200 ddraw/tests: Add a ddraw2 specular lighting test. --- dlls/ddraw/tests/ddraw2.c | 284 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 283 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cc7daebd84cc8cad79b4…

1 0

Matteo Bruni : wined3d: Check all the ffp_material fields.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: 2bab1f7250b89021e7c0c246c4594cf919a98c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bab1f7250b89021e7c0c246c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:12 2015 +0200 wined3d: Check all the ffp_material fields. The application can override each material parameter with one of the two FFP vertex color attributes. The 'ambient' struct field in the GLSL shader can thus happen to be unused and the GL driver may optimize it away. --- dlls/wined3d/glsl_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a5399b2..0a130e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6761,7 +6761,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const break; } } - if (entry->vs.material_ambient_location != -1) + if (entry->vs.material_ambient_location != -1 || entry->vs.material_diffuse_location != -1 + || entry->vs.material_specular_location != -1 + || entry->vs.material_emissive_location != -1 + || entry->vs.material_shininess_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; if (entry->vs.light_ambient_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_LIGHTS;

1 0

Nikolay Sivov : shell32: Implement GetSelectedCount() using IFolderView2:: GetSelection().
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: a6163247cd10e789f71db547c20233ceb5d88a06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6163247cd10e789f71db547c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:29:21 2015 +0300 shell32: Implement GetSelectedCount() using IFolderView2::GetSelection(). --- dlls/shell32/shlview.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 1676996..8352157 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3254,8 +3254,19 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedCount( UINT *count) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p) stub\n", This, count); - return E_NOTIMPL; + IShellItemArray *selection; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, count); + + *count = 0; + hr = IFolderView2_GetSelection(&This->IFolderView2_iface, FALSE, &selection); + if (FAILED(hr)) + return hr; + + hr = IShellItemArray_GetCount(selection, count); + IShellItemArray_Release(selection); + return hr; } static HRESULT WINAPI IShellFolderView_fnGetSelectedObjects(

1 0

Nikolay Sivov : shell32: Forward SetRedraw to IFolderView2.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: be6e022f2d740b06992a0031aad6f19cde906834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6e022f2d740b06992a0031a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:22:28 2015 +0300 shell32: Forward SetRedraw to IFolderView2. --- dlls/shell32/shlview.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 549ba01..1676996 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -625,7 +625,7 @@ static INT CALLBACK fill_list( LPVOID ptr, LPVOID arg ) static HRESULT ShellView_FillList(IShellViewImpl *This) { - IShellFolderView *folderview = &This->IShellFolderView_iface; + IFolderView2 *folderview = &This->IFolderView2_iface; LPENUMIDLIST pEnumIDList; LPITEMIDLIST pidl; DWORD fetched; @@ -658,9 +658,9 @@ static HRESULT ShellView_FillList(IShellViewImpl *This) /* sort the array */ DPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent); - IShellFolderView_SetRedraw(folderview, FALSE); + IFolderView2_SetRedraw(folderview, FALSE); DPA_DestroyCallback(hdpa, fill_list, This); - IShellFolderView_SetRedraw(folderview, TRUE); + IFolderView2_SetRedraw(folderview, TRUE); IEnumIDList_Release(pEnumIDList); @@ -3038,8 +3038,9 @@ static HRESULT WINAPI FolderView2_GetGroupSubsetCount(IFolderView2 *iface, UINT static HRESULT WINAPI FolderView2_SetRedraw(IFolderView2 *iface, BOOL redraw) { IShellViewImpl *This = impl_from_IFolderView2(iface); - FIXME("(%p)->(%d), stub\n", This, redraw); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, redraw); + SendMessageW(This->hWndList, WM_SETREDRAW, redraw, 0); + return S_OK; } static HRESULT WINAPI FolderView2_IsMoveInSameFolder(IFolderView2 *iface) @@ -3245,10 +3246,7 @@ static HRESULT WINAPI IShellFolderView_fnSetRedraw( { IShellViewImpl *This = impl_from_IShellFolderView(iface); TRACE("(%p)->(%d)\n", This, redraw); - - SendMessageW(This->hWndList, WM_SETREDRAW, redraw, 0); - - return S_OK; + return IFolderView2_SetRedraw(&This->IFolderView2_iface, redraw); } static HRESULT WINAPI IShellFolderView_fnGetSelectedCount(

1 0

Nikolay Sivov : shell32: Fix multiline trace message and some magic numbers.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: a897adb67b967a8e2245e167a9ea5753e3af3183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a897adb67b967a8e2245e167a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:03:33 2015 +0300 shell32: Fix multiline trace message and some magic numbers. --- dlls/shell32/shlview.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d6c427e..f0e153c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2249,19 +2249,20 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec( { IShellViewImpl *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08x Opt:0x%08x %p %p)\n", - This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); + FIXME("(%p)->(%s %d 0x%08x %s %p)\n", + This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); if (!pguidCmdGroup) return OLECMDERR_E_UNKNOWNGROUP; + if (IsEqualIID(pguidCmdGroup, &CGID_Explorer) && - (nCmdID == 0x29) && + (nCmdID == OLECMDID_SHOWMESSAGE) && (nCmdexecopt == 4) && pvaOut) return S_OK; if (IsEqualIID(pguidCmdGroup, &CGID_ShellDocView) && - (nCmdID == 9) && - (nCmdexecopt == 0)) - return 1; + (nCmdID == OLECMDID_SPELL) && + (nCmdexecopt == OLECMDEXECOPT_DODEFAULT)) + return S_FALSE; return OLECMDERR_E_UNKNOWNGROUP; }

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_returnValue implementation.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: 71cae1fcebb6d0cb78279e81b28caf663c5a9b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cae1fcebb6d0cb78279e81b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 19:14:25 2015 +0200 mshtml: Added IHTMLEventObj::get_returnValue implementation. --- dlls/mshtml/htmlevent.c | 7 ++++--- dlls/mshtml/tests/events.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 30ce6b1..1687aba 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -265,6 +265,7 @@ typedef struct { HTMLDOMNode *target; const event_info_t *type; nsIDOMEvent *nsevent; + VARIANT return_value; BOOL prevent_default; BOOL cancel_bubble; } HTMLEventObj; @@ -469,6 +470,7 @@ static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT return DISP_E_BADVARTYPE; } + This->return_value = v; if(!V_BOOL(&v)) This->prevent_default = TRUE; return S_OK; @@ -478,10 +480,9 @@ static HRESULT WINAPI HTMLEventObj_get_returnValue(IHTMLEventObj *iface, VARIANT { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - V_VT(p) = VT_EMPTY; - return S_OK; + return VariantCopy(p, &This->return_value); } static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index e3e7f72..11a91da 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1057,6 +1057,7 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { IHTMLEventObj *event; + VARIANT v; HRESULT hres; CHECK_EXPECT(submit_onclick_setret); @@ -1068,10 +1069,20 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID ok(hres == S_OK, "get_event failed: %08x\n", hres); ok(event != NULL, "event == NULL\n"); + V_VT(&v) = VT_ERROR; + hres = IHTMLEventObj_get_returnValue(event, &v); + ok(hres == S_OK, "get_returnValue failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(returnValue) = %d\n", V_VT(&v)); + hres = IHTMLEventObj_put_returnValue(event, onclick_event_retval); ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); IHTMLEventObj_Release(event); + V_VT(&v) = VT_ERROR; + hres = IHTMLEventObj_get_returnValue(event, &v); + ok(hres == S_OK, "get_returnValue failed: %08x\n", hres); + ok(VarCmp(&v, &onclick_event_retval, 0, 0) == VARCMP_EQ, "unexpected returnValue\n"); + *pvarRes = onclick_retval; return S_OK; }

1 0