February 2024 - Wine-commits

Eric Pouech : msvcrt: Don't reset invalid std handle in init.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 233074ded08b326e8049102fdadd81a6187fa073 URL: https://gitlab.winehq.org/wine/wine/-/commit/233074ded08b326e8049102fdadd81… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 15 08:51:43 2023 +0100 msvcrt: Don't reset invalid std handle in init. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 8 ++++---- dlls/msvcrt/file.c | 12 +++++++----- dlls/msvcrt/tests/file.c | 1 - 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e329f28ac8b..21f1b3b96f6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3341,8 +3341,8 @@ static void test_StdHandleInheritance(void) {ARG_STD | ARG_HANDLE_PROTECT | H_DISK, HATTR_TYPE | HATTR_PROTECT | FILE_TYPE_DISK}, /* all others handles type behave as H_DISK */ - {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 24, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, - {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 16}, + {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING}, /* all others handles type behave as H_DISK */ /*10*/ {ARG_STARTUPINFO | H_DEVIL, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, @@ -3369,8 +3369,8 @@ static void test_StdHandleInheritance(void) {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL}, /* all others handles type behave as H_DISK */ -/*10*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 24}, - {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 16}, +/*10*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING}, + {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING}, /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3c1d9572585..b4e80a4b5d0 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -560,12 +560,14 @@ static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag) ioinfo_set_unicode(fdinfo, FALSE); ioinfo_set_textmode(fdinfo, TEXTMODE_ANSI); - if (hand == MSVCRT_NO_CONSOLE) hand = 0; - switch (fdinfo-MSVCRT___pioinfo[0]) + if (hand != MSVCRT_NO_CONSOLE) { - case 0: SetStdHandle(STD_INPUT_HANDLE, hand); break; - case 1: SetStdHandle(STD_OUTPUT_HANDLE, hand); break; - case 2: SetStdHandle(STD_ERROR_HANDLE, hand); break; + switch (fdinfo-MSVCRT___pioinfo[0]) + { + case 0: SetStdHandle(STD_INPUT_HANDLE, hand); break; + case 1: SetStdHandle(STD_OUTPUT_HANDLE, hand); break; + case 2: SetStdHandle(STD_ERROR_HANDLE, hand); break; + } } } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9357b215cd8..1ac6cfe3182 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1897,7 +1897,6 @@ static void test_invalid_stdin_child( void ) ok(handle == (HANDLE)-2, "handle = %p\n", handle); ok(errno == 0xdeadbeef, "errno = %d\n", errno); handle = GetStdHandle(STD_INPUT_HANDLE); - todo_wine ok((LONG_PTR)handle > 0, "Expecting passed handle to be untouched\n"); info = &__pioinfo[STDIN_FILENO/MSVCRT_FD_BLOCK_SIZE][STDIN_FILENO%MSVCRT_FD_BLOCK_SIZE];

1 0

Eric Pouech : kernel32/tests: Remove todo scaffolding for CreateProcess() tests.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 52b9f8a9fa8a50a3e3b9230d18c5dc281284be29 URL: https://gitlab.winehq.org/wine/wine/-/commit/52b9f8a9fa8a50a3e3b9230d18c5dc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Dec 2 15:31:07 2023 +0100 kernel32/tests: Remove todo scaffolding for CreateProcess() tests. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 21f1b3b96f6..2904a31d014 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3307,8 +3307,6 @@ struct std_handle_test unsigned args; /* output */ DWORD expected; - unsigned is_todo; /* bitmask: 1 on TEB values, 2 on StartupInfoA values, 4 on StartupInfoW values, - 8 dangling in StartupInfoW, 16 dangling in TEB */ DWORD is_broken; /* Win7 broken file types */ }; @@ -3461,42 +3459,29 @@ static void test_StdHandleInheritance(void) */ okChildHexInt("StartupInfoA", "hStdInput", (DWORD_PTR)((std_tests[i].args & ARG_STD) ? INVALID_HANDLE_VALUE : hstd[0]), std_tests[i].is_broken); okChildHexInt("StartupInfoA", "hStdOutput", (DWORD_PTR)((std_tests[i].args & ARG_STD) ? INVALID_HANDLE_VALUE : hstd[1]), std_tests[i].is_broken); - todo_wine_if(std_tests[i].is_todo & 8) if (!(std_tests[i].args & ARG_STD)) { okChildHexInt("StartupInfoW", "hStdInput", (DWORD_PTR)hstd[0], std_tests[i].is_broken); okChildHexInt("StartupInfoW", "hStdOutput", (DWORD_PTR)hstd[1], std_tests[i].is_broken); } - todo_wine_if(std_tests[i].is_todo & 16) - { okChildHexInt("TEB", "hStdInput", (DWORD_PTR)hstd[0], std_tests[i].is_broken); okChildHexInt("TEB", "hStdOutput", (DWORD_PTR)hstd[1], std_tests[i].is_broken); - } } else { unsigned startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_INVALID : std_tests[i].expected; - todo_wine_if(std_tests[i].is_todo & 2) - { okChildHexInt("StartupInfoA", "hStdInputEncode", startup_expected, std_tests[i].is_broken); okChildHexInt("StartupInfoA", "hStdOutputEncode", startup_expected, std_tests[i].is_broken); - } startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_UNTOUCHED : std_tests[i].expected; - todo_wine_if(std_tests[i].is_todo & 4) - { okChildHexInt("StartupInfoW", "hStdInputEncode", startup_expected, std_tests[i].is_broken); okChildHexInt("StartupInfoW", "hStdOutputEncode", startup_expected, std_tests[i].is_broken); - } - todo_wine_if(std_tests[i].is_todo & 1) - { okChildHexInt("TEB", "hStdInputEncode", std_tests[i].expected, std_tests[i].is_broken); okChildHexInt("TEB", "hStdOutputEncode", std_tests[i].expected, std_tests[i].is_broken); - } } release_memory();

