wine-devel

wine-devel@winehq.org

5 participants
84473 discussions

[PATCH] windows.media.speech/tests: Compile with long types.
by Bernhard Kölbl 10 Mar '22

10 Mar '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/Makefile.in | 1 - dlls/windows.media.speech/tests/speech.c | 92 ++++++++++----------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index e1616991573..2ee10d3db21 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 3194a75d6d7..be5499954be 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -48,7 +48,7 @@ static inline LONG get_ref(IUnknown *obj) static inline void check_refcount_(unsigned int line, void *obj, LONG exp) { LONG ref = get_ref(obj); - ok_(__FILE__, line)(exp == ref, "Unexpected refcount %u, expected %u\n", ref, exp); + ok_(__FILE__, line)(exp == ref, "Unexpected refcount %lu, expected %lu\n", ref, exp); } #define check_interface(obj, iid, exp) check_interface_(__LINE__, obj, iid, exp) @@ -61,7 +61,7 @@ static void check_interface_(unsigned int line, void *obj, const IID *iid, BOOL expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -79,19 +79,19 @@ static void test_ActivationFactory(void) ULONG ref; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x.\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx.\n", hr); hr = WindowsCreateString(synthesizer_name, wcslen(synthesizer_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x.\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); hr = WindowsCreateString(recognizer_name, wcslen(recognizer_name), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x.\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); hr = WindowsCreateString(garbage_name, wcslen(garbage_name), &str3); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x.\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x.\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx.\n", hr); check_refcount(factory, 2); @@ -103,12 +103,12 @@ static void test_ActivationFactory(void) check_interface(factory, &IID_ISpeechRecognizerStatics2, FALSE); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory2); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x.\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx.\n", hr); ok(factory == factory2, "Factories pointed at factory %p factory2 %p.\n", factory, factory2); check_refcount(factory2, 3); hr = RoGetActivationFactory(str2, &IID_IActivationFactory, (void **)&factory3); - todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "Got unexpected hr %#x.\n", hr); + todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "Got unexpected hr %#lx.\n", hr); if (hr == S_OK) /* Win10+ only */ { @@ -121,18 +121,18 @@ static void test_ActivationFactory(void) check_interface(factory3, &IID_ISpeechRecognizerStatics, TRUE); hr = IActivationFactory_QueryInterface(factory3, &IID_ISpeechRecognizerStatics2, (void **)&recognizer_statics2); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IActivationFactory_QueryInterface failed, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IActivationFactory_QueryInterface failed, hr %#lx.\n", hr); if (hr == S_OK) /* ISpeechRecognizerStatics2 not available in Win10 1507 */ { ref = ISpeechRecognizerStatics2_Release(recognizer_statics2); - ok(ref == 2, "Got unexpected refcount: %u.\n", ref); + ok(ref == 2, "Got unexpected refcount: %lu.\n", ref); } check_interface(factory3, &IID_IInstalledVoicesStatic, FALSE); ref = IActivationFactory_Release(factory3); - ok(ref == 1, "Got unexpected refcount: %u.\n", ref); + ok(ref == 1, "Got unexpected refcount: %lu.\n", ref); } hdll = LoadLibraryW(L"windows.media.speech.dll"); @@ -143,18 +143,18 @@ static void test_ActivationFactory(void) ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); hr = pDllGetActivationFactory(str3, &factory4); - ok((hr == CLASS_E_CLASSNOTAVAILABLE), "Got unexpected hr %#x.\n", hr); + ok((hr == CLASS_E_CLASSNOTAVAILABLE), "Got unexpected hr %#lx.\n", hr); FreeLibrary(hdll); } hr = RoGetActivationFactory(str3, &IID_IActivationFactory, (void **)&factory4); - ok((hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x.\n", hr); + ok((hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx.\n", hr); ref = IActivationFactory_Release(factory2); - ok(ref == 2, "Got unexpected refcount: %u.\n", ref); + ok(ref == 2, "Got unexpected refcount: %lu.\n", ref); ref = IActivationFactory_Release(factory); - ok(ref == 1, "Got unexpected refcount: %u.\n", ref); + ok(ref == 1, "Got unexpected refcount: %lu.\n", ref); WindowsDeleteString(str); WindowsDeleteString(str2); @@ -183,10 +183,10 @@ static void test_SpeechSynthesizer(void) ULONG ref; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hdll = LoadLibraryW(L"windows.media.speech.dll"); if (hdll) @@ -195,31 +195,31 @@ static void test_SpeechSynthesizer(void) ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); hr = WindowsCreateString(unknown_class_name, wcslen(unknown_class_name), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = pDllGetActivationFactory(str2, &factory); - ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); WindowsDeleteString(str2); hr = WindowsCreateString(speech_synthesizer_name2, wcslen(speech_synthesizer_name2), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = pDllGetActivationFactory(str2, &factory2); - ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); WindowsDeleteString(str2); hr = pDllGetActivationFactory(str, &factory2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } else { - win_skip("Failed to load library, err %u.\n", GetLastError()); + win_skip("Failed to load library, err %lu.\n", GetLastError()); } hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr); if (hdll) { @@ -229,47 +229,47 @@ static void test_SpeechSynthesizer(void) } hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInstalledVoicesStatic, (void **)&voices_static); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#lx\n", hr); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IInstalledVoicesStatic_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices); - ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#lx\n", hr); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr); ok(tmp_inspectable != inspectable, "IVectorView_VoiceInformation_QueryInterface voices returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr); size = 0xdeadbeef; hr = IVectorView_VoiceInformation_get_Size(voices, &size); - ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#lx\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); voice = (IVoiceInformation *)0xdeadbeef; hr = IVectorView_VoiceInformation_GetAt(voices, size, &voice); - ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#lx\n", hr); ok(voice == NULL, "IVectorView_VoiceInformation_GetAt returned %p\n", voice); hr = IVectorView_VoiceInformation_GetMany(voices, size, 1, &voice, &size); - ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#lx\n", hr); ok(size == 0, "IVectorView_VoiceInformation_GetMany returned count %u\n", size); IVectorView_VoiceInformation_Release(voices); @@ -280,25 +280,25 @@ static void test_SpeechSynthesizer(void) IInspectable_Release(inspectable); hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = RoActivateInstance(str, &inspectable); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ref = IClosable_Release(closable); - ok(ref == 2, "Got unexpected ref %u.\n", ref); + ok(ref == 2, "Got unexpected ref %lu.\n", ref); ref = ISpeechSynthesizer_Release(synthesizer); - ok(ref == 1, "Got unexpected ref %u.\n", ref); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); ref = IInspectable_Release(inspectable); - ok(!ref, "Got unexpected ref %u.\n", ref); + ok(!ref, "Got unexpected ref %lu.\n", ref); IActivationFactory_Release(factory); WindowsDeleteString(str); @@ -315,13 +315,13 @@ static void test_VoiceInformation(void) HRESULT hr; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#lx\n", hr); WindowsDeleteString(str); -- 2.35.1

