August 2018 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Allow copying between different texture types.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 2aa5b0011a657cd99690783b0c02491105ee799a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa5b0011a657cd99690783b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 11:09:51 2018 +0200 wined3d: Allow copying between different texture types. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7e8cec..5079113 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4090,14 +4090,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - if (src_resource->type != dst_resource->type) - { - WARN("Resource types (%s / %s) don't match.\n", - debug_d3dresourcetype(dst_resource->type), - debug_d3dresourcetype(src_resource->type)); - return WINED3DERR_INVALIDCALL; - } - if (src_resource->format->typeless_id != dst_resource->format->typeless_id || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) { @@ -4109,6 +4101,14 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (dst_resource->type == WINED3D_RTYPE_BUFFER) { + if (src_resource->type != WINED3D_RTYPE_BUFFER) + { + WARN("Resource types (%s / %s) don't match.\n", + debug_d3dresourcetype(dst_resource->type), + debug_d3dresourcetype(src_resource->type)); + return WINED3DERR_INVALIDCALL; + } + if (dst_sub_resource_idx) { WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx);

1 0

Józef Kucia : wined3d: Add fall through comment in texture2d_blt_fbo() (Coverity).
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: bdc0a99012a4f3b574f31af9d50a3ebd05e51dd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdc0a99012a4f3b574f31af9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 11:09:47 2018 +0200 wined3d: Add fall through comment in texture2d_blt_fbo() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5502d05..2f74ad6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -175,6 +175,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 default: FIXME("Unsupported filter mode %s (%#x).\n", debug_d3dtexturefiltertype(filter), filter); + /* fall through */ case WINED3D_TEXF_NONE: case WINED3D_TEXF_POINT: gl_filter = GL_NEAREST;

1 0

Zebediah Figura : winedbg/gdbproxy: Use the WINEDEBUG interface for debugging winedbg.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 6159431cd70b1925833f64a09ff4a0e120c59665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6159431cd70b1925833f64a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 30 14:47:53 2018 -0500 winedbg/gdbproxy: Use the WINEDEBUG interface for debugging winedbg. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 324 ++++++++++++++------------------------------ 1 file changed, 99 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6159431cd70b1925833f…

1 0

Zebediah Figura : winedbg: Ignore EXCEPTION_INVALID_HANDLE.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 05e54ac6e61a4b23b561306d8df2abd4e9882372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e54ac6e61a4b23b561306d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 30 14:47:56 2018 -0500 winedbg: Ignore EXCEPTION_INVALID_HANDLE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 ++ programs/winedbg/tgt_active.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index ff7c5dd..75654d3 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -356,6 +356,8 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e ERR("Cannot set name of thread %04x\n", threadname->dwThreadID); return DBG_CONTINUE; } + case EXCEPTION_INVALID_HANDLE: + return DBG_CONTINUE; default: fprintf(stderr, "Unhandled exception code 0x%08x\n", rec->ExceptionCode); gdbctx->last_sig = SIGABRT; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c5569e6..f632ca0 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -239,6 +239,8 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance dbg_printf("Thread ID=%04x renamed using MS VC6 extension (name==\"%.9s\")\n", pThread->tid, pThread->name); return DBG_CONTINUE; + case EXCEPTION_INVALID_HANDLE: + return DBG_CONTINUE; } if (first_chance && !is_debug && !DBG_IVAR(BreakOnFirstChance) &&

1 0

Zebediah Figura : winedbg/gdbproxy: Don' t try to single-step a terminated process.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 00349e3f2a146af4c05c5333785fd433d9b74475 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00349e3f2a146af4c05c5333… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 30 14:47:54 2018 -0500 winedbg/gdbproxy: Don't try to single-step a terminated process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0135cfc..5fbd6c8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1065,7 +1065,8 @@ static enum packet_return packet_verbose_cont(struct gdb_context* gdbctx) } /* if(defaultAction >=0) */ wait_for_debuggee(gdbctx); - gdbctx->process->be_cpu->single_step(&gdbctx->context, FALSE); + if (gdbctx->process) + gdbctx->process->be_cpu->single_step(&gdbctx->context, FALSE); return packet_reply_status(gdbctx); }

