March 2021 - Wine-devel - list.winehq.org

[PATCH] d3d11/tests: Test ID3D11DeviceContext1::SwapDeviceContextState() on a deferred context.
by Zebediah Figura 02 Mar '21

02 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 58 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c40593d31d8..0d9058585f1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -31969,6 +31969,63 @@ static void test_deferred_context_state(void) release_test_context(&test_context); } +static void test_deferred_context_swap_state(void) +{ + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_9_1; + ID3D11DeviceContext1 *immediate, *deferred; + ID3DDeviceContextState *state, *prev_state; + ID3D11Buffer *green_buffer, *ret_buffer; + struct d3d11_test_context test_context; + ID3D11Device1 *device; + HRESULT hr; + + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + if (FAILED(ID3D11Device_QueryInterface(test_context.device, &IID_ID3D11Device1, (void **)&device))) + { + skip("ID3D11Device1 is not available.\n"); + release_test_context(&test_context); + return; + } + + ID3D11Device1_GetImmediateContext1(device, &immediate); + + green_buffer = create_buffer(test_context.device, D3D11_BIND_CONSTANT_BUFFER, sizeof(green), &green); + ID3D11DeviceContext1_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); + + hr = ID3D11Device1_CreateDeferredContext1(device, 0, &deferred); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (hr != S_OK) + goto out; + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, + &IID_ID3D11Device1, NULL, &state); + ok(hr == S_OK, "Failed to create device context state, hr %#x.\n", hr); + + prev_state = (void *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(deferred, NULL, &prev_state); + ok(!prev_state, "Got state %p.\n", prev_state); + + prev_state = (void *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(deferred, state, &prev_state); + ok(!prev_state, "Got state %p.\n", prev_state); + + ID3D11DeviceContext1_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + + ID3DDeviceContextState_Release(state); + ID3D11DeviceContext1_Release(deferred); + +out: + ID3D11Buffer_Release(green_buffer); + ID3D11DeviceContext1_Release(immediate); + ID3D11Device1_Release(device); + release_test_context(&test_context); +} + static void test_deferred_context_rendering(void) { ID3D11DeviceContext *immediate, *deferred; @@ -32238,6 +32295,7 @@ START_TEST(d3d11) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_deferred_context_state); + queue_test(test_deferred_context_swap_state); queue_test(test_deferred_context_rendering); run_queued_tests(); -- 2.20.1

2 1

[PATCH v2] vcruntime140_1: Support two continuation addresses for catchblock.
by Paul Gofman 02 Mar '21

02 Mar '21

MSVC generates that sometimes when there is a goto from catch block. Fixes a crash in Company of Heroes 2. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - also update exception parameter count. dlls/vcruntime140_1/except_x86_64.c | 56 ++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index a5a760b7b08..73d0d1e452c 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -66,12 +66,14 @@ typedef struct UINT type_info; int offset; UINT handler; - UINT ret_addr; + UINT ret_addr[2]; } catchblock_info; #define CATCHBLOCK_FLAGS 0x01 #define CATCHBLOCK_TYPE_INFO 0x02 #define CATCHBLOCK_OFFSET 0x04 -#define CATCHBLOCK_RET_ADDR 0x10 +#define CATCHBLOCK_RET_ADDR_MASK 0x30 +#define CATCHBLOCK_RET_ADDR 0x10 +#define CATCHBLOCK_TWO_RET_ADDRS 0x20 #define TYPE_FLAG_CONST 1 #define TYPE_FLAG_VOLATILE 2 @@ -82,6 +84,8 @@ typedef struct #define UNWIND_TYPE_DTOR_PTR 2 #define UNWIND_TYPE_FRAME 3 +#define CONSOLIDATE_UNWIND_PARAMETER_COUNT 10 + typedef struct { UINT start_level; @@ -214,19 +218,31 @@ static void read_tryblock_info(BYTE **b, tryblock_info *ti, ULONG64 image_base) static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) { + BYTE ret_addr_type; memset(ci, 0, sizeof(*ci)); ci->header = **b; (*b)++; - if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR)) + if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR_MASK)) { FIXME("unknown header: %x\n", ci->header); return FALSE; } + ret_addr_type = ci->header & CATCHBLOCK_RET_ADDR_MASK; + if (ret_addr_type && ret_addr_type != CATCHBLOCK_RET_ADDR && ret_addr_type != CATCHBLOCK_TWO_RET_ADDRS) + { + FIXME("unsupported ret addr type %#x.\n", ret_addr_type); + return FALSE; + } + if (ci->header & CATCHBLOCK_FLAGS) ci->flags = decode_uint(b); if (ci->header & CATCHBLOCK_TYPE_INFO) ci->type_info = read_rva(b); if (ci->header & CATCHBLOCK_OFFSET) ci->offset = decode_uint(b); ci->handler = read_rva(b); - if (ci->header & CATCHBLOCK_RET_ADDR) ci->ret_addr = decode_uint(b); + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = decode_uint(b); + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = decode_uint(b); + return TRUE; } @@ -303,9 +319,9 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT catchblock_info ci; if (!read_catchblock_info(&catchblock, &ci)) return FALSE; TRACE(" %d: header 0x%x offset %d handler 0x%x(%p) " - "ret addr %x type %x %s\n", j, ci.header, ci.offset, + "ret addr[0] %#x ret_addr[1] %#x type %#x %s\n", j, ci.header, ci.offset, ci.handler, rva_to_ptr(ci.handler, image_base), - ci.ret_addr, ci.type_info, + ci.ret_addr[0], ci.ret_addr[1], ci.type_info, dbgstr_type_info(rva_to_ptr(ci.type_info, image_base))); } } @@ -535,14 +551,25 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) __FINALLY_CTX(cxx_catch_cleanup, &ctx) FlsSetValue(fls_index, (void*)-2); - if (rec->ExceptionInformation[8]) return (void*)rec->ExceptionInformation[8]; - return ret_addr; + TRACE("handler returned %p, ret_addr[0] %p, ret_addr[1] %p.\n", + ret_addr, rec->ExceptionInformation[8], rec->ExceptionInformation[9]); + + if (rec->ExceptionInformation[9]) + { + if ((ULONG_PTR)ret_addr > 1) + { + FIXME("unexpected handler result %p.\n", ret_addr); + return rec->ExceptionInformation[8] ? (void *)rec->ExceptionInformation[8] : ret_addr; + } + return (void*)rec->ExceptionInformation[8 + (ULONG_PTR)ret_addr]; + } + return rec->ExceptionInformation[8] ? (void *)rec->ExceptionInformation[8] : ret_addr; } static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) { - return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==9 && - rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block4; + return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters == CONSOLIDATE_UNWIND_PARAMETER_COUNT + && rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block4; } static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, @@ -610,7 +637,7 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, memset(&catch_record, 0, sizeof(catch_record)); catch_record.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; catch_record.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - catch_record.NumberParameters = 9; + catch_record.NumberParameters = CONSOLIDATE_UNWIND_PARAMETER_COUNT; catch_record.ExceptionInformation[0] = (ULONG_PTR)call_catch_block4; catch_record.ExceptionInformation[1] = orig_frame; catch_record.ExceptionInformation[2] = tryblock.catch_level; @@ -620,9 +647,12 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, (ULONG_PTR)rva_to_ptr(ci.handler, dispatch->ImageBase); catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; - if (ci.ret_addr) + if (ci.ret_addr[0]) catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[0] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + if (ci.ret_addr[1]) + catch_record.ExceptionInformation[9] = (ULONG_PTR)rva_to_ptr( + ci.ret_addr[1] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); } } -- 2.29.2

