wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Matteo Bruni : ddraw/tests: Accept broken testbot result for test_clear_rect_count().
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 6418a489e075ade7fa32dd3ea2eafb3b54fe86e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6418a489e075ade7fa32dd3ea… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:13 2015 +0200 ddraw/tests: Accept broken testbot result for test_clear_rect_count(). --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index da550b5..39e1570 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3212,7 +3212,8 @@ static void test_clear_rect_count(void) ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)), + "Got unexpected color 0x%08x.\n", color); IDirectDrawSurface_Release(rt); destroy_viewport(device, viewport); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ce31cd6..8e543ab 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3457,7 +3457,8 @@ static void test_clear_rect_count(void) ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)), + "Got unexpected color 0x%08x.\n", color); IDirectDrawSurface_Release(rt); destroy_viewport(device, viewport); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d3c9a34..f8e6e21 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4321,7 +4321,8 @@ static void test_clear_rect_count(void) ok(SUCCEEDED(hr), "Failed to clear the viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)), + "Got unexpected color 0x%08x.\n", color); IDirect3DViewport3_Release(viewport); IDirectDrawSurface4_Release(rt); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b8691b8..573be3b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3942,7 +3942,7 @@ static void test_clear_rect_count(void) ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x00ffffff, 1), + ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x00ff0000, 1)), "Clear with count = 0, rect != NULL has color %#08x.\n", color); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ffffff, 1.0f, 0);

1 0

Matteo Bruni : wined3d: Check all the ffp_material fields.
by Alexandre Julliard 05 May '15

05 May '15

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

Matteo Bruni : wined3d: Rename *emission* as *emissive*.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 0c05f9f8fdfeb9988953aefe643dbde1c19da969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c05f9f8fdfeb9988953aefe6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:11 2015 +0200 wined3d: Rename *emission* as *emissive*. Emission is the OpenGL name, emissive the D3D one. Prefer the latter. --- dlls/wined3d/glsl_shader.c | 14 +++++++------- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fe1cef1..a5399b2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -126,7 +126,7 @@ struct glsl_vs_program GLint material_ambient_location; GLint material_diffuse_location; GLint material_specular_location; - GLint material_emission_location; + GLint material_emissive_location; GLint material_shininess_location; GLint light_ambient_location; struct @@ -1111,7 +1111,7 @@ static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context } GL_EXTCALL(glUniform4fv(prog->vs.material_ambient_location, 1, &state->material.ambient.r)); GL_EXTCALL(glUniform4fv(prog->vs.material_diffuse_location, 1, &state->material.diffuse.r)); - GL_EXTCALL(glUniform4fv(prog->vs.material_emission_location, 1, &state->material.emissive.r)); + GL_EXTCALL(glUniform4fv(prog->vs.material_emissive_location, 1, &state->material.emissive.r)); checkGLcall("setting FFP material uniforms"); } @@ -5413,7 +5413,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer const struct wined3d_ffp_vs_settings *settings, const struct wined3d_gl_info *gl_info, BOOL legacy_lighting) { - const char *diffuse, *specular, *emission, *ambient; + const char *diffuse, *specular, *emissive, *ambient; enum wined3d_light_type light_type; unsigned int i; @@ -5433,7 +5433,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer ambient = shader_glsl_ffp_mcs(settings->ambient_source, "ffp_material.ambient"); diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "ffp_material.diffuse"); specular = shader_glsl_ffp_mcs(settings->specular_source, "ffp_material.specular"); - emission = shader_glsl_ffp_mcs(settings->emission_source, "ffp_material.emission"); + emissive = shader_glsl_ffp_mcs(settings->emissive_source, "ffp_material.emissive"); for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) { @@ -5563,7 +5563,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer } shader_addline(buffer, "gl_FrontColor.xyz = %s.xyz * ambient + %s.xyz * diffuse + %s.xyz;\n", - ambient, diffuse, emission); + ambient, diffuse, emissive); shader_addline(buffer, "gl_FrontColor.w = %s.w;\n", diffuse); shader_addline(buffer, "gl_FrontSecondaryColor = %s * specular;\n", specular); } @@ -5587,7 +5587,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe shader_addline(buffer, "uniform mat4 ffp_texture_matrix[%u];\n", MAX_TEXTURES); shader_addline(buffer, "uniform struct\n{\n"); - shader_addline(buffer, " vec4 emission;\n"); + shader_addline(buffer, " vec4 emissive;\n"); shader_addline(buffer, " vec4 ambient;\n"); shader_addline(buffer, " vec4 diffuse;\n"); shader_addline(buffer, " vec4 specular;\n"); @@ -6410,7 +6410,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->material_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.ambient")); vs->material_diffuse_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.diffuse")); vs->material_specular_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.specular")); - vs->material_emission_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emission")); + vs->material_emissive_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emissive")); vs->material_shininess_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.shininess")); vs->light_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_light_ambient")); for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index eb2cbfa..f2088bf 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4232,14 +4232,14 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct if (state->render_states[WINED3D_RS_COLORVERTEX] && (si->use_map & (1 << WINED3D_FFP_DIFFUSE))) { settings->diffuse_source = state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]; - settings->emission_source = state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]; + settings->emissive_source = state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]; settings->ambient_source = state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]; settings->specular_source = state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]; } else { settings->diffuse_source = WINED3D_MCS_MATERIAL; - settings->emission_source = WINED3D_MCS_MATERIAL; + settings->emissive_source = WINED3D_MCS_MATERIAL; settings->ambient_source = WINED3D_MCS_MATERIAL; settings->specular_source = WINED3D_MCS_MATERIAL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fafdb20..f23197d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1870,7 +1870,7 @@ struct wined3d_ffp_vs_settings { DWORD light_type : 24; /* MAX_ACTIVE_LIGHTS, 8 * 3 */ DWORD diffuse_source : 2; - DWORD emission_source : 2; + DWORD emissive_source : 2; DWORD ambient_source : 2; DWORD specular_source : 2;