1 0

Henri Verbeet : wined3d: Rename wined3d_adapter_init_nogl() to wined3d_adapter_no3d_init().
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 8a6d3b3ea2dba8ad329accec63ffc2755566b641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a6d3b3ea2dba8ad329accec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:20 2018 +0430 wined3d: Rename wined3d_adapter_init_nogl() to wined3d_adapter_no3d_init(). Matching WINED3D_NO3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d9a5e9..8f9449f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6728,7 +6728,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) { DISPLAY_DEVICEW display_device; @@ -6774,7 +6774,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) TRACE("Initializing adapters.\n"); if (flags & WINED3D_NO3D) - ret = wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); + ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); else ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); if (!ret)

1 0

Henri Verbeet : wined3d: Set a LUID for WINED3D_NO3D adapters as well.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 8e537aa709e45bd6d238ae41814721068ad4d626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e537aa709e45bd6d238ae41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:22 2018 +0430 wined3d: Set a LUID for WINED3D_NO3D adapters as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index be03a1d..65a1bb1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6641,14 +6641,6 @@ static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD w glEnableWINE = gl_info->gl_ops.gl.p_glEnable; glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - if (!AllocateLocallyUniqueId(&adapter->luid)) - { - ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - return FALSE; - } - TRACE("Allocated LUID %08x:%08x for adapter %p.\n", - adapter->luid.HighPart, adapter->luid.LowPart, adapter); - if (!wined3d_caps_gl_ctx_create(adapter, &caps_gl_ctx)) { ERR("Failed to get a GL context for adapter %p.\n", adapter); @@ -6752,6 +6744,14 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); + if (!AllocateLocallyUniqueId(&adapter->luid)) + { + ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); + return FALSE; + } + TRACE("Allocated LUID %08x:%08x for adapter %p.\n", + adapter->luid.HighPart, adapter->luid.LowPart, adapter); + if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags);

1 0

