- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : windowscodecs: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 982d528793ab61766478e1e0a1bc183c9535fb73 URL: https://gitlab.winehq.org/wine/wine/-/commit/982d528793ab61766478e1e0a1bc18… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 11 18:34:31 2023 +1000 windowscodecs: Remove DECLSPEC_HIDDEN usage. --- dlls/windowscodecs/bitmap.c | 6 +- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/regsvr.c | 4 +- dlls/windowscodecs/ungif.h | 6 +- dlls/windowscodecs/wincodecs_private.h | 112 ++++++++++++++++----------------- 5 files changed, 65 insertions(+), 65 deletions(-)

1 0

Alistair Leslie-Hughes : d3d8: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 6f8be72bd8762052e9b0d827477c915dcb8d4df5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f8be72bd8762052e9b0d827477c91… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 19:13:23 2023 +1000 d3d8: Remove DECLSPEC_HIDDEN usage. --- dlls/d3d8/d3d8_private.h | 66 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 181a952a347..889cc57ce15 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -49,10 +49,10 @@ /* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000 -extern const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops DECLSPEC_HIDDEN; +extern const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops; void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps, - unsigned int adapter_ordinal) DECLSPEC_HIDDEN; + unsigned int adapter_ordinal); struct d3d8 { @@ -63,7 +63,7 @@ struct d3d8 unsigned int wined3d_output_count; }; -BOOL d3d8_init(struct d3d8 *d3d8) DECLSPEC_HIDDEN; +BOOL d3d8_init(struct d3d8 *d3d8); /***************************************************************************** * IDirect3DDevice8 implementation structure @@ -142,7 +142,7 @@ struct d3d8_device }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, - D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; + D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters); static inline struct d3d8_device *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface) { @@ -155,13 +155,13 @@ struct d3d8_resource struct wined3d_private_store private_store; }; -void d3d8_resource_cleanup(struct d3d8_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d8_resource_free_private_data(struct d3d8_resource *resource, const GUID *guid) DECLSPEC_HIDDEN; +void d3d8_resource_cleanup(struct d3d8_resource *resource); +HRESULT d3d8_resource_free_private_data(struct d3d8_resource *resource, const GUID *guid); HRESULT d3d8_resource_get_private_data(struct d3d8_resource *resource, const GUID *guid, - void *data, DWORD *data_size) DECLSPEC_HIDDEN; -void d3d8_resource_init(struct d3d8_resource *resource) DECLSPEC_HIDDEN; + void *data, DWORD *data_size); +void d3d8_resource_init(struct d3d8_resource *resource); HRESULT d3d8_resource_set_private_data(struct d3d8_resource *resource, const GUID *guid, - const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; + const void *data, DWORD data_size, DWORD flags); struct d3d8_volume { @@ -173,7 +173,7 @@ struct d3d8_volume }; void volume_init(struct d3d8_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops); struct d3d8_swapchain { @@ -186,7 +186,7 @@ struct d3d8_swapchain }; HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapchain_desc *desc, - unsigned int swap_interval, struct d3d8_swapchain **swapchain) DECLSPEC_HIDDEN; + unsigned int swap_interval, struct d3d8_swapchain **swapchain); struct d3d8_surface { @@ -202,13 +202,13 @@ struct d3d8_surface struct wined3d_swapchain *swapchain; }; -struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct d3d8_surface *surface) DECLSPEC_HIDDEN; +struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct d3d8_surface *surface); struct d3d8_surface *d3d8_surface_create(struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, IUnknown *container) DECLSPEC_HIDDEN; -struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, IUnknown *container); +struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface); void d3d8_surface_release_rendertarget_view(struct d3d8_surface *surface, - struct wined3d_rendertarget_view *rtv) DECLSPEC_HIDDEN; -struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) DECLSPEC_HIDDEN; + struct wined3d_rendertarget_view *rtv); +struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface); struct d3d8_vertexbuffer { @@ -222,8 +222,8 @@ struct d3d8_vertexbuffer }; HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, - UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) DECLSPEC_HIDDEN; -struct d3d8_vertexbuffer *unsafe_impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface) DECLSPEC_HIDDEN; + UINT size, DWORD usage, DWORD fvf, D3DPOOL pool); +struct d3d8_vertexbuffer *unsafe_impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface); struct d3d8_indexbuffer { @@ -238,8 +238,8 @@ struct d3d8_indexbuffer }; HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, - UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; -struct d3d8_indexbuffer *unsafe_impl_from_IDirect3DIndexBuffer8(IDirect3DIndexBuffer8 *iface) DECLSPEC_HIDDEN; + UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool); +struct d3d8_indexbuffer *unsafe_impl_from_IDirect3DIndexBuffer8(IDirect3DIndexBuffer8 *iface); struct d3d8_texture { @@ -262,7 +262,7 @@ static inline struct wined3d_texture *d3d8_texture_get_draw_texture(struct d3d8_ return texture->draw_texture ? texture->draw_texture : texture->wined3d_texture; } -struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture8 *iface) DECLSPEC_HIDDEN; +struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture8 *iface); struct d3d8_vertex_declaration { @@ -273,11 +273,11 @@ struct d3d8_vertex_declaration DWORD shader_handle; }; -void d3d8_vertex_declaration_destroy(struct d3d8_vertex_declaration *declaration) DECLSPEC_HIDDEN; +void d3d8_vertex_declaration_destroy(struct d3d8_vertex_declaration *declaration); HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration, - struct d3d8_device *device, const DWORD *elements, DWORD shader_handle) DECLSPEC_HIDDEN; + struct d3d8_device *device, const DWORD *elements, DWORD shader_handle); HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declaration, - struct d3d8_device *device, DWORD fvf) DECLSPEC_HIDDEN; + struct d3d8_device *device, DWORD fvf); struct d3d8_vertex_shader { @@ -285,9 +285,9 @@ struct d3d8_vertex_shader struct wined3d_shader *wined3d_shader; }; -void d3d8_vertex_shader_destroy(struct d3d8_vertex_shader *shader) DECLSPEC_HIDDEN; +void d3d8_vertex_shader_destroy(struct d3d8_vertex_shader *shader); HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_device *device, - const DWORD *declaration, const DWORD *byte_code, DWORD shader_handle, DWORD usage) DECLSPEC_HIDDEN; + const DWORD *declaration, const DWORD *byte_code, DWORD shader_handle, DWORD usage); struct d3d8_pixel_shader { @@ -295,15 +295,15 @@ struct d3d8_pixel_shader struct wined3d_shader *wined3d_shader; }; -void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader) DECLSPEC_HIDDEN; +void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader); HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_device *device, - const DWORD *byte_code, DWORD shader_handle) DECLSPEC_HIDDEN; + const DWORD *byte_code, DWORD shader_handle); -D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; -void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; -size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; +D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format); +enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format); +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage); +void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader); +size_t parse_token(const DWORD *pToken); static inline DWORD d3dusage_from_wined3dusage(unsigned int wined3d_usage, unsigned int bind_flags) {

1 0

Alistair Leslie-Hughes : windowscodecs: Remove misleading comment.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 806330d157f4bf52c9acf53c70a1c4d5b50a76e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/806330d157f4bf52c9acf53c70a1c4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 11 18:34:31 2023 +1000 windowscodecs: Remove misleading comment. The libraries used are now staticly linked from the libs directory. --- dlls/windowscodecs/wincodecs_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 6a5c4604cf5..b4bb79a55ea 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -239,7 +239,6 @@ extern HMODULE windowscodecs_module; HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size); -/* unixlib iface */ struct decoder_funcs; struct decoder_info

