wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Zebediah Figura : ntoskrnl/tests: Test discovery of the root PnP device via setupapi.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: f5c1a92b7e54186c9a75506ccd447f21f10b60b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5c1a92b7e54186c9a75506c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:45 2021 -0500 ntoskrnl/tests: Test discovery of the root PnP device via setupapi. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 49 +++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c9f680f01e8..73f96789f06 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -34,6 +34,8 @@ #include "mssip.h" #include "setupapi.h" #include "newdev.h" +#include "initguid.h" +#include "devguid.h" #include "wine/test.h" #include "wine/heap.h" #include "wine/mssign.h" @@ -990,6 +992,49 @@ static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) } } +static void test_pnp_devices(void) +{ + static const GUID control_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc0}}; + + char buffer[200]; + SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA device = {sizeof(device)}; + HDEVINFO set; + HANDLE bus; + BOOL ret; + + set = SetupDiGetClassDevsA(&control_class, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); + + ret = SetupDiEnumDeviceInfo(set, 0, &device); + ok(ret, "failed to get device, error %#x\n", GetLastError()); + ok(IsEqualGUID(&device.ClassGuid, &GUID_DEVCLASS_SYSTEM), "wrong class %s\n", debugstr_guid(&device.ClassGuid)); + + ret = SetupDiGetDeviceInstanceIdA(set, &device, buffer, sizeof(buffer), NULL); + ok(ret, "failed to get device ID, error %#x\n", GetLastError()); + ok(!strcasecmp(buffer, "root\\winetest\\0"), "got ID %s\n", debugstr_a(buffer)); + + ret = SetupDiEnumDeviceInterfaces(set, NULL, &control_class, 0, &iface); + ok(ret, "failed to get interface, error %#x\n", GetLastError()); + ok(IsEqualGUID(&iface.InterfaceClassGuid, &control_class), + "wrong class %s\n", debugstr_guid(&iface.InterfaceClassGuid)); + ok(iface.Flags == SPINT_ACTIVE, "got flags %#x\n", iface.Flags); + + iface_detail->cbSize = sizeof(*iface_detail); + ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, iface_detail, sizeof(buffer), NULL, NULL); + ok(ret, "failed to get interface path, error %#x\n", GetLastError()); + ok(!strcasecmp(iface_detail->DevicePath, "\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}"), + "wrong path %s\n", debugstr_a(iface_detail->DevicePath)); + + SetupDiDestroyDeviceInfoList(set); + + bus = CreateFileA(iface_detail->DevicePath, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(bus != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + CloseHandle(bus); +} + static void test_pnp_driver(struct testsign_context *ctx) { static const char hardware_id[] = "test_hardware_id\0"; @@ -1116,9 +1161,7 @@ static void test_pnp_driver(struct testsign_context *ctx) /* Tests. */ - file = CreateFileA("\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); - CloseHandle(file); + test_pnp_devices(); /* Clean up. */

1 0

