wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Francois Gouget : testbot: Increase the unique Job/Patch/RecordGroup id limits.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: tools Branch: master Commit: b5e9137932dc3e534ade627fdadd09c84fa23cf0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b5e9137932dc3e534ade627… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 17 07:55:26 2021 +0100 testbot: Increase the unique Job/Patch/RecordGroup id limits. First we don't actually care about the SQL formatting directives (i.e. the '(5)' in 'INT(5)'), and these have no impact on the allowed range. They are changed anyway only for consistency with the TestBot ORM declarations. However the TestBot ORM enforces the declared maximum number of digits. So increase those to allow the full range of the underlying database type, which in this case is 0..2^31-1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update45.sql | 24 ++++++++++++++++++++++++ testbot/ddl/winetestbot.sql | 18 +++++++++--------- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/lib/WineTestBot/RecordGroups.pm | 2 +- testbot/lib/WineTestBot/Records.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- 9 files changed, 41 insertions(+), 17 deletions(-) diff --git a/testbot/ddl/update45.sql b/testbot/ddl/update45.sql new file mode 100644 index 0000000..a04dba1 --- /dev/null +++ b/testbot/ddl/update45.sql @@ -0,0 +1,24 @@ +USE winetestbot; + +ALTER TABLE Patches + MODIFY Id INT NOT NULL AUTO_INCREMENT, + MODIFY WebPatchId INT NULL; + +ALTER TABLE PendingPatches + MODIFY PatchId INT NOT NULL; + +ALTER TABLE Jobs + MODIFY Id INT NOT NULL AUTO_INCREMENT, + MODIFY PatchId INT NULL; + +ALTER TABLE Steps + MODIFY JobId INT NOT NULL; + +ALTER TABLE Tasks + MODIFY JobId INT NOT NULL; + +ALTER TABLE RecordGroups + MODIFY Id INT NOT NULL AUTO_INCREMENT; + +ALTER TABLE Records + MODIFY RecordGroupId INT NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 1794b25..3b5cda7 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -66,8 +66,8 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Patches ( - Id INT(7) NOT NULL AUTO_INCREMENT, - WebPatchId INT(7) NULL, + Id INT NOT NULL AUTO_INCREMENT, + WebPatchId INT NULL, Received DATETIME NOT NULL, Disposition VARCHAR(40) NOT NULL, FromName VARCHAR(40) NULL, @@ -94,7 +94,7 @@ CREATE TABLE PendingPatches PendingPatchSetVersion INT(2) NOT NULL, PendingPatchSetTotalParts INT(2) NOT NULL, No INT(2) NOT NULL, - PatchId INT(7) NOT NULL, + PatchId INT NOT NULL, FOREIGN KEY (PendingPatchSetEMail, PendingPatchSetVersion, PendingPatchSetTotalParts) REFERENCES PendingPatchSets(EMail, Version, TotalParts), FOREIGN KEY (PatchId) REFERENCES Patches(Id), @@ -112,7 +112,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Jobs ( - Id INT(5) NOT NULL AUTO_INCREMENT, + Id INT NOT NULL AUTO_INCREMENT, BranchName VARCHAR(20) NOT NULL, UserName VARCHAR(40) NOT NULL, Priority INT(1) NOT NULL, @@ -120,7 +120,7 @@ CREATE TABLE Jobs Remarks VARCHAR(128) NULL, Submitted DATETIME NOT NULL, Ended DATETIME NULL, - PatchId INT(7) NULL, + PatchId INT NULL, FOREIGN KEY (BranchName) REFERENCES Branches(Name), FOREIGN KEY (UserName) REFERENCES Users(Name), FOREIGN KEY (PatchId) REFERENCES Patches(Id), @@ -130,7 +130,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Steps ( - JobId INT(5) NOT NULL, + JobId INT NOT NULL, No INT(2) NOT NULL, PreviousNo INT(2) NULL, Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, @@ -148,7 +148,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Tasks ( - JobId INT(5) NOT NULL, + JobId INT NOT NULL, StepNo INT(2) NOT NULL, No INT(2) NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, @@ -166,7 +166,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE RecordGroups ( - Id INT(6) NOT NULL AUTO_INCREMENT, + Id INT NOT NULL AUTO_INCREMENT, Timestamp DATETIME NOT NULL, PRIMARY KEY (Id) ) @@ -174,7 +174,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Records ( - RecordGroupId INT(6) NOT NULL, + RecordGroupId INT NOT NULL, Type ENUM('engine', 'tasks', 'vmresult', 'vmstatus') NOT NULL, Name VARCHAR(96) NOT NULL, Value VARCHAR(64) NULL, diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index aeecea0..5dbc1a7 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -446,7 +446,7 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Job", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("Id", "Job", 1, 1, "S", 10), CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index cb8c78c..b6a8af4 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -453,8 +453,8 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), - CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), + CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 10), CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 27cedfe..f094543 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -73,7 +73,7 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 6), + CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 10), CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), ); diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 00364f2..fd8e574 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -83,7 +83,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 6), + CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 921077b..0f65d63 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -247,7 +247,7 @@ my @PropertyDescriptors = ( ); SetDetailrefKeyPrefix("Step", @PropertyDescriptors); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index a9326be..0b1655a 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -177,7 +177,7 @@ sub CreateItem($) # Note: To simplify maintenance replace enums with simple string fields. my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), + CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step", !1, 1, "N", 2), CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateBasicPropertyDescriptor("TaskNo", "Task", !1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 141fee0..5cc2cc6 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -368,7 +368,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), @PropertyDescriptors );

