September 2017 - Wine-Commits

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_SetRadiusX().
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

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

Nikolay Sivov : shell32: Stop using fixed size buffers for display names.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

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 Sept. 28, 2017

Sept. 28, 2017

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

Nikolay Sivov : shell32: Implement FolderItem::Name() property getter.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: 2ef383c01a4654683e167280aed5590e38f4ad1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef383c01a4654683e167280a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 28 11:25:44 2017 +0300 shell32: Implement FolderItem::Name() property getter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 36 ++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shelldispatch.c | 26 +++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 3ff9ff0..43e243e 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -748,12 +748,40 @@ static HRESULT WINAPI FolderItemImpl_get_Parent(FolderItem2 *iface, IDispatch ** return S_OK; } -static HRESULT WINAPI FolderItemImpl_get_Name(FolderItem2 *iface, BSTR *pbs) +static HRESULT WINAPI FolderItemImpl_get_Name(FolderItem2 *iface, BSTR *name) { - FIXME("(%p,%p)\n", iface, pbs); + FolderItemImpl *This = impl_from_FolderItem(iface); + LPCITEMIDLIST last_part; + IShellFolder2 *parent; + HRESULT hr = S_OK; + LPITEMIDLIST pidl; + STRRET strret; - *pbs = NULL; - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, name); + + *name = NULL; + + if (This->path) + hr = SHParseDisplayName(This->path, NULL, &pidl, 0, NULL); + else + pidl = This->folder->pidl; + + if (FAILED(hr)) + return S_FALSE; + + hr = SHBindToParent(pidl, &IID_IShellFolder2, (void **)&parent, &last_part); + if (hr == S_OK) + hr = IShellFolder2_GetDisplayNameOf(parent, last_part, SHGDN_INFOLDER, &strret); + + IShellFolder2_Release(parent); + + if (hr == S_OK) + hr = StrRetToBSTR(&strret, last_part, name); + + if (This->path) + ILFree(pidl); + + return hr; } static HRESULT WINAPI FolderItemImpl_put_Name(FolderItem2 *iface, BSTR bs) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 462be18..3735c9b 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -49,12 +49,22 @@ static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); /* Updated Windows 7 has a new IShellDispatch6 in its typelib */ DEFINE_GUID(IID_IWin7ShellDispatch6, 0x34936ba1, 0x67ad, 0x4c41, 0x99,0xb8, 0x8c,0x12,0xdf,0xf1,0xe9,0x74); +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + static void variant_set_string(VARIANT *v, const char *s) { - WCHAR wstr[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, s, -1, wstr, MAX_PATH); V_VT(v) = VT_BSTR; - V_BSTR(v) = SysAllocString(wstr); + V_BSTR(v) = a2bstr(s); } static void init_function_pointers(void) @@ -595,6 +605,7 @@ static void test_items(void) for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++) { VARIANT_BOOL b; + BSTR name; V_I4(&int_index) = i; variant_set_string(&str_index, file_defs[i].name); @@ -618,6 +629,15 @@ static void test_items(void) "file_defs[%d]: expected %s, got %s\n", i, wine_dbgstr_w(path), wine_dbgstr_w(bstr)); SysFreeString(bstr); + bstr = a2bstr(file_defs[i].name); + r = FolderItem_get_Name(item, &name); + ok(r == S_OK, "Failed to get item name, hr %#x.\n", r); + /* Returned display name does not have to strictly match file name, e.g. extension could be omitted. */ + ok(lstrlenW(name) <= lstrlenW(bstr), "file_defs[%d]: unexpected name length.\n", i); + ok(!memcmp(bstr, name, lstrlenW(name) * sizeof(WCHAR)), "file_defs[%d]: unexpected name %s.\n", i, wine_dbgstr_w(name)); + SysFreeString(name); + SysFreeString(bstr); + item = NULL; r = FolderItems_Item(items, str_index, &item); ok(r == S_OK, "file_defs[%d]: FolderItems::Item failed: %08x\n", i, r);

1 0

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_SetRadiusY().
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

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_GetRadiusY().
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

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

