November 2022 - Wine-commits

Alexandre Julliard : nsiproxy.sys: Use the Unix call helpers.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: 2a366cddd71fed2148a4e6fd0fe28312421e13e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a366cddd71fed2148a4e6fd0fe283… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:33:45 2022 +0100 nsiproxy.sys: Use the Unix call helpers. --- dlls/nsiproxy.sys/device.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 7aba1f0c36f..4528e934991 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -37,7 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); -static unixlib_handle_t nsiproxy_handle; static HANDLE request_event; #define DECLARE_CRITICAL_SECTION(cs) \ @@ -53,7 +52,7 @@ static LIST_ENTRY request_queue = LIST_ENTRY_INIT( request_queue ); static NTSTATUS nsiproxy_call( unsigned int code, void *args ) { - return __wine_unix_call( nsiproxy_handle, code, args ); + return WINE_UNIX_CALL( code, args ); } enum unix_calls @@ -425,15 +424,12 @@ static DWORD WINAPI request_thread_proc( void *arg ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { - HMODULE instance; NTSTATUS status; HANDLE thread; TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); - RtlPcToFileHeader( &DriverEntry, (void *)&instance ); - status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &nsiproxy_handle, sizeof(nsiproxy_handle), NULL ); + status = __wine_init_unix_call(); if (status) return status; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl;

1 0

Alexandre Julliard : winebus.sys: Use the Unix call helpers.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: 4510e490e9392c3326241de7c587c990f249614f URL: https://gitlab.winehq.org/wine/wine/-/commit/4510e490e9392c3326241de7c587c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:34:04 2022 +0100 winebus.sys: Use the Unix call helpers. --- dlls/winebus.sys/main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 35f84bd9e29..c02f786a11f 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -100,12 +100,9 @@ static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static struct list device_list = LIST_INIT(device_list); -static HMODULE instance; -static unixlib_handle_t winebus_handle; - static NTSTATUS winebus_call(unsigned int code, void *args) { - return __wine_unix_call(winebus_handle, code, args); + return WINE_UNIX_CALL(code, args); } static void unix_device_remove(DEVICE_OBJECT *device) @@ -1181,10 +1178,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); - RtlPcToFileHeader(&DriverEntry, (void *)&instance); - if ((ret = NtQueryVirtualMemory(GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &winebus_handle, sizeof(winebus_handle), NULL))) - return ret; + if ((ret = __wine_init_unix_call())) return ret; attr.Length = sizeof(attr); attr.ObjectName = path;

1 0

Alexandre Julliard : wineusb.sys: Use the Unix call helpers.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: e7caf5a68728421c7514875d012dab7df6fc689a URL: https://gitlab.winehq.org/wine/wine/-/commit/e7caf5a68728421c7514875d012dab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:34:28 2022 +0100 wineusb.sys: Use the Unix call helpers. --- dlls/wineusb.sys/wineusb.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 63b723503c9..e9e91326a84 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -66,8 +66,6 @@ __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, DECLARE_CRITICAL_SECTION(wineusb_cs); -static unixlib_handle_t unix_handle; - static struct list device_list = LIST_INIT(device_list); struct usb_device @@ -99,7 +97,7 @@ static void destroy_unix_device(struct unix_device *unix_device) .device = unix_device, }; - __wine_unix_call(unix_handle, unix_usb_destroy_device, &params); + WINE_UNIX_CALL(unix_usb_destroy_device, &params); } static void add_unix_device(const struct usb_add_device_event *event) @@ -171,7 +169,7 @@ static HANDLE libusb_event_thread, event_thread; static DWORD CALLBACK libusb_event_thread_proc(void *arg) { - __wine_unix_call(unix_handle, unix_usb_main_loop, NULL); + WINE_UNIX_CALL(unix_usb_main_loop, NULL); return 0; } @@ -199,7 +197,7 @@ static DWORD CALLBACK event_thread_proc(void *arg) .event = &event, }; - __wine_unix_call(unix_handle, unix_usb_get_event, &params); + WINE_UNIX_CALL(unix_usb_get_event, &params); switch (event.type) { @@ -282,7 +280,7 @@ static NTSTATUS fdo_pnp(IRP *irp) { struct usb_device *device, *cursor; - __wine_unix_call(unix_handle, unix_usb_exit, NULL); + WINE_UNIX_CALL(unix_usb_exit, NULL); WaitForSingleObject(libusb_event_thread, INFINITE); CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE); @@ -536,7 +534,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) .transfer = queued_irp->Tail.Overlay.DriverContext[0], }; - __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); + WINE_UNIX_CALL(unix_usb_cancel_transfer, &params); } LeaveCriticalSection(&wineusb_cs); @@ -560,7 +558,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) * completion between submitting and queuing, we won't try to * dequeue the IRP until it's actually been queued. */ EnterCriticalSection(&wineusb_cs); - status = __wine_unix_call(unix_handle, unix_usb_submit_urb, &params); + status = WINE_UNIX_CALL(unix_usb_submit_urb, &params); if (status == STATUS_PENDING) { IoMarkIrpPending(irp); @@ -644,13 +642,10 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { NTSTATUS status; - void *instance; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlPcToFileHeader(DriverEntry, &instance); - if ((status = NtQueryVirtualMemory(GetCurrentProcess(), instance, - MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL))) + if ((status = __wine_init_unix_call())) { ERR("Failed to initialize Unix library, status %#lx.\n", status); return status;