1 0

Gabriel Ivăncescu : jscript: Add initial implementation of ArrayBuffer.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 88c0f72bbffebaa034a946fb0fa3979f9d726232 URL: https://gitlab.winehq.org/wine/wine/-/commit/88c0f72bbffebaa034a946fb0fa397… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 12 17:47:11 2024 +0200 jscript: Add initial implementation of ArrayBuffer. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/Makefile.in | 1 + dlls/jscript/arraybuf.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 4 + dlls/jscript/jscript.h | 5 +- dlls/jscript/object.c | 1 + dlls/mshtml/tests/es5.js | 48 ++++++++++++ 6 files changed, 247 insertions(+), 1 deletion(-)

1 0

Yuxuan Shui : dmband: Implement getting/setting GUID_BandParam on band tracks.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: e9e8ab1392cc858793dc8a2e1c785dd68eb21eb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9e8ab1392cc858793dc8a2e1c785d… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Jan 31 03:06:09 2024 +0000 dmband: Implement getting/setting GUID_BandParam on band tracks. --- dlls/dmband/bandtrack.c | 46 ++++++++++++++++++++++++--- dlls/dmband/tests/dmband.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 4 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 4756ed194ef..b410cf81d3a 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -198,19 +198,35 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat } static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, - MUSIC_TIME *next, void *param) + MUSIC_TIME *out_next, void *param) { struct band_track *This = impl_from_IDirectMusicTrack8(iface); + struct band_entry *band, *next_band; + DMUS_BAND_PARAM *bandparam; - TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, out_next, param); if (!type) return E_POINTER; if (!IsEqualGUID(type, &GUID_BandParam)) return DMUS_E_GET_UNSUPPORTED; + if (list_empty(&This->bands)) + return DMUS_E_NOT_FOUND; - FIXME("GUID_BandParam not handled yet\n"); + bandparam = param; + if (out_next) *out_next = 0; + LIST_FOR_EACH_ENTRY_SAFE(band, next_band, &This->bands, struct band_entry, entry) + { + /* we want to return the first band even when there's nothing with lBandTime <= time */ + bandparam->pBand = band->band; + bandparam->mtTimePhysical = band->head.lBandTimePhysical; + if (band->entry.next == &This->bands) break; + if (out_next) *out_next = next_band->head.lBandTimeLogical; + if (next_band->head.lBandTimeLogical > time) break; + } + + IDirectMusicBand_AddRef(bandparam->pBand); return S_OK; } @@ -227,7 +243,29 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ return DMUS_E_TYPE_UNSUPPORTED; if (IsEqualGUID(type, &GUID_BandParam)) - FIXME("GUID_BandParam not handled yet\n"); + { + struct band_entry *new_entry = NULL, *entry, *next_entry; + DMUS_BAND_PARAM *band_param = param; + if (!band_param || !band_param->pBand) + return E_POINTER; + if (!(new_entry = calloc(1, sizeof(*new_entry)))) + return E_OUTOFMEMORY; + new_entry->band = band_param->pBand; + new_entry->head.lBandTimeLogical = time; + new_entry->head.lBandTimePhysical = band_param->mtTimePhysical; + IDirectMusicBand_AddRef(new_entry->band); + if (list_empty(&This->bands)) + list_add_tail(&This->bands, &new_entry->entry); + else + { + LIST_FOR_EACH_ENTRY_SAFE(entry, next_entry, &This->bands, struct band_entry, entry) + if (entry->entry.next == &This->bands || next_entry->head.lBandTimeLogical > time) + { + list_add_after(&entry->entry, &new_entry->entry); + break; + } + } + } else if (IsEqualGUID(type, &GUID_Clear_All_Bands)) FIXME("GUID_Clear_All_Bands not handled yet\n"); else if (IsEqualGUID(type, &GUID_ConnectToDLSCollection)) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index d88606976e4..82081f70047 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -176,9 +176,12 @@ static void test_dmband(void) static void test_bandtrack(void) { + DMUS_BAND_PARAM bandparam = { 0 }; IDirectMusicTrack8 *dmt8; + IDirectMusicBand *dmb[3]; IPersistStream *ps; CLSID class; + MUSIC_TIME mt; ULARGE_INTEGER size; char buf[64] = { 0 }; HRESULT hr; @@ -266,6 +269,81 @@ static void test_bandtrack(void) } } + for (i = 0; i < 3; i++) + { + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicBand, (void **)&dmb[i]); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); + } + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 0, &mt, &bandparam); + ok(hr == DMUS_E_NOT_FOUND, "hr %#lx, expected not found\n", hr); + ok(bandparam.pBand == NULL, "Got band %p, expected NULL\n", bandparam.pBand); + + bandparam.mtTimePhysical = 10; + bandparam.pBand = dmb[0]; + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_BandParam, 10, &bandparam); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 10, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 0, "Got time %lu, expected 0\n", mt); + ok(bandparam.mtTimePhysical == 10, "Got physical time %lu, expected 10\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + /* get with time before the first band. */ + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 1, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 0, "Got time %lu, expected 0\n", mt); + ok(bandparam.mtTimePhysical == 10, "Got physical time %lu, expected 10\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + bandparam.mtTimePhysical = 100; + bandparam.pBand = dmb[1]; + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_BandParam, 100, &bandparam); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 10, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 100, "Got time %lu, expected 100\n", mt); + ok(bandparam.mtTimePhysical == 10, "Got physical time %lu, expected 10\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 20, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 100, "Got time %lu, expected 100\n", mt); + ok(bandparam.mtTimePhysical == 10, "Got physical time %lu, expected 10\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + /* time return by GetParam is actually not a relative time. */ + bandparam.mtTimePhysical = 250; + bandparam.pBand = dmb[2]; + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_BandParam, 250, &bandparam); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 120, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 250, "Got time %lu, expected 250\n", mt); + ok(bandparam.mtTimePhysical == 100, "Got physical time %lu, expected 0\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + for (i = 0; i < 3; i++) + IDirectMusicBand_Release(dmb[i]); + + bandparam.pBand = NULL; + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_BandParam, 0, &bandparam); + ok(hr == E_POINTER, "hr %#lx, expected E_POINTER\n", hr); + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);

1 0

Henri Verbeet : vkd3d: Cast DWORD flags to uint32_t in debug traces.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: vkd3d Branch: master Commit: 5eba031fa1c7f606ffacf3cb7310615728d150f0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5eba031fa1c7f606ffacf3cb73106… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:57:41 2024 +0100 vkd3d: Cast DWORD flags to uint32_t in debug traces. --- gitlab/build-mingw | 2 +- libs/vkd3d/device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 0886de2c..6d4cf189 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -13,7 +13,7 @@ mkdir build cd build mkdir vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers -../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \ +../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \ make -j$(nproc) && \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \ touch ../pipeline_failed diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 90272818..1e094690 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3888,7 +3888,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateSharedHandle(ID3D12Device7 * struct d3d12_device *device = impl_from_ID3D12Device7(iface); FIXME("iface %p, object %p, attributes %p, access %#x, name %s, handle %p stub!\n", - iface, object, attributes, access, debugstr_w(name, device->wchar_size), handle); + iface, object, attributes, (uint32_t)access, debugstr_w(name, device->wchar_size), handle); return E_NOTIMPL; } @@ -3908,7 +3908,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Devic struct d3d12_device *device = impl_from_ID3D12Device7(iface); FIXME("iface %p, name %s, access %#x, handle %p stub!\n", - iface, debugstr_w(name, device->wchar_size), access, handle); + iface, debugstr_w(name, device->wchar_size), (uint32_t)access, handle); return E_NOTIMPL; }