1 0

Billy Laws : wineboot: Always attempt setup for all machine types.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: b233cfb33eab1895b6dfdb4fffb5c44fa36e05d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b233cfb33eab1895b6dfdb4fffb5c4… Author: Billy Laws <blaws05(a)gmail.com> Date: Mon Jul 3 17:36:35 2023 +0100 wineboot: Always attempt setup for all machine types. Without this, wineboot would bail out on ARM64 in the case where x86_64 WOW is not available but i386 is. Leaving an incomplete prefix without any clear error. --- programs/wineboot/wineboot.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index c05ce580298..76d9812a4bf 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1498,20 +1498,23 @@ static void update_wineprefix( BOOL force ) HWND hwnd = show_wait_window(); for (;;) { - MSG msg; - DWORD res = MsgWaitForMultipleObjects( 1, &process, FALSE, INFINITE, QS_ALLINPUT ); - if (res == WAIT_OBJECT_0) + if (process) { + MSG msg; + DWORD res = MsgWaitForMultipleObjects( 1, &process, FALSE, INFINITE, QS_ALLINPUT ); + if (res != WAIT_OBJECT_0) + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + continue; + } CloseHandle( process ); - if (!machines[count]) break; - if (HIWORD(machines[count]) & 4 /* native machine */) - process = start_rundll32( inf_path, L"DefaultInstall", IMAGE_FILE_MACHINE_TARGET_HOST ); - else - process = start_rundll32( inf_path, L"Wow64Install", LOWORD(machines[count]) ); - count++; - if (!process) break; } - else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + if (!machines[count]) break; + if (HIWORD(machines[count]) & 4 /* native machine */) + process = start_rundll32( inf_path, L"DefaultInstall", IMAGE_FILE_MACHINE_TARGET_HOST ); + else + process = start_rundll32( inf_path, L"Wow64Install", LOWORD(machines[count]) ); + count++; } DestroyWindow( hwnd ); }