1 0

Anton Baskanov : wined3d: Factor out and expose functions to map/unmap wined3d_streaming_buffer.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: ef127f12435a43f0f82d8256f93b5823aeee3957 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef127f12435a43f0f82d8256f93b58… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 21 14:22:03 2022 +0700 wined3d: Factor out and expose functions to map/unmap wined3d_streaming_buffer. --- dlls/wined3d/buffer.c | 31 +++++++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 4 ++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1a953f8e218..fca7f2916b7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1685,8 +1685,9 @@ static HRESULT wined3d_streaming_buffer_prepare(struct wined3d_device *device, return hr; } -HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, - const void *data, unsigned int size, unsigned int stride, unsigned int *ret_pos) +HRESULT CDECL wined3d_streaming_buffer_map(struct wined3d_device *device, + struct wined3d_streaming_buffer *buffer, unsigned int size, unsigned int stride, + unsigned int *ret_pos, void **ret_data) { unsigned int map_flags = WINED3D_MAP_WRITE; struct wined3d_resource *resource; @@ -1695,8 +1696,8 @@ HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, str struct wined3d_box box; HRESULT hr; - TRACE("device %p, buffer %p, data %p, size %u, stride %u, ret_pos %p.\n", - device, buffer, data, size, stride, ret_pos); + TRACE("device %p, buffer %p, size %u, stride %u, ret_pos %p, ret_data %p.\n", + device, buffer, size, stride, ret_pos, ret_data); if (FAILED(hr = wined3d_streaming_buffer_prepare(device, buffer, size))) return hr; @@ -1719,10 +1720,28 @@ HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, str wined3d_box_set(&box, pos, 0, pos + size, 1, 0, 1); if (SUCCEEDED(hr = wined3d_resource_map(resource, 0, &map_desc, &box, map_flags))) { - memcpy(map_desc.data, data, size); - wined3d_resource_unmap(resource, 0); *ret_pos = pos; + *ret_data = map_desc.data; buffer->pos = pos + size; } return hr; } + +void CDECL wined3d_streaming_buffer_unmap(struct wined3d_streaming_buffer *buffer) +{ + wined3d_resource_unmap(&buffer->buffer->resource, 0); +} + +HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, + const void *data, unsigned int size, unsigned int stride, unsigned int *ret_pos) +{ + void *dst_data; + HRESULT hr; + + if (SUCCEEDED(hr = wined3d_streaming_buffer_map(device, buffer, size, stride, ret_pos, &dst_data))) + { + memcpy(dst_data, data, size); + wined3d_streaming_buffer_unmap(buffer); + } + return hr; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e6126faf838..827ac295ddc 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,8 @@ @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) +@ cdecl wined3d_streaming_buffer_map(ptr ptr long long ptr ptr) +@ cdecl wined3d_streaming_buffer_unmap(ptr) @ cdecl wined3d_streaming_buffer_upload(ptr ptr ptr long long ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a18dcda45be..8ec397b73a5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2788,6 +2788,10 @@ HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *st HRESULT __cdecl wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); +HRESULT __cdecl wined3d_streaming_buffer_map(struct wined3d_device *device, + struct wined3d_streaming_buffer *buffer, unsigned int size, unsigned int stride, + unsigned int *ret_pos, void **ret_data); +void __cdecl wined3d_streaming_buffer_unmap(struct wined3d_streaming_buffer *buffer); HRESULT __cdecl wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, const void *data, unsigned int size, unsigned int stride, unsigned int *pos);

