ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved all the content of the DDK files ntdef.h and ntddk.h to 

winternl.h.
This commit is contained in:
Patrik Stridvall 2002-09-12 22:07:02 +00:00 committed by Alexandre Julliard
parent a9298731fa
commit 9c1de6de30
85 changed files with 994 additions and 1553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/winedbg.c
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include "debugger.h" #include "debugger.h"
#include "ntddk.h" #include "winternl.h"
#include "thread.h" #include "thread.h"
#include "wincon.h" #include "wincon.h"
#include "winreg.h" #include "winreg.h"

2
dlls/advapi32/security.c
View File

@ -24,7 +24,7 @@
#include "winerror.h" #include "winerror.h"
#include "rpcnterr.h" #include "rpcnterr.h"
#include "heap.h" #include "heap.h"
#include "ntddk.h" #include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/commdlg/filedlg95.c
View File

@ -60,7 +60,7 @@
#include <string.h> #include <string.h>
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "commdlg.h" #include "commdlg.h"

3
dlls/dsound/buffer.c
View File

@ -37,7 +37,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "ntddk.h" #include "winternl.h"
#include "mmddk.h" #include "mmddk.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -985,4 +985,3 @@ HRESULT WINAPI SecondaryBuffer_Create(
*pdsb = dsb; *pdsb = dsb;
return S_OK; return S_OK;
} }

2
dlls/dsound/dsound_main.c
View File

@ -58,7 +58,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "ntddk.h" #include "winternl.h"
#include "mmddk.h" #include "mmddk.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"

2
dlls/dsound/mixer.c
View File

@ -37,7 +37,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "ntddk.h" #include "winternl.h"
#include "mmddk.h" #include "mmddk.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/dsound/primary.c
View File

@ -37,7 +37,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "ntddk.h" #include "winternl.h"
#include "mmddk.h" #include "mmddk.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/dsound/propset.c
View File

@ -37,7 +37,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "ntddk.h" #include "winternl.h"
#include "mmddk.h" #include "mmddk.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/dsound/sound3d.c
View File

@ -54,7 +54,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "ntddk.h" #include "winternl.h"
#include "mmddk.h" #include "mmddk.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/gdi/driver.c
View File

@ -24,7 +24,7 @@
#include <string.h> #include <string.h>
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
#include "ntddk.h" #include "winternl.h"
#include "gdi.h" #include "gdi.h"
#include "win16drv/win16drv.h" #include "win16drv/win16drv.h"

2
dlls/kernel/kernel_main.c
View File

@ -29,7 +29,7 @@
#include "winbase.h" #include "winbase.h"
#include "wincon.h" #include "wincon.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/library.h" #include "wine/library.h"

2
dlls/kernel/locale.c
View File

@ -32,7 +32,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winuser.h" /* for RT_STRINGW */ #include "winuser.h" /* for RT_STRINGW */
#include "ntddk.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "winnls.h" #include "winnls.h"
#include "winerror.h" #include "winerror.h"

2
dlls/kernel/thunk.c
View File

@ -32,7 +32,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/kernel/time.c
View File

@ -32,7 +32,7 @@
# include <sys/times.h> # include <sys/times.h>
#endif #endif
#include "file.h" #include "file.h"
#include "ntddk.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"

3
dlls/kernel/utthunk.c
View File

@ -19,7 +19,7 @@
*/ */
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "ntddk.h" #include "winternl.h"
#include "module.h" #include "module.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -312,4 +312,3 @@ WORD WINAPI UTInit16( DWORD x1, DWORD x2, DWORD x3, DWORD x4 )
FIXME("(%08lx, %08lx, %08lx, %08lx): stub\n", x1, x2, x3, x4 ); FIXME("(%08lx, %08lx, %08lx, %08lx): stub\n", x1, x2, x3, x4 );
return 0; return 0;
} }

2
dlls/kernel/wowthunk.c
View File

@ -25,7 +25,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "wownt32.h" #include "wownt32.h"
#include "ntddk.h" #include "winternl.h"
#include "file.h" #include "file.h"
#include "miscemu.h" #include "miscemu.h"
#include "stackframe.h" #include "stackframe.h"

2
dlls/msvcrt/cppexcept.c
View File

@ -26,7 +26,7 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#include "ntddk.h" #include "winternl.h"
#include "msvcrt.h" #include "msvcrt.h"
#include "wine/exception.h" #include "wine/exception.h"
#include "msvcrt/excpt.h" #include "msvcrt/excpt.h"

2
dlls/msvcrt/dir.c
View File

