From bfa307751018a4ab7f128084142b7da1a1197a31 Mon Sep 17 00:00:00 2001
From: Kevin Koltzau <kevin@plop.org>
Date: Tue, 23 Aug 2005 09:32:39 +0000
Subject: [PATCH] Properly declare handles.

---
 dlls/advapi32/service.c | 6 +++---
 include/winsvc.h        | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index d209544bd01..337d7d81e22 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -895,7 +895,7 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus )
     service_data *service;
     BOOL r = TRUE;
 
-    TRACE("%lx %lx %lx %lx %lx %lx %lx %lx\n", hService,
+    TRACE("%p %lx %lx %lx %lx %lx %lx %lx\n", hService,
           lpStatus->dwServiceType, lpStatus->dwCurrentState,
           lpStatus->dwControlsAccepted, lpStatus->dwWin32ExitCode,
           lpStatus->dwServiceSpecificExitCode, lpStatus->dwCheckPoint,
@@ -1511,7 +1511,7 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs,
         return r;
     }
 
-    hLock = LockServiceDatabase(hsvc->scm);
+    hLock = LockServiceDatabase((SC_HANDLE)hsvc->scm);
     if (!hLock)
         return r;
 
@@ -2224,7 +2224,7 @@ BOOL WINAPI SetServiceBits( SERVICE_STATUS_HANDLE hServiceStatus,
         BOOL bSetBitsOn,
         BOOL bUpdateImmediately)
 {
-    FIXME("%08lx %08lx %x %x\n", hServiceStatus, dwServiceBits,
+    FIXME("%p %08lx %x %x\n", hServiceStatus, dwServiceBits,
           bSetBitsOn, bUpdateImmediately);
     return TRUE;
 }
diff --git a/include/winsvc.h b/include/winsvc.h
index 4540e03daec..6cf23df05f1 100644
--- a/include/winsvc.h
+++ b/include/winsvc.h
@@ -114,8 +114,9 @@ extern "C" {
 
 /* Handle types */
 
-typedef HANDLE SC_HANDLE, *LPSC_HANDLE;
-typedef DWORD  SERVICE_STATUS_HANDLE;
+DECLARE_HANDLE(SC_HANDLE);
+typedef SC_HANDLE *LPSC_HANDLE;
+DECLARE_HANDLE(SERVICE_STATUS_HANDLE);
 typedef LPVOID SC_LOCK;
 
 /* Service status structure */