1 0

Anton Baskanov : ddraw: Use the wined3d_streaming_buffer helpers to manage the streaming vertex buffer.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: e359c1466a964e9511d25e9010a4b70a65c2dbd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e359c1466a964e9511d25e9010a4b7… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 21 15:12:24 2022 +0700 ddraw: Use the wined3d_streaming_buffer helpers to manage the streaming vertex buffer. --- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 161 ++++++++------------------------------------- 2 files changed, 28 insertions(+), 137 deletions(-)

1 0

Anton Baskanov : ddraw: Use the wined3d_streaming_buffer helpers to manage the streaming index buffer.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: 42503f4ea352315b409d76b43f70e10dc7937965 URL: https://gitlab.winehq.org/wine/wine/-/commit/42503f4ea352315b409d76b43f70e1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 21 15:21:16 2022 +0700 ddraw: Use the wined3d_streaming_buffer helpers to manage the streaming index buffer. --- dlls/ddraw/ddraw_private.h | 6 +-- dlls/ddraw/device.c | 110 +++++---------------------------------------- 2 files changed, 12 insertions(+), 104 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d2b1fc495fc..6693a650394 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -335,11 +335,7 @@ struct d3d_device struct ddraw *ddraw; IUnknown *rt_iface; - struct wined3d_buffer *index_buffer; - UINT index_buffer_size; - UINT index_buffer_pos; - - struct wined3d_streaming_buffer vertex_buffer; + struct wined3d_streaming_buffer vertex_buffer, index_buffer; /* Viewport management */ struct list viewport_list; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 19ae3b6cf33..ac6647b8dad 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -279,8 +279,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) /* There is no need to unset any resources here, wined3d will take * care of that on uninit_3d(). */ - if (This->index_buffer) - wined3d_buffer_decref(This->index_buffer); + wined3d_streaming_buffer_cleanup(&This->index_buffer); wined3d_streaming_buffer_cleanup(&This->vertex_buffer); wined3d_device_context_set_rendertarget_views(This->immediate_context, 0, 1, &null_rtv, FALSE); @@ -3569,42 +3568,6 @@ static HRESULT WINAPI d3d_device2_DrawPrimitive(IDirect3DDevice2 *iface, * DDERR_INVALIDPARAMS if Vertices or Indices is NULL * *****************************************************************************/ -/* The caller is responsible for wined3d locking */ -static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT min_size) -{ - HRESULT hr; - - if (device->index_buffer_size < min_size || !device->index_buffer) - { - UINT size = max(device->index_buffer_size * 2, min_size); - struct wined3d_buffer_desc desc; - struct wined3d_buffer *buffer; - - TRACE("Growing index buffer to %u bytes\n", size); - - desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL; - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, - NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer))) - { - ERR("Failed to create index buffer, hr %#lx.\n", hr); - return hr; - } - - if (device->index_buffer) - wined3d_buffer_decref(device->index_buffer); - device->index_buffer = buffer; - device->index_buffer_size = size; - device->index_buffer_pos = 0; - } - return D3D_OK; -} - static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) @@ -3613,9 +3576,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, HRESULT hr; UINT stride = get_flexible_vertex_size(fvf); UINT vtx_size = stride * vertex_count, idx_size = index_count * sizeof(*indices); - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib; UINT vb_pos, ib_pos; TRACE("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, " @@ -3635,27 +3595,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, &device->vertex_buffer, vertices, vtx_size, stride, &vb_pos))) goto done; - hr = d3d_device_prepare_index_buffer(device, idx_size); - if (FAILED(hr)) - goto done; - ib_pos = device->index_buffer_pos; - if (device->index_buffer_size - idx_size < ib_pos) - ib_pos = 0; - - wined3d_box.left = ib_pos; - wined3d_box.right = ib_pos + idx_size; - ib = wined3d_buffer_get_resource(device->index_buffer); - if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->index_buffer, indices, idx_size, sizeof(*indices), &ib_pos))) goto done; - memcpy(wined3d_map_desc.data, indices, idx_size); - wined3d_resource_unmap(ib, 0); - device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, stride); if (FAILED(hr)) goto done; - wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer.buffer, WINED3DFMT_R16_UINT); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_context_set_primitive_type(device->immediate_context, @@ -4043,9 +3990,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, UINT vtx_dst_stride = get_flexible_vertex_size(fvf); UINT vtx_dst_size = vertex_count * vtx_dst_stride; UINT idx_size = index_count * sizeof(WORD); - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib; void *dst_data; UINT vb_pos; UINT ib_pos; @@ -4069,27 +4013,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, pack_strided_data(dst_data, vertex_count, strided_data, fvf); wined3d_streaming_buffer_unmap(&device->vertex_buffer); - hr = d3d_device_prepare_index_buffer(device, idx_size); - if (FAILED(hr)) - goto done; - ib_pos = device->index_buffer_pos; - if (device->index_buffer_size - idx_size < ib_pos) - ib_pos = 0; - - wined3d_box.left = ib_pos; - wined3d_box.right = ib_pos + idx_size; - ib = wined3d_buffer_get_resource(device->index_buffer); - if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->index_buffer, indices, idx_size, sizeof(WORD), &ib_pos))) goto done; - memcpy(wined3d_map_desc.data, indices, idx_size); - wined3d_resource_unmap(ib, 0); - device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, vtx_dst_stride); if (FAILED(hr)) goto done; - wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer.buffer, WINED3DFMT_R16_UINT); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_context_set_primitive_type(device->immediate_context, @@ -4291,7 +4222,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib; HRESULT hr; UINT ib_pos; @@ -4338,34 +4268,15 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_stateblock_set_vertex_declaration(device->state, vb_impl->wined3d_declaration); - hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); - if (FAILED(hr)) - { - wined3d_mutex_unlock(); - return hr; - } - ib_pos = device->index_buffer_pos; - - if (device->index_buffer_size - index_count * sizeof(WORD) < ib_pos) - ib_pos = 0; - - /* Copy the index stream into the index buffer. */ - wined3d_box.left = ib_pos; - wined3d_box.right = ib_pos + index_count * sizeof(WORD); - ib = wined3d_buffer_get_resource(device->index_buffer); - if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->index_buffer, indices, index_count * sizeof(WORD), sizeof(WORD), &ib_pos))) { - ERR("Failed to map buffer, hr %#lx.\n", hr); wined3d_mutex_unlock(); return hr; } - memcpy(wined3d_map_desc.data, indices, index_count * sizeof(WORD)); - wined3d_resource_unmap(ib, 0); - device->index_buffer_pos = ib_pos + index_count * sizeof(WORD); /* Set the index stream */ - wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer.buffer, WINED3DFMT_R16_UINT); /* Set the vertex stream source */ if (FAILED(hr = wined3d_stateblock_set_stream_source(device->state, @@ -6944,6 +6855,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, c wined3d_stateblock_incref(ddraw->state); wined3d_streaming_buffer_init(&device->vertex_buffer, WINED3D_BIND_VERTEX_BUFFER); + wined3d_streaming_buffer_init(&device->index_buffer, WINED3D_BIND_INDEX_BUFFER); /* Render to the back buffer */ rtv = ddraw_surface_get_rendertarget_view(target);

