November 2021 - Wine-Commits

Rémi Bernon : dinput: Improve object dwOfs values for dinput version <= 0x700.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: f183f8f946f5f273d94cbdfa451e90de326f909c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f183f8f946f5f273d94cbdfa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 16:12:42 2021 +0100 dinput: Improve object dwOfs values for dinput version <= 0x700. It's not completely correct yet as dinput version 0x500 and probably below enumerate objects following the default data format instead of a device specific one. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index b061fe30bcd..dfaf6ae83ff 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -400,11 +400,15 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; struct hid_collection_node *node, *node_end; + WORD version = impl->base.dinput->dwVersion; BOOL ret, seen_axis[6] = {0}; button_ofs += impl->caps.NumberInputValueCaps * sizeof(LONG); - button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); - button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); + if (version >= 0x800) + { + button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); + button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); + } for (caps = HID_INPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->input_caps_count; caps != caps_end; ++caps) @@ -545,7 +549,9 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, for (nary = caps; nary != nary_end; nary--) { - instance.dwOfs = button_ofs; + if (version < 0x800) instance.dwOfs = 0; + else instance.dwOfs = button_ofs; + instance.dwType = DIDFT_NODATA | DIDFT_MAKEINSTANCE( object++ ) | DIDFT_OUTPUT; instance.dwFlags = 0x80008000; instance.wUsagePage = nary->usage_page; @@ -562,7 +568,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, } else for (j = caps->usage_min; j <= caps->usage_max; ++j) { - if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) instance.dwOfs = button_ofs; + if (version < 0x800) instance.dwOfs = 0; + else if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) instance.dwOfs = button_ofs; else instance.dwOfs = value_ofs; instance.dwType = DIDFT_NODATA | DIDFT_MAKEINSTANCE( object++ ) | DIDFT_OUTPUT;

1 0