Dmitry Timoshkov : msxml3/tests: Add a test for saving XML with not default encoding.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 875b8a598f3815840893d276dc21eabaab9ab240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=875b8a598f3815840893d276… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 1 14:20:55 2021 +0300 msxml3/tests: Add a test for saving XML with not default encoding. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e94a2c88a81..5bc2fe1d5c3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8522,10 +8522,19 @@ static void test_events(void) static void test_createProcessingInstruction(void) { + static const WCHAR xml1[] = L"<?xml version=\"1.0\"?>\r\n<test/>\r\n"; + static const char xml2[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\r\n<test/>\r\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; + IXMLDOMNode *node; + IXMLDOMElement *element; WCHAR buff[10]; + BSTR xml; + VARIANT var; HRESULT hr; + IStream *stream; + HGLOBAL global; + char *p; doc = create_document(&IID_IXMLDOMDocument); @@ -8538,6 +8547,47 @@ static void test_createProcessingInstruction(void) IXMLDOMProcessingInstruction_Release(pi); IXMLDOMDocument_Release(doc); + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\""), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("test"), &element); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode *)element, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMElement_Release(element); + + hr = IXMLDOMDocument_get_xml(doc, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(!wcscmp(xml, xml1), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + p = GlobalLock(global); + p[GlobalSize(global)] = 0; +todo_wine + ok(!strcmp(p, xml2), "got %s\n", wine_dbgstr_a(p)); + GlobalUnlock(global); + IStream_Release(stream); + + IXMLDOMDocument_Release(doc); } static void test_put_nodeTypedValue(void)

1 0

Zebediah Figura : d3d11: Use wined3d_device_context functions in ID3D10Device1 methods.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 6c656d8e523599351bfb4b77e3e7e7bbf644e073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c656d8e523599351bfb4b77… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 11:00:08 2021 -0500 d3d11: Use wined3d_device_context functions in ID3D10Device1 methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 71 ++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c656d8e523599351bfb…

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_draw_indirect().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 72043f8cc7cfd4053a19a0d1988d3460084aa22c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72043f8cc7cfd4053a19a0d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 11:00:07 2021 -0500 d3d11: Use wined3d_device_context_draw_indirect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 685551c014c..3b1c42fc592 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1082,7 +1082,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceConte static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndirect(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_buffer *d3d_buffer; TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); @@ -1090,15 +1090,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndire d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); wined3d_mutex_lock(); - wined3d_device_draw_indexed_primitive_instanced_indirect(device->wined3d_device, - d3d_buffer->wined3d_buffer, offset); + wined3d_device_context_draw_indirect(context->wined3d_context, d3d_buffer->wined3d_buffer, offset, true); wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_buffer *d3d_buffer; TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); @@ -1106,8 +1105,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); wined3d_mutex_lock(); - wined3d_device_draw_primitive_instanced_indirect(device->wined3d_device, - d3d_buffer->wined3d_buffer, offset); + wined3d_device_context_draw_indirect(context->wined3d_context, d3d_buffer->wined3d_buffer, offset, false); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_draw_indirect().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: fb54d9212f9c85dd7aacb117770d8ba9cc4454f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb54d9212f9c85dd7aacb117… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 11:00:06 2021 -0500 wined3d: Introduce wined3d_device_context_draw_indirect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 16 ++++++++-------- dlls/wined3d/device.c | 10 ++-------- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 3 --- include/wine/wined3d.h | 3 +++ 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index cbc97d3614a..ef3c0c76c14 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1072,17 +1072,17 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } -void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, bool indexed) +void CDECL wined3d_device_context_draw_indirect(struct wined3d_device_context *context, + struct wined3d_buffer *buffer, unsigned int offset, bool indexed) { - const struct wined3d_d3d_info *d3d_info = &cs->c.device->adapter->d3d_info; - const struct wined3d_state *state = cs->c.state; + const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; + const struct wined3d_state *state = context->state; struct wined3d_cs_draw *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; - op->primitive_type = primitive_type; - op->patch_vertex_count = patch_vertex_count; + op->primitive_type = state->primitive_type; + op->patch_vertex_count = state->patch_vertex_count; op->parameters.indirect = TRUE; op->parameters.u.indirect.buffer = buffer; op->parameters.u.indirect.offset = offset; @@ -1091,7 +1091,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 278bc8677e6..3b22f7b2086 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4484,12 +4484,9 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset) { - struct wined3d_state *state = device->cs->c.state; - TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - wined3d_cs_emit_draw_indirect(device->cs, state->primitive_type, - state->patch_vertex_count, buffer, offset, false); + wined3d_device_context_draw_indirect(&device->cs->c, buffer, offset, false); } void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) @@ -4516,12 +4513,9 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset) { - struct wined3d_state *state = device->cs->c.state; - TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - wined3d_cs_emit_draw_indirect(device->cs, state->primitive_type, - state->patch_vertex_count, buffer, offset, true); + wined3d_device_context_draw_indirect(&device->cs->c, buffer, offset, true); } HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bae5a6d42f0..918e9e253cc 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -168,6 +168,7 @@ @ cdecl wined3d_device_context_draw(ptr long long long long) @ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) +@ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9e73da9f25..db6b6488e59 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4735,9 +4735,6 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, struct wined3d_buffer *buffer, - unsigned int offset, bool indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ee02914b0fe..18dab157834 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -26,6 +26,7 @@ #ifndef __WINE_WINED3D_H #define __WINE_WINED3D_H +#include <stdbool.h> #include "wine/list.h" #define WINED3D_OK S_OK @@ -2564,6 +2565,8 @@ void __cdecl wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); +void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context *context, + struct wined3d_buffer *buffer, unsigned int offset, bool indexed); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_draw_indexed().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 7c74b5b9713c29b312b169d5295be362f1c167af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c74b5b9713c29b312b169d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 11:00:05 2021 -0500 d3d11: Use wined3d_device_context_draw_indexed(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f154bfdf480..685551c014c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -576,14 +576,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceContext1 *iface, UINT index_count, UINT start_index_location, INT base_vertex_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); wined3d_mutex_lock(); - wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); - wined3d_device_draw_indexed_primitive(device->wined3d_device, start_index_location, index_count); + wined3d_device_context_draw_indexed(context->wined3d_context, + base_vertex_location, start_index_location, index_count, 0, 0); wined3d_mutex_unlock(); } @@ -704,7 +704,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 UINT instance_index_count, UINT instance_count, UINT start_index_location, INT base_vertex_location, UINT start_instance_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " "base_vertex_location %d, start_instance_location %u.\n", @@ -712,9 +712,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 base_vertex_location, start_instance_location); wined3d_mutex_lock(); - wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); - wined3d_device_draw_indexed_primitive_instanced(device->wined3d_device, start_index_location, - instance_index_count, start_instance_location, instance_count); + wined3d_device_context_draw_indexed(context->wined3d_context, base_vertex_location, + start_index_location, instance_index_count, start_instance_location, instance_count); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_draw_indexed().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 8cdad7d4b03bc88d7efda8af1cfc2ef3efda19c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cdad7d4b03bc88d7efda8af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 11:00:04 2021 -0500 wined3d: Introduce wined3d_device_context_draw_indexed(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 19 +++++++++++++++---- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e578e51de68..278bc8677e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2409,6 +2409,18 @@ void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, u 0, start_vertex, vertex_count, start_instance, instance_count, false); } +void CDECL wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count) +{ + struct wined3d_state *state = context->state; + + TRACE("context %p, base_vertex_index %d, start_index %u, index_count %u, start_instance %u, instance_count %u.\n", + context, base_vertex_index, start_index, index_count, start_instance, instance_count); + + wined3d_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, + base_vertex_index, start_index, index_count, start_instance, instance_count, true); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -4486,8 +4498,7 @@ void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, 0, 0, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, start_idx, index_count, 0, 0); } void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, @@ -4498,8 +4509,8 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, + start_idx, index_count, start_instance, instance_count); } void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 087a6bead13..bae5a6d42f0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_device_context_draw(ptr long long long long) +@ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3316d6f6653..ee02914b0fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2562,6 +2562,8 @@ void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_cont struct wined3d_buffer *buffer, unsigned int offset); void __cdecl wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count); +void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

