Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[tkreuzer] 34708: fix LIST_ENTRY() macro for 64 bits
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:56:10 2008 New Revision: 34708 URL: http://svn.reactos.org/svn/reactos?rev=34708&view=rev Log: fix LIST_ENTRY() macro for 64 bits Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/list.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/list.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/list.h [iso-8859-1] Wed Jul 23 17:56:10 2008 @@ -224,7 +224,12 @@ #define LIST_INIT(list) { &(list), &(list) } /* get pointer to object containing list element */ +#ifdef _WIN64 #define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (unsigned int)(&((type *)0)->field))) + ((type *)((char *)(elem) - (unsigned long long)(&((type *)0)->field))) +#else +#define LIST_ENTRY(elem, type, field) \ + ((type *)((char *)(elem) - (unsigned long)(&((type *)0)->field))) +#endif #endif /* __WINE_SERVER_LIST_H */

1 0

[tkreuzer] 34707: winddk.h: - add InterlockedCompareExchangePointer and InterlockedExchangePointer - add intrinsic port and register access functions
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:53:04 2008 New Revision: 34707 URL: http://svn.reactos.org/svn/reactos?rev=34707&view=rev Log: winddk.h: - add InterlockedCompareExchangePointer and InterlockedExchangePointer - add intrinsic port and register access functions Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Wed Jul 23 17:53:04 2008 @@ -228,7 +228,7 @@ #define ZwCurrentProcess() NtCurrentProcess() #define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) #define ZwCurrentThread() NtCurrentThread() - + #if (_M_IX86) #define KIP0PCRADDRESS 0xffdff000 #endif @@ -5390,7 +5390,7 @@ */ #define PCR_MINOR_VERSION 1 #define PCR_MAJOR_VERSION 1 - + #ifdef _X86_ typedef ULONG PFN_NUMBER, *PPFN_NUMBER; @@ -5479,19 +5479,19 @@ #error Unknown compiler #endif } - + NTHALAPI KIRQL DDKAPI KeGetCurrentIrql( VOID); - + NTKERNELAPI PRKTHREAD NTAPI KeGetCurrentThread( VOID); - + #define KI_USER_SHARED_DATA 0xffdf0000 #elif defined(__x86_64__) @@ -5572,7 +5572,7 @@ #elif defined(_MIPS_) #error MIPS Headers are totally incorrect - + typedef ULONG PFN_NUMBER, *PPFN_NUMBER; #define PASSIVE_LEVEL 0 @@ -5606,16 +5606,16 @@ // NT-ARM is not documented, need DDK-ARM // #include <armddk.h> - + #else #error Unknown architecture #endif - + #define PAGE_SIZE 0x1000 #define PAGE_SHIFT 12L #define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) - + extern NTKERNELAPI PVOID MmHighestUserAddress; extern NTKERNELAPI PVOID MmSystemRangeStart; extern NTKERNELAPI ULONG_PTR MmUserProbeAddress; @@ -5730,8 +5730,12 @@ * IN OUT PVOID VOLATILE *Target, * IN PVOID Value) */ +#if defined (_M_AMD64) +#define InterlockedExchangePointer _InterlockedExchangePointer +#else #define InterlockedExchangePointer(Target, Value) \ ((PVOID) InterlockedExchange((PLONG) Target, (LONG) Value)) +#endif /* * PVOID @@ -5740,8 +5744,12 @@ * IN PVOID Exchange, * IN PVOID Comparand) */ +#if defined (_M_AMD64) +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#else #define InterlockedCompareExchangePointer(Destination, Exchange, Comparand) \ ((PVOID) InterlockedCompareExchange((PLONG) Destination, (LONG) Exchange, (LONG) Comparand)) +#endif #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) #define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)a) @@ -7555,6 +7563,9 @@ IN PVOID Context ); +/** Io access routines **/ + +#if !defined(_M_AMD64) NTHALAPI VOID NTAPI @@ -7728,6 +7739,244 @@ WRITE_REGISTER_USHORT( IN PUSHORT Register, IN USHORT Value); + +#else + +FORCEINLINE +VOID +READ_PORT_BUFFER_UCHAR( + IN PUCHAR Port, + IN PUCHAR Buffer, + IN ULONG Count) +{ + __inbytestring((USHORT)(ULONG_PTR)Port, Buffer, Count); +} + +FORCEINLINE +VOID +READ_PORT_BUFFER_ULONG( + IN PULONG Port, + IN PULONG Buffer, + IN ULONG Count) +{ + __indwordstring((USHORT)(ULONG_PTR)Port, Buffer, Count); +} + +FORCEINLINE +VOID +READ_PORT_BUFFER_USHORT( + IN PUSHORT Port, + IN PUSHORT Buffer, + IN ULONG Count) +{ + __inwordstring((USHORT)(ULONG_PTR)Port, Buffer, Count); +} + +FORCEINLINE +UCHAR +READ_PORT_UCHAR( + IN PUCHAR Port) +{ + return __inbyte((USHORT)(ULONG_PTR)Port); +} + +FORCEINLINE +ULONG +READ_PORT_ULONG( + IN PULONG Port) +{ + return __indword((USHORT)(ULONG_PTR)Port); +} + +FORCEINLINE +USHORT +READ_PORT_USHORT( + IN PUSHORT Port) +{ + return __inword((USHORT)(ULONG_PTR)Port); +} + +FORCEINLINE +VOID +READ_REGISTER_BUFFER_UCHAR( + IN PUCHAR Register, + IN PUCHAR Buffer, + IN ULONG Count) +{ + __movsb(Register, Buffer, Count); +} + +FORCEINLINE +VOID +READ_REGISTER_BUFFER_ULONG( + IN PULONG Register, + IN PULONG Buffer, + IN ULONG Count) +{ + __movsd(Register, Buffer, Count); +} + +FORCEINLINE +VOID +READ_REGISTER_BUFFER_USHORT( + IN PUSHORT Register, + IN PUSHORT Buffer, + IN ULONG Count) +{ + __movsw(Register, Buffer, Count); +} + +FORCEINLINE +UCHAR +READ_REGISTER_UCHAR( + IN PUCHAR Register) +{ + return *Register; +} + +FORCEINLINE +ULONG +READ_REGISTER_ULONG( + IN PULONG Register) +{ + return *Register; +} + +FORCEINLINE +USHORT +READ_REGISTER_USHORT( + IN PUSHORT Register) +{ + return *Register; +} + +FORCEINLINE +VOID +WRITE_PORT_BUFFER_UCHAR( + IN PUCHAR Port, + IN PUCHAR Buffer, + IN ULONG Count) +{ + __outbytestring((USHORT)(ULONG_PTR)Port, Buffer, Count); +} + +FORCEINLINE +VOID +WRITE_PORT_BUFFER_ULONG( + IN PULONG Port, + IN PULONG Buffer, + IN ULONG Count) +{ + __outdwordstring((USHORT)(ULONG_PTR)Port, Buffer, Count); +} + +FORCEINLINE +VOID +WRITE_PORT_BUFFER_USHORT( + IN PUSHORT Port, + IN PUSHORT Buffer, + IN ULONG Count) +{ + __outwordstring((USHORT)(ULONG_PTR)Port, Buffer, Count); +} + +FORCEINLINE +VOID +WRITE_PORT_UCHAR( + IN PUCHAR Port, + IN UCHAR Value) +{ + __outbyte((USHORT)(ULONG_PTR)Port, Value); +} + +FORCEINLINE +VOID +WRITE_PORT_ULONG( + IN PULONG Port, + IN ULONG Value) +{ + __outdword((USHORT)(ULONG_PTR)Port, Value); +} + +FORCEINLINE +VOID +WRITE_PORT_USHORT( + IN PUSHORT Port, + IN USHORT Value) +{ + __outword((USHORT)(ULONG_PTR)Port, Value); +} + +FORCEINLINE +VOID +WRITE_REGISTER_BUFFER_UCHAR( + IN PUCHAR Register, + IN PUCHAR Buffer, + IN ULONG Count) +{ + LONG Synch; + __movsb(Register, Buffer, Count); + InterlockedOr(&Synch, 1); +} + +FORCEINLINE +VOID +WRITE_REGISTER_BUFFER_ULONG( + IN PULONG Register, + IN PULONG Buffer, + IN ULONG Count) +{ + LONG Synch; + __movsd(Register, Buffer, Count); + InterlockedOr(&Synch, 1); +} + +FORCEINLINE +VOID +WRITE_REGISTER_BUFFER_USHORT( + IN PUSHORT Register, + IN PUSHORT Buffer, + IN ULONG Count) +{ + LONG Synch; + __movsw(Register, Buffer, Count); + InterlockedOr(&Synch, 1); +} + +FORCEINLINE +VOID +WRITE_REGISTER_UCHAR( + IN PUCHAR Register, + IN UCHAR Value) +{ + LONG Synch; + *Register = Value; + InterlockedOr(&Synch, 1); +} + +FORCEINLINE +VOID +WRITE_REGISTER_ULONG( + IN PULONG Register, + IN ULONG Value) +{ + LONG Synch; + *Register = Value; + InterlockedOr(&Synch, 1); +} + +FORCEINLINE +VOID +WRITE_REGISTER_USHORT( + IN PUSHORT Register, + IN USHORT Value) +{ + LONG Sync; + *Register = Value; + InterlockedOr(&Sync, 1); +} + +#endif /** I/O manager routines **/ @@ -9585,9 +9834,9 @@ DDKAPI KeRaiseIrqlToSynchLevel( VOID); - + #elif defined(_M_ARM) - + #include <armddk.h> #else

1 0

[tkreuzer] 34706: - fix ENUMRESLANGPROC, ENUMRESNAMEPROC and ENUMRESTYPEPROC - add Interlocked functions for pointers
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:49:16 2008 New Revision: 34706 URL: http://svn.reactos.org/svn/reactos?rev=34706&view=rev Log: - fix ENUMRESLANGPROC, ENUMRESNAMEPROC and ENUMRESTYPEPROC - add Interlocked functions for pointers Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] Wed Jul 23 17:49:16 2008 @@ -23,7 +23,7 @@ #define FILE_SYSTEM_NOT_SUPPORT 6 #define FILE_USER_DISALLOWED 7 #define FILE_READ_ONLY 8 -#define FILE_DIR_DISALOWED 9 +#define FILE_DIR_DISALOWED 9 #define COMMPROP_INITIALIZED 0xE73CF52E #define SP_SERIALCOMM 1 @@ -1081,12 +1081,12 @@ typedef DWORD(WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,DWORD,DWORD,HANDLE,HANDLE,LPVOID); typedef void(WINAPI *LPFIBER_START_ROUTINE)(PVOID); typedef VOID (WINAPI *PFLS_CALLBACK_FUNCTION)(PVOID); -typedef BOOL(CALLBACK *ENUMRESLANGPROCA)(HMODULE,LPCSTR,LPCSTR,WORD,LONG); -typedef BOOL(CALLBACK *ENUMRESLANGPROCW)(HMODULE,LPCWSTR,LPCWSTR,WORD,LONG); -typedef BOOL(CALLBACK *ENUMRESNAMEPROCA)(HMODULE,LPCSTR,LPSTR,LONG); -typedef BOOL(CALLBACK *ENUMRESNAMEPROCW)(HMODULE,LPCWSTR,LPWSTR,LONG); -typedef BOOL(CALLBACK *ENUMRESTYPEPROCA)(HMODULE,LPSTR,LONG); -typedef BOOL(CALLBACK *ENUMRESTYPEPROCW)(HMODULE,LPWSTR,LONG); +typedef BOOL(CALLBACK *ENUMRESLANGPROCA)(HMODULE,LPCSTR,LPCSTR,WORD,LONG_PTR); +typedef BOOL(CALLBACK *ENUMRESLANGPROCW)(HMODULE,LPCWSTR,LPCWSTR,WORD,LONG_PTR); +typedef BOOL(CALLBACK *ENUMRESNAMEPROCA)(HMODULE,LPCSTR,LPSTR,LONG_PTR); +typedef BOOL(CALLBACK *ENUMRESNAMEPROCW)(HMODULE,LPCWSTR,LPWSTR,LONG_PTR); +typedef BOOL(CALLBACK *ENUMRESTYPEPROCA)(HMODULE,LPSTR,LONG_PTR); +typedef BOOL(CALLBACK *ENUMRESTYPEPROCW)(HMODULE,LPWSTR,LONG_PTR); typedef void(CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPOVERLAPPED); typedef LONG(CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(LPEXCEPTION_POINTERS); typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; @@ -1707,14 +1707,23 @@ #ifndef __INTERLOCKED_DECLARED #define __INTERLOCKED_DECLARED LONG WINAPI InterlockedCompareExchange(IN OUT LONG volatile *,LONG,LONG); -/* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ -#define InterlockedCompareExchangePointer(d,e,c) \ - (PVOID)InterlockedCompareExchange((LPLONG)(d),(LONG)(e),(LONG)(c)) LONG WINAPI InterlockedDecrement(IN OUT LONG volatile *); LONG WINAPI InterlockedExchange(IN OUT LONG volatile *,LONG); -/* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ -#define InterlockedExchangePointer(t,v) \ +#if defined(_WIN64) + /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ + #define InterlockedExchangePointer(t,v) \ + (PVOID)InterlockedExchange64((LONGLONG*)(t),(LONGLONG)(v)) + /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ + #define InterlockedCompareExchangePointer(d,e,c) \ + (PVOID)InterlockedCompareExchange64((LONGLONG*)(d),(LONGLONG)(e),(LONGLONG)(c)) +#else + /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ + #define InterlockedExchangePointer(t,v) \ (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v)) + /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ + #define InterlockedCompareExchangePointer(d,e,c) \ + (PVOID)InterlockedCompareExchange((LPLONG)(d),(LONG)(e),(LONG)(c)) +#endif LONG WINAPI InterlockedExchangeAdd(IN OUT LONG volatile *,LONG); #if (_WIN32_WINNT >= 0x0501) PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER);

