March 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-utils: Simplify handling of shader messages a bit.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: vkd3d Branch: master Commit: fc5df4d3307ed6d2118e983a7c3927e7ffeaeac5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fc5df4d3307ed6d2118e983… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 6 20:04:35 2022 -0600 vkd3d-utils: Simplify handling of shader messages a bit. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-utils/vkd3d_utils_main.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 9607eddd..22953c46 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -263,20 +263,18 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen } ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); - if (messages) + + if (messages && messages_blob) { - if (messages_blob) + if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) { - if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) - { - vkd3d_shader_free_messages(messages); - vkd3d_shader_free_shader_code(&byte_code); - return hr; - } - } - else vkd3d_shader_free_messages(messages); + vkd3d_shader_free_shader_code(&byte_code); + return hr; + } + messages = NULL; } + vkd3d_shader_free_messages(messages); if (!ret) { @@ -351,20 +349,18 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename preprocess_info.include_context = include; ret = vkd3d_shader_preprocess(&compile_info, &preprocessed_code, &messages); - if (messages) + + if (messages && messages_blob) { - if (messages_blob) + if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) { - if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) - { - vkd3d_shader_free_messages(messages); - vkd3d_shader_free_shader_code(&preprocessed_code); - return hr; - } - } - else vkd3d_shader_free_messages(messages); + vkd3d_shader_free_shader_code(&preprocessed_code); + return hr; + } + messages = NULL; } + vkd3d_shader_free_messages(messages); if (!ret) {

1 0

Francois Gouget : testbot/cgi: Fix getting the property descriptors in FormPage::SaveProperties().
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: tools Branch: master Commit: 2340f4d2f23c02cf35c649412a69ceb0b0fa1294 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2340f4d2f23c02cf35c6494… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:52:04 2022 +0100 testbot/cgi: Fix getting the property descriptors in FormPage::SaveProperties(). The base form page has no Collection field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 21c8631..067d11b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -368,7 +368,7 @@ sub SaveProperties($) } } - foreach my $PropertyDescriptor (@{$self->{Collection}->GetPropertyDescriptors}) + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) { if ($PropertyDescriptor->GetClass() eq "Basic" && $PropertyDescriptor->GetType() eq "B" &&

1 0

Francois Gouget : testbot/web: Remove end-of-line spaces in the css file.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: tools Branch: master Commit: ff224083216bc58f78650a5450abadd331d51698 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ff224083216bc58f78650a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:45:35 2022 +0100 testbot/web: Remove end-of-line spaces in the css file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/WineTestBot.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 6d170b1..301ba71 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -123,7 +123,7 @@ A:hover position: relative; bottom: 0.5em; font-size: 0.8em; -} +} h1, h2 { @@ -145,7 +145,7 @@ h2 font-size: 14pt; } -.DetailsBody p +.DetailsBody p { text-align: center; } @@ -175,7 +175,7 @@ h2 margin-top: 2em } -.ItemBody p +.ItemBody p { text-align: center; }

1 0

