June 2016 - Wine-commits - list.winehq.org

Julian Rüger : German translation for release 1.9.11
by Jeremy Newman 06 Jun '16

06 Jun '16

Module: website Branch: master Commit: 677721873154f6dd1fa69e12f04a337fae06eb6f URL: http://source.winehq.org/git/website.git/?a=commit;h=677721873154f6dd1fa69e… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 1 11:32:10 2016 +0200 German translation for release 1.9.11 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016052701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016052701.xml b/news/de/2016052701.xml new file mode 100644 index 0000000..d2b51b8 --- /dev/null +++ b/news/de/2016052701.xml @@ -0,0 +1,16 @@ +<news> +<date>27. Mai 2016</date> +<title>Wine 1.9.11 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.11 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.11">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere Unterstützung langer URLs in WinInet.</li> + <li>Diverse Direct3D-11-Verbesserungen.</li> + <li>Downmixing-Unterstützung in DirectSound.</li> + <li>Einige kosmetische Verbesserungen im Desktopmodus.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.11.tar.bz2">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 1.9.10
by Jeremy Newman 06 Jun '16

06 Jun '16

Module: website Branch: master Commit: 859947da0bf646825d85253e62bf9850f67b1f2d URL: http://source.winehq.org/git/website.git/?a=commit;h=859947da0bf646825d8525… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 1 11:24:42 2016 +0200 German translation for release 1.9.10 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016051701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016051701.xml b/news/de/2016051701.xml new file mode 100644 index 0000000..8b0b105 --- /dev/null +++ b/news/de/2016051701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. Mai 2016</date> +<title>Wine 1.9.10 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Hochauflösende ("Retina") Renderoption unter Mac OS X.</li> + <li>Kompatiblere Verzeichnisauflistung.</li> + <li>Mehrere Korrekturen an der C++-Laufzeit.</li> + <li>Verbesserungen an der Videoausgabe.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.10.tar.bz2">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

Łukasz Wojniłowicz : Polish translation for release 1.9.10
by Jeremy Newman 06 Jun '16

06 Jun '16

Module: website Branch: master Commit: f85500cccc86507a56e505fa0f5301327f20a40e URL: http://source.winehq.org/git/website.git/?a=commit;h=f85500cccc86507a56e505… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 28 06:22:41 2016 +0200 Polish translation for release 1.9.10 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016051701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016051701.xml b/news/pl/2016051701.xml new file mode 100644 index 0000000..86e7423 --- /dev/null +++ b/news/pl/2016051701.xml @@ -0,0 +1,16 @@ +<news> +<date>Maj 17, 2016</date> +<title>Wydano Wine 1.9.10</title> +<body> + Wydanie rozwojowe Wine 1.9.10 jest już dostępne. + <a href="{$root}/announce/1.9.10">Co nowego</a> w tym wydaniu: +<ul> + <li>Opcja wyświetlania w wysokiej rozdzielczości ("Retina") dla Mac OS X.</li> + <li>Większa zgodność wyliczania katalogów.</li> + <li>Kilka poprawek do biblioteki uruchomieniowej C++.</li> + <li>Ulepszenia w wyświetlaniu filmów.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.10.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.11
by Jeremy Newman 06 Jun '16

06 Jun '16

Module: website Branch: master Commit: 73c106ef1d6700280c366351e88b64da59ea2104 URL: http://source.winehq.org/git/website.git/?a=commit;h=73c106ef1d6700280c3663… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 28 06:22:42 2016 +0200 Polish translation for release 1.9.11 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016052701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016052701.xml b/news/pl/2016052701.xml new file mode 100644 index 0000000..a8dd21e --- /dev/null +++ b/news/pl/2016052701.xml @@ -0,0 +1,16 @@ +<news> +<date>Maj 27, 2016</date> +<title>Wydano Wine 1.9.11</title> +<body> + Wydanie rozwojowe Wine 1.9.11 jest już dostępne. + <a href="{$root}/announce/1.9.11">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsze wsparcie długich adresów URL w WinInet.</li> + <li>Rozmaite ulepszenia w Direct3D 11.</li> + <li>Wsparcie dla miksowania-w-dół w DirectSound.</li> + <li>Kilka ulepszeń kosmetycznych w trybie pulpitu.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.11.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Hugh McMaster : reg: Parse the registry operation using an enum.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 6a927ef70c742952be0b7581d61edb677abe58f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a927ef70c742952be0b7581d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:23:27 2016 +0000 reg: Parse the registry operation using an enum. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 71c1b89..3ba3902 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -888,13 +888,34 @@ static BOOL is_help_switch(const WCHAR *s) return FALSE; } -int wmain(int argc, WCHAR *argvW[]) +enum operations { + REG_ADD, + REG_DELETE, + REG_QUERY, + REG_INVALID +}; + +static const WCHAR addW[] = {'a','d','d',0}; +static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; +static const WCHAR queryW[] = {'q','u','e','r','y',0}; + +static enum operations get_operation(const WCHAR *str) { - int i; + if (!lstrcmpiW(str, addW)) + return REG_ADD; + + if (!lstrcmpiW(str, deleteW)) + return REG_DELETE; - static const WCHAR addW[] = {'a','d','d',0}; - static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; - static const WCHAR queryW[] = {'q','u','e','r','y',0}; + if (!lstrcmpiW(str, queryW)) + return REG_QUERY; + + return REG_INVALID; +} + +int wmain(int argc, WCHAR *argvW[]) +{ + int i, op; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; static const WCHAR slashSW[] = {'/','s',0}; @@ -916,7 +937,9 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } - if (!lstrcmpiW(argvW[1], addW)) + op = get_operation(argvW[1]); + + if (op == REG_ADD) { WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; BOOL value_empty = FALSE, force = FALSE; @@ -973,7 +996,7 @@ int wmain(int argc, WCHAR *argvW[]) return reg_add(key_name, value_name, value_empty, type, separator, data, force); } - else if (!lstrcmpiW(argvW[1], deleteW)) + else if (op == REG_DELETE) { WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; @@ -1010,7 +1033,7 @@ int wmain(int argc, WCHAR *argvW[]) } return reg_delete(key_name, value_name, value_empty, value_all, force); } - else if (!lstrcmpiW(argvW[1], queryW)) + else if (op == REG_QUERY) { WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, recurse = FALSE;