1 0

[tkreuzer] 34705: - fix IMAGE_FIRST_SECTION macro - implement GetCurrentFiber(), NtCurrentTeb() and YieldProcessor()
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:45:52 2008 New Revision: 34705 URL: http://svn.reactos.org/svn/reactos?rev=34705&view=rev Log: - fix IMAGE_FIRST_SECTION macro - implement GetCurrentFiber(), NtCurrentTeb() and YieldProcessor() Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Wed Jul 23 17:45:52 2008 @@ -1358,7 +1358,7 @@ #define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800 #define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000 #define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 -#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader)) +#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD_PTR)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader)) #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 #define IMAGE_DIRECTORY_ENTRY_IMPORT 1 #define IMAGE_DIRECTORY_ENTRY_RESOURCE 2 @@ -2910,7 +2910,7 @@ #endif NTSYSAPI -WORD +WORD NTAPI RtlCaptureStackBackTrace( IN DWORD FramesToSkip, @@ -4098,6 +4098,11 @@ ); return ret; } +#elif defined (_M_AMD64) +FORCEINLINE PVOID GetCurrentFiber(VOID) +{ + return (PVOID)__readgsqword(FIELD_OFFSET(NT_TIB, FiberData)); +} #elif defined (_M_ARM) PVOID WINAPI GetCurrentFiber(VOID); #else @@ -4138,13 +4143,18 @@ return ret; } #elif _M_ARM - + // // NT-ARM is not documented // #define KIRQL ULONG // Hack! #include <armddk.h> - + +#elif defined (_M_AMD64) +FORCEINLINE struct _TEB * NtCurrentTeb(VOID) +{ + return __readgsqword(FIELD_OFFSET(NT_TIB, Self)); +} #else static __inline__ struct _TEB * NtCurrentTeb(void) { @@ -4275,6 +4285,8 @@ #if defined(_M_IX86) #define YieldProcessor() __asm__ __volatile__("pause"); +#elif defined (_M_AMD64) +#define YieldProcessor() __asm__ __volatile__("pause"); #elif defined(_M_PPC) #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_MIPS) @@ -4290,6 +4302,19 @@ #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONG64 *)a, b) +#define InterlockedAnd _InterlockedAnd +#define InterlockedExchange _InterlockedExchange +#define InterlockedOr _InterlockedOr + +#define InterlockedAnd64 _InterlockedAnd64 +#define InterlockedOr64 _InterlockedOr64 + +#define InterlockedBitTestAndSet _interlockedbittestandset +#define InterlockedBitTestAndSet64 _interlockedbittestandset64 +#define InterlockedBitTestAndReset _interlockedbittestandreset +#define InterlockedBitTestAndReset64 _interlockedbittestandreset64 + + #endif #else

1 0

[tkreuzer] 34704: Implement _InterlockedAnd64, _InterlockedOr64, _interlockedbittestandreset64, _interlockedbittestandset64 and gs-segment-adressing functions - as amd64 shares most of the intrinsics of x86, implement them in intrin_x86.h
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:27:50 2008 New Revision: 34704 URL: http://svn.reactos.org/svn/reactos?rev=34704&view=rev Log: Implement _InterlockedAnd64, _InterlockedOr64, _interlockedbittestandreset64, _interlockedbittestandset64 and gs-segment-adressing functions - as amd64 shares most of the intrinsics of x86, implement them in intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin.h branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin.h [iso-8859-1] Wed Jul 23 17:27:50 2008 @@ -79,7 +79,7 @@ #include "intrin_arm.h" #elif defined(__x86_64__) /* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ -#include "intrin_x86_64.h" +#include "intrin_x86.h" #else #error Unsupported architecture #endif Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Wed Jul 23 17:27:50 2008 @@ -153,6 +153,13 @@ return __sync_fetch_and_and(value, mask); } +#if defined(_M_AMD64) +static __inline__ __attribute__((always_inline)) long _InterlockedAnd64(volatile long long * const value, const long long mask) +{ + return __sync_fetch_and_and(value, mask); +} +#endif + static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) { return __sync_fetch_and_or(value, mask); @@ -167,6 +174,13 @@ { return __sync_fetch_and_or(value, mask); } + +#if defined(_M_AMD64) +static __inline__ __attribute__((always_inline)) long _InterlockedOr64(volatile long long * const value, const long long mask) +{ + return __sync_fetch_and_or(value, mask); +} +#endif static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) { @@ -455,6 +469,15 @@ return retval; } +#if defined(_M_AMD64) +static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset64(volatile long long * a, const long long b) +{ + unsigned char retval; + __asm__("lock; btrq %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "=m" (a) : [b] "Ir" (b) : "memory"); + return retval; +} +#endif + static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset(volatile long * a, const long b) { unsigned char retval; @@ -462,6 +485,14 @@ return retval; } +#if defined(_M_AMD64) +static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset64(volatile long long * a, const long long b) +{ + unsigned char retval; + __asm__("lock; btsq %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "=m" (a) : [b] "Ir" (b) : "memory"); + return retval; +} +#endif /*** String operations ***/ /* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ @@ -525,7 +556,98 @@ ); } - +#if defined(_M_AMD64) +/*** GS segment addressing ***/ + +static __inline__ __attribute__((always_inline)) void __writegsbyte(const unsigned long Offset, const unsigned char Data) +{ + __asm__("movb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); +} + +static __inline__ __attribute__((always_inline)) void __writegsword(const unsigned long Offset, const unsigned short Data) +{ + __asm__("movw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); +} + +static __inline__ __attribute__((always_inline)) void __writegsdword(const unsigned long Offset, const unsigned long Data) +{ + __asm__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); +} + +static __inline__ __attribute__((always_inline)) void __writegsqword(const unsigned long Offset, const unsigned __int64 Data) +{ + __asm__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); +} + +static __inline__ __attribute__((always_inline)) unsigned char __readgsbyte(const unsigned long Offset) +{ + unsigned char value; + __asm__("movb %%gs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + return value; +} + +static __inline__ __attribute__((always_inline)) unsigned short __readgsword(const unsigned long Offset) +{ + unsigned short value; + __asm__("movw %%gs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + return value; +} + +static __inline__ __attribute__((always_inline)) unsigned long __readgsdword(const unsigned long Offset) +{ + unsigned long value; + __asm__("movl %%gs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + return value; +} + +static __inline__ __attribute__((always_inline)) unsigned __int64 __readgsqword(const unsigned long Offset) +{ + unsigned long value; + __asm__("movq %%gs:%a[Offset], %q[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + return value; +} + +static __inline__ __attribute__((always_inline)) void __incgsbyte(const unsigned long Offset) +{ + __asm__("incb %%gs:%a[Offset]" : : [Offset] "ir" (Offset)); +} + +static __inline__ __attribute__((always_inline)) void __incgsword(const unsigned long Offset) +{ + __asm__("incw %%gs:%a[Offset]" : : [Offset] "ir" (Offset)); +} + +static __inline__ __attribute__((always_inline)) void __incgsdword(const unsigned long Offset) +{ + __asm__("incl %%gs:%a[Offset]" : : [Offset] "ir" (Offset)); +} + +/* NOTE: the bizarre implementation of __addgsxxx mimics the broken Visual C++ behavior */ +static __inline__ __attribute__((always_inline)) void __addgsbyte(const unsigned long Offset, const unsigned char Data) +{ + if(!__builtin_constant_p(Offset)) + __asm__("addb %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset)); + else + __asm__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); +} + +static __inline__ __attribute__((always_inline)) void __addgsword(const unsigned long Offset, const unsigned short Data) +{ + if(!__builtin_constant_p(Offset)) + __asm__("addw %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset)); + else + __asm__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); +} + +static __inline__ __attribute__((always_inline)) void __addgsdword(const unsigned long Offset, const unsigned int Data) +{ + if(!__builtin_constant_p(Offset)) + __asm__("addl %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset)); + else + __asm__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); +} + +#else /*** FS segment addressing ***/ static __inline__ __attribute__((always_inline)) void __writefsbyte(const unsigned long Offset, const unsigned char Data) { @@ -602,6 +724,7 @@ else __asm__("addl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); } +#endif /*** Bit manipulation ***/

1 0

[tkreuzer] 34703: fix inline versions of integer <-> pointer conversion functions
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:24:04 2008 New Revision: 34703 URL: http://svn.reactos.org/svn/reactos?rev=34703&view=rev Log: fix inline versions of integer <-> pointer conversion functions Modified: branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h [iso-8859-1] Wed Jul 23 17:24:04 2008 @@ -65,37 +65,36 @@ typedef unsigned int UHALF_PTR, *PUHALF_PTR; typedef int HALF_PTR, *PHALF_PTR; -#if 0 /* TODO when WIN64 is here */ -inline unsigned long HandleToUlong(const void* h ) - { return((unsigned long) h ); } -inline long HandleToLong( const void* h ) - { return((long) h ); } -inline void* ULongToHandle( const long h ) +#if !defined(__midl) && !defined(__WIDL__) +static inline unsigned long HandleToUlong(const void* h ) + { return((unsigned long)(ULONG_PTR) h ); } +static inline long HandleToLong( const void* h ) + { return((long)(LONG_PTR) h ); } +static inline void* ULongToHandle( const long h ) { return((void*) (UINT_PTR) h ); } -inline void* LongToHandle( const long h ) +static inline void* LongToHandle( const long h ) { return((void*) (INT_PTR) h ); } -inline unsigned long PtrToUlong( const void* p) - { return((unsigned long) p ); } -inline unsigned int PtrToUint( const void* p ) - { return((unsigned int) p ); } -inline unsigned short PtrToUshort( const void* p ) - { return((unsigned short) p ); } -inline long PtrToLong( const void* p ) - { return((long) p ); } -inline int PtrToInt( const void* p ) - { return((int) p ); } -inline short PtrToShort( const void* p ) - { return((short) p ); } -inline void* IntToPtr( const int i ) +static inline unsigned long PtrToUlong( const void* p) + { return((unsigned long)(ULONG_PTR) p ); } +static inline unsigned int PtrToUint( const void* p ) + { return((unsigned int)(UINT_PTR) p ); } +static inline unsigned short PtrToUshort( const void* p ) + { return((unsigned short)(ULONG_PTR) p ); } +static inline long PtrToLong( const void* p ) + { return((long)(LONG_PTR) p ); } +static inline int PtrToInt( const void* p ) + { return((int)(INT_PTR) p ); } +static inline short PtrToShort( const void* p ) + { return((short)(INT_PTR) p ); } +static inline void* IntToPtr( const int i ) { return( (void*)(INT_PTR)i ); } -inline void* UIntToPtr(const unsigned int ui) +static inline void* UIntToPtr(const unsigned int ui) { return( (void*)(UINT_PTR)ui ); } -inline void* LongToPtr( const long l ) +static inline void* LongToPtr( const long l ) { return( (void*)(LONG_PTR)l ); } -inline void* ULongToPtr( const unsigned long ul ) +static inline void* ULongToPtr( const unsigned long ul ) { return( (void*)(ULONG_PTR)ul ); } -#endif /* 0_ */ - +#endif /* !__midl */ #else /* !_WIN64 */ typedef int INT_PTR, *PINT_PTR; typedef unsigned int UINT_PTR, *PUINT_PTR;

1 0

[tkreuzer] 34702: ndk:ldrtypes.h : convert LDR_RESOURCE_INFO members from ULONG to ULONG_PTR
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:21:41 2008 New Revision: 34702 URL: http://svn.reactos.org/svn/reactos?rev=34702&view=rev Log: ndk:ldrtypes.h : convert LDR_RESOURCE_INFO members from ULONG to ULONG_PTR Modified: branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h [iso-8859-1] Wed Jul 23 17:21:41 2008 @@ -138,8 +138,8 @@ // typedef struct _LDR_RESOURCE_INFO { - ULONG Type; - ULONG Name; + ULONG_PTR Type; + ULONG_PTR Name; ULONG Language; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;

1 0