1 0

Rémi Bernon : server: Move rawinput message conversion from win32u.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 2eb8950392996283192250691b005e2df65ab7b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2eb8950392996283192250691b005e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 09:28:46 2024 +0100 server: Move rawinput message conversion from win32u. Appending the entire RAWMOUSE / RAWKEYBOARD / RAWHID + report structs after the hardware message data, instead of using a custom intermediate structure. --- dlls/user32/tests/input.c | 11 +-- dlls/win32u/rawinput.c | 127 +++++------------------------ include/wine/server_protocol.h | 34 ++------ server/protocol.def | 32 ++------ server/queue.c | 180 +++++++++++++++++++++++++++++++++-------- server/request.h | 2 +- tools/make_requests | 2 +- 7 files changed, 183 insertions(+), 205 deletions(-)

1 0

Rémi Bernon : server: Fix rawinput buffer sizes and alignment on WoW64.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 1664ad7d50110902f85af07564ef1505af9cc062 URL: https://gitlab.winehq.org/wine/wine/-/commit/1664ad7d50110902f85af07564ef15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 11:25:41 2024 +0100 server: Fix rawinput buffer sizes and alignment on WoW64. --- dlls/user32/tests/input.c | 3 -- dlls/win32u/rawinput.c | 103 +++++------------------------------------ include/wine/server_protocol.h | 6 +-- server/protocol.def | 4 +- server/queue.c | 96 ++++++++++++++++++++++++-------------- server/request.h | 4 +- server/trace.c | 4 +- 7 files changed, 82 insertions(+), 138 deletions(-)

