wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

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

24 Mar '22

Module: wine Branch: master Commit: d86fda0c700b2af30c5e843dcb47ed6b3bf4a476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86fda0c700b2af30c5e843d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 08:35:24 2022 +0100 ntdll/tests: Enable compilation with long types in threadpool.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 749 +++++++++++++++++++++--------------------- 1 file changed, 375 insertions(+), 374 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d86fda0c700b2af30c5e…

1 0

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

24 Mar '22

Module: wine Branch: master Commit: bd9b459d70a9f7f9dfa9c43244b7e611f74ac5e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9b459d70a9f7f9dfa9c432… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 08:35:17 2022 +0100 ntdll/tests: Enable compilation with long types in thread.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/thread.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index f381f64dbfe..336e0741e93 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" @@ -56,30 +57,30 @@ static void test_dbg_hidden_thread_creation(void) status = pNtCreateThreadEx( &thread, THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_NtCreateThreadEx_proc, NULL, THREAD_CREATE_FLAGS_CREATE_SUSPENDED, 0, 0, 0, NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); dbg_hidden = 0xcc; status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dbg_hidden, sizeof(dbg_hidden), NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); ok( !dbg_hidden, "Got unexpected dbg_hidden %#x.\n", dbg_hidden ); status = NtResumeThread( thread, NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); WaitForSingleObject( thread, INFINITE ); CloseHandle( thread ); status = pNtCreateThreadEx( &thread, THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_NtCreateThreadEx_proc, NULL, THREAD_CREATE_FLAGS_CREATE_SUSPENDED | THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER, 0, 0, 0, NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); dbg_hidden = 0xcc; status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dbg_hidden, sizeof(dbg_hidden), NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); ok( dbg_hidden == 1, "Got unexpected dbg_hidden %#x.\n", dbg_hidden ); status = NtResumeThread( thread, NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); WaitForSingleObject( thread, INFINITE ); CloseHandle( thread ); @@ -97,7 +98,7 @@ static void test_dbg_hidden_thread_creation(void) status = RtlCreateProcessParametersEx( &params, &imageW, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); /* NtCreateUserProcess() may return STATUS_INVALID_PARAMETER with some uninitialized data in create_info. */ memset( &create_info, 0, sizeof(create_info) ); @@ -107,13 +108,13 @@ static void test_dbg_hidden_thread_creation(void) NULL, NULL, 0, THREAD_CREATE_FLAGS_CREATE_SUSPENDED | THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER, params, &create_info, &ps_attr ); - ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx.\n", status ); status = NtCreateUserProcess( &process, &thread, PROCESS_ALL_ACCESS, THREAD_ALL_ACCESS, NULL, NULL, 0, THREAD_CREATE_FLAGS_CREATE_SUSPENDED, params, &create_info, &ps_attr ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); status = NtTerminateProcess( process, 0 ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); CloseHandle( process ); CloseHandle( thread ); }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: wine Branch: master Commit: 0726870f7c21a6aab1f37b525b6d868542871c10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0726870f7c21a6aab1f37b52… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 24 09:07:16 2022 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index f7bb8b6c8f0..585aac2ebe2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3966,13 +3966,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Syklinen __proto__" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Ominaisuutta '|' ei voi määritellä: objekti ei ole laajennettava" +msgstr "Ominaisuutta ei voi määritellä, koska objekti ei ole laajennettava" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible"

1 0

Francois Gouget : cmd: Fix the spelling of a batch file comment.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: wine Branch: master Commit: be11845852eb354eb652cce3aca0294409b6f976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be11845852eb354eb652cce3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 24 03:51:45 2022 +0100 cmd: Fix the spelling of a batch file comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 56a682577bd..3f410e55166 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -380,7 +380,7 @@ rem test : echo i1|tmp.cmd i2|tmp.cmd i3|tmp.cmd i4 rem result: i4:[i3:[i2:[i1,i2],i3],i4]@or_broken@i4:[i3:[i2:,i3],i4]@or_broken@i4:[i3:,i4] del tmp.cmd echo --- chain else -rem Command arguments are gready and eat up the 'else' unless terminated by +rem Command arguments are greedy and eat up the 'else' unless terminated by rem brackets, which means the 'else' can only be recognized when the rem 'if true' command chain ends with brackets. if 1==1 if 2==2 if 3==3 (echo a1) else (echo a2) else echo a3

