August 2019 - Wine-commits - list.winehq.org

Francois Gouget : jscript/tests: A spelling fix in an ok() message.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 326fcdf96718436d512bae09b63f707efa50929a URL: https://source.winehq.org/git/wine.git/?a=commit;h=326fcdf96718436d512bae09… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:18:23 2019 +0200 jscript/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 7037cff..e3f272d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2637,7 +2637,7 @@ static void test_eval(void) ok(script_disp != NULL, "script_disp == NULL\n"); hres = IDispatch_QueryInterface(script_disp, &IID_IDispatchEx, (void**)&script_dispex); - ok(hres == S_OK, "Coult not get IDispatchEx iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); IDispatch_Release(script_disp); str = a2bstr("eval");

1 0

Francois Gouget : kernel32/tests: A couple of spelling fixes in ok() call messages.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 8080e204bfa24ed49c07797a484df82e765dd7d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8080e204bfa24ed49c07797a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:19:06 2019 +0200 kernel32/tests: A couple of spelling fixes in ok() call messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 106c1c4..548ef0b 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -329,7 +329,7 @@ static void process_attach_events(struct debugger_context *ctx) ok(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); - ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddres != DbgBreakPoint\n"); + ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddress != DbgBreakPoint\n"); /* flush debug events */ do next_event(ctx, POLL_EVENT_TIMEOUT); @@ -1006,7 +1006,7 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddres != DbgBreakPoint\n"); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddress != DbgBreakPoint\n"); ret = SetEvent(event_attach); ok(ret, "SetEvent failed, last error %d.\n", GetLastError());

1 0

Francois Gouget : jscript: A spelling fix in a comment.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 0479b6b3fd917f0faf8764e5e9ee93142fbf4e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0479b6b3fd917f0faf8764e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:19:18 2019 +0200 jscript: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/enumerator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index 5c06efd..bbd8d53 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -61,7 +61,7 @@ static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) if (This->atend) return S_OK; - /* dont leak pervious value */ + /* don't leak previous value */ jsval_release(This->item); /* not at end ... get next item */

1 0

