- Wine-Devel - list.winehq.org

[PATCH v2 1/2] winevulkan: fail on explicit layer usage
by Liam Middlebrook Sept. 12, 2020

Sept. 12, 2020

Fixes failure in dEQP-VK.api.device_init.create_instance_layer_name_abuse which expects all layers passed in as part of test to cause instance creation to fail. A quirk bit WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS has been added to optionally restore the previous functionality. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/vulkan.c | 14 ++++++++++---- dlls/winevulkan/vulkan_private.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1b359d22c8c..a8beef126bd 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -335,7 +335,7 @@ static void wine_vk_init_once(void) * driver is responsible for handling e.g. surface extensions. */ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, - VkInstanceCreateInfo *dst) + VkInstanceCreateInfo *dst, struct VkInstance_T *object) { unsigned int i; VkResult res; @@ -351,8 +351,14 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo /* ICDs don't support any layers, so nothing to copy. Modern versions of the loader * filter this data out as well. */ - dst->enabledLayerCount = 0; - dst->ppEnabledLayerNames = NULL; + if (object->quirks & WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS) { + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + WARN("Ignoring explicit layers!\n"); + } else if (dst->enabledLayerCount) { + FIXME("Loading explicit layers is not supported by winevulkan!\n"); + return VK_ERROR_LAYER_NOT_PRESENT; + } TRACE("Enabled %u instance extensions.\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) @@ -673,7 +679,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + res = wine_vk_instance_convert_create_info(create_info, &create_info_host, object); if (res != VK_SUCCESS) { wine_vk_instance_free(object); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index b048108f7a6..4bcc4de440d 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -39,6 +39,7 @@ #define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 #define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 +#define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 struct vulkan_func { -- 2.17.1

3 6

[PATCH v3] msxml3: Fix a memory leak (Valgrind).
by Myah Caron Sept. 12, 2020

Sept. 12, 2020

From: Yongjie Yao <yaoyongjie(a)uniontech.com> Signed-off-by: Yongjie Yao <yaoyongjie(a)uniontech.com> Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v3: Following Nikolay's comments: - Move IStream_Release below GlobalUnlock. - Use the name displayed by their From: address for Signed-off-by. dlls/msxml3/domdoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8d45c546fb5..d447bd2b1d8 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -797,13 +797,17 @@ static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream) hr = GetHGlobalFromStream(hstream, &hglobal); if (FAILED(hr)) + { + IStream_Release(hstream); return hr; + } len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len) xmldoc = doparse(doc, ptr, len, XML_CHAR_ENCODING_NONE); GlobalUnlock(hglobal); + IStream_Release(hstream); if (!xmldoc) { -- 2.28.0

2 1

[PATCH v2 2/2] sapi: Improve GetDefaultTokenId stub.
by Myah Caron Sept. 11, 2020

Sept. 11, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: - Skip test if AudioOutput key doesn't exist (fixes Marvin test failures, but shouldn't happen on updated prefixes that have applied the first patch). - Improve wording for SPERR_NOT_FOUND skip. Original notes below: This patchset is a first step towards fixing https://bugs.winehq.org/show_bug.cgi?id=49641 My previous attempt (https://www.winehq.org/pipermail/wine-devel/2020-August/171124.html) was a rather large patch and had tests that I believe were much too invasive (deleting and restoring system registry keys). Since my previous attempt was dropped (fair enough), in order to reduce the patch review burden, this patch is much smaller and is only meant to cover the bug's use case. dlls/sapi/tests/token.c | 64 +++++++++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 34 ++++++++++++++++++++-- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9f6689b83f8..afa159f4f6f 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -116,11 +116,75 @@ static void test_token_enum(void) ISpObjectTokenEnumBuilder_Release( token_enum ); } +static void test_default_token_id(void) +{ + ISpObjectTokenCategory *cat; + HRESULT hr; + LPWSTR token_id = NULL; + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size; + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + if (hr == SPERR_INVALID_REGISTRY_KEY) { + skip( "AudioOutput category not found\n" ); + return; + } else { + ok( hr == S_OK, "got %08x\n", hr ); + } + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + + /* AudioOutput under windows server returns this error */ + if (hr == SPERR_NOT_FOUND) { + /* also happens if TokenEnums/Tokens is empty or doesn't exist */ + skip( "AudioOutput category not found for GetDefaultTokenId\n" ); + return; + } + + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", + L"DefaultDefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "DefaultDefaultTokenId not found for AudioOutput category (%s)\n", + wine_dbgstr_w(token_id) ); + } else { + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should be equal to the DefaultDefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + } + + CoTaskMemFree( token_id ); + ISpObjectTokenCategory_Release( cat ); +} + START_TEST(token) { CoInitialize( NULL ); test_data_key(); test_token_category(); test_token_enum(); + test_default_token_id(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index d2b70c95cfc..21cd958282f 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -489,8 +489,38 @@ static HRESULT WINAPI token_category_SetDefaultTokenId( ISpObjectTokenCategory * static HRESULT WINAPI token_category_GetDefaultTokenId( ISpObjectTokenCategory *iface, LPWSTR *id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + struct data_key *this_data_key; + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + + FIXME( "(%p)->(%p): semi-stub\n", iface, id ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_POINTER; + + /* todo: check HKCU's DefaultTokenId before */ + + this_data_key = impl_from_ISpRegDataKey( This->data_key ); + + res = RegGetValueW( this_data_key->key, NULL, L"DefaultDefaultTokenId", RRF_RT_REG_SZ, + NULL, &regvalue, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + return SPERR_NOT_FOUND; + } else if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "returning %08x\n", res ); + return res; + } + + *id = CoTaskMemAlloc( regvalue_size ); + wcscpy( *id, regvalue ); + + return S_OK; } const struct ISpObjectTokenCategoryVtbl token_category_vtbl = -- 2.28.0

1 0

[PATCH v2 1/2] sapi: Add AudioOutput registry keys.
by Myah Caron Sept. 11, 2020

Sept. 11, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: no change dlls/sapi/sapi.rgs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index b0863039689..8c5f862d6b7 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -6,6 +6,14 @@ HKLM { NoRemove Speech { + NoRemove AudioOutput + { + val DefaultDefaultTokenId = s 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Speech\AudioOutput\TokenEnums\MMAudioOut\' + NoRemove MMAudioOut + { + val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + } + } NoRemove Voices { } -- 2.28.0

1 0

[PATCH 2/2] sapi: Improve GetDefaultTokenId stub.
by Myah Caron Sept. 11, 2020

Sept. 11, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This patchset is a first step towards fixing https://bugs.winehq.org/show_bug.cgi?id=49641 My previous attempt (https://www.winehq.org/pipermail/wine-devel/2020-August/171124.html) was a rather large patch and had tests that I believe were much too invasive (deleting and restoring system registry keys). Since my previous attempt was dropped (fair enough), in order to reduce the patch review burden, this patch is much smaller and is only meant to cover the bug's use case. dlls/sapi/tests/token.c | 59 +++++++++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 34 ++++++++++++++++++++++-- 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9f6689b83f8..aa21bb6dce4 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -116,11 +116,70 @@ static void test_token_enum(void) ISpObjectTokenEnumBuilder_Release( token_enum ); } +static void test_default_token_id(void) +{ + ISpObjectTokenCategory *cat; + HRESULT hr; + LPWSTR token_id = NULL; + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size; + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + + /* AudioOutput under windows server returns this error */ + if (hr == SPERR_NOT_FOUND) { + /* also happens if TokenEnums/Tokens is empty or doesn't exist */ + skip( "AudioOutput category not found\n" ); + return; + } + + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", + L"DefaultDefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "DefaultDefaultTokenId not found for AudioOutput category (%s)\n", + wine_dbgstr_w(token_id) ); + } else { + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should be equal to the DefaultDefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + } + + CoTaskMemFree( token_id ); + ISpObjectTokenCategory_Release( cat ); +} + START_TEST(token) { CoInitialize( NULL ); test_data_key(); test_token_category(); test_token_enum(); + test_default_token_id(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index d2b70c95cfc..21cd958282f 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -489,8 +489,38 @@ static HRESULT WINAPI token_category_SetDefaultTokenId( ISpObjectTokenCategory * static HRESULT WINAPI token_category_GetDefaultTokenId( ISpObjectTokenCategory *iface, LPWSTR *id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + struct data_key *this_data_key; + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + + FIXME( "(%p)->(%p): semi-stub\n", iface, id ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_POINTER; + + /* todo: check HKCU's DefaultTokenId before */ + + this_data_key = impl_from_ISpRegDataKey( This->data_key ); + + res = RegGetValueW( this_data_key->key, NULL, L"DefaultDefaultTokenId", RRF_RT_REG_SZ, + NULL, &regvalue, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + return SPERR_NOT_FOUND; + } else if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "returning %08x\n", res ); + return res; + } + + *id = CoTaskMemAlloc( regvalue_size ); + wcscpy( *id, regvalue ); + + return S_OK; } const struct ISpObjectTokenCategoryVtbl token_category_vtbl = -- 2.28.0

2 2

[PATCH 1/2] sapi: Add AudioOutput registry keys.
by Myah Caron Sept. 11, 2020

Sept. 11, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/sapi/sapi.rgs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index b0863039689..8c5f862d6b7 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -6,6 +6,14 @@ HKLM { NoRemove Speech { + NoRemove AudioOutput + { + val DefaultDefaultTokenId = s 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Speech\AudioOutput\TokenEnums\MMAudioOut\' + NoRemove MMAudioOut + { + val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + } + } NoRemove Voices { } -- 2.28.0

1 0

[PATCH v3] msvcr120: Add imaxabs.
by Myah Caron Sept. 11, 2020

Sept. 11, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v3: Use cdecl -ret64 imaxabs(int64), following Piotr's comment. .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 10 ++++++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index b34147be5fe..c81c3d42127 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -17,7 +17,7 @@ @ cdecl bsearch(ptr ptr long long ptr) ucrtbase.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) ucrtbase.bsearch_s @ cdecl -ret64 div(long long) ucrtbase.div -@ stub imaxabs +@ cdecl -ret64 imaxabs(int64) ucrtbase.imaxabs @ stub imaxdiv @ cdecl labs(long) ucrtbase.labs @ cdecl -ret64 ldiv(long long) ucrtbase.ldiv diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dd7d48a8629..1773976481f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2210,7 +2210,7 @@ @ cdecl ilogb(double) MSVCR120_ilogb @ cdecl ilogbf(float) MSVCR120_ilogbf @ cdecl ilogbl(double) MSVCR120_ilogbl -@ stub imaxabs +@ cdecl -ret64 imaxabs(int64) MSVCRT_imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) MSVCRT_iswctype @ cdecl isalnum(long) MSVCRT_isalnum diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b8ffbbc7581..8072349d8d0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1874,7 +1874,7 @@ @ cdecl ilogb(double) msvcr120.ilogb @ cdecl ilogbf(float) msvcr120.ilogbf @ cdecl ilogbl(double) msvcr120.ilogbl -@ stub imaxabs +@ cdecl -ret64 imaxabs(int64) msvcr120.imaxabs @ stub imaxdiv @ cdecl isalnum(long) msvcr120.isalnum @ cdecl isalpha(long) msvcr120.isalpha diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 15d8fa4be72..a9cf224575a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1502,6 +1502,16 @@ MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) } #endif +#if _MSVCR_VER>=120 +/********************************************************************* + * imaxabs (MSVCR120.@) + */ +MSVCRT_intmax_t CDECL MSVCRT_imaxabs( MSVCRT_intmax_t n ) +{ + return n >= 0 ? n : -n; +} +#endif + /********************************************************************* * _abs64 (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6e361201b05..6feb6c873f0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -77,6 +77,7 @@ typedef unsigned int MSVCRT__fsize_t; typedef int MSVCRT_long; typedef unsigned int MSVCRT_ulong; typedef __int64 MSVCRT_longlong; +typedef long long MSVCRT_intmax_t; #ifdef _WIN64 typedef unsigned __int64 MSVCRT_size_t; typedef __int64 MSVCRT_intptr_t; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 689b3d7c951..05ac3d3427a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2344,7 +2344,7 @@ @ cdecl ilogb(double) MSVCR120_ilogb @ cdecl ilogbf(float) MSVCR120_ilogbf @ cdecl ilogbl(double) MSVCR120_ilogbl -@ stub imaxabs +@ cdecl -ret64 imaxabs(int64) MSVCRT_imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) MSVCRT_iswctype @ cdecl isalnum(long) MSVCRT_isalnum -- 2.28.0

2 1

[PATCH v2] msvcr120: Add imaxabs.
by Myah Caron Sept. 11, 2020

Sept. 11, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: Use a newly created MSVCRT_intmax_t type instead of intmax_t, fixes compilation errors. I didn't add a test to tests/headers.c because it failed to compile when I tried doing so (for the same reason adding MSVCRT_intmax_t was required). I copied the definition from include/msvcrt/stdint.h. .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 10 ++++++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index b34147be5fe..511a8389ccf 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -17,7 +17,7 @@ @ cdecl bsearch(ptr ptr long long ptr) ucrtbase.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) ucrtbase.bsearch_s @ cdecl -ret64 div(long long) ucrtbase.div -@ stub imaxabs +@ cdecl imaxabs(long long) ucrtbase.imaxabs @ stub imaxdiv @ cdecl labs(long) ucrtbase.labs @ cdecl -ret64 ldiv(long long) ucrtbase.ldiv diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dd7d48a8629..6efd2c99131 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2210,7 +2210,7 @@ @ cdecl ilogb(double) MSVCR120_ilogb @ cdecl ilogbf(float) MSVCR120_ilogbf @ cdecl ilogbl(double) MSVCR120_ilogbl -@ stub imaxabs +@ cdecl imaxabs(long long) MSVCRT_imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) MSVCRT_iswctype @ cdecl isalnum(long) MSVCRT_isalnum diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b8ffbbc7581..ac0c3387340 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1874,7 +1874,7 @@ @ cdecl ilogb(double) msvcr120.ilogb @ cdecl ilogbf(float) msvcr120.ilogbf @ cdecl ilogbl(double) msvcr120.ilogbl -@ stub imaxabs +@ cdecl imaxabs(long long) msvcr120.imaxabs @ stub imaxdiv @ cdecl isalnum(long) msvcr120.isalnum @ cdecl isalpha(long) msvcr120.isalpha diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 15d8fa4be72..a9cf224575a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1502,6 +1502,16 @@ MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) } #endif +#if _MSVCR_VER>=120 +/********************************************************************* + * imaxabs (MSVCR120.@) + */ +MSVCRT_intmax_t CDECL MSVCRT_imaxabs( MSVCRT_intmax_t n ) +{ + return n >= 0 ? n : -n; +} +#endif + /********************************************************************* * _abs64 (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6e361201b05..6feb6c873f0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -77,6 +77,7 @@ typedef unsigned int MSVCRT__fsize_t; typedef int MSVCRT_long; typedef unsigned int MSVCRT_ulong; typedef __int64 MSVCRT_longlong; +typedef long long MSVCRT_intmax_t; #ifdef _WIN64 typedef unsigned __int64 MSVCRT_size_t; typedef __int64 MSVCRT_intptr_t; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 689b3d7c951..072536911c2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2344,7 +2344,7 @@ @ cdecl ilogb(double) MSVCR120_ilogb @ cdecl ilogbf(float) MSVCR120_ilogbf @ cdecl ilogbl(double) MSVCR120_ilogbl -@ stub imaxabs +@ cdecl imaxabs(long long) MSVCRT_imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) MSVCRT_iswctype @ cdecl isalnum(long) MSVCRT_isalnum -- 2.28.0

2 1

[PATCH] d3d9: CreateDevice() requires a valid window to be passed in.
by Jeff Smith Sept. 11, 2020

Sept. 11, 2020

CreateDevice() and CreateDeviceEx() expect the focus window to be non-NULL. If windowed mode is used, the focus window can be NULL as long as the device window is non-NULL instead. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3d9/device.c | 3 ++ dlls/d3d9/tests/device.c | 87 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b92193d46f..3f9004c4c0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4711,6 +4711,9 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine if (output_idx >= parent->wined3d_output_count) return D3DERR_INVALIDCALL; + if (focus_window == 0 && (parameters->hDeviceWindow == 0 || !parameters->Windowed)) + return D3DERR_INVALIDCALL; + if (mode) FIXME("Ignoring display mode.\n"); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 53a83ad887..0fb439bbe3 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -289,6 +289,92 @@ static HRESULT reset_device(IDirect3DDevice9 *device, const struct device_desc * if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr); \ } +static void test_create_device(void) +{ + IDirect3D9 *d3d9; + IDirect3DDevice9 *device; + HWND window; + HRESULT hr; + D3DPRESENT_PARAMETERS present_parameters = {0}; + DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING; + + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d9, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + IDirect3DDevice9_Release(device); + + /* Presentation parameters = NULL causes a crash in Windows. */ + + /* In windowed mode, focus window or device window must be set. */ + + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + behavior_flags, &present_parameters, &device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_parameters.BackBufferWidth == 640, + "Got unexpected BackBufferWidth %u.\n", present_parameters.BackBufferWidth); + ok(present_parameters.BackBufferHeight == 480, + "Got unexpected BackBufferHeight %u.\n", present_parameters.BackBufferHeight); + ok(present_parameters.BackBufferFormat == D3DFMT_X8R8G8B8, + "Got unexpected BackBufferFormat %u.\n", present_parameters.BackBufferFormat); + IDirect3DDevice9_Release(device); + + memset(&present_parameters, 0, sizeof(D3DPRESENT_PARAMETERS)); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, + behavior_flags, &present_parameters, &device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_parameters.BackBufferWidth == 640, + "Got unexpected BackBufferWidth %u.\n", present_parameters.BackBufferWidth); + ok(present_parameters.BackBufferHeight == 480, + "Got unexpected BackBufferHeight %u.\n", present_parameters.BackBufferHeight); + ok(present_parameters.BackBufferFormat == D3DFMT_X8R8G8B8, + "Got unexpected BackBufferFormat %u.\n", present_parameters.BackBufferFormat); + IDirect3DDevice9_Release(device); + + memset(&present_parameters, 0, sizeof(D3DPRESENT_PARAMETERS)); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, + behavior_flags, &present_parameters, &device); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + /* In fullscreen mode, focus window must be set. */ + + memset(&present_parameters, 0, sizeof(D3DPRESENT_PARAMETERS)); + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + behavior_flags, &present_parameters, &device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DDevice9_Release(device); + + memset(&present_parameters, 0, sizeof(D3DPRESENT_PARAMETERS)); + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, + behavior_flags, &present_parameters, &device); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + +done: + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + static void test_get_set_vertex_declaration(void) { IDirect3DVertexDeclaration9 *declaration, *tmp; @@ -14136,6 +14222,7 @@ START_TEST(device) Direct3DShaderValidatorCreate9 = (void *)GetProcAddress(d3d9_handle, "Direct3DShaderValidatorCreate9"); + test_create_device(); test_get_set_vertex_declaration(); test_get_declaration(); test_fvf_decl_conversion(); -- 2.23.0

4 6

[PATCH] msvcr120: Add imaxabs.
by Myah Caron Sept. 11, 2020

Sept. 11, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index b34147be5fe..511a8389ccf 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -17,7 +17,7 @@ @ cdecl bsearch(ptr ptr long long ptr) ucrtbase.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) ucrtbase.bsearch_s @ cdecl -ret64 div(long long) ucrtbase.div -@ stub imaxabs +@ cdecl imaxabs(long long) ucrtbase.imaxabs @ stub imaxdiv @ cdecl labs(long) ucrtbase.labs @ cdecl -ret64 ldiv(long long) ucrtbase.ldiv diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dd7d48a8629..6efd2c99131 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2210,7 +2210,7 @@ @ cdecl ilogb(double) MSVCR120_ilogb @ cdecl ilogbf(float) MSVCR120_ilogbf @ cdecl ilogbl(double) MSVCR120_ilogbl -@ stub imaxabs +@ cdecl imaxabs(long long) MSVCRT_imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) MSVCRT_iswctype @ cdecl isalnum(long) MSVCRT_isalnum diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b8ffbbc7581..ac0c3387340 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1874,7 +1874,7 @@ @ cdecl ilogb(double) msvcr120.ilogb @ cdecl ilogbf(float) msvcr120.ilogbf @ cdecl ilogbl(double) msvcr120.ilogbl -@ stub imaxabs +@ cdecl imaxabs(long long) msvcr120.imaxabs @ stub imaxdiv @ cdecl isalnum(long) msvcr120.isalnum @ cdecl isalpha(long) msvcr120.isalpha diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 15d8fa4be72..696e04f0179 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1502,6 +1502,16 @@ MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) } #endif +#if _MSVCR_VER>=120 +/********************************************************************* + * imaxabs (MSVCR120.@) + */ +intmax_t CDECL MSVCRT_imaxabs( intmax_t n ) +{ + return n >= 0 ? n : -n; +} +#endif + /********************************************************************* * _abs64 (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 689b3d7c951..072536911c2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2344,7 +2344,7 @@ @ cdecl ilogb(double) MSVCR120_ilogb @ cdecl ilogbf(float) MSVCR120_ilogbf @ cdecl ilogbl(double) MSVCR120_ilogbl -@ stub imaxabs +@ cdecl imaxabs(long long) MSVCRT_imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) MSVCRT_iswctype @ cdecl isalnum(long) MSVCRT_isalnum -- 2.28.0

2 1