wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Eric Pouech : ntdll/tests: Enable compilation with long types in change.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 7516cb051060d24f0a1287f0eb94c8f730566130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7516cb051060d24f0a1287f0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:48 2022 +0100 ntdll/tests: Enable compilation with long types in change.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/change.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index e7201b52a3c..89e319bccd7 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <ntstatus.h> #define WIN32_NO_STATUS @@ -301,9 +302,9 @@ static void test_ntncdf_async(void) CloseHandle(hdir); - ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb).Status); - ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb2).Status); - ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %x\n",U(iosb3).Status); + ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %lx\n",U(iosb).Status); + ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %lx\n",U(iosb2).Status); + ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %lx\n",U(iosb3).Status); ok(iosb.Information == 0, "info wrong\n"); ok(iosb2.Information == 0, "info wrong\n"); @@ -312,8 +313,8 @@ static void test_ntncdf_async(void) U(iosb3).Status = 0x111111; iosb3.Information = 0x222222; r = pNtCancelIoFile(hdir, &iosb3); - ok( r == STATUS_INVALID_HANDLE, "cancel failed %x\n", r); - ok(U(iosb3).Status == 0x111111, "status wrong %x\n",U(iosb3).Status); + ok( r == STATUS_INVALID_HANDLE, "cancel failed %lx\n", r); + ok(U(iosb3).Status == 0x111111, "status wrong %lx\n",U(iosb3).Status); ok(iosb3.Information == 0x222222, "info wrong\n"); r = RemoveDirectoryW( path );

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in error.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 44d604f57e8b4da93f5b267c9d6cc3afa0473298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d604f57e8b4da93f5b267c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:59 2022 +0100 ntdll/tests: Enable compilation with long types in error.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/error.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 8f099e6903a..7784886c79b 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdio.h> @@ -75,7 +76,7 @@ static void cmp_call(NTSTATUS win_nt, ULONG win32, const char* message) err = pRtlNtStatusToDosError(win_nt); ok(err == win32, - "%s (%x): got %u, expected %u\n", + "%s (%lx): got %lu, expected %lu\n", message, win_nt, err, win32); } @@ -86,7 +87,7 @@ static void cmp_call2(NTSTATUS win_nt, ULONG win32, const char* message) err = pRtlNtStatusToDosError(win_nt); ok(err == win32 || (!strict && err == ERROR_MR_MID_NOT_FOUND), - "%s (%x): got %u, expected %u (or MID_NOT_FOUND)\n", + "%s (%lx): got %lu, expected %lu (or MID_NOT_FOUND)\n", message, win_nt, err, win32); } @@ -96,7 +97,7 @@ static void cmp_call3(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && err == win32_2), - "%s (%x): got %u, expected %u or %u\n", + "%s (%lx): got %lu, expected %lu or %lu\n", message, win_nt, err, win32_1, win32_2); } @@ -107,7 +108,7 @@ static void cmp_call4(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && (err == win32_2 || err == ERROR_MR_MID_NOT_FOUND)), - "%s (%x): got %u, expected %u or %u\n", + "%s (%lx): got %lu, expected %lu or %lu\n", message, win_nt, err, win32_1, win32_2); }

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in directory.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 570cff9dd222d2061547656eb658eafd2e16142b URL: https://source.winehq.org/git/wine.git/?a=commit;h=570cff9dd222d2061547656e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:51 2022 +0100 ntdll/tests: Enable compilation with long types in directory.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 239 ++++++++++++++++++++++--------------------- 1 file changed, 120 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=570cff9dd222d2061547…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in atom.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 444371356d229cae5236355322b9c5a458bce39a URL: https://source.winehq.org/git/wine.git/?a=commit;h=444371356d229cae52363553… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:43 2022 +0100 ntdll/tests: Enable compilation with long types in atom.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/atom.c | 187 ++++++++++++++++++++++++------------------------ 1 file changed, 94 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=444371356d229cae5236…

1 0

Eric Pouech : user32/tests: Finalize migration to long types.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 92b4fa54b0aaa90f7dc562165732dd65143a7f3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=92b4fa54b0aaa90f7dc56216… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 17:32:34 2022 +0100 user32/tests: Finalize migration to long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/Makefile.in | 1 - dlls/user32/tests/broadcast.c | 1 - dlls/user32/tests/class.c | 1 - dlls/user32/tests/clipboard.c | 1 - dlls/user32/tests/combo.c | 1 - dlls/user32/tests/cursoricon.c | 1 - dlls/user32/tests/dce.c | 1 - dlls/user32/tests/dde.c | 1 - dlls/user32/tests/dialog.c | 1 - dlls/user32/tests/edit.c | 1 - dlls/user32/tests/input.c | 1 - dlls/user32/tests/listbox.c | 1 - dlls/user32/tests/menu.c | 1 - dlls/user32/tests/monitor.c | 1 - dlls/user32/tests/msg.c | 1 - dlls/user32/tests/resource.c | 1 - dlls/user32/tests/scroll.c | 1 - dlls/user32/tests/static.c | 1 - dlls/user32/tests/sysparams.c | 1 - dlls/user32/tests/text.c | 1 - dlls/user32/tests/uitools.c | 1 - dlls/user32/tests/win.c | 1 - dlls/user32/tests/winstation.c | 1 - dlls/user32/tests/wsprintf.c | 1 - 24 files changed, 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92b4fa54b0aaa90f7dc5…

