February 2021 - Wine-devel - list.winehq.org

[PATCH v2 resend 1/2] user32/tests: Add display DC bitmap tests.
by Zhiyi Zhang 02 Feb '21

02 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 198913~198914. Remove a todo_wine for a test that succeeds now. v2 resend: Supersede 198919~198920. 198920 seems to be mistakenly marked as superseded. Thus the resend. dlls/user32/tests/monitor.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..926b288da11 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -1995,7 +2000,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2023,6 +2031,29 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + ok_(__FILE__, line)(ret || broken(!ret), /* <= Win7 */ "GetObjectA failed, error %#x.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), + "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) -- 2.27.0

1 0

[PATCH] include: Pack HID_DESCRIPTOR.
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/ddk/hidport.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ddk/hidport.h b/include/ddk/hidport.h index 3ebe273583b..2c881c87921 100644 --- a/include/ddk/hidport.h +++ b/include/ddk/hidport.h @@ -49,6 +49,7 @@ typedef struct _HID_DEVICE_ATTRIBUTES USHORT Reserved[11]; } HID_DEVICE_ATTRIBUTES, *PHID_DEVICE_ATTRIBUTES; +#include <pshpack1.h> typedef struct _HID_DESCRIPTOR { UCHAR bLength; @@ -62,6 +63,7 @@ typedef struct _HID_DESCRIPTOR USHORT wReportLength; } DescriptorList[1]; } HID_DESCRIPTOR, *PHID_DESCRIPTOR; +#include <poppack.h> #define HID_HID_DESCRIPTOR_TYPE 0x21 #define HID_REPORT_DESCRIPTOR_TYPE 0x22 -- 2.20.1

1 0

[PATCH] winebus.sys: Fix the definition of ABS_TO_HID_MAP.
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winebus.sys/bus_udev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1473579c72c..74cf6a28a1a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -141,6 +141,11 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELERATOR}, /*ABS_GAS*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ + {0,0}, + {0,0}, + {0,0}, + {0,0}, + {0,0}, {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ {0,0}, /*ABS_HAT1X*/ @@ -160,6 +165,7 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ }; #define HID_ABS_MAX (ABS_VOLUME+1) +C_ASSERT(ARRAY_SIZE(ABS_TO_HID_MAP) == HID_ABS_MAX); #define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) static const BYTE REL_TO_HID_MAP[][2] = { -- 2.20.1

1 0

[PATCH] ntoskrnl: Do not destroy the device list in enumerate_new_device().
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6a0e82ec0e2..713e469ee7e 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -336,7 +336,6 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) && !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) { ERR("Failed to create or open device %s, error %#x.\n", debugstr_w(device_instance_id), GetLastError()); - SetupDiDestroyDeviceInfoList( set ); return; } @@ -353,10 +352,7 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) } if (need_driver && !install_device_driver( device, set, &sp_device )) - { - SetupDiDestroyDeviceInfoList( set ); return; - } start_device( device, set, &sp_device ); } -- 2.20.1

1 0

[PATCH 1/5] winegstreamer: Move the "push_thread" field to struct wg_parser.
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 734984d7fed..21d6e324add 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -53,6 +53,8 @@ struct wg_parser GstPad *my_src, *their_sink; guint64 file_size, start_offset, next_offset, stop_offset; + + pthread_t push_thread; }; struct parser @@ -82,8 +84,6 @@ struct parser pthread_cond_t init_cond; bool no_more_pads, has_duration, error; - pthread_t push_thread; - HANDLE read_thread; pthread_cond_t read_cond, read_done_cond; struct @@ -635,7 +635,7 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) gboolean flush; guint32 seqnum; GstEvent *tevent; - BOOL thread = !!This->push_thread; + BOOL thread = !!parser->push_thread; gst_event_parse_seek(event, &rate, &seek_format, &flags, &cur_type, &cur, &stop_type, &stop); @@ -1436,19 +1436,19 @@ static gboolean activate_push(GstPad *pad, gboolean activate) struct wg_parser *parser = This->wg_parser; if (!activate) { - if (This->push_thread) { - pthread_join(This->push_thread, NULL); - This->push_thread = 0; + if (parser->push_thread) { + pthread_join(parser->push_thread, NULL); + parser->push_thread = 0; } if (This->filter.state == State_Stopped) parser->next_offset = parser->start_offset; - } else if (!This->push_thread) { + } else if (!parser->push_thread) { int ret; - if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) + if ((ret = pthread_create(&parser->push_thread, NULL, push_data, This))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); - This->push_thread = 0; + parser->push_thread = 0; return FALSE; } } -- 2.30.0

1 4

[PATCH] ntoskrnl.exe: add KdDisableDebugger/KdEnableDebugger stubs
by Austin English 01 Feb '21

01 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50599 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2e6131c32c7..9dc5809614a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4256,6 +4256,18 @@ void WINAPI KeUnstackDetachProcess(KAPC_STATE *apc_state) FIXME("apc_state %p stub.\n", apc_state); } +NTSTATUS WINAPI KdDisableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + +NTSTATUS WINAPI KdEnableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d57a2f81df6..22968913300 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -515,8 +515,8 @@ @ stub IoWriteTransferCount @ extern KdDebuggerEnabled @ stub KdDebuggerNotPresent -@ stub KdDisableDebugger -@ stub KdEnableDebugger +@ stdcall KdDisableDebugger() +@ stdcall KdEnableDebugger() @ stub KdEnteredDebugger @ stub KdPollBreakIn @ stub KdPowerTransition -- 2.28.0

1 0

[PATCH 3/3] msvcrt: Imporve __libm_sse2_sqrt_precise implementation.
by Piotr Caban 01 Feb '21

01 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-)

1 0

[PATCH 1/3] msvcrt: Imporve sqrt accuracy and performance on x86_64.
by Piotr Caban 01 Feb '21

01 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- The goal of this series is to update sqrt functions so it returns the same values and modifies sse/x87 status word in the same way as native ucrtbase. dlls/msvcrt/math.c | 88 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 26 deletions(-)

1 0

[PATCH v2 2/2] winmm/tests: Get rid of unused functions.
by Akihiro Sagawa 01 Feb '21

01 Feb '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 12 ------------ dlls/winmm/tests/winmm_test.h | 1 - 2 files changed, 13 deletions(-)

3 2

[PATCH v2 1/2] winmm/tests: Strictly test returned time format of waveInGetPostion().
by Akihiro Sagawa 01 Feb '21

01 Feb '21

In v2, split the patch into two parts. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/capture.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-)

2 1