[tkreuzer] 34701: create rbuild files and strip everything from build, except freeldr.
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:14:10 2008 New Revision: 34701 URL: http://svn.reactos.org/svn/reactos?rev=34701&view=rev Log: create rbuild files and strip everything from build, except freeldr. Added: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild (with props) branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild (with props) Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild Added: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild (added) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Wed Jul 23 17:14:10 2008 @@ -1,0 +1,134 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config-amd64.rbuild"> + <xi:fallback> + <xi:include href="config-amd64.template.rbuild" /> + </xi:fallback> + </xi:include> + + <define name="_M_AMD64" /> + <define name="_AMD64_" /> + <define name="_M_AXP64" /> + <define name="__x86_64__" /> + <define name="_X86AMD64_" /> + <define name="_WIN64" /> + + <property name="PLATFORM" value="PC"/> + <property name="usewrc" value="false"/> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> + <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> + <linkerflag>-enable-stdcall-fixup</linkerflag> + + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + </if> + + <compilerflag>-mpreferred-stack-boundary=4</compilerflag> + <compilerflag>-fno-strict-aliasing</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wno-uninitialized</compilerflag> + <linkerflag>-enable-stdcall-fixup</linkerflag> + <linkerflag>-s</linkerflag> + <linkerflag>-static</linkerflag> + + + + <xi:include href="baseaddress.rbuild" /> + + <define name="__REACTOS__" /> + <if property="DBG" value="1"> + <define name="DBG">1</define> + <define name="_SEH_ENABLE_TRACE" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="KDBG" value="1"> + <define name="KDBG">1</define> + <property name="DBG_OR_KDBG" value="true" /> + </if> + + <include>.</include> + <include>include</include> + <include root="intermediate">include</include> + <include>include/psdk</include> + <include root="intermediate">include/psdk</include> + <include>include/dxsdk</include> + <include root="intermediate">include/dxsdk</include> + <include>include/crt</include> + <include>include/crt/mingw32</include> + <include>include/ddk</include> + <include>include/GL</include> + <include>include/ndk</include> + <include>include/reactos</include> + <include root="intermediate">include/reactos</include> + <include root="intermediate">include/reactos/mc</include> + <include>include/reactos/libs</include> + +  + + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + +  + + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + <directory name="lib"> + <xi:include href="lib/lib.rbuild" /> + </directory> + +  + + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + +  + + <directory name="tools"> + <xi:include href="tools/tools.rbuild" /> + </directory> + + + +</project> Propchange: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Jul 23 17:14:10 2008 @@ -30,646 +30,646 @@ ; Base files -base\applications\cacls\cacls.exe 1 -base\applications\calc\calc.exe 1 -base\applications\charmap\charmap.exe 1 -base\applications\cmdutils\dbgprint\dbgprint.exe 1 -base\applications\cmdutils\doskey\doskey.exe 1 -base\applications\cmdutils\find\find.exe 1 -base\applications\cmdutils\hostname\hostname.exe 1 -base\applications\cmdutils\more\more.exe 1 -base\applications\cmdutils\xcopy\xcopy.exe 1 -base\applications\control\control.exe 1 -base\applications\mscutils\devmgmt\devmgmt.exe 1 -base\applications\mscutils\eventvwr\eventvwr.exe 1 -base\applications\games\solitaire\sol.exe 1 -base\applications\games\winemine\winemine.exe 1 -base\applications\hh\hh.exe 1 -base\applications\kbswitch\kbswitch.exe 1 -base\applications\kbswitch\kbsdll\kbsdll.dll 1 -base\applications\logoff\logoff.exe 1 -base\applications\msconfig\msconfig.exe 1 -base\applications\mstsc\mstsc.exe 1 -base\applications\network\arp\arp.exe 1 -base\applications\network\dwnl\dwnl.exe 1 -base\applications\network\route\route.exe 1 -base\applications\network\finger\finger.exe 1 -base\applications\network\ftp\ftp.exe 1 -base\applications\network\ipconfig\ipconfig.exe 1 -base\applications\network\netstat\netstat.exe 1 -base\applications\network\ping\ping.exe 1 -base\applications\network\telnet\telnet.exe 1 -base\applications\network\tracert\tracert.exe 1 -base\applications\network\whois\whois.exe 1 -base\applications\notepad\notepad.exe 1 -base\applications\regedit\regedit.exe 4 -base\applications\regedit\clb\clb.dll 1 -base\applications\sc\sc.exe 1 -base\applications\screensavers\3dtext\3dtext.scr 1 -base\applications\screensavers\logon\logon.scr 1 -base\applications\mscutils\servman\servman.exe 1 -base\applications\shutdown\shutdown.exe 1 -base\applications\sndvol32\sndvol32.exe 1 -base\applications\taskmgr\taskmgr.exe 1 -base\applications\winhlp32\winhlp32.exe 1 -base\applications\wordpad\wordpad.exe 1 - -base\services\dhcp\dhcp.exe 1 -base\services\eventlog\eventlog.exe 1 -base\services\rpcss\rpcss.exe 1 -base\services\tcpsvcs\tcpsvcs.exe 1 -base\services\tcpsvcs\quotes 5 -base\services\umpnpmgr\umpnpmgr.exe 1 -base\services\audiosrv\audiosrv.exe 1 - -base\setup\setup\setup.exe 1 -base\setup\vmwinst\vmwinst.exe 1 - -base\shell\cmd\cmd.exe 1 -base\shell\explorer\explorer.exe 4 -base\shell\explorer\explorer-cfg-template.xml 4 -base\shell\explorer\notifyhook\notifyhook.dll 1 -base\shell\explorer-new\explorer_new.exe 4 optional - -base\system\autochk\autochk.exe 1 -base\system\format\format.exe 1 -base\system\lsass\lsass.exe 1 -base\system\msiexec\msiexec.exe 1 -base\system\regsvr32\regsvr32.exe 1 -base\system\rundll32\rundll32.exe 1 -base\system\services\services.exe 1 -base\system\userinit\userinit.exe 1 -base\system\winlogon\winlogon.exe 1 -base\system\expand\expand.exe 1 -base\system\smss\smss.exe 1 +;base\applications\cacls\cacls.exe 1 +;base\applications\calc\calc.exe 1 +;base\applications\charmap\charmap.exe 1 +;base\applications\cmdutils\dbgprint\dbgprint.exe 1 +;base\applications\cmdutils\doskey\doskey.exe 1 +;base\applications\cmdutils\find\find.exe 1 +;base\applications\cmdutils\hostname\hostname.exe 1 +;base\applications\cmdutils\more\more.exe 1 +;base\applications\cmdutils\xcopy\xcopy.exe 1 +;base\applications\control\control.exe 1 +;base\applications\mscutils\devmgmt\devmgmt.exe 1 +;base\applications\mscutils\eventvwr\eventvwr.exe 1 +;base\applications\games\solitaire\sol.exe 1 +;base\applications\games\winemine\winemine.exe 1 +;base\applications\hh\hh.exe 1 +;base\applications\kbswitch\kbswitch.exe 1 +;base\applications\kbswitch\kbsdll\kbsdll.dll 1 +;base\applications\logoff\logoff.exe 1 +;base\applications\msconfig\msconfig.exe 1 +;base\applications\mstsc\mstsc.exe 1 +;base\applications\network\arp\arp.exe 1 +;base\applications\network\dwnl\dwnl.exe 1 +;base\applications\network\route\route.exe 1 +;base\applications\network\finger\finger.exe 1 +;base\applications\network\ftp\ftp.exe 1 +;base\applications\network\ipconfig\ipconfig.exe 1 +;base\applications\network\netstat\netstat.exe 1 +;base\applications\network\ping\ping.exe 1 +;base\applications\network\telnet\telnet.exe 1 +;base\applications\network\tracert\tracert.exe 1 +;base\applications\network\whois\whois.exe 1 +;base\applications\notepad\notepad.exe 1 +;base\applications\regedit\regedit.exe 4 +;base\applications\regedit\clb\clb.dll 1 +;base\applications\sc\sc.exe 1 +;base\applications\screensavers\3dtext\3dtext.scr 1 +;base\applications\screensavers\logon\logon.scr 1 +;base\applications\mscutils\servman\servman.exe 1 +;base\applications\shutdown\shutdown.exe 1 +;base\applications\sndvol32\sndvol32.exe 1 +;base\applications\taskmgr\taskmgr.exe 1 +;base\applications\winhlp32\winhlp32.exe 1 +;base\applications\wordpad\wordpad.exe 1 + +;base\services\dhcp\dhcp.exe 1 +;base\services\eventlog\eventlog.exe 1 +;base\services\rpcss\rpcss.exe 1 +;base\services\tcpsvcs\tcpsvcs.exe 1 +;base\services\tcpsvcs\quotes 5 +;base\services\umpnpmgr\umpnpmgr.exe 1 +;base\services\audiosrv\audiosrv.exe 1 + +;base\setup\setup\setup.exe 1 +;base\setup\vmwinst\vmwinst.exe 1 + +;base\shell\cmd\cmd.exe 1 +;base\shell\explorer\explorer.exe 4 +;base\shell\explorer\explorer-cfg-template.xml 4 +;base\shell\explorer\notifyhook\notifyhook.dll 1 +;base\shell\explorer-new\explorer_new.exe 4 optional + +;base\system\autochk\autochk.exe 1 +;base\system\format\format.exe 1 +;base\system\lsass\lsass.exe 1 +;base\system\msiexec\msiexec.exe 1 +;base\system\regsvr32\regsvr32.exe 1 +;base\system\rundll32\rundll32.exe 1 +;base\system\services\services.exe 1 +;base\system\userinit\userinit.exe 1 +;base\system\winlogon\winlogon.exe 1 +;base\system\expand\expand.exe 1 +;base\system\smss\smss.exe 1 ; Dynamic Link Libraries -dll\3rdparty\freetype\freetype.dll 1 -dll\3rdparty\mesa32\mesa32.dll 1 -dll\3rdparty\dxtn\dxtn.dll 1 optional - -dll\cpl\access\access.cpl 1 -dll\cpl\appwiz\appwiz.cpl 1 -dll\cpl\console\console.dll 1 -dll\cpl\desk\desk.cpl 1 -dll\cpl\intl\intl.cpl 1 -dll\cpl\main\main.cpl 1 -dll\cpl\mmsys\mmsys.cpl 1 -dll\cpl\ncpa\ncpa.cpl 1 -dll\cpl\powercfg\powercfg.cpl 1 -dll\cpl\sysdm\sysdm.cpl 1 -dll\cpl\timedate\timedate.cpl 1 -dll\cpl\input\input.dll 1 -dll\cpl\joy\joy.cpl 1 - -dll\directx\dinput\dinput.dll 1 -dll\directx\dinput8\dinput8.dll 1 -dll\directx\dplay\dplay.dll 1 -dll\directx\dplayx\dplayx.dll 1 -dll\directx\dsound\dsound.dll 1 -dll\directx\dxdiagn\dxdiagn.dll 1 -dll\directx\ddraw\ddraw.dll 1 -dll\directx\d3d8thk\d3d8thk.dll 1 -dll\directx\devenum\devenum.dll 1 -dll\directx\ksproxy\ksproxy.ax 1 -dll\directx\ksuser\ksuser.dll 1 -dll\directx\msdmo\msdmo.dll 1 -dll\directx\quartz\quartz.dll 1 -dll\directx\qedit\qedit.dll 1 -dll\directx\wine\d3d8\d3d8.dll 1 -dll\directx\wine\wined3d\wined3d.dll 1 -dll\directx\wine\d3d9\d3d9.dll 1 - -dll\keyboard\kbda1\kbda1.dll 1 -dll\keyboard\kbda2\kbda2.dll 1 -dll\keyboard\kbda3\kbda3.dll 1 -dll\keyboard\kbdal\kbdal.dll 1 -dll\keyboard\kbdarme\kbdarme.dll 1 -dll\keyboard\kbdarmw\kbdarmw.dll 1 -dll\keyboard\kbdaze\kbdaze.dll 1 -dll\keyboard\kbdazel\kbdazel.dll 1 -dll\keyboard\kbdbgm\kbdbgm.dll 1 -dll\keyboard\kbdbgt\kbdbgt.dll 1 -dll\keyboard\kbdblr\kbdblr.dll 1 -dll\keyboard\kbdbr\kbdbr.dll 1 -dll\keyboard\kbdbga\kbdbga.dll 1 -dll\keyboard\kbdbe\kbdbe.dll 1 -dll\keyboard\kbdbur\kbdbur.dll 1 -dll\keyboard\kbdcan\kbdcan.dll 1 -dll\keyboard\kbdcr\kbdcr.dll 1 -dll\keyboard\kbdcz1\kbdcz1.dll 1 -dll\keyboard\kbdda\kbdda.dll 1 -dll\keyboard\kbddv\kbddv.dll 1 -dll\keyboard\kbdes\kbdes.dll 1 -dll\keyboard\kbdest\kbdest.dll 1 -dll\keyboard\kbdfc\kbdfc.dll 1 -dll\keyboard\kbdfi\kbdfi.dll 1 -dll\keyboard\kbdfr\kbdfr.dll 1 -dll\keyboard\kbdgeo\kbdgeo.dll 1 -dll\keyboard\kbdgerg\kbdgerg.dll 1 -dll\keyboard\kbdgneo\kbdgneo.dll 1 -dll\keyboard\kbdgrist\kbdgrist.dll 1 -dll\keyboard\kbdgr\kbdgr.dll 1 -dll\keyboard\kbdhe\kbdhe.dll 1 -dll\keyboard\kbdheb\kbdheb.dll 1 -dll\keyboard\kbdhu\kbdhu.dll 1 -dll\keyboard\kbdic\kbdic.dll 1 -dll\keyboard\kbdinasa\kbdinasa.dll 1 -dll\keyboard\kbdinben\kbdinben.dll 1 -dll\keyboard\kbdindev\kbdindev.dll 1 -dll\keyboard\kbdinguj\kbdinguj.dll 1 -dll\keyboard\kbdinmal\kbdinmal.dll 1 -dll\keyboard\kbdir\kbdir.dll 1 -dll\keyboard\kbdit\kbdit.dll 1 -dll\keyboard\kbdja\kbdja.dll 1 -dll\keyboard\kbdkaz\kbdkaz.dll 1 -dll\keyboard\kbdla\kbdla.dll 1 -dll\keyboard\kbdlt\kbdlt.dll 1 -dll\keyboard\kbdlv\kbdlv.dll 1 -dll\keyboard\kbdmac\kbdmac.dll 1 -dll\keyboard\kbdne\kbdne.dll 1 -dll\keyboard\kbdno\kbdno.dll 1 -dll\keyboard\kbdpl1\kbdpl1.dll 1 -dll\keyboard\kbdpo\kbdpo.dll 1 -dll\keyboard\kbdro\kbdro.dll 1 -dll\keyboard\kbdru\kbdru.dll 1 -dll\keyboard\kbdru1\kbdru1.dll 1 -dll\keyboard\kbdsg\kbdsg.dll 1 -dll\keyboard\kbdsk\kbdsk.dll 1 -dll\keyboard\kbdsk1\kbdsk1.dll 1 -dll\keyboard\kbdsw\kbdsw.dll 1 -dll\keyboard\kbdtat\kbdtat.dll 1 -dll\keyboard\kbdth0\kbdth0.dll 1 -dll\keyboard\kbdth1\kbdth1.dll 1 -dll\keyboard\kbdth2\kbdth2.dll 1 -dll\keyboard\kbdth3\kbdth3.dll 1 -dll\keyboard\kbdtuf\kbdtuf.dll 1 -dll\keyboard\kbdtuq\kbdtuq.dll 1 -dll\keyboard\kbduk\kbduk.dll 1 -dll\keyboard\kbdur\kbdur.dll 1 -dll\keyboard\kbdurs\kbdurs.dll 1 -dll\keyboard\kbdus\kbdus.dll 1 -dll\keyboard\kbdusa\kbdusa.dll 1 -dll\keyboard\kbdusl\kbdusl.dll 1 -dll\keyboard\kbdusr\kbdusr.dll 1 -dll\keyboard\kbdusx\kbdusx.dll 1 -dll\keyboard\kbduzb\kbduzb.dll 1 -dll\keyboard\kbdvntc\kbdvntc.dll 1 -dll\keyboard\kbdycc\kbdycc.dll 1 -dll\keyboard\kbdycl\kbdycl.dll 1 -dll\keyboard\kbdko\kbdko.dll 1 - -dll\ntdll\ntdll.dll 1 - -dll\win32\acledit\acledit.dll 1 -dll\win32\aclui\aclui.dll 1 -dll\win32\advapi32\advapi32.dll 1 -dll\win32\advpack\advpack.dll 1 -dll\win32\atl\atl.dll 1 -dll\win32\authz\authz.dll 1 -dll\win32\avifil32\avifil32.dll 1 -dll\win32\beepmidi\beepmidi.dll 1 -dll\win32\browseui\browseui.dll 1 -dll\win32\cabinet\cabinet.dll 1 -dll\win32\cards\cards.dll 1 -dll\win32\cfgmgr32\cfgmgr32.dll 1 -dll\win32\clusapi\clusapi.dll 1 -dll\win32\comcat\comcat.dll 1 -dll\win32\comctl32\comctl32.dll 1 -dll\win32\comdlg32\comdlg32.dll 1 -dll\win32\compstui\compstui.dll 1 -dll\win32\crtdll\crtdll.dll 1 -dll\win32\crypt32\crypt32.dll 1 -dll\win32\cryptdll\cryptdll.dll 1 -dll\win32\cryptnet\cryptnet.dll 1 -dll\win32\cryptui\cryptui.dll 1 -dll\win32\dbghelp\dbghelp.dll 1 -dll\win32\dciman32\dciman32.dll 1 -dll\win32\devmgr\devmgr.dll 1 -dll\win32\dhcpcsvc\dhcpcsvc.dll 1 -dll\win32\dnsapi\dnsapi.dll 1 -dll\win32\fmifs\fmifs.dll 1 -dll\win32\gdi32\gdi32.dll 1 -dll\win32\gdiplus\gdiplus.dll 1 -dll\win32\glu32\glu32.dll 1 -dll\win32\hhctrl.ocx\hhctrl.ocx 1 -dll\win32\hid\hid.dll 1 -dll\win32\hlink\hlink.dll 1 -dll\win32\icmp\icmp.dll 1 -dll\win32\imagehlp\imagehlp.dll 1 -dll\win32\imm32\imm32.dll 1 -dll\win32\inetcomm\inetcomm.dll 1 -dll\win32\inetmib1\inetmib1.dll 1 -dll\win32\iphlpapi\iphlpapi.dll 1 -dll\win32\kernel32\kernel32.dll 1 -dll\win32\lsasrv\lsasrv.dll 1 -dll\win32\lz32\lz32.dll 1 -dll\win32\mapi32\mapi32.dll 1 -dll\win32\mlang\mlang.dll 1 -dll\win32\mmdrv\mmdrv.dll 1 -dll\win32\modemui\modemui.dll 1 -dll\win32\mpr\mpr.dll 1 -dll\win32\msacm32\msacm32.dll 1 -dll\win32\msafd\msafd.dll 1 -dll\win32\msgina\msgina.dll 1 -dll\win32\mshtml\mshtml.dll 1 -dll\win32\msi\msi.dll 1 -dll\win32\msimg32\msimg32.dll 1 -dll\win32\msvcrt\msvcrt.dll 1 -dll\win32\msvcrt20\msvcrt20.dll 1 -dll\win32\msvcrt40\msvcrt40.dll 1 -dll\win32\msvfw32\msvfw32.dll 1 -dll\win32\mswsock\mswsock.dll 1 -dll\win32\msxml3\msxml3.dll 1 -dll\win32\nddeapi\nddeapi.dll 1 -dll\win32\netapi32\netapi32.dll 1 -dll\win32\netcfgx\netcfgx.dll 1 -dll\win32\netid\netid.dll 1 -dll\win32\newdev\newdev.dll 1 -dll\win32\ntdsapi\ntdsapi.dll 1 -dll\win32\ntmarta\ntmarta.dll 1 -dll\win32\objsel\objsel.dll 1 -dll\win32\odbccp32\odbccp32.dll 1 -dll\win32\ole32\ole32.dll 1 -dll\win32\oleacc\oleacc.dll 1 -dll\win32\oleaut32\oleaut32.dll 1 -dll\win32\oledlg\oledlg.dll 1 -dll\win32\olepro32\olepro32.dll 1 -dll\win32\opengl32\opengl32.dll 1 -dll\win32\pdh\pdh.dll 1 -dll\win32\powrprof\powrprof.dll 1 -dll\win32\printui\printui.dll 1 -dll\win32\psapi\psapi.dll 1 -dll\win32\rasapi32\rasapi32.dll 1 -dll\win32\rasdlg\rasdlg.dll 1 -dll\win32\rasman\rasman.dll 1 -dll\win32\riched20\riched20.dll 1 -dll\win32\riched32\riched32.dll 1 -dll\win32\rpcrt4\rpcrt4.dll 1 -dll\win32\rsabase\rsabase.dll 1 -dll\win32\rsaenh\rsaenh.dll 1 -dll\win32\samlib\samlib.dll 1 -dll\win32\samsrv\samsrv.dll 1 -dll\win32\schannel\schannel.dll 1 -dll\win32\secur32\secur32.dll 1 -dll\win32\security\security.dll 1 -dll\win32\sensapi\sensapi.dll 1 -dll\win32\serialui\serialui.dll 1 -dll\win32\setupapi\setupapi.dll 1 -dll\win32\shdocvw\shdocvw.dll 1 -dll\win32\shell32\shell32.dll 1 -dll\win32\shfolder\shfolder.dll 1 -dll\win32\shimgvw\shimgvw.dll 1 -dll\win32\shlwapi\shlwapi.dll 1 -dll\win32\smdll\smdll.dll 1 -dll\win32\snmpapi\snmpapi.dll 1 -dll\win32\stdole2.tlb\stdole2.tlb 1 -dll\win32\syssetup\syssetup.dll 1 -dll\win32\tapi32\tapi32.dll 1 -dll\win32\tapiui\tapiui.dll 1 -dll\win32\twain_32\twain_32.dll 1 -dll\win32\uext2\uext2.dll 1 -dll\win32\ufat\ufat.dll 1 -dll\win32\ufatx\ufatx.dll 1 optional -dll\win32\untfs\untfs.dll 1 -dll\win32\urlmon\urlmon.dll 1 -dll\win32\user32\user32.dll 1 -dll\win32\userenv\userenv.dll 1 -dll\win32\usp10\usp10.dll 1 -dll\win32\uxtheme\uxtheme.dll 1 -dll\win32\vdmdbg\vdmdbg.dll 1 -dll\win32\version\version.dll 1 -dll\win32\winfax\winfax.dll 1 -dll\win32\winhttp\winhttp.dll 1 -dll\win32\wininet\wininet.dll 1 -dll\win32\winmm\winmm.dll 1 -dll\win32\winspool\winspool.drv 1 -dll\win32\winsta\winsta.dll 1 -dll\win32\wintrust\wintrust.dll 1 -dll\win32\wldap32\wldap32.dll 1 -dll\win32\ws2_32\ws2_32.dll 1 -dll\win32\ws2help\ws2help.dll 1 -dll\win32\wshirda\wshirda.dll 1 -dll\win32\wshtcpip\wshtcpip.dll 1 -dll\win32\wsock32\wsock32.dll 1 -dll\win32\wtsapi32\wtsapi32.dll 1 -dll\win32\winmm\midimap\midimap.dll 1 -dll\win32\winmm\wavemap\msacm32.drv 1 optional +;dll\3rdparty\freetype\freetype.dll 1 +;dll\3rdparty\mesa32\mesa32.dll 1 +;dll\3rdparty\dxtn\dxtn.dll 1 optional + +;dll\cpl\access\access.cpl 1 +;dll\cpl\appwiz\appwiz.cpl 1 +;dll\cpl\console\console.dll 1 +;dll\cpl\desk\desk.cpl 1 +;dll\cpl\intl\intl.cpl 1 +;dll\cpl\main\main.cpl 1 +;dll\cpl\mmsys\mmsys.cpl 1 +;dll\cpl\ncpa\ncpa.cpl 1 +;dll\cpl\powercfg\powercfg.cpl 1 +;dll\cpl\sysdm\sysdm.cpl 1 +;dll\cpl\timedate\timedate.cpl 1 +;dll\cpl\input\input.dll 1 +;dll\cpl\joy\joy.cpl 1 + +;dll\directx\dinput\dinput.dll 1 +;dll\directx\dinput8\dinput8.dll 1 +;dll\directx\dplay\dplay.dll 1 +;dll\directx\dplayx\dplayx.dll 1 +;dll\directx\dsound\dsound.dll 1 +;dll\directx\dxdiagn\dxdiagn.dll 1 +;dll\directx\ddraw\ddraw.dll 1 +;dll\directx\d3d8thk\d3d8thk.dll 1 +;dll\directx\devenum\devenum.dll 1 +;dll\directx\ksproxy\ksproxy.ax 1 +;dll\directx\ksuser\ksuser.dll 1 +;dll\directx\msdmo\msdmo.dll 1 +;dll\directx\quartz\quartz.dll 1 +;dll\directx\qedit\qedit.dll 1 +;dll\directx\wine\d3d8\d3d8.dll 1 +;dll\directx\wine\wined3d\wined3d.dll 1 +;dll\directx\wine\d3d9\d3d9.dll 1 + +;dll\keyboard\kbda1\kbda1.dll 1 +;dll\keyboard\kbda2\kbda2.dll 1 +;dll\keyboard\kbda3\kbda3.dll 1 +;dll\keyboard\kbdal\kbdal.dll 1 +;dll\keyboard\kbdarme\kbdarme.dll 1 +;dll\keyboard\kbdarmw\kbdarmw.dll 1 +;dll\keyboard\kbdaze\kbdaze.dll 1 +;dll\keyboard\kbdazel\kbdazel.dll 1 +;dll\keyboard\kbdbgm\kbdbgm.dll 1 +;dll\keyboard\kbdbgt\kbdbgt.dll 1 +;dll\keyboard\kbdblr\kbdblr.dll 1 +;dll\keyboard\kbdbr\kbdbr.dll 1 +;dll\keyboard\kbdbga\kbdbga.dll 1 +;dll\keyboard\kbdbe\kbdbe.dll 1 +;dll\keyboard\kbdbur\kbdbur.dll 1 +;dll\keyboard\kbdcan\kbdcan.dll 1 +;dll\keyboard\kbdcr\kbdcr.dll 1 +;dll\keyboard\kbdcz1\kbdcz1.dll 1 +;dll\keyboard\kbdda\kbdda.dll 1 +;dll\keyboard\kbddv\kbddv.dll 1 +;dll\keyboard\kbdes\kbdes.dll 1 +;dll\keyboard\kbdest\kbdest.dll 1 +;dll\keyboard\kbdfc\kbdfc.dll 1 +;dll\keyboard\kbdfi\kbdfi.dll 1 +;dll\keyboard\kbdfr\kbdfr.dll 1 +;dll\keyboard\kbdgeo\kbdgeo.dll 1 +;dll\keyboard\kbdgerg\kbdgerg.dll 1 +;dll\keyboard\kbdgneo\kbdgneo.dll 1 +;dll\keyboard\kbdgrist\kbdgrist.dll 1 +;dll\keyboard\kbdgr\kbdgr.dll 1 +;dll\keyboard\kbdhe\kbdhe.dll 1 +;dll\keyboard\kbdheb\kbdheb.dll 1 +;dll\keyboard\kbdhu\kbdhu.dll 1 +;dll\keyboard\kbdic\kbdic.dll 1 +;dll\keyboard\kbdinasa\kbdinasa.dll 1 +;dll\keyboard\kbdinben\kbdinben.dll 1 +;dll\keyboard\kbdindev\kbdindev.dll 1 +;dll\keyboard\kbdinguj\kbdinguj.dll 1 +;dll\keyboard\kbdinmal\kbdinmal.dll 1 +;dll\keyboard\kbdir\kbdir.dll 1 +;dll\keyboard\kbdit\kbdit.dll 1 +;dll\keyboard\kbdja\kbdja.dll 1 +;dll\keyboard\kbdkaz\kbdkaz.dll 1 +;dll\keyboard\kbdla\kbdla.dll 1 +;dll\keyboard\kbdlt\kbdlt.dll 1 +;dll\keyboard\kbdlv\kbdlv.dll 1 +;dll\keyboard\kbdmac\kbdmac.dll 1 +;dll\keyboard\kbdne\kbdne.dll 1 +;dll\keyboard\kbdno\kbdno.dll 1 +;dll\keyboard\kbdpl1\kbdpl1.dll 1 +;dll\keyboard\kbdpo\kbdpo.dll 1 +;dll\keyboard\kbdro\kbdro.dll 1 +;dll\keyboard\kbdru\kbdru.dll 1 +;dll\keyboard\kbdru1\kbdru1.dll 1 +;dll\keyboard\kbdsg\kbdsg.dll 1 +;dll\keyboard\kbdsk\kbdsk.dll 1 +;dll\keyboard\kbdsk1\kbdsk1.dll 1 +;dll\keyboard\kbdsw\kbdsw.dll 1 +;dll\keyboard\kbdtat\kbdtat.dll 1 +;dll\keyboard\kbdth0\kbdth0.dll 1 +;dll\keyboard\kbdth1\kbdth1.dll 1 +;dll\keyboard\kbdth2\kbdth2.dll 1 +;dll\keyboard\kbdth3\kbdth3.dll 1 +;dll\keyboard\kbdtuf\kbdtuf.dll 1 +;dll\keyboard\kbdtuq\kbdtuq.dll 1 +;dll\keyboard\kbduk\kbduk.dll 1 +;dll\keyboard\kbdur\kbdur.dll 1 +;dll\keyboard\kbdurs\kbdurs.dll 1 +;dll\keyboard\kbdus\kbdus.dll 1 +;dll\keyboard\kbdusa\kbdusa.dll 1 +;dll\keyboard\kbdusl\kbdusl.dll 1 +;dll\keyboard\kbdusr\kbdusr.dll 1 +;dll\keyboard\kbdusx\kbdusx.dll 1 +;dll\keyboard\kbduzb\kbduzb.dll 1 +;dll\keyboard\kbdvntc\kbdvntc.dll 1 +;dll\keyboard\kbdycc\kbdycc.dll 1 +;dll\keyboard\kbdycl\kbdycl.dll 1 +;dll\keyboard\kbdko\kbdko.dll 1 + +;dll\nt;dll\ntdll.dll 1 + +;dll\win32\acledit\acledit.dll 1 +;dll\win32\aclui\aclui.dll 1 +;dll\win32\advapi32\advapi32.dll 1 +;dll\win32\advpack\advpack.dll 1 +;dll\win32\atl\atl.dll 1 +;dll\win32\authz\authz.dll 1 +;dll\win32\avifil32\avifil32.dll 1 +;dll\win32\beepmidi\beepmidi.dll 1 +;dll\win32\browseui\browseui.dll 1 +;dll\win32\cabinet\cabinet.dll 1 +;dll\win32\cards\cards.dll 1 +;dll\win32\cfgmgr32\cfgmgr32.dll 1 +;dll\win32\clusapi\clusapi.dll 1 +;dll\win32\comcat\comcat.dll 1 +;dll\win32\comctl32\comctl32.dll 1 +;dll\win32\comdlg32\comdlg32.dll 1 +;dll\win32\compstui\compstui.dll 1 +;dll\win32\crtdll\crtdll.dll 1 +;dll\win32\crypt32\crypt32.dll 1 +;dll\win32\cryptdll\cryptdll.dll 1 +;dll\win32\cryptnet\cryptnet.dll 1 +;dll\win32\cryptui\cryptui.dll 1 +;dll\win32\dbghelp\dbghelp.dll 1 +;dll\win32\dciman32\dciman32.dll 1 +;dll\win32\devmgr\devmgr.dll 1 +;dll\win32\dhcpcsvc\dhcpcsvc.dll 1 +;dll\win32\dnsapi\dnsapi.dll 1 +;dll\win32\fmifs\fmifs.dll 1 +;dll\win32\gdi32\gdi32.dll 1 +;dll\win32\gdiplus\gdiplus.dll 1 +;dll\win32\glu32\glu32.dll 1 +;dll\win32\hhctrl.ocx\hhctrl.ocx 1 +;dll\win32\hid\hid.dll 1 +;dll\win32\hlink\hlink.dll 1 +;dll\win32\icmp\icmp.dll 1 +;dll\win32\imagehlp\imagehlp.dll 1 +;dll\win32\imm32\imm32.dll 1 +;dll\win32\inetcomm\inetcomm.dll 1 +;dll\win32\inetmib1\inetmib1.dll 1 +;dll\win32\iphlpapi\iphlpapi.dll 1 +;dll\win32\kernel32\kernel32.dll 1 +;dll\win32\lsasrv\lsasrv.dll 1 +;dll\win32\lz32\lz32.dll 1 +;dll\win32\mapi32\mapi32.dll 1 +;dll\win32\mlang\mlang.dll 1 +;dll\win32\mmdrv\mmdrv.dll 1 +;dll\win32\modemui\modemui.dll 1 +;dll\win32\mpr\mpr.dll 1 +;dll\win32\msacm32\msacm32.dll 1 +;dll\win32\msafd\msafd.dll 1 +;dll\win32\msgina\msgina.dll 1 +;dll\win32\mshtml\mshtml.dll 1 +;dll\win32\msi\msi.dll 1 +;dll\win32\msimg32\msimg32.dll 1 +;dll\win32\msvcrt\msvcrt.dll 1 +;dll\win32\msvcrt20\msvcrt20.dll 1 +;dll\win32\msvcrt40\msvcrt40.dll 1 +;dll\win32\msvfw32\msvfw32.dll 1 +;dll\win32\mswsock\mswsock.dll 1 +;dll\win32\msxml3\msxml3.dll 1 +;dll\win32\nddeapi\nddeapi.dll 1 +;dll\win32\netapi32\netapi32.dll 1 +;dll\win32\netcfgx\netcfgx.dll 1 +;dll\win32\netid\netid.dll 1 +;dll\win32\newdev\newdev.dll 1 +;dll\win32\ntdsapi\ntdsapi.dll 1 +;dll\win32\ntmarta\ntmarta.dll 1 +;dll\win32\objsel\objsel.dll 1 +;dll\win32\odbccp32\odbccp32.dll 1 +;dll\win32\ole32\ole32.dll 1 +;dll\win32\oleacc\oleacc.dll 1 +;dll\win32\oleaut32\oleaut32.dll 1 +;dll\win32\oledlg\oledlg.dll 1 +;dll\win32\olepro32\olepro32.dll 1 +;dll\win32\opengl32\opengl32.dll 1 +;dll\win32\pdh\pdh.dll 1 +;dll\win32\powrprof\powrprof.dll 1 +;dll\win32\printui\printui.dll 1 +;dll\win32\psapi\psapi.dll 1 +;dll\win32\rasapi32\rasapi32.dll 1 +;dll\win32\rasdlg\rasdlg.dll 1 +;dll\win32\rasman\rasman.dll 1 +;dll\win32\riched20\riched20.dll 1 +;dll\win32\riched32\riched32.dll 1 +;dll\win32\rpcrt4\rpcrt4.dll 1 +;dll\win32\rsabase\rsabase.dll 1 +;dll\win32\rsaenh\rsaenh.dll 1 +;dll\win32\samlib\samlib.dll 1 +;dll\win32\samsrv\samsrv.dll 1 +;dll\win32\schannel\schannel.dll 1 +;dll\win32\secur32\secur32.dll 1 +;dll\win32\security\security.dll 1 +;dll\win32\sensapi\sensapi.dll 1 +;dll\win32\serialui\serialui.dll 1 +;dll\win32\setupapi\setupapi.dll 1 +;dll\win32\shdocvw\shdocvw.dll 1 +;dll\win32\shell32\shell32.dll 1 +;dll\win32\shfolder\shfolder.dll 1 +;dll\win32\shimgvw\shimgvw.dll 1 +;dll\win32\shlwapi\shlwapi.dll 1 +;dll\win32\smdll\smdll.dll 1 +;dll\win32\snmpapi\snmpapi.dll 1 +;dll\win32\stdole2.tlb\stdole2.tlb 1 +;dll\win32\syssetup\syssetup.dll 1 +;dll\win32\tapi32\tapi32.dll 1 +;dll\win32\tapiui\tapiui.dll 1 +;dll\win32\twain_32\twain_32.dll 1 +;dll\win32\uext2\uext2.dll 1 +;dll\win32\ufat\ufat.dll 1 +;dll\win32\ufatx\ufatx.dll 1 optional +;dll\win32\untfs\untfs.dll 1 +;dll\win32\urlmon\urlmon.dll 1 +;dll\win32\user32\user32.dll 1 +;dll\win32\userenv\userenv.dll 1 +;dll\win32\usp10\usp10.dll 1 +;dll\win32\uxtheme\uxtheme.dll 1 +;dll\win32\vdmdbg\vdmdbg.dll 1 +;dll\win32\version\version.dll 1 +;dll\win32\winfax\winfax.dll 1 +;dll\win32\winhttp\winhttp.dll 1 +;dll\win32\wininet\wininet.dll 1 +;dll\win32\winmm\winmm.dll 1 +;dll\win32\winspool\winspool.drv 1 +;dll\win32\winsta\winsta.dll 1 +;dll\win32\wintrust\wintrust.dll 1 +;dll\win32\wldap32\wldap32.dll 1 +;dll\win32\ws2_32\ws2_32.dll 1 +;dll\win32\ws2help\ws2help.dll 1 +;dll\win32\wshirda\wshirda.dll 1 +;dll\win32\wshtcpip\wshtcpip.dll 1 +;dll\win32\wsock32\wsock32.dll 1 +;dll\win32\wtsapi32\wtsapi32.dll 1 +;dll\win32\winmm\midimap\midimap.dll 1 +;dll\win32\winmm\wavemap\msacm32.drv 1 optional ; Shell Extensions -dll\shellext\deskadp\deskadp.dll 1 -dll\shellext\deskmon\deskmon.dll 1 +;dll\shellext\deskadp\deskadp.dll 1 +;dll\shellext\deskmon\deskmon.dll 1 ; Drivers -drivers\base\bootvid\bootvid.dll 1 -drivers\base\beep\beep.sys 2 -drivers\base\null\null.sys 2 - -drivers\bus\isapnp\isapnp.sys 2 - -drivers\directx\dxapi\dxapi.sys 2 -drivers\directx\dxg\dxg.sys 2 -drivers\directx\dxgthk\dxgthk.sys 2 - -drivers\filesystems\fs_rec\fs_rec.sys 2 -drivers\filesystems\msfs\msfs.sys 2 -drivers\filesystems\mup\mup.sys 2 -drivers\filesystems\npfs\npfs.sys 2 - -drivers\input\mouclass\mouclass.sys 2 -drivers\input\sermouse\sermouse.sys 2 - -drivers\network\afd\afd.sys 2 -drivers\network\ndis\ndis.sys 2 -drivers\network\tcpip\tcpip.sys 2 -drivers\network\tdi\tdi.sys 2 -drivers\network\dd\ne2000\ne2000.sys 2 -drivers\network\dd\pcnet\pcnet.sys 2 - -drivers\serial\serenum\serenum.sys 2 -drivers\serial\serial\serial.sys 2 - -drivers\storage\ide\pciide\pciide.sys 2 -drivers\storage\ide\pciidex\pciidex.sys 2 - -;drivers\usb\miniport\usbohci\usbohci.sys 2 -;drivers\usb\miniport\usbuhci\usbuhci.sys 2 -;drivers\usb\usbhub\usbhub.sys 2 -;drivers\usb\usbport\usbport.sys 2 -drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 - -drivers\video\displays\vga\vgaddi.dll 1 -drivers\video\displays\framebuf\framebuf.dll 1 -drivers\video\miniport\vga\vgamp.sys 2 -drivers\video\miniport\vbe\vbemp.sys 2 -drivers\video\videoprt\videoprt.sys 2 - -drivers\wmi\wmilib.sys 2 +;drivers\base\bootvid\bootvid.dll 1 +;drivers\base\beep\beep.sys 2 +;drivers\base\null\null.sys 2 + +;drivers\bus\isapnp\isapnp.sys 2 + +;drivers\directx\dxapi\dxapi.sys 2 +;drivers\directx\dxg\dxg.sys 2 +;drivers\directx\dxgthk\dxgthk.sys 2 + +;drivers\filesystems\fs_rec\fs_rec.sys 2 +;drivers\filesystems\msfs\msfs.sys 2 +;drivers\filesystems\mup\mup.sys 2 +;drivers\filesystems\npfs\npfs.sys 2 + +;drivers\input\mouclass\mouclass.sys 2 +;drivers\input\sermouse\sermouse.sys 2 + +;drivers\network\afd\afd.sys 2 +;drivers\network\ndis\ndis.sys 2 +;drivers\network\tcpip\tcpip.sys 2 +;drivers\network\tdi\tdi.sys 2 +;drivers\network\dd\ne2000\ne2000.sys 2 +;drivers\network\dd\pcnet\pcnet.sys 2 + +;drivers\serial\serenum\serenum.sys 2 +;drivers\serial\serial\serial.sys 2 + +;drivers\storage\ide\pciide\pciide.sys 2 +;drivers\storage\ide\pciidex\pciidex.sys 2 + +;;drivers\usb\miniport\usbohci\usbohci.sys 2 +;;drivers\usb\miniport\usbuhci\usbuhci.sys 2 +;;drivers\usb\usbhub\usbhub.sys 2 +;;drivers\usb\usbport\usbport.sys 2 +;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 + +;drivers\video\displays\vga\vgaddi.dll 1 +;drivers\video\displays\framebuf\framebuf.dll 1 +;drivers\video\miniport\vga\vgamp.sys 2 +;drivers\video\miniport\vbe\vbemp.sys 2 +;drivers\video\videoprt\videoprt.sys 2 + +;drivers\wmi\wmilib.sys 2 ; Media -media\fonts\DejaVuSans.ttf 3 -media\fonts\DejaVuSans-Bold.ttf 3 -media\fonts\DejaVuSans-BoldOblique.ttf 3 -media\fonts\DejaVuSansCondensed.ttf 3 -media\fonts\DejaVuSansCondensed-Bold.ttf 3 -media\fonts\DejaVuSansCondensed-BoldOblique.ttf 3 -media\fonts\DejaVuSansCondensed-Oblique.ttf 3 -media\fonts\DejaVuSans-ExtraLight.ttf 3 -media\fonts\DejaVuSansMono.ttf 3 -media\fonts\DejaVuSansMono-Bold.ttf 3 -media\fonts\DejaVuSansMono-BoldOblique.ttf 3 -media\fonts\DejaVuSansMono-Oblique.ttf 3 -media\fonts\DejaVuSans-Oblique.ttf 3 -media\fonts\DejaVuSerif.ttf 3 -media\fonts\DejaVuSerif-Bold.ttf 3 -media\fonts\DejaVuSerif-BoldItalic.ttf 3 -media\fonts\DejaVuSerifCondensed.ttf 3 -media\fonts\DejaVuSerifCondensed-Bold.ttf 3 -media\fonts\DejaVuSerifCondensed-BoldItalic.ttf 3 -media\fonts\DejaVuSerifCondensed-Italic.ttf 3 -media\fonts\DejaVuSerif-Italic.ttf 3 - -media\fonts\LiberationMono-Bold.ttf 3 -media\fonts\LiberationMono-BoldItalic.ttf 3 -media\fonts\LiberationMono-Italic.ttf 3 -media\fonts\LiberationMono-Regular.ttf 3 -media\fonts\LiberationSans-Bold.ttf 3 -media\fonts\LiberationSans-BoldItalic.ttf 3 -media\fonts\LiberationSans-Italic.ttf 3 -media\fonts\LiberationSans-Regular.ttf 3 -media\fonts\LiberationSerif-Bold.ttf 3 -media\fonts\LiberationSerif-BoldItalic.ttf 3 -media\fonts\LiberationSerif-Italic.ttf 3 -media\fonts\LiberationSerif-Regular.ttf 3 - -media\fonts\tahoma.ttf 3 -media\fonts\tahomabd.ttf 3 - -media\fonts\c0419bt_.ttf 3 -media\fonts\c0582bt_.ttf 3 -media\fonts\c0583bt_.ttf 3 -media\fonts\c0611bt_.ttf 3 -media\fonts\c0632bt_.ttf 3 -media\fonts\c0633bt_.ttf 3 -media\fonts\c0648bt_.ttf 3 -media\fonts\c0649bt_.ttf 3 -media\fonts\courbi.ttf 3 -media\fonts\courb.ttf 3 -media\fonts\cour.ttf 3 -media\fonts\helb____.ttf 3 -media\fonts\Marlett.ttf 3 -media\fonts\timr____.ttf 3 -media\fonts\UTBI____.ttf 3 -media\fonts\UTB_____.ttf 3 -media\fonts\UTI_____.ttf 3 -media\fonts\UTRG____.ttf 3 -media\nls\c_037.nls 1 -media\nls\c_500.nls 1 -media\nls\c_737.nls 1 -media\nls\c_775.nls 1 -media\nls\c_850.nls 1 -media\nls\c_852.nls 1 -media\nls\c_855.nls 1 -media\nls\c_856.nls 1 -media\nls\c_857.nls 1 -media\nls\c_860.nls 1 -media\nls\c_861.nls 1 -media\nls\c_862.nls 1 -media\nls\c_863.nls 1 -media\nls\c_864.nls 1 -media\nls\c_865.nls 1 -media\nls\c_866.nls 1 -media\nls\c_869.nls 1 -media\nls\c_874.nls 1 -media\nls\c_875.nls 1 -media\nls\c_878.nls 1 -media\nls\c_932.nls 1 -media\nls\c_936.nls 1 -media\nls\c_949.nls 1 -media\nls\c_950.nls 1 -media\nls\c_1006.nls 1 -media\nls\c_1026.nls 1 -media\nls\c_1250.nls 1 -media\nls\c_1251.nls 1 -media\nls\c_1253.nls 1 -media\nls\c_1254.nls 1 -media\nls\c_1255.nls 1 -media\nls\c_1256.nls 1 -media\nls\c_1257.nls 1 -media\nls\c_1258.nls 1 -media\nls\c_10000.nls 1 -media\nls\c_10006.nls 1 -media\nls\c_10007.nls 1 -media\nls\c_10029.nls 1 -media\nls\c_10079.nls 1 -media\nls\c_10081.nls 1 -media\nls\c_20866.nls 1 -media\nls\c_28591.nls 1 -media\nls\c_28592.nls 1 -media\nls\c_28593.nls 1 -media\nls\c_28594.nls 1 -media\nls\c_28595.nls 1 -media\nls\c_28596.nls 1 -media\nls\c_28597.nls 1 -media\nls\c_28598.nls 1 -media\nls\c_28599.nls 1 -media\drivers\etc\services 5 -media\inf\acpi.inf 6 -media\inf\cdrom.inf 6 -media\inf\display.inf 6 -media\inf\font.inf 6 -media\inf\hdc.inf 6 -media\inf\intl.inf 6 -media\inf\layout.inf 6 -media\inf\machine.inf 6 -media\inf\msmouse.inf 6 -media\inf\keyboard.inf 6 -media\inf\NET_NIC.inf 6 -media\inf\netamd.inf 6 -media\inf\netisa.inf 6 -media\inf\netrtpnt.inf 6 -media\inf\nettcpip.inf 6 -media\inf\ports.inf 6 -media\inf\scsi.inf 6 -media\inf\syssetup.inf 6 -media\inf\usbport.inf 6 -media\inf\usb.inf 6 -media\inf\usbstor.inf 6 -media\inf\xboxdisp.inf 6 +;media\fonts\DejaVuSans.ttf 3 +;media\fonts\DejaVuSans-Bold.ttf 3 +;media\fonts\DejaVuSans-BoldOblique.ttf 3 +;media\fonts\DejaVuSansCondensed.ttf 3 +;media\fonts\DejaVuSansCondensed-Bold.ttf 3 +;media\fonts\DejaVuSansCondensed-BoldOblique.ttf 3 +;media\fonts\DejaVuSansCondensed-Oblique.ttf 3 +;media\fonts\DejaVuSans-ExtraLight.ttf 3 +;media\fonts\DejaVuSansMono.ttf 3 +;media\fonts\DejaVuSansMono-Bold.ttf 3 +;media\fonts\DejaVuSansMono-BoldOblique.ttf 3 +;media\fonts\DejaVuSansMono-Oblique.ttf 3 +;media\fonts\DejaVuSans-Oblique.ttf 3 +;media\fonts\DejaVuSerif.ttf 3 +;media\fonts\DejaVuSerif-Bold.ttf 3 +;media\fonts\DejaVuSerif-BoldItalic.ttf 3 +;media\fonts\DejaVuSerifCondensed.ttf 3 +;media\fonts\DejaVuSerifCondensed-Bold.ttf 3 +;media\fonts\DejaVuSerifCondensed-BoldItalic.ttf 3 +;media\fonts\DejaVuSerifCondensed-Italic.ttf 3 +;media\fonts\DejaVuSerif-Italic.ttf 3 + +;media\fonts\LiberationMono-Bold.ttf 3 +;media\fonts\LiberationMono-BoldItalic.ttf 3 +;media\fonts\LiberationMono-Italic.ttf 3 +;media\fonts\LiberationMono-Regular.ttf 3 +;media\fonts\LiberationSans-Bold.ttf 3 +;media\fonts\LiberationSans-BoldItalic.ttf 3 +;media\fonts\LiberationSans-Italic.ttf 3 +;media\fonts\LiberationSans-Regular.ttf 3 +;media\fonts\LiberationSerif-Bold.ttf 3 +;media\fonts\LiberationSerif-BoldItalic.ttf 3 +;media\fonts\LiberationSerif-Italic.ttf 3 +;media\fonts\LiberationSerif-Regular.ttf 3 + +;media\fonts\tahoma.ttf 3 +;media\fonts\tahomabd.ttf 3 + +;media\fonts\c0419bt_.ttf 3 +;media\fonts\c0582bt_.ttf 3 +;media\fonts\c0583bt_.ttf 3 +;media\fonts\c0611bt_.ttf 3 +;media\fonts\c0632bt_.ttf 3 +;media\fonts\c0633bt_.ttf 3 +;media\fonts\c0648bt_.ttf 3 +;media\fonts\c0649bt_.ttf 3 +;media\fonts\courbi.ttf 3 +;media\fonts\courb.ttf 3 +;media\fonts\cour.ttf 3 +;media\fonts\helb____.ttf 3 +;media\fonts\Marlett.ttf 3 +;media\fonts\timr____.ttf 3 +;media\fonts\UTBI____.ttf 3 +;media\fonts\UTB_____.ttf 3 +;media\fonts\UTI_____.ttf 3 +;media\fonts\UTRG____.ttf 3 +;media\nls\c_037.nls 1 +;media\nls\c_500.nls 1 +;media\nls\c_737.nls 1 +;media\nls\c_775.nls 1 +;media\nls\c_850.nls 1 +;media\nls\c_852.nls 1 +;media\nls\c_855.nls 1 +;media\nls\c_856.nls 1 +;media\nls\c_857.nls 1 +;media\nls\c_860.nls 1 +;media\nls\c_861.nls 1 +;media\nls\c_862.nls 1 +;media\nls\c_863.nls 1 +;media\nls\c_864.nls 1 +;media\nls\c_865.nls 1 +;media\nls\c_866.nls 1 +;media\nls\c_869.nls 1 +;media\nls\c_874.nls 1 +;media\nls\c_875.nls 1 +;media\nls\c_878.nls 1 +;media\nls\c_932.nls 1 +;media\nls\c_936.nls 1 +;media\nls\c_949.nls 1 +;media\nls\c_950.nls 1 +;media\nls\c_1006.nls 1 +;media\nls\c_1026.nls 1 +;media\nls\c_1250.nls 1 +;media\nls\c_1251.nls 1 +;media\nls\c_1253.nls 1 +;media\nls\c_1254.nls 1 +;media\nls\c_1255.nls 1 +;media\nls\c_1256.nls 1 +;media\nls\c_1257.nls 1 +;media\nls\c_1258.nls 1 +;media\nls\c_10000.nls 1 +;media\nls\c_10006.nls 1 +;media\nls\c_10007.nls 1 +;media\nls\c_10029.nls 1 +;media\nls\c_10079.nls 1 +;media\nls\c_10081.nls 1 +;media\nls\c_20866.nls 1 +;media\nls\c_28591.nls 1 +;media\nls\c_28592.nls 1 +;media\nls\c_28593.nls 1 +;media\nls\c_28594.nls 1 +;media\nls\c_28595.nls 1 +;media\nls\c_28596.nls 1 +;media\nls\c_28597.nls 1 +;media\nls\c_28598.nls 1 +;media\nls\c_28599.nls 1 +;media\drivers\etc\services 5 +;media\inf\acpi.inf 6 +;media\inf\cdrom.inf 6 +;media\inf\display.inf 6 +;media\inf\font.inf 6 +;media\inf\hdc.inf 6 +;media\inf\intl.inf 6 +;media\inf\layout.inf 6 +;media\inf\machine.inf 6 +;media\inf\msmouse.inf 6 +;media\inf\keyboard.inf 6 +;media\inf\NET_NIC.inf 6 +;media\inf\netamd.inf 6 +;media\inf\netisa.inf 6 +;media\inf\netrtpnt.inf 6 +;media\inf\nettcpip.inf 6 +;media\inf\ports.inf 6 +;media\inf\scsi.inf 6 +;media\inf\syssetup.inf 6 +;media\inf\usbport.inf 6 +;media\inf\usb.inf 6 +;media\inf\usbstor.inf 6 +;media\inf\xboxdisp.inf 6 ; Subsystems -subsystems\win32\csrss\csrss.exe 1 -subsystems\win32\csrss\win32csr\win32csr.dll 1 -subsystems\csr\csr.exe 1 optional -subsystems\csr\csrsrv\csrsrv.dll 1 optional -subsystems\win\basesrv\basesrv.dll 1 optional -subsystems\win\winsrv\winsrv.dll 1 optional -subsystems\ntvdm\ntvdm.exe 1 -subsystems\win32\win32k\win32k.sys 1 +;subsystems\win32\csrss\csrss.exe 1 +;subsystems\win32\csrss\win32csr\win32csr.dll 1 +;subsystems\csr\csr.exe 1 optional +;subsystems\csr\csrsrv\csrsrv.dll 1 optional +;subsystems\win\basesrv\basesrv.dll 1 optional +;subsystems\win\winsrv\winsrv.dll 1 optional +;subsystems\ntvdm\ntvdm.exe 1 +;subsystems\win32\win32k\win32k.sys 1 boot\bootdata\bootcdregtest\testboot.bat 7 optional tools\dbgprint\dbgprint.exe 7 optional ; Modules -modules\os2\server\os2srv.dll 1 optional -modules\os2\dll\win32\doscalls\doscalls.dll 1 optional -modules\posix\server\psxsrv.dll 1 optional -modules\posix\dll\win32\psxdll\psxdll.dll 1 optional -modules\rosky\dll\win32\libsky\libsky.dll 1 optional -modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional -modules\vms\server\vmssrv.dll 1 optional -modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional -modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional -modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional -modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional -modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional -modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional -modules\rosapps\applications\screensavers\butterflies\butterflies.scr 1 optional -modules\rosapps\applications\cmdutils\comp\comp.exe 1 optional -modules\rosapps\applications\cmdutils\mode\mode.exe 1 optional -modules\rosapps\applications\cmdutils\sort\sort.exe 1 optional -modules\rosapps\applications\cmdutils\tee\tee.exe 1 optional -modules\rosapps\applications\cmdutils\touch\touch.exe 1 optional -modules\rosapps\applications\cmdutils\uptime\uptime.exe 1 optional -modules\rosapps\applications\cmdutils\y\y.exe 1 optional -modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional -modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional -modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional -modules\rosapps\applications\devutils\gettype\gettype.exe 1 optional -modules\rosapps\applications\devutils\roswebparser\roswebparser.exe 1 optional -modules\rosapps\applications\devutils\zoomin\zoomin.exe 1 optional -modules\rosapps\applications\downloader\downloader.exe 1 optional -modules\rosapps\applications\downloader\downloader.xml 1 optional -modules\rosapps\applications\fontview\fontview.exe 1 optional -modules\rosapps\applications\imagesoft\imagesoft.exe 1 optional -modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional -modules\rosapps\applications\net\netreg\netreg.exe 1 optional -modules\rosapps\applications\net\niclist\niclist.exe 1 optional -modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional -modules\rosapps\applications\notevil\notevil.exe 1 optional -modules\rosapps\applications\magnify\magnify.exe 1 optional -modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional -modules\rosapps\applications\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\applications\packmgr\lib\package.dll 1 optional -modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional -modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional -modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional -modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional -modules\rosapps\applications\sysutils\kill\kill.exe 1 optional -modules\rosapps\applications\sysutils\lsdd\lsdd.exe 1 optional -modules\rosapps\applications\sysutils\man\man.exe 1 optional -modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional -modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional -modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional -modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional -modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional -modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional -modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe 1 optional -modules\rosapps\applications\sysutils\utils\infinst\infinst.exe 1 optional -modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional -modules\rosapps\applications\sysutils\utils\objdir\objdir.exe 1 optional -modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe 1 optional -modules\rosapps\applications\sysutils\utils\ps\ps.exe 1 optional -modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe 1 optional -modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional -modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional -modules\rosapps\applications\winfile\winfile.exe 1 optional -modules\rosapps\applications\winver\winver.exe 1 optional -modules\rosapps\applications\write\write.exe 1 optional -modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional -modules\rosapps\demos\maze\maze.exe 1 optional -modules\rosapps\dflat32\edit.exe 1 optional -modules\rosapps\drivers\avtest\avtest.sys 1 optional -modules\rosapps\drivers\ramdrv\ramdrv.sys 1 optional -modules\rosapps\drivers\green\green.sys 1 optional -modules\rosapps\lib\dflat32\dflat32.dll 1 optional -modules\rosapps\templates\dialog.exe 1 optional -modules\rosapps\templates\mdi.exe 1 optional -modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional -modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional -modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional -modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional -modules\rostests\winetests\comcat\comcat_winetest.exe 7 optional -modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional -modules\rostests\winetests\comdlg32\comdlg32_winetest.exe 7 optional -modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional -modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional -modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional -modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional -modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional -modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional -modules\rostests\winetests\mapi32\mapi32_winetest.exe 7 optional -modules\rostests\winetests\mlang\mlang_winetest.exe 7 optional -modules\rostests\winetests\mshtml\mshtml_winetest.exe 7 optional -modules\rostests\winetests\msi\msi_winetest.exe 7 optional -modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional -modules\rostests\winetests\netapi32\netapi32_winetest.exe 7 optional -modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional -modules\rostests\winetests\odbccp32\odbccp32_winetest.exe 7 optional -modules\rostests\winetests\ole32\ole32_winetest.exe 7 optional -modules\rostests\winetests\oleaut32\oleaut32_winetest.exe 7 optional -modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional -modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional -modules\rostests\winetests\riched20\riched20_winetest.exe 7 optional -modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe 7 optional -modules\rostests\winetests\rsabase\rsabase_winetest.exe 7 optional -modules\rostests\winetests\rsaenh\rsaenh_winetest.exe 7 optional -modules\rostests\winetests\schannel\schannel_winetest.exe 7 optional -modules\rostests\winetests\secur32\secur32_winetest.exe 7 optional -modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional -modules\rostests\winetests\shdocvw\shdocvw_winetest.exe 7 optional -modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional -modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional -modules\rostests\winetests\urlmon\urlmon_winetest.exe 7 optional -modules\rostests\winetests\user32\user32_winetest.exe 7 optional -modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional -modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional -modules\rostests\winetests\version\version_winetest.exe 7 optional -modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional -modules\wallpaper\lake.bmp 4 optional +;modules\os2\server\os2srv.dll 1 optional +;modules\os2\dll\win32\doscalls\doscalls.dll 1 optional +;modules\posix\server\psxsrv.dll 1 optional +;modules\posix\dll\win32\psxdll\psxdll.dll 1 optional +;modules\rosky\dll\win32\libsky\libsky.dll 1 optional +;modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional +;modules\vms\server\vmssrv.dll 1 optional +;modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional +;modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional +;modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional +;modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional +;modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional +;modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional +;modules\rosapps\applications\screensavers\butterflies\butterflies.scr 1 optional +;modules\rosapps\applications\cmdutils\comp\comp.exe 1 optional +;modules\rosapps\applications\cmdutils\mode\mode.exe 1 optional +;modules\rosapps\applications\cmdutils\sort\sort.exe 1 optional +;modules\rosapps\applications\cmdutils\tee\tee.exe 1 optional +;modules\rosapps\applications\cmdutils\touch\touch.exe 1 optional +;modules\rosapps\applications\cmdutils\uptime\uptime.exe 1 optional +;modules\rosapps\applications\cmdutils\y\y.exe 1 optional +;modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional +;modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional +;modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional +;modules\rosapps\applications\devutils\gettype\gettype.exe 1 optional +;modules\rosapps\applications\devutils\roswebparser\roswebparser.exe 1 optional +;modules\rosapps\applications\devutils\zoomin\zoomin.exe 1 optional +;modules\rosapps\applications\downloader\downloader.exe 1 optional +;modules\rosapps\applications\downloader\downloader.xml 1 optional +;modules\rosapps\applications\fontview\fontview.exe 1 optional +;modules\rosapps\applications\imagesoft\imagesoft.exe 1 optional +;modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional +;modules\rosapps\applications\net\netreg\netreg.exe 1 optional +;modules\rosapps\applications\net\niclist\niclist.exe 1 optional +;modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional +;modules\rosapps\applications\notevil\notevil.exe 1 optional +;modules\rosapps\applications\magnify\magnify.exe 1 optional +;modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional +;modules\rosapps\applications\packmgr\gui\packmgr.exe 1 optional +;modules\rosapps\applications\packmgr\lib\package.dll 1 optional +;modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional +;modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional +;modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional +;modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional +;modules\rosapps\applications\sysutils\kill\kill.exe 1 optional +;modules\rosapps\applications\sysutils\lsdd\lsdd.exe 1 optional +;modules\rosapps\applications\sysutils\man\man.exe 1 optional +;modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional +;modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional +;modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional +;modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional +;modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional +;modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional +;modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional +;modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional +;modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe 1 optional +;modules\rosapps\applications\sysutils\utils\infinst\infinst.exe 1 optional +;modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional +;modules\rosapps\applications\sysutils\utils\objdir\objdir.exe 1 optional +;modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe 1 optional +;modules\rosapps\applications\sysutils\utils\ps\ps.exe 1 optional +;modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe 1 optional +;modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional +;modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional +;modules\rosapps\applications\winfile\winfile.exe 1 optional +;modules\rosapps\applications\winver\winver.exe 1 optional +;modules\rosapps\applications\write\write.exe 1 optional +;modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional +;modules\rosapps\demos\maze\maze.exe 1 optional +;modules\rosapps\dflat32\edit.exe 1 optional +;modules\rosapps\drivers\avtest\avtest.sys 1 optional +;modules\rosapps\drivers\ramdrv\ramdrv.sys 1 optional +;modules\rosapps\drivers\green\green.sys 1 optional +;modules\rosapps\lib\dflat32\dflat32.dll 1 optional +;modules\rosapps\templates\dialog.exe 1 optional +;modules\rosapps\templates\mdi.exe 1 optional +;modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional +;modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional +;modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional +;modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional +;modules\rostests\winetests\comcat\comcat_winetest.exe 7 optional +;modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional +;modules\rostests\winetests\comdlg32\comdlg32_winetest.exe 7 optional +;modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional +;modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional +;modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional +;modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional +;modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional +;modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional +;modules\rostests\winetests\mapi32\mapi32_winetest.exe 7 optional +;modules\rostests\winetests\mlang\mlang_winetest.exe 7 optional +;modules\rostests\winetests\mshtml\mshtml_winetest.exe 7 optional +;modules\rostests\winetests\msi\msi_winetest.exe 7 optional +;modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional +;modules\rostests\winetests\netapi32\netapi32_winetest.exe 7 optional +;modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional +;modules\rostests\winetests\odbccp32\odbccp32_winetest.exe 7 optional +;modules\rostests\winetests\ole32\ole32_winetest.exe 7 optional +;modules\rostests\winetests\oleaut32\oleaut32_winetest.exe 7 optional +;modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional +;modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional +;modules\rostests\winetests\riched20\riched20_winetest.exe 7 optional +;modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe 7 optional +;modules\rostests\winetests\rsabase\rsabase_winetest.exe 7 optional +;modules\rostests\winetests\rsaenh\rsaenh_winetest.exe 7 optional +;modules\rostests\winetests\schannel\schannel_winetest.exe 7 optional +;modules\rostests\winetests\secur32\secur32_winetest.exe 7 optional +;modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional +;modules\rostests\winetests\shdocvw\shdocvw_winetest.exe 7 optional +;modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional +;modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional +;modules\rostests\winetests\urlmon\urlmon_winetest.exe 7 optional +;modules\rostests\winetests\user32\user32_winetest.exe 7 optional +;modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional +;modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional +;modules\rostests\winetests\version\version_winetest.exe 7 optional +;modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional +;modules\wallpaper\lake.bmp 4 optional ; Native libraries -modules\windows\mfc42.dll 1 optional +;modules\windows\mfc42.dll 1 optional Added: branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… ============================================================================== --- branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild (added) +++ branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild [iso-8859-1] Wed Jul 23 17:14:10 2008 @@ -1,0 +1,80 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group> + + + + + +<property name="SARCH" value="" /> + + + +<property name="OARCH" value="athlon64" /> + + + +<property name="OPTIMIZE" value="3" /> + + + +<property name="KDBG" value="1" /> + + + +<property name="DBG" value="1" /> + + + +<property name="GDB" value="0" /> + + + +<property name="NSWPAT" value="1" /> + + +<property name="_WINKD_" value="0" /> + +</group> Propchange: branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] Wed Jul 23 17:14:10 2008 @@ -2,6 +2,6 @@ <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> - <xi:include href="ntoskrnl-generic.rbuild" /> +  </module> </group>