1 0

Francois Gouget : ncrypt: Fix the spelling of a FIXME() message.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: wine Branch: master Commit: 8a5140e385c7b67e77b7391f930b10f91453b14a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a5140e385c7b67e77b7391f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 24 03:51:32 2022 +0100 ncrypt: Fix the spelling of a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index d7a79faecce..f8fb3135f56 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -171,7 +171,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR if (!provider) return NTE_INVALID_HANDLE; if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); - if (name) FIXME("Persistant keys not supported\n"); + if (name) FIXME("Persistent keys are not supported\n"); if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) {

1 0

Tatsuyuki Ishi : winegcc: Identify ar files through signature.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: wine Branch: master Commit: 510cfd2762238e50e7524bb309905d2da9416890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=510cfd2762238e50e7524bb3… Author: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> Date: Thu Mar 24 11:54:36 2022 +0900 winegcc: Identify ar files through signature. Rust uses the ".rlib" extension for intermediate libraries which it passes to the linker. Detect them through signature so that winegcc will not try to compile it. Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 409ae26cd82..4b4498a59fa 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -63,6 +63,7 @@ file_type get_file_type(const char* filename) /* see tools/winebuild/res32.c: check_header for details */ static const char res_sig[] = { 0,0,0,0, 32,0,0,0, 0xff,0xff, 0,0, 0xff,0xff, 0,0, 0,0,0,0, 0,0, 0,0, 0,0,0,0, 0,0,0,0 }; static const char elf_sig[4] = "\177ELF"; + static const char ar_sig[8] = "!<arch>\n"; char buf[sizeof(res_sig)]; int fd, cnt; @@ -83,6 +84,7 @@ file_type get_file_type(const char* filename) if (strendswith(filename, ".spec")) return file_spec; if (strendswith(filename, ".rc")) return file_rc; if (cnt >= sizeof(elf_sig) && !memcmp(buf, elf_sig, sizeof(elf_sig))) return file_so; /* ELF lib */ + if (cnt >= sizeof(ar_sig) && !memcmp(buf, ar_sig, sizeof(ar_sig))) return file_arh; if (cnt >= sizeof(unsigned int) && (*(unsigned int *)buf == 0xfeedface || *(unsigned int *)buf == 0xcefaedfe || *(unsigned int *)buf == 0xfeedfacf || *(unsigned int *)buf == 0xcffaedfe))

1 0

Francois Gouget : testbot/cgi: Document the CGI classes.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: tools Branch: master Commit: 0259fd144c8ad852b5588d45a34eab681c434f98 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0259fd144c8ad852b5588d4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 24 16:37:53 2022 +0100 testbot/cgi: Document the CGI classes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 87 +++++++++++- .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 4 + testbot/lib/ObjectModel/CGI/CollectionPage.pm | 8 ++ testbot/lib/ObjectModel/CGI/FormPage.pm | 158 ++++++++++++++++++++- testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 +- testbot/lib/ObjectModel/CGI/Page.pm | 68 ++++++++- testbot/lib/WineTestBot/CGI/PageBase.pm | 40 +++++- 7 files changed, 359 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=0259fd144c8ad852b55…

1 0

Francois Gouget : testbot/cgi: Group related CGI framework methods together.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: tools Branch: master Commit: 572f0fd317598cfe93dd2eb153c88ca52faa76fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=572f0fd317598cfe93dd2eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 24 16:37:41 2022 +0100 testbot/cgi: Group related CGI framework methods together. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 668 +++++++++++---------- .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 87 ++- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 152 +++-- testbot/lib/ObjectModel/CGI/FormPage.pm | 331 +++++----- testbot/lib/ObjectModel/CGI/ItemPage.pm | 136 +++-- testbot/lib/ObjectModel/CGI/Page.pm | 156 ++--- testbot/lib/WineTestBot/CGI/PageBase.pm | 355 +++++------ 7 files changed, 1024 insertions(+), 861 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=572f0fd317598cfe93d…

1 0

Francois Gouget : testbot: Tweak the Collection formatting.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: tools Branch: master Commit: 2f1dfbf19cefcc43720e6b287306ce98d10b5d81 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2f1dfbf19cefcc43720e6b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 24 16:34:15 2022 +0100 testbot: Tweak the Collection formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 68 +++++++---------------------------- 1 file changed, 13 insertions(+), 55 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 782f32c..dd0be12 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -195,7 +195,6 @@ sub Load($) my ($self) = @_; $self->GetBackEnd()->LoadCollection($self); - $self->{Loaded} = 1; } @@ -252,11 +251,7 @@ sub GetKeys($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); return $self->GetKeysNoLoad(); } @@ -370,16 +365,9 @@ sub ItemExists($$) { my ($self, $Key) = @_; - if (! defined($Key)) - { - return !1; - } - - if (! $self->{Loaded}) - { - $self->Load(); - } + return !1 if (!defined $Key); + $self->Load() if (!$self->{Loaded}); return exists($self->{Items}{$Key}); } @@ -399,11 +387,7 @@ sub GetItems($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); my @Items = values %{$self->{Items}}; return \@Items; } @@ -422,11 +406,7 @@ sub GetItemsCount($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); return scalar(keys %{$self->{Items}}); } @@ -444,10 +424,7 @@ sub IsEmpty($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } + $self->Load() if (!$self->{Loaded}); # Even though scalar(hash) does not return the number of items in Perl 5.20 # (and cannot generally be compared to numbers), it evaluates to true for @@ -468,7 +445,6 @@ sub SplitKey($$) my ($self, $CombinedKey) = @_; my @KeyComponents = split /#@#/, $CombinedKey; - return @KeyComponents; } @@ -564,11 +540,7 @@ sub Save($) my ($self) = @_; my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Validate(); - if (! defined($ErrMessage)) - { - $self->SaveNoValidate(); - } - + $self->SaveNoValidate() if (!defined $ErrMessage); return ($ErrKey, $ErrProperty, $ErrMessage); } @@ -637,16 +609,11 @@ sub DeleteItem($$) my ($self, $Item) = @_; my $ErrMessage = $Item->OnDelete(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); + my $Key = $Item->GetKey(); $ErrMessage = $self->GetBackEnd()->DeleteItem($Item); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); my $FullKey = $self->GetFullKey($Key); if (defined $FullKey) @@ -663,24 +630,15 @@ sub DeleteAll($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } + $self->Load() if (!$self->{Loaded}); foreach my $Item (values %{$self->{Items}}) { my $ErrMessage = $Item->OnDelete(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); } my $ErrMessage = $self->GetBackEnd()->DeleteAll($self); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); my $ScopeItems = $self->{AllScopeItems}->{ref($self)}; foreach my $Key (keys %{$self->{Items}})

1 0

Conor McCarthy : tests: Test signalling a fence to a lower value after a GPU wait.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: vkd3d Branch: master Commit: 889e5af5dd48e5c76747abe33dfe402d40182e40 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=889e5af5dd48e5c76747abe… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 15:56:01 2022 +0100 tests: Test signalling a fence to a lower value after a GPU wait. Ensures the new fence implementation using timeline semaphores handles this correctly. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2059b182..486c0093 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33373,6 +33373,12 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); + /* signal to a lower value after a GPU wait was used (test timeline semaphore replacement) */ + hr = ID3D12Fence_Signal(fence, 0); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == 0, "Got unexpected value %"PRIu64".\n", value); + hr = ID3D12Fence_Signal(fence, 6); ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); update_buffer_data(cb, 0, sizeof(green), &green);

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