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

Julian Rüger : German translation for release 6.5.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: website Branch: master Commit: 4c99108b866e0c9e5ef8322f7b281bb8ac0fafe5 URL: https://source.winehq.org/git/website.git/?a=commit;h=4c99108b866e0c9e5ef83… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 29 09:39:49 2021 +0200 German translation for release 6.5. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021032601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2021032601.xml b/news/de/2021032601.xml new file mode 100644 index 00000000..9c2af4dc --- /dev/null +++ b/news/de/2021032601.xml @@ -0,0 +1,17 @@ +<news> +<date>26. März 2021</date> +<title>Wine 6.5 freigegeben</title> +<body> + Die Entwicklungsversion 6.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>OpenCL-Unterstützung auf Version 1.2 aktualisiert.</li> + <li>Bessere Unterstützung von IE-Kompatibilitätsmodi in MSHTML.</li> + <li>Weitere Arbeit an fensterlosem RichEdit.</li> + <li>Eine kleine Zahl weiterer Stubs der WinRT-Bibliothek.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.4.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: website Branch: master Commit: 1c71b7898b5ac6dffcd3e4b937d103bdbf9cf599 URL: https://source.winehq.org/git/website.git/?a=commit;h=1c71b7898b5ac6dffcd3e… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 29 09:36:23 2021 +0200 German translation for release 6.4. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021031201.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2021031201.xml b/news/de/2021031201.xml new file mode 100644 index 00000000..16868268 --- /dev/null +++ b/news/de/2021031201.xml @@ -0,0 +1,18 @@ +<news> +<date>12. März 2021</date> +<title>Wine 6.4 freigegeben</title> +<body> + Die Entwicklungsversion 6.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung des DTLS-Protokolls.</li> + <li>Fontset-Unterstützung in DirectWrite.</li> + <li>Dialog zum Bearbeiten von ACL-Einträgen.</li> + <li>Theming-Unterstützung einiger weiterer Steuerelemente.</li> + <li>Unterstützung der koreanischen Wansung-Kodierung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.0.4.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: website Branch: master Commit: 9e1dce79a8171aa3c80302621cfdf76b0f724878 URL: https://source.winehq.org/git/website.git/?a=commit;h=9e1dce79a8171aa3c8030… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 29 09:37:03 2021 +0200 German translation for release 5.0.4. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021032301.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2021032301.xml b/news/de/2021032301.xml new file mode 100644 index 00000000..3213a641 --- /dev/null +++ b/news/de/2021032301.xml @@ -0,0 +1,13 @@ +<news> +<date>23. März 2021</date> +<title>Wine 5.0.4 freigegeben</title> +<body> + Die Wartungsversion 5.0.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.0.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 6.5
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: website Branch: master Commit: ab10b29da66b8075b258b9f47141d36ad133baf3 URL: https://source.winehq.org/git/website.git/?a=commit;h=ab10b29da66b8075b258b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 22:03:49 2021 +0100 Wine release 6.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021032601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021032601.xml b/news/en/2021032601.xml new file mode 100644 index 00000000..460d6b26 --- /dev/null +++ b/news/en/2021032601.xml @@ -0,0 +1,17 @@ +<news> +<date>March 26, 2021</date> +<title>Wine 6.5 Released</title> +<body> + The Wine development release 6.5 is now available. + <a href="{$root}/announce/6.5">What's new</a> in this release: +<ul> + <li>OpenCL support updated to version 1.2.</li> + <li>More support for IE compatibility modes in MSHTML.</li> + <li>More windowless RichEdit work.</li> + <li>A few more WinRT library stubs.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jan Sikorski : d3d11/tests: Test updates of 3D textures.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 684d3bc3bf465767761033c52d2e679ffc8a4006 URL: https://source.winehq.org/git/wine.git/?a=commit;h=684d3bc3bf465767761033c5… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 26 14:21:48 2021 +0100 d3d11/tests: Test updates of 3D textures. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 164 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=684d3bc3bf4657677610…

