Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-18 16:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] reg: Add a new message to indicate when a registry key fails to import.

Browse source 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 9b7a5cfb0e709e4434575daf960f803338bdf6bd by Hugh McMaster <hugh.mcmaster@outlook.com>

manual adjustment needed
This commit is contained in:
winesync 2022-01-16 21:01:12 +01:00 committed by Thomas Csovcsity
parent e11511da86
commit 235d5af3af
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/applications/cmdutils/reg/import.c
View file

@ -523,7 +523,7 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos)
if (open_key(parser, line) != ERROR_SUCCESS)
{
output_message(STRING_OPEN_KEY_FAILED, line);
output_message(STRING_KEY_IMPORT_FAILED, line);
return line;
}
@ -584,7 +584,7 @@ static WCHAR *key_name_state(struct parser *parser, WCHAR *pos)
return p + 1;
}
else if (open_key(parser, p) != ERROR_SUCCESS)
output_message(STRING_OPEN_KEY_FAILED, p);
output_message(STRING_KEY_IMPORT_FAILED, p);
done:
set_state(parser, LINE_START);

1
base/applications/cmdutils/reg/lang/en-US.rc
View file

@ -147,4 +147,5 @@ STRINGTABLE
STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n"
STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?"
STRING_KEY_NONEXIST, "reg: Unable to find the specified registry key\n"
STRING_KEY_IMPORT_FAILED, "reg: Unable to import the registry key '%1'\n"
}

1
base/applications/cmdutils/reg/resource.h
View file

@ -62,3 +62,4 @@
#define STRING_INVALID_SYSTEM_KEY 137
#define STRING_OVERWRITE_FILE 138
#define STRING_KEY_NONEXIST 139
#define STRING_KEY_IMPORT_FAILED 140

2
sdk/tools/winesync/reg.cfg
View file

@ -4,4 +4,4 @@ directories:
files:
programs/reg/resource.h: base/applications/cmdutils/reg/resource.h
tags:
wine: fa2ed01352f8f027625d464915cd953e10766d73
wine: 9b7a5cfb0e709e4434575daf960f803338bdf6bd