- Wine-Devel - list.winehq.org

[PATCH v4 1/3] windows.globalization: Implement IGlobalizationPreferencesStatics::HomeGeographicRegion.
by Rémi Bernon March 26, 2021

March 26, 2021

Returning the user default country. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Same as v3, fix the error handling but without the stupid typo. dlls/windows.globalization/main.c | 12 ++++++++++-- dlls/windows.globalization/tests/globalization.c | 15 +++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 17bb49a1c4e..84813152047 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -225,8 +225,16 @@ static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Languages( static HRESULT STDMETHODCALLTYPE globalization_preferences_get_HomeGeographicRegion( IGlobalizationPreferencesStatics *iface, HSTRING* out) { - FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + WCHAR country[16]; + + TRACE("iface %p, out %p.\n", iface, out); + + if (!GetUserDefaultGeoName(country, 16)) + return E_FAIL; + + TRACE("returning country %s\n", debugstr_w(country)); + + return WindowsCreateString(country, wcslen(country), out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_WeekStartsOn( diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 1918322b7a2..00d9cee5b0d 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -55,14 +55,11 @@ static void test_GlobalizationPreferences(void) BOOLEAN found; HRESULT hr; UINT32 len; - WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], *country, *tmp; + WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], country[16]; UINT32 i, size; GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); - if ((tmp = wcsrchr(locale, '_'))) *tmp = 0; - if (!(tmp = wcschr(locale, '-')) || (wcslen(tmp) > 3 && !(tmp = wcschr(tmp + 1, '-')))) country = wcsdup(L"US"); - else country = wcsdup(tmp + 1); - GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); + GetUserDefaultGeoName(country, 16); hr = pRoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); @@ -77,7 +74,6 @@ static void test_GlobalizationPreferences(void) win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); pWindowsDeleteString(str); pRoUninitialize(); - free(country); return; } @@ -101,8 +97,7 @@ static void test_GlobalizationPreferences(void) IAgileObject_Release(tmp_agile_object); hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); - todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); buf = pWindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); @@ -113,7 +108,8 @@ static void test_GlobalizationPreferences(void) pWindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IInspectable, (void **)&tmp_inspectable); ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); @@ -164,7 +160,6 @@ done: pWindowsDeleteString(str); pRoUninitialize(); - free(country); } START_TEST(globalization) -- 2.30.2

3 8

[PATCH 4/7] include: Add UAS_EXACTLEGACY define.
by Jacek Caban March 26, 2021

March 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/session.c | 4 ++-- dlls/urlmon/tests/misc.c | 4 ++-- include/urlmon.idl | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH 3/7] urlmon: Fix user agent suffix separator handling.
by Jacek Caban March 26, 2021

March 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/session.c | 19 +++++++++---------- dlls/urlmon/tests/misc.c | 3 +++ 2 files changed, 12 insertions(+), 10 deletions(-)

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud March 26, 2021

