Skip to content

W
wine-cw
Commit c7548d6c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

advapi32: Move registry functions to kernelbase.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7c2d5a7c
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 97 deletions
dlls/advapi32/Makefile.in
View file @ c7548d6c
EXTRADEFS = -D_ADVAPI32_
MODULE = advapi32.dll
IMPORTLIB = advapi32
IMPORTS = kernelbase
DELAYIMPORTS = rpcrt4
EXTRALIBS = $(SECURITY_LIBS)
......
dlls/advapi32/advapi32.spec
View file @ c7548d6c
......@@ -272,7 +272,7 @@
# @ stub EncryptionDisable
@ stdcall EnumDependentServicesA(long long ptr long ptr ptr)
@ stdcall EnumDependentServicesW(long long ptr long ptr ptr)
@ stdcall EnumDynamicTimeZoneInformation(long ptr) EnumDynamicTimeZoneInformation
@ stdcall -import EnumDynamicTimeZoneInformation(long ptr)
@ stub EnumServiceGroupA
@ stub EnumServiceGroupW
@ stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr)
......@@ -611,89 +611,89 @@
@ stdcall ReadEncryptedFileRaw(ptr ptr ptr)
@ stdcall ReadEventLogA (long long long ptr long ptr ptr)
@ stdcall ReadEventLogW (long long long ptr long ptr ptr)
@ stdcall RegCloseKey(long)
@ stdcall -import RegCloseKey(long)
@ stdcall RegConnectRegistryA(str long ptr)
# @ stub RegConnectRegistryExA
# @ stub RegConnectRegistryExW
@ stdcall RegConnectRegistryW(wstr long ptr)
@ stdcall RegCopyTreeA(long str long)
@ stdcall RegCopyTreeW(long wstr long)
@ stdcall -import RegCopyTreeW(long wstr long)
@ stdcall RegCreateKeyA(long str ptr)
@ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr)
@ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr)
@ stdcall -import RegCreateKeyExA(long str long ptr long long ptr ptr ptr)
@ stdcall -import RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr)
@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr)
@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr)
@ stdcall RegCreateKeyW(long wstr ptr)
@ stdcall RegDeleteKeyA(long str)
@ stdcall RegDeleteKeyExA(long str long long)
@ stdcall RegDeleteKeyExW(long wstr long long)
@ stdcall -import RegDeleteKeyExA(long str long long)
@ stdcall -import RegDeleteKeyExW(long wstr long long)
# @ stub RegDeleteKeyTransactedA
# @ stub RegDeleteKeyTransactedW
@ stdcall RegDeleteKeyValueA(long str str)
@ stdcall RegDeleteKeyValueW(long wstr wstr)
@ stdcall -import RegDeleteKeyValueA(long str str)
@ stdcall -import RegDeleteKeyValueW(long wstr wstr)
@ stdcall RegDeleteKeyW(long wstr)
@ stdcall RegDeleteTreeA(long str)
@ stdcall RegDeleteTreeW(long wstr)
@ stdcall RegDeleteValueA(long str)
@ stdcall RegDeleteValueW(long wstr)
@ stdcall -import RegDeleteTreeA(long str)
@ stdcall -import RegDeleteTreeW(long wstr)
@ stdcall -import RegDeleteValueA(long str)
@ stdcall -import RegDeleteValueW(long wstr)
@ stdcall RegDisablePredefinedCache()
# @ stub RegDisablePredefinedCacheEx
@ stdcall RegDisableReflectionKey(ptr)
# @ stub RegEnableReflectionKey
@ stdcall RegEnumKeyA(long long ptr long)
@ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr)
@ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr)
@ stdcall -import RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr)
@ stdcall -import RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr)
@ stdcall RegEnumKeyW(long long ptr long)
@ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr)
@ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr)
@ stdcall RegFlushKey(long)
@ stdcall RegGetKeySecurity(long long ptr ptr)
@ stdcall RegGetValueA(long str str long ptr ptr ptr)
@ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr)
@ stdcall RegLoadAppKeyA(str ptr long long long)
@ stdcall RegLoadAppKeyW(wstr ptr long long long)
@ stdcall RegLoadKeyA(long str str)
@ stdcall RegLoadKeyW(long wstr wstr)
@ stdcall RegLoadMUIStringA(long str str long ptr long str)
@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr)
@ stdcall RegNotifyChangeKeyValue(long long long long long)
@ stdcall RegOpenCurrentUser(long ptr)
@ stdcall -import RegEnumValueA(long long ptr ptr ptr ptr ptr ptr)
@ stdcall -import RegEnumValueW(long long ptr ptr ptr ptr ptr ptr)
@ stdcall -import RegFlushKey(long)
@ stdcall -import RegGetKeySecurity(long long ptr ptr)
@ stdcall -import RegGetValueA(long str str long ptr ptr ptr)
@ stdcall -import RegGetValueW(long wstr wstr long ptr ptr ptr)
@ stdcall -import RegLoadAppKeyA(str ptr long long long)
@ stdcall -import RegLoadAppKeyW(wstr ptr long long long)
@ stdcall -import RegLoadKeyA(long str str)
@ stdcall -import RegLoadKeyW(long wstr wstr)
@ stdcall -import RegLoadMUIStringA(long str str long ptr long str)
@ stdcall -import RegLoadMUIStringW(long wstr wstr long ptr long wstr)
@ stdcall -import RegNotifyChangeKeyValue(long long long long long)
@ stdcall -import RegOpenCurrentUser(long ptr)
@ stdcall RegOpenKeyA(long str ptr)
@ stdcall RegOpenKeyExA(long str long long ptr)
@ stdcall RegOpenKeyExW(long wstr long long ptr)
@ stdcall -import RegOpenKeyExA(long str long long ptr)
@ stdcall -import RegOpenKeyExW(long wstr long long ptr)
# @ stub RegOpenKeyTransactedA
# @ stub RegOpenKeyTransactedW
@ stdcall RegOpenKeyW(long wstr ptr)
@ stdcall RegOpenUserClassesRoot(ptr long long ptr)
@ stdcall -import RegOpenUserClassesRoot(ptr long long ptr)
@ stdcall RegOverridePredefKey(long long)
@ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall -import RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall -import RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr)
@ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr)
@ stdcall RegQueryReflectionKey(long ptr)
@ stdcall RegQueryValueA(long str ptr ptr)
@ stdcall RegQueryValueExA(long str ptr ptr ptr ptr)
@ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr)
@ stdcall -import RegQueryValueExA(long str ptr ptr ptr ptr)
@ stdcall -import RegQueryValueExW(long wstr ptr ptr ptr ptr)
@ stdcall RegQueryValueW(long wstr ptr ptr)
@ stub RegRemapPreDefKey
# @ stub RegRenameKey
@ stdcall RegReplaceKeyA(long str str str)
@ stdcall RegReplaceKeyW(long wstr wstr wstr)
@ stdcall RegRestoreKeyA(long str long)
@ stdcall RegRestoreKeyW(long wstr long)
@ stdcall -import RegRestoreKeyA(long str long)
@ stdcall -import RegRestoreKeyW(long wstr long)
@ stdcall RegSaveKeyA(long ptr ptr)
@ stdcall RegSaveKeyExA(long str ptr long)
@ stdcall RegSaveKeyExW(long wstr ptr long)
@ stdcall -import RegSaveKeyExA(long str ptr long)
@ stdcall -import RegSaveKeyExW(long wstr ptr long)
@ stdcall RegSaveKeyW(long ptr ptr)
@ stdcall RegSetKeySecurity(long long ptr)
@ stdcall RegSetKeyValueA(long str str long ptr long)
@ stdcall RegSetKeyValueW(long wstr wstr long ptr long)
@ stdcall -import RegSetKeySecurity(long long ptr)
@ stdcall -import RegSetKeyValueA(long str str long ptr long)
@ stdcall -import RegSetKeyValueW(long wstr wstr long ptr long)
@ stdcall RegSetValueA(long str long ptr long)
@ stdcall RegSetValueExA(long str long long ptr long)
@ stdcall RegSetValueExW(long wstr long long ptr long)
@ stdcall -import RegSetValueExA(long str long long ptr long)
@ stdcall -import RegSetValueExW(long wstr long long ptr long)
@ stdcall RegSetValueW(long wstr long ptr long)
@ stdcall RegUnLoadKeyA(long str)
@ stdcall RegUnLoadKeyW(long wstr)
@ stdcall -import RegUnLoadKeyA(long str)
@ stdcall -import RegUnLoadKeyW(long wstr)
@ stdcall RegisterEventSourceA(str str)
@ stdcall RegisterEventSourceW(wstr wstr)
# @ stub RegisterIdleTask
......
dlls/advapi32/registry.c
View file @ c7548d6c
This source diff could not be displayed because it is too large. You can view the blob instead.
dlls/kernelbase/kernelbase.spec
View file @ c7548d6c
......@@ -262,7 +262,7 @@
@ stdcall DeleteVolumeMountPointW(wstr) kernel32.DeleteVolumeMountPointW
@ stdcall DestroyPrivateObjectSecurity(ptr) advapi32.DestroyPrivateObjectSecurity
@ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl
# @ stub DisablePredefinedHandleTableInternal
@ stdcall DisablePredefinedHandleTableInternal(long)
@ stdcall DisableThreadLibraryCalls(long) kernel32.DisableThreadLibraryCalls
@ stdcall DisassociateCurrentThreadFromCallback(ptr) kernel32.DisassociateCurrentThreadFromCallback
# @ stub DiscardVirtualMemory
......@@ -297,7 +297,7 @@
@ stdcall EnumDateFormatsExW(ptr long long) kernel32.EnumDateFormatsExW
@ stdcall EnumDateFormatsW(ptr long long) kernel32.EnumDateFormatsW
# @ stub EnumDeviceDrivers
@ stdcall EnumDynamicTimeZoneInformation(long ptr) advapi32.EnumDynamicTimeZoneInformation
@ stdcall EnumDynamicTimeZoneInformation(long ptr)
@ stdcall EnumLanguageGroupLocalesW(ptr long long ptr) kernel32.EnumLanguageGroupLocalesW
# @ stub EnumPageFilesA
# @ stub EnumPageFilesW
......@@ -1256,31 +1256,31 @@
# @ stub ReclaimVirtualMemory
# @ stub RefreshPolicyExInternal
# @ stub RefreshPolicyInternal
@ stdcall -private RegCloseKey(long) kernel32.RegCloseKey
@ stdcall RegCopyTreeW(long wstr long) advapi32.RegCopyTreeW
@ stdcall -private RegCreateKeyExA(long str long ptr long long ptr ptr ptr) kernel32.RegCreateKeyExA
@ stdcall RegCloseKey(long)
@ stdcall RegCopyTreeW(long wstr long)
@ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr)
# @ stub RegCreateKeyExInternalA
# @ stub RegCreateKeyExInternalW
@ stdcall -private RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) kernel32.RegCreateKeyExW
@ stdcall -private RegDeleteKeyExA(long str long long) kernel32.RegDeleteKeyExA
@ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr)
@ stdcall RegDeleteKeyExA(long str long long)
# @ stub RegDeleteKeyExInternalA
# @ stub RegDeleteKeyExInternalW
@ stdcall -private RegDeleteKeyExW(long wstr long long) kernel32.RegDeleteKeyExW
@ stdcall RegDeleteKeyValueA(long str str) advapi32.RegDeleteKeyValueA
@ stdcall RegDeleteKeyValueW(long wstr wstr) advapi32.RegDeleteKeyValueW
@ stdcall -private RegDeleteTreeA(long str) kernel32.RegDeleteTreeA
@ stdcall -private RegDeleteTreeW(long wstr) kernel32.RegDeleteTreeW
@ stdcall -private RegDeleteValueA(long str) kernel32.RegDeleteValueA
@ stdcall -private RegDeleteValueW(long wstr) kernel32.RegDeleteValueW
@ stdcall RegDeleteKeyExW(long wstr long long)
@ stdcall RegDeleteKeyValueA(long str str)
@ stdcall RegDeleteKeyValueW(long wstr wstr)
@ stdcall RegDeleteTreeA(long str)
@ stdcall RegDeleteTreeW(long wstr)
@ stdcall RegDeleteValueA(long str)
@ stdcall RegDeleteValueW(long wstr)
# @ stub RegDisablePredefinedCacheEx
@ stdcall -private RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) kernel32.RegEnumKeyExA
@ stdcall -private RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) kernel32.RegEnumKeyExW
@ stdcall -private RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) kernel32.RegEnumValueA
@ stdcall -private RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) kernel32.RegEnumValueW
@ stdcall -private RegFlushKey(long) kernel32.RegFlushKey
@ stdcall -private RegGetKeySecurity(long long ptr ptr) kernel32.RegGetKeySecurity
@ stdcall -private RegGetValueA(long str str long ptr ptr ptr) kernel32.RegGetValueA
@ stdcall -private RegGetValueW(long wstr wstr long ptr ptr ptr) kernel32.RegGetValueW
@ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr)
@ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr)
@ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr)
@ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr)
@ stdcall RegFlushKey(long)
@ stdcall RegGetKeySecurity(long long ptr ptr)
@ stdcall RegGetValueA(long str str long ptr ptr ptr)
@ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr)
# @ stub RegKrnGetAppKeyEventAddressInternal
# @ stub RegKrnGetAppKeyLoaded
# @ stub RegKrnGetClassesEnumTableAddressInternal
......@@ -1289,34 +1289,34 @@
# @ stub RegKrnResetAppKeyLoaded
# @ stub RegKrnSetDllHasThreadStateGlobal
# @ stub RegKrnSetTermsrvRegistryExtensionFlags
@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
@ stdcall -private RegLoadKeyA(long str str) kernel32.RegLoadKeyA
@ stdcall -private RegLoadKeyW(long wstr wstr) kernel32.RegLoadKeyW
@ stdcall -private RegLoadMUIStringA(long str str long ptr long str) kernel32.RegLoadMUIStringA
@ stdcall -private RegLoadMUIStringW(long wstr wstr long ptr long wstr) kernel32.RegLoadMUIStringW
@ stdcall -private RegNotifyChangeKeyValue(long long long long long) kernel32.RegNotifyChangeKeyValue
@ stdcall -private RegOpenCurrentUser(long ptr) kernel32.RegOpenCurrentUser
@ stdcall -private RegOpenKeyExA(long str long long ptr) kernel32.RegOpenKeyExA
@ stdcall RegLoadAppKeyA(str ptr long long long)
@ stdcall RegLoadAppKeyW(wstr ptr long long long)
@ stdcall RegLoadKeyA(long str str)
@ stdcall RegLoadKeyW(long wstr wstr)
@ stdcall RegLoadMUIStringA(long str str long ptr long str)
@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr)
@ stdcall RegNotifyChangeKeyValue(long long long long long)
@ stdcall RegOpenCurrentUser(long ptr)
@ stdcall RegOpenKeyExA(long str long long ptr)
# @ stub RegOpenKeyExInternalA
# @ stub RegOpenKeyExInternalW
@ stdcall -private RegOpenKeyExW(long wstr long long ptr) kernel32.RegOpenKeyExW
@ stdcall -private RegOpenUserClassesRoot(ptr long long ptr) kernel32.RegOpenUserClassesRoot
@ stdcall -private RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) kernel32.RegQueryInfoKeyA
@ stdcall -private RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) kernel32.RegQueryInfoKeyW
@ stdcall -private RegQueryValueExA(long str ptr ptr ptr ptr) kernel32.RegQueryValueExA
@ stdcall -private RegQueryValueExW(long wstr ptr ptr ptr ptr) kernel32.RegQueryValueExW
@ stdcall -private RegRestoreKeyA(long str long) kernel32.RegRestoreKeyA
@ stdcall -private RegRestoreKeyW(long wstr long) kernel32.RegRestoreKeyW
@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA
@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW
@ stdcall -private RegSetKeySecurity(long long ptr) kernel32.RegSetKeySecurity
@ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA
@ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW
@ stdcall -private RegSetValueExA(long str long long ptr long) kernel32.RegSetValueExA
@ stdcall -private RegSetValueExW(long wstr long long ptr long) kernel32.RegSetValueExW
@ stdcall -private RegUnLoadKeyA(long str) kernel32.RegUnLoadKeyA
@ stdcall -private RegUnLoadKeyW(long wstr) kernel32.RegUnLoadKeyW
@ stdcall RegOpenKeyExW(long wstr long long ptr)
@ stdcall RegOpenUserClassesRoot(ptr long long ptr)
@ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall RegQueryValueExA(long str ptr ptr ptr ptr)
@ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr)
@ stdcall RegRestoreKeyA(long str long)
@ stdcall RegRestoreKeyW(long wstr long)
@ stdcall RegSaveKeyExA(long str ptr long)
@ stdcall RegSaveKeyExW(long wstr ptr long)
@ stdcall RegSetKeySecurity(long long ptr)
@ stdcall RegSetKeyValueA(long str str long ptr long)
@ stdcall RegSetKeyValueW(long wstr wstr long ptr long)
@ stdcall RegSetValueExA(long str long long ptr long)
@ stdcall RegSetValueExW(long wstr long long ptr long)
@ stdcall RegUnLoadKeyA(long str)
@ stdcall RegUnLoadKeyW(long wstr)
# @ stub RegisterBadMemoryNotification
# @ stub RegisterGPNotificationInternal
# @ stub RegisterStateChangeNotification
......@@ -1331,7 +1331,7 @@
@ stdcall ReleaseSemaphore(long long ptr) kernel32.ReleaseSemaphore
@ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) kernel32.ReleaseSemaphoreWhenCallbackReturns
# @ stub ReleaseStateLock
# @ stub RemapPredefinedHandleInternal
@ stdcall RemapPredefinedHandleInternal(long long)
@ stdcall RemoveDirectoryA(str) kernel32.RemoveDirectoryA
@ stdcall RemoveDirectoryW(wstr) kernel32.RemoveDirectoryW
@ stdcall RemoveDllDirectory(ptr) kernel32.RemoveDllDirectory
......
dlls/kernelbase/main.c
View file @ c7548d6c
......@@ -267,7 +267,7 @@ HRESULT WINAPI GetAcceptLanguagesW(WCHAR *langbuf, DWORD *buflen)
len = mystrlen * sizeof(WCHAR);
mystr = heap_alloc(len);
mystr[0] = 0;
RegOpenKeyW(HKEY_CURRENT_USER, keyW, &mykey);
RegOpenKeyExW(HKEY_CURRENT_USER, keyW, 0, KEY_QUERY_VALUE, &mykey);
lres = RegQueryValueExW(mykey, valueW, 0, &mytype, (PBYTE)mystr, &len);
RegCloseKey(mykey);
len = lstrlenW(mystr);
......
dlls/kernelbase/registry.c
View file @ c7548d6c
This source diff could not be displayed because it is too large. You can view the blob instead.
include/winreg.h
View file @ c7548d6c
......@@ -104,6 +104,9 @@ WINADVAPI LSTATUS WINAPI RegCloseKey(HKEY);
WINADVAPI LSTATUS WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY);
WINADVAPI LSTATUS WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY);
#define RegConnectRegistry WINELIB_NAME_AW(RegConnectRegistry)
WINADVAPI LSTATUS WINAPI RegCopyTreeA(HKEY,const char*,HKEY);
WINADVAPI LSTATUS WINAPI RegCopyTreeW(HKEY,const WCHAR*,HKEY);
#define RegCopyTree WINELIB_NAME_AW(RegCopyTree)
WINADVAPI LSTATUS WINAPI RegCreateKeyA(HKEY,LPCSTR,PHKEY);
WINADVAPI LSTATUS WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY);
#define RegCreateKey WINELIB_NAME_AW(RegCreateKey)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment