- Wine-Commits - list.winehq.org

Jinoh Kang : server: Check for DELETE access in NtMakeTemporaryObject().
by Alexandre Julliard March 20, 2024

March 20, 2024

Module: wine Branch: master Commit: a4ef56e1d9a3f185f788d798851c9c961defc4e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4ef56e1d9a3f185f788d798851c9c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 21:48:19 2024 +0900 server: Check for DELETE access in NtMakeTemporaryObject(). --- dlls/ntdll/tests/om.c | 1 - server/handle.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 3f416f75f0f..4b166441295 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -3321,7 +3321,6 @@ static void test_object_permanence(void) ok( !!(obi.GrantedAccess & DELETE), "expected DELETE access in %08lx\n", obi.GrantedAccess ); status = NtMakeTemporaryObject( handle ); - todo_wine_if(test->make_temp_status == STATUS_ACCESS_DENIED) ok( status == test->make_temp_status, "NtMakeTemporaryObject returned %08lx\n", status ); if (!NT_ERROR(status)) is_permanent = FALSE; } diff --git a/server/handle.c b/server/handle.c index 02a5a22edd1..ef243e06e0b 100644 --- a/server/handle.c +++ b/server/handle.c @@ -887,9 +887,10 @@ DECL_HANDLER(get_system_handles) DECL_HANDLER(set_object_permanence) { + const unsigned int access = req->permanent ? 0 : DELETE; struct object *obj; - if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; + if (!(obj = get_handle_obj( current->process, req->handle, access, NULL ))) return; if (req->permanent && !obj->is_permanent) {

1 0

Esme Povirk : user32/tests: Accept WM_ACTIVATE in TrackPopupMenu.
by Alexandre Julliard March 20, 2024

March 20, 2024

Module: wine Branch: master Commit: 0b472874afd05298c419dfac6f3fdead6a825ea0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b472874afd05298c419dfac6f3fde… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Mar 16 19:50:40 2024 +0000 user32/tests: Accept WM_ACTIVATE in TrackPopupMenu. --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e11e4a09f7e..1169d82271c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2177,6 +2177,7 @@ static const struct message WmTrackPopupMenuMinimizeWindow[] = { { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook|optional }, /* win11 */ { WM_NCACTIVATE, sent|optional }, /* win11 */ + { WM_ACTIVATE, sent|optional }, /* win11 */ { WM_CANCELMODE, sent }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc },

1 0

Esme Povirk : gdiplus/tests: Region bounds aren't rounded.
by Alexandre Julliard March 20, 2024

March 20, 2024

Module: wine Branch: master Commit: 423ba9cb23d76a7b086e9f474767c14f4240ae6f URL: https://gitlab.winehq.org/wine/wine/-/commit/423ba9cb23d76a7b086e9f474767c1… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Mar 18 20:05:08 2024 +0000 gdiplus/tests: Region bounds aren't rounded. --- dlls/gdiplus/tests/region.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 1bcef8a35dd..375f82f9ea7 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1732,6 +1732,7 @@ static void test_scans(void) static void test_getbounds(void) { GpRegion *region; + GpPath *path; GpGraphics *graphics; GpStatus status; GpRectF rectf; @@ -1807,6 +1808,44 @@ static void test_getbounds(void) ok(rectf.Width == 100.0, "Expected width = 0.0, got %.2f\n", rectf.Width); ok(rectf.Height == 100.0, "Expected height = 0.0, got %.2f\n", rectf.Height); + /* coordinates are not rounded */ + status = GdipResetWorldTransform(graphics); + ok(status == Ok, "status %08x\n", status); + status = GdipResetPageTransform(graphics); + ok(status == Ok, "status %08x\n", status); + rectf.X = 0.125; + rectf.Y = 1.125; + rectf.Width = 2.125; + rectf.Height = 3.125; + status = GdipCombineRegionRect(region, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 0.0; + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + todo_wine ok(rectf.X == 0.125, "Expected X = 0.0, got %.2f\n", rectf.X); + todo_wine ok(rectf.Y == 1.125, "Expected Y = 0.0, got %.2f\n", rectf.Y); + todo_wine ok(rectf.Width == 2.125, "Expected width = 0.0, got %.2f\n", rectf.Width); + todo_wine ok(rectf.Height == 3.125, "Expected height = 0.0, got %.2f\n", rectf.Height); + + /* test path */ + status = GdipCreatePath(FillModeAlternate, &path); + ok(status == Ok, "status %08x\n", status); + status = GdipAddPathRectangle(path, 0.125, 1.125, 2.125, 3.125); + ok(status == Ok, "status %08x\n", status); + status = GdipCombineRegionPath(region, path, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipDeletePath(path); + ok(status == Ok, "status %08x\n", status); + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 0.0; + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + todo_wine ok(rectf.X == 0.125, "Expected X = 0.0, got %.2f\n", rectf.X); + todo_wine ok(rectf.Y == 1.125, "Expected Y = 0.0, got %.2f\n", rectf.Y); + todo_wine ok(rectf.Width == 2.125, "Expected width = 0.0, got %.2f\n", rectf.Width); + todo_wine ok(rectf.Height == 3.125, "Expected height = 0.0, got %.2f\n", rectf.Height); + status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); status = GdipDeleteGraphics(graphics);

1 0

Esme Povirk : gdiplus: Calculate region bounding box without generating HRGN.
by Alexandre Julliard March 20, 2024

March 20, 2024

Module: wine Branch: master Commit: 290dd95dd4acc9f96ccffad03e8f343a57529469 URL: https://gitlab.winehq.org/wine/wine/-/commit/290dd95dd4acc9f96ccffad03e8f34… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Mar 18 20:44:31 2024 +0000 gdiplus: Calculate region bounding box without generating HRGN. --- dlls/gdiplus/region.c | 34 +++++++++++++++++----------------- dlls/gdiplus/tests/region.c | 16 ++++++++-------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 3034dedae76..063ccc96d90 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -104,6 +104,9 @@ typedef struct packed_point short Y; } packed_point; +static void get_region_bounding_box(struct region_element *element, + REAL *min_x, REAL *min_y, REAL *max_x, REAL *max_y, BOOL *empty, BOOL *infinite); + static inline INT get_element_size(const region_element* element) { INT needed = sizeof(DWORD); /* DWORD for the type */ @@ -579,9 +582,8 @@ GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) */ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect) { - HRGN hrgn; - RECT r; - GpStatus status; + REAL min_x, min_y, max_x, max_y; + BOOL empty, infinite; TRACE("(%p, %p, %p)\n", region, graphics, rect); @@ -589,31 +591,29 @@ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, return InvalidParameter; /* Contrary to MSDN, native ignores the graphics transform. */ - status = GdipGetRegionHRgn(region, NULL, &hrgn); - if(status != Ok) - return status; + get_region_bounding_box(&region->node, &min_x, &min_y, &max_x, &max_y, &empty, &infinite); /* infinite */ - if(!hrgn){ + if(infinite){ rect->X = rect->Y = -(REAL)(1 << 22); rect->Width = rect->Height = (REAL)(1 << 23); TRACE("%p => infinite\n", region); return Ok; } - if(GetRgnBox(hrgn, &r)){ - rect->X = r.left; - rect->Y = r.top; - rect->Width = r.right - r.left; - rect->Height = r.bottom - r.top; - TRACE("%p => %s\n", region, debugstr_rectf(rect)); + if(empty){ + rect->X = rect->Y = rect->Width = rect->Height = 0.0; + TRACE("%p => empty\n", region); + return Ok; } - else - status = GenericError; - DeleteObject(hrgn); + rect->X = min_x; + rect->Y = min_y; + rect->Width = max_x - min_x; + rect->Height = max_y - min_y; + TRACE("%p => %s\n", region, debugstr_rectf(rect)); - return status; + return Ok; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 375f82f9ea7..93c6c53ebc1 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1823,10 +1823,10 @@ static void test_getbounds(void) rectf.Height = rectf.Width = 0.0; status = GdipGetRegionBounds(region, graphics, &rectf); ok(status == Ok, "status %08x\n", status); - todo_wine ok(rectf.X == 0.125, "Expected X = 0.0, got %.2f\n", rectf.X); - todo_wine ok(rectf.Y == 1.125, "Expected Y = 0.0, got %.2f\n", rectf.Y); - todo_wine ok(rectf.Width == 2.125, "Expected width = 0.0, got %.2f\n", rectf.Width); - todo_wine ok(rectf.Height == 3.125, "Expected height = 0.0, got %.2f\n", rectf.Height); + ok(rectf.X == 0.125, "Expected X = 0.0, got %.2f\n", rectf.X); + ok(rectf.Y == 1.125, "Expected Y = 0.0, got %.2f\n", rectf.Y); + ok(rectf.Width == 2.125, "Expected width = 0.0, got %.2f\n", rectf.Width); + ok(rectf.Height == 3.125, "Expected height = 0.0, got %.2f\n", rectf.Height); /* test path */ status = GdipCreatePath(FillModeAlternate, &path); @@ -1841,10 +1841,10 @@ static void test_getbounds(void) rectf.Height = rectf.Width = 0.0; status = GdipGetRegionBounds(region, graphics, &rectf); ok(status == Ok, "status %08x\n", status); - todo_wine ok(rectf.X == 0.125, "Expected X = 0.0, got %.2f\n", rectf.X); - todo_wine ok(rectf.Y == 1.125, "Expected Y = 0.0, got %.2f\n", rectf.Y); - todo_wine ok(rectf.Width == 2.125, "Expected width = 0.0, got %.2f\n", rectf.Width); - todo_wine ok(rectf.Height == 3.125, "Expected height = 0.0, got %.2f\n", rectf.Height); + ok(rectf.X == 0.125, "Expected X = 0.0, got %.2f\n", rectf.X); + ok(rectf.Y == 1.125, "Expected Y = 0.0, got %.2f\n", rectf.Y); + ok(rectf.Width == 2.125, "Expected width = 0.0, got %.2f\n", rectf.Width); + ok(rectf.Height == 3.125, "Expected height = 0.0, got %.2f\n", rectf.Height); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status);

1 0

Jinoh Kang : Revert "ntdll/tests: Load NtMakeTemporaryObject() dynamically."
by Alexandre Julliard March 20, 2024

March 20, 2024

Module: wine Branch: master Commit: 25ffa32beb568e2cd985058bd912efc6e582b667 URL: https://gitlab.winehq.org/wine/wine/-/commit/25ffa32beb568e2cd985058bd912ef… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Mar 20 10:52:31 2024 +0900 Revert "ntdll/tests: Load NtMakeTemporaryObject() dynamically." This reverts commit 4fdb45f23ffe7a0578404f6a8fc08e904fc7f962. NtMakeTemporaryObject() has existed since at least Windows NT 3.10. --- dlls/ntdll/tests/om.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d9bcce6d365..3f416f75f0f 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -72,7 +72,6 @@ static NTSTATUS (WINAPI *pNtOpenThreadToken)(HANDLE,DWORD,BOOLEAN,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateToken)(HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,BOOLEAN,TOKEN_TYPE,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateObject)(HANDLE,HANDLE,HANDLE,HANDLE*,ACCESS_MASK,ULONG,ULONG); static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); -static NTSTATUS (WINAPI *pNtMakeTemporaryObject)(HANDLE); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -3259,12 +3258,6 @@ static void test_object_permanence(void) NTSTATUS status; BOOL creatpermapriv = FALSE; - if (!pNtMakeTemporaryObject) - { - win_skip( "NtMakeTemporaryObject is not available.\n" ); - return; - } - status = NtOpenProcessToken( GetCurrentProcess(), TOKEN_DUPLICATE, &process_token ); ok( status == STATUS_SUCCESS, "NtOpenProcessToken returned %08lx\n", status ); @@ -3327,7 +3320,7 @@ static void test_object_permanence(void) if (test->make_temp_status == STATUS_SUCCESS) ok( !!(obi.GrantedAccess & DELETE), "expected DELETE access in %08lx\n", obi.GrantedAccess ); - status = pNtMakeTemporaryObject( handle ); + status = NtMakeTemporaryObject( handle ); todo_wine_if(test->make_temp_status == STATUS_ACCESS_DENIED) ok( status == test->make_temp_status, "NtMakeTemporaryObject returned %08lx\n", status ); if (!NT_ERROR(status)) is_permanent = FALSE; @@ -3379,7 +3372,7 @@ static void test_object_permanence(void) ok( obi_new.Attributes == expect_attr, "expected attr %08lx, got %08lx\n", expect_attr, obi_new.Attributes ); /* ensure object is deleted */ - pNtMakeTemporaryObject( handle ); + NtMakeTemporaryObject( handle ); NtClose( handle ); } winetest_pop_context(); @@ -3436,7 +3429,6 @@ START_TEST(om) pNtDuplicateToken = (void *)GetProcAddress(hntdll, "NtDuplicateToken"); pNtDuplicateObject = (void *)GetProcAddress(hntdll, "NtDuplicateObject"); pNtCompareObjects = (void *)GetProcAddress(hntdll, "NtCompareObjects"); - pNtMakeTemporaryObject = (void *)GetProcAddress(hntdll, "NtMakeTemporaryObject"); test_null_in_object_name(); test_case_sensitive();

1 0

Rémi Bernon : win32u: Avoid a crash when cleaning up a monitor without an adapter.
by Alexandre Julliard March 20, 2024

March 20, 2024

Module: wine Branch: master Commit: 9f3f61283ddfe0715616c596ef7560b94b644623 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f3f61283ddfe0715616c596ef7560… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 20 22:36:21 2024 +0100 win32u: Avoid a crash when cleaning up a monitor without an adapter. --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 07b9d46d9eb..d5ad97a2c33 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1501,7 +1501,7 @@ static void clear_display_devices(void) while (!list_empty( &monitors )) { monitor = LIST_ENTRY( list_head( &monitors ), struct monitor, entry ); - adapter_release( monitor->adapter ); + if (monitor->adapter) adapter_release( monitor->adapter ); list_remove( &monitor->entry ); free( monitor ); }

1 0

Giovanni Mascellani : d2d1: Compile the pixel shader with D3DCompile().
by Alexandre Julliard March 20, 2024

March 20, 2024

Module: wine Branch: master Commit: a78cea20d1578a553f883be3250581000d43f26f URL: https://gitlab.winehq.org/wine/wine/-/commit/a78cea20d1578a553f883be3250581… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Mar 18 13:09:12 2024 +0100 d2d1: Compile the pixel shader with D3DCompile(). --- dlls/d2d1/device.c | 678 +++++++++++++++++------------------------------------ 1 file changed, 214 insertions(+), 464 deletions(-)

1 0

Vijay Kiran Kamuju : d3dcompiler: Add D3DCreateLinker stub.
by Alexandre Julliard March 20, 2024

March 20, 2024

Module: wine Branch: master Commit: 3719aed1f95570aaed26a4bdc5b57939c9fb9d39 URL: https://gitlab.winehq.org/wine/wine/-/commit/3719aed1f95570aaed26a4bdc5b579… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 17 21:49:28 2024 +0100 d3dcompiler: Add D3DCreateLinker stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52622 --- dlls/d3dcompiler_43/compiler.c | 6 ++++++ dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +- include/d3d11shader.h | 16 ++++++++++++++++ include/d3dcompiler.h | 1 + 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index e5c9981ded5..4b2b05df917 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -774,6 +774,12 @@ end: return hr; } +HRESULT WINAPI D3DCreateLinker(ID3D11Linker **linker) +{ + FIXME("linker %p stub!\n", linker); + return E_NOTIMPL; +} + HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) { FIXME("data %p, size %Iu, module %p stub!\n", data, size, module); diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index ca132979565..3ed049e6ab8 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -5,7 +5,7 @@ @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DCreateFunctionLinkingGraph -@ stub D3DCreateLinker +@ stdcall D3DCreateLinker(ptr) @ stub D3DDecompressShaders @ stdcall D3DDisassemble(ptr long long ptr ptr) @ stub D3DDisassemble10Effect(ptr long ptr) diff --git a/include/d3d11shader.h b/include/d3d11shader.h index a7441508146..225c4344100 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -261,4 +261,20 @@ DECLARE_INTERFACE_(ID3D11Module, IUnknown) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D11Linker, 0x59a6cd0e, 0xe10d, 0x4c1f, 0x88, 0xc0, 0x63, 0xab, 0xa1, 0xda, 0xf3, 0x0e); + +#define INTERFACE ID3D11Linker +DECLARE_INTERFACE_(ID3D11Linker, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* ID3D11Linker methods */ + STDMETHOD(Link)(THIS_ ID3D11ModuleInstance *instance, LPCSTR instname, LPCSTR targetname, UINT flags, ID3DBlob **shader, ID3DBlob **error) PURE; + STDMETHOD(UseLibrary)(THIS_ ID3D11ModuleInstance *libinstance) PURE; + STDMETHOD(AddClipPlaneFromCBuffer)(THIS_ UINT bufferslot, UINT bufferentry) PURE; +}; +#undef INTERFACE + #endif diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index f897a785992..87821a9031a 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -153,6 +153,7 @@ typedef HRESULT (WINAPI *pD3DPreprocess)(const void *data, SIZE_T size, const ch const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); +HRESULT WINAPI D3DCreateLinker(ID3D11Linker **linker); HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module); #ifdef __cplusplus

1 0

Henri Verbeet : vkd3d-common: Merge vkd3d_debug.h into vkd3d_common.h.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: vkd3d Branch: master Commit: 2431357fd64d7a606d2c7f046179631dd8f17e4a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2431357fd64d7a606d2c7f0461796… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 18 16:16:55 2024 +0100 vkd3d-common: Merge vkd3d_debug.h into vkd3d_common.h. There doesn't seem much point in separating these. Pretty much all of vkd3d (eventually) includes vkd3d_debug.h, and vkd3d_debug.h includes vkd3d_common.h because it uses VKD3D_PRINTF_FUNC. The separation also makes it inconvenient to use the debug macros in vkd3d_common.h. --- Makefile.am | 3 - include/private/vkd3d_common.h | 119 +++++++++++++++++++++++++++++++++ include/private/vkd3d_debug.h | 147 ----------------------------------------- include/private/vkd3d_memory.h | 2 +- libs/vkd3d-common/blob.c | 1 - libs/vkd3d-common/debug.c | 2 +- libs/vkd3d-common/error.c | 1 - 7 files changed, 121 insertions(+), 154 deletions(-)

1 0

Henri Verbeet : vkd3d: Move the vkd3d_mutex implementation to vkd3d-common.
by Alexandre Julliard March 19, 2024

March 19, 2024

Module: vkd3d Branch: master Commit: 166dc24b2f73b0541a14815081ee4c8d9eab3269 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/166dc24b2f73b0541a14815081ee4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 18 16:09:43 2024 +0100 vkd3d: Move the vkd3d_mutex implementation to vkd3d-common. --- include/private/vkd3d_common.h | 60 +++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 67 ------------------------------------------ 2 files changed, 60 insertions(+), 67 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 372f39ce..75a8235c 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -30,6 +30,9 @@ #include <stdint.h> #include <stdio.h> #include <stdlib.h> +#ifndef _WIN32 +#include <pthread.h> +#endif #ifdef _MSC_VER #include <intrin.h> @@ -424,6 +427,63 @@ static inline uint32_t vkd3d_atomic_increment_u32(uint32_t volatile *x) return vkd3d_atomic_add_fetch_u32(x, 1); } +struct vkd3d_mutex +{ +#ifdef _WIN32 + CRITICAL_SECTION lock; +#else + pthread_mutex_t lock; +#endif +}; + +static inline void vkd3d_mutex_init(struct vkd3d_mutex *lock) +{ +#ifdef _WIN32 + InitializeCriticalSection(&lock->lock); +#else + int ret; + + if ((ret = pthread_mutex_init(&lock->lock, NULL))) + ERR("Failed to initialise the mutex, ret %d.\n", ret); +#endif +} + +static inline void vkd3d_mutex_lock(struct vkd3d_mutex *lock) +{ +#ifdef _WIN32 + EnterCriticalSection(&lock->lock); +#else + int ret; + + if ((ret = pthread_mutex_lock(&lock->lock))) + ERR("Failed to lock the mutex, ret %d.\n", ret); +#endif +} + +static inline void vkd3d_mutex_unlock(struct vkd3d_mutex *lock) +{ +#ifdef _WIN32 + LeaveCriticalSection(&lock->lock); +#else + int ret; + + if ((ret = pthread_mutex_unlock(&lock->lock))) + ERR("Failed to unlock the mutex, ret %d.\n", ret); +#endif +} + +static inline void vkd3d_mutex_destroy(struct vkd3d_mutex *lock) +{ +#ifdef _WIN32 + DeleteCriticalSection(&lock->lock); +#else + int ret; + + if ((ret = pthread_mutex_destroy(&lock->lock))) + ERR("Failed to destroy the mutex, ret %d.\n", ret); +#endif +} + static inline void vkd3d_parse_version(const char *version, int *major, int *minor) { *major = atoi(version); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index aff2c440..84423072 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -203,36 +203,11 @@ union vkd3d_thread_handle void *handle; }; -struct vkd3d_mutex -{ - CRITICAL_SECTION lock; -}; - struct vkd3d_cond { CONDITION_VARIABLE cond; }; -static inline void vkd3d_mutex_init(struct vkd3d_mutex *lock) -{ - InitializeCriticalSection(&lock->lock); -} - -static inline void vkd3d_mutex_lock(struct vkd3d_mutex *lock) -{ - EnterCriticalSection(&lock->lock); -} - -static inline void vkd3d_mutex_unlock(struct vkd3d_mutex *lock) -{ - LeaveCriticalSection(&lock->lock); -} - -static inline void vkd3d_mutex_destroy(struct vkd3d_mutex *lock) -{ - DeleteCriticalSection(&lock->lock); -} - static inline void vkd3d_cond_init(struct vkd3d_cond *cond) { InitializeConditionVariable(&cond->cond); @@ -288,53 +263,11 @@ union vkd3d_thread_handle void *handle; }; -struct vkd3d_mutex -{ - pthread_mutex_t lock; -}; - struct vkd3d_cond { pthread_cond_t cond; }; - -static inline void vkd3d_mutex_init(struct vkd3d_mutex *lock) -{ - int ret; - - ret = pthread_mutex_init(&lock->lock, NULL); - if (ret) - ERR("Could not initialize the mutex, error %d.\n", ret); -} - -static inline void vkd3d_mutex_lock(struct vkd3d_mutex *lock) -{ - int ret; - - ret = pthread_mutex_lock(&lock->lock); - if (ret) - ERR("Could not lock the mutex, error %d.\n", ret); -} - -static inline void vkd3d_mutex_unlock(struct vkd3d_mutex *lock) -{ - int ret; - - ret = pthread_mutex_unlock(&lock->lock); - if (ret) - ERR("Could not unlock the mutex, error %d.\n", ret); -} - -static inline void vkd3d_mutex_destroy(struct vkd3d_mutex *lock) -{ - int ret; - - ret = pthread_mutex_destroy(&lock->lock); - if (ret) - ERR("Could not destroy the mutex, error %d.\n", ret); -} - static inline void vkd3d_cond_init(struct vkd3d_cond *cond) { int ret;

1 0