wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Ihsan Akmal : include: Add missing dxgi.idl constants.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: c553e26f779bf2a170caed4e4c0fe22b84c6e043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c553e26f779bf2a170caed4e4… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 26 17:21:21 2017 +0200 include: Add missing dxgi.idl constants. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index b2e53e3..0626315 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -45,6 +45,16 @@ const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x400L; const UINT DXGI_ENUM_MODES_INTERLACED = 1; const UINT DXGI_ENUM_MODES_SCALING = 2; +const UINT DXGI_RESOURCE_PRIORITY_MINIMUM = 0x28000000; +const UINT DXGI_RESOURCE_PRIORITY_LOW = 0x50000000; +const UINT DXGI_RESOURCE_PRIORITY_NORMAL = 0x78000000; +const UINT DXGI_RESOURCE_PRIORITY_HIGH = 0xa0000000; +const UINT DXGI_RESOURCE_PRIORITY_MAXIMUM = 0xc8000000; + +const UINT DXGI_MAP_READ = 0x1; +const UINT DXGI_MAP_WRITE = 0x2; +const UINT DXGI_MAP_DISCARD = 0x4; + typedef enum DXGI_SWAP_EFFECT { DXGI_SWAP_EFFECT_DISCARD = 0, DXGI_SWAP_EFFECT_SEQUENTIAL = 1, @@ -297,6 +307,8 @@ cpp_quote("#define DXGI_PRESENT_DO_NOT_WAIT __MSABI_LONG(0x00000008U) cpp_quote("#define DXGI_PRESENT_STEREO_PREFER_RIGHT __MSABI_LONG(0x00000010U)") cpp_quote("#define DXGI_PRESENT_STEREO_TEMPORARY_MONO __MSABI_LONG(0x00000020U)") cpp_quote("#define DXGI_PRESENT_RESTRICT_TO_OUTPUT __MSABI_LONG(0x00000040U)") +cpp_quote("#define DXGI_PRESENT_USE_DURATION __MSABI_LONG(0x00000100U)") +cpp_quote("#define DXGI_PRESENT_ALLOW_TEARING __MSABI_LONG(0x00000200U)") [ object,

1 0

Alex Henrie : include: Add D3D_DISABLE_9EX checks to d3d9.h.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 7abed27908f637fe738cffa1e574aa1db3907d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abed27908f637fe738cffa1e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 26 17:21:20 2017 +0200 include: Add D3D_DISABLE_9EX checks to d3d9.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 1121 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 569 insertions(+), 552 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7abed27908f637fe738cf…

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateRadialGradientBrush().
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 7c430c5ce0b3f5986f21c22b98820cdd3b75531f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c430c5ce0b3f5986f21c22b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:40 2017 +0200 d2d1: Implement d2d_d3d_render_target_CreateRadialGradientBrush(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 12 ++- dlls/d2d1/render_target.c | 25 ++++-- 3 files changed, 222 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c430c5ce0b3f5986f21c…

1 0

Henri Verbeet : d2d1: Implement linear gradient brushes.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: e29e627064d8172bfeaafc93c15cb531ac1d09f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29e627064d8172bfeaafc93c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:39 2017 +0200 d2d1: Implement linear gradient brushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 60 +++++++++--- dlls/d2d1/d2d1_private.h | 17 +++- dlls/d2d1/render_target.c | 213 +++++++++++++++++++++++++++++++++---------- dlls/d2d1/tests/d2d1.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 451 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e29e627064d8172bfeaaf…

1 0

Henri Verbeet : d2d1: Create shader resource views for gradient stop collections.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 24814f8f4a13d231872b7bb1c3395165f0a6baa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24814f8f4a13d231872b7bb1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:38 2017 +0200 d2d1: Create shader resource views for gradient stop collections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 68 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/render_target.c | 3 ++- 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 18d9ddf..1fc00e9 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -68,6 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection if (!refcount) { HeapFree(GetProcessHeap(), 0, gradient->stops); + ID3D10ShaderResourceView_Release(gradient->view); ID2D1Factory_Release(gradient->factory); HeapFree(GetProcessHeap(), 0, gradient); } @@ -129,21 +130,84 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = d2d_gradient_GetExtendMode, }; -HRESULT d2d_gradient_create(ID2D1Factory *factory, const D2D1_GRADIENT_STOP *stops, +HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, struct d2d_gradient **gradient) { + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D10_SUBRESOURCE_DATA buffer_data; + ID3D10ShaderResourceView *view; + D3D10_BUFFER_DESC buffer_desc; + struct d2d_vec4 *data; + ID3D10Buffer *buffer; + unsigned int i; + HRESULT hr; + + if (!(data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 2 * stop_count * sizeof(*data)))) + { + ERR("Failed to allocate data.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < stop_count; ++i) + { + data[i * 2].x = stops[i].position; + data[i * 2 + 1].x = stops[i].color.r; + data[i * 2 + 1].y = stops[i].color.g; + data[i * 2 + 1].z = stops[i].color.b; + data[i * 2 + 1].w = stops[i].color.a; + } + + buffer_desc.ByteWidth = 2 * stop_count * sizeof(*data); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + buffer_data.pSysMem = data; + buffer_data.SysMemPitch = 0; + buffer_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer); + HeapFree(GetProcessHeap(), 0, data); + if (FAILED(hr)) + { + ERR("Failed to create buffer, hr %#x.\n", hr); + return hr; + } + + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = 2 * stop_count; + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &view); + ID3D10Buffer_Release(buffer); + if (FAILED(hr)) + { + ERR("Failed to create view, hr %#x.\n", hr); + return hr; + } + if (!(*gradient = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**gradient)))) + { + ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; + } - FIXME("Ignoring gradient properties.\n"); + if (gamma != D2D1_GAMMA_2_2) + FIXME("Ignoring gamma %#x.\n", gamma); + if (extend_mode != D2D1_EXTEND_MODE_CLAMP) + FIXME("Ignoring extend mode %#x.\n", extend_mode); (*gradient)->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; (*gradient)->refcount = 1; ID2D1Factory_AddRef((*gradient)->factory = factory); + (*gradient)->view = view; (*gradient)->stop_count = stop_count; if (!((*gradient)->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops)))) { + ID3D10ShaderResourceView_Release(view); HeapFree(GetProcessHeap(), 0, *gradient); return E_OUTOFMEMORY; } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2294568..efb504a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -201,11 +201,12 @@ struct d2d_gradient LONG refcount; ID2D1Factory *factory; + ID3D10ShaderResourceView *view; D2D1_GRADIENT_STOP *stops; UINT32 stop_count; }; -HRESULT d2d_gradient_create(ID2D1Factory *factory, const D2D1_GRADIENT_STOP *stops, +HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, struct d2d_gradient **gradient) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0a23b31..98471cb 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -380,7 +380,8 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", iface, stops, stop_count, gamma, extend_mode, gradient); - if (SUCCEEDED(hr = d2d_gradient_create(render_target->factory, stops, stop_count, gamma, extend_mode, &object))) + if (SUCCEEDED(hr = d2d_gradient_create(render_target->factory, render_target->device, + stops, stop_count, gamma, extend_mode, &object))) *gradient = &object->ID2D1GradientStopCollection_iface; return hr;

1 0

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_GetOpacity().
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: c1cba92cc0bb7c5d798e883ebdceee3070ef6b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cba92cc0bb7c5d798e883eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:37 2017 +0200 d2d1: Implement d2d_linear_gradient_brush_GetOpacity(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b5f7418..18d9ddf 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -403,9 +403,11 @@ static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetTransform(ID2D1Linear static float STDMETHODCALLTYPE d2d_linear_gradient_brush_GetOpacity(ID2D1LinearGradientBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return brush->opacity; } static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetTransform(ID2D1LinearGradientBrush *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_SetOpacity().
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: aa7d5a84146b260b4a3a0c672133e9bae0fdb260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7d5a84146b260b4a3a0c672… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:36 2017 +0200 d2d1: Implement d2d_linear_gradient_brush_SetOpacity(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index cc1a020..b5f7418 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -384,7 +384,11 @@ static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetFactory(ID2D1LinearGr static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetOpacity(ID2D1LinearGradientBrush *iface, float opacity) { - FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; } static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetTransform(ID2D1LinearGradientBrush *iface,

1 0

Nikolay Sivov : shell32: Silence fixme for tested case.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 76d46fa3234a5b6eb5042b683b283942e6b99c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d46fa3234a5b6eb5042b683… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 12:57:52 2017 +0300 shell32: Silence fixme for tested case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 57170ee..644f67be 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1148,6 +1148,8 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F default: FIXME("Index type %d not handled.\n", V_VT(&index)); + /* fall through */ + case VT_EMPTY: return E_NOTIMPL; }

1 0

Nikolay Sivov : shell32: Implement FolderItem attributes properties.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: d935fa69d80d9afe93875155b94b0dfc1609508a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d935fa69d80d9afe93875155b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 12:57:51 2017 +0300 shell32: Implement FolderItem attributes properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 49 +++++++++++++++++++++++++------------- dlls/shell32/tests/shelldispatch.c | 7 ++++++ 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 82c62ae..57170ee 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -83,6 +83,7 @@ typedef struct { LONG ref; FolderImpl *folder; WCHAR *path; /* if NULL, folder path is used */ + DWORD attributes; } FolderItemImpl; typedef struct { @@ -788,36 +789,48 @@ static HRESULT WINAPI FolderItemImpl_get_GetFolder(FolderItem2 *iface, return E_NOTIMPL; } -static HRESULT WINAPI FolderItemImpl_get_IsLink(FolderItem2 *iface, - VARIANT_BOOL *pb) +static HRESULT WINAPI FolderItemImpl_get_IsLink(FolderItem2 *iface, VARIANT_BOOL *b) { - FIXME("(%p,%p)\n", iface, pb); + FolderItemImpl *This = impl_from_FolderItem(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, b); + + *b = This->attributes & SFGAO_LINK ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } -static HRESULT WINAPI FolderItemImpl_get_IsFolder(FolderItem2 *iface, - VARIANT_BOOL *pb) +static HRESULT WINAPI FolderItemImpl_get_IsFolder(FolderItem2 *iface, VARIANT_BOOL *b) { - FIXME("(%p,%p)\n", iface, pb); + FolderItemImpl *This = impl_from_FolderItem(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, b); + + *b = This->attributes & SFGAO_FOLDER ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } -static HRESULT WINAPI FolderItemImpl_get_IsFileSystem(FolderItem2 *iface, - VARIANT_BOOL *pb) +static HRESULT WINAPI FolderItemImpl_get_IsFileSystem(FolderItem2 *iface, VARIANT_BOOL *b) { - FIXME("(%p,%p)\n", iface, pb); + FolderItemImpl *This = impl_from_FolderItem(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, b); + + *b = This->attributes & SFGAO_FILESYSTEM ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } -static HRESULT WINAPI FolderItemImpl_get_IsBrowsable(FolderItem2 *iface, - VARIANT_BOOL *pb) +static HRESULT WINAPI FolderItemImpl_get_IsBrowsable(FolderItem2 *iface, VARIANT_BOOL *b) { - FIXME("(%p,%p)\n", iface, pb); + FolderItemImpl *This = impl_from_FolderItem(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, b); + + *b = This->attributes & SFGAO_BROWSABLE ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } static HRESULT WINAPI FolderItemImpl_get_ModifyDate(FolderItem2 *iface, @@ -924,6 +937,7 @@ static const FolderItem2Vtbl FolderItemImpl_Vtbl = { static HRESULT FolderItem_Constructor(FolderImpl *folder, const WCHAR *path, FolderItem **item) { + PIDLIST_ABSOLUTE pidl; FolderItemImpl *This; TRACE("%s\n", debugstr_w(path)); @@ -942,6 +956,9 @@ static HRESULT FolderItem_Constructor(FolderImpl *folder, const WCHAR *path, Fol This->folder = folder; Folder3_AddRef(&folder->Folder3_iface); + if (SHParseDisplayName(This->path, NULL, &pidl, ~0u, &This->attributes) == S_OK) + ILFree(pidl); + *item = (FolderItem *)&This->FolderItem2_iface; return S_OK; } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 06e73dd..462be18 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -594,6 +594,8 @@ static void test_items(void) /* test the folder item corresponding to each file */ for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++) { + VARIANT_BOOL b; + V_I4(&int_index) = i; variant_set_string(&str_index, file_defs[i].name); @@ -629,6 +631,11 @@ static void test_items(void) "file_defs[%d]: expected %s, got %s\n", i, wine_dbgstr_w(path), wine_dbgstr_w(bstr)); SysFreeString(bstr); + b = 0xdead; + r = FolderItem_get_IsFolder(item, &b); + ok(r == S_OK, "Failed to get IsFolder property, %#x.\n", r); + ok(file_defs[i].type == DIRECTORY ? b == VARIANT_TRUE : b == VARIANT_FALSE, "Unexpected prop value %#x.\n", b); + FolderItem_Release(item); if (file_defs[i].type == DIRECTORY)

1 0

Nikolay Sivov : shell32: Store simple full path for FolderItem.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 0d87da46a92a878e650a533052fe88bacd5e92bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d87da46a92a878e650a53305… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 12:57:50 2017 +0300 shell32: Store simple full path for FolderItem. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 97 +++++++++++++------------------------- dlls/shell32/tests/shelldispatch.c | 6 +-- 2 files changed, 36 insertions(+), 67 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 8930e88..82c62ae 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -67,6 +67,7 @@ typedef struct { IDispatch *application; IShellFolder2 *folder; PIDLIST_ABSOLUTE pidl; + WCHAR path[MAX_PATH]; } FolderImpl; typedef struct { @@ -81,7 +82,7 @@ typedef struct { FolderItem2 FolderItem2_iface; LONG ref; FolderImpl *folder; - VARIANT dir; + WCHAR *path; /* if NULL, folder path is used */ } FolderItemImpl; typedef struct { @@ -657,8 +658,8 @@ static ULONG WINAPI FolderItemImpl_Release(FolderItem2 *iface) if (!ref) { - VariantClear(&This->dir); Folder3_Release(&This->folder->Folder3_iface); + HeapFree(GetProcessHeap(), 0, This->path); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -759,40 +760,14 @@ static HRESULT WINAPI FolderItemImpl_put_Name(FolderItem2 *iface, BSTR bs) return E_NOTIMPL; } -static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem2 *iface, BSTR *pbs) +static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem2 *iface, BSTR *path) { FolderItemImpl *This = impl_from_FolderItem(iface); - HRESULT ret = S_OK; - WCHAR *pathW; - int len; - TRACE("(%p,%p)\n", iface, pbs); + TRACE("(%p,%p)\n", iface, path); - *pbs = NULL; - if (V_VT(&This->dir) == VT_I4) - { - pathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (!pathW) return E_OUTOFMEMORY; - ret = SHGetFolderPathW(NULL, V_I4(&This->dir), NULL, SHGFP_TYPE_CURRENT, - pathW); - if (ret == S_OK) - *pbs = SysAllocString(pathW); - else if (ret == E_INVALIDARG) - { - FIXME("not implemented for %#x\n", V_I4(&This->dir)); - ret = E_NOTIMPL; - } - HeapFree(GetProcessHeap(), 0, pathW); - } - else /* VT_BSTR */ - { - pathW = V_BSTR(&This->dir); - len = lstrlenW(pathW); - *pbs = SysAllocStringLen(pathW, pathW[len - 1] == '\\' ? len - 1 : len); - } - if (ret == S_OK && !*pbs) - ret = E_OUTOFMEMORY; - return ret; + *path = SysAllocString(This->path ? This->path : This->folder->path); + return *path ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, @@ -947,33 +922,28 @@ static const FolderItem2Vtbl FolderItemImpl_Vtbl = { FolderItemImpl_ExtendedProperty }; -static HRESULT FolderItem_Constructor(FolderImpl *folder, VARIANT *dir, FolderItem **ppfi) +static HRESULT FolderItem_Constructor(FolderImpl *folder, const WCHAR *path, FolderItem **item) { FolderItemImpl *This; - HRESULT ret; - TRACE("%s\n", debugstr_variant(dir)); + TRACE("%s\n", debugstr_w(path)); - *ppfi = NULL; + *item = NULL; + + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemImpl)); - if (!This) return E_OUTOFMEMORY; This->FolderItem2_iface.lpVtbl = &FolderItemImpl_Vtbl; This->ref = 1; - - VariantInit(&This->dir); - ret = VariantCopy(&This->dir, dir); - if (FAILED(ret)) - { - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } + if (path) + This->path = strdupW(path); This->folder = folder; Folder3_AddRef(&folder->Folder3_iface); - *ppfi = (FolderItem *)&This->FolderItem2_iface; - return ret; + *item = (FolderItem *)&This->FolderItem2_iface; + return S_OK; } static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface, @@ -1116,7 +1086,6 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F FolderItemsImpl *This = impl_from_FolderItems(iface); WCHAR buffW[MAX_PATH], *display_name; HRESULT hr; - VARIANT v; TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&index), item); @@ -1158,18 +1127,14 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F break; } case VT_ERROR: - return FolderItem_Constructor(This->folder, &This->folder->dir, item); + return FolderItem_Constructor(This->folder, NULL, item); default: FIXME("Index type %d not handled.\n", V_VT(&index)); return E_NOTIMPL; } - V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(display_name); - hr = FolderItem_Constructor(This->folder, &v, item); - VariantClear(&v); - return hr; + return FolderItem_Constructor(This->folder, display_name, item); } static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **ppunk) @@ -1521,7 +1486,6 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem FolderItem *self; BSTR str; WCHAR pathW[MAX_PATH]; - VARIANT v; HRESULT hr; TRACE("(%p,%s,%p)\n", iface, debugstr_w(name), item); @@ -1544,11 +1508,7 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem if (!PathFileExistsW(pathW)) return S_FALSE; - V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(pathW); - hr = FolderItem_Constructor(This, &v, item); - VariantClear(&v); - return hr; + return FolderItem_Constructor(This, pathW, item); } static HRESULT WINAPI FolderImpl_NewFolder(Folder3 *iface, BSTR bName, @@ -1584,13 +1544,13 @@ static HRESULT WINAPI FolderImpl_GetDetailsOf(Folder3 *iface, VARIANT vItem, return E_NOTIMPL; } -static HRESULT WINAPI FolderImpl_get_Self(Folder3 *iface, FolderItem **ppfi) +static HRESULT WINAPI FolderImpl_get_Self(Folder3 *iface, FolderItem **item) { FolderImpl *This = impl_from_Folder(iface); - TRACE("(%p,%p)\n", iface, ppfi); + TRACE("(%p,%p)\n", iface, item); - return FolderItem_Constructor(This, &This->dir, ppfi); + return FolderItem_Constructor(This, NULL, item); } static HRESULT WINAPI FolderImpl_get_OfflineStatus(Folder3 *iface, LONG *pul) @@ -1667,7 +1627,10 @@ static const Folder3Vtbl FolderImpl_Vtbl = { static HRESULT Folder_Constructor(VARIANT *dir, IShellFolder2 *folder, LPITEMIDLIST pidl, Folder **ret) { + PCUITEMID_CHILD last_part; + IShellFolder2 *parent; FolderImpl *This; + STRRET strret; HRESULT hr; *ret = NULL; @@ -1680,6 +1643,12 @@ static HRESULT Folder_Constructor(VARIANT *dir, IShellFolder2 *folder, LPITEMIDL This->ref = 1; This->folder = folder; This->pidl = pidl; + + hr = SHBindToParent(pidl, &IID_IShellFolder2, (void **)&parent, &last_part); + IShellFolder2_GetDisplayNameOf(parent, last_part, SHGDN_FORPARSING, &strret); + StrRetToBufW(&strret, NULL, This->path, sizeof(This->path)/sizeof(*This->path)); + IShellFolder2_Release(parent); + IShellDispatch_Constructor(NULL, &IID_IDispatch, (void **)&This->application); VariantInit(&This->dir); diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 757ef45..06e73dd 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -244,10 +244,10 @@ static void test_namespace(void) r = Folder2_get_Self(folder2, &item); ok(r == S_OK, "Folder::get_Self failed: %08x\n", r); r = FolderItem_get_Path(item, &item_path); -todo_wine { ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); - ok(!lstrcmpW(item_path, clsidW), "expected %s, got %s\n", wine_dbgstr_w(clsidW), wine_dbgstr_w(item_path)); -} + /* TODO: we return lowercase GUID here */ + ok(!lstrcmpiW(item_path, clsidW), "expected %s, got %s\n", wine_dbgstr_w(clsidW), wine_dbgstr_w(item_path)); + SysFreeString(item_path); FolderItem_Release(item); Folder2_Release(folder2);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
45
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 September 2017