March 26, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 206 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 158 insertions(+), 48 deletions(-) diff --git a/po/nl.po b/po/nl.po index 4622ec87318..237bd4a8535 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-01-30 22:00+0100\n" +"PO-Revision-Date: 2021-03-26 15:45+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -14292,17 +14292,6 @@ msgid "Icons (*.ico)" msgstr "Pictogrammen (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14318,7 +14307,7 @@ msgstr "" " REG [opdracht] [parameters]\n" "\n" "Ondersteunde opdrachten:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Voor hulp bij een opdracht, type:\n" " REG [opdracht] /?\n" @@ -14373,6 +14362,55 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <sleutel> [/v waardenaam | /ve] [/t type] [/s scheidingsteken] " +"[/d gegevens] [/f]\n" +"\n" +" Voeg een sleutel toe aan het register of geef een nieuwe waarde aan een " +"registersleutel.\n" +"\n" +" <sleutel>\n" +" De registersleutel die toegevoegd wordt. Als [/v] of [/ve] is gegeven,\n" +" de sleutel waaraan de nieuwe registergegevens moeten worden toegevoegd.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" De naam van de registerwaarde die moet worden toegevoegd.\n" +"\n" +" /ve\n" +" Voeg een lege registerwaarde toe. Deze optie wijzigt de (Standaard)\n" +" registerwaarde.\n" +"\n" +" /t <type>\n" +" Het gegevenstype van de registersleutel. Als [/t] is gegeven, dan moet\n" +" <type> één van de volgende zijn:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Als [/t] niet is gegeven, dan wordt het type REG_SZ verondersteld.\n" +"\n" +" /s <scheidingsteken>\n" +" Het teken dat gebruikt wordt om gegevens in REG_MULTI_SZ te scheiden.\n" +" Als [/s] niet is gegeven, wordt het standaard teken \\0 verwacht.\n" +"\n" +" /d <gegevens>\n" +" De gevens die toegevoegd moeten worden aan een registerwaarde.\n" +"\n" +" /f\n" +" Wijzig het register zonder bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -14412,6 +14450,42 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <sleutel> [/v waardenaam | /ve | /va] [/f]\n" +"\n" +" Verwijder een registersleutel (inclusief alle subsleutels en waardes),\n" +" of een waarde van een registersleutel.\n" +"\n" +" <sleutel>\n" +" De registersleutel die moet worden verwijderd. Als [/v], [/ve] of [/va]\n" +" is gegeven, de registersleutel waarin de waarde moet worden verwijderd.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" De naam van de registerwaarde die verwijderd moet worden.\n" +"\n" +" /ve\n" +" Verwijder een lege registerwaarde. Deze optie haalt de (Standaard)\n" +" registerwaarde weg.\n" +"\n" +" /va\n" +" Verwijder alle waardes van een registersleutel.\n" +"\n" +" /f\n" +" Verwijder een registersleutel (inclusief alle subsleutels en waardes)\n" +" zonder bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -14447,16 +14521,47 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <sleutel> [/v waardenaam | /ve] [/s]\n" +"\n" +" Toon een registersleutel en laat alle directe subsleutels, waardes en\n" +" gegevens zien. Gebruik [/s] om de gegevens van de onderliggende\n" +" subsleutels te tonen.\n" +"\n" +" <sleutel>\n" +" De te tonen registersleutel.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" Toon de gegevens van de registerwaarde. Als noch [/v] noch [/ve] is\n" +" gegeven, worden alle waardes van de <sleutel> getoond.\n" +"\n" +" /ve\n" +" Toon een een lege registerwaarde. Deze optie vraagt de waarde op van\n" +" de (Standaard) registerwaarde.\n" +"\n" +" /s\n" +" Toon alle registervermeldingen onder <sleutel> en zijn subsleutels.\n" +"\n" #: programs/reg/reg.rc:116 msgid "The operation completed successfully\n" msgstr "De bewerking is succesvol voltooid\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Foutieve sleutelnaam\n" +msgstr "reg: Foutieve registersleutel\n" #: programs/reg/reg.rc:118 msgid "reg: Invalid command line parameters\n" @@ -14567,6 +14672,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <bestand>\n" +"\n" +" Importeer sleutels, waardes en gegevens uit een bestand in het register.\n" +"\n" +" <bestand>\n" +" De naam en het pad van het registerbestand dat geïmporteerd moet worden.\n" +"\n" #: programs/reg/reg.rc:149 msgid "reg: The file '%1' was not found.\n" @@ -14610,6 +14722,34 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <sleutel> <bestand> [/y]\n" +"\n" +" Exporteer een registersleutel (inclusief alle subsleutels en waardes)\n" +" naar een bestand.\n" +"\n" +" <sleutel>\n" +" De registersleutel die geëxporteerd moet worden.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" <bestand>\n" +" De naam en pad van het registerbestand dat aangemaakt wordt.\n" +" Dit bestand moet de extensie .reg hebben.\n" +"\n" +" /y\n" +" <bestand> overschrijven zonder een bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:172 msgid "reg: Invalid system key [%1]\n" @@ -15289,37 +15429,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: Verwijderen van DLL '%1' gelukt\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -15350,7 +15459,7 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"Start een programma, of open een document in het programma dat normaal voor\n" +"Start een programma, of open een document met het programma dat normaal voor\n" "deze extensie gebruikt wordt.\n" "Gebruik:\n" "start [opties] programma-naam [...]\n" @@ -15375,6 +15484,7 @@ msgstr "" " met de exit code.\n" "/unix Gebruik een Unix bestandsnaam en start het bestand zoals\n" " Windows Verkenner.\n" +"/exec Voer het opgegeven bestand uit (intern gebruikt in Wine).\n" "/ProgIDOpen Open een document met het specificeerde progID.\n" "/? Toon deze hulp en eindig.\n" -- 2.31.0

1 0

[PATCH 4/6] mmdevapi/tests: Use nameless unions.
by Jacek Caban March 26, 2021

March 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mmdevapi/tests/Makefile.in | 1 - dlls/mmdevapi/tests/propstore.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)

2 1

[PATCH 3/6] mmdevapi: Use nameless unions.
by Jacek Caban March 26, 2021

March 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/devenum.c | 52 ++++++++++++++++++------------------ dlls/mmdevapi/spatialaudio.c | 4 +-- 3 files changed, 28 insertions(+), 29 deletions(-)

2 1

[PATCH] atl80/tests: Request an older version of atl80 for compatibility.
by Francois Gouget March 26, 2021