Huw Davies : sapi: Add a partial implementation of SpObjectTokenCategory:: EnumTokens().
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: 682c1b9532e234b1d2d22ff1c79846d08e4666c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682c1b9532e234b1d2d22ff1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:54 2017 +0100 sapi: Add a partial implementation of SpObjectTokenCategory::EnumTokens(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 35 +++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 25 +++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 688ade7..9f6689b8 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -49,6 +49,40 @@ static void test_data_key(void) ISpRegDataKey_Release( data_key ); } +static void test_token_category(void) +{ + ISpObjectTokenCategory *cat; + IEnumSpObjectTokens *enum_tokens; + HRESULT hr; + WCHAR bogus[] = {'b','o','g','u','s',0}; + ULONG count; + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_EnumTokens( cat, NULL, NULL, &enum_tokens ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, bogus, FALSE ); + ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_EnumTokens( cat, NULL, NULL, &enum_tokens ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IEnumSpObjectTokens_GetCount( enum_tokens, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + IEnumSpObjectTokens_Release( enum_tokens ); + ISpObjectTokenCategory_Release( cat ); +} + static void test_token_enum(void) { ISpObjectTokenEnumBuilder *token_enum; @@ -86,6 +120,7 @@ START_TEST(token) { CoInitialize( NULL ); test_data_key(); + test_token_category(); test_token_enum(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 9262641..781e3cc 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -455,8 +455,29 @@ static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface, LPCWSTR req, LPCWSTR opt, IEnumSpObjectTokens **enum_tokens ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + ISpObjectTokenEnumBuilder *builder; + HRESULT hr; + + FIXME( "(%p)->(%s %s %p): semi-stub\n", This, debugstr_w( req ), debugstr_w( opt ), enum_tokens ); + + if (!This->data_key) return SPERR_UNINITIALIZED; + + hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_ALL, + &IID_ISpObjectTokenEnumBuilder, (void **)&builder ); + if (FAILED(hr)) return hr; + + hr = ISpObjectTokenEnumBuilder_SetAttribs( builder, req, opt ); + if (FAILED(hr)) goto fail; + + /* FIXME: Build the enumerator */ + + hr = ISpObjectTokenEnumBuilder_QueryInterface( builder, &IID_IEnumSpObjectTokens, + (void **)enum_tokens ); + +fail: + ISpObjectTokenEnumBuilder_Release( builder ); + return hr; } static HRESULT WINAPI token_category_SetDefaultTokenId( ISpObjectTokenCategory *iface,

1 0

Huw Davies : sapi: Implement SpObjectTokenEnum::SetAttribs().
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: 77b7bd19c5a437dd5cf0cff11050ef9ba105eaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b7bd19c5a437dd5cf0cff11… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:49 2017 +0100 sapi: Implement SpObjectTokenEnum::SetAttribs(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/sapi_private.h | 17 +++++++++++++++++ dlls/sapi/token.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 7a5c14e..0f6ca4a 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; @@ -30,3 +32,18 @@ static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); } + +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + DWORD size; + + if (str) + { + size = (strlenW( str ) + 1) * sizeof(WCHAR); + ret = heap_alloc( size ); + if (ret) memcpy( ret, str, size ); + } + + return ret; +} diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 03ce0a7..8ad13a8 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -231,6 +231,9 @@ struct token_enum { ISpObjectTokenEnumBuilder ISpObjectTokenEnumBuilder_iface; LONG ref; + + BOOL init; + WCHAR *req, *opt; }; struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnumBuilder *iface ) @@ -276,7 +279,11 @@ static ULONG WINAPI token_enum_Release( ISpObjectTokenEnumBuilder *iface ) TRACE( "(%p) ref = %u\n", This, ref ); if (!ref) + { + heap_free( This->req ); + heap_free( This->opt ); heap_free( This ); + } return ref; } @@ -326,8 +333,30 @@ static HRESULT WINAPI token_enum_GetCount( ISpObjectTokenEnumBuilder *iface, static HRESULT WINAPI token_enum_SetAttribs( ISpObjectTokenEnumBuilder *iface, LPCWSTR req, LPCWSTR opt) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); + + TRACE( "(%p)->(%s %s)\n", This, debugstr_w( req ), debugstr_w( opt ) ); + + if (This->init) return SPERR_ALREADY_INITIALIZED; + + if (req) + { + This->req = heap_strdupW( req ); + if (!This->req) goto out_of_mem; + } + + if (opt) + { + This->opt = heap_strdupW( opt ); + if (!This->opt) goto out_of_mem; + } + + This->init = TRUE; + return S_OK; + +out_of_mem: + heap_free( This->req ); + return E_OUTOFMEMORY; } static HRESULT WINAPI token_enum_AddTokens( ISpObjectTokenEnumBuilder *iface, @@ -385,6 +414,9 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) if (!This) return E_OUTOFMEMORY; This->ISpObjectTokenEnumBuilder_iface.lpVtbl = &token_enum_vtbl; This->ref = 1; + This->req = NULL; + This->opt = NULL; + This->init = FALSE; hr = ISpObjectTokenEnumBuilder_QueryInterface( &This->ISpObjectTokenEnumBuilder_iface, iid, obj );

1 0

