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

advapi32: Fix registry API prototypes to match the PSDK.

This commit is contained in:
Bang Jun-Young 2006-07-08 22:26:16 +09:00 committed by Alexandre Julliard
parent 94af8633a4
commit 0542e835bb
2 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
dlls/advapi32/registry.c
View File

@ -154,9 +154,9 @@ inline static HKEY get_special_root_hkey( HKEY hkey )
* *
* See RegCreateKeyExA. * See RegCreateKeyExA.
*/ */
DWORD WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, LONG WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class,
DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
PHKEY retkey, LPDWORD dispos ) PHKEY retkey, LPDWORD dispos )
{ {
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW, classW; UNICODE_STRING nameW, classW;
@ -202,9 +202,9 @@ DWORD WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR cl
* FIXME * FIXME
* MAXIMUM_ALLOWED in access mask not supported by server * MAXIMUM_ALLOWED in access mask not supported by server
*/ */
DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, LONG WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class,
DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
PHKEY retkey, LPDWORD dispos ) PHKEY retkey, LPDWORD dispos )
{ {
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING classW; UNICODE_STRING classW;
@ -256,7 +256,7 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR clas
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: nonzero error code defined in Winerror.h * Failure: nonzero error code defined in Winerror.h
*/ */
DWORD WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult ) LONG WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult )
{ {
/* FIXME: previous implementation converted ERROR_INVALID_HANDLE to ERROR_BADKEY, */ /* FIXME: previous implementation converted ERROR_INVALID_HANDLE to ERROR_BADKEY, */
/* but at least my version of NT (4.0 SP5) doesn't do this. -- AJ */ /* but at least my version of NT (4.0 SP5) doesn't do this. -- AJ */
@ -270,7 +270,7 @@ DWORD WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult )
* *
* See RegCreateKeyW. * See RegCreateKeyW.
*/ */
DWORD WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult ) LONG WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult )
{ {
return RegCreateKeyExA( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, return RegCreateKeyExA( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_ALL_ACCESS, NULL, phkResult, NULL ); KEY_ALL_ACCESS, NULL, phkResult, NULL );
@ -283,7 +283,7 @@ DWORD WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult )
* *
* See RegOpenKeyExA. * See RegOpenKeyExA.
*/ */
DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM access, PHKEY retkey ) LONG WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM access, PHKEY retkey )
{ {
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
@ -321,7 +321,7 @@ DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM acce
* Unlike RegCreateKeyExA(), this function will not create the key if it * Unlike RegCreateKeyExA(), this function will not create the key if it
* does not exist. * does not exist.
*/ */
DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, PHKEY retkey ) LONG WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, PHKEY retkey )
{ {
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
STRING nameA; STRING nameA;
@ -353,7 +353,7 @@ DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acces
* *
* See RegOpenKeyA. * See RegOpenKeyA.
*/ */
DWORD WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey ) LONG WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey )
{ {
if (!name || !*name) if (!name || !*name)
{ {
@ -378,7 +378,7 @@ DWORD WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey )
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: A standard Win32 error code. retkey is set to 0. * Failure: A standard Win32 error code. retkey is set to 0.
*/ */
DWORD WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) LONG WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey )
{ {
if (!name || !*name) if (!name || !*name)
{ {
@ -409,7 +409,7 @@ DWORD WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey )
* Since Wine does not currently allow threads to impersonate other users, * Since Wine does not currently allow threads to impersonate other users,
* this stub should work fine. * this stub should work fine.
*/ */
DWORD WINAPI RegOpenCurrentUser( REGSAM access, PHKEY retkey ) LONG WINAPI RegOpenCurrentUser( REGSAM access, PHKEY retkey )
{ {
return RegOpenKeyExA( HKEY_CURRENT_USER, "", 0, access, retkey ); return RegOpenKeyExA( HKEY_CURRENT_USER, "", 0, access, retkey );
} }
@ -436,8 +436,8 @@ DWORD WINAPI RegOpenCurrentUser( REGSAM access, PHKEY retkey )
* Failure: System error code. If there are no more subkeys available, the * Failure: System error code. If there are no more subkeys available, the
* function returns ERROR_NO_MORE_ITEMS. * function returns ERROR_NO_MORE_ITEMS.
*/ */
DWORD WINAPI RegEnumKeyExW( HKEY hkey, DWORD index, LPWSTR name, LPDWORD name_len, LONG WINAPI RegEnumKeyExW( HKEY hkey, DWORD index, LPWSTR name, LPDWORD name_len,
LPDWORD reserved, LPWSTR class, LPDWORD class_len, FILETIME *ft ) LPDWORD reserved, LPWSTR class, LPDWORD class_len, FILETIME *ft )
{ {
NTSTATUS status; NTSTATUS status;
char buffer[256], *buf_ptr = buffer; char buffer[256], *buf_ptr = buffer;
@ -500,8 +500,8 @@ DWORD WINAPI RegEnumKeyExW( HKEY hkey, DWORD index, LPWSTR name, LPDWORD name_le
* *
* See RegEnumKeyExW. * See RegEnumKeyExW.
*/ */
DWORD WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_len, LONG WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_len,
LPDWORD reserved, LPSTR class, LPDWORD class_len, FILETIME *ft ) LPDWORD reserved, LPSTR class, LPDWORD class_len, FILETIME *ft )
{ {
NTSTATUS status; NTSTATUS status;
char buffer[256], *buf_ptr = buffer; char buffer[256], *buf_ptr = buffer;
@ -579,7 +579,7 @@ DWORD WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_len
* Failure: system error code. If there are no more subkeys available, the * Failure: system error code. If there are no more subkeys available, the
* function returns ERROR_NO_MORE_ITEMS. * function returns ERROR_NO_MORE_ITEMS.
*/ */
DWORD WINAPI RegEnumKeyW( HKEY hkey, DWORD index, LPWSTR name, DWORD name_len ) LONG WINAPI RegEnumKeyW( HKEY hkey, DWORD index, LPWSTR name, DWORD name_len )
{ {
return RegEnumKeyExW( hkey, index, name, &name_len, NULL, NULL, NULL, NULL ); return RegEnumKeyExW( hkey, index, name, &name_len, NULL, NULL, NULL, NULL );
} }
@ -590,7 +590,7 @@ DWORD WINAPI RegEnumKeyW( HKEY hkey, DWORD index, LPWSTR name, DWORD name_len )
* *
* See RegEnumKeyW. * See RegEnumKeyW.
*/ */
DWORD WINAPI RegEnumKeyA( HKEY hkey, DWORD index, LPSTR name, DWORD name_len ) LONG WINAPI RegEnumKeyA( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
{ {
return RegEnumKeyExA( hkey, index, name, &name_len, NULL, NULL, NULL, NULL ); return RegEnumKeyExA( hkey, index, name, &name_len, NULL, NULL, NULL, NULL );
} }
@ -625,10 +625,10 @@ DWORD WINAPI RegEnumKeyA( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
* - both allow class to be NULL and class_len to be NULL * - both allow class to be NULL and class_len to be NULL
* (it's hard to test validity, so test !NULL instead) * (it's hard to test validity, so test !NULL instead)
*/ */
DWORD WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPDWORD reserved, LONG WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPDWORD reserved,
LPDWORD subkeys, LPDWORD max_subkey, LPDWORD max_class, LPDWORD subkeys, LPDWORD max_subkey, LPDWORD max_class,
LPDWORD values, LPDWORD max_value, LPDWORD max_data, LPDWORD values, LPDWORD max_value, LPDWORD max_data,
LPDWORD security, FILETIME *modif ) LPDWORD security, FILETIME *modif )
{ {
NTSTATUS status; NTSTATUS status;
char buffer[256], *buf_ptr = buffer; char buffer[256], *buf_ptr = buffer;
@ -702,8 +702,8 @@ DWORD WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPDWO
* Failure: nonzero error code from Winerror.h ldwTotsize contains num needed * Failure: nonzero error code from Winerror.h ldwTotsize contains num needed
* bytes. * bytes.
*/ */
DWORD WINAPI RegQueryMultipleValuesA(HKEY hkey, PVALENTA val_list, DWORD num_vals, LONG WINAPI RegQueryMultipleValuesA( HKEY hkey, PVALENTA val_list, DWORD num_vals,
LPSTR lpValueBuf, LPDWORD ldwTotsize) LPSTR lpValueBuf, LPDWORD ldwTotsize )
{ {
unsigned int i; unsigned int i;
DWORD maxBytes = *ldwTotsize; DWORD maxBytes = *ldwTotsize;
@ -748,8 +748,8 @@ DWORD WINAPI RegQueryMultipleValuesA(HKEY hkey, PVALENTA val_list, DWORD num_val
* *
* See RegQueryMultipleValuesA. * See RegQueryMultipleValuesA.
*/ */
DWORD WINAPI RegQueryMultipleValuesW(HKEY hkey, PVALENTW val_list, DWORD num_vals, LONG WINAPI RegQueryMultipleValuesW( HKEY hkey, PVALENTW val_list, DWORD num_vals,
LPWSTR lpValueBuf, LPDWORD ldwTotsize) LPWSTR lpValueBuf, LPDWORD ldwTotsize )
{ {
unsigned int i; unsigned int i;
DWORD maxBytes = *ldwTotsize; DWORD maxBytes = *ldwTotsize;
@ -811,10 +811,10 @@ DWORD WINAPI RegQueryMultipleValuesW(HKEY hkey, PVALENTW val_list, DWORD num_val
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: nonzero error code from Winerror.h * Failure: nonzero error code from Winerror.h
*/ */
DWORD WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDWORD reserved, LONG WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDWORD reserved,
LPDWORD subkeys, LPDWORD max_subkey, LPDWORD max_class, LPDWORD subkeys, LPDWORD max_subkey, LPDWORD max_class,
LPDWORD values, LPDWORD max_value, LPDWORD max_data, LPDWORD values, LPDWORD max_value, LPDWORD max_data,
LPDWORD security, FILETIME *modif ) LPDWORD security, FILETIME *modif )
{ {
NTSTATUS status; NTSTATUS status;
char buffer[256], *buf_ptr = buffer; char buffer[256], *buf_ptr = buffer;
@ -885,7 +885,7 @@ DWORD WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDWOR
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: Error code * Failure: Error code
*/ */
DWORD WINAPI RegCloseKey( HKEY hkey ) LONG WINAPI RegCloseKey( HKEY hkey )
{ {
if (!hkey) return ERROR_INVALID_HANDLE; if (!hkey) return ERROR_INVALID_HANDLE;
if (hkey >= (HKEY)0x80000000) return ERROR_SUCCESS; if (hkey >= (HKEY)0x80000000) return ERROR_SUCCESS;
@ -898,7 +898,7 @@ DWORD WINAPI RegCloseKey( HKEY hkey )
* *
* See RegDeleteKeyA. * See RegDeleteKeyA.
*/ */
DWORD WINAPI RegDeleteKeyW( HKEY hkey, LPCWSTR name ) LONG WINAPI RegDeleteKeyW( HKEY hkey, LPCWSTR name )
{ {
DWORD ret; DWORD ret;
HKEY tmp; HKEY tmp;
@ -935,7 +935,7 @@ DWORD WINAPI RegDeleteKeyW( HKEY hkey, LPCWSTR name )
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: Error code * Failure: Error code
*/ */
DWORD WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) LONG WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name )
{ {
DWORD ret; DWORD ret;
HKEY tmp; HKEY tmp;
@ -982,8 +982,8 @@ DWORD WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name )
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: Error code * Failure: Error code
*/ */
DWORD WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, LONG WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved,
DWORD type, CONST BYTE *data, DWORD count ) DWORD type, CONST BYTE *data, DWORD count )
{ {
UNICODE_STRING nameW; UNICODE_STRING nameW;
@ -1011,8 +1011,8 @@ DWORD WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved,
* win95 does not care about count for REG_SZ and finds out the len by itself (js) * win95 does not care about count for REG_SZ and finds out the len by itself (js)
* NT does definitely care (aj) * NT does definitely care (aj)
*/ */
DWORD WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, LONG WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type,
CONST BYTE *data, DWORD count ) CONST BYTE *data, DWORD count )
{ {
ANSI_STRING nameA; ANSI_STRING nameA;
WCHAR *dataW = NULL; WCHAR *dataW = NULL;
@ -1071,7 +1071,7 @@ DWORD WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type,
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: nonzero error code from Winerror.h * Failure: nonzero error code from Winerror.h
*/ */
DWORD WINAPI RegSetValueW( HKEY hkey, LPCWSTR name, DWORD type, LPCWSTR data, DWORD count ) LONG WINAPI RegSetValueW( HKEY hkey, LPCWSTR name, DWORD type, LPCWSTR data, DWORD count )
{ {
HKEY subkey = hkey; HKEY subkey = hkey;
DWORD ret; DWORD ret;
@ -1097,7 +1097,7 @@ DWORD WINAPI RegSetValueW( HKEY hkey, LPCWSTR name, DWORD type, LPCWSTR data, DW
* *
* See RegSetValueW. * See RegSetValueW.
*/ */
DWORD WINAPI RegSetValueA( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count ) LONG WINAPI RegSetValueA( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count )
{ {
HKEY subkey = hkey; HKEY subkey = hkey;
DWORD ret; DWORD ret;
@ -1122,8 +1122,8 @@ DWORD WINAPI RegSetValueA( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWOR
* *
* See RegQueryValueExA. * See RegQueryValueExA.
*/ */
DWORD WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, LONG WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type,
LPBYTE data, LPDWORD count ) LPBYTE data, LPDWORD count )
{ {
NTSTATUS status; NTSTATUS status;
UNICODE_STRING name_str; UNICODE_STRING name_str;
@ -1208,8 +1208,8 @@ DWORD WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWOR
* MSDN states that if data is too small it is partially filled. In reality * MSDN states that if data is too small it is partially filled. In reality
* it remains untouched. * it remains untouched.
*/ */
DWORD WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type, LONG WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type,
LPBYTE data, LPDWORD count ) LPBYTE data, LPDWORD count )
{ {
NTSTATUS status; NTSTATUS status;
ANSI_STRING nameA; ANSI_STRING nameA;
@ -1306,7 +1306,7 @@ DWORD WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: nonzero error code from Winerror.h * Failure: nonzero error code from Winerror.h
*/ */
DWORD WINAPI RegQueryValueW( HKEY hkey, LPCWSTR name, LPWSTR data, LPLONG count ) LONG WINAPI RegQueryValueW( HKEY hkey, LPCWSTR name, LPWSTR data, LPLONG count )
{ {
DWORD ret; DWORD ret;
HKEY subkey = hkey; HKEY subkey = hkey;
@ -1335,7 +1335,7 @@ DWORD WINAPI RegQueryValueW( HKEY hkey, LPCWSTR name, LPWSTR data, LPLONG count
* *
* See RegQueryValueW. * See RegQueryValueW.
*/ */
DWORD WINAPI RegQueryValueA( HKEY hkey, LPCSTR name, LPSTR data, LPLONG count ) LONG WINAPI RegQueryValueA( HKEY hkey, LPCSTR name, LPSTR data, LPLONG count )
{ {
DWORD ret; DWORD ret;
HKEY subkey = hkey; HKEY subkey = hkey;
@ -1629,8 +1629,8 @@ LONG WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue,
* Failure: nonzero error code from Winerror.h * Failure: nonzero error code from Winerror.h
*/ */
DWORD WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_count, LONG WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_count,
LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count ) LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count )
{ {
NTSTATUS status; NTSTATUS status;
DWORD total_size; DWORD total_size;
@ -1714,8 +1714,8 @@ DWORD WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_co
* *
* See RegEnumValueW. * See RegEnumValueW.
*/ */
DWORD WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_count, LONG WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_count,
LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count ) LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count )
{ {
NTSTATUS status; NTSTATUS status;
DWORD total_size; DWORD total_size;
@ -1820,7 +1820,7 @@ DWORD WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_cou
* *
* See RegDeleteValueA. * See RegDeleteValueA.
*/ */
DWORD WINAPI RegDeleteValueW( HKEY hkey, LPCWSTR name ) LONG WINAPI RegDeleteValueW( HKEY hkey, LPCWSTR name )
{ {
UNICODE_STRING nameW; UNICODE_STRING nameW;
@ -1844,7 +1844,7 @@ DWORD WINAPI RegDeleteValueW( HKEY hkey, LPCWSTR name )
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: nonzero error code from Winerror.h * Failure: nonzero error code from Winerror.h
*/ */
DWORD WINAPI RegDeleteValueA( HKEY hkey, LPCSTR name ) LONG WINAPI RegDeleteValueA( HKEY hkey, LPCSTR name )
{ {
STRING nameA; STRING nameA;
NTSTATUS status; NTSTATUS status;
@ -2238,7 +2238,7 @@ LONG WINAPI RegGetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInformati
* Success: ERROR_SUCCESS * Success: ERROR_SUCCESS
* Failure: Error code * Failure: Error code
*/ */
DWORD WINAPI RegFlushKey( HKEY hkey ) LONG WINAPI RegFlushKey( HKEY hkey )
{ {
hkey = get_special_root_hkey( hkey ); hkey = get_special_root_hkey( hkey );
if (!hkey) return ERROR_INVALID_HANDLE; if (!hkey) return ERROR_INVALID_HANDLE;

66
include/winreg.h
View File

@ -89,9 +89,9 @@ BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL);
BOOL WINAPI InitiateSystemShutdownExA(LPSTR,LPSTR,DWORD,BOOL,BOOL,DWORD); BOOL WINAPI InitiateSystemShutdownExA(LPSTR,LPSTR,DWORD,BOOL,BOOL,DWORD);
BOOL WINAPI InitiateSystemShutdownExW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL,DWORD); BOOL WINAPI InitiateSystemShutdownExW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL,DWORD);
#define InitiateSystemShutdownEx WINELIB_NAME_AW(InitiateSystemShutdownEx); #define InitiateSystemShutdownEx WINELIB_NAME_AW(InitiateSystemShutdownEx);
DWORD WINAPI RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM, LONG WINAPI RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,
LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD); LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
DWORD WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM, LONG WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,
LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD); LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
#define RegCreateKeyEx WINELIB_NAME_AW(RegCreateKeyEx) #define RegCreateKeyEx WINELIB_NAME_AW(RegCreateKeyEx)
LONG WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES); LONG WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES);
@ -101,9 +101,9 @@ LONG WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIP
LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY); LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY);
LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY); LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY);
#define RegConnectRegistry WINELIB_NAME_AW(RegConnectRegistry) #define RegConnectRegistry WINELIB_NAME_AW(RegConnectRegistry)
DWORD WINAPI RegEnumKeyExA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPSTR, LONG WINAPI RegEnumKeyExA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPSTR,
LPDWORD,LPFILETIME); LPDWORD,LPFILETIME);
DWORD WINAPI RegEnumKeyExW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPWSTR, LONG WINAPI RegEnumKeyExW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPWSTR,
LPDWORD,LPFILETIME); LPDWORD,LPFILETIME);
#define RegEnumKeyEx WINELIB_NAME_AW(RegEnumKeyEx) #define RegEnumKeyEx WINELIB_NAME_AW(RegEnumKeyEx)
LONG WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,LPDWORD); LONG WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,LPDWORD);
@ -117,20 +117,20 @@ LONG WINAPI RegLoadMUIStringA(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCST
LONG WINAPI RegLoadMUIStringW(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR); LONG WINAPI RegLoadMUIStringW(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR);
#define RegLoadMUIString WINELIB_NAME_AW(RegLoadMUIString) #define RegLoadMUIString WINELIB_NAME_AW(RegLoadMUIString)
LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL); LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL);
DWORD WINAPI RegOpenCurrentUser(REGSAM,PHKEY); LONG WINAPI RegOpenCurrentUser(REGSAM,PHKEY);
DWORD WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY); LONG WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY);
DWORD WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY); LONG WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY);
#define RegOpenKeyEx WINELIB_NAME_AW(RegOpenKeyEx) #define RegOpenKeyEx WINELIB_NAME_AW(RegOpenKeyEx)
LONG WINAPI RegOpenUserClassesRoot(HANDLE,DWORD,REGSAM,PHKEY); LONG WINAPI RegOpenUserClassesRoot(HANDLE,DWORD,REGSAM,PHKEY);
DWORD WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD, LONG WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD,
LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD, LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,
LPDWORD,LPFILETIME); LPDWORD,LPFILETIME);
DWORD WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD, LONG WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,
LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD, LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,
LPDWORD,LPFILETIME); LPDWORD,LPFILETIME);
#define RegQueryInfoKey WINELIB_NAME_AW(RegQueryInfoKey) #define RegQueryInfoKey WINELIB_NAME_AW(RegQueryInfoKey)
DWORD WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); LONG WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD);
DWORD WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); LONG WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD);
#define RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues) #define RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues)
LONG WINAPI RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR); LONG WINAPI RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR);
LONG WINAPI RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR); LONG WINAPI RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR);
@ -144,38 +144,38 @@ LONG WINAPI RegUnLoadKeyW(HKEY,LPCWSTR);
/* Declarations for functions that are the same in Win16 and Win32 */ /* Declarations for functions that are the same in Win16 and Win32 */
DWORD WINAPI RegCloseKey(HKEY); LONG WINAPI RegCloseKey(HKEY);
DWORD WINAPI RegFlushKey(HKEY); LONG WINAPI RegFlushKey(HKEY);
DWORD WINAPI RegCreateKeyA(HKEY,LPCSTR,PHKEY); LONG WINAPI RegCreateKeyA(HKEY,LPCSTR,PHKEY);
DWORD WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY); LONG WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY);
#define RegCreateKey WINELIB_NAME_AW(RegCreateKey) #define RegCreateKey WINELIB_NAME_AW(RegCreateKey)
DWORD WINAPI RegDeleteKeyA(HKEY,LPCSTR); LONG WINAPI RegDeleteKeyA(HKEY,LPCSTR);
DWORD WINAPI RegDeleteKeyW(HKEY,LPCWSTR); LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR);
#define RegDeleteKey WINELIB_NAME_AW(RegDeleteKey) #define RegDeleteKey WINELIB_NAME_AW(RegDeleteKey)
DWORD WINAPI RegDeleteValueA(HKEY,LPCSTR); LONG WINAPI RegDeleteValueA(HKEY,LPCSTR);
DWORD WINAPI RegDeleteValueW(HKEY,LPCWSTR); LONG WINAPI RegDeleteValueW(HKEY,LPCWSTR);
#define RegDeleteValue WINELIB_NAME_AW(RegDeleteValue) #define RegDeleteValue WINELIB_NAME_AW(RegDeleteValue)
DWORD WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD); LONG WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD);
DWORD WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD); LONG WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD);
#define RegEnumKey WINELIB_NAME_AW(RegEnumKey) #define RegEnumKey WINELIB_NAME_AW(RegEnumKey)
DWORD WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); LONG WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); LONG WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
#define RegEnumValue WINELIB_NAME_AW(RegEnumValue) #define RegEnumValue WINELIB_NAME_AW(RegEnumValue)
DWORD WINAPI RegOpenKeyA(HKEY,LPCSTR,PHKEY); LONG WINAPI RegOpenKeyA(HKEY,LPCSTR,PHKEY);
DWORD WINAPI RegOpenKeyW(HKEY,LPCWSTR,PHKEY); LONG WINAPI RegOpenKeyW(HKEY,LPCWSTR,PHKEY);
#define RegOpenKey WINELIB_NAME_AW(RegOpenKey) #define RegOpenKey WINELIB_NAME_AW(RegOpenKey)
DWORD WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG); LONG WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG);
DWORD WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); LONG WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG);
#define RegQueryValue WINELIB_NAME_AW(RegQueryValue) #define RegQueryValue WINELIB_NAME_AW(RegQueryValue)
DWORD WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); LONG WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); LONG WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
#define RegQueryValueEx WINELIB_NAME_AW(RegQueryValueEx) #define RegQueryValueEx WINELIB_NAME_AW(RegQueryValueEx)
DWORD WINAPI RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); LONG WINAPI RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
DWORD WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD); LONG WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
#define RegSetValue WINELIB_NAME_AW(RegSetValue) #define RegSetValue WINELIB_NAME_AW(RegSetValue)
DWORD WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,CONST BYTE*,DWORD); LONG WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,CONST BYTE*,DWORD);
DWORD WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,CONST BYTE*,DWORD); LONG WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,CONST BYTE*,DWORD);
#define RegSetValueEx WINELIB_NAME_AW(RegSetValueEx) #define RegSetValueEx WINELIB_NAME_AW(RegSetValueEx)
#ifdef __cplusplus #ifdef __cplusplus