1 0

[PATCH] vcruntime140_1: Support two continuation addresses for catchblock.
by Paul Gofman 02 Mar '21

02 Mar '21

MSVC generates that sometimes when there is a goto from catch block. Fixes a crash in Company of Heroes 2. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/vcruntime140_1/except_x86_64.c | 48 +++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index a5a760b7b08..37c087469d0 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -66,12 +66,14 @@ typedef struct UINT type_info; int offset; UINT handler; - UINT ret_addr; + UINT ret_addr[2]; } catchblock_info; #define CATCHBLOCK_FLAGS 0x01 #define CATCHBLOCK_TYPE_INFO 0x02 #define CATCHBLOCK_OFFSET 0x04 -#define CATCHBLOCK_RET_ADDR 0x10 +#define CATCHBLOCK_RET_ADDR_MASK 0x30 +#define CATCHBLOCK_RET_ADDR 0x10 +#define CATCHBLOCK_TWO_RET_ADDRS 0x20 #define TYPE_FLAG_CONST 1 #define TYPE_FLAG_VOLATILE 2 @@ -214,19 +216,31 @@ static void read_tryblock_info(BYTE **b, tryblock_info *ti, ULONG64 image_base) static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) { + BYTE ret_addr_type; memset(ci, 0, sizeof(*ci)); ci->header = **b; (*b)++; - if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR)) + if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR_MASK)) { FIXME("unknown header: %x\n", ci->header); return FALSE; } + ret_addr_type = ci->header & CATCHBLOCK_RET_ADDR_MASK; + if (ret_addr_type && ret_addr_type != CATCHBLOCK_RET_ADDR && ret_addr_type != CATCHBLOCK_TWO_RET_ADDRS) + { + FIXME("unsupported ret addr type %#x.\n", ret_addr_type); + return FALSE; + } + if (ci->header & CATCHBLOCK_FLAGS) ci->flags = decode_uint(b); if (ci->header & CATCHBLOCK_TYPE_INFO) ci->type_info = read_rva(b); if (ci->header & CATCHBLOCK_OFFSET) ci->offset = decode_uint(b); ci->handler = read_rva(b); - if (ci->header & CATCHBLOCK_RET_ADDR) ci->ret_addr = decode_uint(b); + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = decode_uint(b); + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = decode_uint(b); + return TRUE; } @@ -303,9 +317,9 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT catchblock_info ci; if (!read_catchblock_info(&catchblock, &ci)) return FALSE; TRACE(" %d: header 0x%x offset %d handler 0x%x(%p) " - "ret addr %x type %x %s\n", j, ci.header, ci.offset, + "ret addr[0] %#x ret_addr[1] %#x type %#x %s\n", j, ci.header, ci.offset, ci.handler, rva_to_ptr(ci.handler, image_base), - ci.ret_addr, ci.type_info, + ci.ret_addr[0], ci.ret_addr[1], ci.type_info, dbgstr_type_info(rva_to_ptr(ci.type_info, image_base))); } } @@ -535,8 +549,19 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) __FINALLY_CTX(cxx_catch_cleanup, &ctx) FlsSetValue(fls_index, (void*)-2); - if (rec->ExceptionInformation[8]) return (void*)rec->ExceptionInformation[8]; - return ret_addr; + TRACE("handler returned %p, ret_addr[0] %p, ret_addr[1] %p.\n", + ret_addr, rec->ExceptionInformation[8], rec->ExceptionInformation[9]); + + if (rec->ExceptionInformation[9]) + { + if ((ULONG_PTR)ret_addr > 1) + { + FIXME("unexpected handler result %p.\n", ret_addr); + return rec->ExceptionInformation[8] ? (void *)rec->ExceptionInformation[8] : ret_addr; + } + return (void*)rec->ExceptionInformation[8 + (ULONG_PTR)ret_addr]; + } + return rec->ExceptionInformation[8] ? (void *)rec->ExceptionInformation[8] : ret_addr; } static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) @@ -620,9 +645,12 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, (ULONG_PTR)rva_to_ptr(ci.handler, dispatch->ImageBase); catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; - if (ci.ret_addr) + if (ci.ret_addr[0]) catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[0] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + if (ci.ret_addr[1]) + catch_record.ExceptionInformation[9] = (ULONG_PTR)rva_to_ptr( + ci.ret_addr[1] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); } } -- 2.29.2

