February 2009 - Wine-Commits

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_fontSize.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: fc851aa48aa11c7f370ab9a24df89aa07351aa95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc851aa48aa11c7f370ab9a24… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 21 21:14:48 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_fontSize. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 4c02b3f..ce2945d 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -188,8 +188,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_fontWeight(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_fontSize(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_FONT_SIZE, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_backgroundImage(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ca05f6e..bf84cda 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2445,6 +2445,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); ok( V_I4(&v) == 400, "expect 400 got (%d)\n", V_I4(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_fontSize(current_style, &v); + ok(hres == S_OK, "get_fontSize failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_fontWeight .
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 64af8b3f7e4e968fc316f4f596826cee86bd0893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64af8b3f7e4e968fc316f4f59… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 21 21:08:17 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_fontWeight. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 4 ---- dlls/mshtml/htmlstyle.h | 4 ++++ dlls/mshtml/tests/dom.c | 7 +++++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index e376056..4c02b3f 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -181,8 +181,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_fontVariant(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_fontWeight(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_FONT_WEIGHT, p, ATTR_STR_TO_INT); } static HRESULT WINAPI HTMLCurrentStyle_get_fontSize(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 84edd94..769e14e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -212,10 +212,6 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -#define ATTR_FIX_PX 1 -#define ATTR_FIX_URL 2 -#define ATTR_STR_TO_INT 4 - HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LPCWSTR value, DWORD flags) { nsAString str_name, str_value, str_empty; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 7cf135a..8db28df 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -80,3 +80,7 @@ HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,LPCWSTR,DWORD); HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags); HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags); + +#define ATTR_FIX_PX 1 +#define ATTR_FIX_URL 2 +#define ATTR_STR_TO_INT 4 diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c2f51b7..ca05f6e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2371,6 +2371,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) { BSTR str; HRESULT hres; + VARIANT v; test_disp((IUnknown*)current_style, &DIID_DispHTMLCurrentStyle); test_ifaces((IUnknown*)current_style, cstyle_iids); @@ -2438,6 +2439,12 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_cursor failed: %08x\n", hres); ok(!strcmp_wa(str, "default"), "get_cursor returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok( V_I4(&v) == 400, "expect 400 got (%d)\n", V_I4(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Stefan Dösinger : d3d9: Add an alpha blending test.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 4aa0591c96b498528ca1b9a09f23632433830610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa0591c96b498528ca1b9a09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 10 17:38:15 2009 +0100 d3d9: Add an alpha blending test. --- dlls/d3d9/tests/visual.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f1f140b..4cb3497 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9898,6 +9898,133 @@ static void zwriteenable_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); } +static void alphatest_test(IDirect3DDevice9 *device) { +#define ALPHATEST_PASSED 0x0000ff00 +#define ALPHATEST_FAILED 0x00ff0000 + struct { + D3DCMPFUNC func; + DWORD color_less; + DWORD color_equal; + DWORD color_greater; + } testdata[] = { + { D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED }, + { D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED }, + { D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED }, + { D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED }, + { D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED }, + { D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED }, + { D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED }, + { D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED }, + }; + unsigned int i, j; + HRESULT hr; + DWORD color; + struct vertex quad[] = { + { -1.0, -1.0, 0.1, ALPHATEST_PASSED | 0x80000000 }, + { 1.0, -1.0, 0.1, ALPHATEST_PASSED | 0x80000000 }, + { -1.0, 1.0, 0.1, ALPHATEST_PASSED | 0x80000000 }, + { 1.0, 1.0, 0.1, ALPHATEST_PASSED | 0x80000000 }, + }; + D3DCAPS9 caps; + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHATESTENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with 0x%08x\n", hr); + + for(j = 0; j < 2; j++) { + if(j == 1) { + /* Try a pixel shader instead of fixed function. The wined3d code may emulate + * the alpha test either for performance reasons(floating point RTs) or to work + * around driver bugs(Geforce 7x00 cards on MacOS). There may be a different + * codepath for ffp and shader in this case, and the test should cover both + */ + IDirect3DPixelShader9 *ps; + DWORD shader_code[] = { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff /* end */ + }; + memset(&caps, 0, sizeof(caps)); + IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed with 0x%08x\n", hr); + if(caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) { + break; + } + + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &ps); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed with 0x%08x\n", hr); + IDirect3DDevice9_SetPixelShader(device, ps); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with 0x%08x\n", hr); + IDirect3DPixelShader9_Release(ps); + } + + for(i = 0; i < (sizeof(testdata)/sizeof(testdata[0])); i++) { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, testdata[i].func); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAREF, 0x90); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with 0x%08x\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, testdata[i].color_less, 1), "Alphatest failed. Got color 0x%08x, expected 0x%08x. alpha < ref, func %u\n", + color, testdata[i].color_less, testdata[i].func); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAREF, 0x80); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with 0x%08x\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, testdata[i].color_equal, 1), "Alphatest failed. Got color 0x%08x, expected 0x%08x. alpha == ref, func %u\n", + color, testdata[i].color_equal, testdata[i].func); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAREF, 0x70); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with 0x%08x\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, testdata[i].color_greater, 1), "Alphatest failed. Got color 0x%08x, expected 0x%08x. alpha > ref, func %u\n", + color, testdata[i].color_greater, testdata[i].func); + } + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHATESTENABLE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with 0x%08x\n", hr); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -9995,6 +10122,7 @@ START_TEST(visual) np2_stretch_rect_test(device_ptr); yuv_color_test(device_ptr); zwriteenable_test(device_ptr); + alphatest_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) {

1 0

Stefan Dösinger : wined3d: Properly update last_was_pshader.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 6012475e5999bee20d0418dcaf016d6729191b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6012475e5999bee20d0418dca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 19 12:29:49 2009 +0100 wined3d: Properly update last_was_pshader. --- dlls/wined3d/arb_program_shader.c | 3 +++ dlls/wined3d/ati_fragment_shader.c | 1 + dlls/wined3d/state.c | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 33619b6..f1e8230 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3031,6 +3031,9 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, state_texfactor_arbfp(STATE_RENDER(WINED3DRS_TEXTUREFACTOR), stateblock, context); state_arb_specularenable(STATE_RENDER(WINED3DRS_SPECULARENABLE), stateblock, context); } + context->last_was_pshader = FALSE; + } else { + context->last_was_pshader = TRUE; } /* Finally, select the shader. If a pixel shader is used, it will be set and enabled by the shader backend. diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 4fe5430..5555208 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -885,6 +885,7 @@ static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *statebl IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL use_vshader = use_vs(stateblock); + context->last_was_pshader = use_ps(stateblock); /* The ATIFS code does not support pixel shaders currently, but we have to provide a state handler * to call shader_select to select a vertex shader if one is applied because the vertex shader state * may defer calling the shader backend if the pshader state is dirty. diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c3344f6..6b36a3d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3408,6 +3408,7 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC sampler(STATE_SAMPLER(i), stateblock, context); } } + context->last_was_pshader = TRUE; } else { /* Otherwise all samplers were activated by the code above in earlier draws, or by sampler() * if a different texture was bound. I don't have to do anything. @@ -3423,6 +3424,7 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC (STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock, context); } } + context->last_was_pshader = FALSE; } if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) {

1 0

Vincent Povirk : shell32: Implement UnixFolder_IShellFolder2_GetDefaultColumn.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 7236452df83f57aa5c6f951f42ad0e121cf7e639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7236452df83f57aa5c6f951f4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 13 17:07:32 2009 -0600 shell32: Implement UnixFolder_IShellFolder2_GetDefaultColumn. --- dlls/shell32/shfldr_unixfs.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index f50e284..9d4e956 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1273,8 +1273,14 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_EnumSearches(IShellFolder2* iface static HRESULT WINAPI UnixFolder_IShellFolder2_GetDefaultColumn(IShellFolder2* iface, DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(iface=%p,dwReserved=%x,pSort=%p,pDisplay=%p)\n", iface, dwReserved, pSort, pDisplay); + + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + + return S_OK; } static HRESULT WINAPI UnixFolder_IShellFolder2_GetDefaultColumnState(IShellFolder2* iface,

1 0

Vincent Povirk : shell32: Add IPersistIDList interface to ShellItem objects .
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 443809296064660de2a588bb09a51062b52d6fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=443809296064660de2a588bb0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 13 16:34:42 2009 -0600 shell32: Add IPersistIDList interface to ShellItem objects. --- dlls/shell32/shellitem.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d16b35d..d65513d 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -42,9 +42,16 @@ typedef struct _ShellItem { const IShellItemVtbl *lpIShellItemVtbl; LONG ref; LPITEMIDLIST pidl; + const IPersistIDListVtbl *lpIPersistIDListVtbl; } ShellItem; +static inline ShellItem *impl_from_IPersistIDList( IPersistIDList *iface ) +{ + return (ShellItem*)((char*)iface - FIELD_OFFSET(ShellItem, lpIPersistIDListVtbl)); +} + + static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, void **ppv) { @@ -58,6 +65,10 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, { *ppv = This; } + else if (IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistIDList, riid)) + { + *ppv = &(This->lpIPersistIDListVtbl); + } else { FIXME("not implemented for %s\n", shdebugstr_guid(riid)); *ppv = NULL; @@ -153,6 +164,70 @@ static const IShellItemVtbl ShellItem_Vtbl = { }; +static HRESULT WINAPI ShellItem_GetClassID(ShellItem* This, CLSID *pClassID) +{ + TRACE("(%p,%p)\n", This, pClassID); + + *pClassID = CLSID_ShellItem; + return S_OK; +} + + +static HRESULT WINAPI ShellItem_IPersistIDList_QueryInterface(IPersistIDList *iface, + REFIID riid, void **ppv) +{ + ShellItem *This = impl_from_IPersistIDList(iface); + return ShellItem_QueryInterface((IShellItem*)This, riid, ppv); +} + +static ULONG WINAPI ShellItem_IPersistIDList_AddRef(IPersistIDList *iface) +{ + ShellItem *This = impl_from_IPersistIDList(iface); + return ShellItem_AddRef((IShellItem*)This); +} + +static ULONG WINAPI ShellItem_IPersistIDList_Release(IPersistIDList *iface) +{ + ShellItem *This = impl_from_IPersistIDList(iface); + return ShellItem_Release((IShellItem*)This); +} + +static HRESULT WINAPI ShellItem_IPersistIDList_GetClassID(IPersistIDList* iface, + CLSID *pClassID) +{ + ShellItem *This = impl_from_IPersistIDList(iface); + + return ShellItem_GetClassID(This, pClassID); +} + +static HRESULT WINAPI ShellItem_IPersistIDList_SetIDList(IPersistIDList* iface, + LPCITEMIDLIST pidl) +{ + ShellItem *This = impl_from_IPersistIDList(iface); + + FIXME("(%p,%p)\n", This, pidl); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellItem_IPersistIDList_GetIDList(IPersistIDList* iface, + LPITEMIDLIST *ppidl) +{ + ShellItem *This = impl_from_IPersistIDList(iface); + + FIXME("(%p,%p)\n", This, ppidl); + return E_NOTIMPL; +} + +static const IPersistIDListVtbl ShellItem_IPersistIDList_Vtbl = { + ShellItem_IPersistIDList_QueryInterface, + ShellItem_IPersistIDList_AddRef, + ShellItem_IPersistIDList_Release, + ShellItem_IPersistIDList_GetClassID, + ShellItem_IPersistIDList_SetIDList, + ShellItem_IPersistIDList_GetIDList +}; + + HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { ShellItem *This; @@ -168,6 +243,7 @@ HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **p This->lpIShellItemVtbl = &ShellItem_Vtbl; This->ref = 1; This->pidl = NULL; + This->lpIPersistIDListVtbl = &ShellItem_IPersistIDList_Vtbl; ret = ShellItem_QueryInterface((IShellItem*)This, riid, ppv); ShellItem_Release((IShellItem*)This);

1 0

Vincent Povirk : include: Add IPersistIDList to headers.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: a5c22d0070f6c9fd1b04a7099d42614f1ffc379d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c22d0070f6c9fd1b04a7099… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 13 15:53:23 2009 -0600 include: Add IPersistIDList to headers. --- include/shobjidl.idl | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e73c5d2..324f5e5 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -69,6 +69,21 @@ interface IPersistFolder2 : IPersistFolder /***************************************************************************** + * IPersistIDList interface + */ +[ + object, + uuid(1079acfc-29bd-11d3-8e0d-00c04f6837d5), + pointer_default(unique) +] +interface IPersistIDList : IPersist +{ + HRESULT SetIDList( [in] LPCITEMIDLIST pidl ); + HRESULT GetIDList( [out] LPITEMIDLIST *ppidl ); +} + + +/***************************************************************************** * IEnumIDList interface */ [

1 0

Vincent Povirk : shell32: Partially implement SHCreateShellItem.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 9b9325fbd107688ded0a6e2f3c7e1c8035a9e025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9325fbd107688ded0a6e2f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 18 12:32:00 2009 -0600 shell32: Partially implement SHCreateShellItem. --- dlls/shell32/pidl.c | 7 ------- dlls/shell32/shellitem.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 95d5b1a..f3534d1 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2369,10 +2369,3 @@ LPITEMIDLIST* _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida) return dst; } - -HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, - IShellFolder *psfParent, LPCITEMIDLIST pidl, IShellItem **ppsi) -{ - FIXME("STUB: %p %p %p %p\n",pidlParent, psfParent, pidl, ppsi); - return E_NOINTERFACE; -} diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 53964a7..d16b35d 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -174,3 +174,38 @@ HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **p return ret; } + +HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, + IShellFolder *psfParent, LPCITEMIDLIST pidl, IShellItem **ppsi) +{ + ShellItem *This; + LPITEMIDLIST new_pidl; + HRESULT ret; + + TRACE("(%p,%p,%p,%p)\n", pidlParent, psfParent, pidl, ppsi); + + if (!pidlParent && !psfParent && pidl) + { + new_pidl = ILClone(pidl); + if (!new_pidl) + return E_OUTOFMEMORY; + } + else + { + FIXME("(%p,%p,%p) not implemented\n", pidlParent, psfParent, pidl); + return E_NOINTERFACE; + } + + ret = IShellItem_Constructor(NULL, &IID_IShellItem, (void**)&This); + if (This) + { + *ppsi = (IShellItem*)This; + This->pidl = new_pidl; + } + else + { + *ppsi = NULL; + ILFree(new_pidl); + } + return ret; +}

