September 2017 - Wine-Commits

Henri Verbeet : d2d1: Implement radial gradient brushes.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

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

Alexandre Julliard : README: Remove references to removed Wiki pages.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

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

Sept. 28, 2017

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

Sept. 28, 2017

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

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

Sept. 28, 2017

Module: wine Branch: master Commit: 211f2c7b9343216ba6123ad3f5953e2a05c54106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211f2c7b9343216ba6123ad3f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:50 2017 +0100 sapi: Implement SpObjectTokenEnum::GetCount(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 8ad13a8..27d3abe 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -234,6 +234,7 @@ struct token_enum BOOL init; WCHAR *req, *opt; + ULONG count; }; struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnumBuilder *iface ) @@ -326,8 +327,14 @@ static HRESULT WINAPI token_enum_Item( ISpObjectTokenEnumBuilder *iface, static HRESULT WINAPI token_enum_GetCount( ISpObjectTokenEnumBuilder *iface, ULONG *count ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); + + TRACE( "(%p)->(%p)\n", This, count ); + + if (!This->init) return SPERR_UNINITIALIZED; + + *count = This->count; + return S_OK; } static HRESULT WINAPI token_enum_SetAttribs( ISpObjectTokenEnumBuilder *iface, @@ -417,6 +424,7 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) This->req = NULL; This->opt = NULL; This->init = FALSE; + This->count = 0; hr = ISpObjectTokenEnumBuilder_QueryInterface( &This->ISpObjectTokenEnumBuilder_iface, iid, obj );

1 0

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

Sept. 28, 2017

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