1 0

Rémi Bernon : win32u: Get rid of the rawinput thread data and buffer.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 87e5bdaa4a0442c0bf2829a86d86b548d912a3ef URL: https://gitlab.winehq.org/wine/wine/-/commit/87e5bdaa4a0442c0bf2829a86d86b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 1 08:42:33 2024 +0100 win32u: Get rid of the rawinput thread data and buffer. --- dlls/win32u/ntuser_private.h | 12 +--- dlls/win32u/rawinput.c | 142 +++++++++++++++++-------------------------- 2 files changed, 57 insertions(+), 97 deletions(-) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 11bb7f4baf6..3b6cab5bdc9 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,16 +38,6 @@ enum system_timer_id SYSTEM_TIMER_KEY_REPEAT = 0xfff0, }; -struct rawinput_thread_data -{ - UINT hw_id; /* current rawinput message id */ - RAWINPUT buffer[1]; /* rawinput message data buffer */ -}; - -/* on windows the buffer capacity is quite large as well, enough to */ -/* hold up to 10s of 1kHz mouse rawinput events */ -#define RAWINPUT_BUFFER_SIZE (512 * 1024) - struct user_object { HANDLE handle; @@ -133,7 +123,7 @@ struct user_thread_info MSG key_repeat_msg; /* Last WM_KEYDOWN message to repeat */ HKL kbd_layout; /* Current keyboard layout */ UINT kbd_layout_id; /* Current keyboard layout ID */ - struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */ + struct hardware_msg_data *rawinput; /* Current rawinput message data */ UINT spy_indent; /* Current spy indent */ BOOL clipping_cursor; /* thread is currently clipping */ DWORD clipping_reset; /* time when clipping was last reset */ diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index e4f43091b9b..1120ce053aa 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -52,51 +52,6 @@ typedef struct } RAWINPUTHEADER64; #endif -static struct rawinput_thread_data *get_rawinput_thread_data(void) -{ - struct user_thread_info *thread_info = get_user_thread_info(); - struct rawinput_thread_data *data = thread_info->rawinput; - if (data) return data; - data = thread_info->rawinput = calloc( 1, RAWINPUT_BUFFER_SIZE + sizeof(struct user_thread_info) ); - return data; -} - -static BOOL rawinput_from_hardware_message( RAWINPUT *rawinput, const struct hardware_msg_data *msg_data ) -{ - SIZE_T size = msg_data->size - sizeof(*msg_data); - if (sizeof(RAWINPUTHEADER) + size > rawinput->header.dwSize) return FALSE; - - rawinput->header.dwType = msg_data->rawinput.type; - rawinput->header.dwSize = sizeof(RAWINPUTHEADER) + size; - rawinput->header.hDevice = UlongToHandle( msg_data->rawinput.device ); - rawinput->header.wParam = msg_data->rawinput.wparam; - - if (msg_data->rawinput.type == RIM_TYPEMOUSE) - { - if (size != sizeof(RAWMOUSE)) return FALSE; - rawinput->data.mouse = *(RAWMOUSE *)(msg_data + 1); - } - else if (msg_data->rawinput.type == RIM_TYPEKEYBOARD) - { - if (size != sizeof(RAWKEYBOARD)) return FALSE; - rawinput->data.keyboard = *(RAWKEYBOARD *)(msg_data + 1); - } - else if (msg_data->rawinput.type == RIM_TYPEHID) - { - RAWHID *hid = (RAWHID *)(msg_data + 1); - if (size < offsetof(RAWHID, bRawData[0])) return FALSE; - if (size != offsetof(RAWHID, bRawData[hid->dwCount * hid->dwSizeHid])) return FALSE; - memcpy( &rawinput->data.hid, msg_data + 1, size ); - } - else - { - FIXME( "Unhandled rawinput type %#x.\n", msg_data->rawinput.type ); - return FALSE; - } - - return TRUE; -} - struct device { HANDLE file; @@ -552,69 +507,83 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade /********************************************************************** * NtUserGetRawInputData (win32u.@) */ -UINT WINAPI NtUserGetRawInputData( HRAWINPUT rawinput, UINT command, void *data, UINT *data_size, UINT header_size ) +UINT WINAPI NtUserGetRawInputData( HRAWINPUT handle, UINT command, void *data, UINT *data_size, UINT header_size ) { - struct rawinput_thread_data *thread_data; - UINT size; - - TRACE( "rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", - rawinput, command, data, data_size, header_size ); + struct user_thread_info *thread_info = get_user_thread_info(); + struct hardware_msg_data *msg_data; + RAWINPUT *rawinput = data; + UINT size = 0; - if (!(thread_data = get_rawinput_thread_data())) - { - RtlSetLastWin32Error( ERROR_OUTOFMEMORY ); - return ~0u; - } + TRACE( "handle %p, command %#x, data %p, data_size %p, header_size %u.\n", + handle, command, data, data_size, header_size ); - if (!rawinput || thread_data->hw_id != (UINT_PTR)rawinput) + if (!(msg_data = thread_info->rawinput) || msg_data->hw_id != (UINT_PTR)handle) { RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); - return ~0u; + return -1; } if (header_size != sizeof(RAWINPUTHEADER)) { WARN( "Invalid structure size %u.\n", header_size ); RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); - return ~0u; - } - - switch (command) - { - case RID_INPUT: - size = thread_data->buffer->header.dwSize; - break; - - case RID_HEADER: - size = sizeof(RAWINPUTHEADER); - break; - - default: - RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); - return ~0u; + return -1; } + if (command != RID_HEADER && command != RID_INPUT) goto failed; + if (command == RID_INPUT) size = msg_data->size - sizeof(*msg_data); if (!data) { - *data_size = size; + *data_size = sizeof(RAWINPUTHEADER) + size; return 0; } - if (*data_size < size) + if (*data_size < sizeof(RAWINPUTHEADER) + size) { RtlSetLastWin32Error( ERROR_INSUFFICIENT_BUFFER ); - return ~0u; + return -1; + } + + rawinput->header.dwType = msg_data->rawinput.type; + rawinput->header.dwSize = sizeof(RAWINPUTHEADER) + msg_data->size - sizeof(*msg_data); + rawinput->header.hDevice = UlongToHandle( msg_data->rawinput.device ); + rawinput->header.wParam = msg_data->rawinput.wparam; + if (command == RID_HEADER) return sizeof(RAWINPUTHEADER); + + if (msg_data->rawinput.type == RIM_TYPEMOUSE) + { + if (size != sizeof(RAWMOUSE)) goto failed; + rawinput->data.mouse = *(RAWMOUSE *)(msg_data + 1); + } + else if (msg_data->rawinput.type == RIM_TYPEKEYBOARD) + { + if (size != sizeof(RAWKEYBOARD)) goto failed; + rawinput->data.keyboard = *(RAWKEYBOARD *)(msg_data + 1); + } + else if (msg_data->rawinput.type == RIM_TYPEHID) + { + RAWHID *hid = (RAWHID *)(msg_data + 1); + if (size < offsetof(RAWHID, bRawData[0])) goto failed; + if (size != offsetof(RAWHID, bRawData[hid->dwCount * hid->dwSizeHid])) goto failed; + memcpy( &rawinput->data.hid, msg_data + 1, size ); + } + else + { + FIXME( "Unhandled rawinput type %#x.\n", msg_data->rawinput.type ); + goto failed; } - memcpy( data, thread_data->buffer, size ); - return size; + + return rawinput->header.dwSize; + +failed: + WARN( "Invalid command %u or data size %u.\n", command, size ); + RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); + return -1; } BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) { - struct rawinput_thread_data *thread_data; - - if (!(thread_data = get_rawinput_thread_data())) - return FALSE; + struct user_thread_info *thread_info = get_user_thread_info(); if (msg->message == WM_INPUT_DEVICE_CHANGE) { @@ -624,9 +593,10 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d } else { - thread_data->buffer->header.dwSize = RAWINPUT_BUFFER_SIZE; - if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) return FALSE; - thread_data->hw_id = hw_id; + struct hardware_msg_data *tmp; + if (!(tmp = realloc( thread_info->rawinput, msg_data->size ))) return FALSE; + memcpy( tmp, msg_data, msg_data->size ); + thread_info->rawinput = tmp; msg->lParam = (LPARAM)hw_id; }