@ -25,7 +25,7 @@
#include "wine/port.h" #include "wine/port.h"
#include <time.h> #include <time.h>
#include "ntddk.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "msvcrt.h" #include "msvcrt.h"
#include "ms_errno.h" #include "ms_errno.h"

2
dlls/msvcrt/except.c
View File

@ -28,7 +28,7 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/exception.h" #include "wine/exception.h"
#include "thread.h" #include "thread.h"
#include "msvcrt.h" #include "msvcrt.h"

2
dlls/msvcrt/file.c
View File

@ -30,7 +30,7 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#include "ntddk.h" #include "winternl.h"
#include "msvcrt.h" #include "msvcrt.h"
#include "ms_errno.h" #include "ms_errno.h"

2
dlls/netapi32/wksta.c
View File

@ -24,7 +24,7 @@
#include "lmapibuf.h" #include "lmapibuf.h"
#include "lmerr.h" #include "lmerr.h"
#include "winerror.h" #include "winerror.h"
#include "ntdef.h" #include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/ntdll/cdrom.c
View File

@ -61,7 +61,7 @@
# include <sys/cdio.h> # include <sys/cdio.h>
#endif #endif
#include "ntddk.h" #include "winternl.h"
#include "winioctl.h" #include "winioctl.h"
#include "ntddstor.h" #include "ntddstor.h"
#include "ntddcdrm.h" #include "ntddcdrm.h"

2
dlls/ntdll/critsection.c
View File

@ -26,7 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include "winerror.h" #include "winerror.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DEFAULT_DEBUG_CHANNEL(ntdll);

2
dlls/ntdll/debugtools.c
View File

@ -40,7 +40,7 @@
#include "thread.h" #include "thread.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "ntddk.h" #include "winternl.h"
#include "msvcrt/excpt.h" #include "msvcrt/excpt.h"
WINE_DECLARE_DEBUG_CHANNEL(tid); WINE_DECLARE_DEBUG_CHANNEL(tid);

4
dlls/ntdll/error.c
View File

