Hugh McMaster : regedit: Remove data types that cannot be imported and clean-up data_types array.
Alexandre Julliard
julliard at winehq.org
Wed Mar 29 15:02:51 CDT 2017
Module: wine
Branch: master
Commit: 523a61da855d0aff094553f65e263467dcab92f2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=523a61da855d0aff094553f65e263467dcab92f2
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Wed Mar 29 05:25:31 2017 +0000
regedit: Remove data types that cannot be imported and clean-up data_types array.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/regedit/regproc.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 066fb2d..a54a96f 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -205,21 +205,18 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type)
struct data_type { const WCHAR *tag; int len; int type; int parse_type; };
static const WCHAR quote[] = {'"'};
- static const WCHAR str[] = {'s','t','r',':','"'};
- static const WCHAR str2[] = {'s','t','r','(','2',')',':','"'};
static const WCHAR hex[] = {'h','e','x',':'};
static const WCHAR dword[] = {'d','w','o','r','d',':'};
static const WCHAR hexp[] = {'h','e','x','('};
- static const struct data_type data_types[] = { /* actual type */ /* type to assume for parsing */
- { quote, 1, REG_SZ, REG_SZ },
- { str, 5, REG_SZ, REG_SZ },
- { str2, 8, REG_EXPAND_SZ, REG_SZ },
- { hex, 4, REG_BINARY, REG_BINARY },
- { dword, 6, REG_DWORD, REG_DWORD },
- { hexp, 4, -1, REG_BINARY },
- { NULL, 0, 0, 0 }
- };
+ static const struct data_type data_types[] = {
+ /* tag len type parse type */
+ { quote, 1, REG_SZ, REG_SZ },
+ { hex, 4, REG_BINARY, REG_BINARY },
+ { dword, 6, REG_DWORD, REG_DWORD },
+ { hexp, 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */
+ { NULL, 0, 0, 0 }
+ };
const struct data_type *ptr;
int type;
More information about the wine-cvs
mailing list