March 26, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Some TestBot VMs only have version 8.0.50727.762 which is still sufficient for the current tests. Version .42 is the earliest atl80 version supported by the current crop. --- dlls/atl80/tests/atl80.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl80/tests/atl80.manifest b/dlls/atl80/tests/atl80.manifest index 712793fcb1b..fa833e28927 100644 --- a/dlls/atl80/tests/atl80.manifest +++ b/dlls/atl80/tests/atl80.manifest @@ -12,7 +12,7 @@ <assemblyIdentity type="win32" name="microsoft.vc80.atl" - version="8.0.50727.4053" + version="8.0.50727.42" processorArchitecture="*" publicKeyToken="1fc8b3b9a1e18e3b" language="*" -- 2.20.1

2 1

[PATCH v2 1/2] reg: Parse 'reg query' command-line arguments in query.c
by Hugh McMaster March 26, 2021

March 26, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- v2: Fix incorrect variable name causing apply failure. programs/reg/query.c | 51 +++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.c | 16 ++++++-------- programs/reg/reg.h | 3 +-- 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 6ab518c91d9..7ae99fad6d5 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -298,7 +298,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { HKEY key; @@ -325,3 +325,52 @@ int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } + +int reg_query(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_empty = FALSE, recurse = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 's': + recurse = TRUE; + break; + default: + goto invalid; + } + } + } + + if (value_name && value_empty) + goto invalid; + + return run_query(root, path, key_name, value_name, value_empty, recurse); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 53f87e1defa..88889205ca7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -337,7 +337,7 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; + BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -380,6 +380,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argc, argvW); + if (op == REG_QUERY) + return reg_query(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; @@ -429,12 +432,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } break; case 's': - if (op == REG_QUERY) - { - recurse = TRUE; - break; - } - ptr = argvW[++i]; if (!ptr || lstrlenW(ptr) != 1) { @@ -461,9 +458,8 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_ADD) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else if (op == REG_DELETE) - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); else - ret = reg_query(root, path, key_name, value_name, value_empty, recurse); + ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + return ret; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 89492ae8f74..e1e4804d19d 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -57,7 +57,6 @@ int reg_export(int argc, WCHAR *argvW[]); int reg_import(int argc, WCHAR *argvW[]); /* query.c */ -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL recurse); +int reg_query(int argc, WCHAR *argvW[]); #endif /* __REG_H__ */ -- 2.31.0

1 1

[PATCH 1/2] reg: Parse 'reg query' command-line arguments in query.c
by Hugh McMaster March 26, 2021

March 26, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/query.c | 51 +++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.c | 16 ++++++-------- programs/reg/reg.h | 3 +-- 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 6ab518c91d9..35d26488771 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -298,7 +298,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { HKEY key; @@ -325,3 +325,52 @@ int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } + +int reg_query(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_empty = FALSE, recurse = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*s)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 's': + recurse = TRUE; + break; + default: + goto invalid; + } + } + } + + if (value_name && value_empty) + goto invalid; + + return run_query(root, path, key_name, value_name, value_empty, recurse); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 53f87e1defa..88889205ca7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -337,7 +337,7 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; + BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -380,6 +380,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argc, argvW); + if (op == REG_QUERY) + return reg_query(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; @@ -429,12 +432,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } break; case 's': - if (op == REG_QUERY) - { - recurse = TRUE; - break; - } - ptr = argvW[++i]; if (!ptr || lstrlenW(ptr) != 1) { @@ -461,9 +458,8 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_ADD) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else if (op == REG_DELETE) - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); else - ret = reg_query(root, path, key_name, value_name, value_empty, recurse); + ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + return ret; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 89492ae8f74..e1e4804d19d 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -57,7 +57,6 @@ int reg_export(int argc, WCHAR *argvW[]); int reg_import(int argc, WCHAR *argvW[]); /* query.c */ -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL recurse); +int reg_query(int argc, WCHAR *argvW[]); #endif /* __REG_H__ */ -- 2.31.0

2 3

[tools] testbot/WineTest: Pass the full path to winetest.exe.
by Francois Gouget March 26, 2021

March 26, 2021

It is not installed in the wineprefix and thus is not in %PATH%. So Wine needs its full path to find it. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- Wine used to be able to find winetest.exe in the build tree but no longer (happened between f69c8f018188 and 12cfe6826773). This lets the TestBot run the tests on Wine VMs again but there is another issue with the WoW64 wineprefix creation. --- testbot/bin/build/WineTest.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index dd41fcf67..498b8afde 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -86,7 +86,8 @@ sub WineTestSuite($$$$) # there are test failures. my $BaseName = SetupTest("WineTest", $Mission); my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$DataDir/$BaseName.report") { @@ -96,7 +97,7 @@ sub WineTestSuite($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "winetest.exe", + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; @@ -142,7 +143,8 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $BaseName = SetupTest("the tests", $Mission); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); if (!-f "$DataDir/$BaseName.report") -- 2.20.1

1 0