Huw Davies : sapi: Implement SpDataKey::SetKey().
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: 41144614c7d2a68fa470ddb8b357b02c2f481817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41144614c7d2a68fa470ddb8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:47 2017 +0100 sapi: Implement SpDataKey::SetKey(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/sapi/tests/Makefile.in | 5 ++++ dlls/sapi/tests/token.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 17 ++++++++++++-- 5 files changed, 79 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 339bfc5..f3247bd 100755 --- a/configure +++ b/configure @@ -18667,6 +18667,7 @@ wine_fn_config_dll rtutils enable_rtutils implib wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds clean wine_fn_config_dll sapi enable_sapi clean +wine_fn_config_test dlls/sapi/tests sapi_test wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel diff --git a/configure.ac b/configure.ac index e1dc522..b958ff3 100644 --- a/configure.ac +++ b/configure.ac @@ -3448,6 +3448,7 @@ WINE_CONFIG_DLL(rtutils,,[implib]) WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds,,[clean]) WINE_CONFIG_DLL(sapi,,[clean]) +WINE_CONFIG_TEST(dlls/sapi/tests) WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in new file mode 100644 index 0000000..bf924d7 --- /dev/null +++ b/dlls/sapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = sapi.dll +IMPORTS = ole32 user32 advapi32 + +C_SRCS = \ + token.c diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c new file mode 100644 index 0000000..8c445ea --- /dev/null +++ b/dlls/sapi/tests/token.c @@ -0,0 +1,57 @@ +/* + * Speech API (SAPI) token tests. + * + * Copyright (C) 2017 Huw Davies + * + * 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 + */ + +#define COBJMACROS + +#include "initguid.h" +#include "sapiddk.h" +#include "sperror.h" + +#include "wine/test.h" + +static void test_data_key(void) +{ + ISpRegDataKey *data_key; + HRESULT hr; + HKEY key; + LONG res; + + hr = CoCreateInstance( &CLSID_SpDataKey, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpRegDataKey, (void **)&data_key ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Winetest\\sapi", 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &key, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + hr = ISpRegDataKey_SetKey( data_key, key, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = ISpRegDataKey_SetKey( data_key, key, FALSE ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + + ISpRegDataKey_Release( data_key ); +} + +START_TEST(token) +{ + CoInitialize( NULL ); + test_data_key(); + CoUninitialize(); +} diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index bcacba8..a274f5f 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -39,6 +39,9 @@ struct data_key { ISpRegDataKey ISpRegDataKey_iface; LONG ref; + + HKEY key; + BOOL read_only; }; struct data_key *impl_from_ISpRegDataKey( ISpRegDataKey *iface ) @@ -84,6 +87,7 @@ static ULONG WINAPI data_key_Release( ISpRegDataKey *iface ) if (!ref) { + if (This->key) RegCloseKey( This->key ); heap_free( This ); } @@ -175,8 +179,15 @@ static HRESULT WINAPI data_key_EnumValues( ISpRegDataKey *iface, static HRESULT WINAPI data_key_SetKey( ISpRegDataKey *iface, HKEY key, BOOL read_only ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct data_key *This = impl_from_ISpRegDataKey( iface ); + + TRACE( "(%p)->(%p %d)\n", This, key, read_only ); + + if (This->key) return SPERR_ALREADY_INITIALIZED; + + This->key = key; + This->read_only = read_only; + return S_OK; } const struct ISpRegDataKeyVtbl data_key_vtbl = @@ -207,6 +218,8 @@ HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) if (!This) return E_OUTOFMEMORY; This->ISpRegDataKey_iface.lpVtbl = &data_key_vtbl; This->ref = 1; + This->key = NULL; + This->read_only = FALSE; hr = ISpRegDataKey_QueryInterface( &This->ISpRegDataKey_iface, iid, obj );

1 0

Michael Müller : ntdll: Fix parameters of RtlIpv4StringToAddressExW.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: e0392c3ba879cb52097ad2b5ac5d022d9dc51960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0392c3ba879cb52097ad2b5a… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 27 23:06:45 2017 -0600 ntdll: Fix parameters of RtlIpv4StringToAddressExW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 11 ++++++----- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 68d7f22..ad53c0f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -725,7 +725,7 @@ @ stdcall RtlIpv4AddressToStringW(ptr ptr) # @ stub RtlIpv4StringToAddressA # @ stub RtlIpv4StringToAddressExA -@ stdcall RtlIpv4StringToAddressExW(ptr ptr wstr ptr) +@ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) # @ stub RtlIpv4StringToAddressW # @ stub RtlIpv6AddressToStringA # @ stub RtlIpv6AddressToStringExA diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index e56eec8..a1d71eb 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -884,12 +884,13 @@ void WINAPI RtlCopyLuidAndAttributesArray( for (i = 0; i < Count; i++) Dest[i] = Src[i]; } -NTSTATUS WINAPI RtlIpv4StringToAddressExW(PULONG IP, PULONG Port, - LPCWSTR Buffer, PULONG MaxSize) +/*********************************************************************** + * RtlIpv4StringToAddressExW [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port) { - FIXME("(%p,%p,%p,%p): stub\n", IP, Port, Buffer, MaxSize); - - return STATUS_SUCCESS; + FIXME("(%s, %u, %p, %p): stub\n", debugstr_w(str), strict, address, port); + return STATUS_NOT_IMPLEMENTED; } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0da60b5..efbd13e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1080,7 +1080,7 @@ @ stdcall RtlIpv4AddressToStringW(ptr ptr) ntdll.RtlIpv4AddressToStringW @ stub RtlIpv4StringToAddressA @ stub RtlIpv4StringToAddressExA -@ stdcall RtlIpv4StringToAddressExW(ptr ptr wstr ptr) ntdll.RtlIpv4StringToAddressExW +@ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) ntdll.RtlIpv4StringToAddressExW @ stub RtlIpv4StringToAddressW @ stub RtlIpv6AddressToStringA @ stub RtlIpv6AddressToStringExA

1 0