dependency fixes for winternl.h (RESEND)
Mike McCormack
mike at codeweavers.com
Fri Jun 10 01:06:37 CDT 2005
This one adds the changes to ntdll, and additionally defines FILETIME.
The only dependency left is on the TIME_ZONE_INFORMATION structure, and
I can't find any information on the correct prototype for
RtlQueryTimeZoneInformation() and RtlSetTimeZoneInformation().
Mike
ChangeLog:
* dependency fixes for winternl.h
-------------- next part --------------
Index: include/winternl.h
===================================================================
RCS file: /home/wine/wine/include/winternl.h,v
retrieving revision 1.132
diff -u -p -r1.132 winternl.h
--- include/winternl.h 7 Jun 2005 20:01:29 -0000 1.132
+++ include/winternl.h 10 Jun 2005 06:04:56 -0000
@@ -61,6 +61,21 @@ typedef struct _UNICODE_STRING {
typedef const UNICODE_STRING *PCUNICODE_STRING;
+#ifndef _FILETIME_
+#define _FILETIME_
+/* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */
+typedef struct _FILETIME
+{
+#ifdef WORDS_BIGENDIAN
+ DWORD dwHighDateTime;
+ DWORD dwLowDateTime;
+#else
+ DWORD dwLowDateTime;
+ DWORD dwHighDateTime;
+#endif
+} FILETIME, *PFILETIME, *LPFILETIME;
+#endif /* _FILETIME_ */
+
typedef struct _CLIENT_ID
{
HANDLE UniqueProcess;
@@ -1423,6 +1438,16 @@ typedef struct _RTL_QUERY_REGISTRY_TABLE
ULONG DefaultLength;
} RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE;
+typedef struct _KEY_MULTIPLE_VALUE_INFORMATION
+{
+ PUNICODE_STRING ValueName;
+ ULONG DataLength;
+ ULONG DataOffset;
+ ULONG Type;
+} KEY_MULTIPLE_VALUE_INFORMATION, *PKEY_MULTIPLE_VALUE_INFORMATION;
+
+typedef VOID (*PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG );
+
/***********************************************************************
* Function declarations
@@ -1527,7 +1552,7 @@ NTSTATUS WINAPI NtQueryInformationThrea
NTSTATUS WINAPI NtQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD);
NTSTATUS WINAPI NtQueryInstallUILanguage(LANGID*);
NTSTATUS WINAPI NtQueryKey(HKEY,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
-NTSTATUS WINAPI NtQueryMultipleValueKey(HKEY,PVALENTW,ULONG,PVOID,ULONG,PULONG);
+NTSTATUS WINAPI NtQueryMultipleValueKey(HKEY,PKEY_MULTIPLE_VALUE_INFORMATION,ULONG,PVOID,ULONG,PULONG);
NTSTATUS WINAPI NtQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG);
NTSTATUS WINAPI NtQueryPerformanceCounter(PLARGE_INTEGER, PLARGE_INTEGER);
NTSTATUS WINAPI NtQuerySecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,ULONG,PULONG);
@@ -1561,7 +1586,7 @@ NTSTATUS WINAPI NtSetInformationToken(H
NTSTATUS WINAPI NtSetIoCompletion(HANDLE,ULONG,ULONG,NTSTATUS,ULONG);
NTSTATUS WINAPI NtSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*);
-NTSTATUS WINAPI NtSetTimer(HANDLE, const LARGE_INTEGER*, PTIMERAPCROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*);
+NTSTATUS WINAPI NtSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*);
NTSTATUS WINAPI NtSetValueKey(HKEY,const UNICODE_STRING *,ULONG,ULONG,const void *,ULONG);
NTSTATUS WINAPI NtSignalAndWaitForSingleObject(HANDLE,HANDLE,BOOLEAN,const LARGE_INTEGER*);
NTSTATUS WINAPI NtSuspendThread(HANDLE,PULONG);
Index: dlls/ntdll/reg.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/reg.c,v
retrieving revision 1.59
diff -u -p -r1.59 reg.c
--- dlls/ntdll/reg.c 16 May 2005 14:08:11 -0000 1.59
+++ dlls/ntdll/reg.c 10 Jun 2005 06:04:56 -0000
@@ -645,7 +645,7 @@ NTSTATUS WINAPI NtNotifyChangeKey(
NTSTATUS WINAPI NtQueryMultipleValueKey(
HKEY KeyHandle,
- PVALENTW ListOfValuesToQuery,
+ PKEY_MULTIPLE_VALUE_INFORMATION ListOfValuesToQuery,
ULONG NumberOfItems,
PVOID MultipleValueInformation,
ULONG Length,
Index: dlls/ntdll/sync.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/sync.c,v
retrieving revision 1.48
diff -u -p -r1.48 sync.c
--- dlls/ntdll/sync.c 6 Jun 2005 20:04:33 -0000 1.48
+++ dlls/ntdll/sync.c 10 Jun 2005 06:04:56 -0000
@@ -456,7 +456,7 @@ NTSTATUS WINAPI NtOpenTimer(OUT PHANDLE
*/
NTSTATUS WINAPI NtSetTimer(IN HANDLE handle,
IN const LARGE_INTEGER* when,
- IN PTIMERAPCROUTINE callback,
+ IN PTIMER_APC_ROUTINE callback,
IN PVOID callback_arg,
IN BOOLEAN resume,
IN ULONG period OPTIONAL,
More information about the wine-patches
mailing list