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

[PATCH 1/2] user32/tests: Add display DC bitmap tests.
by Zhiyi Zhang 29 Jan '21

29 Jan '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 1/3] wineboot: Set the NXSupportPolicy member of the user shared data to NX_SUPPORT_POLICY_OPTIN.
by Zebediah Figura 29 Jan '21

29 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I have been unable to locate a program that requires these. (However, due to ease of implementation, and the fact that the ntdll side of ProcessExecuteFlags is already implemented, I am inclined to believe that they're worth implementing anyway.) programs/wineboot/wineboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..9427448b612 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -291,6 +291,7 @@ static void create_user_shared_data(void) data->NtMinorVersion = version.dwMinorVersion; data->SuiteMask = version.wSuiteMask; data->NumberOfPhysicalPages = sbi.MmNumberOfPhysicalPages; + data->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; wcscpy( data->NtSystemRoot, L"C:\\windows" ); features = data->ProcessorFeatures; -- 2.30.0

1 2

[tools] testbot/TestWTBS: Automatically check the 'Task:' build and wine lines.
by Francois Gouget 29 Jan '21

29 Jan '21

The automatic checks only cover the simple cases which is the majority, thus allowing to simplify the TestWTBS directives. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 6f78406ad..bc4e0d9ba 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -362,14 +362,43 @@ sub LoadTestInfo($) foreach my $TaskType (@$TaskTypes) { my $TaskInfo = $TestInfo->{$TaskType}; - if (!defined $TaskInfo->{$Field}) - { - $TaskInfo->{$Field} = $SrcVal; - } + next if (defined $TaskInfo->{$Field}); + # Copy arrays to avoid side-effects when adding built-in defaults + $TaskInfo->{$Field} = ref($SrcVal) eq "ARRAY" ? [ @$SrcVal ] : $SrcVal; } } } + # Automatically check the Task: lines in simple cases + # Make sure no test is run for build tasks + my $GrepV = ($TestInfo->{build}->{"report.GrepV"} ||= []); + push @$GrepV, '.'; + $GrepV = ($TestInfo->{build}->{"log.GrepV"} ||= []); + push @$GrepV, '^Task: tests$'; + if (($TestInfo->{build}->{Status} || "") =~ /^bad(?:build|patch)$/ or + $TestInfo->{build}->{HasTimeout}) + { + push @$GrepV, '^Task: ok$'; + } + else + { + my $Grep = ($TestInfo->{build}->{"log.Grep"} ||= []); + push @$Grep, '^Task: ok$'; + } + + # Note: Depending on where the timeout occurs, the wine task log may or + # may not have a 'Task: ok' line. + if (($TestInfo->{wine}->{Status} || "") eq "completed" and + !$TestInfo->{wine}->{HasTimeout}) + { + my $Grep = ($TestInfo->{wine}->{"log.Grep"} ||= []); + if (CheckValue($TestInfo->{wine}->{TestUnits})) + { + push @$Grep, '^Task: tests$'; + } + push @$Grep, '^Task: ok$'; + } + # Validate and fix the Grep* fields foreach my $GrepType ("Grep", "GrepV") { -- 2.20.1

1 0

MAXPNAMELEN
by Doug Kingston 29 Jan '21

29 Jan '21

dlls/include/mmsystem.h:#define MAXPNAMELEN 32 /* max product name length (including NULL) */ I wanted to know what the reason was for bounding this string to only 32 bytes (actually 31 + null). We have a situation with identical devices and need to add some differentiating text to that string when multiple identical devices exist so that applications can choose the correct device. Our device product string is "USB PnP Sound Device" (20 chars). mmdevdrv.c:static WCHAR *construct_device_id() then prefixs with either "In: " (4 chars) or "Out: " (5 chars) and concatenates " - USB" (6 chars). In: USB PnP Sound Device - USB Out: USB PnP Sound Device - USB Total string length is 30 or 31 characters. Any additional text added at the end will get truncated and a prefix will cause the existing string to be truncated. -Doug-

3 2

[PATCH 1/4] winegstreamer: Do not flush the upstream source pin in activate_push().
by Zebediah Figura 29 Jan '21

29 Jan '21

We don't do this in pull mode (and in general never have; avidemux and wavparse are two examples of GStreamer elements that don't flush the upstream pad when deactivating). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a4d49c75a1b..b2a20934837 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1424,12 +1424,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); - IAsyncReader_BeginFlush(This->reader); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; } - IAsyncReader_EndFlush(This->reader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) { -- 2.30.0

1 3

[PATCH 1/2] loader: On Mac, move the top-down allocations area down to avoid Rosetta regions.
by Brendan Shanks 28 Jan '21

28 Jan '21

On Apple Silicon, Rosetta's shared cache starts at 0x7ffe00000000 and the runtime is mapped below that. Put the top-down allocation area below the runtime with plenty of room to spare. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 43dc6b2b7e6..d86675538bb 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -79,7 +79,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ - { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ -- 2.26.2

1 1

[PATCH] secur32: implement the SECPKG_ATTR_UNIQUE_BINDINGS context attribute
by Damjan Jovanovic 28 Jan '21

28 Jan '21

.NET's System.Data.SqlClient needs this to connect to MSSQL Server. A MacOSX implementation doesn't appear to be possible. Try 3 uses free() instead of gnutls_free(), and prints a FIXME on MacOS. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/secur32/schannel.c | 7 +++++++ dlls/secur32/schannel_gnutls.c | 37 ++++++++++++++++++++++++++++++++++ dlls/secur32/schannel_macosx.c | 7 +++++++ dlls/secur32/secur32_priv.h | 2 ++ dlls/secur32/tests/schannel.c | 26 ++++++++++++++++++++++++ 5 files changed, 79 insertions(+)

2 1

[PATCH 1/4] include: Add IWMPRemoteMediaServices interface to wmp.idl.
by Rémi Bernon 28 Jan '21

28 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wmp.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/wmp.idl b/include/wmp.idl index 442b7021383..8a146bdbea9 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -360,6 +360,22 @@ library WMPLib { HRESULT playItem([in] IWMPMedia *pIWMPMedia); } + [ + odl, + uuid(cbb92747-741f-44fe-ab5b-f1a48f3b2a59), + oleautomation + ] + interface IWMPRemoteMediaServices : IUnknown + { + HRESULT GetServiceType([out, retval] BSTR *type); + + HRESULT GetApplicationName([out, retval] BSTR *name); + + HRESULT GetScriptableObject([out, retval] BSTR *name, [out, retval] IDispatch **out); + + HRESULT GetCustomUIMode([out, retval] BSTR *file); + } + [ odl, uuid(9104d1ab-80c9-4fed-abf0-2e6417a6df14), -- 2.30.0

1 3

[PATCH] cmd: Match the Windows ver output.
by Francois Gouget 28 Jan '21

28 Jan '21

Some programs parse this string to get the Windows version! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- cmd seems to use the same string for "cmd /c ver" and the first line of "cmd /?". On Windows 10 neither string is translated in the locales I checked (French, Japanese, Chinese, Hebrew). That does not prove it's never translated but it does look like it isn't. So maybe that justifies moving the string out of the resource file so it does not appear in the PO files. If so I can resubmit a modified version. programs/cmd/cmd.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/cmd.rc b/programs/cmd/cmd.rc index fa604a6db56..04401dc4886 100644 --- a/programs/cmd/cmd.rc +++ b/programs/cmd/cmd.rc @@ -393,7 +393,7 @@ Enter HELP <command> for further information on any of the above commands.\n" WCMD_NOPATH, "PATH not found\n" WCMD_ANYKEY,"Press any key to continue... " WCMD_CONSTITLE,"Wine Command Prompt" - WCMD_VERSION,"Microsoft Windows %1!S!\n" + WCMD_VERSION,"Microsoft Windows [Version %1!S!]\n" WCMD_MOREPROMPT, "More? " WCMD_LINETOOLONG, "The input line is too long.\n" WCMD_VOLUMELABEL, "Volume in drive %1!c! is %2\n" -- 2.20.1

2 2

[PATCH vkd3d 1/6] vkd3d: Fix typo in WARN() message.
by Matteo Bruni 28 Jan '21

28 Jan '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e5c6791..8b84451 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -195,7 +195,7 @@ static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *que { unsigned int i; - WARN("Ressetting sequence number for queue %p.\n", queue); + WARN("Resetting sequence number for queue %p.\n", queue); queue->completed_sequence_number = 0; queue->submitted_sequence_number = 1; -- 2.26.2

5 18