1 0

[tools v2] testbot/web: Explicitly call exit on return from Redirect().
by Francois Gouget 10 Mar '22

10 Mar '22

Having Redirect() call exit() itself is confusing and requires documenting that it does not return in each call point and/or adding a defensive exit() call anyway. Using the exit(Redirect(...)) construct is more explicit, concise and robust. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Remove a chunk that was patching a debug web page that's specific to my test site. --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 18 +++++++----------- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++------ testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 +++--- testbot/web/JobDetails.pl | 8 +++----- testbot/web/Login.pl | 3 +-- testbot/web/Submit.pl | 13 +++---------- testbot/web/admin/Log.pl | 4 ++-- testbot/web/admin/SpecialJobs.pl | 3 +-- testbot/web/admin/UserDetails.pl | 9 +++------ 10 files changed, 28 insertions(+), 48 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index a5e8187009..9027b87758 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -539,20 +539,16 @@ sub OnAction($$) "=" . uri_escape($MasterColValues->[$ColIndex]); } } - $self->{EnclosingPage}->Redirect($Target); - return 1; + exit($self->{EnclosingPage}->Redirect($Target)); } - else + + my $Ok = 1; + foreach my $Key (@{$self->{Collection}->GetKeys()}) { - my $Ok = 1; - foreach my $Key (@{$self->{Collection}->GetKeys()}) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) { - if (defined($self->{EnclosingPage}->GetParam($self->SelName($Key))) && - $Ok) - { - my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); - } + my $Item = $self->{Collection}->GetItem($Key); + $Ok = $self->CallOnItemAction($Item, $Action); } } } diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 6d9449173d..940115475f 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -151,13 +151,11 @@ sub OnAction($$) if ($Action eq "OK") { return !1 if (!$self->Save()); - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } - elsif ($Action eq "Cancel") + if ($Action eq "Cancel") { - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } return $self->SUPER::OnAction($Action); @@ -177,7 +175,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); # does not return + return $self->Redirect($Target); } 1; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 8abaaaa9d2..b0450d0e78 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -246,7 +246,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($self, $Location); } sub GetCurrentSession($) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index d38e8d96b6..b7edd8fcaa 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -56,7 +56,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - $self->Redirect($Page, MakeSecureURL($LoginURL)); + exit($self->Redirect($Page, MakeSecureURL($LoginURL))); } } @@ -75,7 +75,7 @@ sub CheckSecurePage($$) if ($UseSSL && ! SecureConnection()) { - $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); + exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); } } @@ -415,7 +415,7 @@ sub Redirect($$$) } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT); - exit; + return 0; # a suitable exit code } sub GetCurrentSession($) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 919c7a5e3b..8d93957ce6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -52,7 +52,7 @@ sub _initialize($$$) $self->{Job} = CreateJobs()->GetItem($JobId); if (!defined $self->{Job}) { - $self->Redirect("/"); # does not return + exit($self->Redirect("/")); } $self->{JobId} = $JobId; @@ -193,8 +193,7 @@ sub OnCancel($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnRestart($) @@ -215,8 +214,7 @@ sub OnRestart($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnAction($$$) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index d9757edb92..ac64fc28ea 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -135,8 +135,7 @@ sub OnLogIn($) { $Target = "/"; } - $self->Redirect(MakeSecureURL($Target)); # does not return - exit; + exit($self->Redirect(MakeSecureURL($Target))); } sub OnAction($$) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 98d13381e0..79d1c8772d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1265,8 +1265,7 @@ sub _SubmitJob($$) return undef; } - $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey())); } sub OnSubmit($) @@ -1323,14 +1322,8 @@ sub OnOK($) { my ($self) = @_; - if (defined $self->{JobKey}) - { - $self->Redirect("/JobDetails.pl?Key=$self->{JobKey}"); # does not return - } - else - { - $self->Redirect("/"); # does not return - } + my $Target = defined $self->{JobKey} ? "/JobDetails.pl?Key=$self->{JobKey}" : "/"; + exit($self->Redirect($Target)); } sub OnAction($$) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index cb253bd03e..456e73f55d 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -71,8 +71,8 @@ sub GetActions($) sub OnDownload($) { my ($self) = @_; - $self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours")); # does not return - exit; + + exit($self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours"))); } sub OnAction($$) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 534336c483..02d9f8ea9d 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -237,8 +237,7 @@ sub OnSubmit($) return undef; } - $self->Redirect("/"); # does not return - exit; + exit($self->Redirect("/")); } sub OnAction($$) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 2cf0f597fb..8c26930e8e 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -74,8 +74,7 @@ sub OnApprove($) return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); return !1 if (defined $self->{ErrMessage}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnReject($) @@ -87,8 +86,7 @@ sub OnReject($) return !1 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnOK($) @@ -101,8 +99,7 @@ sub OnOK($) # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); } - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnAction($$) -- 2.30.2