1 0

Hugh McMaster : reg: Exit with an error if the specified operation is invalid.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 33d657f55ccc304744917d92e832cd55a963bbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d657f55ccc304744917d92e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:23:39 2016 +0000 reg: Exit with an error if the specified operation is invalid. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 3ba3902..db737f7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -939,6 +939,13 @@ int wmain(int argc, WCHAR *argvW[]) op = get_operation(argvW[1]); + if (op == REG_INVALID) + { + output_message(STRING_INVALID_OPTION, argvW[1]); + output_message(STRING_REG_HELP); + return 1; + } + if (op == REG_ADD) { WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL;

1 0

Hugh McMaster : reg: Simplify help logic and syntax.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 45acfd9b5086a57dad59a0cab73436efa143134b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45acfd9b5086a57dad59a0cab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:23:51 2016 +0000 reg: Simplify help logic and syntax. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index db737f7..417fe88 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -916,6 +916,7 @@ static enum operations get_operation(const WCHAR *str) int wmain(int argc, WCHAR *argvW[]) { int i, op; + BOOL show_op_help = FALSE; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; static const WCHAR slashSW[] = {'/','s',0}; @@ -946,18 +947,22 @@ int wmain(int argc, WCHAR *argvW[]) return 1; } + if (argc > 2) + show_op_help = is_help_switch(argvW[2]); + + if (argc == 2 || (show_op_help && argc > 3)) + { + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, struprW(argvW[1])); + return 1; + } + if (op == REG_ADD) { WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; BOOL value_empty = FALSE, force = FALSE; - if (argc < 3) - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, struprW(argvW[1])); - return 1; - } - else if (argc == 3 && is_help_switch(argvW[2])) + if (show_op_help) { output_message(STRING_ADD_USAGE); return 0; @@ -1008,13 +1013,7 @@ int wmain(int argc, WCHAR *argvW[]) WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; - if (argc < 3) - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, struprW(argvW[1])); - return 1; - } - else if (argc == 3 && is_help_switch(argvW[2])) + if (show_op_help) { output_message(STRING_DELETE_USAGE); return 0; @@ -1045,13 +1044,7 @@ int wmain(int argc, WCHAR *argvW[]) WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, recurse = FALSE; - if (argc < 3) - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, struprW(argvW[1])); - return 1; - } - else if (argc == 3 && is_help_switch(argvW[2])) + if (show_op_help) { output_message(STRING_QUERY_USAGE); return 0;

1 0

Hugh McMaster : reg: Make help for registry operations common in wmain.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 2864105ef59e62692cd97ce23574c3606dff4c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2864105ef59e62692cd97ce23… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:24:00 2016 +0000 reg: Make help for registry operations common in wmain. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 417fe88..92f6428 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -956,18 +956,22 @@ int wmain(int argc, WCHAR *argvW[]) output_message(STRING_FUNC_HELP, struprW(argvW[1])); return 1; } + else if (show_op_help) + { + if (op == REG_ADD) + output_message(STRING_ADD_USAGE); + else if (op == REG_DELETE) + output_message(STRING_DELETE_USAGE); + else + output_message(STRING_QUERY_USAGE); + return 0; + } if (op == REG_ADD) { WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; BOOL value_empty = FALSE, force = FALSE; - if (show_op_help) - { - output_message(STRING_ADD_USAGE); - return 0; - } - key_name = argvW[2]; for (i = 1; i < argc; i++) { @@ -1013,12 +1017,6 @@ int wmain(int argc, WCHAR *argvW[]) WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; - if (show_op_help) - { - output_message(STRING_DELETE_USAGE); - return 0; - } - key_name = argvW[2]; for (i = 1; i < argc; i++) { @@ -1044,12 +1042,6 @@ int wmain(int argc, WCHAR *argvW[]) WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, recurse = FALSE; - if (show_op_help) - { - output_message(STRING_QUERY_USAGE); - return 0; - } - key_name = argvW[2]; for (i = 1; i < argc; i++) {

1 0

Hugh McMaster : reg: Move duplicate sane_path() calls to wmain.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: d57ad7b0541e6c96fa3526e8351637fd997b9b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57ad7b0541e6c96fa3526e83… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:24:12 2016 +0000 reg: Move duplicate sane_path() calls to wmain. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 92f6428..3a9dc2e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -351,9 +351,6 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, LPWSTR p; HKEY root,subkey; - if (!sane_path(key_name)) - return 1; - p = strchrW(key_name,'\\'); if (p) p++; @@ -431,9 +428,6 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, LPWSTR p; HKEY root,subkey; - if (!sane_path(key_name)) - return 1; - p = strchrW(key_name,'\\'); if (p) p++; @@ -836,9 +830,6 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL WCHAR newlineW[] = {'\n',0}; int ret; - if (!sane_path(key_name)) - return 1; - if (value_name && value_empty) { output_message(STRING_INVALID_CMDLINE); @@ -917,6 +908,7 @@ int wmain(int argc, WCHAR *argvW[]) { int i, op; BOOL show_op_help = FALSE; + WCHAR *key_name; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; static const WCHAR slashSW[] = {'/','s',0}; @@ -967,12 +959,16 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } + key_name = argvW[2]; + + if (!sane_path(key_name)) + return 1; + if (op == REG_ADD) { - WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; + WCHAR *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; BOOL value_empty = FALSE, force = FALSE; - key_name = argvW[2]; for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW)) @@ -1014,10 +1010,9 @@ int wmain(int argc, WCHAR *argvW[]) } else if (op == REG_DELETE) { - WCHAR *key_name, *value_name = NULL; + WCHAR *value_name = NULL; BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; - key_name = argvW[2]; for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW)) @@ -1039,10 +1034,9 @@ int wmain(int argc, WCHAR *argvW[]) } else if (op == REG_QUERY) { - WCHAR *key_name, *value_name = NULL; + WCHAR *value_name = NULL; BOOL value_empty = FALSE, recurse = FALSE; - key_name = argvW[2]; for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW))