1 0

Anton Baskanov : wined3d: Add a lower size bound for the streaming buffer allocation.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: 1c84acd0573176b0f3b4b33ecd58d8aec428270a URL: https://gitlab.winehq.org/wine/wine/-/commit/1c84acd0573176b0f3b4b33ecd58d8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Nov 17 15:01:05 2022 +0700 wined3d: Add a lower size bound for the streaming buffer allocation. Apps that issues many small draw calls (e.g. Earth 2150) may cause frequent DISCARD maps, which are significantly slower than NOOVERWRITE ones. --- dlls/wined3d/buffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fca7f2916b7..74c2a1b8b2b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ +#define SB_MIN_SIZE (512 * 1024) /* Minimum size of an allocated streaming buffer. */ + struct wined3d_buffer_ops { BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, @@ -1665,7 +1667,7 @@ static HRESULT wined3d_streaming_buffer_prepare(struct wined3d_device *device, return S_OK; } - size = max(old_size * 2, min_size); + size = max(SB_MIN_SIZE, max(old_size * 2, min_size)); TRACE("Growing buffer to %u bytes.\n", size); desc.byte_width = size;

1 0

Rémi Bernon : winex11.drv: Reposition windows on desktop resize only when useful.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: aeb43dce75f45e44ebf08d73ddf9a66f043e4fbe URL: https://gitlab.winehq.org/wine/wine/-/commit/aeb43dce75f45e44ebf08d73ddf9a6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 23 17:24:28 2022 +0100 winex11.drv: Reposition windows on desktop resize only when useful. This will end up moving window around only if the old virtual screen origin is different from the new one. Don't send unnecessary messages if it didn't change. This helps speeding up D3D tests on the testbot VMs with multiple displays and hopefully solve the timeout problems. --- dlls/winex11.drv/desktop.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 2950c663bb9..bb998543ae7 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -470,8 +470,10 @@ void X11DRV_resize_desktop(void) virtual_rect.right - virtual_rect.left, virtual_rect.bottom - virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); ungrab_clipping_window(); - send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left, - old_virtual_rect.top, SMTO_ABORTIFHUNG, 2000, FALSE ); + + if (old_virtual_rect.left != virtual_rect.left || old_virtual_rect.top != virtual_rect.top) + send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left, + old_virtual_rect.top, SMTO_ABORTIFHUNG, 2000, FALSE ); /* forward clip_fullscreen_window request to the foreground window */ send_notify_message( NtUserGetForegroundWindow(), WM_X11DRV_CLIP_CURSOR_REQUEST, TRUE, TRUE );