1 0

David Kahurani : gdiplus: Dump both variable address and internal values for matrices.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 6c1319e7ad17766637cf0e6cfad3a298e9c8ac8c URL: https://gitlab.winehq.org/wine/wine/-/commit/6c1319e7ad17766637cf0e6cfad3a2… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Tue Jul 11 15:31:39 2023 +0300 gdiplus: Dump both variable address and internal values for matrices. Dumping variable address by itself is barely useful. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/brush.c | 18 +++++++++--------- dlls/gdiplus/gdiplus.c | 7 +++++++ dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 14 +++++--------- dlls/gdiplus/graphicspath.c | 10 +++++----- dlls/gdiplus/matrix.c | 32 ++++++++++++++++---------------- dlls/gdiplus/pen.c | 6 +++--- dlls/gdiplus/region.c | 4 ++-- 8 files changed, 49 insertions(+), 44 deletions(-)

1 0

Nikolay Sivov : d3dcompiler/tests: Add some tests for matrix packing order compile flags.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: cdeeffb90a6713bfcb09e939198ca36ee1ca1e03 URL: https://gitlab.winehq.org/wine/wine/-/commit/cdeeffb90a6713bfcb09e939198ca3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 6 14:01:05 2023 +0200 d3dcompiler/tests: Add some tests for matrix packing order compile flags. --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 184 ++++++++++++++++++++++------------ 1 file changed, 122 insertions(+), 62 deletions(-)

1 0