1 0

The fu^H^Hpain is almost over
by Eric Pouech 10 Mar '22

10 Mar '22

The migration to long type (after the serie of this morning) is coming to an end What remains to be done: - migration of dlls/oleaut32/tests, dlls/ntdll/tests, dlls/user32/tests - all the D3D related modules (Henri's working on it) [1] - media speech (Berhnard's working on it) At the begining there were 745 modules to be migrated. Current situation: 78 modules yet to be migrated (D3D accounts for 53 of those) What's on hold - all the modules with a Unixlib, and the modules not yet migrated to cross compilation (and tools/winedump) [2]: strategy of migration to long type for ELF compilation (A) still be decided - dlls/user32: pending on (A) & interferes with win32u migration - dlls/nsi/tests: impacted by migration of dlls/nsiproxy.sys (in fact include/wine/nsi.h) and/or (A) For the remaining work: trying to limit the load on Marvin - for the (ntdll|user32)/tests modules: using a sub-module granularity and no serie of patches - that will allow to limit to number of changes per day - for (ntdll|user32)/tests (and the cleanup of kernel32/tests): trying to bypass Marvin for the patch which moves control of long type from module's Makefile to individual .c files cheers [1] dlls/d3d* dlls/d3d*/tests dlls/ddraw* dlls/ddraw*/tests dlls/dxgi* dlls/dxgi*/tests dlls/wined3d [2] Not yet migrated modules to long types | Module | Family | Why_Not_Migrated | | ------ | ------ | ---------------- | | dlls/capi2032 | | Unixlib | | dlls/nsiproxy.sys | nsi | Unixlib | | dlls/ntdll | | Unixlib | | dlls/openal32 | | no-cross | | dlls/opengl32 | | no-cross | | dlls/user32 | win32u | | | dlls/win32u | win32u | Unixlib | | dlls/winealsa.drv | | no-cross,Unixlib | | dlls/wineandroid.drv | | no-cross | | dlls/winecoreaudio.drv | | Unixlib | | dlls/winecrt0 | | (A) | | dlls/winemac.drv | | no-cross | | dlls/wineoss.drv | | no-cross | | dlls/winepulse.drv | | Unixlib | | dlls/wineusb.sys | | no-cross | | dlls/winevulkan | | Unixlib | | dlls/winex11.drv | | no-cross | | dlls/winspool.drv | | Unixlib | | dlls/nsi/tests | nsi | | | dlls/ntdll/tests | | | | dlls/oleaut32/tests | | | | dlls/user32/tests | | | | dlls/windows.media.speech/tests | | | | dlls/winmm/tests | | under review | | tools/winedump | | (A) | Unixlib: module with a Unixlib part no-cross: module not yet cross-compiled / linked with msvcrt/ucrtbase