1 0

Eric Pouech : d3d12: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 08584a2e6e84c9d96457640641db237108101bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08584a2e6e84c9d964576406… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 16:59:33 2022 +0100 d3d12: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/Makefile.in | 1 - dlls/d3d12/d3d12_main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index e5fb77be025..09ca3f24d9e 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3d12.dll IMPORTLIB = d3d12 IMPORTS = dxgi dxguid wined3d gdi32 user32 uuid win32u diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 40e3165ee80..2dddfe60efe 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -89,13 +89,13 @@ static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adap { if (FAILED(hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory))) { - WARN("Failed to create DXGI factory, hr %#x.\n", hr); + WARN("Failed to create DXGI factory, hr %#lx.\n", hr); goto done; } if (FAILED(hr = IDXGIFactory4_EnumAdapters(factory, 0, &dxgi_adapter))) { - WARN("Failed to enumerate primary adapter, hr %#x.\n", hr); + WARN("Failed to enumerate primary adapter, hr %#lx.\n", hr); goto done; } @@ -103,7 +103,7 @@ static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adap } if (FAILED(hr = IUnknown_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)wine_adapter))) - WARN("Invalid adapter %p, hr %#x.\n", adapter, hr); + WARN("Invalid adapter %p, hr %#lx.\n", adapter, hr); done: if (dxgi_adapter) @@ -284,7 +284,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe if (FAILED(hr = IWineDXGIAdapter_get_adapter_info(wine_adapter, &adapter_info))) { - WARN("Failed to get adapter info, hr %#x.\n", hr); + WARN("Failed to get adapter info, hr %#lx.\n", hr); goto done; } @@ -305,7 +305,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe if (FAILED(hr = vkd3d_create_instance(&instance_create_info, &instance))) { - WARN("Failed to create vkd3d instance, hr %#x.\n", hr); + WARN("Failed to create vkd3d instance, hr %#lx.\n", hr); goto done; } @@ -332,7 +332,7 @@ done: HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { - TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + TRACE("data %p, data_size %Iu, iid %s, deserializer %p.\n", data, data_size, debugstr_guid(iid), deserializer); return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); @@ -341,7 +341,7 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { - TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + TRACE("data %p, data_size %Iu, iid %s, deserializer %p.\n", data, data_size, debugstr_guid(iid), deserializer); return vkd3d_create_versioned_root_signature_deserializer(data, data_size, iid, deserializer);

1 0

Eric Pouech : d3d12/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 636b2d92201fde49e8881e09bbba1ea05c836664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=636b2d92201fde49e8881e09… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 16:59:32 2022 +0100 d3d12/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/Makefile.in | 1 - dlls/d3d12/tests/d3d12.c | 158 +++++++++++++++++++++---------------------- 2 files changed, 79 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=636b2d92201fde49e888…

1 0

Eric Pouech : dxgi: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: ee2ef012f7466f6dcada1e8fe40da5132d4f1bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2ef012f7466f6dcada1e8f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 16:59:31 2022 +0100 dxgi: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/Makefile.in | 1 - dlls/dxgi/adapter.c | 12 ++++++------ dlls/dxgi/device.c | 20 ++++++++++---------- dlls/dxgi/dxgi_main.c | 6 +++--- dlls/dxgi/factory.c | 20 ++++++++++---------- dlls/dxgi/output.c | 16 ++++++++-------- dlls/dxgi/surface.c | 4 ++-- dlls/dxgi/swapchain.c | 48 ++++++++++++++++++++++++------------------------ 8 files changed, 63 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee2ef012f7466f6dcada…

1 0

Henri Verbeet : wined3d: Store "multisample_quality" as an unsigned int in struct wined3d_swapchain_desc.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 51b05581bc10ffb8ea3699a81999d90e6dd78c7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=51b05581bc10ffb8ea3699a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 18 16:59:30 2022 +0100 wined3d: Store "multisample_quality" as an unsigned int in struct wined3d_swapchain_desc. Consistent with what we do in other places in wined3d, like e.g. struct wined3d_resource_desc. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wined3d.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1fdbd105cc4..7fbff07a3ad 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1774,7 +1774,7 @@ struct wined3d_swapchain_desc unsigned int backbuffer_count; unsigned int backbuffer_bind_flags; enum wined3d_multisample_type multisample_type; - DWORD multisample_quality; + unsigned int multisample_quality; enum wined3d_swap_effect swap_effect; HWND device_window; BOOL windowed;

1 0

Eric Pouech : dxgi/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 65ff2098826bb9944b872251b1c9543bbbe6f488 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ff2098826bb9944b872251… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 16:59:29 2022 +0100 dxgi/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/Makefile.in | 1 - dlls/dxgi/tests/dxgi.c | 1768 +++++++++++++++++++++---------------------- 2 files changed, 876 insertions(+), 893 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65ff2098826bb9944b87…

1 0

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 March 2022