1 0

Vincent Povirk : shell32: Add stub implementation of IShellItem.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: e69c663c6668b0e4cb3ed10601a193e68678b277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69c663c6668b0e4cb3ed1060… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 18 12:32:32 2009 -0600 shell32: Add stub implementation of IShellItem. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellitem.c | 176 +++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shellole.c | 1 + include/shlguid.h | 2 + 5 files changed, 181 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 4fe4300..d416eec 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -29,6 +29,7 @@ C_SRCS = \ recyclebin.c \ regsvr.c \ shell32_main.c \ + shellitem.c \ shelllink.c \ shellole.c \ shellord.c \ diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 88ffb0c..973e526 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -85,6 +85,7 @@ IContextMenu2 * ISvBgCm_Constructor(LPSHELLFOLDER pSFParent, BOOL bDesktop); LPSHELLVIEW IShellView_Constructor(LPSHELLFOLDER); HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +HRESULT WINAPI IShellItem_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IShellLink_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv); HRESULT WINAPI ISF_Desktop_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c new file mode 100644 index 0000000..53964a7 --- /dev/null +++ b/dlls/shell32/shellitem.c @@ -0,0 +1,176 @@ +/* + * IShellItem implementation + * + * Copyright 2008 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdio.h> +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +#include "pidl.h" +#include "shell32_main.h" +#include "debughlp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +typedef struct _ShellItem { + const IShellItemVtbl *lpIShellItemVtbl; + LONG ref; + LPITEMIDLIST pidl; +} ShellItem; + + +static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, + void **ppv) +{ + ShellItem *This = (ShellItem*)iface; + + TRACE("(%p,%p,%p)\n", iface, riid, ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IShellItem, riid)) + { + *ppv = This; + } + else { + FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ShellItem_AddRef(IShellItem *iface) +{ + ShellItem *This = (ShellItem*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ShellItem_Release(IShellItem *iface) +{ + ShellItem *This = (ShellItem*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + if (ref == 0) + { + ILFree(This->pidl); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, + REFGUID rbhid, REFIID riid, void **ppvOut) +{ + FIXME("(%p,%p,%s,%p,%p)\n", iface, pbc, shdebugstr_guid(rbhid), riid, ppvOut); + + *ppvOut = NULL; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellItem_GetParent(IShellItem *iface, IShellItem **ppsi) +{ + FIXME("(%p,%p)\n", iface, ppsi); + + *ppsi = NULL; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellItem_GetDisplayName(IShellItem *iface, SIGDN sigdnName, + LPWSTR *ppszName) +{ + FIXME("(%p,%x,%p)\n", iface, sigdnName, ppszName); + + *ppszName = NULL; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellItem_GetAttributes(IShellItem *iface, SFGAOF sfgaoMask, + SFGAOF *psfgaoAttribs) +{ + FIXME("(%p,%x,%p)\n", iface, sfgaoMask, psfgaoAttribs); + + *psfgaoAttribs = 0; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellItem_Compare(IShellItem *iface, IShellItem *oth, + SICHINTF hint, int *piOrder) +{ + FIXME("(%p,%p,%x,%p)\n", iface, oth, hint, piOrder); + + return E_NOTIMPL; +} + +static const IShellItemVtbl ShellItem_Vtbl = { + ShellItem_QueryInterface, + ShellItem_AddRef, + ShellItem_Release, + ShellItem_BindToHandler, + ShellItem_GetParent, + ShellItem_GetDisplayName, + ShellItem_GetAttributes, + ShellItem_Compare +}; + + +HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + ShellItem *This; + HRESULT ret; + + TRACE("(%p,%s)\n",pUnkOuter, debugstr_guid(riid)); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ShellItem)); + This->lpIShellItemVtbl = &ShellItem_Vtbl; + This->ref = 1; + This->pidl = NULL; + + ret = ShellItem_QueryInterface((IShellItem*)This, riid, ppv); + ShellItem_Release((IShellItem*)This); + + return ret; +} diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 69229f3..9e63c1e 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -64,6 +64,7 @@ static const struct { {&CLSID_MyComputer, ISF_MyComputer_Constructor}, {&CLSID_NetworkPlaces, ISF_NetworkPlaces_Constructor}, {&CLSID_ShellDesktop, ISF_Desktop_Constructor}, + {&CLSID_ShellItem, IShellItem_Constructor}, {&CLSID_ShellLink, IShellLink_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, diff --git a/include/shlguid.h b/include/shlguid.h index d7c2b55..1692dec 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -131,6 +131,8 @@ DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); +DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); + #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); #define PID_FINDDATA 0

1 0

Vincent Povirk : include: Add IShellItem to headers.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 66258ccc29b00e983d975378227d322cb07bd73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=66258ccc29b00e983d9753782… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 7 14:53:17 2009 -0600 include: Add IShellItem to headers. --- dlls/shell32/pidl.c | 2 +- include/shlobj.h | 1 + include/shobjidl.idl | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c259d24..95d5b1a 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2371,7 +2371,7 @@ LPITEMIDLIST* _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida) } HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, - IShellFolder *psfParent, LPCITEMIDLIST pidl, void **ppsi) + IShellFolder *psfParent, LPCITEMIDLIST pidl, IShellItem **ppsi) { FIXME("STUB: %p %p %p %p\n",pidlParent, psfParent, pidl, ppsi); return E_NOINTERFACE; diff --git a/include/shlobj.h b/include/shlobj.h index 6480023..b7efc85 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -44,6 +44,7 @@ LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); +HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*); DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*); #define SHCLSIDFromString WINELIB_NAME_AW(SHCLSIDFromString) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 07baea7..e73c5d2 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -337,6 +337,42 @@ interface IShellFolder2 : IShellFolder HRESULT MapColumnToSCID( [in] UINT iColumn, [in] SHCOLUMNID *pscid ); } +/***************************************************************************** + * IShellItem interface + */ +[ + object, + uuid(43826d1e-e718-42ee-bc55-a1e261c37bfe), + pointer_default(unique) +] +interface IShellItem : IUnknown +{ + typedef DWORD SIGDN; + + typedef DWORD SICHINTF; + + HRESULT BindToHandler( + [in] IBindCtx *pbc, + [in] REFGUID rbhid, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvOut); + + HRESULT GetParent( [out] IShellItem **ppsi ); + + HRESULT GetDisplayName( + [in] SIGDN sigdnName, + [out] LPWSTR *ppszName); + + HRESULT GetAttributes( + [in] SFGAOF sfgaoMask, + [out] SFGAOF *psfgaoAttribs); + + HRESULT Compare( + [in] IShellItem *psi, + [in] SICHINTF hint, + [out] int *piOrder); +} + /*****************************************************************************

1 0