3 May
2015
3 May
'15
11:32 a.m.
Author: akhaldi
Date: Sun May 3 11:32:28 2015
New Revision: 67530
URL: http://svn.reactos.org/svn/reactos?rev=67530&view=rev
Log:
[REG_WINETEST] Import from Wine Staging 1.7.37. CORE-9246
Added:
trunk/rostests/winetests/reg/ (with props)
trunk/rostests/winetests/reg/CMakeLists.txt (with props)
trunk/rostests/winetests/reg/reg.c (with props)
trunk/rostests/winetests/reg/testlist.c (with props)
Modified:
trunk/rostests/winetests/CMakeLists.txt
Modified: trunk/rostests/winetests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?…
==============================================================================
--- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sun May 3 11:32:28 2015
@@ -76,6 +76,7 @@
add_subdirectory(qmgr)
add_subdirectory(quartz)
add_subdirectory(rasapi32)
+add_subdirectory(reg)
add_subdirectory(regedit)
add_subdirectory(riched20)
add_subdirectory(riched32)
Propchange: trunk/rostests/winetests/reg/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun May 3 11:32:28 2015
@@ -0,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/rostests/winetests/reg/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/rostests/winetests/reg/
------------------------------------------------------------------------------
bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Added: trunk/rostests/winetests/reg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/reg/CMakeLists.…
==============================================================================
--- trunk/rostests/winetests/reg/CMakeLists.txt (added)
+++ trunk/rostests/winetests/reg/CMakeLists.txt [iso-8859-1] Sun May 3 11:32:28 2015
@@ -0,0 +1,5 @@
+
+add_executable(reg_winetest reg.c testlist.c)
+set_module_type(reg_winetest win32cui)
+add_importlibs(reg_winetest advapi32 msvcrt kernel32)
+add_cd_file(TARGET reg_winetest DESTINATION reactos/bin FOR all)
Propchange: trunk/rostests/winetests/reg/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/rostests/winetests/reg/reg.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/reg/reg.c?rev=6…
==============================================================================
--- trunk/rostests/winetests/reg/reg.c (added)
+++ trunk/rostests/winetests/reg/reg.c [iso-8859-1] Sun May 3 11:32:28 2015
@@ -0,0 +1,429 @@
+/*
+ * Copyright 2014 Akihiro Sagawa
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windows.h>
+#include "wine/test.h"
+
+#define lok ok_(__FILE__,line)
+#define KEY_BASE "Software\\Wine\\reg_test"
+#define REG_EXIT_SUCCESS 0
+#define REG_EXIT_FAILURE 1
+#define TODO_REG_TYPE (0x0001u)
+#define TODO_REG_SIZE (0x0002u)
+#define TODO_REG_DATA (0x0004u)
+
+#define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r)
+static BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc)
+{
+ STARTUPINFOA si = {sizeof(STARTUPINFOA)};
+ PROCESS_INFORMATION pi;
+ BOOL bret;
+ DWORD ret;
+ char cmdline[256];
+
+ si.dwFlags = STARTF_USESTDHANDLES;
+ si.hStdInput = INVALID_HANDLE_VALUE;
+ si.hStdOutput = INVALID_HANDLE_VALUE;
+ si.hStdError = INVALID_HANDLE_VALUE;
+
+ strcpy(cmdline, cmd);
+ if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si,
&pi))
+ return FALSE;
+
+ ret = WaitForSingleObject(pi.hProcess, 10000);
+ if (ret == WAIT_TIMEOUT)
+ TerminateProcess(pi.hProcess, 1);
+
+ bret = GetExitCodeProcess(pi.hProcess, rc);
+ lok(bret, "GetExitCodeProcess failed: %d\n", GetLastError());
+
+ CloseHandle(pi.hThread);
+ CloseHandle(pi.hProcess);
+ return bret;
+}
+
+#define verify_reg(k,v,t,d,s,todo) verify_reg_(__LINE__,k,v,t,d,s,todo)
+static void verify_reg_(unsigned line, HKEY hkey, const char* value,
+ DWORD exp_type, const void *exp_data, DWORD exp_size, DWORD
todo)
+{
+ DWORD type, size;
+ BYTE data[256];
+ LONG err;
+
+ size = sizeof(data);
+ memset(data, 0xdd, size);
+ err = RegQueryValueExA(hkey, value, NULL, &type, data, &size);
+ lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err);
+ if (err != ERROR_SUCCESS)
+ return;
+
+ if (todo & TODO_REG_TYPE)
+ todo_wine lok(type == exp_type, "got wrong type %d, expected %d\n",
type, exp_type);
+ else
+ lok(type == exp_type, "got wrong type %d, expected %d\n", type,
exp_type);
+ if (todo & TODO_REG_SIZE)
+ todo_wine lok(size == exp_size, "got wrong size %d, expected %d\n",
size, exp_size);
+ else
+ lok(size == exp_size, "got wrong size %d, expected %d\n", size,
exp_size);
+ if (todo & TODO_REG_DATA)
+ todo_wine lok(memcmp(data, exp_data, size) == 0, "got wrong data\n");
+ else
+ lok(memcmp(data, exp_data, size) == 0, "got wrong data\n");
+}
+
+static void test_add(void)
+{
+ HKEY hkey, subkey;
+ LONG err;
+ DWORD r, dword, type, size;
+ char buffer[22];
+
+ run_reg_exe("reg add", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
+ ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
+
+ err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey);
+ ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey);
+ ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err);
+
+ /* Test empty type */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v emptyType /t \"\"
/d WineTest /f", &r);
+ ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),
+ "got exit code %u\n", r);
+ if (r == REG_EXIT_SUCCESS)
+ verify_reg(hkey, "emptyType", REG_SZ, "", 1, 0);
+ else
+ win_skip("broken reg.exe detected\n");
+
+ /* Test input key formats */
+ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f",
&r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0");
+ ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r);
+
+ run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f",
&r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest1");
+ ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f",
&r);
+ ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */),
+ "got exit code %u\n", r);
+ err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest2");
+ ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */),
+ "got exit code %d\n", r);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f",
&r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ,
&subkey);
+ ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err);
+ RegCloseKey(subkey);
+ err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3");
+ ok(err == ERROR_SUCCESS, "got exit code %d\n", r);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ,
&subkey);
+ ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err);
+ RegCloseKey(subkey);
+ err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4");
+ ok(err == ERROR_SUCCESS, "got exit code %d\n", r);
+
+ /* REG_NONE */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t
REG_NONE /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r);
+ verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0",
18, 0);
+
+ /* REG_SZ */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f",
&r);
+ ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),
+ "got exit code %d, expected 0\n", r);
+ if (r == REG_EXIT_SUCCESS)
+ verify_reg(hkey, "", REG_SZ, "WineTest", 9, 0);
+ else
+ win_skip("broken reg.exe detected\n");
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /d deadbeef /f",
&r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ verify_reg(hkey, "test", REG_SZ, "deadbeef", 9, 0);
+
+ 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, 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);
+ verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0);
+
+ 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, 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);
+ verify_reg(hkey, "test3", REG_SZ, "", 1, 0);
+
+ /* REG_EXPAND_SZ */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d
\"dead%PATH%beef\" /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15,
0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand1 /t REG_EXpand_sz /d
\"dead^%PATH^%beef\" /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef",
17, 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2
/f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "expand2", 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 %u\n", r);
+ verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand3 /f
/d \"\"", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0);
+
+ /* REG_BINARY */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0
/f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "bin0", REG_BINARY, buffer, 0, 0);
+
+ run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_BINARY
/d deadbeef /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ dword = 0xefbeadde;
+ verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d
0xDeAdBeEf", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin2 /f /d
x01", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin3 /f /d
01x", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin4 /f /d
DeAdBeEf0DD", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ /* Remaining nibble prefixed */
+ buffer[0] = 0x0d; buffer[1] = 0xea; buffer[2] = 0xdb;
+ buffer[3] = 0xee; buffer[4] = 0xf0; buffer[5] = 0xdd;
+ /* Remaining nibble suffixed on winXP */
+ buffer[6] = 0xde; buffer[7] = 0xad; buffer[8] = 0xbe;
+ buffer[9] = 0xef; buffer[10] = 0x0d; buffer[11] = 0xd0;
+ size = 6;
+ err = RegQueryValueExA(hkey, "bin4", NULL, &type, (void *) (buffer+12),
&size);
+ ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err);
+ ok(type == REG_BINARY, "got wrong type %u\n", type);
+ ok(size == 6, "got wrong size %u\n", size);
+ ok(memcmp(buffer, buffer+12, 6) == 0 ||
+ broken(memcmp(buffer+6, buffer+12, 6) == 0 /* WinXP */), "got wrong
data\n");
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin5 /d
\"\" /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "bin5", REG_BINARY, buffer, 0, 0);
+
+ /* REG_DWORD */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d
12345678", &r);
+ ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),
+ "got exit code %d, expected 0\n", r);
+ dword = 12345678;
+ if (r == REG_EXIT_SUCCESS)
+ verify_reg(hkey, "", REG_DWORD, &dword, sizeof(dword), 0);
+ else
+ win_skip("broken reg.exe detected\n");
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD
/f", &r);
+ ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */),
+ "got exit code %d, expected 0\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);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d
deadbeef /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d
123xyz /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword5 /t reg_dword /d
12345678 /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ dword = 12345678;
+ verify_reg(hkey, "dword5", REG_DWORD, &dword, sizeof(dword), 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword6 /t REG_DWORD /D 0123
/f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ size = sizeof(dword);
+ err = RegQueryValueExA(hkey, "dword6", NULL, &type, (LPBYTE)&dword,
&size);
+ ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err);
+ ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type,
REG_DWORD);
+ ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size,
(int)sizeof(DWORD));
+ ok(dword == 123 || broken(dword == 0123 /* WinXP */),
+ "got wrong data %d, expected %d\n", dword, 123);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d
0xabcdefg /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d
0xdeadbeef /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ dword = 0xdeadbeef;
+ verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d
-1", &r);
+ ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit
code %u\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d
-0x1", &r);
+ ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit
code %u\n", r);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d
0x01ffffffff /f", &r);
+ todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */),
"got exit code %d\n", r);
+
+ /* REG_DWORD_LITTLE_ENDIAN */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t
REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ dword = 456;
+ verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword,
sizeof(dword), 0);
+
+ /* REG_DWORD_BIG_ENDIAN */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t
REG_DWORD_BIG_ENDIAN /d 456 /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ dword = 456;
+ verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword,
sizeof(dword), 0);
+ /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like
+ * an ordinary REG_DWORD - that is little endian. GG */
+
+ /* REG_MULTI_SZ */
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d
\"three\\0little\\0strings\" /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ memcpy(buffer, "three\0little\0strings\0", 22);
+ verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s
\"#\" /d \"three#little#strings\" /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d
\"\" /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3
/f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ 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
\"#\" /d \"threelittlestrings\" /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0",
20, 0);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s
\"#randomgibberish\" /d \"three#little#strings\" /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s
\"\\0\" /d \"three\\0little\\0strings\" /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s
\"\" /d \"three#little#strings\" /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s
\"#\" /d \"##\" /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s
\"#\" /d \"two##strings\" /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s
\"#\" /d \"#a\" /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+
+ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s
\"#\" /d \"a#\" /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);
+ buffer[0]='a'; buffer[1]=0; buffer[2]=0;
+ verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, 0);
+
+ RegCloseKey(hkey);
+
+ err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
+ ok(err == ERROR_SUCCESS, "got %d\n", err);
+}
+
+static void test_delete(void)
+{
+ HKEY hkey, hsubkey;
+ LONG err;
+ DWORD r;
+ const DWORD deadbeef = 0xdeadbeef;
+
+ run_reg_exe("reg delete", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL,
&hkey, NULL);
+ ok(err == ERROR_SUCCESS, "got %d\n", err);
+
+ err = RegSetValueExA(hkey, "foo", 0, REG_DWORD, (LPBYTE)&deadbeef,
sizeof(deadbeef));
+ ok(err == ERROR_SUCCESS, "got %d\n" ,err);
+
+ err = RegSetValueExA(hkey, "bar", 0, REG_DWORD, (LPBYTE)&deadbeef,
sizeof(deadbeef));
+ ok(err == ERROR_SUCCESS, "got %d\n" ,err);
+
+ err = RegSetValueExA(hkey, "", 0, REG_DWORD, (LPBYTE)&deadbeef,
sizeof(deadbeef));
+ ok(err == ERROR_SUCCESS, "got %d\n" ,err);
+
+ err = RegCreateKeyExA(hkey, "subkey", 0, NULL, 0, KEY_ALL_ACCESS, NULL,
&hsubkey, NULL);
+ ok(err == ERROR_SUCCESS, "got %d\n" ,err);
+ RegCloseKey(hsubkey);
+
+ run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ err = RegQueryValueExA(hkey, "bar", NULL, NULL, NULL, NULL);
+ ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
+
+ run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL);
+ ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
+
+ run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ err = RegQueryValueExA(hkey, "foo", NULL, NULL, NULL, NULL);
+ ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
+ err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey);
+ ok(err == ERROR_SUCCESS, "got %d\n", err);
+ RegCloseKey(hsubkey);
+ RegCloseKey(hkey);
+
+ run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey);
+ ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
+
+ run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
+}
+
+static void test_query(void)
+{
+ DWORD r;
+ run_reg_exe("reg Query", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+}
+
+START_TEST(reg)
+{
+ DWORD r;
+ if (!run_reg_exe("reg.exe /?", &r)) {
+ win_skip("reg.exe not available, skipping reg.exe tests\n");
+ return;
+ }
+
+ test_add();
+ test_delete();
+ test_query();
+}
Propchange: trunk/rostests/winetests/reg/reg.c
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/rostests/winetests/reg/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/reg/testlist.c?…
==============================================================================
--- trunk/rostests/winetests/reg/testlist.c (added)
+++ trunk/rostests/winetests/reg/testlist.c [iso-8859-1] Sun May 3 11:32:28 2015
@@ -0,0 +1,12 @@
+/* Automatically generated by make depend; DO NOT EDIT!! */
+
+#define STANDALONE
+#include <wine/test.h>
+
+extern void func_reg(void);
+
+const struct test winetest_testlist[] =
+{
+ { "reg", func_reg },
+ { 0, 0 }
+};
Propchange: trunk/rostests/winetests/reg/testlist.c
------------------------------------------------------------------------------
svn:eol-style = native