wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Henri Verbeet : d2d1: Implement radial gradient brushes.
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: 24dc5c740944d6499835e38a949cf4a8ac7208ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dc5c740944d6499835e38a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 28 13:14:18 2017 +0200 d2d1: Implement radial gradient brushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 62 ++++++++-- dlls/d2d1/d2d1_private.h | 14 +++ dlls/d2d1/geometry.c | 5 - dlls/d2d1/render_target.c | 289 ++++++++++++++++++++++++++++++++++------------ dlls/d2d1/tests/d2d1.c | 215 ++++++++++++++++++++++++++++++++++ 5 files changed, 500 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24dc5c740944d6499835e…

1 0

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_SetRadiusY().
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: 370cbf488a29bb6714789a72654f66c7f110148c URL: http://source.winehq.org/git/wine.git/?a=commit;h=370cbf488a29bb6714789a726… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 28 13:14:17 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_SetRadiusY(). 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 8c23a61..b6a4787 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -709,7 +709,11 @@ static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetRadiusX(ID2D1RadialGr static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetRadiusY(ID2D1RadialGradientBrush *iface, float radius) { - FIXME("iface %p, radius %.8e stub!\n", iface, radius); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); + + TRACE("iface %p, radius %.8e.\n", iface, radius); + + brush->u.radial.radius.y = radius; } static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_radial_gradient_brush_GetCenter(ID2D1RadialGradientBrush *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_SetRadiusX().
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: ac4db5ebda5a8d876f69449fe4fbc642312fc00d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4db5ebda5a8d876f69449fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 28 13:14:16 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_SetRadiusX(). 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 9b2f13e..8c23a61 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -700,7 +700,11 @@ static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetGradientOriginOffset( static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetRadiusX(ID2D1RadialGradientBrush *iface, float radius) { - FIXME("iface %p, radius %.8e stub!\n", iface, radius); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); + + TRACE("iface %p, radius %.8e.\n", iface, radius); + + brush->u.radial.radius.x = radius; } static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetRadiusY(ID2D1RadialGradientBrush *iface, float radius)

