September 2017 - Wine-commits

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: 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: 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: 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 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

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

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

28 Sep '17

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

1 0

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

28 Sep '17

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

1 0

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

28 Sep '17

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

1 0

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

28 Sep '17

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

1 0