1 0

Floris Renaud : Change Dutch Mailman web interface password.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: website Branch: master Commit: 65c74a7b7b000827adfd7d07d327ca52f89ef931 URL: https://source.winehq.org/git/website.git/?a=commit;h=65c74a7b7b000827adfd7… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Mar 18 17:46:04 2021 +0100 Change Dutch Mailman web interface password. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/nl/forums.template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/nl/forums.template b/templates/nl/forums.template index f4bb72c1..41ee86fe 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -45,11 +45,13 @@ Mailman gebruikersomgeving</a> website. </tr> <tr> <td>Wachtwoord:</td> - <td><code>getalist</code></td> + <td><code class="getForumKey bold cursor" data-code="RnljREw3S2tDdmhXUmJiRQ== +">**********************</code></td> <tr> </table> - Dit wachtwoord wordt van tijd tot tijd veranderd. + Klik op de code om het wachtwoord te tonen. + Dit wachtwoord wordt van tijd tot tijd veranderd. </div> Let op: Voordat u naar een bericht naar maillijst stuurt, moet u ingeschreven zijn.

1 0

Nikolay Sivov : urlmon: Remove unnecessary local variable.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 2828d0820a1661e46f606f28db090d710cef11f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2828d0820a1661e46f606f28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 17 23:43:28 2021 +0300 urlmon: Remove unnecessary local variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/binding.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index d35052dfdf6..a74970033b3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1126,8 +1126,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres HRESULT hres; if(!(This->state & BINDING_LOCKED)) { - HRESULT hres = IInternetProtocolEx_LockRequest( - &This->protocol->IInternetProtocolEx_iface, 0); + hres = IInternetProtocolEx_LockRequest(&This->protocol->IInternetProtocolEx_iface, 0); if(SUCCEEDED(hres)) This->state |= BINDING_LOCKED; }

1 0

Hugh McMaster : reg: Split 'add' functions from reg.c.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 7e7d92d5e97f89a409db0dd091419b4f1bfe7ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e7d92d5e97f89a409db0dd0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 17 23:38:06 2021 +1100 reg: Split 'add' functions from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/Makefile.in | 1 + programs/reg/add.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++ programs/reg/reg.c | 192 ------------------------------------------ programs/reg/reg.h | 4 + 4 files changed, 218 insertions(+), 192 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e7d92d5e97f89a409db…

1 0

