July 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Use proper absolute paths for registry keys.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: wine Branch: master Commit: c6d96400076fd907378f8f2817d99ff4a4b1e9f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d96400076fd907378f8f28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 4 14:38:35 2022 +0200 ntdll: Use proper absolute paths for registry keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 10 ++-------- dlls/ntdll/unix/env.c | 6 ++++-- dlls/ntdll/unix/system.c | 3 ++- dlls/ntdll/version.c | 8 ++++---- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d750f7a7579..20a96664825 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3488,13 +3488,7 @@ static NTSTATUS query_string_option( HANDLE hkey, LPCWSTR name, ULONG type, NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LPCWSTR value, ULONG type, void *data, ULONG in_size, ULONG *out_size ) { - static const WCHAR optionsW[] = {'M','a','c','h','i','n','e','\\', - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','m','a','g','e',' ','F','i','l','e',' ', - 'E','x','e','c','u','t','i','o','n',' ','O','p','t','i','o','n','s','\\'}; + static const WCHAR optionsW[] = L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"; WCHAR path[MAX_PATH + ARRAY_SIZE( optionsW )]; OBJECT_ATTRIBUTES attr; UNICODE_STRING name_str; @@ -3932,7 +3926,7 @@ static void load_global_options(void) attr.Attributes = OBJ_CASE_INSENSITIVE; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &name_str, L"Machine\\System\\CurrentControlSet\\Control\\Session Manager" ); + RtlInitUnicodeString( &name_str, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager" ); if (!NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) { diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f69e4e80f0d..161367e354f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1725,11 +1725,13 @@ static ULONG get_dword_option( HANDLE key, const WCHAR *name, ULONG defval ) */ static void load_global_options( const UNICODE_STRING *image ) { - static const WCHAR optionsW[] = {'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\', + static const WCHAR optionsW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'I','m','a','g','e',' ','F','i','l','e',' ','E','x','e','c','u','t','i','o','n',' ','O','p','t','i','o','n','s',0}; - static const WCHAR sessionW[] = {'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + static const WCHAR sessionW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 0df20aff3d5..f374fdec131 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2115,7 +2115,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; static const WCHAR tziW[] = { 'T','Z','I',0 }; - static const WCHAR Time_ZonesW[] = { 'M','a','c','h','i','n','e','\\', + static const WCHAR Time_ZonesW[] = { '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 492c24cc636..b9eabb31154 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -264,7 +264,7 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, L"Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion" ); + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion" ); if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) return FALSE; @@ -311,7 +311,7 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) /* get service pack version */ - RtlInitUnicodeString( &nameW, L"Machine\\System\\CurrentControlSet\\Control\\Windows" ); + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Windows" ); if (!NtOpenKey( &hkey2, KEY_ALL_ACCESS, &attr )) { RtlInitUnicodeString( &valueW, L"CSDVersion" ); @@ -329,7 +329,7 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) /* get product type */ - RtlInitUnicodeString( &nameW, L"Machine\\System\\CurrentControlSet\\Control\\ProductOptions" ); + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\ProductOptions" ); if (!NtOpenKey( &hkey2, KEY_ALL_ACCESS, &attr )) { RtlInitUnicodeString( &valueW, L"ProductType" ); @@ -373,7 +373,7 @@ static BOOL get_win9x_registry_version( RTL_OSVERSIONINFOEXW *version ) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, L"Machine\\Software\\Microsoft\\Windows\\CurrentVersion" ); + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Windows\\CurrentVersion" ); if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) return FALSE;

1 0

Francois Gouget : testbot/web: Only show the date for the latest failures occurrence.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: tools Branch: master Commit: 707ab709652a124a95b2305de72d126dd7ee34cd URL: https://source.winehq.org/git/tools.git/?a=commit;h=707ab709652a124a95b2305… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 4 17:07:51 2022 +0200 testbot/web: Only show the date for the latest failures occurrence. This limits line wrapping in the failures list. This adds ValueFormatter::GenerateDateTipTime(). As usual the time is shown as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 53 ++++++++++++++++++++++++++- testbot/web/FailuresList.pl | 1 + testbot/web/WineTestBot.css | 1 + testbot/web/js/datetime.js | 12 ++++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 49bf8565..343c61c7 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -23,7 +23,8 @@ package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime - GenerateDayTimeTipDate GenerateTimeTipDate GenerateValueHTML); + GenerateDayTimeTipDate GenerateTimeTipDate GenerateDateTipTime + GenerateValueHTML); use POSIX qw(strftime); @@ -238,6 +239,51 @@ sub GenerateTimeTipDate($;$$) } } +=pod +=over 12 + +=item C<GenerateDateTipTime()> + +Show the timestamp's date with the time as a tooltip. + +The timestamp is shown in the user's timezone if JavaScript is available and +in the server's timezone otherwise. + +The default for TagAttrs is 'a' and it should always be a tag that shows the +content of the title attribute as a tooltip. + +See GenerateDateTime() for more details. + +=back +=cut + +sub GenerateDateTipTime($;$$) +{ + my ($Sec1970, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "a"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}datetiptime' timestamp='$Sec1970' ", + strftime("title='%H:%M:%S'>%Y-%m-%d", localtime($Sec1970)), + "</$Tag>"; + } + else + { + print " "; + } +} + # # Property value formatting @@ -303,6 +349,11 @@ sub GenerateValueHTML($$$;$) GenerateDayTimeTipDate($Value); return; } + if ($Format eq "datetiptime") + { + GenerateDateTipTime($Value); + return; + } } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index e271ee1d..2cb40c48 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -56,6 +56,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp)$/ ? "" : + $PropertyName =~ /^Last(?:Old|New)$/ ? ("ro", "datetiptime") : $self->SUPER::DisplayProperty($PropertyDescriptor); } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 5e0c39ff..78d33f88 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -414,6 +414,7 @@ a.title { color:inherit; text-decoration: none; } a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } a.daytimetipdate { color:inherit; text-decoration: none; } +a.datetiptime { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index d21bf5c6..842a6ec3 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -60,6 +60,16 @@ function ShowTimeTipDate(dom) Pad2(dt.getSeconds()); } +function ShowDateTipTime(dom) +{ + const sec1970 = dom.getAttribute("timestamp"); + const dt = new Date(sec1970 * 1000); + dom.setAttribute('title', Pad2(dt.getHours()) +':'+ Pad2(dt.getMinutes()) + +':'+ Pad2(dt.getSeconds())); + dom.innerHTML = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ + Pad2(dt.getDate()); +} + function init() { document.querySelectorAll(".datetime").forEach(dom => { @@ -73,6 +83,8 @@ function init() }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); + document.querySelectorAll(".datetiptime").forEach(dom => { + ShowDateTipTime(dom); }); }

1 0

Francois Gouget : testbot: Also identify Failure test units on unhandled exception lines.
by Alexandre Julliard 04 Jul '22

04 Jul '22

Module: tools Branch: master Commit: 8bb8de5a5f9be971e1a66f899044f04308d54006 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8bb8de5a5f9be971e1a66f8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 4 18:10:09 2022 +0200 testbot: Also identify Failure test units on unhandled exception lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 41016314..3de2f12c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1408,7 +1408,9 @@ sub MatchLogFailures($$) foreach my $ErrIndex (0..$#{$Group->{Errors}}) { my $Line = $Group->{Errors}->[$ErrIndex]; - my $TestUnit = $Line =~ /^([_a-z0-9]+)\.c:\d+:/ ? $1 : ""; + my $TestUnit = $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* / ? $1 : + $Line =~ /^[0-9a-f]+:([_a-z0-9]+):[0-9.]* unhandled exception / ? $1 : + ""; my $UnitFailures = $FailureTree{$GroupName}->{$TestUnit}; next if (!$UnitFailures);

1 0

Alexandre Julliard : Wine release 7.12
by Alexandre Julliard 01 Jul '22

01 Jul '22

Module: website Branch: master Commit: b8b9eb6b2ef64af63353336f0275bed48bc24e62 URL: https://source.winehq.org/git/website.git/?a=commit;h=b8b9eb6b2ef64af633533… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 21:02:41 2022 +0200 Wine release 7.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022070101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022070101.xml b/news/en/2022070101.xml new file mode 100644 index 00000000..952839b7 --- /dev/null +++ b/news/en/2022070101.xml @@ -0,0 +1,17 @@ +<news> +<date>July 1, 2022</date> +<title>Wine 7.12 Released</title> +<body> + The Wine development release 7.12 is now available. + <a href="{$root}/announce/7.12">What's new</a> in this release: +<ul> + <li>Theming support for Qt5 applications.</li> + <li>Bundled vkd3d upgraded to version 1.4.</li> + <li>Improved effect support in Direct2D.</li> + <li>QWORD support in registry tools.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.12.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 7.12.
by Alexandre Julliard 01 Jul '22

01 Jul '22

Module: wine Branch: master Commit: b2bf7b6b899dc18d092deebb0356a909db656ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2bf7b6b899dc18d092deebb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 21:00:33 2022 +0200 Release 7.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 721 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 354 insertions(+), 390 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2bf7b6b899dc18d092d…

1 0

Tag wine-7.12 : Alexandre Julliard : Release 7.12
by Alexandre Julliard 01 Jul '22

01 Jul '22

Module: wine Branch: refs/tags/wine-7.12 Tag: 114d8b4ffb5db9bf4079675148b77c92840452a4 URL: https://source.winehq.org/git/wine.git/?a=tag;h=114d8b4ffb5db9bf4079675148b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 21:00:33 2022 +0200 Release 7.12

1 0

Alexandre Julliard : ntdll: Add atan2.
by Alexandre Julliard 01 Jul '22

01 Jul '22

Module: wine Branch: master Commit: 49f8704aac554de2b06b4d6120f21dfc91d3ed6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f8704aac554de2b06b4d61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 16:27:42 2022 +0200 ntdll: Add atan2. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 74 insertions(+) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index e6de9e67c1f..aeed5d31696 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -1173,6 +1173,79 @@ double CDECL atan( double x ) return sign ? -z : z; } +/********************************************************************* + * atan2 (NTDLL.@) + * + * Copied from musl: src/math/atan2.c + */ +double CDECL atan2( double y, double x ) +{ + static const double pi = 3.1415926535897931160E+00, + pi_lo = 1.2246467991473531772E-16; + + double z; + unsigned int m, lx, ly, ix, iy; + + if (isnan(x) || isnan(y)) + return x+y; + ix = *(ULONGLONG*)&x >> 32; + lx = *(ULONGLONG*)&x; + iy = *(ULONGLONG*)&y >> 32; + ly = *(ULONGLONG*)&y; + if (((ix - 0x3ff00000) | lx) == 0) /* x = 1.0 */ + return atan(y); + m = ((iy >> 31) & 1) | ((ix >> 30) & 2); /* 2*sign(x)+sign(y) */ + ix = ix & 0x7fffffff; + iy = iy & 0x7fffffff; + + /* when y = 0 */ + if ((iy | ly) == 0) { + switch(m) { + case 0: + case 1: return y; /* atan(+-0,+anything)=+-0 */ + case 2: return pi; /* atan(+0,-anything) = pi */ + case 3: return -pi; /* atan(-0,-anything) =-pi */ + } + } + /* when x = 0 */ + if ((ix | lx) == 0) + return m & 1 ? -pi / 2 : pi / 2; + /* when x is INF */ + if (ix == 0x7ff00000) { + if (iy == 0x7ff00000) { + switch(m) { + case 0: return pi / 4; /* atan(+INF,+INF) */ + case 1: return -pi / 4; /* atan(-INF,+INF) */ + case 2: return 3 * pi / 4; /* atan(+INF,-INF) */ + case 3: return -3 * pi / 4; /* atan(-INF,-INF) */ + } + } else { + switch(m) { + case 0: return 0.0; /* atan(+...,+INF) */ + case 1: return -0.0; /* atan(-...,+INF) */ + case 2: return pi; /* atan(+...,-INF) */ + case 3: return -pi; /* atan(-...,-INF) */ + } + } + } + /* |y/x| > 0x1p64 */ + if (ix + (64 << 20) < iy || iy == 0x7ff00000) + return m & 1 ? -pi / 2 : pi / 2; + + /* z = atan(|y/x|) without spurious underflow */ + if ((m & 2) && iy + (64 << 20) < ix) /* |y/x| < 0x1p-64, x<0 */ + z = 0; + else + z = atan(fabs(y / x)); + switch (m) { + case 0: return z; /* atan(+,+) */ + case 1: return -z; /* atan(-,+) */ + case 2: return pi - (z - pi_lo); /* atan(+,-) */ + default: /* case 3 */ + return (z - pi_lo) - pi; /* atan(-,-) */ + } +} + /********************************************************************* * ceil (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ac1936117f7..1862358e593 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1567,6 +1567,7 @@ @ cdecl _wtol(wstr) @ cdecl abs(long) @ cdecl atan(double) +@ cdecl atan2(double double) @ cdecl atoi(str) @ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr)

1 0

Giovanni Mascellani : mfplat/buffer: Deduplicate common code between Lock2D() and Lock2DSize().
by Alexandre Julliard 01 Jul '22

01 Jul '22

Module: wine Branch: master Commit: 2f83de8cffdc059fb9e3db9b86a9a98b1f299b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f83de8cffdc059fb9e3db9b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 29 11:47:21 2022 +0200 mfplat/buffer: Deduplicate common code between Lock2D() and Lock2DSize(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 101 +++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a7ba306223d..e3d38438b88 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -655,18 +655,11 @@ static const IMF2DBuffer2Vtbl memory_2d_buffer_vtbl = memory_2d_buffer_Copy2DTo, }; -static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +static HRESULT d3d9_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFlags flags, BYTE **scanline0, + LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - - if (!scanline0 || !pitch) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; else if (!buffer->_2d.locks) @@ -679,8 +672,29 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca buffer->_2d.locks++; *scanline0 = buffer->d3d9_surface.rect.pBits; *pitch = buffer->d3d9_surface.rect.Pitch; + if (buffer_start) + *buffer_start = *scanline0; + if (buffer_length) + *buffer_length = buffer->d3d9_surface.rect.Pitch * buffer->_2d.height; } + return hr; +} + +static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +{ + struct buffer *buffer = impl_from_IMF2DBuffer2(iface); + HRESULT hr; + + TRACE("%p, %p, %p.\n", iface, scanline0, pitch); + + if (!scanline0 || !pitch) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + hr = d3d9_surface_buffer_lock(buffer, MF2DBuffer_LockFlags_ReadWrite, scanline0, pitch, NULL, NULL); + LeaveCriticalSection(&buffer->cs); return hr; @@ -744,7 +758,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr = S_OK; + HRESULT hr; TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); @@ -753,23 +767,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu EnterCriticalSection(&buffer->cs); - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks) - { - hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0); - } - - if (SUCCEEDED(hr)) - { - buffer->_2d.locks++; - *scanline0 = buffer->d3d9_surface.rect.pBits; - *pitch = buffer->d3d9_surface.rect.Pitch; - if (buffer_start) - *buffer_start = *scanline0; - if (buffer_length) - *buffer_length = buffer->d3d9_surface.rect.Pitch * buffer->_2d.height; - } + hr = d3d9_surface_buffer_lock(buffer, flags, scanline0, pitch, buffer_start, buffer_length); LeaveCriticalSection(&buffer->cs); @@ -1030,18 +1028,11 @@ static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface return S_OK; } -static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFlags flags, + BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - - if (!scanline0 || !pitch) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; else if (!buffer->_2d.locks++) @@ -1051,8 +1042,29 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca { *scanline0 = buffer->dxgi_surface.map_desc.pData; *pitch = buffer->dxgi_surface.map_desc.RowPitch; + if (buffer_start) + *buffer_start = *scanline0; + if (buffer_length) + *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; } + return hr; +} + +static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +{ + struct buffer *buffer = impl_from_IMF2DBuffer2(iface); + HRESULT hr; + + TRACE("%p, %p, %p.\n", iface, scanline0, pitch); + + if (!scanline0 || !pitch) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + hr = dxgi_surface_buffer_lock(buffer, MF2DBuffer_LockFlags_ReadWrite, scanline0, pitch, NULL, NULL); + LeaveCriticalSection(&buffer->cs); return hr; @@ -1113,7 +1125,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr = S_OK; + HRESULT hr; TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); @@ -1122,20 +1134,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu EnterCriticalSection(&buffer->cs); - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) - hr = dxgi_surface_buffer_map(buffer); - - if (SUCCEEDED(hr)) - { - *scanline0 = buffer->dxgi_surface.map_desc.pData; - *pitch = buffer->dxgi_surface.map_desc.RowPitch; - if (buffer_start) - *buffer_start = *scanline0; - if (buffer_length) - *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; - } + hr = dxgi_surface_buffer_lock(buffer, flags, scanline0, pitch, buffer_start, buffer_length); LeaveCriticalSection(&buffer->cs);

1 0

Giovanni Mascellani : mfplat/tests: Remove duplicated tests.
by Alexandre Julliard 01 Jul '22

01 Jul '22

Module: wine Branch: master Commit: 0a78a9f56d35e2c03913ea7a5dc8f98294f89ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a78a9f56d35e2c03913ea7a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 29 11:47:22 2022 +0200 mfplat/tests: Remove duplicated tests. The same tests are already performed in test_MFGetPlaneSize(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index deed2408a41..7b5e4d1c680 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4318,7 +4318,6 @@ image_size_tests[] = static void test_MFCalculateImageSize(void) { - DWORD plane_size; unsigned int i; UINT32 size; HRESULT hr; @@ -4340,15 +4339,6 @@ static void test_MFCalculateImageSize(void) ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); - - if (pMFGetPlaneSize) - { - unsigned int expected = ptr->plane_size ? ptr->plane_size : ptr->size; - - hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &plane_size); - ok(hr == S_OK, "%u: failed to get plane size, hr %#lx.\n", i, hr); - ok(plane_size == expected, "%u: unexpected plane size %lu, expected %u.\n", i, plane_size, expected); - } } }

1 0

Zebediah Figura : wineusb.sys: Move the libusb_cancel_transfer() call to a new Unix library.
by Alexandre Julliard 01 Jul '22

01 Jul '22

Module: wine Branch: master Commit: e61498c0f2d9df92893b07818ad7843e76f86100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e61498c0f2d9df92893b0781… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 15:41:19 2022 -0500 wineusb.sys: Move the libusb_cancel_transfer() call to a new Unix library. --- dlls/wineusb.sys/Makefile.in | 2 ++ dlls/wineusb.sys/unixlib.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wineusb.sys/unixlib.h | 38 +++++++++++++++++++++++++++++++++ dlls/wineusb.sys/wineusb.c | 21 +++++++++++++++++-- 4 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index 8145213fbef..ee3bfffdbeb 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineusb.sys +UNIXLIB = wineusb.so IMPORTS = ntoskrnl UNIX_LIBS = $(USB_LIBS) UNIX_CFLAGS = $(USB_CFLAGS) @@ -7,6 +8,7 @@ UNIX_CFLAGS = $(USB_CFLAGS) EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin C_SRCS = \ + unixlib.c \ wineusb.c RC_SRCS = wineusb.rc diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c new file mode 100644 index 00000000000..cdc84d98ede --- /dev/null +++ b/dlls/wineusb.sys/unixlib.c @@ -0,0 +1,50 @@ +/* + * libusb backend + * + * Copyright 2020 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include <libusb.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "wine/debug.h" +#include "wine/list.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wineusb); + +static NTSTATUS usb_cancel_transfer(void *args) +{ + const struct usb_cancel_transfer_params *params = args; + int ret; + + if ((ret = libusb_cancel_transfer(params->transfer)) < 0) + ERR("Failed to cancel transfer: %s\n", libusb_strerror(ret)); + + return STATUS_SUCCESS; +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ +#define X(name) [unix_ ## name] = name + X(usb_cancel_transfer), +}; diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h new file mode 100644 index 00000000000..d046062cd5f --- /dev/null +++ b/dlls/wineusb.sys/unixlib.h @@ -0,0 +1,38 @@ +/* + * wineusb Unix library interface + * + * Copyright 2022 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINEUSB_UNIXLIB_H +#define __WINE_WINEUSB_UNIXLIB_H + +#include "windef.h" +#include "winternl.h" +#include "wine/unixlib.h" + +struct usb_cancel_transfer_params +{ + void *transfer; +}; + +enum unix_funcs +{ + unix_usb_cancel_transfer, +}; + +#endif diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 87669b5c65d..1f3435b67a4 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -36,6 +36,8 @@ #include "wine/list.h" #include "wine/unicode.h" +#include "unixlib.h" + WINE_DEFAULT_DEBUG_CHANNEL(wineusb); #ifdef __ASM_USE_FASTCALL_WRAPPER @@ -64,6 +66,8 @@ __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, DECLARE_CRITICAL_SECTION(wineusb_cs); +static unixlib_handle_t unix_handle; + static struct list device_list = LIST_INIT(device_list); struct usb_device @@ -712,9 +716,12 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) for (entry = mark->Flink; entry != mark; entry = entry->Flink) { IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + struct usb_cancel_transfer_params params = + { + .transfer = queued_irp->Tail.Overlay.DriverContext[0], + }; - if ((ret = libusb_cancel_transfer(queued_irp->Tail.Overlay.DriverContext[0])) < 0) - ERR("Failed to cancel transfer: %s\n", libusb_strerror(ret)); + __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); } LeaveCriticalSection(&wineusb_cs); @@ -930,10 +937,20 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { + NTSTATUS status; + void *instance; int err; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + RtlPcToFileHeader(DriverEntry, &instance); + if ((status = NtQueryVirtualMemory(GetCurrentProcess(), instance, + MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL))) + { + ERR("Failed to initialize Unix library, status %#x.\n", status); + return status; + } + driver_obj = driver; if ((err = libusb_init(NULL)))

1 0