* Sync up to trunk HEAD (r62975).

svn path=/branches/shell-experiments/; revision=62976
This commit is contained in:
Amine Khaldi 2014-04-26 11:31:20 +00:00
commit 3a088d8ec6
811 changed files with 26955 additions and 128558 deletions

View file

@ -1160,18 +1160,11 @@ typedef struct _SYSTEM_TIMEOFDAY_INFORMATION {
/* System Information Class 0x08 */
typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION {
#ifdef __WINESRC__
LARGE_INTEGER liIdleTime;
LARGE_INTEGER liKernelTime;
LARGE_INTEGER liUserTime;
DWORD dwSpare[5];
#else
LARGE_INTEGER IdleTime;
LARGE_INTEGER KernelTime;
LARGE_INTEGER UserTime;
LARGE_INTEGER Reserved1[2];
ULONG Reserved2;
#endif
} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION, *PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
/* System Information Class 0x0b */
@ -2455,6 +2448,9 @@ typedef struct _LDR_MODULE
#define LDR_DONT_RESOLVE_REFS 0x40000000
#define LDR_WINE_INTERNAL 0x80000000
/* flag for LdrAddRefDll */
#define LDR_ADDREF_DLL_PIN 0x00000001
/* FIXME: to be checked */
#define MAXIMUM_FILENAME_LENGTH 256