wine-devel

wine-devel@winehq.org

8 participants
84486 discussions

[PATCH 2/4] sapi: Add stubs for SpObjectToken.
by Myah Caron 16 Sep '20

16 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This patchset is progressing further towards fixing https://bugs.winehq.org/show_bug.cgi?id=49641 Though the tests reference GetCategory, it would require a fair amount of work to implement, so I've left it out of this patchset. I've kept the tests however, as they reveal some information about SetId (the primary target of this patchset). dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 ++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/token.c | 124 +++++++++++++++++ dlls/sapi/token.c | 276 +++++++++++++++++++++++++++++++++++++ include/sapi.idl | 13 ++ 6 files changed, 430 insertions(+) diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index e8d4ae01583..9c644001faa 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -110,6 +110,7 @@ static struct class_factory file_stream_cf = { { &class_factory_vtbl }, file_ static struct class_factory speech_voice_cf = { { &class_factory_vtbl }, speech_voice_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 }; +static struct class_factory token_cf = { { &class_factory_vtbl }, token_create }; /****************************************************************** * DllGetClassObject @@ -128,6 +129,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) cf = &token_category_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum )) cf = &token_enum_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_SpObjectToken )) + cf = &token_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpVoice )) cf = &speech_voice_cf.IClassFactory_iface; diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl index ed86d166fcd..082244e0812 100644 --- a/dlls/sapi/sapi_classes.idl +++ b/dlls/sapi/sapi_classes.idl @@ -51,6 +51,19 @@ coclass SpObjectTokenEnum [default] interface IEnumSpObjectTokens; } +[ + uuid(ef411752-3736-4cb4-9c8c-8ef4ccb58efe), + helpstring("Object Token"), + progid("SAPI.SpObjectToken.1"), + vi_progid("SAPI.SpObjectToken"), + threading(both) +] +coclass SpObjectToken +{ + interface ISpObjectToken; + [default] interface ISpDataKey; +} + [ uuid(96749377-3391-11d2-9ee3-00c04f797396), helpstring("Speech Voice"), diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index e9fed0ea443..414dea2755a 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -25,6 +25,7 @@ HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_H HRESULT speech_voice_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; +HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; static inline LPWSTR heap_strdupW(LPCWSTR str) { diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 58d69920fd5..9558022b3f4 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -174,6 +174,129 @@ static void test_default_token_id(void) ISpObjectTokenCategory_Release( cat ); } +static void test_object_token(void) +{ + ISpObjectToken *token; + HRESULT hr; + LPWSTR tempW, token_id; + ISpObjectTokenCategory *cat; + + hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectToken, (void **)&token ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectToken_GetId( token, NULL ); + todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + tempW = (LPWSTR)0xdeadbeef; + hr = ISpObjectToken_GetId( token, &tempW ); + todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( tempW == (LPWSTR)0xdeadbeef, "got %s\n", wine_dbgstr_w(tempW) ); + + hr = ISpObjectToken_GetCategory( token, NULL ); + todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + cat = (LPVOID)0xdeadbeef; + hr = ISpObjectToken_GetCategory( token, &cat ); + todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); + + hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); + todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + hr = ISpObjectToken_SetId( token, L"bogus", NULL, FALSE ); + todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE\\winetest bogus", FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + + /* SetId succeeds even if the key is invalid, but exists */ + hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE", FALSE ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); + todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); + todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectToken_GetId( token, NULL ); + todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = ISpObjectToken_GetCategory( token, NULL ); + todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + + tempW = NULL; + hr = ISpObjectToken_GetId( token, &tempW ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( tempW != NULL, "got %p\n", tempW ); + if (tempW) { + ok( !wcscmp(tempW, L"HKEY_LOCAL_MACHINE\\SOFTWARE"), "got %s\n", + wine_dbgstr_w(tempW) ); + CoTaskMemFree( tempW ); + } + + cat = (LPVOID)0xdeadbeef; + hr = ISpObjectToken_GetCategory( token, &cat ); + todo_wine ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08x\n", hr ); + ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); + + /* get the default token id for SPCAT_AUDIOOUT */ + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + if (hr == SPERR_NOT_FOUND) { + skip( "AudioOutput category not found for GetDefaultTokenId\n" ); + return; + } + ok( hr == S_OK, "got %08x\n", hr ); + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + ISpObjectTokenCategory_Release( cat ); + + /* recreate token in order to SetId again */ + ISpObjectToken_Release( token ); + hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectToken, (void **)&token ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* NULL appears to auto-detect the category */ + hr = ISpObjectToken_SetId( token, NULL, token_id, FALSE ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + tempW = NULL; + hr = ISpObjectToken_GetId( token, &tempW ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( tempW != NULL, "got %p\n", tempW ); + if (tempW) { + ok( !wcscmp(tempW, token_id), "got %s\n", wine_dbgstr_w(tempW) ); + CoTaskMemFree( tempW ); + } + + cat = (LPVOID)0xdeadbeef; + hr = ISpObjectToken_GetCategory( token, &cat ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( cat != (LPVOID)0xdeadbeef, "got %p\n", cat ); + if (cat != (LPVOID)0xdeadbeef) { + tempW = NULL; + hr = ISpObjectTokenCategory_GetId( cat, &tempW ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( tempW != NULL, "got %p\n", tempW ); + if (tempW) { + ok( !wcscmp(tempW, SPCAT_AUDIOOUT), "got %s\n", wine_dbgstr_w(tempW) ); + CoTaskMemFree( tempW ); + } + + /* not freed by ISpObjectToken_Release */ + ISpObjectTokenCategory_Release( cat ); + } + + ISpObjectToken_Release( token ); +} + START_TEST(token) { CoInitialize( NULL ); @@ -181,5 +304,6 @@ START_TEST(token) test_token_category(); test_token_enum(); test_default_token_id(); + test_object_token(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 21cd958282f..f7a00d73f02 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -776,3 +776,279 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) ISpObjectTokenEnumBuilder_Release( &This->ISpObjectTokenEnumBuilder_iface ); return hr; } + +struct object_token +{ + ISpObjectToken ISpObjectToken_iface; + LONG ref; +}; + +static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) +{ + return CONTAINING_RECORD( iface, struct object_token, ISpObjectToken_iface ); +} + +static HRESULT WINAPI token_QueryInterface( ISpObjectToken *iface, + REFIID iid, void **obj ) +{ + struct object_token *This = impl_from_ISpObjectToken( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + if (IsEqualIID( iid, &IID_IUnknown ) || + IsEqualIID( iid, &IID_ISpDataKey ) || + IsEqualIID( iid, &IID_ISpObjectToken )) + { + ISpObjectToken_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_AddRef( ISpObjectToken *iface ) +{ + struct object_token *This = impl_from_ISpObjectToken( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + + TRACE( "(%p) ref = %u\n", This, ref ); + return ref; +} + +static ULONG WINAPI token_Release( ISpObjectToken *iface ) +{ + struct object_token *This = impl_from_ISpObjectToken( iface ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE( "(%p) ref = %u\n", This, ref ); + + if (!ref) + { + heap_free( This ); + } + + return ref; +} + +static HRESULT WINAPI token_SetData( ISpObjectToken *iface, + LPCWSTR name, ULONG size, + const BYTE *data ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetData( ISpObjectToken *iface, + LPCWSTR name, ULONG *size, + BYTE *data ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_SetStringValue( ISpObjectToken *iface, + LPCWSTR name, LPCWSTR value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetStringValue( ISpObjectToken *iface, + LPCWSTR name, LPWSTR *value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_SetDWORD( ISpObjectToken *iface, + LPCWSTR name, DWORD value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetDWORD( ISpObjectToken *iface, + LPCWSTR name, DWORD *pdwValue ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_OpenKey( ISpObjectToken *iface, + LPCWSTR name, ISpDataKey **sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_CreateKey( ISpObjectToken *iface, + LPCWSTR name, ISpDataKey **sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_DeleteKey( ISpObjectToken *iface, + LPCWSTR name ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_DeleteValue( ISpObjectToken *iface, + LPCWSTR name ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_EnumKeys( ISpObjectToken *iface, + ULONG index, LPWSTR *sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_EnumValues( ISpObjectToken *iface, + ULONG index, LPWSTR *value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_SetId( ISpObjectToken *iface, + LPCWSTR category_id, LPCWSTR token_id, + BOOL create ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetId( ISpObjectToken *iface, + LPWSTR *token_id ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetCategory( ISpObjectToken *iface, + ISpObjectTokenCategory **category ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_CreateInstance( ISpObjectToken *iface, + IUnknown *outer, + DWORD class_context, + REFIID riid, + void **object ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetStorageFileName( ISpObjectToken *iface, + REFCLSID caller, + LPCWSTR key_name, + LPCWSTR filename, + ULONG folder, + LPWSTR *filepath ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_RemoveStorageFileName( ISpObjectToken *iface, + REFCLSID caller, + LPCWSTR key_name, + BOOL delete_file ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_Remove( ISpObjectToken *iface, + REFCLSID caller ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_IsUISupported( ISpObjectToken *iface, + LPCWSTR ui_type, + void *extra_data, + ULONG extra_data_size, + IUnknown *object, + BOOL *supported ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_DisplayUI( ISpObjectToken *iface, + HWND parent, + LPCWSTR title, + LPCWSTR ui_type, + void *extra_data, + ULONG extra_data_size, + IUnknown *object ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_MatchesAttributes( ISpObjectToken *iface, + LPCWSTR attributes, + BOOL *matches ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +const struct ISpObjectTokenVtbl token_vtbl = +{ + token_QueryInterface, + token_AddRef, + token_Release, + token_SetData, + token_GetData, + token_SetStringValue, + token_GetStringValue, + token_SetDWORD, + token_GetDWORD, + token_OpenKey, + token_CreateKey, + token_DeleteKey, + token_DeleteValue, + token_EnumKeys, + token_EnumValues, + token_SetId, + token_GetId, + token_GetCategory, + token_CreateInstance, + token_GetStorageFileName, + token_RemoveStorageFileName, + token_Remove, + token_IsUISupported, + token_DisplayUI, + token_MatchesAttributes +}; + +HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) +{ + struct object_token *This = heap_alloc( sizeof(*This) ); + HRESULT hr; + + if (!This) return E_OUTOFMEMORY; + This->ISpObjectToken_iface.lpVtbl = &token_vtbl; + This->ref = 1; + + hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj ); + + ISpObjectToken_Release( &This->ISpObjectToken_iface ); + return hr; +} diff --git a/include/sapi.idl b/include/sapi.idl index 9e6ba5be5ea..0a7a034cace 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -1064,6 +1064,19 @@ library SpeechLib interface ISpObjectTokenCategory; } + [ + uuid(ef411752-3736-4cb4-9c8c-8ef4ccb58efe), + helpstring("Object Token"), + progid("SAPI.SpObjectToken.1"), + vi_progid("SAPI.SpObjectToken"), + threading(both) + ] + coclass SpObjectToken + { + interface ISpObjectToken; + [default] interface ISpDataKey; + } + [ uuid(3bee4890-4fe9-4a37-8c1e-5e7e12791c1f) ] -- 2.28.0