Hugh McMaster : reg: Split 'delete' functions from reg.c.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 81a3eecc3c2e7ddced2f25cabc6de47101fd4fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81a3eecc3c2e7ddced2f25ca… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 17 23:38:05 2021 +1100 reg: Split 'delete' functions from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/Makefile.in | 1 + programs/reg/delete.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++ programs/reg/reg.c | 88 -------------------------------------- programs/reg/reg.h | 4 ++ 4 files changed, 114 insertions(+), 88 deletions(-) diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 3203126db66..161be0062f1 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -5,6 +5,7 @@ DELAYIMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ + delete.c \ export.c \ import.c \ query.c \ diff --git a/programs/reg/delete.c b/programs/reg/delete.c new file mode 100644 index 00000000000..530d4513ece --- /dev/null +++ b/programs/reg/delete.c @@ -0,0 +1,109 @@ +/* + * Copyright 2016-2017, 2021 Hugh McMaster + * + * 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 <windows.h> +#include <wine/heap.h> +#include "reg.h" + +int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL value_all, BOOL force) +{ + HKEY key; + + if (!force) + { + BOOL ret; + + if (value_name || value_empty) + ret = ask_confirm(STRING_DELETE_VALUE, value_name); + else if (value_all) + ret = ask_confirm(STRING_DELETE_VALUEALL, key_name); + else + ret = ask_confirm(STRING_DELETE_SUBKEY, key_name); + + if (!ret) + { + output_message(STRING_CANCELLED); + return 0; + } + } + + /* Delete subtree only if no /v* option is given */ + if (!value_name && !value_empty && !value_all) + { + if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + output_message(STRING_SUCCESS); + return 0; + } + + if (RegOpenKeyW(root, path, &key) != ERROR_SUCCESS) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + + if (value_all) + { + DWORD max_value_len = 256, value_len; + WCHAR *value_name; + LONG rc; + + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + + while (1) + { + value_len = max_value_len; + rc = RegEnumValueW(key, 0, value_name, &value_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + rc = RegDeleteValueW(key, value_name); + if (rc != ERROR_SUCCESS) + { + heap_free(value_name); + RegCloseKey(key); + output_message(STRING_VALUEALL_FAILED, key_name); + return 1; + } + } + else if (rc == ERROR_MORE_DATA) + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } + else break; + } + heap_free(value_name); + } + else if (value_name || value_empty) + { + if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS) + { + RegCloseKey(key); + output_message(STRING_CANNOT_FIND); + return 1; + } + } + + RegCloseKey(key); + output_message(STRING_SUCCESS); + return 0; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8b97c560118..079ed9b1a1e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -422,94 +422,6 @@ static int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 0; } -static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL value_all, BOOL force) -{ - HKEY key; - - if (!force) - { - BOOL ret; - - if (value_name || value_empty) - ret = ask_confirm(STRING_DELETE_VALUE, value_name); - else if (value_all) - ret = ask_confirm(STRING_DELETE_VALUEALL, key_name); - else - ret = ask_confirm(STRING_DELETE_SUBKEY, key_name); - - if (!ret) - { - output_message(STRING_CANCELLED); - return 0; - } - } - - /* Delete subtree only if no /v* option is given */ - if (!value_name && !value_empty && !value_all) - { - if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) - { - output_message(STRING_CANNOT_FIND); - return 1; - } - output_message(STRING_SUCCESS); - return 0; - } - - if (RegOpenKeyW(root, path, &key) != ERROR_SUCCESS) - { - output_message(STRING_CANNOT_FIND); - return 1; - } - - if (value_all) - { - DWORD max_value_len = 256, value_len; - WCHAR *value_name; - LONG rc; - - value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); - - while (1) - { - value_len = max_value_len; - rc = RegEnumValueW(key, 0, value_name, &value_len, NULL, NULL, NULL, NULL); - if (rc == ERROR_SUCCESS) - { - rc = RegDeleteValueW(key, value_name); - if (rc != ERROR_SUCCESS) - { - heap_free(value_name); - RegCloseKey(key); - output_message(STRING_VALUEALL_FAILED, key_name); - return 1; - } - } - else if (rc == ERROR_MORE_DATA) - { - max_value_len *= 2; - value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); - } - else break; - } - heap_free(value_name); - } - else if (value_name || value_empty) - { - if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS) - { - RegCloseKey(key); - output_message(STRING_CANNOT_FIND); - return 1; - } - } - - RegCloseKey(key); - output_message(STRING_SUCCESS); - return 0; -} - WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 471ed9c4d55..c8baaa0f9a9 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -41,6 +41,10 @@ HKEY path_get_rootkey(const WCHAR *path); WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len); BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); +/* delete.c */ +int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL value_all, BOOL force); + /* export.c */ int reg_export(int argc, WCHAR *argv[]);