1 0

Hugh McMaster : reg: Fail if duplicate command-line switches are passed to 'reg query'.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 2c84ec7ee04ab03883907691f115e01a7165b6e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c84ec7ee04ab03883907691… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 26 23:30:05 2021 +1100 reg: Fail if duplicate command-line switches are passed to 'reg query'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 2 ++ programs/reg/tests/query.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 7ae99fad6d5..c8277cd7114 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -344,6 +344,7 @@ int reg_query(int argc, WCHAR *argvW[]) if (!lstrcmpiW(str, L"ve")) { + if (value_empty) goto invalid; value_empty = TRUE; continue; } @@ -357,6 +358,7 @@ int reg_query(int argc, WCHAR *argvW[]) goto invalid; break; case 's': + if (recurse) goto invalid; recurse = TRUE; break; default: diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index fcd43a4b195..e2b438f8c92 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -117,7 +117,7 @@ static void test_query(void) "got exit code %d, expected 0\n", r); run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); /* Clean-up, then query */ delete_key(key, "subkey");

1 0

Tag wine-6.5 : Alexandre Julliard : Release 6.5
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: refs/tags/wine-6.5 Tag: 1a2547fca1bd31432b089ee7aa5693032ee4632d URL: https://source.winehq.org/git/wine.git/?a=tag;h=1a2547fca1bd31432b089ee7aa5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 22:01:56 2021 +0100 Release 6.5

1 0