1 1

[PATCH] winevulkan: Add a trailing linefeed to FIXME() messages.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winevulkan/vulkan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a7f5462c432..dc3c9688df7 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1507,7 +1507,7 @@ static inline VkTimeDomainEXT get_performance_counter_time_domain(void) return VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT; # endif #else - FIXME("No mapping for VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT on this platform."); + FIXME("No mapping for VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT on this platform.\n"); return VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT; #endif } @@ -1536,7 +1536,7 @@ static inline uint64_t convert_timestamp(VkTimeDomainEXT host_domain, VkTimeDoma && target_domain == VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT) return convert_monotonic_timestamp(value); - FIXME("Couldn't translate between host domain %d and target domain %d", host_domain, target_domain); + FIXME("Couldn't translate between host domain %d and target domain %d\n", host_domain, target_domain); return value; } @@ -1609,7 +1609,7 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe else if (host_time_domains[i] == VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT) supports_monotonic_raw = TRUE; else - FIXME("Unknown time domain %d", host_time_domains[i]); + FIXME("Unknown time domain %d\n", host_time_domains[i]); } heap_free(host_time_domains); @@ -1622,7 +1622,7 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe else if (supports_monotonic && performance_counter_domain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT) out_time_domains[out_time_domain_count++] = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT; else - FIXME("VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT not supported on this platform."); + FIXME("VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT not supported on this platform.\n"); /* Forward the device domain time */ if (supports_device) -- 2.20.1

1 0

