Changed to use new server-side registry support.

dlls/advapi32/Makefile.in

@@ -11,6 +11,7 @@ C_SRCS = \
 	advapi.c \
 	crypt.c \
 	eventlog.c \
+	registry.c \
 	security.c \
 	service.c
 

dlls/shell32/shell.spec

@@ -3,7 +3,7 @@ type	win16
 
   1 pascal   RegOpenKey(long str ptr) RegOpenKey16
   2 pascal   RegCreateKey(long str ptr) RegCreateKey16
-  3 pascal   RegCloseKey(long) RegCloseKey
+  3 pascal   RegCloseKey(long) RegCloseKey16
   4 pascal   RegDeleteKey(long str) RegDeleteKey16
   5 pascal   RegSetValue(long str long str long) RegSetValue16
   6 pascal   RegQueryValue(long str ptr ptr) RegQueryValue16

if1632/kernel.spec

@@ -226,7 +226,7 @@ file	krnl386.exe
 217 pascal RegOpenKey(long str ptr) RegOpenKey16                          # Both 95/NT
 218 pascal RegCreateKey(long str ptr) RegCreateKey16
 219 pascal RegDeleteKey(long str) RegDeleteKey16
-220 pascal RegCloseKey(long) RegCloseKey                                  # Both 95/NT
+220 pascal RegCloseKey(long) RegCloseKey16                                # Both 95/NT
 221 pascal RegSetValue(long str long ptr long) RegSetValue16
 222 pascal RegDeleteValue(long str) RegDeleteValue16
 223 pascal RegEnumValue(long long ptr ptr ptr ptr ptr ptr) RegEnumValue16 # Both 95/NT

include/wine/winbase16.h

@@ -166,16 +166,17 @@ BOOL16      WINAPI LocalUnlock16(HLOCAL16);
 HGLOBAL16   WINAPI LockSegment16(HGLOBAL16);
 FARPROC16   WINAPI MakeProcInstance16(FARPROC16,HANDLE16);
 VOID        WINAPI OutputDebugString16(LPCSTR);
+DWORD       WINAPI RegCloseKey16(HKEY);
 DWORD       WINAPI RegCreateKey16(HKEY,LPCSTR,LPHKEY);
 DWORD       WINAPI RegDeleteKey16(HKEY,LPCSTR);
 DWORD       WINAPI RegDeleteValue16(HKEY,LPSTR);
 DWORD       WINAPI RegEnumKey16(HKEY,DWORD,LPSTR,DWORD);
 DWORD       WINAPI RegEnumValue16(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
 DWORD       WINAPI RegOpenKey16(HKEY,LPCSTR,LPHKEY);
-DWORD       WINAPI RegQueryValue16(HKEY,LPSTR,LPSTR,LPDWORD);
-DWORD       WINAPI RegQueryValueEx16(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+DWORD       WINAPI RegQueryValue16(HKEY,LPCSTR,LPSTR,LPDWORD);
+DWORD       WINAPI RegQueryValueEx16(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
 DWORD       WINAPI RegSetValue16(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
-DWORD       WINAPI RegSetValueEx16(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
+DWORD       WINAPI RegSetValueEx16(HKEY,LPCSTR,DWORD,DWORD,CONST BYTE*,DWORD);
 BOOL16      WINAPI RemoveDirectory16(LPCSTR);
 BOOL16      WINAPI SetCurrentDirectory16(LPCSTR);
 UINT16      WINAPI SetErrorMode16(UINT16);

include/winnt.h

@@ -1282,6 +1282,9 @@ typedef enum tagSID_NAME_USE {
 #define GENERIC_EXECUTE            0x20000000
 #define GENERIC_ALL                0x10000000
 
+#define MAXIMUM_ALLOWED            0x02000000
+#define ACCESS_SYSTEM_SECURITY     0x01000000
+
 #define EVENT_MODIFY_STATE         0x0002
 #define EVENT_ALL_ACCESS           (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3)
 

include/winreg.h

@@ -50,7 +50,6 @@ extern "C" {
 #define	REG_OPTION_VOLATILE		0x00000001
 #define	REG_OPTION_CREATE_LINK		0x00000002
 #define	REG_OPTION_BACKUP_RESTORE	0x00000004 /* FIXME */
-#define	REG_OPTION_TAINTED		0x80000000 /* Internal? */
 
 #define REG_CREATED_NEW_KEY	0x00000001
 #define REG_OPENED_EXISTING_KEY	0x00000002