1 0

[PATCH v4 4/4] ncrypt: Always map bcrypt return values.
by Hans Leidekker 10 Mar '22

10 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f7af49e6610..d7a79faecce 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -37,6 +37,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) switch (status) { case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status); return NTE_INTERNAL_ERROR; @@ -123,7 +124,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) { struct object *object; - NTSTATUS ret; + NTSTATUS status; if (!(object = allocate_object(KEY))) { @@ -135,10 +136,10 @@ static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE pro { case RSA: { - ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (ret != ERROR_SUCCESS) + status = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (status != STATUS_SUCCESS) { - ERR("Error opening algorithm provider\n"); + ERR("Error opening algorithm provider %#lx\n", status); free(object); return NULL; } @@ -174,7 +175,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) { - NTSTATUS ret; + NTSTATUS status; DWORD default_bitlen = 1024; if (!(object = create_key_object(RSA, provider))) @@ -183,13 +184,13 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR return NTE_NO_MEMORY; } - ret = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); - if (ret != ERROR_SUCCESS) + status = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); + if (status != STATUS_SUCCESS) { - ERR("Error generating key pair\n"); + ERR("Error generating key pair %#lx\n", status); BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); - return NTE_INTERNAL_ERROR; + return map_ntstatus(status); } set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&default_bitlen, sizeof(default_bitlen)); @@ -278,15 +279,16 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) static SECURITY_STATUS free_key_object(struct key *key) { - NTSTATUS ret = BCryptDestroyKey(key->bcrypt_key); - if (BCryptCloseAlgorithmProvider(key->bcrypt_alg, 0)) return NTE_INVALID_HANDLE; - return ret ? NTE_INVALID_HANDLE : ERROR_SUCCESS; + NTSTATUS status, status2; + status = BCryptDestroyKey(key->bcrypt_key); + if ((status2 = BCryptCloseAlgorithmProvider(key->bcrypt_alg, 0))) return map_ntstatus(status2); + return status ? map_ntstatus(status) : ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) { struct object *object = (struct object *)handle; - SECURITY_STATUS ret = ERROR_SUCCESS; + SECURITY_STATUS ret = STATUS_SUCCESS; unsigned int i; TRACE("(%#Ix)\n", handle); @@ -378,7 +380,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H case BCRYPT_RSAPRIVATE_MAGIC: case BCRYPT_RSAPUBLIC_MAGIC: { - NTSTATUS ret; + NTSTATUS status; BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; if (!(object = create_key_object(RSA, provider))) @@ -387,13 +389,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_NO_MEMORY; } - ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); - if (ret != ERROR_SUCCESS) + status = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); + if (status != STATUS_SUCCESS) { - WARN("Error importing key pair with bcrypt %#lx\n", ret); + WARN("Error importing key pair %#lx\n", status); BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); - return NTE_BAD_DATA; + return map_ntstatus(status); } set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength)); -- 2.30.2

1 0

[PATCH v4 3/4] ncrypt: Implement NCryptFinalizeKey.
by Hans Leidekker 10 Mar '22