[PATCH] xactengine3_7: Add a trailing linefeed to ERR() messages.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/xactengine3_7/xact_dll.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8b9ee33ab5c..3fbb4875930 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -253,7 +253,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, if (!cue) { FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); + ERR("Failed to allocate XACT3CueImpl!\n"); return E_OUTOFMEMORY; } @@ -295,7 +295,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, if (!cue) { FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); + ERR("Failed to allocate XACT3CueImpl!\n"); return E_OUTOFMEMORY; } @@ -543,7 +543,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, if (!wave) { FACTWave_Destroy(fwave); - ERR("Failed to allocate XACT3WaveImpl!"); + ERR("Failed to allocate XACT3WaveImpl!\n"); return E_OUTOFMEMORY; } @@ -585,7 +585,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, if (!wave) { FACTWave_Destroy(fwave); - ERR("Failed to allocate XACT3WaveImpl!"); + ERR("Failed to allocate XACT3WaveImpl!\n"); return E_OUTOFMEMORY; } @@ -870,7 +870,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, if (!sb) { FACTSoundBank_Destroy(fsb); - ERR("Failed to allocate XACT3SoundBankImpl!"); + ERR("Failed to allocate XACT3SoundBankImpl!\n"); return E_OUTOFMEMORY; } @@ -907,7 +907,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac if (!wb) { FACTWaveBank_Destroy(fwb); - ERR("Failed to allocate XACT3WaveBankImpl!"); + ERR("Failed to allocate XACT3WaveBankImpl!\n"); return E_OUTOFMEMORY; } @@ -955,7 +955,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa if (!wb) { FACTWaveBank_Destroy(fwb); - ERR("Failed to allocate XACT3WaveBankImpl!"); + ERR("Failed to allocate XACT3WaveBankImpl!\n"); return E_OUTOFMEMORY; } -- 2.20.1

1 0

[PATCH] libwine: Use NULL instead of casting 0.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- It's a matter of taste I guess, but it's what NULL is here for. libs/wine/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index d6fb88f8eca..16bb97bec8e 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -479,7 +479,7 @@ noconv: long int atolW( const WCHAR *str ) { - return strtolW( str, (WCHAR **)0, 10 ); + return strtolW( str, NULL, 10 ); } int atoiW( const WCHAR *str ) -- 2.20.1

1 0

[PATCH] conhost: Add a trailing linefeed to TRACE() and ERR() messages.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/conhost/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 01917ee8b67..a665cbb84d4 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -285,7 +285,7 @@ static void save_registry_key( HKEY key, const struct console_config *config ) DWORD val, width, height, i; WCHAR color_name[13]; - TRACE( "%s", debugstr_config( config )); + TRACE( "%s\n", debugstr_config( config )); for (i = 0; i < ARRAY_SIZE(config->color_map); i++) { @@ -870,7 +870,7 @@ static void update_console_font( struct console *console, const WCHAR *font, EnumFontFamiliesW( console->window->mem_dc, NULL, get_first_font_enum, (LPARAM)&fc ); if (fc.done) return; } - ERR( "Couldn't find a decent font" ); + ERR( "Couldn't find a decent font\n" ); } /* get a cell from a relative coordinate in window (takes into account the scrolling) */ -- 2.20.1

1 0

[PATCH] widl: Fix missing delegate declaration namespace.
by Rémi Bernon 02 Mar '21

02 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/typetree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a1e7abc31e5..591a58b2849 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -901,7 +901,7 @@ static void compute_delegate_iface_names(type_t *delegate, type_t *type, typeref type_t *type_delegate_declare(char *name, struct namespace *namespace) { - type_t *type = get_type(TYPE_DELEGATE, name, NULL, 0); + type_t *type = get_type(TYPE_DELEGATE, name, namespace, 0); if (type_get_type_detect_alias(type) != TYPE_DELEGATE) error_loc("delegate %s previously not declared a delegate at %s:%d\n", type->name, type->loc_info.input_name, type->loc_info.line_number); -- 2.30.0

2 1

[PATCH] fsutil/tests: Add a trailing linefeed to an ok() message.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/fsutil/tests/fsutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index eff47a4f8ec..aa0d5d3884b 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -100,7 +100,7 @@ static void test_hardlink(void) ok(boolrc, "failed to get info about hardlink, error %#x\n", GetLastError()); CloseHandle(hfile); - ok(info.nNumberOfLinks == 2, "our link is not a hardlink"); + ok(info.nNumberOfLinks == 2, "our link is not a hardlink\n"); rc = runcmd("fsutil hardlink create link file"); ok(rc == 1, "fsutil didn't complain about already existing destination\n"); -- 2.20.1

1 0

[PATCH] winegcc: Add a trailing linefeed to an error() message.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c812af48670..9297a9b75bd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1679,7 +1679,7 @@ int main(int argc, char **argv) strarray_add( opts.args, argv[i] ); continue; } - if ((fstat( fd, &st ) == -1)) error( "Cannot stat %s", argv[i] + 1 ); + if ((fstat( fd, &st ) == -1)) error( "Cannot stat %s\n", argv[i] + 1 ); if (st.st_size) { input_buffer = xmalloc( st.st_size + 1 ); -- 2.20.1

1 0