2 1

[PATCH 1/4] sapi: Fix MMAudioOut registry key location.
by Myah Caron 16 Sep '20

16 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Sorry, I should have caught that last time. dlls/sapi/sapi.rgs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index 8c5f862d6b7..331e115ae71 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -9,9 +9,12 @@ HKLM NoRemove AudioOutput { val DefaultDefaultTokenId = s 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Speech\AudioOutput\TokenEnums\MMAudioOut\' - NoRemove MMAudioOut + NoRemove TokenEnums { - val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + NoRemove MMAudioOut + { + val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + } } } NoRemove Voices -- 2.28.0

1 0

[PATCH 1/5] winevulkan: Invert MAX_IMAGE_COUNT quirk to default to zero
by Liam Middlebrook 15 Sep '20

15 Sep '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/vulkan.c | 4 +--- dlls/winevulkan/vulkan_private.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f730c04923a..a0dafbca46b 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -729,8 +729,6 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } - object->quirks |= WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT; - *instance = object; TRACE("Created instance %p (native instance %p).\n", object, object->instance); return VK_SUCCESS; @@ -1580,7 +1578,7 @@ static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCa * https://vulkan.gpuinfo.org/displayreport.php?id=9122#surface * https://vulkan.gpuinfo.org/displayreport.php?id=9121#surface */ - if ((phys_dev->instance->quirks & WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT) && !capabilities->maxImageCount) + if (!(phys_dev->instance->quirks & WINEVULKAN_QUIRK_DONT_ADJUST_MAX_IMAGE_COUNT) && !capabilities->maxImageCount) { capabilities->maxImageCount = max(capabilities->minImageCount, 16); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4bcc4de440d..00698aff4bb 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -38,7 +38,7 @@ #define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE #define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 -#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 +#define WINEVULKAN_QUIRK_DONT_ADJUST_MAX_IMAGE_COUNT 0x00000002 #define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 struct vulkan_func -- 2.17.1

4 8

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 15 Sep '20

15 Sep '20

1 0

[PATCH] crypt32: Fix conversion of CRYPT_KEY_PROV_INFO between store and certificate property.
by Dmitry Timoshkov 15 Sep '20

15 Sep '20

Store uses relative offsets while certificate property uses pointers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 13d8df9258..ef871155b9 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -566,7 +566,7 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) if (store->pwszContainerName) { - info.pwszContainerName = (LPWSTR)p; + info.pwszContainerName = (LPWSTR)((BYTE *)store + store->pwszContainerName); p += (lstrlenW(info.pwszContainerName) + 1) * sizeof(WCHAR); } else @@ -574,7 +574,7 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) if (store->pwszProvName) { - info.pwszProvName = (LPWSTR)p; + info.pwszProvName = (LPWSTR)((BYTE *)store + store->pwszProvName); p += (lstrlenW(info.pwszProvName) + 1) * sizeof(WCHAR); } else @@ -705,6 +705,7 @@ static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY to->dwProvType = from->dwProvType; to->dwFlags = from->dwFlags; to->cProvParam = from->cProvParam; + to->rgProvParam = 0; to->dwKeySpec = from->dwKeySpec; for (i = 0; i < to->cProvParam; i++) @@ -713,6 +714,7 @@ static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY p += sizeof(*param); param->dwParam = from->rgProvParam[i].dwParam; + param->pbData = 0; param->cbData = from->rgProvParam[i].cbData; param->dwFlags = from->rgProvParam[i].dwFlags; memcpy(p, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData); -- 2.26.2

1 0

[PATCH] msvcrt: Fix _vs{w,n}printf_c function when terminating character doesn't fit into buffer.
by Piotr Caban 15 Sep '20

15 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 8 ++++---- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrt/tests/printf.c | 5 +++++ dlls/msvcrt/wcs.c | 37 +++++++++++++++++++++++++++++++++++++ 8 files changed, 66 insertions(+), 24 deletions(-)

1 0

[PATCH 4/5] conhost/tests: Add ReadConsole tests.
by Jacek Caban 15 Sep '20

15 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 93 +++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-)

2 1

[PATCH] d3d9: Lock wined3d mutex in d3d9_device_CreateTexture().
by Piotr Caban 15 Sep '20

15 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- texture_init is already doing the locking. dlls/d3d9/device.c | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 3/5] conhost/tests: Allow clear screen on console exit.
by Jacek Caban 15 Sep '20

15 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)

2 1

[PATCH 2/5] conhost/tests: Improve handling slow conhost replies.
by Jacek Caban 15 Sep '20

15 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

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