Alexandre Julliard : msv1_0: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 78cdb254dd311291ab3f02f8bc10d4d0b510b338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78cdb254dd311291ab3f02f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:41:29 2021 +0100 msv1_0: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 4 +-- dlls/msv1_0/unixlib.c | 78 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/msv1_0/unixlib.h | 9 ++---- 3 files changed, 71 insertions(+), 20 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 73d7faef456..32783f2f6cf 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -51,9 +51,7 @@ static NTSTATUS ntlm_check_version(void) static void ntlm_cleanup( struct ntlm_ctx *ctx ) { - struct cleanup_params params = { ctx }; - - __wine_unix_call( ntlm_handle, unix_cleanup, &params ); + __wine_unix_call( ntlm_handle, unix_cleanup, ctx ); } static NTSTATUS ntlm_chat( struct ntlm_ctx *ctx, char *buf, unsigned int buflen, unsigned int *retlen ) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 674b61c1f7b..799577fd4a5 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -54,7 +54,7 @@ struct com_buf static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) { char *newline; - struct com_buf *com_buf = ctx->com_buf; + struct com_buf *com_buf = (struct com_buf *)(ULONG_PTR)ctx->com_buf; if (!com_buf) { @@ -66,7 +66,7 @@ static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) } com_buf->size = INITIAL_BUFFER_SIZE; com_buf->offset = 0; - ctx->com_buf = com_buf; + ctx->com_buf = (ULONG_PTR)com_buf; } do @@ -97,7 +97,7 @@ static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) static NTSTATUS ntlm_chat( void *args ) { - struct chat_params *params = args; + const struct chat_params *params = args; struct ntlm_ctx *ctx = params->ctx; struct com_buf *com_buf; SECURITY_STATUS status = SEC_E_OK; @@ -107,7 +107,7 @@ static NTSTATUS ntlm_chat( void *args ) write( ctx->pipe_out, "\n", 1 ); if ((status = read_line( ctx, &offset )) != SEC_E_OK) return status; - com_buf = ctx->com_buf; + com_buf = (struct com_buf *)(ULONG_PTR)ctx->com_buf; *params->retlen = strlen( com_buf->buffer ); if (*params->retlen > params->buflen) return SEC_E_BUFFER_TOO_SMALL; @@ -128,9 +128,8 @@ static NTSTATUS ntlm_chat( void *args ) static NTSTATUS ntlm_cleanup( void *args ) { - struct cleanup_params *params = args; - struct ntlm_ctx *ctx = params->ctx; - struct com_buf *com_buf = ctx->com_buf; + struct ntlm_ctx *ctx = args; + struct com_buf *com_buf = (struct com_buf *)(ULONG_PTR)ctx->com_buf; if (!ctx || (ctx->mode != MODE_CLIENT && ctx->mode != MODE_SERVER)) return STATUS_INVALID_HANDLE; ctx->mode = MODE_INVALID; @@ -154,7 +153,7 @@ static NTSTATUS ntlm_cleanup( void *args ) static NTSTATUS ntlm_fork( void *args ) { - struct fork_params *params = args; + const struct fork_params *params = args; struct ntlm_ctx *ctx = params->ctx; int pipe_in[2], pipe_out[2]; @@ -216,7 +215,6 @@ static NTSTATUS ntlm_check_version( void *args ) char *argv[3], buf[80]; NTSTATUS status = STATUS_DLL_NOT_FOUND; struct fork_params params = { &ctx, argv }; - struct cleanup_params cleanup_params = { &ctx }; int len; argv[0] = (char *)"ntlm_auth"; @@ -249,7 +247,7 @@ static NTSTATUS ntlm_check_version( void *args ) "Make sure that ntlm_auth >= %d.%d.%d is in your path. " "Usually, you can find it in the winbind package of your distribution.\n", NTLM_AUTH_MAJOR_VERSION, NTLM_AUTH_MINOR_VERSION, NTLM_AUTH_MICRO_VERSION ); - ntlm_cleanup( &cleanup_params ); + ntlm_cleanup( &ctx ); return status; } @@ -260,3 +258,63 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ntlm_fork, ntlm_check_version, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_ntlm_chat( void *args ) +{ + struct + { + PTR32 ctx; + PTR32 buf; + UINT buflen; + PTR32 retlen; + } const *params32 = args; + + struct chat_params params = + { + ULongToPtr(params32->ctx), + ULongToPtr(params32->buf), + params32->buflen, + ULongToPtr(params32->retlen) + }; + + return ntlm_chat( &params ); +} + +static NTSTATUS wow64_ntlm_fork( void *args ) +{ + struct + { + PTR32 ctx; + PTR32 argv; + } const *params32 = args; + + struct fork_params params; + PTR32 *argv32 = ULongToPtr(params32->argv); + char **argv; + NTSTATUS ret; + int i, argc = 0; + + while (argv32[argc]) argc++; + argv = malloc( (argc + 1) * sizeof(*argv) ); + for (i = 0; i <= argc; i++) argv[i] = ULongToPtr( argv32[i] ); + + params.ctx = ULongToPtr(params32->ctx); + params.argv = argv; + ret = ntlm_fork( &params ); + free( argv ); + return ret; +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_ntlm_chat, + ntlm_cleanup, + wow64_ntlm_fork, + ntlm_check_version, +}; + +#endif /* _WIN64 */ diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index efd640aaa4a..7aee646ed50 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -57,7 +57,7 @@ struct arc4_info #define FLAG_NEGOTIATE_NTLM2 0x00080000 #define FLAG_NEGOTIATE_KEY_EXCHANGE 0x40000000 -struct com_buf; +typedef UINT64 com_buf_ptr; struct ntlm_ctx { @@ -68,7 +68,7 @@ struct ntlm_ctx int pipe_out; char session_key[16]; unsigned int flags; - struct com_buf *com_buf; + com_buf_ptr com_buf; struct { struct @@ -99,11 +99,6 @@ struct chat_params unsigned int *retlen; }; -struct cleanup_params -{ - struct ntlm_ctx *ctx; -}; - struct fork_params { struct ntlm_ctx *ctx;

1 0

Stefan Dösinger : d3d8/tests: Port the filling convention test to d3d8.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 3ebafc805f7294cdd8e2b37a44592f8fc6401377 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ebafc805f7294cdd8e2b37a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 8 16:38:58 2021 +0300 d3d8/tests: Port the filling convention test to d3d8. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 483 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 483 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ebafc805f7294cdd8e2…

1 0

Zebediah Figura : wined3d: Introduce a wined3d_buffer_update_sub_resource() helper.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 1b16a606f7c26090971a9c9cf061999a30e72f0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b16a606f7c26090971a9c9c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 16:34:44 2021 -0600 wined3d: Introduce a wined3d_buffer_update_sub_resource() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 9 +++++++++ dlls/wined3d/cs.c | 9 ++------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index be4d095eba0..2bdfff7c1b0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1093,6 +1093,15 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off context_release(context); } +void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct upload_bo *upload_bo, unsigned int offset, unsigned int size) +{ + if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == (uintptr_t)buffer->buffer_object) + wined3d_context_flush_bo_address(context, &upload_bo->addr, size); + else + wined3d_buffer_copy_bo_address(buffer, context, offset, &upload_bo->addr, size); +} + static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_sub_resource_data *data) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e1e9c8e1857..9f79479ce8f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2742,13 +2742,8 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi if (resource->type == WINED3D_RTYPE_BUFFER) { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - size_t size = box->right - box->left; - - if (op->bo.addr.buffer_object && op->bo.addr.buffer_object == (uintptr_t)buffer->buffer_object) - wined3d_context_flush_bo_address(context, &op->bo.addr, size); - else - wined3d_buffer_copy_bo_address(buffer, context, box->left, &op->bo.addr, size); + wined3d_buffer_update_sub_resource(buffer_from_resource(resource), + context, &op->bo, box->left, box->right - box->left); goto done; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 63fea9da0e7..2880a5c6b90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5072,6 +5072,8 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; +void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct upload_bo *upload_bo, unsigned int offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data,

1 0

Zebediah Figura : wined3d: Reference vertex buffer objects only after calling context_update_stream_info().
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 613e16387785e5cf632c0ba385428b8392ea05f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=613e16387785e5cf632c0ba3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 16:34:40 2021 -0600 wined3d: Reference vertex buffer objects only after calling context_update_stream_info(). It may load buffers into a different location. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d2dd9e0bd09..09c871efcd4 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3963,12 +3963,23 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, device_invalidate_state(device, STATE_STREAMSRC); else wined3d_buffer_load(&buffer_gl->b, context, state); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } /* Loading the buffers above may have invalidated the stream info. */ if (wined3d_context_is_graphics_state_dirty(context, STATE_STREAMSRC)) context_update_stream_info(context, state); + map = context->stream_info.use_map; + while (map) + { + const struct wined3d_stream_info_element *e; + struct wined3d_buffer_gl *buffer_gl; + + e = &context->stream_info.elements[wined3d_bit_scan(&map)]; + buffer_gl = wined3d_buffer_gl(state->streams[e->stream_idx].buffer); + + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + if (indexed && state->index_buffer) { struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(state->index_buffer);

1 0

Alexandre Julliard : qcap: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: bd610fd705c3cd81e9479d35b9c8e392bd031166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd610fd705c3cd81e9479d35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:43:55 2021 +0100 qcap: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 26 ++-- dlls/qcap/v4l.c | 324 +++++++++++++++++++++++++++++++++++++++++++---- dlls/qcap/vfwcapture.c | 4 +- 3 files changed, 312 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd610fd705c3cd81e947…

1 0

Ziqing Hui : d3dx10: Implement D3DX10CreateTextureFromResource{A,W}.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 94f8a077bb301f47ef0cd919f160b1877d7d0ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f8a077bb301f47ef0cd919… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 4 19:28:48 2021 +0800 d3dx10: Implement D3DX10CreateTextureFromResource{A,W}. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 7 ++----- dlls/d3dx10_43/texture.c | 46 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 50128260b3e..55a4d057fdf 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2076,8 +2076,6 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromResource tests */ - todo_wine - { hr = D3DX10CreateTextureFromResourceW(device, NULL, NULL, NULL, NULL, &resource, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10CreateTextureFromResourceW(device, NULL, L"deadbeef", NULL, NULL, &resource, NULL); @@ -2086,7 +2084,6 @@ static void test_create_texture(void) ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10CreateTextureFromResourceA(device, NULL, "deadbeef", NULL, NULL, &resource, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -2095,7 +2092,7 @@ static void test_create_texture(void) hr = D3DX10CreateTextureFromResourceW(device, resource_module, test_resource_name, NULL, NULL, &resource, NULL); - todo_wine + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) @@ -2107,7 +2104,7 @@ static void test_create_texture(void) hr = D3DX10CreateTextureFromResourceA(device, resource_module, get_str_a(test_resource_name), NULL, NULL, &resource, NULL); - todo_wine + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 62baed0ca23..3488c80ab29 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -626,17 +626,55 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE module, const char *resource, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { - FIXME("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + HRSRC res_info; + void *buffer; + DWORD size; + HRESULT hr; + + TRACE("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, module, debugstr_a(resource), load_info, pump, texture, hresult); - return E_NOTIMPL; + + if (!resource || !texture) + return D3DX10_ERR_INVALID_DATA; + + if (!(res_info = FindResourceA(module, resource, (const char *)RT_RCDATA))) + { + /* Try loading the resource as bitmap data */ + if (!(res_info = FindResourceA(module, resource, (const char *)RT_BITMAP))) + return D3DX10_ERR_INVALID_DATA; + } + + if (FAILED(hr = load_resource(module, res_info, &buffer, &size))) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); } HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE module, const WCHAR *resource, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { - FIXME("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + HRSRC res_info; + void *buffer; + DWORD size; + HRESULT hr; + + TRACE("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, module, debugstr_w(resource), load_info, pump, texture, hresult); - return E_NOTIMPL; + + if (!resource || !texture) + return D3DX10_ERR_INVALID_DATA; + + if (!(res_info = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) + { + /* Try loading the resource as bitmap data */ + if (!(res_info = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP))) + return D3DX10_ERR_INVALID_DATA; + } + + if (FAILED(hr = load_resource(module, res_info, &buffer, &size))) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); } HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size,

1 0

Zebediah Figura : wined3d: Make the "buffer_object" field of struct wined3d_buffer a wined3d_bo pointer.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: d630aa20bf44055189db61d8c54709abb394c80e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d630aa20bf44055189db61d8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 16:34:41 2021 -0600 wined3d: Make the "buffer_object" field of struct wined3d_buffer a wined3d_bo pointer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/buffer.c | 24 ++++++++++++------------ dlls/wined3d/context_vk.c | 8 ++++---- dlls/wined3d/cs.c | 2 +- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 9 +++++++-- 6 files changed, 29 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d630aa20bf44055189db…

1 0

Brendan Shanks : sechost: Fix hang when a device notification callback tries to register/unregister a notify.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: b9b4c215f5725446ef649e5be2ab9075485fc551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9b4c215f5725446ef649e5b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 8 14:38:57 2021 -0800 sechost: Fix hang when a device notification callback tries to register/unregister a notify. Fixes 4 second hang in Yooka-Laylee and the Impossible Lair when a controller is connected. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/service.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index c447263bd0f..e6f4eb75db0 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1992,9 +1992,11 @@ static DWORD WINAPI device_notify_proc( void *arg ) RPC_WSTR binding_str; DWORD err = ERROR_SUCCESS; struct device_notify_registration *registration; + struct device_notification_details *details_copy; + unsigned int details_copy_nelems, details_copy_size; plugplay_rpc_handle handle = NULL; DWORD code = 0; - unsigned int size; + unsigned int i, size; BYTE *buf; if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) @@ -2026,6 +2028,9 @@ static DWORD WINAPI device_notify_proc( void *arg ) return 1; } + details_copy_size = 8; + details_copy = heap_alloc( details_copy_size * sizeof(*details_copy) ); + for (;;) { buf = NULL; @@ -2046,15 +2051,31 @@ static DWORD WINAPI device_notify_proc( void *arg ) break; } + /* Make a copy to avoid a hang if a callback tries to register or unregister for notifications. */ + i = 0; + details_copy_nelems = 0; EnterCriticalSection( &service_cs ); LIST_FOR_EACH_ENTRY(registration, &device_notify_list, struct device_notify_registration, entry) { - registration->details.cb( registration->details.handle, code, (DEV_BROADCAST_HDR *)buf ); + details_copy[i++] = registration->details; + details_copy_nelems++; + if (i == details_copy_size) + { + details_copy_size *= 2; + details_copy = heap_realloc( details_copy, details_copy_size * sizeof(*details_copy) ); + } } LeaveCriticalSection(&service_cs); + + for (i = 0; i < details_copy_nelems; i++) + { + details_copy[i].cb( details_copy[i].handle, code, (DEV_BROADCAST_HDR *)buf ); + } MIDL_user_free(buf); } + heap_free( details_copy ); + __TRY { plugplay_unregister_listener( handle );

1 0

Zebediah Figura : wined3d: Parse ISG1, PSG1 and OSG1 signatures.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 8a34f089e080299750b413283f1918ef3ab4bdd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a34f089e080299750b41328… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 19:44:42 2021 -0600 wined3d: Parse ISG1, PSG1 and OSG1 signatures. These signatures extend the OSG5 format by a minimum precision hint, which gets ignored for now but could be implemented using 16-bit floats in the future. Fixes some shader parsing errors in Resident Evil 2. Based on a vkd3d patch by Philip Rebohle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 21 ++++++++++++++++++--- include/wine/wined3d.h | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4635910269f..005be96a51f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1820,10 +1820,13 @@ const struct wined3d_shader_frontend sm4_shader_frontend = #define TAG_AON9 WINEMAKEFOURCC('A', 'o', 'n', '9') #define TAG_DXBC WINEMAKEFOURCC('D', 'X', 'B', 'C') +#define TAG_ISG1 WINEMAKEFOURCC('I', 'S', 'G', '1') #define TAG_ISGN WINEMAKEFOURCC('I', 'S', 'G', 'N') +#define TAG_OSG1 WINEMAKEFOURCC('O', 'S', 'G', '1') #define TAG_OSG5 WINEMAKEFOURCC('O', 'S', 'G', '5') #define TAG_OSGN WINEMAKEFOURCC('O', 'S', 'G', 'N') #define TAG_PCSG WINEMAKEFOURCC('P', 'C', 'S', 'G') +#define TAG_PSG1 WINEMAKEFOURCC('P', 'S', 'G', '1') #define TAG_SHDR WINEMAKEFOURCC('S', 'H', 'D', 'R') #define TAG_SHEX WINEMAKEFOURCC('S', 'H', 'E', 'X') @@ -1955,6 +1958,7 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; + bool has_stream_index, has_min_precision; const char *ptr = data; unsigned int i; DWORD count; @@ -1982,11 +1986,14 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si return E_OUTOFMEMORY; } + has_min_precision = tag == TAG_OSG1 || tag == TAG_PSG1 || tag == TAG_ISG1; + has_stream_index = tag == TAG_OSG5 || has_min_precision; + for (i = 0; i < count; ++i) { DWORD name_offset; - if (tag == TAG_OSG5) + if (has_stream_index) read_dword(&ptr, &e[i].stream_idx); else e[i].stream_idx = 0; @@ -2003,10 +2010,15 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si read_dword(&ptr, &e[i].register_idx); read_dword(&ptr, &e[i].mask); + if (has_min_precision) + read_dword(&ptr, &e[i].min_precision); + else + e[i].min_precision = 0; + TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " - "type %u, register idx: %u, use_mask %#x, input_mask %#x.\n", + "type %u, register idx: %u, use_mask %#x, input_mask %#x, min_precision %u.\n", e[i].stream_idx, debugstr_a(e[i].semantic_name), e[i].semantic_idx, e[i].sysval_semantic, - e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); + e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff, e[i].min_precision); } s->elements = e; @@ -2024,6 +2036,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR switch (tag) { case TAG_ISGN: + case TAG_ISG1: if (ctx->max_version < 4) { TRACE("Skipping shader input signature.\n"); @@ -2039,6 +2052,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR break; case TAG_OSGN: + case TAG_OSG1: case TAG_OSG5: if (ctx->max_version < 4) { @@ -2055,6 +2069,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR break; case TAG_PCSG: + case TAG_PSG1: if (shader->patch_constant_signature.elements) { FIXME("Multiple patch constant signatures.\n"); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7a6588ea4f4..1fdbd105cc4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2107,6 +2107,7 @@ struct wined3d_shader_signature_element enum wined3d_component_type component_type; unsigned int register_idx; DWORD mask; + unsigned int min_precision; }; struct wined3d_shader_signature

1 0