1 0

Nikolay Sivov : explorer: Added IDispatch support for IShellWindows.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: d1e309abe2b7790f7a62c2536ce409200bcf9455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e309abe2b7790f7a62c2536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 22:27:44 2015 +0300 explorer: Added IDispatch support for IShellWindows. --- programs/explorer/desktop.c | 51 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 03008f4..7ee6174 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -67,13 +67,13 @@ static unsigned int nb_launchers, nb_allocated; static REFIID tid_ids[] = { - &IID_NULL, + &IID_IShellWindows, &IID_IWebBrowser2 }; typedef enum { - NULL_tid, + IShellWindows_tid, IWebBrowser2_tid, LAST_tid } tid_t; @@ -1071,24 +1071,39 @@ static ULONG WINAPI shellwindows_Release(IShellWindows *iface) static HRESULT WINAPI shellwindows_GetTypeInfoCount(IShellWindows *iface, UINT *pctinfo) { - FIXME("%p\n", pctinfo); - return E_NOTIMPL; + TRACE("%p\n", pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI shellwindows_GetTypeInfo(IShellWindows *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("%u 0x%x %p\n", iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%d %d %p\n", iTInfo, lcid, ppTInfo); + return get_typeinfo(IShellWindows_tid, ppTInfo); } static HRESULT WINAPI shellwindows_GetIDsOfNames(IShellWindows *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("%s %p %u 0x%x %p\n", debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%s %p %d %d %p\n", debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if (!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IShellWindows_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI shellwindows_Invoke(IShellWindows *iface, @@ -1096,9 +1111,21 @@ static HRESULT WINAPI shellwindows_Invoke(IShellWindows *iface, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("0x%x %s 0x%x 0x%x %p %p %p %p\n", dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%d %s %d %08x %p %p %p %p\n", dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IShellWindows_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI shellwindows_get_Count(IShellWindows *iface, LONG *count)

1 0

Nikolay Sivov : shell32: Implement GetSelectedCount() using IFolderView2:: GetSelection().
by Alexandre Julliard 05 May '15

05 May '15

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 05 May '15

05 May '15

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: Forward AutoArrange() to IFolderView2.
by Alexandre Julliard 05 May '15

05 May '15

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

Nikolay Sivov : shell32: Fix multiline trace message and some magic numbers.
by Alexandre Julliard 05 May '15

05 May '15

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

Nikolay Sivov : shell32/tests: A test for shellview QI for IOleWindow.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: a7b99a1f892693985f608b9286ab863763a88592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b99a1f892693985f608b928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:01:59 2015 +0300 shell32/tests: A test for shellview QI for IOleWindow. --- dlls/shell32/tests/shlview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 2d323d9..cab0630 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -938,6 +938,7 @@ static void test_IOleWindow(void) { IShellFolder *desktop; IShellView *view; + IOleWindow *wnd; HRESULT hr; hr = SHGetDesktopFolder(&desktop); @@ -946,6 +947,9 @@ static void test_IOleWindow(void) hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); ok(hr == S_OK, "got (0x%08x)\n", hr); + hr = IShellView_QueryInterface(view, &IID_IOleWindow, (void**)&wnd); + ok(hr == E_NOINTERFACE, "got (0x%08x)\n", hr); + /* IShellView::ContextSensitiveHelp */ hr = IShellView_ContextSensitiveHelp(view, TRUE); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr);

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_returnValue implementation.
by Alexandre Julliard 05 May '15

05 May '15

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

← Newer
1
...
34
35
36
37
38
39
40
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015