1 0

Hugh McMaster : reg: Split 'query' functions from reg.c.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: b80de8721690947bcd2e86b658b261f201002039 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b80de8721690947bcd2e86b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 17 23:38:04 2021 +1100 reg: Split 'query' functions from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/Makefile.in | 1 + programs/reg/query.c | 329 +++++++++++++++++++++++++++++++++++++++++++++++ programs/reg/reg.c | 315 +-------------------------------------------- programs/reg/reg.h | 16 ++- 4 files changed, 346 insertions(+), 315 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b80de8721690947bcd2e…

1 0

Esme Povirk : mscoree/tests: Increase timeout in expected failure case.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: e402c8bfcb657168db12406843cc28b7a8d2c0e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e402c8bfcb657168db124068… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Mar 17 11:58:58 2021 -0500 mscoree/tests: Increase timeout in expected failure case. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 4be3da8c731..9974eff6335 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -646,7 +646,7 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, ret = CreateProcessW(tmpexe, tmpexe, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcessW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); - if (expect_failure) ret = WaitForSingleObject(pi.hProcess, 500); + if (expect_failure) ret = WaitForSingleObject(pi.hProcess, 2000); else { ret = WaitForSingleObject(pi.hProcess, 5000);

1 0

Nikolay Sivov : urlmon: Fix function name in the warning message.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 52c0e33536cc815f0565933c0ec95519b537a197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52c0e33536cc815f0565933c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 17 20:26:06 2021 +0300 urlmon: Fix function name in the warning message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index e6ffd366693..2acffdc1ffe 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -498,7 +498,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret HRESULT protocol_lock_request(Protocol *protocol) { if (!InternetLockRequestFile(protocol->request, &protocol->lock)) - WARN("InternetLockRequest failed: %d\n", GetLastError()); + WARN("InternetLockRequestFile failed: %d\n", GetLastError()); return S_OK; } @@ -509,7 +509,7 @@ HRESULT protocol_unlock_request(Protocol *protocol) return S_OK; if(!InternetUnlockRequestFile(protocol->lock)) - WARN("InternetUnlockRequest failed: %d\n", GetLastError()); + WARN("InternetUnlockRequestFile failed: %d\n", GetLastError()); protocol->lock = 0; return S_OK;

1 0

Rémi Bernon : include: Add Gamepad runtimeclass in windows.gaming.input.idl.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 76998f82de110c7e6ca203435c079ce01c150444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76998f82de110c7e6ca20343… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 17 13:07:04 2021 +0100 include: Add Gamepad runtimeclass in windows.gaming.input.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.gaming.input.idl | 153 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6c98f6d6c8b..1c80421ef6f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -750,6 +750,7 @@ SOURCES = \ windns.h \ windows.foundation.collections.idl \ windows.foundation.idl \ + windows.gaming.input.idl \ windows.h \ windows.media.speechsynthesis.idl \ windowscontracts.idl \ diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl new file mode 100644 index 00000000000..1da22408eeb --- /dev/null +++ b/include/windows.gaming.input.idl @@ -0,0 +1,153 @@ +/* + * Copyright 2021 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "eventtoken.idl"; +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Gaming { + namespace Input { + typedef enum GamepadButtons GamepadButtons; + typedef struct GamepadReading GamepadReading; + typedef struct GamepadVibration GamepadVibration; + interface IGameController; + interface IGameControllerBatteryInfo; + interface IGamepad; + interface IGamepad2; + interface IGamepadStatics; + interface IGamepadStatics2; + runtimeclass Gamepad; + } + } +} + +namespace Windows { + namespace Gaming { + namespace Input { + declare { + interface Windows.Foundation.EventHandler<Windows.Gaming.Input.Gamepad*>; + interface Windows.Foundation.Collections.IVectorView<Gamepad*>; + } + } + } +} + +namespace Windows { + namespace Gaming { + namespace Input { + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + flags + ] + enum GamepadButtons + { + None = 0x0, + Menu = 0x1, + View = 0x2, + A = 0x4, + B = 0x8, + X = 0x10, + Y = 0x20, + DPadUp = 0x40, + DPadDown = 0x80, + DPadLeft = 0x100, + DPadRight = 0x200, + LeftShoulder = 0x400, + RightShoulder = 0x800, + LeftThumbstick = 0x1000, + RightThumbstick = 0x2000, + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + Paddle1 = 0x4000, + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + Paddle2 = 0x8000, + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + Paddle3 = 0x10000, + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + Paddle4 = 0x20000 + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct GamepadReading + { + UINT64 Timestamp; + Windows.Gaming.Input.GamepadButtons Buttons; + DOUBLE LeftTrigger; + DOUBLE RightTrigger; + DOUBLE LeftThumbstickX; + DOUBLE LeftThumbstickY; + DOUBLE RightThumbstickX; + DOUBLE RightThumbstickY; + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct GamepadVibration + { + DOUBLE LeftMotor; + DOUBLE RightMotor; + DOUBLE LeftTrigger; + DOUBLE RightTrigger; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Gaming.Input.Gamepad), + uuid(bc7bb43c-0a69-3903-9e9d-a50f86a45de5) + ] + interface IGamepad : IInspectable + requires Windows.Gaming.Input.IGameController + { + [propget] HRESULT Vibration([out, retval] Windows.Gaming.Input.GamepadVibration* value); + [propput] HRESULT Vibration([in] Windows.Gaming.Input.GamepadVibration value); + HRESULT GetCurrentReading([out, retval] Windows.Gaming.Input.GamepadReading* value); + } + + [ + object, + uuid(8bbce529-d49c-39e9-9560-e47dde96b7c8) + ] + interface IGamepadStatics : IInspectable + { + [eventadd] HRESULT GamepadAdded([in] Windows.Foundation.EventHandler<Gamepad*> *value, [out, retval] EventRegistrationToken* token); + [eventremove] HRESULT GamepadAdded([in] EventRegistrationToken token); + [eventadd] HRESULT GamepadRemoved([in] Windows.Foundation.EventHandler<Gamepad*> *value, [out, retval] EventRegistrationToken* token); + [eventremove] HRESULT GamepadRemoved([in] EventRegistrationToken token); + [propget] HRESULT Gamepads([out, retval] Windows.Foundation.Collections.IVectorView<Gamepad*> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Gaming.Input.IGamepadStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Gaming.Input.IGamepadStatics2, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass Gamepad + { + [default] interface Windows.Gaming.Input.IGamepad; + interface Windows.Gaming.Input.IGameController; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Gaming.Input.IGamepad2; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Gaming.Input.IGameControllerBatteryInfo; + } + } + } +}

1 0

Rémi Bernon : include: Add EventRegistrationToken struct in eventtoken.idl.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: fb75a35514f3e1d6e2f6624af880d00ce9c0fc76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb75a35514f3e1d6e2f6624a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 17 13:07:03 2021 +0100 include: Add EventRegistrationToken struct in eventtoken.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/eventtoken.idl | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d3494dde7a0..6c98f6d6c8b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -283,6 +283,7 @@ SOURCES = \ errors.h \ errrec.idl \ evcode.h \ + eventtoken.idl \ evntprov.h \ evntrace.h \ evr.idl \ diff --git a/include/eventtoken.idl b/include/eventtoken.idl new file mode 100644 index 00000000000..0d27615a4ad --- /dev/null +++ b/include/eventtoken.idl @@ -0,0 +1,23 @@ +/* + * Copyright 2021 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 + */ + +struct EventRegistrationToken +{ + __int64 value; +}; +typedef struct EventRegistrationToken EventRegistrationToken;

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 2021