10 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v4: Map bcrypt return values. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 43 +++++++++++++++++++++++++++++++++++--- dlls/ncrypt/tests/ncrypt.c | 25 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f76d5885476..f7af49e6610 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "ncrypt.h" @@ -30,6 +32,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); +static SECURITY_STATUS map_ntstatus(NTSTATUS status) +{ + switch (status) + { + case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + default: + FIXME("unhandled status %#lx\n", status); + return NTE_INTERNAL_ERROR; + } +} + static struct object *allocate_object(enum object_type type) { struct object *ret; @@ -227,10 +240,34 @@ SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR * return NTE_NOT_SUPPORTED; } -SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) +SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE handle, DWORD flags) { - FIXME("(%#Ix, %#lx): stub\n", key, flags); - return NTE_NOT_SUPPORTED; + struct object *object = (struct object *)handle; + DWORD key_length; + struct object_property *prop; + NTSTATUS status; + + TRACE("(%#Ix, %#lx)\n", handle, flags); + + if (!object || object->type != KEY) return NTE_INVALID_HANDLE; + + if (!(prop = get_object_property(object, NCRYPT_LENGTH_PROPERTY))) return NTE_INVALID_HANDLE; + key_length = *(DWORD *)prop->value; + status = BCryptSetProperty(object->key.bcrypt_key, BCRYPT_KEY_LENGTH, (UCHAR *)&key_length, sizeof(key_length), 0); + if (status != STATUS_SUCCESS) + { + ERR("Error setting key length property\n"); + return map_ntstatus(status); + } + + status = BCryptFinalizeKeyPair(object->key.bcrypt_key, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error finalizing key pair\n"); + return map_ntstatus(status); + } + + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index ec69b236ac9..fc951fef80a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -306,6 +306,30 @@ static void test_create_persisted_key(void) NCryptFreeObject(prov); } +static void test_finalize_key(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(key, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(key, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(0, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + NCryptFreeObject(key); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -313,4 +337,5 @@ START_TEST(ncrypt) test_get_property(); test_set_property(); test_create_persisted_key(); + test_finalize_key(); } -- 2.30.2

1 0

[PATCH v4 2/4] bcrypt: Return an error when BCryptFinalizeKeyPair() is called twice.
by Hans Leidekker 10 Mar '22

10 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 1 + dlls/bcrypt/tests/bcrypt.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index e1b32be32a4..6862c5cdcf2 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -846,6 +846,7 @@ static NTSTATUS key_asymmetric_generate( void *args ) int ret; if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; + if (key_data(key)->privkey) return STATUS_INVALID_HANDLE; switch (key->alg_id) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 8982e0ae90b..efb5843fa4e 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2157,6 +2157,9 @@ static void test_RSA(void) ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); + size = 0; buf = HeapAlloc(GetProcessHeap(), 0, sizeof(rsaPrivateBlob)); ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf, sizeof(rsaPrivateBlob), &size, 0); @@ -2565,6 +2568,9 @@ static void test_BCryptSignHash(void) ret = BCryptFinalizeKeyPair(key, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); + len = 0; memset(sig, 0, sizeof(sig)); -- 2.30.2

1 0

[PATCH v4 1/4] ncrypt: Implement NCryptCreatePersistedKey.
by Hans Leidekker 10 Mar '22

