Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 13:16:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] reg: Allow /reg:32 and /reg:64 switches to be passed via the command line.

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44755
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 2b900e1c38d9bed0901ea036488e896e6df0cbe9 by Hugh McMaster <hugh.mcmaster@outlook.com>

manual adjustment needed
This commit is contained in:
winesync 2022-01-16 21:06:06 +01:00 • committed by Thomas Csovcsity
parent 9cf114d789
commit b6bc8e1371
9 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/applications/cmdutils/reg/add.c
View file

@ -235,6 +235,8 @@ int reg_add(int argc, WCHAR *argvW[])
value_empty = TRUE;
continue;
}
else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64"))
continue;
else if (!str[0] || str[1])
goto invalid;

2
base/applications/cmdutils/reg/delete.c
View file

@ -137,6 +137,8 @@ int reg_delete(int argc, WCHAR *argvW[])
value_empty = TRUE;
continue;
}
else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64"))
continue;
else if (!str[0] || str[1])
goto invalid;

2
base/applications/cmdutils/reg/export.c
View file

@ -368,6 +368,8 @@ int reg_export(int argc, WCHAR *argvW[])
if (is_char(*str, 'y') && !str[1])
overwrite_file = TRUE;
else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64"))
continue;
else
goto invalid;
}

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

@ -978,11 +978,19 @@ int reg_import(int argc, WCHAR *argvW[])
BYTE s[2];
struct parser parser;
if (argc > 3)
if (argc > 4) goto invalid;
if (argc == 4)
{
output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
return 1;
WCHAR *str = argvW[3];
if (*str != '/' && *str != '-')
goto invalid;
str++;
if (lstrcmpiW(str, L"reg:32") && lstrcmpiW(str, L"reg:64"))
goto invalid;
}
filename = argvW[2];
@ -1032,4 +1040,9 @@ int reg_import(int argc, WCHAR *argvW[])
error:
fclose(fp);
return 1;
invalid:
output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
return 1;
}

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

@ -148,4 +148,8 @@ STRINGTABLE
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"
STRING_REG_VIEW_USAGE, " /reg:32\n\
\ Access the registry using the 32-bit view.\n\n\
\ /reg:64\n\
\ Access the registry using the 64-bit view.\n\n"
}

2
base/applications/cmdutils/reg/query.c
View file

@ -347,6 +347,8 @@ int reg_query(int argc, WCHAR *argvW[])
value_empty = TRUE;
continue;
}
else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64"))
continue;
else if (!str[0] || str[1])
goto invalid;

1
base/applications/cmdutils/reg/reg.c
View file

@ -338,6 +338,7 @@ int __cdecl wmain(int argc, WCHAR *argvW[])
if (is_help_switch(argvW[2]))
{
output_message(op_help);
output_message(STRING_REG_VIEW_USAGE);
return 0;
}

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

@ -63,3 +63,4 @@
#define STRING_OVERWRITE_FILE 138
#define STRING_KEY_NONEXIST 139
#define STRING_KEY_IMPORT_FAILED 140
#define STRING_REG_VIEW_USAGE 141

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: 010cb1b4057550b2eb6c371db5ba5a8d11ef337e
wine: 2b900e1c38d9bed0901ea036488e896e6df0cbe9