October 2020 - Wine-devel - list.winehq.org

[PATCH] d3dx9/tests: Use wide-char string literals.
by Michael Stefaniuc 01 Oct '20

01 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/asm.c | 6 ++---- dlls/d3dx9_36/tests/effect.c | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 4087bd89b09..9b4e82f218a 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -195,7 +195,6 @@ static void assembleshader_test(void) }; struct D3DXIncludeImpl include; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; - static const WCHAR shader_filename_w[] = {'s','h','a','d','e','r','.','v','s','h',0}; /* pDefines test */ shader = NULL; @@ -356,7 +355,7 @@ static void assembleshader_test(void) shader = NULL; messages = NULL; - hr = D3DXAssembleShaderFromFileW(shader_filename_w, NULL, &include.ID3DXInclude_iface, + hr = D3DXAssembleShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude main shader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); @@ -445,7 +444,6 @@ static void d3dxpreprocess_test(void) ID3DXBuffer *shader, *messages; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; static struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}}; - static const WCHAR shader_filename_w[] = {'s','h','a','d','e','r','.','v','s','h',0}; if (create_file("shader.vsh", testshader, sizeof(testshader) - 1, shader_vsh_path)) { @@ -520,7 +518,7 @@ static void d3dxpreprocess_test(void) shader = NULL; messages = NULL; - hr = D3DXPreprocessShaderFromFileW(shader_filename_w, NULL, &include.ID3DXInclude_iface, + hr = D3DXPreprocessShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, &shader, &messages); ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude main shader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c72049d553e..ae6f65d52d5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7740,8 +7740,6 @@ static void test_create_effect_from_file(void) " VertexShader = compile vs_2_0 vs_main();\n" " }\n" "}\n"; - static const WCHAR effect1_filename_w[] = {'e','f','f','e','c','t','1','.','f','x',0}; - static const WCHAR effect2_filename_w[] = {'e','f','f','e','c','t','2','.','f','x',0}; WCHAR effect_path_w[MAX_PATH], filename_w[MAX_PATH]; char effect_path[MAX_PATH], filename[MAX_PATH]; D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -7798,7 +7796,7 @@ static void test_create_effect_from_file(void) create_file("include1.h", include1_wrong, sizeof(include1_wrong) - 1, NULL); lstrcpyW(filename_w, effect_path_w); - lstrcatW(filename_w, effect1_filename_w); + lstrcatW(filename_w, L"effect1.fx"); effect = NULL; messages = NULL; hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL, @@ -7813,7 +7811,7 @@ static void test_create_effect_from_file(void) effect->lpVtbl->Release(effect); lstrcpyW(filename_w, effect_path_w); - lstrcatW(filename_w, effect2_filename_w); + lstrcatW(filename_w, L"effect2.fx"); effect = NULL; messages = NULL; /* This is apparently broken on native, it ends up using the wrong include. */ @@ -7835,7 +7833,7 @@ static void test_create_effect_from_file(void) delete_file("include2.h"); delete_directory("include"); - lstrcpyW(filename_w, effect2_filename_w); + lstrcpyW(filename_w, L"effect2.fx"); effect = NULL; messages = NULL; include.ID3DXInclude_iface.lpVtbl = &d3dxinclude_vtbl; -- 2.26.2

2 1

[PATCH] d3dx11/tests: Use wide-char string literals.
by Michael Stefaniuc 01 Oct '20

01 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index db06c971440..06924877da4 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -129,13 +129,12 @@ static void test_D3DX11CreateAsyncMemoryLoader(void) static void create_testfile(WCHAR *path, const void *data, int data_len) { - static const WCHAR test_filename[] = {'a','s','y','n','c','l','o','a','d','e','r','.','d','a','t','a',0}; DWORD written; HANDLE file; BOOL ret; GetTempPathW(MAX_PATH, path); - lstrcatW(path, test_filename); + lstrcatW(path, L"asyncloader.data"); file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %d.\n", @@ -240,7 +239,6 @@ static void test_D3DX11CreateAsyncFileLoader(void) static void test_D3DX11CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX11DataLoader *loader; HRESULT hr; @@ -259,7 +257,7 @@ static void test_D3DX11CreateAsyncResourceLoader(void) hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX11CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX11CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); } -- 2.26.2

2 1

[PATCH] d3dx10/tests: Use wide-char string literals.
by Michael Stefaniuc 01 Oct '20

01 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 897c54249b3..54cb4df3b7b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1340,7 +1340,6 @@ static void test_D3DX10CreateAsyncFileLoader(void) static void test_D3DX10CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX10DataLoader *loader; HRESULT hr; @@ -1359,7 +1358,7 @@ static void test_D3DX10CreateAsyncResourceLoader(void) hr = D3DX10CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX10CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); } -- 2.26.2

2 1

[PATCH 5/5] include: Add missing names in D3D12_FEATURE enum in d3d12.idl.
by Biswapriyo Nath 01 Oct '20

01 Oct '20

1 0

[PATCH 4/5] include: Add D3D12Heap interface in d3d12.idl.
by Biswapriyo Nath 01 Oct '20

01 Oct '20

1 0

[PATCH 3/5] include: Add D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS enum in d3d12.idl.
by Biswapriyo Nath 01 Oct '20

01 Oct '20

1 0

[PATCH 1/5] include: Add D3D12_SHADER_VERSION_TYPE enum in d3d12shader.idl.
by Biswapriyo Nath 01 Oct '20

01 Oct '20

1 0

[PATCH] include: Add DWRITE_MAKE_FONT_AXIS_TAG macro.
by Nikolay Sivov 01 Oct '20