Zebediah Figura : winedbg/gdbproxy: Simplify packet_verbose().
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 1dbab1cd0d820698e4aa90667d9d8e60dbd86327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dbab1cd0d820698e4aa9066… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 30 14:47:55 2018 -0500 winedbg/gdbproxy: Simplify packet_verbose(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 46 ++++----------------------------------------- 1 file changed, 4 insertions(+), 42 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 5fbd6c8..ff7c5dd 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1070,55 +1070,17 @@ static enum packet_return packet_verbose_cont(struct gdb_context* gdbctx) return packet_reply_status(gdbctx); } -struct verbose_defail -{ - const char* name; - unsigned len; - enum packet_return (*handler)(struct gdb_context*); -} verbose_details[] = -{ - /* {"Attach", 6}, */ - {"Cont", 4, packet_verbose_cont}, - /* {"File", 4}, - {"FlashErase", 10}, - {"FlashWrite", 10}, - {"FlashDone", 9}, - {"Kill", 4}, - {"Run", 3}, - {"Stopped", 7},*/ -}; - static enum packet_return packet_verbose(struct gdb_context* gdbctx) { - unsigned i; - unsigned klen; - - for (klen = 0; ; klen++) + if (gdbctx->in_packet_len >= 4 && !memcmp(gdbctx->in_packet, "Cont", 4)) { - if (klen == gdbctx->in_packet_len || - gdbctx->in_packet[klen] == ';' || - gdbctx->in_packet[klen] == ':' || - gdbctx->in_packet[klen] == '?') - { - TRACE("Trying to process verbose packet %s\n", - debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len)); - for (i = 0; i < ARRAY_SIZE(verbose_details); i++) - { - if (klen == verbose_details[i].len && - !memcmp(gdbctx->in_packet, verbose_details[i].name, verbose_details[i].len)) - { - return verbose_details[i].handler(gdbctx); - } - } - /* no matching handler found, abort */ - break; - } + return packet_verbose_cont(gdbctx); } - WARN("No support for verbose packet %s\n", + WARN("Unhandled verbose packet %s\n", debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len)); return packet_error; - } +} static enum packet_return packet_continue_signal(struct gdb_context* gdbctx) {

1 0

Daniel Lehman : kernel32/tests: Add some CompareStringA/W tests.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 32acf3139cc29cd651709de34a02b229a44d9263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32acf3139cc29cd651709de3… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Aug 10 18:21:07 2018 -0700 kernel32/tests: Add some CompareStringA/W tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 39d359f..85c468d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1839,6 +1839,8 @@ static const struct comparestringa_entry comparestringa_data[] = { static void test_CompareStringA(void) { + static const char ABC_EE[] = {'A','B','C',0,0xEE}; + static const char ABC_FF[] = {'A','B','C',0,0xFF}; int ret, i; char a[256]; LCID lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); @@ -1980,10 +1982,23 @@ static void test_CompareStringA(void) ret = CompareStringA(lcid, 0, a, sizeof(a), a, sizeof(a)); ok (GetLastError() == 0xdeadbeef && ret == CSTR_EQUAL, "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); + + ret = CompareStringA(CP_ACP, 0, ABC_EE, 3, ABC_FF, 3); + ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + ret = CompareStringA(CP_ACP, 0, ABC_EE, 5, ABC_FF, 3); + ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + ret = CompareStringA(CP_ACP, 0, ABC_EE, 3, ABC_FF, 5); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringA(CP_ACP, 0, ABC_EE, 5, ABC_FF, 5); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringA(CP_ACP, 0, ABC_FF, 5, ABC_EE, 5); + ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); } static void test_CompareStringW(void) { + static const WCHAR ABC_EE[] = {'A','B','C',0,0xEE}; + static const WCHAR ABC_FF[] = {'A','B','C',0,0xFF}; WCHAR *str1, *str2; SYSTEM_INFO si; DWORD old_prot; @@ -2010,6 +2025,17 @@ static void test_CompareStringW(void) success = VirtualFree(buf, 0, MEM_RELEASE); ok(success, "VirtualFree failed with %u\n", GetLastError()); + + ret = CompareStringW(CP_ACP, 0, ABC_EE, 3, ABC_FF, 3); + ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + ret = CompareStringW(CP_ACP, 0, ABC_EE, 5, ABC_FF, 3); + ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + ret = CompareStringW(CP_ACP, 0, ABC_EE, 3, ABC_FF, 5); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringW(CP_ACP, 0, ABC_EE, 5, ABC_FF, 5); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringW(CP_ACP, 0, ABC_FF, 5, ABC_EE, 5); + ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); } struct comparestringex_test {

1 0

Józef Kucia : wined3d: Use snprintf() in init_debug_buffer() (Coverity).
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: f51f911ae5503975c43e1ec80667942c37c60395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51f911ae5503975c43e1ec8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 11:09:48 2018 +0200 wined3d: Use snprintf() in init_debug_buffer() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 800cdc4..861f169 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4340,9 +4340,9 @@ struct debug_buffer static void init_debug_buffer(struct debug_buffer *buffer, const char *default_string) { - strcpy(buffer->str, default_string); + snprintf(buffer->str, sizeof(buffer->str), "%s", default_string); buffer->ptr = buffer->str; - buffer->size = ARRAY_SIZE(buffer->str); + buffer->size = sizeof(buffer->str); } static void debug_append(struct debug_buffer *buffer, const char *str, const char *separator) @@ -4355,7 +4355,7 @@ static void debug_append(struct debug_buffer *buffer, const char *str, const cha if (size == -1 || size >= buffer->size) { buffer->size = 0; - strcpy(&buffer->str[ARRAY_SIZE(buffer->str) - 4], "..."); + strcpy(&buffer->str[sizeof(buffer->str) - 4], "..."); return; }

1 0