@ -20,7 +20,7 @@
*/ */
#include "config.h" #include "config.h"
#include "ntddk.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -38,7 +38,7 @@ static const struct error_table error_table[20];
/************************************************************************** /**************************************************************************
* RtlNtStatusToDosError (NTDLL.@) * RtlNtStatusToDosError (NTDLL.@)
*/ */
DWORD WINAPI RtlNtStatusToDosError( DWORD status ) ULONG WINAPI RtlNtStatusToDosError( NTSTATUS status )
{ {
const struct error_table *table = error_table; const struct error_table *table = error_table;

4
dlls/ntdll/exception.c
View File

@ -26,7 +26,7 @@
#include <signal.h> #include <signal.h>
#include "winnt.h" #include "winnt.h"
#include "ntddk.h" #include "winternl.h"
#include "global.h" #include "global.h"
#include "wine/exception.h" #include "wine/exception.h"
#include "stackframe.h" #include "stackframe.h"
@ -252,7 +252,7 @@ void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context )
* RtlUnwind (NTDLL.@) * RtlUnwind (NTDLL.@)
*/ */
DEFINE_REGS_ENTRYPOINT_4( RtlUnwind, EXC_RtlUnwind, DEFINE_REGS_ENTRYPOINT_4( RtlUnwind, EXC_RtlUnwind,
PEXCEPTION_FRAME, LPVOID, PEXCEPTION_RECORD, DWORD ); PVOID, PVOID, PEXCEPTION_RECORD, PVOID );
void WINAPI EXC_RtlUnwind( PEXCEPTION_FRAME pEndFrame, LPVOID unusedEip, void WINAPI EXC_RtlUnwind( PEXCEPTION_FRAME pEndFrame, LPVOID unusedEip,
PEXCEPTION_RECORD pRecord, DWORD returnEax, PEXCEPTION_RECORD pRecord, DWORD returnEax,
CONTEXT *context ) CONTEXT *context )

2
dlls/ntdll/file.c
View File

@ -35,7 +35,7 @@
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "file.h" /* FIXME */ #include "file.h" /* FIXME */
#include "ntddk.h" #include "winternl.h"
#include "winioctl.h" #include "winioctl.h"
WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DEFAULT_DEBUG_CHANNEL(ntdll);

2
dlls/ntdll/heap.c
View File

@ -26,7 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"

2
dlls/ntdll/large_int.c
View File

@ -19,7 +19,7 @@
*/ */
#include "winnt.h" #include "winnt.h"
#include "ntddk.h" #include "winternl.h"
/* /*
* Note: we use LONGLONG instead of LARGE_INTEGER, because * Note: we use LONGLONG instead of LARGE_INTEGER, because

3
dlls/ntdll/loader.c
View File

@ -17,9 +17,8 @@
*/ */
#include "winbase.h" #include "winbase.h"
#include "ntdef.h"
#include "winnt.h" #include "winnt.h"
#include "ntddk.h" #include "winternl.h"
#include "module.h" #include "module.h"
#include "wine/exception.h" #include "wine/exception.h"

2
dlls/ntdll/nt.c
View File

@ -27,7 +27,7 @@
#include <time.h> #include <time.h>
#include "wine/debug.h" #include "wine/debug.h"
#include "ntddk.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "wine/server.h" #include "wine/server.h"

2
dlls/ntdll/ntdll_misc.h
View File

@ -19,8 +19,8 @@
#ifndef __WINE_NTDLL_MISC_H #ifndef __WINE_NTDLL_MISC_H
#define __WINE_NTDLL_MISC_H #define __WINE_NTDLL_MISC_H
#include "ntdef.h"
#include "winnt.h" #include "winnt.h"
#include "winternl.h"
/* debug helper */ /* debug helper */
extern LPCSTR debugstr_us( const UNICODE_STRING *str ); extern LPCSTR debugstr_us( const UNICODE_STRING *str );

6
dlls/ntdll/om.c
View File

@ -30,7 +30,7 @@
#endif #endif
#include "wine/debug.h" #include "wine/debug.h"
#include "ntddk.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "wine/server.h" #include "wine/server.h"
@ -257,11 +257,11 @@ NTSTATUS WINAPI NtClose( HANDLE Handle )
* ZwWaitForSingleObject [NTDLL.@] * ZwWaitForSingleObject [NTDLL.@]
*/ */
NTSTATUS WINAPI NtWaitForSingleObject( NTSTATUS WINAPI NtWaitForSingleObject(
IN PHANDLE Object, IN HANDLE Object,
IN BOOLEAN Alertable, IN BOOLEAN Alertable,
IN PLARGE_INTEGER Time) IN PLARGE_INTEGER Time)
{ {
FIXME("(%p,0x%08x,%p),stub!\n",Object,Alertable,Time); FIXME("(0x%08x,0x%08x,%p),stub!\n",Object,Alertable,Time);
return 0; return 0;
} }

2
dlls/ntdll/reg.c
View File

@ -34,7 +34,7 @@
#include "winerror.h" #include "winerror.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/server.h" #include "wine/server.h"
#include "ntddk.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
WINE_DEFAULT_DEBUG_CHANNEL(reg); WINE_DEFAULT_DEBUG_CHANNEL(reg);

2
dlls/ntdll/rtl.c
View File

@ -29,7 +29,7 @@
#include "winerror.h" #include "winerror.h"
#include "stackframe.h" #include "stackframe.h"
#include "ntddk.h" #include "winternl.h"
#include "winreg.h" #include "winreg.h"
WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DEFAULT_DEBUG_CHANNEL(ntdll);

2
dlls/ntdll/rtlbitmap.c
View File

@ -31,7 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DEFAULT_DEBUG_CHANNEL(ntdll);

8
dlls/ntdll/rtlstr.c
View File

@ -26,7 +26,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "ntddk.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -338,8 +338,8 @@ BOOLEAN WINAPI RtlPrefixUnicodeString( const UNICODE_STRING *s1,
* NOTES: * NOTES:
* writes terminating 0 * writes terminating 0
*/ */
NTSTATUS WINAPI RtlAnsiStringToUnicodeString( UNICODE_STRING *uni, NTSTATUS WINAPI RtlAnsiStringToUnicodeString( PUNICODE_STRING uni,
const STRING *ansi, PCANSI_STRING ansi,
BOOLEAN doalloc ) BOOLEAN doalloc )
{ {
DWORD total = RtlAnsiStringToUnicodeSize( ansi ); DWORD total = RtlAnsiStringToUnicodeSize( ansi );
@ -686,7 +686,7 @@ NTSTATUS WINAPI RtlMultiByteToUnicodeSize( DWORD *size, LPCSTR str, UINT len )
* Compute the size necessary for the multibyte conversion of 'str', * Compute the size necessary for the multibyte conversion of 'str',
* without the terminating NULL. * without the terminating NULL.
*/ */
NTSTATUS WINAPI RtlUnicodeToMultiByteSize( DWORD *size, LPCWSTR str, UINT len ) NTSTATUS WINAPI RtlUnicodeToMultiByteSize( PULONG size, LPCWSTR str, ULONG len )
{ {
*size = cp_wcstombs( get_ansi_table(), 0, str, len / sizeof(WCHAR), NULL, 0, NULL, NULL ); *size = cp_wcstombs( get_ansi_table(), 0, str, len / sizeof(WCHAR), NULL, 0, NULL, NULL );
return STATUS_SUCCESS; return STATUS_SUCCESS;

2
dlls/ntdll/sec.c
View File

@ -39,7 +39,7 @@
#include "winerror.h" #include "winerror.h"
#include "stackframe.h" #include "stackframe.h"
#include "ntddk.h" #include "winternl.h"
#include "winreg.h" #include "winreg.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "msvcrt/excpt.h" #include "msvcrt/excpt.h"

4
dlls/ntdll/signal_i386.c
View File

@ -50,7 +50,7 @@
# include <sys/signal.h> # include <sys/signal.h>
#endif #endif
#include "ntddk.h" #include "winternl.h"
#include "winnt.h" #include "winnt.h"
#include "wine/library.h" #include "wine/library.h"
@ -408,11 +408,9 @@ typedef struct
#define T_UNKNOWN (-1) /* Unknown fault (TRAP_sig not defined) */ #define T_UNKNOWN (-1) /* Unknown fault (TRAP_sig not defined) */
#include "wine/exception.h" #include "wine/exception.h"
#include "winnt.h"
#include "stackframe.h" #include "stackframe.h"
#include "global.h" #include "global.h"
#include "miscemu.h" #include "miscemu.h"
#include "ntddk.h"
#include "syslevel.h" #include "syslevel.h"
#include "wine/debug.h" #include "wine/debug.h"

23
dlls/ntdll/signal_powerpc.c
View File

@ -50,11 +50,19 @@
# include <sys/signal.h> # include <sys/signal.h>
#endif #endif
#include "ntddk.h" #include "winternl.h"
#include "winnt.h" #include "winnt.h"
#include "wine/library.h" #include "wine/library.h"
#include "wine/exception.h"
#include "selectors.h" #include "selectors.h"
#include "stackframe.h"
#include "global.h"
#include "miscemu.h"
#include "syslevel.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(seh);
/*********************************************************************** /***********************************************************************
* signal context platform-specific definitions * signal context platform-specific definitions
@ -65,17 +73,6 @@ typedef struct ucontext SIGCONTEXT;
#define HANDLER_DEF(name) void name( int __signal, struct siginfo *__siginfo, SIGCONTEXT *__context ) #define HANDLER_DEF(name) void name( int __signal, struct siginfo *__siginfo, SIGCONTEXT *__context )
#define HANDLER_CONTEXT (__context) #define HANDLER_CONTEXT (__context)
#include "wine/exception.h"
#include "winnt.h"
#include "stackframe.h"
#include "global.h"
#include "miscemu.h"
#include "ntddk.h"
#include "syslevel.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(seh);
typedef int (*wine_signal_handler)(unsigned int sig); typedef int (*wine_signal_handler)(unsigned int sig);
static wine_signal_handler handlers[256]; static wine_signal_handler handlers[256];

2
dlls/ntdll/signal_sparc.c
View File

@ -30,7 +30,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/ucontext.h> #include <sys/ucontext.h>
#include "ntddk.h" #include "winternl.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"

2
dlls/ntdll/sync.c
View File

@ -27,7 +27,7 @@
#include "winerror.h" #include "winerror.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/server.h" #include "wine/server.h"
#include "ntddk.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DEFAULT_DEBUG_CHANNEL(ntdll);

2
dlls/ntdll/tests/error.c
View File

@ -21,7 +21,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "rpcnterr.h" #include "rpcnterr.h"
#include "ntddk.h" #include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "wine/test.h" #include "wine/test.h"
#include <stdio.h> #include <stdio.h>

2
dlls/ntdll/tests/rtlbitmap.c
View File

@ -23,7 +23,7 @@
#include "wine/test.h" #include "wine/test.h"
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "ntddk.h" #include "winternl.h"
/* Function ptrs for ordinal calls */ /* Function ptrs for ordinal calls */
static HMODULE hntdll = 0; static HMODULE hntdll = 0;

25
dlls/ntdll/time.c
View File

@ -33,7 +33,7 @@
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
#include "ntddk.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
@ -211,9 +211,9 @@ VOID WINAPI RtlSystemTimeToLocalTime(
/****************************************************************************** /******************************************************************************
* RtlTimeToSecondsSince1970 [NTDLL.@] * RtlTimeToSecondsSince1970 [NTDLL.@]
*/ */
BOOLEAN WINAPI RtlTimeToSecondsSince1970( const FILETIME *time, LPDWORD res ) BOOLEAN WINAPI RtlTimeToSecondsSince1970( const LARGE_INTEGER *time, PULONG res )
{ {
ULONGLONG tmp = ((ULONGLONG)time->dwHighDateTime << 32) | time->dwLowDateTime; ULONGLONG tmp = ((ULONGLONG)time->s.HighPart << 32) | time->s.LowPart;
tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL ); tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL );
tmp -= SECS_1601_TO_1970; tmp -= SECS_1601_TO_1970;
if (tmp > 0xffffffff) return FALSE; if (tmp > 0xffffffff) return FALSE;
@ -224,9 +224,9 @@ BOOLEAN WINAPI RtlTimeToSecondsSince1970( const FILETIME *time, LPDWORD res )
/****************************************************************************** /******************************************************************************
* RtlTimeToSecondsSince1980 [NTDLL.@] * RtlTimeToSecondsSince1980 [NTDLL.@]
*/ */
BOOLEAN WINAPI RtlTimeToSecondsSince1980( const FILETIME *time, LPDWORD res ) BOOLEAN WINAPI RtlTimeToSecondsSince1980( const LARGE_INTEGER *time, LPDWORD res )
{ {
ULONGLONG tmp = ((ULONGLONG)time->dwHighDateTime << 32) | time->dwLowDateTime; ULONGLONG tmp = ((ULONGLONG)time->s.HighPart << 32) | time->s.LowPart;
tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL ); tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL );
tmp -= SECS_1601_to_1980; tmp -= SECS_1601_to_1980;
if (tmp > 0xffffffff) return FALSE; if (tmp > 0xffffffff) return FALSE;
@ -237,21 +237,21 @@ BOOLEAN WINAPI RtlTimeToSecondsSince1980( const FILETIME *time, LPDWORD res )
/****************************************************************************** /******************************************************************************
* RtlSecondsSince1970ToTime [NTDLL.@] * RtlSecondsSince1970ToTime [NTDLL.@]
*/ */
void WINAPI RtlSecondsSince1970ToTime( DWORD time, FILETIME *res ) void WINAPI RtlSecondsSince1970ToTime( DWORD time, LARGE_INTEGER *res )
{ {
ULONGLONG secs = RtlExtendedIntegerMultiply( time + SECS_1601_TO_1970, 10000000 ); ULONGLONG secs = RtlExtendedIntegerMultiply( time + SECS_1601_TO_1970, 10000000 );
res->dwLowDateTime = (DWORD)secs; res->s.LowPart = (DWORD)secs;
res->dwHighDateTime = (DWORD)(secs >> 32); res->s.HighPart = (DWORD)(secs >> 32);
} }
/****************************************************************************** /******************************************************************************
* RtlSecondsSince1980ToTime [NTDLL.@] * RtlSecondsSince1980ToTime [NTDLL.@]
*/ */
void WINAPI RtlSecondsSince1980ToTime( DWORD time, FILETIME *res ) void WINAPI RtlSecondsSince1980ToTime( DWORD time, LARGE_INTEGER *res )
{ {
ULONGLONG secs = RtlExtendedIntegerMultiply( time + SECS_1601_to_1980, 10000000 ); ULONGLONG secs = RtlExtendedIntegerMultiply( time + SECS_1601_to_1980, 10000000 );
res->dwLowDateTime = (DWORD)secs; res->s.LowPart = (DWORD)secs;
res->dwHighDateTime = (DWORD)(secs >> 32); res->s.HighPart = (DWORD)(secs >> 32);
} }
/****************************************************************************** /******************************************************************************
@ -269,7 +269,7 @@ VOID WINAPI RtlTimeToElapsedTimeFields(
* NtQuerySystemTime (NTDLL.@) * NtQuerySystemTime (NTDLL.@)
* ZwQuerySystemTime (NTDLL.@) * ZwQuerySystemTime (NTDLL.@)
*/ */
void WINAPI NtQuerySystemTime( LARGE_INTEGER *time ) NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER time )
{ {
ULONGLONG secs; ULONGLONG secs;
struct timeval now; struct timeval now;
@ -278,4 +278,5 @@ void WINAPI NtQuerySystemTime( LARGE_INTEGER *time )
secs = RtlExtendedIntegerMultiply( now.tv_sec+SECS_1601_TO_1970, 10000000 ) + now.tv_usec * 10; secs = RtlExtendedIntegerMultiply( now.tv_sec+SECS_1601_TO_1970, 10000000 ) + now.tv_usec * 10;
time->s.LowPart = (DWORD)secs; time->s.LowPart = (DWORD)secs;
time->s.HighPart = (DWORD)(secs >> 32); time->s.HighPart = (DWORD)(secs >> 32);
return STATUS_SUCCESS;
} }

2
dlls/ntdll/wcstring.c
View File

@ -27,7 +27,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "ntddk.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/ole32/hglobalstream.c
View File

@ -33,7 +33,7 @@
#include "ole2.h" #include "ole2.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/ole32/stg_stream.c
View File

@ -29,7 +29,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "storage32.h" #include "storage32.h"

4
dlls/ole32/storage.c
View File

@ -31,7 +31,7 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#include "windef.h" #include "windef.h"
#include "ntddk.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
@ -1728,5 +1728,3 @@ HRESULT WINAPI StgOpenStorage16(
return S_OK; return S_OK;
} }

2
dlls/oleaut32/tmarshal.c
View File

@ -40,7 +40,7 @@
#include "ole2disp.h" #include "ole2disp.h"
#include "typelib.h" #include "typelib.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "ntddk.h" #include "winternl.h"
static const WCHAR riidW[5] = {'r','i','i','d',0}; static const WCHAR riidW[5] = {'r','i','i','d',0};
static const WCHAR pdispparamsW[] = {'p','d','i','s','p','p','a','r','a','m','s',0}; static const WCHAR pdispparamsW[] = {'p','d','i','s','p','p','a','r','a','m','s',0};

2
dlls/setupapi/dirid.c
View File

@ -20,7 +20,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "setupapi.h" #include "setupapi.h"
#include "wine/unicode.h" #include "wine/unicode.h"

2
dlls/setupapi/infparse.c
View File

@ -28,7 +28,7 @@
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "setupapi.h" #include "setupapi.h"
#include "setupx16.h" #include "setupx16.h"

2
dlls/setupapi/install.c
View File

@ -20,7 +20,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "setupapi.h" #include "setupapi.h"
#include "wine/unicode.h" #include "wine/unicode.h"

2
dlls/setupapi/parser.c
View File

@ -27,7 +27,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "windef.h" #include "windef.h"
#include "ntddk.h" #include "winternl.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "wine/unicode.h" #include "wine/unicode.h"

2
dlls/setupapi/queue.c
View File

@ -20,7 +20,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "setupapi.h" #include "setupapi.h"
#include "wine/unicode.h" #include "wine/unicode.h"

2
dlls/winedos/int21.c
View File

@ -26,7 +26,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "dosexe.h" #include "dosexe.h"
#include "miscemu.h" #include "miscemu.h"

2
dlls/winmm/mmsystem.c
View File

@ -41,7 +41,7 @@
#include "wine/mmsystem16.h" #include "wine/mmsystem16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "heap.h" #include "heap.h"
#include "ntddk.h" #include "winternl.h"
#include "winemm.h" #include "winemm.h"
#include "wine/debug.h" #include "wine/debug.h"

2
files/directory.c
View File

@ -41,7 +41,7 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h" #include "winreg.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "drive.h" #include "drive.h"
#include "file.h" #include "file.h"

2
files/dos_fs.c
View File

@ -50,7 +50,7 @@
#include "file.h" #include "file.h"
#include "heap.h" #include "heap.h"
#include "msdos.h" #include "msdos.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/server.h" #include "wine/server.h"
#include "msvcrt/excpt.h" #include "msvcrt/excpt.h"

2
files/drive.c
View File

@ -55,7 +55,7 @@
#endif #endif
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" /* for GetCurrentTask */ #include "wine/winbase16.h" /* for GetCurrentTask */
#include "winerror.h" #include "winerror.h"
#include "winioctl.h" #include "winioctl.h"

6
files/file.c
View File

@ -59,7 +59,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/server.h" #include "wine/server.h"
@ -2969,11 +2969,11 @@ BOOL WINAPI SetFileTime( HANDLE hFile,
{ {
req->handle = hFile; req->handle = hFile;
if (lpLastAccessTime) if (lpLastAccessTime)
RtlTimeToSecondsSince1970( lpLastAccessTime, (DWORD *)&req->access_time ); RtlTimeToSecondsSince1970( (PLARGE_INTEGER) lpLastAccessTime, (DWORD *)&req->access_time );
else else
req->access_time = 0; /* FIXME */ req->access_time = 0; /* FIXME */
if (lpLastWriteTime) if (lpLastWriteTime)
RtlTimeToSecondsSince1970( lpLastWriteTime, (DWORD *)&req->write_time ); RtlTimeToSecondsSince1970( (PLARGE_INTEGER) lpLastWriteTime, (DWORD *)&req->write_time );
else else
req->write_time = 0; /* FIXME */ req->write_time = 0; /* FIXME */
ret = !wine_server_call_err( req ); ret = !wine_server_call_err( req );

2
files/profile.c
View File

@ -38,7 +38,7 @@
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winreg.h" #include "winreg.h"
#include "drive.h" #include "drive.h"

1182
include/ntddk.h
View File

File diff suppressed because it is too large Load Diff

114
include/ntdef.h
View File

@ -1,114 +0,0 @@
/*
* Copyright (C) 1999 Juergen Schmied
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __WINE_NTDEF_H
#define __WINE_NTDEF_H
#include "basetsd.h"
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif
#define NTAPI __stdcall
#ifndef IN
#define IN
#endif
#ifndef OUT
#define OUT
#endif
#ifndef OPTIONAL
#define OPTIONAL
#endif
#ifndef VOID
#define VOID void
#endif
typedef LONG NTSTATUS;
typedef NTSTATUS *PNTSTATUS;
typedef short CSHORT;
typedef CSHORT *PCSHORT;
/* NT lowlevel Strings (handled by Rtl* functions in NTDLL)
* If they are zero terminated, Length does not include the terminating 0.
*/
typedef struct _STRING {
USHORT Length;
USHORT MaximumLength;
PSTR Buffer;
} STRING,*PSTRING,ANSI_STRING,*PANSI_STRING;
typedef struct _CSTRING {
USHORT Length;
USHORT MaximumLength;
PCSTR Buffer;
} CSTRING,*PCSTRING;
typedef struct _UNICODE_STRING {
USHORT Length; /* bytes */
USHORT MaximumLength; /* bytes */
PWSTR Buffer;
} UNICODE_STRING,*PUNICODE_STRING;
/*
Objects
*/
#define OBJ_INHERIT 0x00000002L
#define OBJ_PERMANENT 0x00000010L
#define OBJ_EXCLUSIVE 0x00000020L
#define OBJ_CASE_INSENSITIVE 0x00000040L
#define OBJ_OPENIF 0x00000080L
#define OBJ_OPENLINK 0x00000100L
#define OBJ_KERNEL_HANDLE 0x00000200L
#define OBJ_VALID_ATTRIBUTES 0x000003F2L
typedef struct _OBJECT_ATTRIBUTES
{ ULONG Length;
HANDLE RootDirectory;
PUNICODE_STRING ObjectName;
ULONG Attributes;
PVOID SecurityDescriptor; /* type SECURITY_DESCRIPTOR */
PVOID SecurityQualityOfService; /* type SECURITY_QUALITY_OF_SERVICE */
} OBJECT_ATTRIBUTES;
typedef OBJECT_ATTRIBUTES *POBJECT_ATTRIBUTES;
#define InitializeObjectAttributes(p,n,a,r,s) \
{ (p)->Length = sizeof(OBJECT_ATTRIBUTES); \
(p)->RootDirectory = r; \
(p)->Attributes = a; \
(p)->ObjectName = n; \
(p)->SecurityDescriptor = s; \
(p)->SecurityQualityOfService = NULL; \
}
#ifdef __cplusplus
}
#endif
#endif

2
include/thread.h
View File

@ -21,7 +21,7 @@
#ifndef __WINE_THREAD_H #ifndef __WINE_THREAD_H
#define __WINE_THREAD_H #define __WINE_THREAD_H
#include "ntdef.h" /* UNICODE_STRING */ #include "winternl.h"
#include "wine/windef16.h" #include "wine/windef16.h"
struct _PDB; struct _PDB;

1
include/wine/server.h
View File

@ -22,7 +22,6 @@
#define __WINE_WINE_SERVER_H #define __WINE_WINE_SERVER_H
#include "thread.h" #include "thread.h"
#include "ntddk.h"
#include "wine/exception.h" #include "wine/exception.h"
#include "wine/server_protocol.h" #include "wine/server_protocol.h"

1020
include/winternl.h
View File

File diff suppressed because it is too large Load Diff

1
loader/module.c
View File

@ -32,6 +32,7 @@
#endif #endif
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winerror.h" #include "winerror.h"
#include "winternl.h"
#include "heap.h" #include "heap.h"
#include "file.h" #include "file.h"
#include "module.h" #include "module.h"

2
loader/pe_resource.c
View File

@ -32,7 +32,7 @@
#include "wine/unicode.h" #include "wine/unicode.h"
#include "windef.h" #include "windef.h"
#include "winnls.h" #include "winnls.h"
#include "ntddk.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "wine/debug.h" #include "wine/debug.h"

2
loader/task.c
View File

@ -40,7 +40,7 @@
#include "instance.h" #include "instance.h"
#include "miscemu.h" #include "miscemu.h"
#include "module.h" #include "module.h"
#include "ntddk.h" #include "winternl.h"
#include "selectors.h" #include "selectors.h"
#include "wine/server.h" #include "wine/server.h"
#include "syslevel.h" #include "syslevel.h"

2
memory/environ.c
View File

@ -31,7 +31,7 @@
#include "wine/server.h" #include "wine/server.h"
#include "wine/library.h" #include "wine/library.h"
#include "heap.h" #include "heap.h"
#include "ntddk.h" #include "winternl.h"
#include "selectors.h" #include "selectors.h"
/* Win32 process environment database */ /* Win32 process environment database */

2
memory/heap.c
View File

@ -30,7 +30,7 @@
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winerror.h" #include "winerror.h"
#include "winnt.h" #include "winnt.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "selectors.h" #include "selectors.h"
#include "global.h" #include "global.h"

2
misc/main.c
View File

@ -37,7 +37,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "ntddk.h" #include "winternl.h"
#include "winnls.h" #include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "wine/debug.h" #include "wine/debug.h"

2
misc/options.c
View File

@ -24,7 +24,7 @@
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/library.h" #include "wine/library.h"
#include "options.h" #include "options.h"
#include "module.h" #include "module.h"

2
misc/version.c
View File

@ -32,7 +32,7 @@
#include "winreg.h" #include "winreg.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "module.h" #include "module.h"
#include "wine/debug.h" #include "wine/debug.h"

2
msdos/int21.c
View File

@ -47,7 +47,7 @@
#include <ctype.h> #include <ctype.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" /* SW_NORMAL */ #include "winuser.h" /* SW_NORMAL */
#include "wine/winbase16.h" #include "wine/winbase16.h"

2
msdos/vxd.c
View File

@ -30,7 +30,7 @@
#endif #endif
#include "winbase.h" #include "winbase.h"
#include "windef.h" #include "windef.h"
#include "ntddk.h" #include "winternl.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"

2
ole/ole2nls.c
View File

@ -33,7 +33,7 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "winver.h" #include "winver.h"
#include "winnls.h" #include "winnls.h"

2
relay32/relay386.c
View File

@ -26,7 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include "winnt.h" #include "winnt.h"
#include "ntddk.h" #include "winternl.h"
#include "winreg.h" #include "winreg.h"
#include "stackframe.h" #include "stackframe.h"
#include "module.h" #include "module.h"

2
relay32/snoop.c
View File

@ -26,7 +26,7 @@
#include <string.h> #include <string.h>
#include "winbase.h" #include "winbase.h"
#include "winnt.h" #include "winnt.h"
#include "ntddk.h" #include "winternl.h"
#include "snoop.h" #include "snoop.h"
#include "stackframe.h" #include "stackframe.h"
#include "wine/debug.h" #include "wine/debug.h"

2
scheduler/critsection.c
View File

@ -28,7 +28,7 @@
#include "winerror.h" #include "winerror.h"
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "thread.h" #include "thread.h"

2
scheduler/pthread.c
View File

@ -36,7 +36,7 @@
#include "winbase.h" #include "winbase.h"
#include "thread.h" #include "thread.h"
#include "ntddk.h" #include "winternl.h"
static int init_done; static int init_done;

2
scheduler/syslevel.c
View File

@ -24,7 +24,7 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include "ntddk.h" #include "winternl.h"
#include "syslevel.h" #include "syslevel.h"
#include "stackframe.h" #include "stackframe.h"
#include "wine/library.h" #include "wine/library.h"

2
server/registry.c
View File

@ -45,7 +45,7 @@
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
#include "winnt.h" /* registry definitions */ #include "winnt.h" /* registry definitions */
#include "ntddk.h" #include "winternl.h"
#include "wine/library.h" #include "wine/library.h"
/* a registry key */ /* a registry key */

2
win32/except.c
View File

@ -41,7 +41,7 @@
#include <stdio.h> #include <stdio.h>
#include "windef.h" #include "windef.h"
#include "winerror.h" #include "winerror.h"
#include "ntddk.h" #include "winternl.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/exception.h" #include "wine/exception.h"