Fix LUID definition.

ea31cf0a · Francois Gouget · Alexandre Julliard · 80eff975 · ea31cf0a · ea31cf0a
Commit ea31cf0a authored Nov 20, 2001 by Francois Gouget Committed by Alexandre Julliard Nov 20, 2001
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

service.c dlls/advapi32/service.c +2 -2

nt.c dlls/ntdll/nt.c +6 -3

winnt.h include/winnt.h +4 -1

No files found.
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -262,8 +262,8 @@ OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName,
 BOOL WINAPI
 AllocateLocallyUniqueId( PLUID lpluid )
 {
-	lpluid->s.LowPart = time(NULL);
+	lpluid->LowPart = time(NULL);
-	lpluid->s.HighPart = 0;
+	lpluid->HighPart = 0;
 	return TRUE;
 }

--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -694,10 +694,13 @@ NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID Luid)
 {
    static LUID luid;
-	FIXME("%p (0x%08lx%08lx)\n", Luid, luid.DUMMYSTRUCTNAME.HighPart, luid.DUMMYSTRUCTNAME.LowPart);
+    FIXME("%p (0x%08lx%08lx)\n", Luid, luid.HighPart, luid.LowPart);
-	luid.QuadPart++;
+    luid.LowPart++;
+    if (luid.LowPart==0)
+        luid.HighPart++;
+    Luid->HighPart = luid.HighPart;
+    Luid->LowPart = luid.LowPart;
-	Luid->QuadPart = luid.QuadPart;
    return STATUS_SUCCESS;
 }
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -3591,7 +3591,10 @@ typedef union _ULARGE_INTEGER {
 * Locally Unique Identifier
 */
-typedef LARGE_INTEGER LUID,*PLUID;
+typedef struct _LUID {
+    DWORD LowPart;
+    LONG HighPart;
+} LUID, *PLUID;
 typedef struct _LUID_AND_ATTRIBUTES {
  LUID   Luid;