Paul Gofman : kernelbase: Add stub for QueryIoRingCapabilities().
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 4021dde40d6ac7fa80074039906b54ebdd509550 URL: https://gitlab.winehq.org/wine/wine/-/commit/4021dde40d6ac7fa80074039906b54… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 10 14:20:40 2023 -0600 kernelbase: Add stub for QueryIoRingCapabilities(). --- dlls/kernelbase/file.c | 12 +++++++++ dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/tests/Makefile.in | 1 + dlls/kernelbase/tests/file.c | 57 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 7c2e132bdcb..29d005e0e28 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -36,6 +36,7 @@ #include "shlwapi.h" #include "ddk/ntddk.h" #include "ddk/ntddser.h" +#include "ioringapi.h" #include "kernelbase.h" #include "wine/exception.h" @@ -4483,3 +4484,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH WaitCommEvent( HANDLE handle, DWORD *events, OVERL return DeviceIoControl( handle, IOCTL_SERIAL_WAIT_ON_MASK, NULL, 0, events, sizeof(*events), NULL, overlapped ); } + + +/*********************************************************************** + * QueryIoRingCapabilities (kernelbase.@) + */ +HRESULT WINAPI QueryIoRingCapabilities(IORING_CAPABILITIES *caps) +{ + FIXME( "caps %p stub.\n", caps ); + + return E_NOTIMPL; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 17ae37e824c..46492a59d92 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1232,6 +1232,7 @@ @ stdcall QueryDosDeviceW(wstr ptr long) @ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) @ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) +@ stdcall QueryIoRingCapabilities(ptr) # @ stub QueryIdleProcessorCycleTime # @ stub QueryIdleProcessorCycleTimeEx @ stdcall QueryInterruptTime(ptr) diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in index 675054c753d..b51eaefcd13 100644 --- a/dlls/kernelbase/tests/Makefile.in +++ b/dlls/kernelbase/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = kernelbase.dll C_SRCS = \ + file.c \ path.c \ process.c \ sync.c diff --git a/dlls/kernelbase/tests/file.c b/dlls/kernelbase/tests/file.c new file mode 100644 index 00000000000..18dff0a32ab --- /dev/null +++ b/dlls/kernelbase/tests/file.c @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2023 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdlib.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winerror.h> +#include <ioringapi.h> + +#include "wine/test.h" + +static HRESULT (WINAPI *pQueryIoRingCapabilities)(IORING_CAPABILITIES *); + +static void test_ioring_caps(void) +{ + IORING_CAPABILITIES caps; + HRESULT hr; + + if (!pQueryIoRingCapabilities) + { + win_skip("QueryIoRingCapabilities is not available, skipping tests.\n"); + return; + } + + memset(&caps, 0xcc, sizeof(caps)); + hr = pQueryIoRingCapabilities(&caps); + todo_wine ok(hr == S_OK, "got %#lx.\n", hr); +} + +START_TEST(file) +{ + HMODULE hmod; + + hmod = LoadLibraryA("kernelbase.dll"); + pQueryIoRingCapabilities = (void *)GetProcAddress(hmod, "QueryIoRingCapabilities"); + + test_ioring_caps(); +}

1 0

Paul Gofman : include: Add initial ioring definitions.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 27fc318161cad21d08c3ee71dc8248d3dae1eae8 URL: https://gitlab.winehq.org/wine/wine/-/commit/27fc318161cad21d08c3ee71dc8248… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 10 14:09:22 2023 -0600 include: Add initial ioring definitions. --- include/Makefile.in | 2 ++ include/ioringapi.h | 42 ++++++++++++++++++++++++++++++++++++++++++ include/ntioring_x.h | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b1b582ff4d6..5fd20858aee 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -376,6 +376,7 @@ SOURCES = \ inspectable.idl \ interactioncontext.h \ intshcut.h \ + ioringapi.h \ ip2string.h \ ipexport.h \ iphlpapi.h \ @@ -575,6 +576,7 @@ SOURCES = \ ntdef.h \ ntdsapi.h \ ntgdi.h \ + ntioring_x.h \ ntlsa.h \ ntquery.h \ ntsecapi.h \ diff --git a/include/ioringapi.h b/include/ioringapi.h new file mode 100644 index 00000000000..3ccbfc80654 --- /dev/null +++ b/include/ioringapi.h @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2023 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __IORINGAPI_H_ +#define __IORINGAPI_H_ + +#include <ntioring_x.h> + +struct IORING_CAPABILITIES +{ + IORING_VERSION MaxVersion; + UINT32 MaxSubmissionQueueSize; + UINT32 MaxCompletionQueueSize; + IORING_FEATURE_FLAGS FeatureFlags; +}; +typedef struct IORING_CAPABILITIES IORING_CAPABILITIES; + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI QueryIoRingCapabilities(IORING_CAPABILITIES *caps); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/include/ntioring_x.h b/include/ntioring_x.h new file mode 100644 index 00000000000..bf16d9368d4 --- /dev/null +++ b/include/ntioring_x.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2023 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __NTIORING_X_H_ +#define __NTIORING_X_H_ + +enum IORING_VERSION +{ + IORING_VERSION_INVALID = 0, + IORING_VERSION_1 = 1, + IORING_VERSION_2 = 2, + IORING_VERSION_3 = 300, +}; +typedef enum IORING_VERSION IORING_VERSION; + +enum IORING_FEATURE_FLAGS +{ + IORING_FEATURE_FLAGS_NONE = 0, + IORING_FEATURE_UM_EMULATION = 0x00000001, + IORING_FEATURE_SET_COMPLETION_EVENT = 0x00000002, +}; +typedef enum IORING_FEATURE_FLAGS IORING_FEATURE_FLAGS; + +#endif

