ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regedit: Use a generic data type to correctly process all data types. 

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2017-06-20 13:25:32 +00:00 committed by Alexandre Julliard
parent 8fd6c63bf3
commit e3234f6ede
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/regedit/regproc.c
View File

@ -160,10 +160,10 @@ struct parser
HKEY hkey; /* current registry key */ HKEY hkey; /* current registry key */
WCHAR *key_name; /* current key name */ WCHAR *key_name; /* current key name */
WCHAR *value_name; /* value name */ WCHAR *value_name; /* value name */
DWORD parse_type; /* generic data type for parsing */
DWORD data_type; /* data type */ DWORD data_type; /* data type */
void *data; /* value data */ void *data; /* value data */
DWORD data_size; /* size of the data (in bytes) */ DWORD data_size; /* size of the data (in bytes) */
BOOL hex_type; /* parsing a hex data type */
enum parser_state state; /* current parser state */ enum parser_state state; /* current parser state */
}; };
@ -309,6 +309,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line)
if (strncmpW(ptr->tag, *line, ptr->len)) if (strncmpW(ptr->tag, *line, ptr->len))
continue; continue;
parser->parse_type = ptr->parse_type;
parser->data_type = ptr->parse_type; parser->data_type = ptr->parse_type;
*line += ptr->len; *line += ptr->len;
@ -323,7 +324,6 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line)
return FALSE; return FALSE;
parser->data_type = val; parser->data_type = val;
parser->hex_type = TRUE;
*line = end + 2; *line = end + 2;
} }
return TRUE; return TRUE;
@ -720,7 +720,7 @@ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos)
return line; return line;
} }
switch (parser->data_type) switch (parser->parse_type)
{ {
case REG_SZ: case REG_SZ:
set_state(parser, STRING_DATA); set_state(parser, STRING_DATA);
@ -728,10 +728,7 @@ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos)
case REG_DWORD: case REG_DWORD:
set_state(parser, DWORD_DATA); set_state(parser, DWORD_DATA);
break; break;
case REG_NONE: case REG_BINARY: /* all hex data types, including undefined */
case REG_EXPAND_SZ:
case REG_BINARY:
case REG_MULTI_SZ:
set_state(parser, HEX_DATA); set_state(parser, HEX_DATA);
break; break;
default: default:
@ -828,11 +825,10 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos)
RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type,
parser->data, parser->data_size); parser->data, parser->data_size);
if (parser->data_type == REG_DWORD || parser->hex_type) if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY)
{ {
HeapFree(GetProcessHeap(), 0, parser->data); HeapFree(GetProcessHeap(), 0, parser->data);
parser->data = NULL; parser->data = NULL;
parser->hex_type = FALSE;
} }
if (parser->reg_version == REG_VERSION_31) if (parser->reg_version == REG_VERSION_31)
@ -1469,10 +1465,10 @@ BOOL import_registry_file(FILE *reg_file)
parser.hkey = NULL; parser.hkey = NULL;
parser.key_name = NULL; parser.key_name = NULL;
parser.value_name = NULL; parser.value_name = NULL;
parser.parse_type = 0;
parser.data_type = 0; parser.data_type = 0;
parser.data = NULL; parser.data = NULL;
parser.data_size = 0; parser.data_size = 0;
parser.hex_type = FALSE;
parser.state = HEADER; parser.state = HEADER;
pos = parser.two_wchars; pos = parser.two_wchars;

16
programs/regedit/tests/regedit.c
View File

@ -457,14 +457,14 @@ static void test_basic_import(void)
"\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n"
"\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n\n"); "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n\n");
verify_reg(hkey, "Wine13a", REG_NONE, "Value", 6, 0); verify_reg(hkey, "Wine13a", REG_NONE, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine13d", 0x1000, "Value", 6, 0); verify_reg(hkey, "Wine13d", 0x1000, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine13e", 0x7fff, "Value", 6, 0); verify_reg(hkey, "Wine13e", 0x7fff, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0);
verify_reg_nonexist(hkey, "Wine13i"); todo_wine verify_reg_nonexist(hkey, "Wine13i");
RegCloseKey(hkey); RegCloseKey(hkey);