1 0

Hugh McMaster : reg: Move duplicate path_get_rootkey() calls to wmain.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: ee718839646b41a3ca149acba56c567748864b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee718839646b41a3ca149acba… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:24:23 2016 +0000 reg: Move duplicate path_get_rootkey() calls to wmain. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 52 +++++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 3a9dc2e..9cf094e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -345,22 +345,15 @@ static BOOL sane_path(const WCHAR *key) return TRUE; } -static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, - WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) +static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, + WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { LPWSTR p; - HKEY root,subkey; + HKEY subkey; p = strchrW(key_name,'\\'); if (p) p++; - root = path_get_rootkey(key_name); - if (!root) - { - output_message(STRING_INVALID_KEY); - return 1; - } - if (value_name && value_empty) { output_message(STRING_INVALID_CMDLINE); @@ -422,22 +415,15 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 0; } -static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, - BOOL value_all, BOOL force) +static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, + BOOL value_all, BOOL force) { LPWSTR p; - HKEY root,subkey; + HKEY subkey; p = strchrW(key_name,'\\'); if (p) p++; - root = path_get_rootkey(key_name); - if (!root) - { - output_message(STRING_INVALID_KEY); - return 1; - } - if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) { output_message(STRING_INVALID_CMDLINE); @@ -823,10 +809,10 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) +static int reg_query(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { WCHAR *p; - HKEY root, key; + HKEY key; WCHAR newlineW[] = {'\n',0}; int ret; @@ -836,13 +822,6 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL return 1; } - root = path_get_rootkey(key_name); - if (!root) - { - output_message(STRING_INVALID_KEY); - return 1; - } - p = strchrW(key_name, '\\'); if (p) p++; @@ -909,6 +888,7 @@ int wmain(int argc, WCHAR *argvW[]) int i, op; BOOL show_op_help = FALSE; WCHAR *key_name; + HKEY root; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; static const WCHAR slashSW[] = {'/','s',0}; @@ -964,6 +944,13 @@ int wmain(int argc, WCHAR *argvW[]) if (!sane_path(key_name)) return 1; + root = path_get_rootkey(key_name); + if (!root) + { + output_message(STRING_INVALID_KEY); + return 1; + } + if (op == REG_ADD) { WCHAR *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; @@ -1005,8 +992,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashFW)) force = TRUE; } - return reg_add(key_name, value_name, value_empty, type, separator, - data, force); + return reg_add(root, key_name, value_name, value_empty, type, separator, data, force); } else if (op == REG_DELETE) { @@ -1030,7 +1016,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashFW)) force = TRUE; } - return reg_delete(key_name, value_name, value_empty, value_all, force); + return reg_delete(root, key_name, value_name, value_empty, value_all, force); } else if (op == REG_QUERY) { @@ -1052,7 +1038,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashSW)) recurse = TRUE; } - return reg_query(key_name, value_name, value_empty, recurse); + return reg_query(root, key_name, value_name, value_empty, recurse); } else {

1 0