Alexandre Julliard : Release 6.5.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 71d41b37a1917cdf20cdb171dc73c20dbfdaeefa URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d41b37a1917cdf20cdb171… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 22:01:56 2021 +0100 Release 6.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1028 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 526 insertions(+), 526 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71d41b37a1917cdf20cd…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 31436b0a0611010bddcb632587d3a4b5b4c1a84a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31436b0a0611010bddcb6325… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Mar 26 21:50:27 2021 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 192 ++++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 146 insertions(+), 46 deletions(-) diff --git a/po/fi.po b/po/fi.po index 69a07195ba5..0edfd9e7461 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14196,17 +14196,6 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.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" @@ -14222,7 +14211,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, IMPORT, EXPORT, QUERY\n" +" ADD, DELETE, EXPORT, IMPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -14277,6 +14266,51 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <avain> [/v arvon_nimi | /ve] [/t laji] [/s erotin] [/d data] [/f]\n" +"\n" +" Lisää avaimen rekisteriin tai lisää uuden arvon rekisteriavaimeen.\n" +"\n" +" <avain>\n" +" Rekisteriavain, joka lisätään, tai jos [/v] tai [/ve] on annettu,\n" +" avain, johon uusi data lisätään.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\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" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Lisättävän rekisteriarvon nimi.\n" +"\n" +" /ve\n" +" Lisää nimetön rekisteriarvo. Tämä muokkaa (Oletus)-rekisteriarvoa.\n" +"\n" +" /t <laji>\n" +" Lisättävän datan laji. Jos [/t] annetaan, lajin pitää olla jokin\n" +" seuraavista:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Jos parametria [/t] ei anneta, datan laji on oletuksena REG_SZ.\n" +"\n" +" /s <erotin>\n" +" Merkki, jolla erotetaan merkkijonot tyypin REG_MULTI_SZ datassa.\n" +" Jos parametria [/s] ei anneta, erotin on oletuksena \\0.\n" +"\n" +" /d <data>\n" +" Rekisteriarvoon lisättävä data.\n" +"\n" +" /f\n" +" Muokkaa rekisteriä kysymättä vahvistusta.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -14316,6 +14350,40 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <avain> [/v arvon_nimi | /ve | /va] [/f]\n" +"\n" +" Poistaa rekisteriavaimen (mukaan lukien aliavaimet ja arvot), tai poistaa\n" +" yhden tai useamman arvon annetusta rekisteriavaimesta.\n" +"\n" +" <avain>\n" +" Poistettava rekisteriavain tai, jos [/v], [/ve] tai [/va] on annettu,\n" +" rekisteriavain, josta arvo tai arvot poistetaan.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\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" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Poistettavan rekisteriarvon nimi.\n" +"\n" +" /ve\n" +" Poista nimetön rekisteriarvo. Tämä poistaa (Oletus)-rekisteriarvon.\n" +"\n" +" /va\n" +" Poista kaikki arvot annetusta rekisteriavaimesta.\n" +"\n" +" /f\n" +" Poista rekisteriavain (mukaan lukien aliavaimet ja arvot) kysymättä\n" +" vahvistusta.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -14351,16 +14419,45 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <avain> [/v arvon_nimi | /ve] [/s]\n" +"\n" +" Hakee annetun rekisteriavaimen ja listaa sen välittömät aliavaimet, arvot\n" +" ja datan. Parametri [/s] hakee rekursiivisesti myös aliavainten sisällön.\n" +"\n" +" <avain>\n" +" Rekisteriavain, joka haetaan.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\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" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Haettavan rekisteriarvon nimi. Jos ei anneta parametria [/v] eikä [/" +"ve],\n" +" kaikki rekisteriavaimen alaiset arvot haetaan.\n" +"\n" +" /ve\n" +" Hae nimetön rekisteriarvo. Tämä hakee (Oletus)-rekisteriarvon.\n" +"\n" +" /s\n" +" Listaa kaikki rekisterin kohdat avaimen ja sen aliavainten alla.\n" +"\n" #: programs/reg/reg.rc:116 msgid "The operation completed successfully\n" msgstr "Toiminnon suorittaminen onnistui\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Avaimen nimi ei kelpaa\n" +msgstr "reg: Rekisteriavain ei kelpaa\n" #: programs/reg/reg.rc:118 msgid "reg: Invalid command line parameters\n" @@ -14469,6 +14566,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <tiedosto> [/y]\n" +"\n" +" Tuo avaimet, arvot ja datan tiedostosta rekisteriin.\n" +"\n" +" <tiedosto>\n" +" Tuotavan rekisteritiedoston nimi ja polku.\n" +"\n" #: programs/reg/reg.rc:149 msgid "reg: The file '%1' was not found.\n" @@ -14512,6 +14616,32 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <avain> <tiedosto> [/y]\n" +"\n" +" Vie rekisteriavaimen (mukaan lukien aliavaimet ja arvot) tiedostoon.\n" +"\n" +" <avain>\n" +" Vietävä rekisteriavain.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\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" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" <tiedosto>\n" +" Luotavan rekisteritiedoston nimi ja polku. Tiedostonimen tulee olla\n" +" .reg-päätteinen.\n" +"\n" +" /y\n" +" Ylikirjoita tiedosto kysymättä vahvistusta.\n" +"\n" #: programs/reg/reg.rc:172 msgid "reg: Invalid system key [%1]\n" @@ -15188,37 +15318,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: DLL:n '%1' asennus purettu\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" @@ -15273,6 +15372,7 @@ msgstr "" "/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" "/unix Käytä Unix-tiedostonimeä ja avaa tiedosto siten, kuin\n" " Windows Explorer avaisi sen.\n" +"/exec Käynnistä exec-funktiolla (Winen sisäistä käyttöä varten).\n" "/ProgIDOpen Avaa dokumentti määrätyllä progID:llä.\n" "/? Näytä tämä ohje ja lopeta.\n"

1 0

Hugh McMaster : reg: Parse 'reg query' command-line arguments in query.c.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 8e7738be92888c3aae19ab799d232d3f5112254c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7738be92888c3aae19ab79… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 26 23:30:04 2021 +1100 reg: Parse 'reg query' command-line arguments in query.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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__ */

1 0