1 0

Alexandre Julliard : uxtheme: Use BOOLEAN instead of BOOL in ordinal functions.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 3bd1d1c60d10e96caef40dae6dde8da5f9d03da7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bd1d1c60d10e96caef40dae6dde8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 11:48:46 2024 +0100 uxtheme: Use BOOLEAN instead of BOOL in ordinal functions. This should fix test failures on Windows. --- dlls/uxtheme/system.c | 8 ++++---- dlls/uxtheme/tests/system.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 3c0eb3c66f4..371e23b5474 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1268,7 +1268,7 @@ void WINAPI RefreshImmersiveColorPolicyState(void) * RETURNS * Whether or not the system should use dark mode. */ -BOOL WINAPI ShouldSystemUseDarkMode(void) +BOOLEAN WINAPI ShouldSystemUseDarkMode(void) { DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); @@ -1285,7 +1285,7 @@ BOOL WINAPI ShouldSystemUseDarkMode(void) * RETURNS * Whether or not apps should use dark mode. */ -BOOL WINAPI ShouldAppsUseDarkMode(void) +BOOLEAN WINAPI ShouldAppsUseDarkMode(void) { DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); @@ -1300,7 +1300,7 @@ BOOL WINAPI ShouldAppsUseDarkMode(void) * AllowDarkModeForWindow (UXTHEME.133) * */ -BOOL WINAPI AllowDarkModeForWindow(HWND hwnd, BOOL allow) +BOOLEAN WINAPI AllowDarkModeForWindow(HWND hwnd, BOOLEAN allow) { FIXME("%p %d: stub\n", hwnd, allow); return FALSE; @@ -1320,7 +1320,7 @@ int WINAPI SetPreferredAppMode(int app_mode) * IsDarkModeAllowedForWindow (UXTHEME.137) * */ -BOOL WINAPI IsDarkModeAllowedForWindow(HWND hwnd) +BOOLEAN WINAPI IsDarkModeAllowedForWindow(HWND hwnd) { FIXME("%p: stub\n", hwnd); return FALSE; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 36740fe2664..30c5fbce161 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -50,8 +50,8 @@ static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, DWORD *); -static BOOL (WINAPI *pShouldSystemUseDarkMode)(void); -static BOOL (WINAPI *pShouldAppsUseDarkMode)(void); +static BOOLEAN (WINAPI *pShouldSystemUseDarkMode)(void); +static BOOLEAN (WINAPI *pShouldAppsUseDarkMode)(void); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -2680,7 +2680,7 @@ static void test_theme(void) static void test_ShouldSystemUseDarkMode(void) { DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; - BOOL result; + BOOLEAN result; LSTATUS ls; if (!pShouldSystemUseDarkMode) @@ -2709,7 +2709,7 @@ static void test_ShouldSystemUseDarkMode(void) static void test_ShouldAppsUseDarkMode(void) { DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; - BOOL result; + BOOLEAN result; LSTATUS ls; if (!pShouldAppsUseDarkMode)

1 0

Alexandre Julliard : gdi32/tests: Fix the expected GetTextMetrics() results on recent Windows.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 525835897b9378ec736e60e6898a9c9ffd597ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/525835897b9378ec736e60e6898a9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 12:34:04 2024 +0100 gdi32/tests: Fix the expected GetTextMetrics() results on recent Windows. --- dlls/gdi32/tests/font.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 76ea0ac7de7..0513c2b2ca8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6527,7 +6527,7 @@ static void test_max_height(void) DeleteObject(SelectObject(hdc, hfont_old)); /* test the largest value */ - lf.lfHeight = -((1 << 16) - 1); + lf.lfHeight = -((1 << 14) - 1); hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); memset(&tm, 0, sizeof(tm)); @@ -6547,12 +6547,15 @@ static void test_max_height(void) hfont_old = SelectObject(hdc, hfont); memset(&tm, 0, sizeof(tm)); r = GetTextMetricsA(hdc, &tm); - ok(r, "GetTextMetrics failed\n"); - ok(tm.tmHeight == tm1.tmHeight, - "expected 1 ppem value (%ld), got %ld\n", tm1.tmHeight, tm.tmHeight); - ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, - "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); - DeleteObject(SelectObject(hdc, hfont_old)); + if (r) + { + ok(r, "GetTextMetrics failed\n"); + ok(tm.tmHeight == tm1.tmHeight, + "expected 1 ppem value (%ld), got %ld\n", tm1.tmHeight, tm.tmHeight); + ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, + "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); + DeleteObject(SelectObject(hdc, hfont_old)); + } winetest_pop_context(); }

1 0