Index: trunk/src/advapi32/advapi32.h
===================================================================
--- trunk/src/advapi32/advapi32.h	(revision 1378)
+++ trunk/src/advapi32/advapi32.h	(revision 1382)
@@ -1,3 +1,3 @@
-/* $Id: advapi32.h,v 1.5 1999-09-02 19:39:07 phaller Exp $ */
+/* $Id: advapi32.h,v 1.6 1999-10-20 17:18:17 phaller Exp $ */
 
 /*
@@ -47,14 +47,14 @@
 LONG      ODIN_INTERNAL ODIN_RegConnectRegistryA(LPCSTR,HKEY,LPHKEY);
 LONG      ODIN_INTERNAL ODIN_RegConnectRegistryW(LPCWSTR,HKEY,LPHKEY);
-DWORD     ODIN_INTERNAL ODIN_RegEnumKeyExA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPSTR,LPDWORD,LPFILETIME);
-DWORD     ODIN_INTERNAL ODIN_RegEnumKeyExW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPWSTR,LPDWORD,LPFILETIME);
+LONG      ODIN_INTERNAL ODIN_RegEnumKeyExA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPSTR,LPDWORD,LPFILETIME);
+LONG      ODIN_INTERNAL ODIN_RegEnumKeyExW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPWSTR,LPDWORD,LPFILETIME);
 LONG      ODIN_INTERNAL ODIN_RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,LPDWORD);
 LONG      ODIN_INTERNAL ODIN_RegLoadKeyA(HKEY,LPCSTR,LPCSTR);
 LONG      ODIN_INTERNAL ODIN_RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR);
 LONG      ODIN_INTERNAL ODIN_RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL);
-DWORD     ODIN_INTERNAL ODIN_RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,LPHKEY);
-DWORD     ODIN_INTERNAL ODIN_RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,LPHKEY);
-DWORD     ODIN_INTERNAL ODIN_RegQueryInfoKeyW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPFILETIME);
-DWORD     ODIN_INTERNAL ODIN_RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPFILETIME);
+LONG      ODIN_INTERNAL ODIN_RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,LPHKEY);
+LONG      ODIN_INTERNAL ODIN_RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,LPHKEY);
+LONG      ODIN_INTERNAL ODIN_RegQueryInfoKeyW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPFILETIME);
+LONG      ODIN_INTERNAL ODIN_RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPFILETIME);
 LONG      ODIN_INTERNAL ODIN_RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR);
 LONG      ODIN_INTERNAL ODIN_RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR);
@@ -63,28 +63,28 @@
 LONG      ODIN_INTERNAL ODIN_RegUnLoadKeyA(HKEY,LPCSTR);
 LONG      ODIN_INTERNAL ODIN_RegUnLoadKeyW(HKEY,LPCWSTR);
-DWORD     ODIN_INTERNAL ODIN_RegCloseKey(HKEY);
-DWORD     ODIN_INTERNAL ODIN_RegFlushKey(HKEY);
-DWORD     ODIN_INTERNAL ODIN_RegCreateKeyA(HKEY,LPCSTR,LPHKEY);
-DWORD     ODIN_INTERNAL ODIN_RegCreateKeyW(HKEY,LPCWSTR,LPHKEY);
-DWORD     ODIN_INTERNAL ODIN_RegDeleteKeyA(HKEY,LPCSTR);
-DWORD     ODIN_INTERNAL ODIN_RegDeleteKeyW(HKEY,LPWSTR);
-DWORD     ODIN_INTERNAL ODIN_RegDeleteValueA(HKEY,LPSTR);
-DWORD     ODIN_INTERNAL ODIN_RegDeleteValueW(HKEY,LPWSTR);
-DWORD     ODIN_INTERNAL ODIN_RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD);
-DWORD     ODIN_INTERNAL ODIN_RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD);
-DWORD     ODIN_INTERNAL ODIN_RegEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-DWORD     ODIN_INTERNAL ODIN_RegEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-DWORD     ODIN_INTERNAL ODIN_RegOpenKeyA(HKEY,LPCSTR,LPHKEY);
-DWORD     ODIN_INTERNAL ODIN_RegOpenKeyW(HKEY,LPCWSTR,LPHKEY);
-DWORD     ODIN_INTERNAL ODIN_RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG);
-DWORD     ODIN_INTERNAL ODIN_RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG);
+LONG      ODIN_INTERNAL ODIN_RegCloseKey(HKEY);
+LONG      ODIN_INTERNAL ODIN_RegFlushKey(HKEY);
+LONG      ODIN_INTERNAL ODIN_RegCreateKeyA(HKEY,LPCSTR,LPHKEY);
+LONG      ODIN_INTERNAL ODIN_RegCreateKeyW(HKEY,LPCWSTR,LPHKEY);
+LONG      ODIN_INTERNAL ODIN_RegDeleteKeyA(HKEY,LPCSTR);
+LONG      ODIN_INTERNAL ODIN_RegDeleteKeyW(HKEY,LPWSTR);
+LONG      ODIN_INTERNAL ODIN_RegDeleteValueA(HKEY,LPSTR);
+LONG      ODIN_INTERNAL ODIN_RegDeleteValueW(HKEY,LPWSTR);
+LONG      ODIN_INTERNAL ODIN_RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD);
+LONG      ODIN_INTERNAL ODIN_RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD);
+LONG      ODIN_INTERNAL ODIN_RegEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+LONG      ODIN_INTERNAL ODIN_RegEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+LONG      ODIN_INTERNAL ODIN_RegOpenKeyA(HKEY,LPCSTR,LPHKEY);
+LONG      ODIN_INTERNAL ODIN_RegOpenKeyW(HKEY,LPCWSTR,LPHKEY);
+LONG      ODIN_INTERNAL ODIN_RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG);
+LONG      ODIN_INTERNAL ODIN_RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG);
 LONG      ODIN_INTERNAL ODIN_RegQueryValueExA(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
 LONG      ODIN_INTERNAL ODIN_RegQueryValueExW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-DWORD     ODIN_INTERNAL ODIN_RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
-DWORD     ODIN_INTERNAL ODIN_RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
-DWORD     ODIN_INTERNAL ODIN_RegSetValueExA(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
-DWORD     ODIN_INTERNAL ODIN_RegSetValueExW(HKEY,LPWSTR,DWORD,DWORD,LPBYTE,DWORD);
-DWORD     ODIN_INTERNAL ODIN_RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
-DWORD     ODIN_INTERNAL ODIN_RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
+LONG      ODIN_INTERNAL ODIN_RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
+LONG      ODIN_INTERNAL ODIN_RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
+LONG      ODIN_INTERNAL ODIN_RegSetValueExA(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
+LONG      ODIN_INTERNAL ODIN_RegSetValueExW(HKEY,LPWSTR,DWORD,DWORD,LPBYTE,DWORD);
+LONG      ODIN_INTERNAL ODIN_RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
+LONG      ODIN_INTERNAL ODIN_RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
 
 
Index: trunk/src/advapi32/advapi32exp.def
===================================================================
--- trunk/src/advapi32/advapi32exp.def	(revision 1378)
+++ trunk/src/advapi32/advapi32exp.def	(revision 1382)
@@ -1,208 +1,202 @@
-; $Id: advapi32exp.def,v 1.2 1999-06-10 14:23:33 phaller Exp $
-
-;Created by BLAST for IBM's compiler
+;Internal export definition file - autogenerated by ImpDef.
 LIBRARY ADVAPI32 INITINSTANCE
-DATA MULTIPLE NONSHARED
-
 EXPORTS
-_AbortSystemShutdownA@4            @1
-_AbortSystemShutdownW@4            @2
-_AccessCheck@32                    @3
-_AccessCheckAndAuditAlarmA@44      @4
-_AccessCheckAndAuditAlarmW@44      @5
-_AddAccessAllowedAce@16            @6
-_AddAccessDeniedAce@16             @7
-_AddAce@20                         @8
-_AddAuditAccessAce@24              @9
-_AdjustTokenGroups@24              @10
-_AdjustTokenPrivileges@24          @11
-_AllocateAndInitializeSid@44       @12
-_AllocateLocallyUniqueId@4         @13
-_AreAllAccessesGranted@8           @14
-_AreAnyAccessesGranted@8           @15
-_BackupEventLogA@8                 @16
-_BackupEventLogW@8                 @17
-_ChangeServiceConfigA@44           @18
-_ChangeServiceConfigW@44           @19
-_ClearEventLogA@8                  @20
-_ClearEventLogW@8                  @21
-_CloseEventLog@4                   @22
-_CloseServiceHandle@4              @23
-_ControlService@12                 @24
-_CopySid@12                        @25
-_CreatePrivateObjectSecurity@24  @26
-_CreateProcessAsUserA@44           @27
-_CreateProcessAsUserW@44           @28
-_CreateServiceA@52                 @29
-_CreateServiceW@52                 @30
-_DeleteAce@8                       @31
-_DeleteService@4                   @32
-_DeregisterEventSource@4           @33
-_DestroyPrivateObjectSecurity@4 @34
-_DuplicateToken@12                 @35
-_EnumDependentServicesA@24         @36
-_EnumDependentServicesW@24         @37
-_EnumServicesStatusA@32            @38
-_EnumServicesStatusW@32            @39
-_EqualPrefixSid@8                  @40
-_EqualSid@8                        @41
-_FindFirstFreeAce@8                @42
-_FreeSid@4                         @43
-_GetAce@12                         @44
-_GetAclInformation@16              @45
-_GetFileSecurityA@20               @46
-_GetFileSecurityW@20               @47
-_GetKernelObjectSecurity@20        @48
-_GetLengthSid@4                    @49
-_GetNumberOfEventLogRecords@8     @50
-_GetOldestEventLogRecord@8         @51
-_GetPrivateObjectSecurity@20       @52
-_GetSecurityDescriptorControl@12 @53
-_GetSecurityDescriptorDacl@16      @54
-_GetSecurityDescriptorGroup@12    @55
-_GetSecurityDescriptorLength@4   @56
-_GetSecurityDescriptorOwner@12    @57
-_GetSecurityDescriptorSacl@16      @58
-_GetServiceDisplayNameA@16         @59
-_GetServiceDisplayNameW@16         @60
-_GetServiceKeyNameA@16             @61
-_GetServiceKeyNameW@16             @62
-_GetSidIdentifierAuthority@4       @63
-_GetSidLengthRequired@4            @64
-_GetSidSubAuthority@8              @65
-_GetSidSubAuthorityCount@4         @66
-_GetTokenInformation@20            @67
-_GetUserNameA@8                    @68
-_GetUserNameW@8                    @69
-_ImpersonateLoggedOnUser@4         @70
-_ImpersonateNamedPipeClient@4     @71
-_ImpersonateSelf@4                 @72
-_InitializeAcl@12                  @73
-_InitializeSecurityDescriptor@8 @74
-_InitializeSid@12                  @75
-_InitiateSystemShutdownA@20        @76
-_InitiateSystemShutdownW@20        @77
-_IsTextUnicode@12                  @78
-_IsValidAcl@4                      @79
-_IsValidSecurityDescriptor@4       @80
-_IsValidSid@4                      @81
-_LockServiceDatabase@4             @82
-_LogonUserA@24                     @83
-_LogonUserW@24                     @84
-_LookupAccountNameA@28             @85
-_LookupAccountNameW@28             @86
-_LookupAccountSidA@28              @87
-_LookupAccountSidW@28              @88
-_LookupPrivilegeDisplayNameA@20  @89
-_LookupPrivilegeDisplayNameW@20  @90
-_LookupPrivilegeNameA@16           @91
-_LookupPrivilegeNameW@16           @92
-_LookupPrivilegeValueA@12          @93
-_LookupPrivilegeValueW@12          @94
-_MakeAbsoluteSD@44                 @95
-_MakeSelfRelativeSD@12             @96
-_MapGenericMask@8                  @97
-_NotifyBootConfigStatus@4          @98
-_NotifyChangeEventLog@8            @99
-_ObjectCloseAuditAlarmA@12         @100
-_ObjectCloseAuditAlarmW@12         @101
-_ObjectOpenAuditAlarmA@48          @102
-_ObjectOpenAuditAlarmW@48          @103
-_ObjectPrivilegeAuditAlarmA@24    @104
-_ObjectPrivilegeAuditAlarmW@24    @105
-_OpenBackupEventLogA@8             @106
-_OpenBackupEventLogW@8             @107
-_OpenEventLogA@8                   @108
-_OpenEventLogW@8                   @109
-_OpenProcessToken@12               @110
-_OpenSCManagerA@12                 @111
-_OpenSCManagerW@12                 @112
-_OpenServiceA@12                   @113
-_OpenServiceW@12                   @114
-_OpenThreadToken@16                @115
-_PrivilegeCheck@12                 @116
-_PrivilegedServiceAuditAlarmA@20 @117
-_PrivilegedServiceAuditAlarmW@20 @118
-_QueryServiceConfigA@16            @119
-_QueryServiceConfigW@16            @120
-_QueryServiceLockStatusA@16        @121
-_QueryServiceLockStatusW@16        @122
-_QueryServiceObjectSecurity@20    @123
-_QueryServiceStatus@8              @124
-_ReadEventLogA@28                  @125
-_ReadEventLogW@28                  @126
-_RegCloseKey@4                     @127
-_RegConnectRegistryA@12            @128
-_RegConnectRegistryW@12            @129
-_RegCreateKeyA@12                  @130
-_RegCreateKeyExA@36                @131
-_RegCreateKeyExW@36                @132
-_RegCreateKeyW@12                  @133
-_RegDeleteKeyA@8                   @134
-_RegDeleteKeyW@8                   @135
-_RegDeleteValueA@8                 @136
-_RegDeleteValueW@8                 @137
-_RegEnumKeyA@16                    @138
-_RegEnumKeyExA@32                  @139
-_RegEnumKeyExW@32                  @140
-_RegEnumKeyW@16                    @141
-_RegEnumValueA@32                  @142
-_RegEnumValueW@32                  @143
-_RegFlushKey@4                     @144
-_RegGetKeySecurity@16              @145
-_RegLoadKeyA@12                    @146
-_RegLoadKeyW@12                    @147
-_RegNotifyChangeKeyValue@20        @148
-_RegOpenKeyA@12                    @149
-_RegOpenKeyExA@20                  @150
-_RegOpenKeyExW@20                  @151
-_RegOpenKeyW@12                    @152
-_RegQueryInfoKeyA@48               @153
-_RegQueryInfoKeyW@48               @154
-_RegQueryMultipleValuesA@20        @155
-_RegQueryMultipleValuesW@20        @156
-_RegQueryValueA@16                 @157
-_RegQueryValueExA@24               @158
-_RegQueryValueExW@24               @159
-_RegQueryValueW@16                 @160
-_RegRemapPreDefKey@4               @161
-_RegReplaceKeyA@16                 @162
-_RegReplaceKeyW@16                 @163
-_RegRestoreKeyA@12                 @164
-_RegRestoreKeyW@12                 @165
-_RegSaveKeyA@12                    @166
-_RegSaveKeyW@12                    @167
-_RegSetKeySecurity@12              @168
-_RegSetValueA@20                   @169
-_RegSetValueExA@24                 @170
-_RegSetValueExW@24                 @171
-_RegSetValueW@20                   @172
-_RegUnLoadKeyA@8                   @173
-_RegUnLoadKeyW@8                   @174
-_RegisterEventSourceA@8            @175
-_RegisterEventSourceW@8            @176
-_RegisterServiceCtrlHandlerA@8   @177
-_RegisterServiceCtrlHandlerW@8   @178
-_ReportEventA@36                   @179
-_ReportEventW@36                   @180
-_RevertToSelf@0                    @181
-_SetAclInformation@16              @182
-_SetFileSecurityA@12               @183
-_SetFileSecurityW@12               @184
-_SetKernelObjectSecurity@12        @185
-_SetPrivateObjectSecurity@20       @186
-_SetSecurityDescriptorDacl@16      @187
-_SetSecurityDescriptorGroup@12    @188
-_SetSecurityDescriptorOwner@12    @189
-_SetSecurityDescriptorSacl@16      @190
-_SetServiceBits@16                 @191
-_SetServiceObjectSecurity@12       @192
-_SetServiceStatus@8                @193
-_SetThreadToken@8                  @194
-_SetTokenInformation@16            @195
-_StartServiceA@12                  @196
-_StartServiceCtrlDispatcherA@4   @197
-_StartServiceCtrlDispatcherW@4   @198
-_StartServiceW@12                  @199
-_UnlockServiceDatabase@4           @200
-
+    _AbortSystemShutdownA@4                   @1
+    _AbortSystemShutdownW@4                   @2
+    _AccessCheck@32                           @3
+    _AccessCheckAndAuditAlarmA@44             @4
+    _AccessCheckAndAuditAlarmW@44             @5
+    _AddAccessAllowedAce@16                   @6
+    _AddAccessDeniedAce@16                    @7
+    _AddAce@20                                @8
+    _AddAuditAccessAce@24                     @9
+    _AdjustTokenGroups@24                     @10
+    _AdjustTokenPrivileges@24                 @11
+    _AllocateAndInitializeSid@44              @12
+    _AllocateLocallyUniqueId@4                @13
+    _AreAllAccessesGranted@8                  @14
+    _AreAnyAccessesGranted@8                  @15
+    _BackupEventLogA@8                        @16
+    _BackupEventLogW@8                        @17
+    _ChangeServiceConfigA@44                  @18
+    _ChangeServiceConfigW@44                  @19
+    _ClearEventLogA@8                         @20
+    _ClearEventLogW@8                         @21
+    _CloseEventLog@4                          @22
+    _CloseServiceHandle@4                     @23
+    _ControlService@12                        @24
+    _CopySid@12                               @25
+    _CreatePrivateObjectSecurity@24           @26
+    _CreateProcessAsUserA@44                  @27
+    _CreateProcessAsUserW@44                  @28
+    _CreateServiceA@52                        @29
+    _CreateServiceW@52                        @30
+    _DeleteAce@8                              @31
+    _DeleteService@4                          @32
+    _DeregisterEventSource@4                  @33
+    _DestroyPrivateObjectSecurity@4           @34
+    _DuplicateToken@12                        @35
+    _EnumDependentServicesA@24                @36
+    _EnumDependentServicesW@24                @37
+    _EnumServicesStatusA@32                   @38
+    _EnumServicesStatusW@32                   @39
+    _EqualPrefixSid@8                         @40
+    _EqualSid@8                               @41
+    _FindFirstFreeAce@8                       @42
+    _FreeSid@4                                @43
+    _GetAce@12                                @44
+    _GetAclInformation@16                     @45
+    _GetFileSecurityA@20                      @46
+    _GetFileSecurityW@20                      @47
+    _GetKernelObjectSecurity@20               @48
+    _GetLengthSid@4                           @49
+    _GetNumberOfEventLogRecords@8             @50
+    _GetOldestEventLogRecord@8                @51
+    _GetPrivateObjectSecurity@20              @52
+    _GetSecurityDescriptorControl@12          @53
+    _GetSecurityDescriptorDacl@16             @54
+    _GetSecurityDescriptorGroup@12            @55
+    _GetSecurityDescriptorLength@4            @56
+    _GetSecurityDescriptorOwner@12            @57
+    _GetSecurityDescriptorSacl@16             @58
+    _GetServiceDisplayNameA@16                @59
+    _GetServiceDisplayNameW@16                @60
+    _GetServiceKeyNameA@16                    @61
+    _GetServiceKeyNameW@16                    @62
+    _GetSidIdentifierAuthority@4              @63
+    _GetSidLengthRequired@4                   @64
+    _GetSidSubAuthority@8                     @65
+    _GetSidSubAuthorityCount@4                @66
+    _GetTokenInformation@20                   @67
+    _GetUserNameA@8                           @68
+    _GetUserNameW@8                           @69
+    _ImpersonateLoggedOnUser@4                @70
+    _ImpersonateNamedPipeClient@4             @71
+    _ImpersonateSelf@4                        @72
+    _InitializeAcl@12                         @73
+    _InitializeSecurityDescriptor@8           @74
+    _InitializeSid@12                         @75
+    _InitiateSystemShutdownA@20               @76
+    _InitiateSystemShutdownW@20               @77
+    _IsTextUnicode@12                         @78
+    _IsValidAcl@4                             @79
+    _IsValidSecurityDescriptor@4              @80
+    _IsValidSid@4                             @81
+    _LockServiceDatabase@4                    @82
+    _LogonUserA@24                            @83
+    _LogonUserW@24                            @84
+    _LookupAccountNameA@28                    @85
+    _LookupAccountNameW@28                    @86
+    _LookupAccountSidA@28                     @87
+    _LookupAccountSidW@28                     @88
+    _LookupPrivilegeDisplayNameA@20           @89
+    _LookupPrivilegeDisplayNameW@20           @90
+    _LookupPrivilegeNameA@16                  @91
+    _LookupPrivilegeNameW@16                  @92
+    _LookupPrivilegeValueA@12                 @93
+    _LookupPrivilegeValueW@12                 @94
+    _MakeAbsoluteSD@44                        @95
+    _MakeSelfRelativeSD@12                    @96
+    _MapGenericMask@8                         @97
+    _NotifyBootConfigStatus@4                 @98
+    _NotifyChangeEventLog@8                   @99
+    _ObjectCloseAuditAlarmA@12                @100
+    _ObjectCloseAuditAlarmW@12                @101
+    _ObjectOpenAuditAlarmA@48                 @102
+    _ObjectOpenAuditAlarmW@48                 @103
+    _ObjectPrivilegeAuditAlarmA@24            @104
+    _ObjectPrivilegeAuditAlarmW@24            @105
+    _OpenBackupEventLogA@8                    @106
+    _OpenBackupEventLogW@8                    @107
+    _OpenEventLogA@8                          @108
+    _OpenEventLogW@8                          @109
+    _OpenProcessToken@12                      @110
+    _OpenSCManagerA@12                        @111
+    _OpenSCManagerW@12                        @112
+    _OpenServiceA@12                          @113
+    _OpenServiceW@12                          @114
+    _OpenThreadToken@16                       @115
+    _PrivilegeCheck@12                        @116
+    _PrivilegedServiceAuditAlarmA@20          @117
+    _PrivilegedServiceAuditAlarmW@20          @118
+    _QueryServiceConfigA@16                   @119
+    _QueryServiceConfigW@16                   @120
+    _QueryServiceLockStatusA@16               @121
+    _QueryServiceLockStatusW@16               @122
+    _QueryServiceObjectSecurity@20            @123
+    _QueryServiceStatus@8                     @124
+    _ReadEventLogA@28                         @125
+    _ReadEventLogW@28                         @126
+    _RegCloseKey@4                            @127
+    _RegConnectRegistryA@12                   @128
+    _RegConnectRegistryW@12                   @129
+    _RegCreateKeyA@12                         @130
+    _RegCreateKeyExA@36                       @131
+    _RegCreateKeyExW@36                       @132
+    _RegCreateKeyW@12                         @133
+    _RegDeleteKeyA@8                          @134
+    _RegDeleteKeyW@8                          @135
+    _RegDeleteValueA@8                        @136
+    _RegDeleteValueW@8                        @137
+    _RegEnumKeyA@16                           @138
+    _RegEnumKeyExA@32                         @139
+    _RegEnumKeyExW@32                         @140
+    _RegEnumKeyW@16                           @141
+    _RegEnumValueA@32                         @142
+    _RegEnumValueW@32                         @143
+    _RegFlushKey@4                            @144
+    _RegGetKeySecurity@16                     @145
+    _RegLoadKeyA@12                           @146
+    _RegLoadKeyW@12                           @147
+    _RegNotifyChangeKeyValue@20               @148
+    _RegOpenKeyA@12                           @149
+    _RegOpenKeyExA@20                         @150
+    _RegOpenKeyExW@20                         @151
+    _RegOpenKeyW@12                           @152
+    _RegQueryInfoKeyA@48                      @153
+    _RegQueryInfoKeyW@48                      @154
+    _RegQueryMultipleValuesA@20               @155
+    _RegQueryMultipleValuesW@20               @156
+    _RegQueryValueA@16                        @157
+    _RegQueryValueExA@24                      @158
+    _RegQueryValueExW@24                      @159
+    _RegQueryValueW@16                        @160
+    _RegReplaceKeyA@16                        @162
+    _RegReplaceKeyW@16                        @163
+    _RegRestoreKeyA@12                        @164
+    _RegRestoreKeyW@12                        @165
+    _RegSaveKeyA@12                           @166
+    _RegSaveKeyW@12                           @167
+    _RegSetKeySecurity@12                     @168
+    _RegSetValueA@20                          @169
+    _RegSetValueExA@24                        @170
+    _RegSetValueExW@24                        @171
+    _RegSetValueW@20                          @172
+    _RegUnLoadKeyA@8                          @173
+    _RegUnLoadKeyW@8                          @174
+    _RegisterEventSourceA@8                   @175
+    _RegisterEventSourceW@8                   @176
+    _RegisterServiceCtrlHandlerA@8            @177
+    _RegisterServiceCtrlHandlerW@8            @178
+    _ReportEventA@36                          @179
+    _ReportEventW@36                          @180
+    _RevertToSelf@0                           @181
+    _SetAclInformation@16                     @182
+    _SetFileSecurityA@12                      @183
+    _SetFileSecurityW@12                      @184
+    _SetKernelObjectSecurity@12               @185
+    _SetPrivateObjectSecurity@20              @186
+    _SetSecurityDescriptorDacl@16             @187
+    _SetSecurityDescriptorGroup@12            @188
+    _SetSecurityDescriptorOwner@12            @189
+    _SetSecurityDescriptorSacl@16             @190
+    _SetServiceBits@16                        @191
+    _SetServiceObjectSecurity@12              @192
+    _SetServiceStatus@8                       @193
+    _SetThreadToken@8                         @194
+    _SetTokenInformation@16                   @195
+    _StartServiceA@12                         @196
+    _StartServiceCtrlDispatcherA@4            @197
+    _StartServiceCtrlDispatcherW@4            @198
+    _StartServiceW@12                         @199
+    _UnlockServiceDatabase@4                  @200
Index: trunk/src/advapi32/registry.cpp
===================================================================
--- trunk/src/advapi32/registry.cpp	(revision 1378)
+++ trunk/src/advapi32/registry.cpp	(revision 1382)
@@ -1,3 +1,3 @@
-/* $Id: registry.cpp,v 1.4 1999-10-14 17:21:14 phaller Exp $ */
+/* $Id: registry.cpp,v 1.5 1999-10-20 17:18:17 phaller Exp $ */
 
 /*
@@ -76,59 +76,59 @@
  * Result    :
  * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION1(DWORD,RegCloseKey,HKEY,arg1)
-{
-  return _O32_RegCloseKey(ConvertKey(arg1));
-}
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION3(DWORD,RegCreateKeyA,HKEY,  arg1,
-                                  LPCSTR,arg2,
-                                  PHKEY, arg3)
-{
-  return _O32_RegCreateKey(ConvertKey(arg1),
-                          arg2,
-                          arg3);
-}
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION3(DWORD,RegCreateKeyW,HKEY,   arg1,
-                                  LPCWSTR,arg2,
-                                  PHKEY,  arg3)
-{
-  char *astring = UnicodeToAsciiString((LPWSTR)arg2);
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION1(LONG,RegCloseKey,HKEY,hKey)
+{
+  return _O32_RegCloseKey(ConvertKey(hKey));
+}
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION3(LONG,RegCreateKeyA,HKEY,  hKey,
+                                 LPCSTR,lpszSubKey,
+                                 PHKEY, phkResult)
+{
+  return _O32_RegCreateKey(ConvertKey(hKey),
+                          lpszSubKey,
+                          phkResult);
+}
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION3(LONG,RegCreateKeyW,HKEY,   hKey,
+                                 LPCWSTR,lpszSubKey,
+                                 PHKEY,  phkResult)
+{
+  char *astring = UnicodeToAsciiString((LPWSTR)lpszSubKey);
   LONG  rc;
 
-  rc = _O32_RegCreateKey(ConvertKey(arg1),
+  rc = _O32_RegCreateKey(ConvertKey(hKey),
                         astring,
-                        arg3);
+                        phkResult);
 
   FreeAsciiString(astring);
@@ -144,66 +144,66 @@
  * Result    :
  * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION9(DWORD,RegCreateKeyExA,HKEY,                 arg1,
-                                    LPCSTR,               arg2,
-                                    DWORD,                arg3,
-                                    LPSTR,                arg4,
-                                    DWORD,                arg5,
-                                    REGSAM,               arg6,
-                                    LPSECURITY_ATTRIBUTES,arg7,
-                                    PHKEY,                arg8,
-                                    LPDWORD,              arg9)
-{
-  return _O32_RegCreateKeyEx(ConvertKey(arg1),
-                            arg2,
-                            arg3,
-                            arg4,
-                            arg5,
-                            arg6 | KEY_READ,
-                            arg7,
-                            arg8,
-                            arg9);
-}
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION9(DWORD,RegCreateKeyExW,HKEY,                 arg1,
-                                    LPCWSTR,              arg2,
-                                    DWORD,                arg3,
-                                    LPWSTR,               arg4,
-                                    DWORD,                arg5,
-                                    REGSAM,               arg6,
-                                    LPSECURITY_ATTRIBUTES,arg7,
-                                    PHKEY,                arg8,
-                                    LPDWORD,              arg9)
-{
-  char *astring1 = UnicodeToAsciiString((LPWSTR)arg2);
-  char *astring2 = UnicodeToAsciiString(arg4);
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION9(LONG,RegCreateKeyExA,HKEY,                 hKey,
+                                   LPCSTR,               lpszSubKey,
+                                   DWORD,                dwReserved,
+                                   LPSTR,                lpszClass,
+                                   DWORD,                fdwOptions,
+                                   REGSAM,               samDesired,
+                                   LPSECURITY_ATTRIBUTES,lpSecurityAttributes,
+                                   PHKEY,                phkResult,
+                                   LPDWORD,              lpdwDisposition)
+{
+  return _O32_RegCreateKeyEx(ConvertKey(hKey),
+                             lpszSubKey,
+                             dwReserved,
+                             lpszClass,
+                             fdwOptions,
+                             samDesired, //  | KEY_READ
+                             lpSecurityAttributes,
+                             phkResult,
+                             lpdwDisposition);
+}
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION9(LONG,RegCreateKeyExW,HKEY,                 hKey,
+                                   LPCWSTR,              lpszSubKey,
+                                   DWORD,                dwReserved,
+                                   LPWSTR,               lpszClass,
+                                   DWORD,                fdwOptions,
+                                   REGSAM,               samDesired,
+                                   LPSECURITY_ATTRIBUTES,lpSecurityAttributes,
+                                   PHKEY,                phkResult,
+                                   LPDWORD,              lpdwDisposition)
+{
+  char *astring1 = UnicodeToAsciiString((LPWSTR)lpszSubKey);
+  char *astring2 = UnicodeToAsciiString(lpszClass);
   LONG  rc;
 
-  rc = _O32_RegCreateKeyEx(ConvertKey(arg1),
+  rc = _O32_RegCreateKeyEx(ConvertKey(hKey),
                           astring1,
-                          arg3,
+                          dwReserved,
                           astring2,
-                          arg5,
-                          arg6 | KEY_READ,
-                          arg7,
-                          arg8,
-                          arg9);
+                          fdwOptions,
+                          samDesired, //  | KEY_READ
+                          lpSecurityAttributes,
+                          phkResult,
+                          lpdwDisposition);
 
   FreeAsciiString(astring1);
@@ -220,16 +220,16 @@
  * Result    :
  * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION2(DWORD,RegDeleteKeyW,HKEY,  arg1,
-                                  LPWSTR,arg2)
-{
-  char *astring = UnicodeToAsciiString(arg2);
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION2(LONG,RegDeleteKeyW,HKEY,  hKey,
+                                 LPWSTR,lpszSubKey)
+{
+  char *astring = UnicodeToAsciiString(lpszSubKey);
   LONG  rc;
 
-  rc = _O32_RegDeleteKey(ConvertKey(arg1),
+  rc = _O32_RegDeleteKey(ConvertKey(hKey),
                         astring);
   FreeAsciiString(astring);
@@ -245,56 +245,56 @@
  * Result    :
  * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION2(DWORD,RegDeleteKeyA,HKEY,  arg1,
-                                  LPCSTR,arg2)
-{
-  return _O32_RegDeleteKey(ConvertKey(arg1),
-                          arg2);
-}
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION2(DWORD,RegDeleteValueA,HKEY, arg1,
-                                    LPSTR,arg2)
-{
-  return _O32_RegDeleteValue(ConvertKey(arg1),
-                            arg2);
-}
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION2(DWORD,RegDeleteValueW,HKEY,  arg1,
-                                    LPWSTR,arg2)
-{
-  char *astring = UnicodeToAsciiString(arg2);
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION2(LONG,RegDeleteKeyA,HKEY,  hKey,
+                                 LPCSTR,lpszSubKey)
+{
+  return _O32_RegDeleteKey(ConvertKey(hKey),
+                          lpszSubKey);
+}
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION2(LONG,RegDeleteValueA,HKEY, hKey,
+                                   LPSTR,lpszValue)
+{
+  return _O32_RegDeleteValue(ConvertKey(hKey),
+                            lpszValue);
+}
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : CORRECTED UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION2(LONG,RegDeleteValueW,HKEY,  hKey,
+                                   LPWSTR,lpszValue)
+{
+  char *astring = UnicodeToAsciiString(lpszValue);
   LONG  rc;
 
-  rc = _O32_RegDeleteValue(ConvertKey(arg1),
+  rc = _O32_RegDeleteValue(ConvertKey(hKey),
                           astring);
   FreeAsciiString(astring);
@@ -315,45 +315,45 @@
  *****************************************************************************/
 