Francois Gouget : hidclass.sys: A spelling fix in an ERR() message.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 7c44f3dcd6d790cdcecc9e93c65dadc6aac93481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c44f3dcd6d790cdcecc9e93… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:19:52 2019 +0200 hidclass.sys: A spelling fix in an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 5e164f3..af1679d 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -631,7 +631,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l { case TAG_LOCAL_USAGE: if (usages_top == sizeof(usages)) - ERR("More then 256 individual usages defined\n"); + ERR("More than 256 individual usages defined\n"); else { usages[usages_top++] = getValue(bSize, itemVal, FALSE);

1 0

Francois Gouget : dplayx: A spelling fix in a FIXME() message.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 22558e1d187d5a76daf076d8a50048b79d9b99ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=22558e1d187d5a76daf076d8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:20:20 2019 +0200 dplayx: A spelling fix in a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplaysp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 43938e8..53be88e 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -466,7 +466,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi { LPDPMSG_CHAT msg = lpMsg; - FIXME( "DPSYS_CHAT not implemeneted\n" ); + FIXME( "DPSYS_CHAT not implemented\n" ); break; }

1 0

Francois Gouget : comctl32: A spelling fix in a TRACE() message.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 76dc3fd49455814230948c76f4478435878fb6f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76dc3fd49455814230948c76… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:20:57 2019 +0200 comctl32: A spelling fix in a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/hotkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 7c3bff7..58717a2 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -221,7 +221,7 @@ HOTKEY_SetRules(HOTKEY_INFO *infoPtr, WORD invComb, WORD invMod) { infoPtr->InvComb = invComb; infoPtr->InvMod = invMod; - TRACE("(infoPtr=%p) Invalid Modifers: 0x%x, If Invalid: 0x%x\n", infoPtr, + TRACE("(infoPtr=%p) Invalid Modifiers: 0x%x, If Invalid: 0x%x\n", infoPtr, infoPtr->InvComb, infoPtr->InvMod); }

1 0

Francois Gouget : advpack: A spelling fix in a comment.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 529a45515b2eff3a55a1edf7841daf681d709f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=529a45515b2eff3a55a1edf7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:21:32 2019 +0200 advpack: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 860abee..70dc4d7 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -492,7 +492,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, lstrcatW(info->inf_path, backslash); lstrcatW(info->inf_path, info->inf_filename); - /* RunSetupCommand opens unmodifed filename parameter */ + /* RunSetupCommand opens unmodified filename parameter */ if (flags & RSC_FLAG_INF) path = inf_filename; else

1 0

Henri Verbeet : wined3d: Make the adapter responsible for swapchain creation and destruction.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 7170f67456c98f8ae62ec3ffb3c362d2896cea29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7170f67456c98f8ae62ec3ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:04 2019 +0430 wined3d: Make the adapter responsible for swapchain creation and destruction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 33 ++++++++++++++++ dlls/wined3d/adapter_vk.c | 33 ++++++++++++++++ dlls/wined3d/directx.c | 33 ++++++++++++++++ dlls/wined3d/swapchain.c | 90 +++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 16 ++++++++ 5 files changed, 173 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7170f67456c98f8ae62e…

1 0

Henri Verbeet : wined3d: Introduce a structure for Vulkan context information.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: f654f983fa388f77fc2940f7c80fbb67fca28c2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f654f983fa388f77fc2940f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:05 2019 +0430 wined3d: Introduce a structure for Vulkan context information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 35 +++++++++-------------------------- dlls/wined3d/context.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 25 ++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a309847..50f173f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -24,23 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -struct wined3d_device_vk -{ - struct wined3d_device d; - - struct wined3d_context context_vk; - - VkDevice vk_device; - VkQueue vk_queue; - - struct wined3d_vk_info vk_info; -}; - -static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) -{ - return CONTAINING_RECORD(device, struct wined3d_device_vk, d); -} - static inline const struct wined3d_adapter_vk *wined3d_adapter_vk_const(const struct wined3d_adapter *adapter) { return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); @@ -300,7 +283,7 @@ struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device if (!device->context_count) return NULL; - return &wined3d_device_vk(device)->context_vk; + return &wined3d_device_vk(device)->context_vk.c; } void adapter_vk_release_context(struct wined3d_context *context) @@ -416,8 +399,8 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { + struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; - struct wined3d_context *context_vk; HRESULT hr; TRACE("device %p.\n", device); @@ -430,10 +413,10 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return hr; } - if (!device_context_add(device, context_vk)) + if (!device_context_add(device, &context_vk->c)) { ERR("Failed to add the newly created context to the context list.\n"); - wined3d_context_cleanup(context_vk); + wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -442,8 +425,8 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) if (!(device_vk->d.blitter = wined3d_cpu_blitter_create())) { ERR("Failed to create CPU blitter.\n"); - device_context_remove(device, context_vk); - wined3d_context_cleanup(context_vk); + device_context_remove(device, &context_vk->c); + wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -452,15 +435,15 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) static void adapter_vk_uninit_3d(struct wined3d_device *device) { - struct wined3d_context *context_vk; + struct wined3d_context_vk *context_vk; TRACE("device %p.\n", device); device->blitter->ops->blitter_destroy(device->blitter, NULL); context_vk = &wined3d_device_vk(device)->context_vk; - device_context_remove(device, context_vk); - wined3d_context_cleanup(context_vk); + device_context_remove(device, &context_vk->c); + wined3d_context_vk_cleanup(context_vk); } static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2509d90..8a6cd5c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,6 +1493,11 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_cleanup(&context_gl->c); } +void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) +{ + wined3d_context_cleanup(&context_vk->c); +} + DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -2295,11 +2300,11 @@ fail: return E_FAIL; } -HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined3d_swapchain *swapchain) +HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); - wined3d_context_init(context_vk, swapchain); + wined3d_context_init(&context_vk->c, swapchain); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e63d5e6..00ed6dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2127,7 +2127,13 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; -HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, +struct wined3d_context_vk +{ + struct wined3d_context c; +}; + +void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); @@ -3287,6 +3293,23 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +struct wined3d_device_vk +{ + struct wined3d_device d; + + struct wined3d_context_vk context_vk; + + VkDevice vk_device; + VkQueue vk_queue; + + struct wined3d_vk_info vk_info; +}; + +static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_vk, d); +} + static inline BOOL isStateDirty(const struct wined3d_context *context, unsigned int state_id) { unsigned int idx = state_id / (sizeof(*context->dirty_graphics_states) * CHAR_BIT);

1 0

Henri Verbeet : wined3d: Setup and tear down the shader backend for the Vulkan adapter.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 3ab6b8293229bfeec31a74e6f514681ab91b4cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ab6b8293229bfeec31a74e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:06 2019 +0430 wined3d: Setup and tear down the shader backend for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 50f173f..cdb5c97 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -413,9 +413,18 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return hr; } + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, + device->adapter->vertex_pipe, device->adapter->fragment_pipe))) + { + ERR("Failed to allocate shader private data, hr %#x.\n", hr); + wined3d_context_vk_cleanup(context_vk); + return hr; + } + if (!device_context_add(device, &context_vk->c)) { ERR("Failed to add the newly created context to the context list.\n"); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -426,6 +435,7 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { ERR("Failed to create CPU blitter.\n"); device_context_remove(device, &context_vk->c); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -436,13 +446,20 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) static void adapter_vk_uninit_3d(struct wined3d_device *device) { struct wined3d_context_vk *context_vk; + struct wined3d_shader *shader; TRACE("device %p.\n", device); + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) + { + device->shader_backend->shader_destroy(shader); + } + device->blitter->ops->blitter_destroy(device->blitter, NULL); context_vk = &wined3d_device_vk(device)->context_vk; device_context_remove(device, &context_vk->c); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); }

1 0