Changelog: * include/winnt.h, dlls/advapi32/service.c, dlls/ntdll/nt.c Fix LUID definition -- Francois Gouget fgouget@free.fr http://fgouget.free.fr/ The nice thing about meditation is that it makes doing nothing quite respectable -- Paul Dean
Index: include/winnt.h =================================================================== RCS file: /home/wine/wine/include/winnt.h,v retrieving revision 1.93 diff -u -r1.93 winnt.h --- include/winnt.h 2001/08/09 21:14:42 1.93 +++ include/winnt.h 2001/11/19 08:30:38 @@ -3591,12 +3591,15 @@ * Locally Unique Identifier */ -typedef LARGE_INTEGER LUID,*PLUID; +typedef struct _LUID { + DWORD LowPart; + LONG HighPart; +} LUID, *PLUID; typedef struct _LUID_AND_ATTRIBUTES { - LUID Luid; - DWORD Attributes; -} LUID_AND_ATTRIBUTES; + LUID Luid; + DWORD Attributes; +} LUID_AND_ATTRIBUTES; /* * PRIVILEGE_SET Index: dlls/advapi32/service.c =================================================================== RCS file: /home/wine/wine/dlls/advapi32/service.c,v retrieving revision 1.25 diff -u -r1.25 service.c --- dlls/advapi32/service.c 2001/10/22 19:04:32 1.25 +++ dlls/advapi32/service.c 2001/11/19 08:30:29 @@ -262,8 +262,8 @@ BOOL WINAPI AllocateLocallyUniqueId( PLUID lpluid ) { - lpluid->s.LowPart = time(NULL); - lpluid->s.HighPart = 0; + lpluid->LowPart = time(NULL); + lpluid->HighPart = 0; return TRUE; } Index: dlls/ntdll/nt.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/nt.c,v retrieving revision 1.35 diff -u -r1.35 nt.c --- dlls/ntdll/nt.c 2001/07/19 00:39:09 1.35 +++ dlls/ntdll/nt.c 2001/11/19 08:30:31 @@ -692,12 +692,15 @@ */ NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID Luid) { - static LUID 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->QuadPart = luid.QuadPart; - return STATUS_SUCCESS; + luid.LowPart++; + if (luid.LowPart==0) + luid.HighPart++; + Luid->HighPart = luid.HighPart; + Luid->LowPart = luid.LowPart; + + return STATUS_SUCCESS; }