-ODINFUNCTION4(DWORD,RegEnumKeyA,HKEY, arg1,
-                                DWORD,arg2,
-                                LPSTR,arg3,
-                                DWORD,arg4)
-{
-  return _O32_RegEnumKey(ConvertKey(arg1),
-                        arg2,
-                        arg3,
-                        arg4);
-}
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
-ODINFUNCTION4(DWORD,RegEnumKeyW,HKEY,  arg1,
-                                DWORD, arg2,
-                                LPWSTR,arg3,
-                                DWORD, arg4)
+ODINFUNCTION4(LONG,RegEnumKeyA,HKEY, hKey,
+                               DWORD,iSubKey,
+                               LPSTR,lpszName,
+                               DWORD,cchName)
+{
+  return _O32_RegEnumKey(ConvertKey(hKey),
+                        iSubKey,
+                        lpszName,
+                        cchName);
+}
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+ODINFUNCTION4(LONG,RegEnumKeyW,HKEY,  hKey,
+                               DWORD, iSubKey,
+                               LPWSTR,lpszName,
+                               DWORD, cchName)
 {
   char *astring;
   LONG  rc;
 
-  rc = _O32_RegEnumKey(ConvertKey(arg1),
-                      arg2,
-                      (char *)arg3,
-                      arg4);
+  rc = _O32_RegEnumKey(ConvertKey(hKey),
+                      iSubKey,
+                      (char *)lpszName,
+                      cchName);
   if(rc == ERROR_SUCCESS)
   {
-    astring = (char *)malloc(arg4);
-    strcpy(astring, (char *)arg3);
-    AsciiToUnicode(astring, arg3);
+    astring = (char *)malloc(cchName);
+    strcpy(astring, (char *)lpszName);
+    AsciiToUnicode(astring, lpszName);
     free(astring);
   }
@@ -374,12 +374,12 @@
  *****************************************************************************/
 
-ODINFUNCTION8(DWORD,RegEnumKeyExA,HKEY,      arg1,
-                                  DWORD,     arg2,
-                                  LPSTR,     arg3,
-                                  LPDWORD,   arg4,
-                                  LPDWORD,   arg5,
-                                  LPSTR,     arg6,
-                                  LPDWORD,   arg7,
-                                  LPFILETIME,arg8)
+ODINFUNCTION8(LONG,RegEnumKeyExA,HKEY,      arg1,
+                                 DWORD,     arg2,
+                                 LPSTR,     arg3,
+                                 LPDWORD,   arg4,
+                                 LPDWORD,   arg5,
+                                 LPSTR,     arg6,
+                                 LPDWORD,   arg7,
+                                 LPFILETIME,arg8)
 {
   return _O32_RegEnumKeyEx(ConvertKey(arg1),
@@ -406,12 +406,12 @@
  *****************************************************************************/
 
-ODINFUNCTION8(DWORD,RegEnumKeyExW,HKEY,      arg1,
-                                  DWORD,     arg2,
-                                  LPWSTR,    arg3,
-                                  LPDWORD,   arg4,
-                                  LPDWORD,   arg5,
-                                  LPWSTR,    arg6,
-                                  LPDWORD,   arg7,
-                                  LPFILETIME,arg8)
+ODINFUNCTION8(LONG,RegEnumKeyExW,HKEY,      arg1,
+                                 DWORD,     arg2,
+                                 LPWSTR,    arg3,
+                                 LPDWORD,   arg4,
+                                 LPDWORD,   arg5,
+                                 LPWSTR,    arg6,
+                                 LPDWORD,   arg7,
+                                 LPFILETIME,arg8)
 {
   char *astring;
@@ -454,12 +454,12 @@
  *****************************************************************************/
 
-ODINFUNCTION8(DWORD,RegEnumValueA,HKEY,   arg1,
-                                  DWORD,  arg2,
-                                  LPSTR,  arg3,
-                                  LPDWORD,arg4,
-                                  LPDWORD,arg5,
-                                  LPDWORD,arg6,
-                                  LPBYTE, arg7,
-                                  LPDWORD,arg8)
+ODINFUNCTION8(LONG,RegEnumValueA,HKEY,   arg1,
+                                 DWORD,  arg2,
+                                 LPSTR,  arg3,
+                                 LPDWORD,arg4,
+                                 LPDWORD,arg5,
+                                 LPDWORD,arg6,
+                                 LPBYTE, arg7,
+                                 LPDWORD,arg8)
 {
   return _O32_RegEnumValue(ConvertKey(arg1),
@@ -486,12 +486,12 @@
  *****************************************************************************/
 
-ODINFUNCTION8(DWORD,RegEnumValueW,HKEY,   arg1,
-                                  DWORD,  arg2,
-                                  LPWSTR, arg3,
-                                  LPDWORD,arg4,
-                                  LPDWORD,arg5,
-                                  LPDWORD,arg6,
-                                  LPBYTE, arg7,
-                                  LPDWORD,arg8)
+ODINFUNCTION8(LONG,RegEnumValueW,HKEY,   arg1,
+                                 DWORD,  arg2,
+                                 LPWSTR, arg3,
+                                 LPDWORD,arg4,
+                                 LPDWORD,arg5,
+                                 LPDWORD,arg6,
+                                 LPBYTE, arg7,
+                                 LPDWORD,arg8)
 {
   char *astring;
@@ -529,7 +529,7 @@
  *****************************************************************************/
 
-ODINFUNCTION3(DWORD,RegOpenKeyA,HKEY,  arg1,
-                                LPCSTR,arg2,
-                                PHKEY, arg3)
+ODINFUNCTION3(LONG,RegOpenKeyA,HKEY,  arg1,
+                               LPCSTR,arg2,
+                               PHKEY, arg3)
 {
   LONG rc;
@@ -557,7 +557,7 @@
  *****************************************************************************/
 
-ODINFUNCTION3(DWORD,RegOpenKeyW,HKEY,   arg1,
-                                LPCWSTR,arg2,
-                                PHKEY,  arg3)
+ODINFUNCTION3(LONG,RegOpenKeyW,HKEY,   arg1,
+                               LPCWSTR,arg2,
+                               PHKEY,  arg3)
 {
   char *astring = UnicodeToAsciiString((LPWSTR)arg2);
@@ -587,5 +587,5 @@
  *****************************************************************************/
 
-ODINFUNCTION5(DWORD,RegOpenKeyExA,HKEY,  arg1,
+ODINFUNCTION5(LONG,RegOpenKeyExA,HKEY,  arg1,
                                   LPCSTR,arg2,
                                   DWORD, arg3,
@@ -622,5 +622,5 @@
  *****************************************************************************/
 
-ODINFUNCTION5(DWORD,RegOpenKeyExW,HKEY,   arg1,
+ODINFUNCTION5(LONG,RegOpenKeyExW,HKEY,   arg1,
                                   LPCWSTR,arg2,
                                   DWORD,  arg3,
@@ -658,5 +658,5 @@
  *****************************************************************************/
 
-ODINFUNCTION12(DWORD,RegQueryInfoKeyA,HKEY,       arg1,
+ODINFUNCTION12(LONG,RegQueryInfoKeyA,HKEY,       arg1,
                                       LPSTR,      arg2,
                                       LPDWORD,    arg3,
@@ -698,5 +698,5 @@
  *****************************************************************************/
 
-ODINFUNCTION12(DWORD,RegQueryInfoKeyW,HKEY,       arg1,
+ODINFUNCTION12(LONG,RegQueryInfoKeyW,HKEY,       arg1,
                                       LPWSTR,     arg2,
                                       LPDWORD,    arg3,
@@ -749,5 +749,5 @@
  *****************************************************************************/
 
-ODINFUNCTION4(DWORD,RegQueryValueA,HKEY,  arg1,
+ODINFUNCTION4(LONG,RegQueryValueA,HKEY,  arg1,
                                    LPCSTR,arg2,
                                    LPSTR, arg3,
@@ -775,5 +775,5 @@
  *****************************************************************************/
 
-ODINFUNCTION4(DWORD,RegQueryValueW,HKEY,   hkey,
+ODINFUNCTION4(LONG,RegQueryValueW,HKEY,   hkey,
                                    LPCWSTR,lpszSubKey,
                                    LPWSTR, lpszValue,
@@ -874,5 +874,5 @@
  *****************************************************************************/
 
-ODINFUNCTION5(DWORD,RegSetValueA,HKEY,  hkey,
+ODINFUNCTION5(LONG,RegSetValueA,HKEY,  hkey,
                                  LPCSTR,lpSubKey,
                                  DWORD, dwType,
@@ -904,5 +904,5 @@
  *****************************************************************************/
 
-ODINFUNCTION5(DWORD,RegSetValueW,HKEY,   hkey,
+ODINFUNCTION5(LONG,RegSetValueW,HKEY,   hkey,
                                  LPCWSTR,lpSubKey,
                                  DWORD,  dwType,
@@ -942,5 +942,5 @@
  *****************************************************************************/
 
-ODINFUNCTION6(DWORD,RegSetValueExA,HKEY,  arg1,
+ODINFUNCTION6(LONG,RegSetValueExA,HKEY,  arg1,
                                    LPSTR, arg2,
                                    DWORD, arg3,
@@ -970,5 +970,5 @@
  *****************************************************************************/
 
-ODINFUNCTION6(DWORD,RegSetValueExW,HKEY,  arg1,
+ODINFUNCTION6(LONG,RegSetValueExW,HKEY,  arg1,
                                    LPWSTR,arg2,
                                    DWORD, arg3,
@@ -1011,5 +1011,5 @@
  *****************************************************************************/
 
-ODINFUNCTION1(DWORD,RegFlushKey,HKEY,hkey)
+ODINFUNCTION1(LONG,RegFlushKey,HKEY,hkey)
 {
   dprintf(("ADVAPI32: RegFlushKey not implemented yet."));