1 0

Bartosz Kosiorek : gdiplus: Add GdipSetCustomLineCapBaseCap implementation.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 742c315702016b4c4cec2a3195c462410796c7c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/742c315702016b4c4cec2a3195c462… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 7 17:35:50 2022 +0100 gdiplus: Add GdipSetCustomLineCapBaseCap implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45273 --- dlls/gdiplus/customlinecap.c | 17 ++++++++--------- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/tests/customlinecap.c | 5 +++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index c74928eeda6..2e7b000355e 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -96,7 +96,7 @@ static GpStatus init_custom_linecap(GpCustomLineCap *cap, GpPathData *pathdata, cap->pathdata.Count = pathdata->Count; cap->inset = base_inset; - cap->cap = basecap; + cap->basecap = basecap; cap->join = LineJoinMiter; cap->scale = 1.0; @@ -193,16 +193,15 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, } GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, - GpLineCap base) + GpLineCap basecap) { - static int calls; + TRACE("(%p,%u)\n", custom, basecap); + if(!custom || basecap > LineCapTriangle) + return InvalidParameter; - TRACE("(%p,%u)\n", custom, base); + custom->basecap = basecap; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, @@ -264,7 +263,7 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLi if(!customCap || !baseCap) return InvalidParameter; - *baseCap = customCap->cap; + *baseCap = customCap->basecap; return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0c55af6614a..77b35659946 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -351,7 +351,7 @@ struct GpCustomLineCap{ CustomLineCapType type; GpPathData pathdata; BOOL fill; /* TRUE for fill, FALSE for stroke */ - GpLineCap cap; /* as far as I can tell, this value is ignored */ + GpLineCap basecap; /* cap used together with customLineCap */ REAL inset; /* how much to adjust the end of the line */ GpLineJoin join; REAL scale; diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 26175ca8f66..c475216ff21 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -283,14 +283,15 @@ static void test_create_adjustable_cap(void) ok(base == LineCapTriangle, "Unexpected base cap %d\n", base); stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); - todo_wine ok(stat == Ok, "Unexpected return code, %d\n", stat); stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); ok(stat == Ok, "Unexpected return code, %d\n", stat); - todo_wine ok(base == LineCapSquare, "Unexpected base cap %d\n", base); + stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquareAnchor); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + /* Base inset */ stat = GdipGetAdjustableArrowCapWidth(cap, &width); ok(stat == Ok, "Unexpected return code, %d\n", stat);

