wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Hans Leidekker : ipconfig: Print primary DNS suffix.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 21fad44766974a16c5c37abba0b8ce162324e49c URL: https://source.winehq.org/git/wine.git/?a=commit;h=21fad44766974a16c5c37abb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 9 11:59:32 2021 +0100 ipconfig: Print primary DNS suffix. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 30 +++++++++++++++++------------- po/ast.po | 30 +++++++++++++++++------------- po/bg.po | 30 +++++++++++++++++------------- po/ca.po | 30 +++++++++++++++++------------- po/cs.po | 30 +++++++++++++++++------------- po/da.po | 30 +++++++++++++++++------------- po/de.po | 30 +++++++++++++++++------------- po/el.po | 30 +++++++++++++++++------------- po/en.po | 30 +++++++++++++++++------------- po/en_US.po | 30 +++++++++++++++++------------- po/eo.po | 30 +++++++++++++++++------------- po/es.po | 30 +++++++++++++++++------------- po/fa.po | 30 +++++++++++++++++------------- po/fi.po | 30 +++++++++++++++++------------- po/fr.po | 30 +++++++++++++++++------------- po/he.po | 30 +++++++++++++++++------------- po/hi.po | 30 +++++++++++++++++------------- po/hr.po | 30 +++++++++++++++++------------- po/hu.po | 30 +++++++++++++++++------------- po/it.po | 30 +++++++++++++++++------------- po/ja.po | 30 +++++++++++++++++------------- po/ko.po | 30 +++++++++++++++++------------- po/lt.po | 30 +++++++++++++++++------------- po/ml.po | 30 +++++++++++++++++------------- po/nb_NO.po | 30 +++++++++++++++++------------- po/nl.po | 30 +++++++++++++++++------------- po/or.po | 30 +++++++++++++++++------------- po/pa.po | 30 +++++++++++++++++------------- po/pl.po | 30 +++++++++++++++++------------- po/pt_BR.po | 30 +++++++++++++++++------------- po/pt_PT.po | 30 +++++++++++++++++------------- po/rm.po | 30 +++++++++++++++++------------- po/ro.po | 30 +++++++++++++++++------------- po/ru.po | 30 +++++++++++++++++------------- po/si.po | 30 +++++++++++++++++------------- po/sk.po | 30 +++++++++++++++++------------- po/sl.po | 30 +++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 30 +++++++++++++++++------------- po/sr_RS(a)latin.po | 30 +++++++++++++++++------------- po/sv.po | 30 +++++++++++++++++------------- po/ta.po | 30 +++++++++++++++++------------- po/te.po | 30 +++++++++++++++++------------- po/th.po | 30 +++++++++++++++++------------- po/tr.po | 30 +++++++++++++++++------------- po/uk.po | 30 +++++++++++++++++------------- po/wa.po | 30 +++++++++++++++++------------- po/wine.pot | 30 +++++++++++++++++------------- po/zh_CN.po | 30 +++++++++++++++++------------- po/zh_TW.po | 30 +++++++++++++++++------------- programs/ipconfig/ipconfig.c | 4 +++- programs/ipconfig/ipconfig.h | 1 + programs/ipconfig/ipconfig.rc | 1 + 52 files changed, 838 insertions(+), 638 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21fad44766974a16c5c3…

1 0

Brendan Shanks : sechost: Fix hang when a device notification callback tries to register/unregister a notify.
by Alexandre Julliard 09 Nov '21

09 Nov '21

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 09 Nov '21

09 Nov '21

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

Zebediah Figura : wined3d: Introduce a wined3d_buffer_update_sub_resource() helper.
by Alexandre Julliard 09 Nov '21

09 Nov '21

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: Make the "buffer_object" field of struct wined3d_buffer a wined3d_bo pointer.
by Alexandre Julliard 09 Nov '21

09 Nov '21

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

Zebediah Figura : wined3d: Reference vertex buffer objects only after calling context_update_stream_info().
by Alexandre Julliard 09 Nov '21

09 Nov '21

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

Stefan Dösinger : d3d8/tests: Port the filling convention test to d3d8.
by Alexandre Julliard 09 Nov '21