1 0

Paul Gofman : d3d11/tests: Add basic test for shared resources.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 4de67d87717e04b361d6c5f0a42b28c5c8c3f09b URL: https://gitlab.winehq.org/wine/wine/-/commit/4de67d87717e04b361d6c5f0a42b28… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 5 15:26:23 2023 -0600 d3d11/tests: Add basic test for shared resources. --- dlls/d3d11/tests/d3d11.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index cc3139f759f..5634d8770e5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25,6 +25,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d11_4.h" +#include "winternl.h" #include "wine/heap.h" #include "wine/test.h" @@ -34881,6 +34882,189 @@ static void test_vertex_formats(void) release_test_context(&test_context); } +static BOOL is_kmt_handle(HANDLE h) +{ + return (ULONG_PTR)h & 0xc0000000; +} + +static void test_shared_resource(D3D_FEATURE_LEVEL feature_level) +{ + static const UINT tests[] = + { + 0, + D3D11_RESOURCE_MISC_SHARED, + D3D11_RESOURCE_MISC_SHARED_NTHANDLE, + D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_NTHANDLE, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED_NTHANDLE, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_NTHANDLE, + }; + static const unsigned int sharing_type_flags = D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX; + struct device_desc device_desc = { 0 }; + ID3D11Texture2D *tex, *tex2; + D3D11_TEXTURE2D_DESC desc; + ID3D11Device1 *device1; + ID3D11Device *device; + IDXGIResource1 *res1; + IDXGIResource *res; + unsigned int test; + BOOL flags_valid; + HANDLE handle; + BOOL nthandle; + HANDLE h, h2; + HRESULT hr; + ULONG ref; + BOOL bret; + + device_desc.feature_level = &feature_level; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device, feature level %#x.\n", feature_level); + return; + } + device1 = NULL; + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11Device1, (void **)&device1); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "got %#lx.\n", hr); + if (hr != S_OK) + { + win_skip("ID3D11Device1 is not supported, skipping tests.\n"); + ID3D11Device_Release(device); + return; + } + + memset(&desc, 0, sizeof(desc)); + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Width = 256; + desc.Height = 256; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.SampleDesc.Count = 1; + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + + for (test = 0; test < ARRAY_SIZE(tests); ++test) + { + handle = NULL; + tex = NULL; + res = NULL; + res1 = NULL; + + desc.MiscFlags = tests[test]; + nthandle = desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_NTHANDLE; + winetest_push_context("MiscFlags %#x, nthandle %d", tests[test], nthandle); + + if (!desc.MiscFlags) + flags_valid = TRUE; + else if (feature_level < D3D_FEATURE_LEVEL_10_0) + flags_valid = FALSE; + else + flags_valid = (desc.MiscFlags & sharing_type_flags) == D3D11_RESOURCE_MISC_SHARED + || (desc.MiscFlags & sharing_type_flags) == D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &tex); + if (flags_valid) + ok(hr == S_OK + || broken(desc.MiscFlags == (D3D11_RESOURCE_MISC_SHARED + | D3D11_RESOURCE_MISC_SHARED_NTHANDLE) && hr == E_INVALIDARG) /* software device before Win10 */ + || broken(hr == E_OUTOFMEMORY) /* software device before Win8 */, + "got %#lx.\n", hr); + else + todo_wine ok(hr == E_INVALIDARG, "got %#lx.\n", hr); + if (FAILED(hr)) + goto test_done; + + hr = ID3D11Texture2D_QueryInterface(tex, &IID_IDXGIResource, (void **)&res); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ID3D11Texture2D_QueryInterface(tex, &IID_IDXGIResource1, (void **)&res1); + todo_wine ok(hr == S_OK, "got %#lx.\n", hr); + if (FAILED(hr)) + goto test_done; + + h = (HANDLE)0xdeadbeef; + hr = IDXGIResource_GetSharedHandle(res, &h); + if (nthandle) + { + ok(hr == E_INVALIDARG, "got %#lx.\n", hr); + ok(h == (HANDLE)0xdeadbeef, "got %p.\n", h); + } + else if (desc.MiscFlags) + { + ok(hr == S_OK, "got %#lx.\n", hr); + ok(is_kmt_handle(h), "wrong handle %p.\n", h); + handle = h; + } + else + { + ok(hr == S_OK, "got %#lx.\n", hr); + ok(!h, "got %p.\n", h); + } + + h = (HANDLE)0xdeadbeef; + hr = IDXGIResource1_CreateSharedHandle(res1, NULL, GENERIC_ALL | DXGI_SHARED_RESOURCE_READ + | DXGI_SHARED_RESOURCE_WRITE, NULL, &h); + if (nthandle) + { + ok(hr == S_OK, "got %#lx.\n", hr); + handle = h; + } + else + { + ok(hr == E_INVALIDARG || broken(hr == E_NOTIMPL) /* Win7 software device */, "got %#lx.\n", hr); + ok(!h || broken(h == (HANDLE)0xdeadbeef) /* Win7 software device */, "got %p.\n", h); + } + + if (!desc.MiscFlags) + goto test_done; + + bret = DuplicateHandle(GetCurrentProcess(), h, GetCurrentProcess(), &h2, 0, FALSE, DUPLICATE_SAME_ACCESS); + if (nthandle) + { + char buffer[1024]; + OBJECT_TYPE_INFORMATION *type = (OBJECT_TYPE_INFORMATION *)buffer; + NTSTATUS status; + ULONG len = 0; + + ok(bret, "failed, err %lu.\n", GetLastError()); + CloseHandle(h2); + status = NtQueryObject(h, ObjectTypeInformation, buffer, sizeof(buffer), &len); + ok(!status, "got %#lx.\n", status); + ok(!wcscmp(type->TypeName.Buffer, L"DxgkSharedResource"), "got %s.\n", debugstr_w(type->TypeName.Buffer)); + } + else + { + ok(!bret && GetLastError() == ERROR_INVALID_HANDLE, "got bret %d, err %lu.\n", bret, GetLastError()); + } + + hr = ID3D11Device_OpenSharedResource(device, handle, &IID_ID3D11Texture2D, (void **)&tex2); + ok(hr == (nthandle ? E_INVALIDARG : S_OK), "got %#lx.\n", hr); + if (SUCCEEDED(hr)) + ID3D11Texture2D_Release(tex2); + hr = ID3D11Device1_OpenSharedResource1(device1, handle, &IID_ID3D11Texture2D, (void **)&tex2); + ok(hr == (nthandle ? S_OK : E_INVALIDARG), "got %#lx.\n", hr); + if (SUCCEEDED(hr)) + ID3D11Texture2D_Release(tex2); + bret = CloseHandle(handle); + if (nthandle) + ok(bret, "failed, err %lu.\n", GetLastError()); + else + ok(!bret && GetLastError() == ERROR_INVALID_HANDLE, "got bret %d, err %lu.\n", bret, GetLastError()); + +test_done: + if (tex) + IDXGIResource_Release(res); + if (res) + ID3D11Texture2D_Release(tex); + if (res1) + IDXGIResource1_Release(res1); + winetest_pop_context(); + } + + if (device1) + ID3D11Device1_Release(device1); + ref = ID3D11Device_Release(device); + ok(!ref, "got %ld.\n", ref); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -35065,6 +35249,7 @@ START_TEST(d3d11) queue_test(test_rtv_depth_slice); queue_test(test_vertex_formats); queue_test(test_dxgi_resources); + queue_for_each_feature_level(test_shared_resource); run_queued_tests();