01 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index f5ee6157cd7..1b10454ec60 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -80,6 +80,12 @@ typedef struct DWRITE_FONT_PROPERTY WCHAR const *localeName; } DWRITE_FONT_PROPERTY; +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define DWRITE_MAKE_FONT_AXIS_TAG(a,b,c,d) (static_cast<DWRITE_FONT_AXIS_TAG>(DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d)))") +cpp_quote("#else") +cpp_quote("#define DWRITE_MAKE_FONT_AXIS_TAG(a,b,c,d) (DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d))") +cpp_quote("#endif") + typedef enum DWRITE_FONT_AXIS_TAG { DWRITE_FONT_AXIS_TAG_WEIGHT = 0x74686777, /* 'wght' */ -- 2.28.0

1 0

[PATCH v2] vcruntime140_1: Terminate on noexcept function trying to propagate exception.
by Daniel Lehman 30 Sep '20

30 Sep '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: handle nested case this should print 0x42: wine64 tosend.exe these should terminate(): wine64 tosend.exe 1 wine64 tosend.exe 1 1 wine64 tosend.exe 1 1 1 /* cl /EHsc /MD noexcept.cpp */ void do_throw(void) { throw int(0x42); } void crash_without_tries(void) noexcept { do_throw(); } void crash_with_tries(void) noexcept { try { do_throw(); } catch (float e) { /* bogus */ } } void crash_nested(void) noexcept { try { try { throw 1; } catch (int e) { throw; } } catch (float f) { /* bogus */ } } void works(void) noexcept { try { do_throw(); } catch (int e) { printf("0x%x\n", e); } } void works_nested(void) noexcept { try { try { throw 1; } catch (int e) { throw; } } catch (...) { } } void works_nested2(void) noexcept { try { try { try { throw 1; } catch (int e) { throw; } } catch (int e) { throw; } } catch (...) { } } int main(int argc, char **argv) { try { switch (argc) { case 4: crash_nested(); break; case 3: crash_without_tries(); break; case 2: crash_with_tries(); break; default: works(); works_nested(); works_nested2(); break; } } catch (...) { printf("%s: should not be printed\n", __FUNCTION__); } return 0; } --- dlls/vcruntime140_1/except_x86_64.c | 90 ++++++++++++++++------------- 1 file changed, 49 insertions(+), 41 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index f66ae43721f..341f26a20c2 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -683,56 +683,64 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, cxx_local_unwind4(orig_frame, dispatch, descr, trylevel, last_level); return ExceptionContinueSearch; } - if (!descr->tryblock_map) return ExceptionContinueSearch; - - if (rec->ExceptionCode == CXX_EXCEPTION) + if (descr->tryblock_map) { - if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) - { - TRACE("rethrow detected.\n"); - *rec = *(EXCEPTION_RECORD*)*__current_exception(); - } - - exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - - if (TRACE_ON(seh)) + if (rec->ExceptionCode == CXX_EXCEPTION) { - TRACE("handling C++ exception rec %p frame %lx descr %p\n", rec, frame, descr); - dump_exception_type(exc_type, rec->ExceptionInformation[3]); - } - } - else - { - _se_translator_function se_translator = get_se_translator(); - - exc_type = NULL; - TRACE("handling C exception code %x rec %p frame %lx descr %p\n", - rec->ExceptionCode, rec, frame, descr); + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + { + TRACE("rethrow detected.\n"); + *rec = *(EXCEPTION_RECORD*)*__current_exception(); + } - if (se_translator) { - EXCEPTION_POINTERS except_ptrs; - se_translator_ctx ctx; + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - ctx.dest_frame = frame; - ctx.orig_frame = orig_frame; - ctx.seh_rec = rec; - ctx.dispatch = dispatch; - ctx.descr = descr; - ctx.trylevel = trylevel; - __TRY + if (TRACE_ON(seh)) { - except_ptrs.ExceptionRecord = rec; - except_ptrs.ContextRecord = context; - se_translator(rec->ExceptionCode, &except_ptrs); + TRACE("handling C++ exception rec %p frame %lx descr %p\n", rec, frame, descr); + dump_exception_type(exc_type, rec->ExceptionInformation[3]); } - __EXCEPT_CTX(se_translation_filter, &ctx) - { + } + else + { + _se_translator_function se_translator = get_se_translator(); + + exc_type = NULL; + TRACE("handling C exception code %x rec %p frame %lx descr %p\n", + rec->ExceptionCode, rec, frame, descr); + + if (se_translator) { + EXCEPTION_POINTERS except_ptrs; + se_translator_ctx ctx; + + ctx.dest_frame = frame; + ctx.orig_frame = orig_frame; + ctx.seh_rec = rec; + ctx.dispatch = dispatch; + ctx.descr = descr; + ctx.trylevel = trylevel; + __TRY + { + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + se_translator(rec->ExceptionCode, &except_ptrs); + } + __EXCEPT_CTX(se_translation_filter, &ctx) + { + } + __ENDTRY } - __ENDTRY } + + find_catch_block4(rec, context, NULL, frame, dispatch, descr, exc_type, orig_frame, trylevel); } - find_catch_block4(rec, context, NULL, frame, dispatch, descr, exc_type, orig_frame, trylevel); + if ((descr->header & FUNC_DESCR_NO_EXCEPT) && + !(descr->header & FUNC_DESCR_IS_CATCH)) + { + ERR("noexcept function propagating exception\n"); + terminate(); + } return ExceptionContinueSearch; } @@ -759,7 +767,7 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, return ExceptionContinueSearch; /* handle only c++ exceptions */ if (descr.header & ~(FUNC_DESCR_IS_CATCH | FUNC_DESCR_UNWIND_MAP | - FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS)) + FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS | FUNC_DESCR_NO_EXCEPT)) { FIXME("unsupported flags: %x\n", descr.header); return ExceptionContinueSearch; -- 2.25.1

1 0