1 0

[tkreuzer] 34700: Make ncitool create syscall stubs for amd64. We use the same as for x86 for now.
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 17:00:43 2008 New Revision: 34700 URL: http://svn.reactos.org/svn/reactos?rev=34700&view=rev Log: Make ncitool create syscall stubs for amd64. We use the same as for x86 for now. Modified: branches/ros-amd64-bringup/reactos/tools/nci/ncitool.c Modified: branches/ros-amd64-bringup/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/nci/ncitool.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/nci/ncitool.c [iso-8859-1] Wed Jul 23 17:00:43 2008 @@ -4,7 +4,7 @@ * PROJECT: Native Call Interface Support Tool * PURPOSE: Generates NCI Tables and Stubs. * PROGRAMMER; Alex Ionescu (alex(a)relsoft.net) - * CHANGE HISTORY: 14/01/05 - Created. Based on original code by + * CHANGE HISTORY: 14/01/05 - Created. Based on original code by * KJK::Hyperion and Emanuelle Aliberti. * */ @@ -44,9 +44,9 @@ /********** Stub Code ************/ /* - * This stubs calls into KUSER_SHARED_DATA where either a + * This stubs calls into KUSER_SHARED_DATA where either a * sysenter or interrupt is performed, depending on CPU support. - */ + */ #if defined(__GNUC__) #define UserModeStub_x86 " movl $0x%x, %%eax\n" \ " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ @@ -84,7 +84,7 @@ /* * This stub calls KiSystemService directly with a fake INT2E stack. - * Because EIP is pushed during the call, the handler will return here. + * Because EIP is pushed during the call, the handler will return here. */ #if defined(__GNUC__) #define KernelModeStub_x86 " movl $0x%x, %%eax\n" \ @@ -129,6 +129,8 @@ struct ncitool_data_t ncitool_data[] = { { "i386", 4, KernelModeStub_x86, UserModeStub_x86, + ".global _%s@%d\n", "_%s@%d:\n" }, + { "amd64", 4, KernelModeStub_x86, UserModeStub_x86, ".global _%s@%d\n", "_%s@%d:\n" }, { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, "\t.globl %s\n", "%s:\n" }, @@ -148,7 +150,7 @@ /* FUNCTIONS ****************************************************************/ /*++ - * WriteFileHeader + * WriteFileHeader * * Prints out the File Header for a Stub File. * @@ -166,7 +168,7 @@ * FileLocation is only used for printing the header. * *--*/ -void +void WriteFileHeader(FILE * StubFile, char* FileDescription, char* FileLocation) @@ -185,7 +187,7 @@ } /*++ - * WriteFileHeader + * WriteFileHeader * * Prints out the File Header for a Stub File. * @@ -203,21 +205,21 @@ * FileLocation is only used for printing the header. * *--*/ -void -WriteStubHeader(FILE* StubFile, - char* SyscallName, +void +WriteStubHeader(FILE* StubFile, + char* SyscallName, unsigned StackBytes) { /* Export the function */ fprintf(StubFile, GlobalHeader, SyscallName, StackBytes); - + /* Define it */ fprintf(StubFile, Declaration, SyscallName, StackBytes); } - + /*++ - * WriteKernelModeStub + * WriteKernelModeStub * * Prints out the Kernel Mode Stub for a System Call. * @@ -237,12 +239,12 @@ * On i386, StackBytes is the number of arguments x 4. * *--*/ -void -WriteKernelModeStub(FILE* StubFile, - char* SyscallName, +void +WriteKernelModeStub(FILE* StubFile, + char* SyscallName, unsigned StackBytes, unsigned int SyscallId) -{ +{ /* Write the Stub Header and export the Function */ WriteStubHeader(StubFile, SyscallName, StackBytes); @@ -251,7 +253,7 @@ } /*++ - * WriteUserModeStub + * WriteUserModeStub * * Prints out the User Mode Stub for a System Call. * @@ -271,12 +273,12 @@ * On i386, StackBytes is the number of arguments x 4. * *--*/ -void -WriteUserModeStub(FILE* StubFile, - char* SyscallName, +void +WriteUserModeStub(FILE* StubFile, + char* SyscallName, unsigned StackBytes, unsigned int SyscallId) -{ +{ /* Write the Stub Header and export the Function */ WriteStubHeader(StubFile, SyscallName, StackBytes); @@ -285,7 +287,7 @@ } /*++ - * GetNameAndArgumentsFromDb + * GetNameAndArgumentsFromDb * * Parses an entry from a System Call Database, extracting * the function's name and arguments that it takes. @@ -305,23 +307,23 @@ * On i386, StackBytes is the number of arguments x 4. * *--*/ -void +void GetNameAndArgumentsFromDb(char Line[], char ** NtSyscallName, char ** SyscallArguments) { char *s; char *stmp; - + /* Remove new line */ if ((s = (char *) strchr(Line,'\r')) != NULL) { *s = '\0'; } - + /* Skip comments (#) and empty lines */ s = &Line[0]; if ((*s) != '#' && (*s) != '\0') { - + /* Extract the NtXXX name */ *NtSyscallName = (char *)strtok(s," \t"); @@ -332,9 +334,9 @@ if ((stmp = strchr(*SyscallArguments, '\n')) != NULL) { *stmp = '\0'; } - + } else { - + /* Skip this entry */ *NtSyscallName = NULL; *SyscallArguments = NULL; @@ -342,7 +344,7 @@ } /*++ - * CreateStubs + * CreateStubs * * Parses a System Call Database and creates stubs for all the entries. * @@ -379,28 +381,28 @@ char *SyscallArguments; int SyscallId; unsigned StackBytes; - + /* We loop, incrementing the System Call Index, until the end of the file */ for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { - + /* Extract the Name and Arguments */ - GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); + GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); if (SyscallArguments != NULL) StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); else StackBytes = 0; - + /* Make sure we really extracted something */ if (NtSyscallName) { - + /* Create Usermode Stubs for Nt/Zw syscalls in each Usermode file */ int i; for (i= 0; i < UserFiles; i++) { - + /* Write the Nt Version */ - WriteUserModeStub(UserModeFiles[i], - NtSyscallName, - StackBytes, + WriteUserModeStub(UserModeFiles[i], + NtSyscallName, + StackBytes, SyscallId | Index); /* If a Zw Version is needed (was specified), write it too */ @@ -426,7 +428,7 @@ StackBytes, SyscallId | Index); } - + /* Only increase if we actually added something */ SyscallId++; } @@ -434,7 +436,7 @@ } /*++ - * CreateSystemServiceTable + * CreateSystemServiceTable * * Parses a System Call Database and creates a System Call Service Table for it. * @@ -455,7 +457,7 @@ * *--*/ void -CreateSystemServiceTable(FILE *SyscallDb, +CreateSystemServiceTable(FILE *SyscallDb, FILE *SyscallTable, char * Name, char * FileLocation) @@ -477,21 +479,21 @@ /* Extract the Name and Arguments */ GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - + /* Make sure we really extracted something */ if (NtSyscallName) { - + /* Add a new line */ if (SyscallId > 0) fprintf(SyscallTable,",\n"); - + /* Write the syscall name in the service table. */ fprintf(SyscallTable,"\t\t(ULONG_PTR)%s", NtSyscallName); - + /* Only increase if we actually added something */ SyscallId++; } } - + /* Close the service table (C syntax) */ fprintf(SyscallTable,"\n};\n"); @@ -504,24 +506,24 @@ /* Extract the Name and Arguments */ GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - + /* Make sure we really extracted something */ if (NtSyscallName) { - + /* Add a new line */ if (SyscallId > 0) fprintf(SyscallTable,",\n"); - + /* Write the syscall arguments in the argument table. */ if (SyscallArguments != NULL) fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); else fprintf(SyscallTable,"\t\t0"); - + /* Only increase if we actually added something */ SyscallId++; } } - + /* Close the service table (C syntax) */ fprintf(SyscallTable,"\n};\n"); @@ -574,14 +576,14 @@ usage(argv[0]); return(1); } - + /* Open all Output and bail out if any fail */ for (FileNumber = 0; FileNumber < Arguments; FileNumber++) { - + /* Open the File */ if (FileNumber == 2) OpenType = "wb"; Files[FileNumber] = fopen(argv[FileNumber + ArgOffset], OpenType); - + /* Check for failure and error out if so */ if (!Files[FileNumber]) { perror(argv[FileNumber + ArgOffset]); @@ -590,32 +592,32 @@ } /* Write the File Headers */ - WriteFileHeader(Files[NtosUserStubs], - "System Call Stubs for Native API", + WriteFileHeader(Files[NtosUserStubs], + "System Call Stubs for Native API", argv[NtosUserStubs + ArgOffset]); - - WriteFileHeader(Files[NtosKernelStubs], - "System Call Stubs for Native API", + + WriteFileHeader(Files[NtosKernelStubs], + "System Call Stubs for Native API", argv[NtosKernelStubs + ArgOffset]); fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]); - WriteFileHeader(Files[Win32kStubs], - "System Call Stubs for Native API", + WriteFileHeader(Files[Win32kStubs], + "System Call Stubs for Native API", argv[Win32kStubs + ArgOffset]); /* Create the System Stubs */ CreateStubs(Files[NativeSystemDb], - &Files[NtosUserStubs], - Files[NtosKernelStubs], - MAIN_INDEX, + &Files[NtosUserStubs], + Files[NtosKernelStubs], + MAIN_INDEX, 1, 1); /* Create the Graphics Stubs */ - CreateStubs(Files[NativeGuiDb], - &Files[Win32kStubs], - NULL, - WIN32K_INDEX, + CreateStubs(Files[NativeGuiDb], + &Files[Win32kStubs], + NULL, + WIN32K_INDEX, 1, 0); @@ -624,22 +626,22 @@ rewind(Files[NativeGuiDb]); /* Create the Service Tables */ - CreateSystemServiceTable(Files[NativeSystemDb], + CreateSystemServiceTable(Files[NativeSystemDb], Files[NtosServiceTable], "Main", argv[NtosServiceTable + ArgOffset]); - - CreateSystemServiceTable(Files[NativeGuiDb], + + CreateSystemServiceTable(Files[NativeGuiDb], Files[Win32kServiceTable], "Win32k", argv[Win32kServiceTable + ArgOffset]); /* Close all files */ for (FileNumber = 0; FileNumber < Arguments-ArgOffset; FileNumber++) { - + /* Close the File */ fclose(Files[FileNumber]); - + } return(0);

1 0

[tkreuzer] 34699: create a branch for amd64 port
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 16:34:47 2008 New Revision: 34699 URL: http://svn.reactos.org/svn/reactos?rev=34699&view=rev Log: create a branch for amd64 port Added: branches/ros-amd64-bringup/ - copied from r34698, trunk/

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008