[ros-diffs] [sserapion] 36898: - Fix CryptReleaseContext definition. - Make SERVICE_STATUS_HANDLE and CLIENT_HANDLE HANDLEs. - Fix LSAPR_HANDLE, SC_RPC_HANDLE definitions. - Fixes 64bit advapi32 build.

Author: sserapion
Date: Wed Oct 22 21:25:18 2008
New Revision: 36898
URL: http://svn.reactos.org/svn/reactos?rev=36898&view=rev
Log:
- Fix CryptReleaseContext definition.
- Make SERVICE_STATUS_HANDLE and CLIENT_HANDLE HANDLEs.
- Fix  LSAPR_HANDLE, SC_RPC_HANDLE definitions.
- Fixes 64bit advapi32 build.
Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c
    branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c
    branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c
    branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h
    branches/ros-amd64-bringup/reactos/include/psdk/winsvc.h
    branches/ros-amd64-bringup/reactos/include/reactos/idl/lsa.idl
    branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl
    branches/ros-amd64-bringup/reactos/include/reactos/services/services.h
Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Wed Oct
22 21:25:18 2008
@@ -400,7 +400,7 @@
   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 @@
     {
       return RtlNtStatusToDosError (Status);
     }
-  TRACE("ParentKey %x\n", (ULONG)ParentKey);
+  TRACE("ParentKey %p\n", ParentKey);
   if (lpClass != NULL)
     {
@@ -1091,7 +1091,7 @@
     {
       return RtlNtStatusToDosError(Status);
     }
-  TRACE("ParentKey %x\n", (ULONG)ParentKey);
+  TRACE("ParentKey %p\n", ParentKey);
   RtlInitUnicodeString (&ClassString,
                        lpClass);
Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Wed Oct
22 21:25:18 2008
@@ -93,7 +93,7 @@
     LSAHandleBind();
     return LsarClose(LSABindingHandle,
-                     (unsigned long *)&ObjectHandle);
+                     &ObjectHandle);
 }
@@ -108,7 +108,7 @@
     LSAHandleBind();
     return LsarDelete(LSABindingHandle,
-                      (unsigned long)ObjectHandle);
+                      ObjectHandle);
 }
Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Wed
Oct 22 21:25:18 2008
@@ -457,7 +457,7 @@
     Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName);
     if (Service == NULL)
     {
-        return (SERVICE_STATUS_HANDLE)NULL;
+        return INVALID_HANDLE_VALUE;
     }
     Service->HandlerFunction = lpHandlerProc;
Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] Wed Oct 22
21:25:18 2008
@@ -3788,7 +3788,7 @@
 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);
Modified: branches/ros-amd64-bringup/reactos/include/psdk/winsvc.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/winsvc.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/winsvc.h [iso-8859-1] Wed Oct 22
21:25:18 2008
@@ -158,7 +158,7 @@
 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 {
Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/lsa.idl
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Wed Oct 22
21:25:18 2008
@@ -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")
Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Wed Oct
22 21:25:18 2008
@@ -17,7 +17,7 @@
 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;
Modified: branches/ros-amd64-bringup/reactos/include/reactos/services/services.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/services/services.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/services/services.h [iso-8859-1]
Wed Oct 22 21:25:18 2008
@@ -11,7 +11,7 @@
 #define SERVICE_CONTROL_START 0
-typedef DWORD CLIENT_HANDLE;
+DECLARE_HANDLE(CLIENT_HANDLE);
 typedef struct _SCM_CONTROL_PACKET
 {