* ntdll.h (_SYSTEM_PROCESSOR_TIMES): Force eight byte alignment.
(_SYSTEM_TIME_OF_DAY_INFORMATION): Ditto.
This commit is contained in:
parent
d5591d9df6
commit
91a2f87b9d
|
@ -1,3 +1,8 @@
|
|||
2002-07-05 Christopher Faylor <cgf@redhat.com>
|
||||
|
||||
* ntdll.h (_SYSTEM_PROCESSOR_TIMES): Force eight byte alignment.
|
||||
(_SYSTEM_TIME_OF_DAY_INFORMATION): Ditto.
|
||||
|
||||
2002-07-05 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* fhandler.h (UNCONNECTED): New define.
|
||||
|
|
|
@ -50,7 +50,7 @@ typedef struct _SYSTEM_BASIC_INFORMATION
|
|||
UCHAR NumberProcessors;
|
||||
} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION;
|
||||
|
||||
typedef struct _SYSTEM_PROCESSOR_TIMES
|
||||
typedef struct __attribute__ ((aligned (8))) _SYSTEM_PROCESSOR_TIMES
|
||||
{
|
||||
LARGE_INTEGER IdleTime;
|
||||
LARGE_INTEGER KernelTime;
|
||||
|
@ -244,7 +244,7 @@ typedef struct _SYSTEM_PERFORMANCE_INFORMATION
|
|||
ULONG SystemCalls;
|
||||
} SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION;
|
||||
|
||||
typedef struct _SYSTEM_TIME_OF_DAY_INFORMATION
|
||||
typedef struct __attribute__ ((aligned(8))) _SYSTEM_TIME_OF_DAY_INFORMATION
|
||||
{
|
||||
LARGE_INTEGER BootTime;
|
||||
LARGE_INTEGER CurrentTime;
|
||||
|
|
|
@ -2822,35 +2822,23 @@ suffix_scan::has (const char *in_path, const suffix_info *in_suffixes)
|
|||
int
|
||||
suffix_scan::next ()
|
||||
{
|
||||
if (suffixes)
|
||||
for (;;)
|
||||
{
|
||||
while (suffixes && suffixes->name)
|
||||
if (!suffixes->addon)
|
||||
suffixes++;
|
||||
else
|
||||
{
|
||||
strcpy (eopath, suffixes->name);
|
||||
if (nextstate == SCAN_EXTRALNK)
|
||||
strcat (eopath, ".lnk");
|
||||
suffixes++;
|
||||
return 1;
|
||||
}
|
||||
suffixes = NULL;
|
||||
}
|
||||
|
||||
if (!suffixes)
|
||||
switch (nextstate)
|
||||
{
|
||||
case SCAN_BEG:
|
||||
suffixes = suffixes_start;
|
||||
if (!suffixes)
|
||||
nextstate = SCAN_LNK;
|
||||
else
|
||||
{
|
||||
nextstate = SCAN_LNK;
|
||||
return 1;
|
||||
}
|
||||
if (!*suffixes->name)
|
||||
suffixes++;
|
||||
nextstate = SCAN_EXTRALNK;
|
||||
}
|
||||
return 1;
|
||||
/* fall through to suffix checking below */
|
||||
break;
|
||||
case SCAN_HASLNK:
|
||||
nextstate = SCAN_EXTRALNK; /* Skip SCAN_BEG */
|
||||
return 1;
|
||||
|
@ -2870,6 +2858,20 @@ suffix_scan::next ()
|
|||
*eopath = '\0';
|
||||
return 0;
|
||||
}
|
||||
|
||||
while (suffixes && suffixes->name)
|
||||
if (!suffixes->addon)
|
||||
suffixes++;
|
||||
else
|
||||
{
|
||||
strcpy (eopath, suffixes->name);
|
||||
if (nextstate == SCAN_EXTRALNK)
|
||||
strcat (eopath, ".lnk");
|
||||
suffixes++;
|
||||
return 1;
|
||||
}
|
||||
suffixes = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* Check if PATH is a symlink. PATH must be a valid Win32 path name.
|
||||
|
|
Loading…
Reference in New Issue