1 0

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_GetRadiusY().
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: f92b291f24db0e178f5e872f6d17cc9288024552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92b291f24db0e178f5e872f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 28 13:14:15 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_GetRadiusY(). 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 689ffd5..9b2f13e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -741,9 +741,11 @@ static float STDMETHODCALLTYPE d2d_radial_gradient_brush_GetRadiusX(ID2D1RadialG static float STDMETHODCALLTYPE d2d_radial_gradient_brush_GetRadiusY(ID2D1RadialGradientBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); + + TRACE("iface %p.\n", iface); - return 0.0f; + return brush->u.radial.radius.y; } static void STDMETHODCALLTYPE d2d_radial_gradient_brush_GetGradientStopCollection(ID2D1RadialGradientBrush *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_GetRadiusX().
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: 8dd021fd72e9fbdd2c0084a35ed7305e551063b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd021fd72e9fbdd2c0084a35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 28 13:14:14 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_GetRadiusX(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 8 ++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index f141c72..689ffd5 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -732,9 +732,11 @@ static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_radial_gradient_brush_GetGradientOr static float STDMETHODCALLTYPE d2d_radial_gradient_brush_GetRadiusX(ID2D1RadialGradientBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return brush->u.radial.radius.x; } static float STDMETHODCALLTYPE d2d_radial_gradient_brush_GetRadiusY(ID2D1RadialGradientBrush *iface) @@ -789,6 +791,8 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, ID2D1GradientStopCollection_AddRef(&b->u.radial.gradient->ID2D1GradientStopCollection_iface); b->u.radial.centre = gradient_desc->center; b->u.radial.offset = gradient_desc->gradientOriginOffset; + b->u.radial.radius.x = gradient_desc->radiusX; + b->u.radial.radius.y = gradient_desc->radiusY; TRACE("Created brush %p.\n", b); *brush = b; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index ccff6df..9a46490 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -244,6 +244,7 @@ struct d2d_brush struct d2d_gradient *gradient; D2D1_POINT_2F centre; D2D1_POINT_2F offset; + D2D1_POINT_2F radius; } radial; struct {

1 0

Alexandre Julliard : README: Remove references to removed Wiki pages.
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: d8fe80c5c5a911c8b2fb23f33b57e996e94768ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8fe80c5c5a911c8b2fb23f33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 12:21:58 2017 +0200 README: Remove references to removed Wiki pages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README b/README index 5423e7b..70cb004 100644 --- a/README +++ b/README @@ -74,13 +74,9 @@ Basic requirements: Optional support libraries: Configure will display notices when optional libraries are not found on your system. See http://wiki.winehq.org/Recommended_Packages for - hints about the packages you should install. - - On 64-bit platforms, if compiling Wine as 32-bit (default), you have - to make sure to install the 32-bit versions of these libraries; see - http://wiki.winehq.org/WineOn64bit for details. If you want a true - 64-bit Wine (or a mixed 32-bit and 64-bit Wine setup), see - http://wiki.winehq.org/Wine64 for details. + hints about the packages you should install. On 64-bit platforms, + you have to make sure to install the 32-bit versions of these + libraries. 4. COMPILATION

1 0

Nikolay Sivov : shell32: PickIconDlg() is documented now.
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: 937ef127723c94ca1b3072089e00f3e2bce16e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=937ef127723c94ca1b3072089… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 28 11:58:28 2017 +0300 shell32: PickIconDlg() is documented now. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dialogs.c | 11 +++-------- dlls/shell32/shell32.spec | 2 +- dlls/shell32/undocshell.h | 6 ------ include/shlobj.h | 2 ++ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 5d7e079..1a583f2 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -60,15 +60,10 @@ static void FillList (HWND, char *, BOOL) ; * PickIconDlg [SHELL32.62] * */ -INT WINAPI PickIconDlg( - HWND hwndOwner, - LPSTR lpstrFile, - DWORD nMaxFile, - LPDWORD lpdwIconIndex) +INT WINAPI PickIconDlg(HWND hwndOwner, WCHAR *path, UINT path_len, INT *index) { - FIXME("(%p,%s,%08x,%p):stub.\n", - hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex); - return 0xffffffff; + FIXME("(%p,%s,%u,%p):stub.\n", hwndOwner, debugstr_w(path), path_len, index); + return 0xffffffff; } HRESULT WINAPI SHOpenWithDialog(HWND parent, const OPENASINFO *info) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 6d2c61b..c38591c 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -57,7 +57,7 @@ 59 stdcall -ordinal RestartDialog(long wstr long) 60 stdcall -noname ExitWindowsDialog(long) 61 stdcall -noname RunFileDlg(long long str str str long) RunFileDlgAW - 62 stdcall -ordinal PickIconDlg(long ptr long ptr) + 62 stdcall -ordinal PickIconDlg(long wstr long ptr) 63 stdcall -ordinal GetFileNameFromBrowse(long ptr long str str str str) GetFileNameFromBrowseAW 64 stdcall -ordinal DriveType(long) 65 stdcall -noname InvalidateDriveType(long) diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 3f3372a..9b3d844 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -79,12 +79,6 @@ BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); * Shell Common Dialogs */ -BOOL WINAPI PickIconDlg( - HWND hwndOwner, - LPSTR lpstrFile, - DWORD nMaxFile, - LPDWORD lpdwIconIndex); - /* RunFileDlg flags */ #define RFF_NOBROWSE 0x01 #define RFF_NODEFAULT 0x02 diff --git a/include/shlobj.h b/include/shlobj.h index 66596a3..09efc18 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1800,6 +1800,8 @@ HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST pidlFolder, HWND hwnd, UINT LPFNDFMCALLBACK lpfn, UINT nKeys, const HKEY *ahkeys, IContextMenu **ppcm); +int WINAPI PickIconDlg(HWND owner, WCHAR *path, UINT path_len, int *index); + #include <poppack.h> #ifdef __cplusplus

1 0

Nikolay Sivov : shell32: Added missing arguments to trace messages.
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: c36e7d1ec7537999f7c7cba610bbbcefd5d9d6eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36e7d1ec7537999f7c7cba61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 28 11:25:47 2017 +0300 shell32: Added missing arguments to trace messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 82fc9ac..0baab6b 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1547,36 +1547,32 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem return hr; } -static HRESULT WINAPI FolderImpl_NewFolder(Folder3 *iface, BSTR bName, - VARIANT vOptions) +static HRESULT WINAPI FolderImpl_NewFolder(Folder3 *iface, BSTR name, VARIANT options) { - FIXME("(%p,%s)\n", iface, debugstr_w(bName)); + FIXME("(%p,%s,%s)\n", iface, debugstr_w(name), debugstr_variant(&options)); return E_NOTIMPL; } -static HRESULT WINAPI FolderImpl_MoveHere(Folder3 *iface, VARIANT vItem, - VARIANT vOptions) +static HRESULT WINAPI FolderImpl_MoveHere(Folder3 *iface, VARIANT item, VARIANT options) { - FIXME("(%p)\n", iface); + FIXME("(%p,%s,%s)\n", iface, debugstr_variant(&item), debugstr_variant(&options)); return E_NOTIMPL; } -static HRESULT WINAPI FolderImpl_CopyHere(Folder3 *iface, VARIANT vItem, - VARIANT vOptions) +static HRESULT WINAPI FolderImpl_CopyHere(Folder3 *iface, VARIANT item, VARIANT options) { - FIXME("(%p)\n", iface); + FIXME("(%p,%s,%s)\n", iface, debugstr_variant(&item), debugstr_variant(&options)); return E_NOTIMPL; } -static HRESULT WINAPI FolderImpl_GetDetailsOf(Folder3 *iface, VARIANT vItem, - int iColumn, BSTR *pbs) +static HRESULT WINAPI FolderImpl_GetDetailsOf(Folder3 *iface, VARIANT item, int column, BSTR *str) { - FIXME("(%p,%d,%p)\n", iface, iColumn, pbs); + FIXME("(%p,%s,%d,%p)\n", iface, debugstr_variant(&item), column, str); - *pbs = NULL; + *str = NULL; return E_NOTIMPL; } @@ -1877,7 +1873,7 @@ static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch6 *iface, LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf) { - FIXME("(%p,%x,%s,%x,%p)\n", iface, Hwnd, debugstr_w(Title), Options, ppsdf); + FIXME("(%p,%x,%s,%x,%s,%p)\n", iface, Hwnd, debugstr_w(Title), Options, debugstr_variant(&RootFolder), ppsdf); *ppsdf = NULL; return E_NOTIMPL; @@ -1892,16 +1888,16 @@ static HRESULT WINAPI ShellDispatch_Windows(IShellDispatch6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI ShellDispatch_Open(IShellDispatch6 *iface, VARIANT vDir) +static HRESULT WINAPI ShellDispatch_Open(IShellDispatch6 *iface, VARIANT dir) { - FIXME("(%p)\n", iface); + FIXME("(%p,%s)\n", iface, debugstr_variant(&dir)); return E_NOTIMPL; } -static HRESULT WINAPI ShellDispatch_Explore(IShellDispatch6 *iface, VARIANT vDir) +static HRESULT WINAPI ShellDispatch_Explore(IShellDispatch6 *iface, VARIANT dir) { - FIXME("(%p)\n", iface); + FIXME("(%p,%s)\n", iface, debugstr_variant(&dir)); return E_NOTIMPL; } @@ -2080,13 +2076,13 @@ static HRESULT WINAPI ShellDispatch_GetSystemInformation(IShellDispatch6 *iface, static HRESULT WINAPI ShellDispatch_ServiceStart(IShellDispatch6 *iface, BSTR service, VARIANT persistent, VARIANT *ret) { - FIXME("(%s, %p): stub\n", debugstr_w(service), ret); + FIXME("(%s, %s, %p): stub\n", debugstr_w(service), debugstr_variant(&persistent), ret); return E_NOTIMPL; } static HRESULT WINAPI ShellDispatch_ServiceStop(IShellDispatch6 *iface, BSTR service, VARIANT persistent, VARIANT *ret) { - FIXME("(%s, %p): stub\n", debugstr_w(service), ret); + FIXME("(%s, %s, %p): stub\n", debugstr_w(service), debugstr_variant(&persistent), ret); return E_NOTIMPL; } @@ -2142,13 +2138,13 @@ static HRESULT WINAPI ShellDispatch_CanStartStopService(IShellDispatch6 *iface, static HRESULT WINAPI ShellDispatch_ShowBrowserBar(IShellDispatch6 *iface, BSTR clsid, VARIANT show, VARIANT *ret) { - FIXME("(%s, %p): stub\n", debugstr_w(clsid), ret); + FIXME("(%s, %s, %p): stub\n", debugstr_w(clsid), debugstr_variant(&show), ret); return E_NOTIMPL; } static HRESULT WINAPI ShellDispatch_AddToRecent(IShellDispatch6 *iface, VARIANT file, BSTR category) { - FIXME("(%s): stub\n", debugstr_w(category)); + FIXME("(%s, %s): stub\n", debugstr_variant(&file), debugstr_w(category)); return E_NOTIMPL; }

1 0

Nikolay Sivov : shell32: Stop using fixed size buffers for display names.
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: 8b661a18e322ef7666a22255c91b6f9d900eff3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b661a18e322ef7666a22255c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 28 11:25:46 2017 +0300 shell32: Stop using fixed size buffers for display names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 52 ++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 9c35b06..82fc9ac 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -66,14 +66,14 @@ typedef struct { IDispatch *application; IShellFolder2 *folder; PIDLIST_ABSOLUTE pidl; - WCHAR path[MAX_PATH]; + BSTR path; } FolderImpl; typedef struct { FolderItems3 FolderItems3_iface; LONG ref; FolderImpl *folder; - WCHAR **item_names; + BSTR *item_names; LONG item_count; } FolderItemsImpl; @@ -1030,7 +1030,7 @@ static ULONG WINAPI FolderItemsImpl_Release(FolderItems3 *iface) { Folder3_Release(&This->folder->Folder3_iface); for (i = 0; i < This->item_count; i++) - HeapFree(GetProcessHeap(), 0, This->item_names[i]); + SysFreeString(This->item_names[i]); HeapFree(GetProcessHeap(), 0, This->item_names); HeapFree(GetProcessHeap(), 0, This); } @@ -1132,7 +1132,7 @@ static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, FolderItem **item) { FolderItemsImpl *This = impl_from_FolderItems(iface); - WCHAR buffW[MAX_PATH], *display_name; + BSTR display_name = NULL; HRESULT hr; TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&index), item); @@ -1152,7 +1152,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F if (V_I4(&index) >= This->item_count || V_I4(&index) < 0) return S_FALSE; - display_name = This->item_names[V_I4(&index)]; + display_name = SysAllocString(This->item_names[V_I4(&index)]); break; case VT_BSTR: @@ -1167,15 +1167,13 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F NULL, &pidl, NULL))) return S_FALSE; - IShellFolder2_GetDisplayNameOf(This->folder->folder, pidl, SHGDN_FORPARSING, &strret); - StrRetToBufW(&strret, NULL, buffW, sizeof(buffW)/sizeof(*buffW)); + if (IShellFolder2_GetDisplayNameOf(This->folder->folder, pidl, SHGDN_FORPARSING, &strret) == S_OK) + StrRetToBSTR(&strret, pidl, &display_name); ILFree(pidl); - - display_name = buffW; break; } case VT_ERROR: - return FolderItem_Constructor(This->folder, NULL, item); + break; default: FIXME("Index type %d not handled.\n", V_VT(&index)); @@ -1184,7 +1182,9 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F return E_NOTIMPL; } - return FolderItem_Constructor(This->folder, display_name, item); + hr = FolderItem_Constructor(This->folder, display_name, item); + SysFreeString(display_name); + return hr; } static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **ppunk) @@ -1313,7 +1313,7 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) ULONG fetched; pidls = HeapAlloc(GetProcessHeap(), 0, This->item_count * sizeof(*pidls)); - This->item_names = HeapAlloc(GetProcessHeap(), 0, This->item_count * sizeof(*This->item_names)); + This->item_names = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->item_count * sizeof(*This->item_names)); if (!pidls || !This->item_names) { @@ -1329,13 +1329,10 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) for (i = 0; i < This->item_count; i++) { - WCHAR buffW[MAX_PATH]; STRRET strret; - IShellFolder2_GetDisplayNameOf(folder->folder, pidls[i], SHGDN_FORPARSING, &strret); - StrRetToBufW(&strret, NULL, buffW, sizeof(buffW)/sizeof(*buffW)); - - This->item_names[i] = strdupW(buffW); + if (IShellFolder2_GetDisplayNameOf(folder->folder, pidls[i], SHGDN_FORPARSING, &strret) == S_OK) + StrRetToBSTR(&strret, pidls[i], &This->item_names[i]); ILFree(pidls[i]); } @@ -1397,6 +1394,7 @@ static ULONG WINAPI FolderImpl_Release(Folder3 *iface) if (!ref) { ILFree(This->pidl); + SysFreeString(This->path); IShellFolder2_Release(This->folder); IDispatch_Release(This->application); HeapFree(GetProcessHeap(), 0, This); @@ -1463,7 +1461,6 @@ static HRESULT WINAPI FolderImpl_get_Title(Folder3 *iface, BSTR *title) FolderImpl *This = impl_from_Folder(iface); PCUITEMID_CHILD last_part; IShellFolder2 *parent; - WCHAR buffW[MAX_PATH]; SHELLDETAILS sd; HRESULT hr; @@ -1479,10 +1476,7 @@ static HRESULT WINAPI FolderImpl_get_Title(Folder3 *iface, BSTR *title) if (FAILED(hr)) return hr; - StrRetToBufW(&sd.str, NULL, buffW, sizeof(buffW)/sizeof(buffW[0])); - *title = SysAllocString(buffW); - - return *title ? S_OK : E_OUTOFMEMORY; + return StrRetToBSTR(&sd.str, last_part, title); } static HRESULT WINAPI FolderImpl_get_Application(Folder3 *iface, IDispatch **disp) @@ -1529,10 +1523,10 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid) static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item) { FolderImpl *This = impl_from_Folder(iface); - WCHAR pathW[MAX_PATH]; LPITEMIDLIST pidl; STRRET strret; HRESULT hr; + BSTR path; TRACE("(%p,%s,%p)\n", iface, debugstr_w(name), item); @@ -1541,14 +1535,16 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem if (FAILED(IShellFolder2_ParseDisplayName(This->folder, NULL, NULL, name, NULL, &pidl, NULL))) return S_FALSE; - hr = IShellFolder2_GetDisplayNameOf(This->folder, pidl, SHGDN_FORPARSING, &strret); + if ((hr = IShellFolder2_GetDisplayNameOf(This->folder, pidl, SHGDN_FORPARSING, &strret)) == S_OK) + StrRetToBSTR(&strret, pidl, &path); + ILFree(pidl); if (FAILED(hr)) return S_FALSE; - StrRetToBufW(&strret, NULL, pathW, sizeof(pathW)/sizeof(*pathW)); - - return FolderItem_Constructor(This, pathW, item); + hr = FolderItem_Constructor(This, path, item); + SysFreeString(path); + return hr; } static HRESULT WINAPI FolderImpl_NewFolder(Folder3 *iface, BSTR bName, @@ -1686,7 +1682,7 @@ static HRESULT Folder_Constructor(IShellFolder2 *folder, LPITEMIDLIST pidl, Fold 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)); + StrRetToBSTR(&strret, last_part, &This->path); IShellFolder2_Release(parent); IShellDispatch_Constructor(NULL, &IID_IDispatch, (void **)&This->application);

