- Fix CryptReleaseContext definition.

- Make SERVICE_STATUS_HANDLE and CLIENT_HANDLE HANDLEs.
- Fix  LSAPR_HANDLE, SC_RPC_HANDLE definitions.
- Fixes 64bit advapi32 build.

svn path=/branches/ros-amd64-bringup/; revision=36898

diff --git a/reactos/dll/win32/advapi32/reg/reg.c b/reactos/dll/win32/advapi32/reg/reg.c
index 8753be1..c6bd78f 100644 (file)
--- a/reactos/dll/win32/advapi32/reg/reg.c
+++ b/reactos/dll/win32/advapi32/reg/reg.c
@@ -400,7 +400,7 @@ RegCloseKey (HKEY hKey)
   NTSTATUS Status;
 
   /* don't close null handle or a pseudo handle */
-  if ((!hKey) || (((ULONG)hKey & 0xF0000000) == 0x80000000))
+  if ((!hKey) || (((ULONG_PTR)hKey & 0xF0000000) == 0x80000000))
     {
       return ERROR_INVALID_HANDLE;
     }
@@ -1018,7 +1018,7 @@ RegCreateKeyExA (HKEY hKey,
     {
       return RtlNtStatusToDosError (Status);
     }
-  TRACE("ParentKey %x\n", (ULONG)ParentKey);
+  TRACE("ParentKey %p\n", ParentKey);
 
   if (lpClass != NULL)
     {
@@ -1091,7 +1091,7 @@ RegCreateKeyExW (HKEY hKey,
     {
       return RtlNtStatusToDosError(Status);
     }
-  TRACE("ParentKey %x\n", (ULONG)ParentKey);
+  TRACE("ParentKey %p\n", ParentKey);
 
   RtlInitUnicodeString (&ClassString,
                        lpClass);

diff --git a/reactos/dll/win32/advapi32/sec/lsa.c b/reactos/dll/win32/advapi32/sec/lsa.c
index 831c6ea..00677ef 100644 (file)
--- a/reactos/dll/win32/advapi32/sec/lsa.c
+++ b/reactos/dll/win32/advapi32/sec/lsa.c
@@ -93,7 +93,7 @@ LsaClose(LSA_HANDLE ObjectHandle)
     LSAHandleBind();
 
     return LsarClose(LSABindingHandle,
-                     (unsigned long *)&ObjectHandle);
+                     &ObjectHandle);
 }
 
 
@@ -108,7 +108,7 @@ LsaDelete(LSA_HANDLE ObjectHandle)
     LSAHandleBind();
 
     return LsarDelete(LSABindingHandle,
-                      (unsigned long)ObjectHandle);
+                      ObjectHandle);
 }
 
 

diff --git a/reactos/dll/win32/advapi32/service/sctrl.c b/reactos/dll/win32/advapi32/service/sctrl.c
index d6b3380..b8cce99 100644 (file)
--- a/reactos/dll/win32/advapi32/service/sctrl.c
+++ b/reactos/dll/win32/advapi32/service/sctrl.c
@@ -457,7 +457,7 @@ RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName,
     Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName);
     if (Service == NULL)
     {
-        return (SERVICE_STATUS_HANDLE)NULL;
+        return INVALID_HANDLE_VALUE;
     }
 
     Service->HandlerFunction = lpHandlerProc;

diff --git a/reactos/include/psdk/wincrypt.h b/reactos/include/psdk/wincrypt.h
index 7ca1b51..2816dc2 100644 (file)
--- a/reactos/include/psdk/wincrypt.h
+++ b/reactos/include/psdk/wincrypt.h
@@ -3788,7 +3788,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *);
 WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD);
 WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD);
 WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *);
-WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR);
+WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD);
 WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD);
 WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD);
 WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);

diff --git a/reactos/include/psdk/winsvc.h b/reactos/include/psdk/winsvc.h
index cfc3f57..781a177 100644 (file)
--- a/reactos/include/psdk/winsvc.h
+++ b/reactos/include/psdk/winsvc.h
@@ -158,7 +158,7 @@ typedef struct _SERVICE_TABLE_ENTRYW {
 DECLARE_HANDLE(SC_HANDLE);
 typedef SC_HANDLE *LPSC_HANDLE;
 typedef PVOID SC_LOCK;
-typedef DWORD SERVICE_STATUS_HANDLE;
+DECLARE_HANDLE(SERVICE_STATUS_HANDLE);
 typedef VOID(WINAPI *LPHANDLER_FUNCTION)(DWORD);
 typedef DWORD (WINAPI *LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID);
 typedef struct _SERVICE_DESCRIPTIONA {

diff --git a/reactos/include/reactos/idl/lsa.idl b/reactos/include/reactos/idl/lsa.idl
index a09896c..0d4bd61 100644 (file)
--- a/reactos/include/reactos/idl/lsa.idl
+++ b/reactos/include/reactos/idl/lsa.idl
@@ -4,7 +4,7 @@
 
 #include <ms-dtyp.idl>
 
-typedef /*[context_handle]*/ unsigned long LSAPR_HANDLE;
+typedef [context_handle] void* LSAPR_HANDLE;
 typedef LSAPR_HANDLE *PLSAPR_HANDLE;
 
 cpp_quote("#ifndef _WINNT_H")

diff --git a/reactos/include/reactos/idl/svcctl.idl b/reactos/include/reactos/idl/svcctl.idl
index 943a979..8d4e078 100644 (file)
--- a/reactos/include/reactos/idl/svcctl.idl
+++ b/reactos/include/reactos/idl/svcctl.idl
@@ -17,7 +17,7 @@ const unsigned short SC_MAX_ARGUMENTS = 1024;
 
 typedef /*[handle]*/ LPSTR SVCCTL_HANDLEA;
 typedef /*[handle]*/ LPWSTR SVCCTL_HANDLEW;
-typedef /*[context_handle]*/ ULONG_PTR SC_RPC_HANDLE;
+typedef [context_handle] void* SC_RPC_HANDLE;
 typedef SC_RPC_HANDLE* LPSC_RPC_HANDLE;
 typedef /*[context_handle]*/ unsigned long SC_RPC_LOCK;
 typedef SC_RPC_LOCK* LPSC_RPC_LOCK;

diff --git a/reactos/include/reactos/services/services.h b/reactos/include/reactos/services/services.h
index e32d8bc..21a6085 100644 (file)
--- a/reactos/include/reactos/services/services.h
+++ b/reactos/include/reactos/services/services.h
@@ -11,7 +11,7 @@
 
 #define SERVICE_CONTROL_START 0
 
-typedef DWORD CLIENT_HANDLE;
+DECLARE_HANDLE(CLIENT_HANDLE);
 
 typedef struct _SCM_CONTROL_PACKET
 {