1 0

Zebediah Figura : wined3d: Move struct wined3d_rendertarget_view_vk to wined3d_vk.h.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 07283df79ab8034b84ea38fe74e631430d48bca9 URL: https://gitlab.winehq.org/wine/wine/-/commit/07283df79ab8034b84ea38fe74e631… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:27:07 2022 -0600 wined3d: Move struct wined3d_rendertarget_view_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 49 ++---------------------------------------- dlls/wined3d/wined3d_vk.h | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e058d4ef9cb..e6aaeed9adf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4775,17 +4775,6 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_vk.h" - -static inline void wined3d_resource_vk_barrier(struct wined3d_resource *resource, - struct wined3d_context_vk *context_vk, uint32_t bind_mask) -{ - if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_buffer_vk_barrier(wined3d_buffer_vk(buffer_from_resource(resource)), context_vk, bind_mask); - else - wined3d_texture_vk_barrier(wined3d_texture_vk(texture_from_resource(resource)), context_vk, bind_mask); -} - struct wined3d_rendertarget_view { LONG refcount; @@ -4842,42 +4831,6 @@ HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_view_gl *v const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -struct wined3d_rendertarget_view_vk -{ - struct wined3d_rendertarget_view v; - - VkImageView vk_image_view; - uint64_t command_buffer_id; -}; - -static inline struct wined3d_rendertarget_view_vk *wined3d_rendertarget_view_vk( - struct wined3d_rendertarget_view *view) -{ - return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_vk, v); -} - -static inline void wined3d_rendertarget_view_vk_barrier(struct wined3d_rendertarget_view_vk *rtv_vk, - struct wined3d_context_vk *context_vk, uint32_t bind_mask) -{ - wined3d_resource_vk_barrier(rtv_vk->v.resource, context_vk, bind_mask); -} - -static inline VkImageView wined3d_rendertarget_view_vk_get_image_view(struct wined3d_rendertarget_view_vk *rtv_vk, - struct wined3d_context_vk *context_vk) -{ - struct wined3d_texture_vk *texture_vk; - - if (rtv_vk->vk_image_view) - return rtv_vk->vk_image_view; - - texture_vk = wined3d_texture_vk(wined3d_texture_from_resource(rtv_vk->v.resource)); - return wined3d_texture_vk_get_default_image_info(texture_vk, context_vk)->imageView; -} - -HRESULT wined3d_rendertarget_view_vk_init(struct wined3d_rendertarget_view_vk *view_vk, - const struct wined3d_view_desc *desc, struct wined3d_resource *resource, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; - struct wined3d_shader_resource_view { LONG refcount; @@ -4916,6 +4869,8 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +#include "wined3d_vk.h" + struct wined3d_view_vk { struct wined3d_bo_user bo_user; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 6514ece2068..36d832130ba 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -880,4 +880,49 @@ HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +static inline void wined3d_resource_vk_barrier(struct wined3d_resource *resource, + struct wined3d_context_vk *context_vk, uint32_t bind_mask) +{ + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_buffer_vk_barrier(wined3d_buffer_vk(buffer_from_resource(resource)), context_vk, bind_mask); + else + wined3d_texture_vk_barrier(wined3d_texture_vk(texture_from_resource(resource)), context_vk, bind_mask); +} + +struct wined3d_rendertarget_view_vk +{ + struct wined3d_rendertarget_view v; + + VkImageView vk_image_view; + uint64_t command_buffer_id; +}; + +static inline struct wined3d_rendertarget_view_vk *wined3d_rendertarget_view_vk( + struct wined3d_rendertarget_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_vk, v); +} + +static inline void wined3d_rendertarget_view_vk_barrier(struct wined3d_rendertarget_view_vk *rtv_vk, + struct wined3d_context_vk *context_vk, uint32_t bind_mask) +{ + wined3d_resource_vk_barrier(rtv_vk->v.resource, context_vk, bind_mask); +} + +static inline VkImageView wined3d_rendertarget_view_vk_get_image_view(struct wined3d_rendertarget_view_vk *rtv_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_texture_vk *texture_vk; + + if (rtv_vk->vk_image_view) + return rtv_vk->vk_image_view; + + texture_vk = wined3d_texture_vk(wined3d_texture_from_resource(rtv_vk->v.resource)); + return wined3d_texture_vk_get_default_image_info(texture_vk, context_vk)->imageView; +} + +HRESULT wined3d_rendertarget_view_vk_init(struct wined3d_rendertarget_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0