09 Nov '21

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

Ziqing Hui : d3dx10: Implement D3DX10CreateTextureFromResource{A,W}.
by Alexandre Julliard 09 Nov '21

09 Nov '21

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

Ziqing Hui : d3dx10: Implement D3DX10CreateTextureFromFile{A,W}.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 81bc256685b02f76449b7ae0d382b15b09d6dde9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81bc256685b02f76449b7ae0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 4 19:28:47 2021 +0800 d3dx10: Implement D3DX10CreateTextureFromFile{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 | 42 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 13f70f34f96..50128260b3e 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2034,8 +2034,6 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromFile tests */ - todo_wine - { hr = D3DX10CreateTextureFromFileW(device, NULL, NULL, NULL, &resource, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10CreateTextureFromFileW(device, L"deadbeef", NULL, NULL, &resource, NULL); @@ -2044,7 +2042,6 @@ static void test_create_texture(void) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10CreateTextureFromFileA(device, "deadbeef", NULL, NULL, &resource, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -2052,7 +2049,7 @@ static void test_create_texture(void) create_file(test_filename, test_image[i].data, test_image[i].size, path); hr = D3DX10CreateTextureFromFileW(device, path, 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) @@ -2063,7 +2060,7 @@ static void test_create_texture(void) } hr = D3DX10CreateTextureFromFileA(device, get_str_a(path), 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 0568bc2316c..62baed0ca23 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -576,17 +576,51 @@ end: HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *src_file, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { - FIXME("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + WCHAR *buffer; + int str_len; + HRESULT hr; + + TRACE("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, debugstr_a(src_file), load_info, pump, texture, hresult); - return E_NOTIMPL; + + if (!src_file || !texture) + return E_FAIL; + + if (!(str_len = MultiByteToWideChar(CP_ACP, 0, src_file, -1, NULL, 0))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(buffer = heap_alloc(str_len * sizeof(*buffer)))) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, src_file, -1, buffer, str_len); + hr = D3DX10CreateTextureFromFileW(device, buffer, load_info, pump, texture, hresult); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *src_file, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { - FIXME("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + void *buffer = NULL; + DWORD size = 0; + HRESULT hr; + + TRACE("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, debugstr_w(src_file), load_info, pump, texture, hresult); - return E_NOTIMPL; + + if (!src_file || !texture) + return E_FAIL; + + if (FAILED(load_file(src_file, &buffer, &size))) + return D3D10_ERROR_FILE_NOT_FOUND; + + hr = D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE module, const char *resource,

1 0

Alexandre Julliard : ntdll: Create a remote thread in DbgUiIssueRemoteBreakin().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 8dc6987ba5c3fdaa5baea8b00a860f62a3716c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc6987ba5c3fdaa5baea8b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 12:33:30 2021 +0100 ntdll: Create a remote thread in DbgUiIssueRemoteBreakin(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 9 ++++++++- dlls/ntdll/unix/loader.c | 3 --- dlls/ntdll/unix/server.c | 28 ---------------------------- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 3 +-- include/wine/server_protocol.h | 5 ++--- server/protocol.def | 3 +-- server/thread.c | 1 - server/trace.c | 6 ------ 9 files changed, 12 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 160b1f549c9..82b8daa47af 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -552,5 +552,12 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) */ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) { - return unix_funcs->DbgUiIssueRemoteBreakin( process ); + HANDLE handle; + NTSTATUS status; + OBJECT_ATTRIBUTES attr = { sizeof(attr) }; + + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, + DbgUiRemoteBreakin, NULL, 0, 0, 0, 0, NULL ); + if (!status) NtClose( handle ); + return status; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ea7f18602da..99226d472da 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -110,7 +110,6 @@ static const char so_dir[] = "/aarch64-unix"; static const char so_dir[] = ""; #endif -void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; @@ -1082,7 +1081,6 @@ static void load_ntdll_functions( HMODULE module ) if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ ERR( "%s not found\n", #name ) - GET_FUNC( DbgUiRemoteBreakin ); GET_FUNC( KiRaiseUserExceptionDispatcher ); GET_FUNC( KiUserExceptionDispatcher ); GET_FUNC( KiUserApcDispatcher ); @@ -2144,7 +2142,6 @@ static struct unix_funcs unix_funcs = #ifdef __aarch64__ NtCurrentTeb, #endif - DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, RtlWakeAddressAll, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 46d403df326..399b1cceb16 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -574,17 +574,6 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO if (!self) NtClose( wine_server_ptr_handle(call->dup_handle.dst_process) ); break; } - case APC_BREAK_PROCESS: - { - HANDLE handle; - - result->type = APC_BREAK_PROCESS; - result->break_process.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, - NtCurrentProcess(), pDbgUiRemoteBreakin, NULL, - 0, 0, 0, 0, NULL ); - if (!result->break_process.status) NtClose( handle ); - break; - } default: server_protocol_error( "get_apc_request: bad type %d\n", call->type ); break; @@ -1639,23 +1628,6 @@ void server_init_thread( void *entry_point, BOOL *suspend ) } -/*********************************************************************** - * DbgUiIssueRemoteBreakin - */ -NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) -{ - apc_call_t call; - apc_result_t result; - NTSTATUS status; - - memset( &call, 0, sizeof(call) ); - call.type = APC_BREAK_PROCESS; - status = server_queue_process_apc( process, &call, &result ); - if (status) return status; - return result.break_process.status; -} - - /****************************************************************************** * NtDuplicateObject */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6b8835bcba0..641de0c465f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -92,7 +92,6 @@ static const LONG teb_offset = 0x2000; #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) /* callbacks to PE ntdll from the Unix side */ -extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d56259deff2..62030d91cdb 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 127 +#define NTDLL_UNIXLIB_VERSION 128 struct unix_funcs { @@ -36,7 +36,6 @@ struct unix_funcs #endif /* other Win32 API functions */ - NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); NTSTATUS (WINAPI *RtlWaitOnAddress)( const void *addr, const void *cmp, SIZE_T size, const LARGE_INTEGER *timeout ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c561b48714d..5a66e9aff8f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -470,8 +470,7 @@ enum apc_type APC_MAP_VIEW, APC_UNMAP_VIEW, APC_CREATE_THREAD, - APC_DUP_HANDLE, - APC_BREAK_PROCESS + APC_DUP_HANDLE }; typedef struct @@ -6263,7 +6262,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 735 +#define SERVER_PROTOCOL_VERSION 736 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 6a25db0326f..ad6d2bb58d0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -486,8 +486,7 @@ enum apc_type APC_MAP_VIEW, APC_UNMAP_VIEW, APC_CREATE_THREAD, - APC_DUP_HANDLE, - APC_BREAK_PROCESS + APC_DUP_HANDLE }; typedef struct diff --git a/server/thread.c b/server/thread.c index b85df68af92..55eb8513af8 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1734,7 +1734,6 @@ DECL_HANDLER(queue_apc) } break; case APC_CREATE_THREAD: - case APC_BREAK_PROCESS: process = get_process_from_handle( req->handle, PROCESS_CREATE_THREAD ); break; case APC_DUP_HANDLE: diff --git a/server/trace.c b/server/trace.c index 6e78f8281f0..903e323273b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -237,9 +237,6 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) call->dup_handle.src_handle, call->dup_handle.dst_process, call->dup_handle.access, call->dup_handle.attributes, call->dup_handle.options ); break; - case APC_BREAK_PROCESS: - fprintf( stderr, "APC_BREAK_PROCESS" ); - break; default: fprintf( stderr, "type=%u", call->type ); break; @@ -324,9 +321,6 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) fprintf( stderr, "APC_DUP_HANDLE,status=%s,handle=%04x", get_status_name( result->dup_handle.status ), result->dup_handle.handle ); break; - case APC_BREAK_PROCESS: - fprintf( stderr, "APC_BREAK_PROCESS,status=%s", get_status_name( result->break_process.status ) ); - break; default: fprintf( stderr, "type=%u", result->type ); break;

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021