1 0

Nikolay Sivov : d2d1: Implement ID2D1Multithread.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 27fed4a5209cf1a32870cbba229711b64925d7e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27fed4a5209cf1a32870cbba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 2 18:06:39 2021 +0300 d2d1: Implement ID2D1Multithread. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 68 +++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2a9de448c6e..b65727d3a32 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,12 +30,15 @@ struct d2d_settings d2d_settings = struct d2d_factory { ID2D1Factory2 ID2D1Factory2_iface; + ID2D1Multithread ID2D1Multithread_iface; LONG refcount; ID3D10Device1 *device; float dpi_x; float dpi_y; + + CRITICAL_SECTION cs; }; static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) @@ -43,6 +46,11 @@ static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory2_iface); } +static inline struct d2d_factory *impl_from_ID2D1Multithread(ID2D1Multithread *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Multithread_iface); +} + static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) { HDC hdc; @@ -63,6 +71,8 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface, REFIID iid, void **out) { + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if ((IsEqualGUID(iid, &IID_ID2D1Factory2) && d2d_settings.max_version_factory >= 2) @@ -74,6 +84,12 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface *out = iface; return S_OK; } + else if (IsEqualGUID(iid, &IID_ID2D1Multithread)) + { + ID2D1Factory2_AddRef(iface); + *out = &factory->ID2D1Multithread_iface; + return S_OK; + } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -102,6 +118,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface) { if (factory->device) ID3D10Device1_Release(factory->device); + DeleteCriticalSection(&factory->cs); heap_free(factory); } @@ -593,17 +610,92 @@ static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = d2d_factory_ID2D1Factory1_CreateDevice, }; +static HRESULT STDMETHODCALLTYPE d2d_factory_mt_QueryInterface(ID2D1Multithread *iface, REFIID iid, void **out) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_QueryInterface(&factory->ID2D1Factory2_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_factory_mt_AddRef(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_AddRef(&factory->ID2D1Factory2_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_factory_mt_Release(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_Release(&factory->ID2D1Factory2_iface); +} + +static BOOL STDMETHODCALLTYPE d2d_factory_mt_GetMultithreadProtected(ID2D1Multithread *iface) +{ + return TRUE; +} + +static void STDMETHODCALLTYPE d2d_factory_mt_Enter(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + + TRACE("%p.\n", iface); + + return EnterCriticalSection(&factory->cs); +} + +static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + + TRACE("%p.\n", iface); + + return LeaveCriticalSection(&factory->cs); +} + +static BOOL STDMETHODCALLTYPE d2d_factory_st_GetMultithreadProtected(ID2D1Multithread *iface) +{ + return FALSE; +} + +static void STDMETHODCALLTYPE d2d_factory_st_Enter(ID2D1Multithread *iface) +{ +} + +static void STDMETHODCALLTYPE d2d_factory_st_Leave(ID2D1Multithread *iface) +{ +} + +static const struct ID2D1MultithreadVtbl d2d_factory_multithread_vtbl = +{ + d2d_factory_mt_QueryInterface, + d2d_factory_mt_AddRef, + d2d_factory_mt_Release, + d2d_factory_mt_GetMultithreadProtected, + d2d_factory_mt_Enter, + d2d_factory_mt_Leave, +}; + +static const struct ID2D1MultithreadVtbl d2d_factory_multithread_noop_vtbl = +{ + d2d_factory_mt_QueryInterface, + d2d_factory_mt_AddRef, + d2d_factory_mt_Release, + d2d_factory_st_GetMultithreadProtected, + d2d_factory_st_Enter, + d2d_factory_st_Leave, +}; + static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, const D2D1_FACTORY_OPTIONS *factory_options) { - if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED) - FIXME("Ignoring factory type %#x.\n", factory_type); if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); factory->ID2D1Factory2_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Multithread_iface.lpVtbl = factory_type == D2D1_FACTORY_TYPE_SINGLE_THREADED ? + &d2d_factory_multithread_noop_vtbl : &d2d_factory_multithread_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); + InitializeCriticalSection(&factory->cs); } HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, @@ -615,6 +707,12 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("factory_type %#x, iid %s, factory_options %p, factory %p.\n", factory_type, debugstr_guid(iid), factory_options, factory); + if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED && + factory_type != D2D1_FACTORY_TYPE_MULTI_THREADED) + { + return E_INVALIDARG; + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a046a21c7f6..8dbad9c5ecc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9614,6 +9614,73 @@ static void test_geometry_group(BOOL d3d11) ID2D1Factory_Release(factory); } +static DWORD WINAPI mt_factory_test_thread_func(void *param) +{ + ID2D1Multithread *multithread = param; + + ID2D1Multithread_Enter(multithread); + + return 0; +} + +static void test_mt_factory(BOOL d3d11) +{ + ID2D1Multithread *multithread; + ID2D1Factory *factory; + HANDLE thread; + HRESULT hr; + DWORD ret; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED + 1, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread); + if (hr == E_NOINTERFACE) + { + win_skip("ID2D1Multithread is not supported.\n"); + ID2D1Factory_Release(factory); + return; + } + ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr); + + ret = ID2D1Multithread_GetMultithreadProtected(multithread); + ok(!ret, "Unexpected return value.\n"); + + ID2D1Multithread_Enter(multithread); + thread = CreateThread(NULL, 0, mt_factory_test_thread_func, multithread, 0, NULL); + ok(!!thread, "Failed to create a thread.\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ID2D1Multithread_Release(multithread); + ID2D1Factory_Release(factory); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread); + ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr); + + ret = ID2D1Multithread_GetMultithreadProtected(multithread); + ok(!!ret, "Unexpected return value.\n"); + + ID2D1Multithread_Enter(multithread); + thread = CreateThread(NULL, 0, mt_factory_test_thread_func, multithread, 0, NULL); + ok(!!thread, "Failed to create a thread.\n"); + ret = WaitForSingleObject(thread, 10); + ok(ret == WAIT_TIMEOUT, "Expected timeout.\n"); + ID2D1Multithread_Leave(multithread); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ID2D1Multithread_Release(multithread); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9674,6 +9741,7 @@ START_TEST(d2d1) queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); + queue_test(test_mt_factory); run_queued_tests(); }

1 0

Louis Lenders : websocket: Add stub dll.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: b918aa074bee3e9e0f8e491e49ad3095b535b690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b918aa074bee3e9e0f8e491e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Apr 4 01:03:07 2021 +0200 websocket: Add stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50902 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/websocket/Makefile.in | 3 +++ dlls/websocket/websocket.spec | 13 +++++++++++++ 4 files changed, 19 insertions(+) diff --git a/configure b/configure index cf34fa3ada5..4665a6f5876 100755 --- a/configure +++ b/configure @@ -1655,6 +1655,7 @@ enable_wbemprox enable_wbemuuid enable_wdscore enable_webservices +enable_websocket enable_wer enable_wevtapi enable_wevtsvc @@ -21116,6 +21117,7 @@ wine_fn_config_makefile dlls/wbemuuid enable_wbemuuid wine_fn_config_makefile dlls/wdscore enable_wdscore wine_fn_config_makefile dlls/webservices enable_webservices wine_fn_config_makefile dlls/webservices/tests enable_tests +wine_fn_config_makefile dlls/websocket enable_websocket wine_fn_config_makefile dlls/wer enable_wer wine_fn_config_makefile dlls/wer/tests enable_tests wine_fn_config_makefile dlls/wevtapi enable_wevtapi diff --git a/configure.ac b/configure.ac index 95eb04d6d49..2217330d60e 100644 --- a/configure.ac +++ b/configure.ac @@ -3791,6 +3791,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemuuid) WINE_CONFIG_MAKEFILE(dlls/wdscore) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) +WINE_CONFIG_MAKEFILE(dlls/websocket) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) diff --git a/dlls/websocket/Makefile.in b/dlls/websocket/Makefile.in new file mode 100644 index 00000000000..95b76b5931e --- /dev/null +++ b/dlls/websocket/Makefile.in @@ -0,0 +1,3 @@ +MODULE = websocket.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/websocket/websocket.spec b/dlls/websocket/websocket.spec new file mode 100644 index 00000000000..36bfc74cf34 --- /dev/null +++ b/dlls/websocket/websocket.spec @@ -0,0 +1,13 @@ +@ stub WebSocketAbortHandle +@ stub WebSocketBeginClientHandshake +@ stub WebSocketBeginServerHandshake +@ stub WebSocketCompleteAction +@ stub WebSocketCreateClientHandle +@ stub WebSocketCreateServerHandle +@ stub WebSocketDeleteHandle +@ stub WebSocketEndClientHandshake +@ stub WebSocketEndServerHandshake +@ stub WebSocketGetAction +@ stub WebSocketGetGlobalProperty +@ stub WebSocketReceive +@ stub WebSocketSend

1 0

Louis Lenders : advapi32: Update version resource.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 145210af9f49348a07d2f2e4acd20391d85c873f URL: https://source.winehq.org/git/wine.git/?a=commit;h=145210af9f49348a07d2f2e4… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Apr 3 23:56:45 2021 +0200 advapi32: Update version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50854 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/version.rc b/dlls/advapi32/version.rc index 1c05b9cac95..d22f12b1c7d 100644 --- a/dlls/advapi32/version.rc +++ b/dlls/advapi32/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine advapi32 dll" #define WINE_FILENAME_STR "advapi32.dll" -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.1.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" +#define WINE_FILEVERSION 10,0,10240,16384 +#define WINE_FILEVERSION_STR "10.0.10240.16384" +#define WINE_PRODUCTVERSION 10,0,10240,16384 +#define WINE_PRODUCTVERSION_STR "10.0.10240.16384" #include "wine/wine_common_ver.rc"

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
87
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 April 2021