1 0

Bartosz Kosiorek : gdiplus: Remove not used LineCustomCap parameter.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: bc8ced226abcd636eff3f22015c3f4a231a83deb URL: https://gitlab.winehq.org/wine/wine/-/commit/bc8ced226abcd636eff3f22015c3f4… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 7 17:35:53 2022 +0100 gdiplus: Remove not used LineCustomCap parameter. --- dlls/gdiplus/graphicspath.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index d98a5ae4bf6..5ddd96778db 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1876,7 +1876,7 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * } static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, - REAL pen_width, GpLineCap cap, GpCustomLineCap *custom, int add_first_points, + REAL pen_width, GpLineCap cap, int add_first_points, int add_last_point, path_list_node_t **last_point) { switch (cap) @@ -2097,8 +2097,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, } static void widen_open_figure(const GpPointF *points, int start, int end, - GpPen *pen, REAL pen_width, GpLineCap start_cap, GpCustomLineCap *start_custom, - GpLineCap end_cap, GpCustomLineCap *end_custom, path_list_node_t **last_point) + GpPen *pen, REAL pen_width, GpLineCap start_cap, + GpLineCap end_cap, path_list_node_t **last_point) { int i; path_list_node_t *prev_point; @@ -2109,21 +2109,21 @@ static void widen_open_figure(const GpPointF *points, int start, int end, prev_point = *last_point; widen_cap(&points[start], &points[start+1], - pen_width, start_cap, start_custom, FALSE, TRUE, last_point); + pen_width, start_cap, FALSE, TRUE, last_point); for (i=start+1; i<end; i++) widen_joint(&points[i-1], &points[i], &points[i+1], pen, pen_width, last_point); widen_cap(&points[end], &points[end-1], - pen_width, end_cap, end_custom, TRUE, TRUE, last_point); + pen_width, end_cap, TRUE, TRUE, last_point); for (i=end-1; i>start; i--) widen_joint(&points[i+1], &points[i], &points[i-1], pen, pen_width, last_point); widen_cap(&points[start], &points[start+1], - pen_width, start_cap, start_custom, TRUE, FALSE, last_point); + pen_width, start_cap, TRUE, FALSE, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2267,8 +2267,8 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, tmp_points[num_tmp_points].Y = path->pathdata.Points[i].Y + segment_dy * segment_pos / segment_length; widen_open_figure(tmp_points, 0, num_tmp_points, pen, pen_width, - draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, - LineCapFlat, NULL, last_point); + draw_start_cap ? pen->startcap : LineCapFlat, + LineCapFlat, last_point); draw_start_cap = 0; num_tmp_points = 0; } @@ -2301,8 +2301,8 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, { /* last dash overflows last segment */ widen_open_figure(tmp_points, 0, num_tmp_points-1, pen, pen_width, - draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, - closed ? LineCapFlat : pen->endcap, pen->customend, last_point); + draw_start_cap ? pen->startcap : LineCapFlat, + closed ? LineCapFlat : pen->endcap, last_point); } heap_free(dash_pattern_scaled); @@ -2377,7 +2377,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, subpath_start, i, 0, pen, pen_width, &last_point); else - widen_open_figure(flat_path->pathdata.Points, subpath_start, i, pen, pen_width, pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point); + widen_open_figure(flat_path->pathdata.Points, subpath_start, i, pen, pen_width, pen->startcap, pen->endcap, &last_point); } }

1 0