Small fixes to compile with the headers (mostly nt-security).

dlls/advapi32/service.c

@@ -157,7 +157,7 @@ OpenSCManager32W( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName,
  *   lpluid []
  */
 BOOL32 WINAPI
-AllocateLocallyUniqueId( LPLUID lpluid )
+AllocateLocallyUniqueId( PLUID lpluid )
 {
 	lpluid->LowPart = time(NULL);
 	lpluid->HighPart = 0;

files/drive.c

@@ -637,8 +637,8 @@ int DRIVE_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL32
 /***********************************************************************
  *           DRIVE_GetFreeSpace
  */
-static int DRIVE_GetFreeSpace( int drive, LPULARGE_INTEGER size, 
-			       LPULARGE_INTEGER available )
+static int DRIVE_GetFreeSpace( int drive, PULARGE_INTEGER size, 
+			       PULARGE_INTEGER available )
 {
     struct statfs info;
     unsigned long long  bigsize,bigavail=0;
@@ -808,9 +808,9 @@ BOOL32 WINAPI GetDiskFreeSpace32W( LPCWSTR root, LPDWORD cluster_sectors,
  *           GetDiskFreeSpaceEx32A   (KERNEL32.871)
  */
 BOOL32 WINAPI GetDiskFreeSpaceEx32A( LPCSTR root,
-				     LPULARGE_INTEGER avail,
-				     LPULARGE_INTEGER total,
-				     LPULARGE_INTEGER totalfree)
+				     PULARGE_INTEGER avail,
+				     PULARGE_INTEGER total,
+				     PULARGE_INTEGER totalfree)
 {
     int	drive;
     ULARGE_INTEGER size,available;
@@ -841,9 +841,9 @@ BOOL32 WINAPI GetDiskFreeSpaceEx32A( LPCSTR root,
 /***********************************************************************
  *           GetDiskFreeSpaceEx32W   (KERNEL32.873)
  */
-BOOL32 WINAPI GetDiskFreeSpaceEx32W( LPCWSTR root, LPULARGE_INTEGER avail,
-				     LPULARGE_INTEGER total,
-				     LPULARGE_INTEGER  totalfree)
+BOOL32 WINAPI GetDiskFreeSpaceEx32W( LPCWSTR root, PULARGE_INTEGER avail,
+				     PULARGE_INTEGER total,
+				     PULARGE_INTEGER  totalfree)
 {
     LPSTR xroot;
     BOOL32 ret;

misc/registry.c

@@ -3418,7 +3418,7 @@ LONG WINAPI RegConnectRegistry32A( LPCSTR machine, HKEY hkey, LPHKEY reskey )
  */
 LONG WINAPI RegGetKeySecurity( HKEY hkey, 
                                SECURITY_INFORMATION SecurityInformation,
-                               LPSECURITY_DESCRIPTOR pSecurityDescriptor,
+                               PSECURITY_DESCRIPTOR pSecurityDescriptor,
                                LPDWORD lpcbSecurityDescriptor )
 {
     LPKEYSTRUCT	lpkey;
@@ -3550,7 +3550,7 @@ LONG WINAPI RegUnLoadKey32A( HKEY hkey, LPCSTR lpSubKey )
  *    pSecurityDesc [I] Address of descriptor for key
  */
 LONG WINAPI RegSetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInfo,
-                               LPSECURITY_DESCRIPTOR pSecurityDesc )
+                               PSECURITY_DESCRIPTOR pSecurityDesc )
 {
     LPKEYSTRUCT	lpkey;
 

win32/newfns.c

@@ -45,7 +45,7 @@ BOOL32 WINAPI UTUnRegister(HMODULE32 hModule)
 /****************************************************************************
  *		QueryPerformanceCounter (KERNEL32.564)
  */
-BOOL32 WINAPI QueryPerformanceCounter(LPLARGE_INTEGER counter)
+BOOL32 WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter)
 {
     struct timeval tv;
 
@@ -58,7 +58,7 @@ BOOL32 WINAPI QueryPerformanceCounter(LPLARGE_INTEGER counter)
 /****************************************************************************
  *		QueryPerformanceFrequency (KERNEL32.565)
  */
-BOOL32 WINAPI QueryPerformanceFrequency(LPLARGE_INTEGER frequency)
+BOOL32 WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency)
 {
 	frequency->LowPart	= 1000000;
 	frequency->HighPart	= 0;

windows/user.c

@@ -467,9 +467,9 @@ BOOL32 WINAPI SetProcessWindowStation(HWINSTA32 hWinSta) {
 BOOL32 WINAPI SetUserObjectSecurity(
 	HANDLE32 hObj,
 	/*LPSECURITY_INFORMATION*/LPVOID pSIRequested,
-	/*LPSECURITY_DESCRIPTOR*/LPVOID pSID
+	PSECURITY_DESCRIPTOR pSID
 ) {
-	FIXME(win32,"(%d,%p,%p),stub!\n",hObj,pSIRequested,pSID);
+	FIXME(win32,"(0x%08x,%p,%p),stub!\n",hObj,pSIRequested,pSID);
 	return TRUE;
 }
 
@@ -491,7 +491,7 @@ HDESK32 WINAPI CreateDesktop32W(
  *           SetWindowStationUser   (USER32.521)
  */
 DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) {
-	FIXME(win32,"(%ld,%ld),stub!\n",x1,x2);
+	FIXME(win32,"(0x%08lx,0x%08lx),stub!\n",x1,x2);
 	return 1;
 }