Francois Gouget : testbot/cgi: !1 is really an empty string in FormPage::SaveProperties().
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: tools Branch: master Commit: aa8d29559c08cbab0b750278cd506f49c0330f34 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aa8d29559c08cbab0b75027… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:46:21 2022 +0100 testbot/cgi: !1 is really an empty string in FormPage::SaveProperties(). So the point of that SaveProperty() call is that if an editable property value was not received as a form parameter it is considered to be an empty string. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 43b9b59..21c8631 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -375,7 +375,7 @@ sub SaveProperties($) $self->DisplayProperty($PropertyDescriptor) eq "rw" && ! defined($self->GetParam($PropertyDescriptor->GetName()))) { - if (! $self->SaveProperty($PropertyDescriptor, !1)) + if (! $self->SaveProperty($PropertyDescriptor, "")) { return !1; }

1 0

Francois Gouget : testbot/cgi: Add a tooltip on the 'required field' asterisks.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: tools Branch: master Commit: 798cc33be70ad692adc5c9fe3e4580a5eb7d7149 URL: https://source.winehq.org/git/tools.git/?a=commit;h=798cc33be70ad692adc5c9f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:52:21 2022 +0100 testbot/cgi: Add a tooltip on the 'required field' asterisks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 067d11b..9ea7f0f 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -305,7 +305,7 @@ sub GenerateRequired($$) if ($PropertyDescriptor->GetIsRequired()) { $self->{HasRequired} = 1; - print " <span class='Required'>*</span>"; + print " <a class='Required' title='Required field'>*</a>"; } }

1 0

Francois Gouget : testbot/web: Better separate GetParam() and SetParam().
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: tools Branch: master Commit: 81cc4388e64e1d0af6a7a57d46fae182e222780e URL: https://source.winehq.org/git/tools.git/?a=commit;h=81cc4388e64e1d0af6a7a57… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:47:47 2022 +0100 testbot/web: Better separate GetParam() and SetParam(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 39 ++++++++++++++++++++++++++++++++----- testbot/web/Feedback.pl | 6 +++--- testbot/web/Register.pl | 4 ++-- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index b910228..8abaaaa 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -77,18 +77,47 @@ sub GetParamNames($) =head1 C<GetParam()> -This thunks to CGI::param() and thus takes the same arguments list but forces -the result to scalar context to avoid security issues. +Returns the specified parameter. +Note that unlike CGI::param() this forces the result to scalar context to +avoid security issues. + To get the list of parameter names use GetParamNames(). =back =cut -sub GetParam($@) +sub GetParam($$) { - my $self = shift; + my ($self, $Name) = @_; + + return scalar($self->{CGIObj}->param($Name)); +} + +=pod +=over 12 + +=head1 C<SetParam()> - return scalar($self->{CGIObj}->param(@_)); +Sets the specified parameter or removes it from the parameters list if the +value is undefined. + +To get the list of parameter names use GetParamNames(). + +=back +=cut + +sub SetParam($$$) +{ + my ($self, $Name, $Value) = @_; + + if (defined $Value) + { + $self->{CGIObj}->param($Name, $Value); + } + else + { + $self->{CGIObj}->delete($Name); + } } sub CGI($) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 9eba086..ca1ee5e 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -41,7 +41,7 @@ sub _initialize($$$) ); if (!$Session and $RegistrationQ) { - $self->GetParam("FeedA", "") if (!defined $self->GetParam("FeedA")); + $self->SetParam("FeedA", "") if (!defined $self->GetParam("FeedA")); push @PropertyDescriptors, CreateBasicPropertyDescriptor("FeedA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); } @@ -51,8 +51,8 @@ sub _initialize($$$) { # Provide default values my $User = $Session->User; - $self->GetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); - $self->GetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); + $self->SetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); + $self->SetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); } } diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 23f57a9..4cfef79 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -40,11 +40,11 @@ sub _initialize($$$) $self->{ExtraProperties} = []; if ($RegistrationQ) { - $self->GetParam("RegA", "") if (!defined $self->GetParam("RegA")); + $self->SetParam("RegA", "") if (!defined $self->GetParam("RegA")); push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("RegA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); } - $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); + $self->SetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 160); }

1 0

Francois Gouget : testbot/web: Don't assume that "/index.pl" is the TestBot landing page.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: tools Branch: master Commit: de0ddebb90c1ff365b6bf58f43653b0957d3ed14 URL: https://source.winehq.org/git/tools.git/?a=commit;h=de0ddebb90c1ff365b6bf58… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:48:05 2022 +0100 testbot/web: Don't assume that "/index.pl" is the TestBot landing page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- testbot/web/JobDetails.pl | 2 +- testbot/web/Login.pl | 2 +- testbot/web/Submit.pl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 8b046c8..2681ece 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -244,7 +244,7 @@ ${ProjectName} Test Bot <div id="menu"> <ul> <li class='top'><p>Test Bot</p></li> - <li><p><a href='/index.pl'>Home</a></p></li> + <li><p><a href='/'>Home</a></p></li> EOF if (defined($PatchesMailingList)) { @@ -307,7 +307,7 @@ EOF </div> <div id='banner'> <div id='Logo'> - <a href='/index.pl'><img src='/${ProjectName}Logo.png' alt=''></a> + <a href='/'><img src='/${ProjectName}Logo.png' alt=''></a> </div> <div id='Project'> <img src='/${ProjectName}Project.png' alt=''> diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index eef7a17..919c7a5 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("/index.pl"); # does not return + $self->Redirect("/"); # does not return } $self->{JobId} = $JobId; diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index ef3f4cb..d9757ed 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -133,7 +133,7 @@ sub OnLogIn($) my $Target = $self->GetParam("Target"); if (! defined($Target) || $Target eq "" || substr($Target, 0, 1) ne "/") { - $Target = "/index.pl"; + $Target = "/"; } $self->Redirect(MakeSecureURL($Target)); # does not return exit; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 9a7ac0b..98d1338 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1329,7 +1329,7 @@ sub OnOK($) } else { - $self->Redirect("/index.pl"); # does not return + $self->Redirect("/"); # does not return } }

1 0

Paul Gofman : ws2_32: Base inet_addr() implementation on musl.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 18230d23c599f1f5f9dd419dccc11c49117cc3b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18230d23c599f1f5f9dd419d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 3 13:32:26 2022 +0300 ws2_32: Base inet_addr() implementation on musl. The imported algorithm is modified to match the tests. Fixes a regression introduced by commit 671cf16f773e5dafc7edbf7766aed9e52e4e7b56. Windows inet_addr() behaves basically the same as Unix inet_addr() which is different from inet_pton(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 52 ++++++++++++++++++++-- dlls/ws2_32/tests/protocol.c | 103 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 141 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 0f56b1604d8..6e7e8eee18a 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1834,17 +1834,61 @@ int WINAPI WSAAddressToStringW( struct sockaddr *addr, DWORD addr_len, return 0; } - /*********************************************************************** * inet_addr (ws2_32.11) */ u_long WINAPI inet_addr( const char *str ) { + unsigned long a[4] = { 0 }; + const char *s = str; + unsigned char *d; + unsigned int i; u_long addr; + char *z; + + TRACE( "str %s.\n", debugstr_a(str) ); + + if (!s) + { + SetLastError( WSAEFAULT ); + return INADDR_NONE; + } + + d = (unsigned char *)&addr; + + if (s[0] == ' ' && !s[1]) return 0; - if (inet_pton( AF_INET, str, &addr ) == 1) - return addr; - return INADDR_NONE; + for (i = 0; i < 4; ++i) + { + a[i] = strtoul( s, &z, 0 ); + if (z == s || !isdigit( *s )) return INADDR_NONE; + if (!*z || isspace(*z)) break; + if (*z != '.') return INADDR_NONE; + s = z + 1; + } + + if (i == 4) return INADDR_NONE; + + switch (i) + { + case 0: + a[1] = a[0] & 0xffffff; + a[0] >>= 24; + /* fallthrough */ + case 1: + a[2] = a[1] & 0xffff; + a[1] >>= 16; + /* fallthrough */ + case 2: + a[3] = a[2] & 0xff; + a[2] >>= 8; + } + for (i = 0; i < 4; ++i) + { + if (a[i] > 255) return INADDR_NONE; + d[i] = a[i]; + } + return addr; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 374fa01789d..9b3dec39dad 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -674,6 +674,98 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_inet_addr(void) +{ + static const struct + { + const char *input; + u_long addr; + } + tests[] = + { + {"1.2.3.4", 0x04030201}, + {"1 2 3 4", 0x01000000}, + {"1.2.3. 4", 0xffffffff}, + {"1.2.3 .4", 0x03000201}, + {"1.2.3 \xfe\xff", 0x03000201}, + {"3.4.5.6.7", 0xffffffff}, + {"3.4.5.6. 7", 0xffffffff}, + {"3.4.5.6 7", 0x06050403}, + {" 3.4.5.6", 0xffffffff}, + {"\t3.4.5.6", 0xffffffff}, + {"3.4.5.6 ", 0x06050403}, + {"3.4.5.6 ", 0x06050403}, + {"3. 4.5.6", 0xffffffff}, + {"3 .4.5.6", 0x03000000}, + {"1.2.3", 0x03000201}, + {".1.2.3", 0xffffffff}, + {"0.0.0.0", 0x00000000}, + {"", 0xffffffff}, + {" 0", 0xffffffff}, + {"0xa1a2b3b4 ", 0xb4b3a2a1}, + {".", 0xffffffff}, + {" ", 0x00000000}, + {"\t", 0xffffffff}, + {" ", 0xffffffff}, + {"127.127.127.255", 0xff7f7f7f}, + {"127.127.127.255:123", 0xffffffff}, + {"127.127.127.256", 0xffffffff}, + {"a", 0xffffffff}, + {"1.2.3.0xaA", 0xaa030201}, + {"1.1.1.0x", 0xffffffff}, + {"1.2.3.010", 0x08030201}, + {"1.2.3.00", 0x00030201}, + {"1.2.3.0a", 0xffffffff}, + {"1.1.1.0o10", 0xffffffff}, + {"1.1.1.0b10", 0xffffffff}, + {"1.1.1.-2", 0xffffffff}, + {"1", 0x01000000}, + {"1.2", 0x02000001}, + {"1.2.3", 0x03000201}, + {"203569230", 0x4e38220c}, + {"[0.1.2.3]", 0xffffffff}, + {"0x00010203", 0x03020100}, + {"0x2134", 0x34210000}, + {"1234BEEF", 0xffffffff}, + {"017700000001", 0x0100007f}, + {"0777", 0xff010000}, + {"2607:f0d0:1002:51::4", 0xffffffff}, + {"::177.32.45.20", 0xffffffff}, + {"::1/128", 0xffffffff}, + {"::1", 0xffffffff}, + {":1", 0xffffffff}, + }; + u_long addr, expected; + unsigned int i; + char str[32]; + + WSASetLastError(0xdeadbeef); + addr = inet_addr(NULL); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(addr == 0xffffffff, "got addr %#08x\n", addr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context( "Address %s, i %u", debugstr_a(tests[i].input), i ); + WSASetLastError(0xdeadbeef); + addr = inet_addr(tests[i].input); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == tests[i].addr, "got addr %#08x\n", addr); + winetest_pop_context(); + } + + strcpy(str, "1.2.3"); + str[6] = 0; + for (i = 1; i < 256; ++i) + { + if (isdigit(i)) + continue; + str[5] = i; + expected = isspace(i) ? 0x03000201 : 0xffffffff; + addr = inet_addr(str); + ok(addr == expected, "got addr %#08x, expected %#08x, i %u\n", addr, expected, i); + } +} + static void test_inet_pton(void) { static const struct @@ -942,11 +1034,6 @@ static void test_inet_pton(void) ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); - WSASetLastError(0xdeadbeef); - ret = inet_addr(NULL); - ok(ret == INADDR_NONE, "got %#x\n", ret); - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { WCHAR inputW[32]; @@ -969,11 +1056,6 @@ static void test_inet_pton(void) ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); ok(addr == ipv4_tests[i].addr, "got addr %#08x\n", addr); - WSASetLastError(0xdeadbeef); - addr = inet_addr(ipv4_tests[i].input); - ok(addr == ipv4_tests[i].ret ? ipv4_tests[i].addr : INADDR_NONE, "got addr %#08x\n", addr); - ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); - winetest_pop_context(); } @@ -2871,6 +2953,7 @@ START_TEST( protocol ) test_WSALookupService(); test_inet_ntoa(); + test_inet_addr(); test_inet_pton(); test_addr_to_print(); test_WSAAddressToString();

1 0

Rémi Bernon : windows.gaming.input: Start a thread to monitor HID device addition and removal.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: d6be529ce8c44a9680259585f626340cb8d72033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6be529ce8c44a9680259585… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 4 10:05:08 2022 +0100 windows.gaming.input: Start a thread to monitor HID device addition and removal. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 3 +- dlls/windows.gaming.input/main.c | 145 ++++++++++++++++++++++++++++++++++ dlls/windows.gaming.input/private.h | 3 + dlls/windows.gaming.input/provider.c | 37 +++++++++ 4 files changed, 187 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index 24b5fb226b2..87cf0b8e386 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -1,11 +1,12 @@ MODULE = windows.gaming.input.dll -IMPORTS = combase uuid +IMPORTS = combase uuid user32 setupapi hid C_SRCS = \ controller.c \ gamepad.c \ main.c \ manager.c \ + provider.c \ vector.c IDL_SRCS = \ diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index c050d1d5113..0fc23cea5bf 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -23,6 +23,13 @@ #define COBJMACROS #include "windef.h" #include "winbase.h" +#include "winreg.h" +#include "winuser.h" + +#include "dbt.h" +#include "ddk/hidclass.h" +#include "ddk/hidsdi.h" +#include "setupapi.h" #include "initguid.h" #include "private.h" @@ -31,6 +38,127 @@ WINE_DEFAULT_DEBUG_CHANNEL(input); +static HINSTANCE windows_gaming_input; + +DEFINE_GUID( GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x47,0x67,0x50,0xc5,0xe1,0xa6 ); + +static LRESULT CALLBACK devnotify_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + DEV_BROADCAST_DEVICEINTERFACE_W *iface; + + TRACE( "hwnd %p, msg %#x, wparam %#Ix, lparam %#Ix\n", hwnd, msg, wparam, lparam ); + + if (msg == WM_DEVICECHANGE) + { + switch (wparam) + { + case DBT_DEVICEARRIVAL: + iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; + provider_create( iface->dbcc_name ); + break; + case DBT_DEVICEREMOVECOMPLETE: + iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; + provider_remove( iface->dbcc_name ); + break; + default: break; + } + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static void initialize_providers( void ) +{ + char buffer[offsetof( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + GUID guid = GUID_DEVINTERFACE_WINEXINPUT; + HDEVINFO set; + DWORD i = 0; + + set = SetupDiGetClassDevsW( NULL, NULL, NULL, DIGCF_ALLCLASSES | DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + + while (SetupDiEnumDeviceInterfaces( set, NULL, &guid, i++, &iface )) + { + detail->cbSize = sizeof(*detail); + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof(buffer), NULL, NULL )) continue; + provider_create( detail->DevicePath ); + } + + HidD_GetHidGuid( &guid ); + + while (SetupDiEnumDeviceInterfaces( set, NULL, &guid, i++, &iface )) + { + detail->cbSize = sizeof(*detail); + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof(buffer), NULL, NULL )) continue; + provider_create( detail->DevicePath ); + } + + SetupDiDestroyDeviceInfoList( set ); +} + +static DWORD WINAPI monitor_thread_proc( void *param ) +{ + DEV_BROADCAST_DEVICEINTERFACE_W filter = + { + .dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE_W), + .dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE, + }; + WNDCLASSEXW wndclass = + { + .cbSize = sizeof(WNDCLASSEXW), + .lpszClassName = L"__wine_gaming_input_devnotify", + .lpfnWndProc = devnotify_wndproc, + }; + HANDLE start_event = param; + HDEVNOTIFY devnotify; + HMODULE module; + HWND hwnd; + MSG msg; + + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (void *)windows_gaming_input, &module ); + RegisterClassExW( &wndclass ); + hwnd = CreateWindowExW( 0, wndclass.lpszClassName, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL ); + devnotify = RegisterDeviceNotificationW( hwnd, &filter, DEVICE_NOTIFY_ALL_INTERFACE_CLASSES ); + initialize_providers(); + SetEvent( start_event ); + + do + { + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + } while (!MsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, QS_ALLINPUT, MWMO_ALERTABLE )); + + UnregisterDeviceNotification( devnotify ); + DestroyWindow( hwnd ); + UnregisterClassW( wndclass.lpszClassName, NULL ); + + FreeLibraryAndExitThread( module, 0 ); + return 0; +} + +static BOOL WINAPI start_monitor_thread( INIT_ONCE *once, void *param, void **context ) +{ + HANDLE thread, start_event; + + start_event = CreateEventA( NULL, FALSE, FALSE, NULL ); + if (!start_event) ERR( "Failed to create start event, error %lu\n", GetLastError() ); + + thread = CreateThread( NULL, 0, monitor_thread_proc, start_event, 0, NULL ); + if (!thread) ERR( "Failed to create monitor thread, error %lu\n", GetLastError() ); + else + { + WaitForSingleObject( start_event, INFINITE ); + CloseHandle( thread ); + } + + CloseHandle( start_event ); + return !!thread; +} + HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) { FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); @@ -39,10 +167,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory **factory ) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; const WCHAR *buffer = WindowsGetStringRawBuffer( class_str, NULL ); TRACE( "class %s, factory %p.\n", debugstr_w(buffer), factory ); + InitOnceExecuteOnce( &init_once, start_monitor_thread, NULL, NULL ); + *factory = NULL; if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController )) @@ -55,3 +186,17 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** if (*factory) return S_OK; return REGDB_E_CLASSNOTREG; } + +BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) +{ + TRACE( "instance %p, reason %lu, reserved %p.\n", instance, reason, reserved ); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( instance ); + windows_gaming_input = instance; + break; + } + return TRUE; +} diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index c6dd1105896..87a3f677d8c 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -41,6 +41,9 @@ extern IActivationFactory *manager_factory; extern HRESULT vector_create( REFIID iid, REFIID view_iid, void **out ); +extern void provider_create( const WCHAR *device_path ); +extern void provider_remove( const WCHAR *device_path ); + #define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ static inline impl_type *impl_from_##iface_type( iface_type *iface ) \ { \ diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c new file mode 100644 index 00000000000..710349eb75f --- /dev/null +++ b/dlls/windows.gaming.input/provider.c @@ -0,0 +1,37 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2022 Rémi Bernon 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 + */ + +#include "private.h" + +#include "initguid.h" +#include "provider.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(input); + +void provider_create( const WCHAR *device_path ) +{ + FIXME( "device_path %s stub!\n", debugstr_w( device_path ) ); +} + +void provider_remove( const WCHAR *device_path ) +{ + FIXME( "device_path %s stub!\n", debugstr_w( device_path ) ); +}

1 0

Rémi Bernon : windows.gaming.input: Add an internal WineGameControllerProvider runtimeclass.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: afaf061edeb93ea98dff73121a791455e4567f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afaf061edeb93ea98dff7312… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 4 10:05:07 2022 +0100 windows.gaming.input: Add an internal WineGameControllerProvider runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 4 ++- dlls/windows.gaming.input/provider.idl | 55 ++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index d7f93283bec..24b5fb226b2 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -8,4 +8,6 @@ C_SRCS = \ manager.c \ vector.c -IDL_SRCS = classes.idl +IDL_SRCS = \ + classes.idl \ + provider.idl diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl new file mode 100644 index 00000000000..dc67a94acaa --- /dev/null +++ b/dlls/windows.gaming.input/provider.idl @@ -0,0 +1,55 @@ +/* + * Copyright 2022 Rémi Bernon 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 + */ + +#pragma makedep header + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.gaming.input.idl"; +import "windows.gaming.input.custom.idl"; + +namespace Windows.Gaming.Input.Custom { + interface IWineGameControllerProvider; + runtimeclass WineGameControllerProvider; + + [ + exclusiveto(Windows.Gaming.Input.Custom.WineGameControllerProvider), + uuid(8967b6ef-a4de-4b9a-984a-9f920b4d1b26) + ] + interface IWineGameControllerProvider : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerProvider + { + } + + [ + marshaling_behavior(agile), + threading(both) + ] + runtimeclass WineGameControllerProvider + { + [default] interface Windows.Gaming.Input.Custom.IWineGameControllerProvider; + interface Windows.Gaming.Input.Custom.IGameControllerProvider; + } +}

1 0