wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Nikolay Sivov : shell32: Implement FolderItem::Name() property getter.
by Alexandre Julliard 28 Sep '17

28 Sep '17

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

Huw Davies : sapi: Add a partial implementation of SpObjectTokenCategory:: EnumTokens().
by Alexandre Julliard 28 Sep '17

28 Sep '17

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 SpObjectTokenCategory::SetId().
by Alexandre Julliard 28 Sep '17

28 Sep '17

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 28 Sep '17

28 Sep '17

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 28 Sep '17

28 Sep '17

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: Implement SpObjectTokenEnum::GetCount().
by Alexandre Julliard 28 Sep '17

28 Sep '17

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

Huw Davies : sapi: Implement SpObjectTokenEnum::SetAttribs().
by Alexandre Julliard 28 Sep '17

28 Sep '17

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: Add a stub SpObjectTokenEnum object implementation.
by Alexandre Julliard 28 Sep '17

28 Sep '17

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

Huw Davies : sapi: Implement SpDataKey::SetKey().
by Alexandre Julliard 28 Sep '17

28 Sep '17

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

Huw Davies : sapi: Add a stub SpDataKey object implementation.
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: c82d27429330db91b7ebda107e17df910e75fe0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82d27429330db91b7ebda107… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:46 2017 +0100 sapi: Add a stub SpDataKey object implementation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 3 +- dlls/sapi/main.c | 91 ++++++++++++++++++++ dlls/sapi/sapi.spec | 2 +- dlls/sapi/sapi_private.h | 31 +++++++ dlls/sapi/token.c | 215 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 340 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c82d27429330db91b7ebd…

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