Huw Davies : sapi: Implement SpObjectTokenCategory::SetId().
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: 6a7259d8d12c016611dcbf9b7fc2ec29b325884d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7259d8d12c016611dcbf9b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:53 2017 +0100 sapi: Implement SpObjectTokenCategory::SetId(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b70dc50..9262641 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -231,6 +231,8 @@ struct token_category { ISpObjectTokenCategory ISpObjectTokenCategory_iface; LONG ref; + + ISpRegDataKey *data_key; }; struct token_category *impl_from_ISpObjectTokenCategory( ISpObjectTokenCategory *iface ) @@ -277,6 +279,7 @@ static ULONG WINAPI token_category_Release( ISpObjectTokenCategory *iface ) if (!ref) { + if (This->data_key) ISpRegDataKey_Release( This->data_key ); heap_free( This ); } return ref; @@ -368,11 +371,69 @@ static HRESULT WINAPI token_category_EnumValues( ISpObjectTokenCategory *iface, return E_NOTIMPL; } +static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key ) +{ + static const WCHAR HKLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\'}; + static const WCHAR HKCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\'}; + struct table + { + const WCHAR *name; + int size; + HKEY key; + } table[] = + { + { HKLM, sizeof(HKLM), HKEY_LOCAL_MACHINE }, + { HKCU, sizeof(HKCU), HKEY_CURRENT_USER }, + { NULL } + }; + struct table *ptr; + int len = strlenW( str ); + + for (ptr = table; ptr->name; ptr++) + { + if (len >= ptr->size / sizeof(ptr->name[0]) && !memcmp( str, ptr->name, ptr->size )) + { + *root = ptr->key; + *sub_key = str + ptr->size / sizeof(ptr->name[0]); + return S_OK; + } + } + return S_FALSE; +} + static HRESULT WINAPI token_category_SetId( ISpObjectTokenCategory *iface, LPCWSTR id, BOOL create ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + HKEY root, key; + const WCHAR *subkey; + LONG res; + HRESULT hr; + + TRACE( "(%p)->(%s %d)\n", This, debugstr_w( id ), create ); + + if (This->data_key) return SPERR_ALREADY_INITIALIZED; + + hr = parse_cat_id( id, &root, &subkey ); + if (hr != S_OK) return SPERR_INVALID_REGISTRY_KEY; + + if (create) FIXME( "Ignoring create\n" ); + + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (res) return SPERR_INVALID_REGISTRY_KEY; + + hr = CoCreateInstance( &CLSID_SpDataKey, NULL, CLSCTX_ALL, + &IID_ISpRegDataKey, (void **)&This->data_key ); + if (FAILED(hr)) goto fail; + + hr = ISpRegDataKey_SetKey( This->data_key, key, FALSE ); + if (FAILED(hr)) goto fail; + + return hr; + +fail: + RegCloseKey( key ); + return hr; } static HRESULT WINAPI token_category_GetId( ISpObjectTokenCategory *iface, @@ -445,6 +506,7 @@ HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) if (!This) return E_OUTOFMEMORY; This->ISpObjectTokenCategory_iface.lpVtbl = &token_category_vtbl; This->ref = 1; + This->data_key = NULL; hr = ISpObjectTokenCategory_QueryInterface( &This->ISpObjectTokenCategory_iface, iid, obj );

1 0

Huw Davies : sapi: Add a stub SpObjectTokenCategory object implementation.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: c3a635c2a5ec7e004719f773b126a6c7841598a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a635c2a5ec7e004719f773b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:52 2017 +0100 sapi: Add a stub SpObjectTokenCategory object implementation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/main.c | 3 + dlls/sapi/sapi_private.h | 1 + dlls/sapi/token.c | 225 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+) diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index ea164a5..5ad6b63 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -107,6 +107,7 @@ static const struct IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory data_key_cf = { { &class_factory_vtbl }, data_key_create }; +static struct class_factory token_category_cf = { { &class_factory_vtbl }, token_category_create }; static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create }; /****************************************************************** @@ -120,6 +121,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) if (IsEqualCLSID( clsid, &CLSID_SpDataKey )) cf = &data_key_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenCategory )) + cf = &token_category_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum )) cf = &token_enum_cf.IClassFactory_iface; diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 0f6ca4a..5f78d12 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -21,6 +21,7 @@ #include "wine/unicode.h" HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; +HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 51d2ed1..b70dc50 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -227,6 +227,231 @@ HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) return hr; } +struct token_category +{ + ISpObjectTokenCategory ISpObjectTokenCategory_iface; + LONG ref; +}; + +struct token_category *impl_from_ISpObjectTokenCategory( ISpObjectTokenCategory *iface ) +{ + return CONTAINING_RECORD( iface, struct token_category, ISpObjectTokenCategory_iface ); +} + +static HRESULT WINAPI token_category_QueryInterface( ISpObjectTokenCategory *iface, + REFIID iid, void **obj ) +{ + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + if (IsEqualIID( iid, &IID_IUnknown ) || + IsEqualIID( iid, &IID_ISpDataKey ) || + IsEqualIID( iid, &IID_ISpObjectTokenCategory )) + { + ISpObjectTokenCategory_AddRef( iface ); + *obj = iface; + return S_OK; + } + + FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI token_category_AddRef( ISpObjectTokenCategory *iface ) +{ + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + + TRACE( "(%p) ref = %u\n", This, ref ); + return ref; +} + +static ULONG WINAPI token_category_Release( ISpObjectTokenCategory *iface ) +{ + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE( "(%p) ref = %u\n", This, ref ); + + if (!ref) + { + heap_free( This ); + } + return ref; +} + +static HRESULT WINAPI token_category_SetData( ISpObjectTokenCategory *iface, + LPCWSTR name, ULONG size, + const BYTE *data ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_GetData( ISpObjectTokenCategory *iface, + LPCWSTR name, ULONG *size, + BYTE *data ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_SetStringValue( ISpObjectTokenCategory *iface, + LPCWSTR name, LPCWSTR value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_GetStringValue( ISpObjectTokenCategory *iface, + LPCWSTR name, LPWSTR *value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_SetDWORD( ISpObjectTokenCategory *iface, + LPCWSTR name, DWORD value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_GetDWORD( ISpObjectTokenCategory *iface, + LPCWSTR name, DWORD *pdwValue ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_OpenKey( ISpObjectTokenCategory *iface, + LPCWSTR name, ISpDataKey **sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_CreateKey( ISpObjectTokenCategory *iface, + LPCWSTR name, ISpDataKey **sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_DeleteKey( ISpObjectTokenCategory *iface, + LPCWSTR name ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_DeleteValue( ISpObjectTokenCategory *iface, + LPCWSTR name ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_EnumKeys( ISpObjectTokenCategory *iface, + ULONG index, LPWSTR *sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_EnumValues( ISpObjectTokenCategory *iface, + ULONG index, LPWSTR *value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_SetId( ISpObjectTokenCategory *iface, + LPCWSTR id, BOOL create ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_GetId( ISpObjectTokenCategory *iface, + LPWSTR *id ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_GetDataKey( ISpObjectTokenCategory *iface, + SPDATAKEYLOCATION location, + ISpDataKey **data_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface, + LPCWSTR req, LPCWSTR opt, + IEnumSpObjectTokens **enum_tokens ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_SetDefaultTokenId( ISpObjectTokenCategory *iface, + LPCWSTR id ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_category_GetDefaultTokenId( ISpObjectTokenCategory *iface, + LPWSTR *id ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +const struct ISpObjectTokenCategoryVtbl token_category_vtbl = +{ + token_category_QueryInterface, + token_category_AddRef, + token_category_Release, + token_category_SetData, + token_category_GetData, + token_category_SetStringValue, + token_category_GetStringValue, + token_category_SetDWORD, + token_category_GetDWORD, + token_category_OpenKey, + token_category_CreateKey, + token_category_DeleteKey, + token_category_DeleteValue, + token_category_EnumKeys, + token_category_EnumValues, + token_category_SetId, + token_category_GetId, + token_category_GetDataKey, + token_category_EnumTokens, + token_category_SetDefaultTokenId, + token_category_GetDefaultTokenId, +}; + +HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) +{ + struct token_category *This = heap_alloc( sizeof(*This) ); + HRESULT hr; + + if (!This) return E_OUTOFMEMORY; + This->ISpObjectTokenCategory_iface.lpVtbl = &token_category_vtbl; + This->ref = 1; + + hr = ISpObjectTokenCategory_QueryInterface( &This->ISpObjectTokenCategory_iface, iid, obj ); + + ISpObjectTokenCategory_Release( &This->ISpObjectTokenCategory_iface ); + return hr; +} + struct token_enum { ISpObjectTokenEnumBuilder ISpObjectTokenEnumBuilder_iface;

1 0

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

Sept. 28, 2017

Module: wine Branch: master Commit: c522fedf19f6e217c7ae1017f84134cbb0432f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c522fedf19f6e217c7ae1017f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:51 2017 +0100 sapi: Add a partial implementation of SpObjectTokenEnum::Next(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 34 ++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 12 ++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 8c445ea..688ade7 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -49,9 +49,43 @@ static void test_data_key(void) ISpRegDataKey_Release( data_key ); } +static void test_token_enum(void) +{ + ISpObjectTokenEnumBuilder *token_enum; + HRESULT hr; + ISpObjectToken *token; + ULONG count; + + hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenEnumBuilder_GetCount( token_enum, &count ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenEnumBuilder_Next( token_enum, 1, &token, &count ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenEnumBuilder_SetAttribs( token_enum, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = ISpObjectTokenEnumBuilder_GetCount( token_enum, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 0, "got %u\n", count ); + + count = 0xdeadbeef; + hr = ISpObjectTokenEnumBuilder_Next( token_enum, 1, &token, &count ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( count == 0, "got %u\n", count ); + + ISpObjectTokenEnumBuilder_Release( token_enum ); +} + START_TEST(token) { CoInitialize( NULL ); test_data_key(); + test_token_enum(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 27d3abe..51d2ed1 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -293,8 +293,16 @@ static HRESULT WINAPI token_enum_Next( ISpObjectTokenEnumBuilder *iface, ULONG num, ISpObjectToken **tokens, ULONG *fetched ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); + + TRACE( "(%p)->(%u %p %p)\n", This, num, tokens, fetched ); + + if (!This->init) return SPERR_UNINITIALIZED; + + FIXME( "semi-stub: Returning an empty enumerator\n" ); + + if (fetched) *fetched = 0; + return S_FALSE; } static HRESULT WINAPI token_enum_Skip( ISpObjectTokenEnumBuilder *iface,

1 0

Huw Davies : sapi: Add a stub SpObjectTokenEnum object implementation.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: 07e559306735ebc51a8506ec4b659d5b809bd54d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e559306735ebc51a8506ec4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:48 2017 +0100 sapi: Add a stub SpObjectTokenEnum object implementation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/main.c | 3 + dlls/sapi/sapi_private.h | 1 + dlls/sapi/token.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+) diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index edbb5d9..ea164a5 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -107,6 +107,7 @@ static const struct IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory data_key_cf = { { &class_factory_vtbl }, data_key_create }; +static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create }; /****************************************************************** * DllGetClassObject @@ -119,6 +120,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) if (IsEqualCLSID( clsid, &CLSID_SpDataKey )) cf = &data_key_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum )) + cf = &token_enum_cf.IClassFactory_iface; if (!cf) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 7809f50..7a5c14e 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -19,6 +19,7 @@ */ HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; +HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index a274f5f..03ce0a7 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -226,3 +226,168 @@ HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) ISpRegDataKey_Release( &This->ISpRegDataKey_iface ); return hr; } + +struct token_enum +{ + ISpObjectTokenEnumBuilder ISpObjectTokenEnumBuilder_iface; + LONG ref; +}; + +struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnumBuilder *iface ) +{ + return CONTAINING_RECORD( iface, struct token_enum, ISpObjectTokenEnumBuilder_iface ); +} + +static HRESULT WINAPI token_enum_QueryInterface( ISpObjectTokenEnumBuilder *iface, + REFIID iid, void **obj ) +{ + struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + if (IsEqualIID( iid, &IID_IUnknown ) || + IsEqualIID( iid, &IID_IEnumSpObjectTokens ) || + IsEqualIID( iid, &IID_ISpObjectTokenEnumBuilder )) + { + ISpObjectTokenEnumBuilder_AddRef( iface ); + *obj = iface; + return S_OK; + } + + FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI token_enum_AddRef( ISpObjectTokenEnumBuilder *iface ) +{ + struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + + TRACE( "(%p) ref = %u\n", This, ref ); + return ref; +} + +static ULONG WINAPI token_enum_Release( ISpObjectTokenEnumBuilder *iface ) +{ + struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE( "(%p) ref = %u\n", This, ref ); + + if (!ref) + heap_free( This ); + + return ref; +} + +static HRESULT WINAPI token_enum_Next( ISpObjectTokenEnumBuilder *iface, + ULONG num, ISpObjectToken **tokens, + ULONG *fetched ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_Skip( ISpObjectTokenEnumBuilder *iface, + ULONG num ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_Reset( ISpObjectTokenEnumBuilder *iface) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_Clone( ISpObjectTokenEnumBuilder *iface, + IEnumSpObjectTokens **clone ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_Item( ISpObjectTokenEnumBuilder *iface, + ULONG index, ISpObjectToken **token ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_GetCount( ISpObjectTokenEnumBuilder *iface, + ULONG *count ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_SetAttribs( ISpObjectTokenEnumBuilder *iface, + LPCWSTR req, LPCWSTR opt) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_AddTokens( ISpObjectTokenEnumBuilder *iface, + ULONG num, ISpObjectToken **tokens ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_AddTokensFromDataKey( ISpObjectTokenEnumBuilder *iface, + ISpDataKey *data_key, + LPCWSTR sub_key, LPCWSTR cat_id ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_AddTokensFromTokenEnum( ISpObjectTokenEnumBuilder *iface, + IEnumSpObjectTokens *token_enum ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_enum_Sort( ISpObjectTokenEnumBuilder *iface, + LPCWSTR first ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl = +{ + token_enum_QueryInterface, + token_enum_AddRef, + token_enum_Release, + token_enum_Next, + token_enum_Skip, + token_enum_Reset, + token_enum_Clone, + token_enum_Item, + token_enum_GetCount, + token_enum_SetAttribs, + token_enum_AddTokens, + token_enum_AddTokensFromDataKey, + token_enum_AddTokensFromTokenEnum, + token_enum_Sort +}; + +HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) +{ + struct token_enum *This = heap_alloc( sizeof(*This) ); + HRESULT hr; + + if (!This) return E_OUTOFMEMORY; + This->ISpObjectTokenEnumBuilder_iface.lpVtbl = &token_enum_vtbl; + This->ref = 1; + + hr = ISpObjectTokenEnumBuilder_QueryInterface( &This->ISpObjectTokenEnumBuilder_iface, iid, obj ); + + ISpObjectTokenEnumBuilder_Release( &This->ISpObjectTokenEnumBuilder_iface ); + return hr; +}

1 0