1 0

Nikolay Sivov : shell32: Get rid of original variant used to create a Folder.
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: 3e2559b98ae3d67588fc6249262e7def728548fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2559b98ae3d67588fc62492… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 28 11:25:45 2017 +0300 shell32: Get rid of original variant used to create a Folder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 43e243e..9c35b06 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -63,7 +63,6 @@ typedef struct { typedef struct { Folder3 Folder3_iface; LONG ref; - VARIANT dir; IDispatch *application; IShellFolder2 *folder; PIDLIST_ABSOLUTE pidl; @@ -1090,13 +1089,24 @@ static HRESULT WINAPI FolderItemsImpl_Invoke(FolderItems3 *iface, return hr; } +static BOOL shellfolder_exists(const WCHAR *path) +{ + PIDLIST_ABSOLUTE pidl = NULL; + HRESULT hr; + + hr = SHParseDisplayName(path, NULL, &pidl, 0, NULL); + ILFree(pidl); + + return SUCCEEDED(hr); +} + static HRESULT WINAPI FolderItemsImpl_get_Count(FolderItems3 *iface, LONG *count) { FolderItemsImpl *This = impl_from_FolderItems(iface); TRACE("(%p,%p)\n", iface, count); - *count = PathIsDirectoryW(V_BSTR(&This->folder->dir)) ? This->item_count : 0; + *count = shellfolder_exists(This->folder->path) ? This->item_count : 0; return S_OK; } @@ -1129,7 +1139,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F *item = NULL; - if (!PathIsDirectoryW(V_BSTR(&This->folder->dir))) + if (!shellfolder_exists(This->folder->path)) return S_FALSE; switch (V_VT(&index)) @@ -1271,16 +1281,10 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) unsigned int i; HRESULT hr; - TRACE("(%s,%p)\n", debugstr_variant(&folder->dir), ret); + TRACE("(%s,%p)\n", debugstr_w(folder->path), ret); *ret = NULL; - if (V_VT(&folder->dir) == VT_I4) - { - FIXME("special folder constants are not supported\n"); - return E_NOTIMPL; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1395,7 +1399,6 @@ static ULONG WINAPI FolderImpl_Release(Folder3 *iface) ILFree(This->pidl); IShellFolder2_Release(This->folder); IDispatch_Release(This->application); - VariantClear(&This->dir); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -1662,7 +1665,7 @@ static const Folder3Vtbl FolderImpl_Vtbl = { FolderImpl_put_ShowWebViewBarricade }; -static HRESULT Folder_Constructor(VARIANT *dir, IShellFolder2 *folder, LPITEMIDLIST pidl, Folder **ret) +static HRESULT Folder_Constructor(IShellFolder2 *folder, LPITEMIDLIST pidl, Folder **ret) { PCUITEMID_CHILD last_part; IShellFolder2 *parent; @@ -1688,14 +1691,6 @@ static HRESULT Folder_Constructor(VARIANT *dir, IShellFolder2 *folder, LPITEMIDL IShellDispatch_Constructor(NULL, &IID_IDispatch, (void **)&This->application); - VariantInit(&This->dir); - hr = VariantCopy(&This->dir, dir); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } - *ret = (Folder *)&This->Folder3_iface; return hr; } @@ -1880,7 +1875,7 @@ static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, if (FAILED(hr)) return S_FALSE; - return Folder_Constructor(&dir, folder, pidl, ret); + return Folder_Constructor(folder, pidl, ret); } static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch6 *iface,

1 0

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