From: Jonathan Vollebregt Subject: [v5 10/12] reg.exe: Clean up reg_add Message-Id: <1413571143-11658-10-git-send-email-jnvsor@gmail.com> Date: Fri, 17 Oct 2014 20:39:01 +0200 --- programs/reg/reg.c | 70 +++++++++++++++++++++++------------------------- programs/reg/tests/reg.c | 14 +++++----- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index c9efe47..a58eb9a 100755 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -356,29 +356,24 @@ static BYTE *wchar_get_data(const WCHAR *input, const DWORD type, } } -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( const WCHAR *key_name, const WCHAR *value_name, const BOOL value_empty, + const WCHAR *type, const WCHAR separator, const WCHAR *data, + const BOOL force) { - static const WCHAR stubW[] = {'A','D','D',' ','-',' ','%','s', - ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0}; - LPWSTR p; - HKEY root,subkey; + HKEY key; - reg_printfW(stubW, key_name, value_name, value_empty, type, data, force); - - p = strchrW(key_name,'\\'); - if (!p) + if (value_name && value_empty) { - reg_message(STRING_INVALID_KEY); + reg_message(STRING_INVALID_CMDLINE); return 1; } - p++; - root = path_get_rootkey(key_name); - if (!root) + key = path_get_rootkey(key_name); + if (!key) return 1; - if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) + key_name = strchrW(key_name, '\\'); + if (key_name && RegCreateKeyW(key, key_name + 1, &key) != ERROR_SUCCESS) { reg_message(STRING_INVALID_KEY); return 1; @@ -386,16 +381,15 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, if (value_name || data) { - DWORD reg_type; - DWORD reg_count = 0; - BYTE* reg_data = NULL; + DWORD size, reg_type; + BYTE *data_out; + + if (value_name && !value_name[0]) + value_name = NULL; - if (!force) + if (!force && RegQueryValueW(key, value_name, NULL, NULL) == ERROR_SUCCESS) { - if (RegQueryValueW(subkey,value_name,NULL,NULL)==ERROR_SUCCESS) - { - /* FIXME: Prompt for overwrite */ - } + /* FIXME: Prompt for overwrite */ } if (!type) @@ -405,29 +399,24 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, if (reg_type == -1) { - RegCloseKey(subkey); + RegCloseKey(key); reg_message(STRING_INVALID_CMDLINE); return 1; } - if (data) + data_out = wchar_get_data(data, reg_type, separator, &size); + if (!data_out) { - reg_data = wchar_get_data(data, reg_type, separator, ®_count); - if (!reg_data) - { - RegCloseKey(subkey); - reg_message(STRING_ERROR); - return 1; - } + RegCloseKey(key); + return 1; } - RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count); - HeapFree(GetProcessHeap(),0,reg_data); + RegSetValueExW(key, value_name, 0, reg_type, data_out, size); + HeapFree(GetProcessHeap(), 0, data_out); } - RegCloseKey(subkey); + RegCloseKey(key); reg_message(STRING_SUCCESS); - return 0; } @@ -593,7 +582,14 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashTW)) type = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashSW)) - separator = argvW[++i][0]; + { + if (argvW[++i][1]) + { + reg_message(STRING_INVALID_CMDLINE); + return 1; + } + separator = argvW[i][0]; + } else if (!lstrcmpiW(argvW[i], slashDW)) data = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashFW)) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index beaa662..4804888 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -123,7 +123,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "test", REG_SZ, "", 1, 0); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -131,7 +131,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test2", REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "test2", REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test3 /f /d \"\"", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -144,7 +144,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand1 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "expand1", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "expand1", REG_EXPAND_SZ, "", 1, 0); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -198,7 +198,7 @@ static void test_add(void) win_skip("broken reg.exe detected\n"); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -263,12 +263,12 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"\" /d \"three#little#strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"##\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"two##strings\" /f", &r); -- 2.1.1