10 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v4: Trim the list of algorithms. Formatting. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 253 +++++++++++++++++++++------------- dlls/ncrypt/ncrypt_internal.h | 11 ++ dlls/ncrypt/tests/ncrypt.c | 8 +- 3 files changed, 177 insertions(+), 95 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 8ace3e55731..f76d5885476 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -30,12 +30,165 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); +static struct object *allocate_object(enum object_type type) +{ + struct object *ret; + if (!(ret = calloc(1, sizeof(*ret)))) return NULL; + ret->type = type; + return ret; +} + +static struct object_property *get_object_property(struct object *object, const WCHAR *name) +{ + unsigned int i; + for (i = 0; i < object->num_properties; i++) + { + struct object_property *property = &object->properties[i]; + if (!lstrcmpW(property->key, name)) return property; + } + return NULL; +} + +struct object_property *add_object_property(struct object *object, const WCHAR *name) +{ + struct object_property *property; + + if (!object->num_properties) + { + if (!(object->properties = malloc(sizeof(*property)))) + { + ERR("Error allocating memory.\n"); + return NULL; + } + property = &object->properties[object->num_properties++]; + } + else + { + struct object_property *tmp; + if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) + { + ERR("Error allocating memory.\n"); + return NULL; + } + object->properties = tmp; + property = &object->properties[object->num_properties++]; + } + + memset(property, 0, sizeof(*property)); + if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + { + ERR("Error allocating memory.\n"); + return NULL; + } + + lstrcpyW(property->key, name); + return property; +} + +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +{ + struct object_property *property = get_object_property(object, name); + void *tmp; + + if (!property && !(property = add_object_property(object, name))) return NTE_NO_MEMORY; + + property->value_size = value_size; + if (!(tmp = realloc(property->value, value_size))) + { + ERR("Error allocating memory.\n"); + free(property->key); + property->key = NULL; + return NTE_NO_MEMORY; + } + + property->value = tmp; + memcpy(property->value, value, value_size); + + return ERROR_SUCCESS; +} + +static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) +{ + struct object *object; + NTSTATUS ret; + + if (!(object = allocate_object(KEY))) + { + ERR("Error allocating memory\n"); + return NULL; + } + + switch (algid) + { + case RSA: + { + ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error opening algorithm provider\n"); + free(object); + return NULL; + } + + object->key.algid = RSA; + set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, + sizeof(BCRYPT_RSA_ALGORITHM)); + break; + } + default: + { + ERR("Invalid algid %#x\n", algid); + free(object); + return NULL; + } + } + + set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); + return object; +} + SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(%#Ix, %p, %s, %s, %#lx, %#lx): stub\n", provider, key, wine_dbgstr_w(algid), + struct object *object; + + TRACE("(%#Ix, %p, %s, %s, %#lx, %#lx)\n", provider, key, wine_dbgstr_w(algid), wine_dbgstr_w(name), keyspec, flags); - return NTE_NOT_SUPPORTED; + + 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 (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) + { + NTSTATUS ret; + DWORD default_bitlen = 1024; + + if (!(object = create_key_object(RSA, provider))) + { + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; + } + + ret = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error generating key pair\n"); + BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); + free(object); + return NTE_INTERNAL_ERROR; + } + + set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&default_bitlen, sizeof(default_bitlen)); + } + else + { + FIXME("Algorithm not handled %s\n", wine_dbgstr_w(algid)); + return NTE_NOT_SUPPORTED; + } + + *key = (NCRYPT_KEY_HANDLE)object; + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, @@ -132,17 +285,6 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) return ret; } -static struct object_property *get_object_property(struct object *object, const WCHAR *name) -{ - unsigned int i; - for (i = 0; i < object->num_properties; i++) - { - struct object_property *property = &object->properties[i]; - if (!lstrcmpW(property->key, name)) return property; - } - return NULL; -} - SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { @@ -163,72 +305,6 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name return ERROR_SUCCESS; } -static struct object *allocate_object(enum object_type type) -{ - struct object *ret; - if (!(ret = calloc(1, sizeof(*ret)))) return NULL; - ret->type = type; - return ret; -} - -struct object_property *add_object_property(struct object *object, const WCHAR *name) -{ - struct object_property *property; - - if (!object->num_properties) - { - if (!(object->properties = malloc(sizeof(*property)))) - { - ERR("Error allocating memory.\n"); - return NULL; - } - property = &object->properties[object->num_properties++]; - } - else - { - struct object_property *tmp; - if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) - { - ERR("Error allocating memory.\n"); - return NULL; - } - object->properties = tmp; - property = &object->properties[object->num_properties++]; - } - - memset(property, 0, sizeof(*property)); - if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) - { - ERR("Error allocating memory.\n"); - return NULL; - } - - lstrcpyW(property->key, name); - return property; -} - -static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) -{ - struct object_property *property = get_object_property(object, name); - void *tmp; - - if (!property && !(property = add_object_property(object, name))) return NTE_NO_MEMORY; - - property->value_size = value_size; - if (!(tmp = realloc(property->value, value_size))) - { - ERR("Error allocating memory.\n"); - free(property->key); - property->key = NULL; - return NTE_NO_MEMORY; - } - - property->value = tmp; - memcpy(property->value, value, value_size); - - return ERROR_SUCCESS; -} - SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, BYTE *data, DWORD datasize, DWORD flags) @@ -259,12 +335,6 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_FLAGS; } - if (!(object = allocate_object(KEY))) - { - ERR("Error allocating memory\n"); - return NTE_NO_MEMORY; - } - switch(header->Magic) { case BCRYPT_RSAFULLPRIVATE_MAGIC: @@ -273,13 +343,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H { NTSTATUS ret; BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; - ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (ret != ERROR_SUCCESS) + + if (!(object = create_key_object(RSA, provider))) { - ERR("Error opening algorithm provider\n"); - free(object); - return NTE_INTERNAL_ERROR; + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; } + ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); if (ret != ERROR_SUCCESS) { @@ -289,14 +359,11 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_DATA; } - set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); - set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength)); break; } default: FIXME("Unhandled key magic %#lx\n", header->Magic); - free(object); return NTE_INVALID_PARAMETER; } diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index e5884c8871a..0ab20de14ad 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -18,8 +18,19 @@ #include <bcrypt.h> +enum algid +{ + /* symmetric */ + AES, + /* asymmetric */ + RSA, + DSA, + ECDSA, +}; + struct key { + enum algid algid; BCRYPT_ALG_HANDLE bcrypt_alg; BCRYPT_KEY_HANDLE bcrypt_key; }; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index cf434054428..ec69b236ac9 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -229,6 +229,7 @@ static void test_set_property(void) { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + } NCryptFreeObject(key); key = 0; @@ -240,6 +241,8 @@ static void test_set_property(void) ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + todo_wine + { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); @@ -261,7 +264,6 @@ static void test_create_persisted_key(void) ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { key = 0; ret = NCryptCreatePersistedKey(0, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); @@ -292,14 +294,16 @@ static void test_create_persisted_key(void) NCryptFinalizeKey(key, 0); NCryptFreeObject(key); + todo_wine + { key = 0; ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_AES_ALGORITHM, NULL, 0, 0); ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win 7 */, "got %#lx\n", ret); if (ret == NTE_NOT_SUPPORTED) win_skip("broken, symmetric keys not supported.\n"); else ok(key, "got null handle\n"); + } NCryptFreeObject(prov); - } } START_TEST(ncrypt) -- 2.30.2

1 0

[PATCH 1/2] d3d11: Do not print a FIXME for dynamic linking in shader retrieval functions.
by Zebediah Figura 10 Mar '22

10 Mar '22

Many applications call GetShader functions with non-NULL class instance pointers despite never using dynamic linking, in an apparent attempt to save all device state. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/device.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8b0846498a5..f8d3e3f9c46 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1734,8 +1734,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_PSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -1792,8 +1790,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_VSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -1926,8 +1922,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_GSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2393,8 +2387,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_HSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2487,8 +2479,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_DSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2607,8 +2597,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_CSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; -- 2.35.1

2 3

[PATCH] wined3d: Do not print a d3d_perf warning in adapter_vk_alloc_bo() for unmapped BOs.
by Zebediah Figura 10 Mar '22

10 Mar '22

BOs will always be unmapped here. This is a relic from an older form of the code where mapping was done in wined3d_context_vk_create_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3e126e1ae3a..5ef5d76062a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -21,7 +21,6 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static const struct wined3d_state_entry_template misc_state_template_vk[] = { @@ -1278,9 +1277,6 @@ static bool adapter_vk_alloc_bo(struct wined3d_device *device, struct wined3d_re if (!bo_vk->b.map_ptr) { - WARN_(d3d_perf)("BO %p (chunk %p, slab %p) is not mapped.\n", - bo_vk, bo_vk->memory ? bo_vk->memory->chunk : NULL, bo_vk->slab); - if (!wined3d_bo_vk_map(bo_vk, context_vk)) ERR("Failed to map bo.\n"); } -- 2.35.1

2 1

[PATCH 1/6] windows.gaming.input: Implement IRawGameControllerStatics_get_RawGameControllers.
by Rémi Bernon 10 Mar '22

10 Mar '22

It is important to add RawGameController instances to the vector in the initialization callback, because some games check the vector, as well as the Gamepad class vector in the OnGameControllerAdded callback. This also removes the OnGameControllerAdded failure case, to avoid leaking controllers that were already added to the controller vector, and instead rely on the OnGameControllerRemoved call to do the cleanup. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 9 +-- dlls/windows.gaming.input/controller.c | 82 +++++++++++++++++++++----- dlls/windows.gaming.input/manager.c | 6 +- 3 files changed, 70 insertions(+), 27 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 2d801aacda2..e74e76482f9 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3340,17 +3340,10 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); ok( hr == S_OK, "get_Size returned %#lx\n", hr ); - todo_wine ok( size == 1, "got size %u\n", size ); hr = IVectorView_RawGameController_GetAt( controllers_view, 0, &raw_controller ); - todo_wine ok( hr == S_OK, "GetAt returned %#lx\n", hr ); IVectorView_RawGameController_Release( controllers_view ); - if (hr != S_OK) - { - IRawGameControllerStatics_Release( controller_statics ); - goto done; - } /* HID gamepads aren't exposed as WGI gamepads on Windows */ @@ -3372,6 +3365,7 @@ static void test_windows_gaming_input(void) check_interface( raw_controller, &IID_IInspectable, TRUE ); check_interface( raw_controller, &IID_IAgileObject, TRUE ); check_interface( raw_controller, &IID_IRawGameController, TRUE ); + todo_wine check_interface( raw_controller, &IID_IRawGameController2, TRUE ); check_interface( raw_controller, &IID_IGameController, TRUE ); check_interface( raw_controller, &IID_IGamepad, FALSE ); @@ -3384,6 +3378,7 @@ static void test_windows_gaming_input(void) check_interface( game_controller, &IID_IInspectable, TRUE ); check_interface( game_controller, &IID_IAgileObject, TRUE ); check_interface( game_controller, &IID_IRawGameController, TRUE ); + todo_wine check_interface( game_controller, &IID_IRawGameController2, TRUE ); check_interface( game_controller, &IID_IGameController, TRUE ); check_interface( game_controller, &IID_IGamepad, FALSE ); diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 9fb1b1a69a2..51ede5a0e47 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -24,6 +24,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(input); +static CRITICAL_SECTION controller_cs; +static CRITICAL_SECTION_DEBUG controller_cs_debug = +{ + 0, 0, &controller_cs, + { &controller_cs_debug.ProcessLocksList, &controller_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controller_cs") } +}; +static CRITICAL_SECTION controller_cs = { &controller_cs_debug, -1, 0, 0, 0, 0 }; + +static IVector_RawGameController *controllers; + +static HRESULT init_controllers(void) +{ + static const struct vector_iids iids = + { + .vector = &IID_IVector_RawGameController, + .view = &IID_IVectorView_RawGameController, + .iterable = &IID_IIterable_RawGameController, + .iterator = &IID_IIterator_RawGameController, + }; + HRESULT hr; + + EnterCriticalSection( &controller_cs ); + if (controllers) hr = S_OK; + else hr = vector_create( &iids, (void **)&controllers ); + LeaveCriticalSection( &controller_cs ); + + return hr; +} + struct controller { IGameControllerImpl IGameControllerImpl_iface; @@ -118,13 +148,19 @@ static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameCo IGameControllerProvider *provider ) { struct controller *impl = impl_from_IGameControllerImpl( iface ); + HRESULT hr; TRACE( "iface %p, outer %p, provider %p.\n", iface, outer, provider ); impl->IGameController_outer = outer; IGameControllerProvider_AddRef( (impl->provider = provider) ); - return S_OK; + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) + hr = IVector_RawGameController_Append( controllers, &impl->IRawGameController_iface ); + LeaveCriticalSection( &controller_cs ); + + return hr; } static const struct IGameControllerImplVtbl controller_vtbl = @@ -381,23 +417,14 @@ static HRESULT WINAPI statics_remove_RawGameControllerRemoved( IRawGameControlle static HRESULT WINAPI statics_get_RawGameControllers( IRawGameControllerStatics *iface, IVectorView_RawGameController **value ) { - static const struct vector_iids iids = - { - .vector = &IID_IVector_RawGameController, - .view = &IID_IVectorView_RawGameController, - .iterable = &IID_IIterable_RawGameController, - .iterator = &IID_IIterator_RawGameController, - }; - IVector_RawGameController *controllers; HRESULT hr; TRACE( "iface %p, value %p.\n", iface, value ); - if (SUCCEEDED(hr = vector_create( &iids, (void **)&controllers ))) - { + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) hr = IVector_RawGameController_GetView( controllers, value ); - IVector_RawGameController_Release( controllers ); - } + LeaveCriticalSection( &controller_cs ); return hr; } @@ -468,8 +495,33 @@ static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameContr static HRESULT WINAPI controller_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + IRawGameController *controller; + BOOLEAN found; + UINT32 index; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IGameController_QueryInterface( value, &IID_IRawGameController, (void **)&controller ))) + return hr; + + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) + { + if (FAILED(hr = IVector_RawGameController_IndexOf( controllers, controller, &index, &found )) || !found) + WARN( "Could not find controller %p, hr %#lx!\n", controller, hr ); + else + hr = IVector_RawGameController_RemoveAt( controllers, index ); + } + LeaveCriticalSection( &controller_cs ); + + if (FAILED(hr)) + WARN( "Failed to remove controller %p, hr %#lx!\n", controller, hr ); + else if (found) + TRACE( "Removed controller %p.\n", controller ); + IRawGameController_Release( controller ); + + return S_OK; } static const struct ICustomGameControllerFactoryVtbl controller_factory_vtbl = diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index 489588a68ab..6a8963a1fc4 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -502,11 +502,7 @@ void manager_on_provider_created( IGameControllerProvider *provider ) controller = LIST_ENTRY( entry, struct controller, entry ); hr = ICustomGameControllerFactory_OnGameControllerAdded( controller->factory, &controller->IGameController_iface ); - if (FAILED(hr)) - { - list_remove( &controller->entry ); - IGameController_Release( &controller->IGameController_iface ); - } + if (FAILED(hr)) WARN( "OnGameControllerAdded failed, hr %#lx\n", hr ); if (next == &controller_list) break; } -- 2.35.1

2 6

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-devel