Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 16168: Build ws2_32 with NDK
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Build ws2_32 with NDK Modified: trunk/reactos/lib/ws2_32/include/catalog.h Modified: trunk/reactos/lib/ws2_32/include/ws2_32.h _____ Modified: trunk/reactos/lib/ws2_32/include/catalog.h --- trunk/reactos/lib/ws2_32/include/catalog.h 2005-06-20 19:28:45 UTC (rev 16167) +++ trunk/reactos/lib/ws2_32/include/catalog.h 2005-06-20 19:30:55 UTC (rev 16168) @@ -7,8 +7,6 @@ #ifndef __CATALOG_H #define __CATALOG_H -#include <wsahelp.h> - typedef struct _CATALOG_ENTRY { LIST_ENTRY ListEntry; ULONG ReferenceCount; _____ Modified: trunk/reactos/lib/ws2_32/include/ws2_32.h --- trunk/reactos/lib/ws2_32/include/ws2_32.h 2005-06-20 19:28:45 UTC (rev 16167) +++ trunk/reactos/lib/ws2_32/include/ws2_32.h 2005-06-20 19:30:55 UTC (rev 16168) @@ -8,14 +8,14 @@ #define __WS2_32_H #include <roscfg.h> -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> -#include <ntos.h> -#include <napi/teb.h> #include <winsock2.h> #include <ws2spi.h> #include <ws2tcpip.h> #include <windows.h> +#include <wsahelp.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #undef assert #include <debug.h> #include <windns.h> // DNS_A_DATA

1 0

[ion] 16167: Compile msafd with NDK
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Compile msafd with NDK Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/lib/msafd/include/msafd.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-20 19:19:23 UTC (rev 16166) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-20 19:28:45 UTC (rev 16167) @@ -1435,6 +1435,35 @@ ); /* + * Misc conversion functions + */ +LARGE_INTEGER +STDCALL +RtlConvertLongToLargeInteger(IN LONG SignedInteger); + +LARGE_INTEGER +STDCALL +RtlEnlargedIntegerMultiply( + LONG Multiplicand, + LONG Multiplier +); + +ULONG +STDCALL +RtlEnlargedUnsignedDivide( + ULARGE_INTEGER Dividend, + ULONG Divisor, + PULONG Remainder +); + +LARGE_INTEGER +STDCALL +RtlEnlargedUnsignedMultiply( + ULONG Multiplicand, + ULONG Multiplier +); + +/* * Time Functions */ NTSTATUS _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-20 19:19:23 UTC (rev 16166) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-20 19:28:45 UTC (rev 16167) @@ -805,6 +805,15 @@ LARGE_INTEGER Length; } FILE_ALLOCATED_RANGE_BUFFER, *PFILE_ALLOCATED_RANGE_BUFFER; +typedef struct _FILE_FULL_EA_INFORMATION +{ + ULONG NextEntryOffset; + UCHAR Flags; + UCHAR EaNameLength; + USHORT EaValueLength; + CHAR EaName[1]; +} FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION; + typedef struct _FILE_QUOTA_INFORMATION { ULONG NextEntryOffset; _____ Modified: trunk/reactos/lib/msafd/include/msafd.h --- trunk/reactos/lib/msafd/include/msafd.h 2005-06-20 19:19:23 UTC (rev 16166) +++ trunk/reactos/lib/msafd/include/msafd.h 2005-06-20 19:28:45 UTC (rev 16167) @@ -10,16 +10,14 @@ #include <roscfg.h> #include <stdlib.h> #include <windows.h> -#define NTOS_USER_MODE -#include <ntos.h> -#include <wsahelp.h> /* comment for msvc */ -//#include "C:\Programming\ReactOS\reactos\w32api\include\wsahelp.h" uncomment for MSVC +#include <wsahelp.h> #include <winsock2.h> #include <ws2spi.h> -//#include "C:\Programming\ReactOS\reactos\w32api\include\ddk\tdi.h" uncomment for MSVC -#include <ddk/tdi.h> /* comment for msvc */ +#include <ddk/tdi.h> #include <afd/shared.h> #include <helpers.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <debug.h> extern HANDLE GlobalHeap;

1 0

[ion] 16166: Build secur32 with NDK
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Build secur32 with NDK Modified: trunk/reactos/lib/secur32/dllmain.c _____ Modified: trunk/reactos/lib/secur32/dllmain.c --- trunk/reactos/lib/secur32/dllmain.c 2005-06-20 19:18:35 UTC (rev 16165) +++ trunk/reactos/lib/secur32/dllmain.c 2005-06-20 19:19:23 UTC (rev 16166) @@ -11,7 +11,8 @@ /* INCLUDES ******************************************************************/ #include <windows.h> -#include <ntos.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> /* GLOBALS *******************************************************************/

1 0

[hbirr] 16165: Moved the TRACE_LDR macro from ntdll.h to utils.c.
by hbirr＠svn.reactos.com 20 Jun '05

20 Jun '05

Moved the TRACE_LDR macro from ntdll.h to utils.c. Modified: trunk/reactos/include/ntdll/ntdll.h Modified: trunk/reactos/lib/ntdll/ldr/utils.c _____ Modified: trunk/reactos/include/ntdll/ntdll.h --- trunk/reactos/include/ntdll/ntdll.h 2005-06-20 19:14:08 UTC (rev 16164) +++ trunk/reactos/include/ntdll/ntdll.h 2005-06-20 19:18:35 UTC (rev 16165) @@ -3,15 +3,6 @@ #include <ntos/ntdef.h> #endif -#ifdef NDEBUG -#if defined(__GNUC__) -#define TRACE_LDR(args...) if (RtlGetNtGlobalFlags() & FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } -#else -#endif /* __GNUC__ */ -#else -#define TRACE_LDR(args...) do { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#endif - /* Macros expanding to the appropriate inline assembly to raise a breakpoint */ #if defined(_M_IX86) #define ASM_BREAKPOINT "\nint $3\n" _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-20 19:14:08 UTC (rev 16164) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-20 19:18:35 UTC (rev 16165) @@ -27,6 +27,15 @@ /* GLOBALS *******************************************************************/ +#ifdef NDEBUG +#if defined(__GNUC__) +#define TRACE_LDR(args...) if (RtlGetNtGlobalFlags() & FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } +#else +#endif /* __GNUC__ */ +#else +#define TRACE_LDR(args...) do { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) +#endif + typedef struct _TLS_DATA { PVOID StartAddressOfRawData;

1 0

[ion] 16164: Build epsapi with NDK
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Build epsapi with NDK Modified: trunk/reactos/include/epsapi.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/lib/epsapi/enum/drivers.c Modified: trunk/reactos/lib/epsapi/enum/modules.c Modified: trunk/reactos/lib/epsapi/enum/processes.c _____ Modified: trunk/reactos/include/epsapi.h --- trunk/reactos/include/epsapi.h 2005-06-20 19:05:25 UTC (rev 16163) +++ trunk/reactos/include/epsapi.h 2005-06-20 19:14:08 UTC (rev 16164) @@ -26,8 +26,8 @@ #define __EPSAPI_H_INCLUDED__ /* INCLUDES */ -#define NTOS_MODE_USER -#include <ntos.h> +#include <ntdll/rtl.h> +#include <ntdll/ldr.h> /* FIXME: USE LDR_DATA_TABLE_ENTRY */ /* OBJECTS */ _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-20 19:05:25 UTC (rev 16163) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-20 19:14:08 UTC (rev 16164) @@ -464,7 +464,8 @@ } SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION; /* Class 1 */ -typedef struct _SYSTEM_PROCESSOR_INFORMATION { +typedef struct _SYSTEM_PROCESSOR_INFORMATION +{ USHORT ProcessorArchitecture; USHORT ProcessorLevel; USHORT ProcessorRevision; @@ -552,7 +553,8 @@ } SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION; /* Class 3 */ -typedef struct _SYSTEM_TIMEOFDAY_INFORMATION { +typedef struct _SYSTEM_TIMEOFDAY_INFORMATION +{ LARGE_INTEGER BootTime; LARGE_INTEGER CurrentTime; LARGE_INTEGER TimeZoneBias; @@ -633,7 +635,8 @@ } SYSTEM_CALL_COUNT_INFORMATION, *PSYSTEM_CALL_COUNT_INFORMATION; /* Class 7 */ -typedef struct _SYSTEM_DEVICE_INFORMATION { +typedef struct _SYSTEM_DEVICE_INFORMATION +{ ULONG NumberOfDisks; ULONG NumberOfFloppies; ULONG NumberOfCdRoms; _____ Modified: trunk/reactos/lib/epsapi/enum/drivers.c --- trunk/reactos/lib/epsapi/enum/drivers.c 2005-06-20 19:05:25 UTC (rev 16163) +++ trunk/reactos/lib/epsapi/enum/drivers.c 2005-06-20 19:14:08 UTC (rev 16164) @@ -14,9 +14,9 @@ * and improve reusability */ -#include <stddef.h> +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> #define NDEBUG #include <debug.h> @@ -188,8 +188,8 @@ PsaWalkNextSystemModule(IN PSYSTEM_MODULE_INFORMATION CurrentSystemModule) { return (PSYSTEM_MODULE_INFORMATION_ENTRY)((ULONG_PTR)CurrentSystemModule + - (offsetof(SYSTEM_MODULE_INFORMATION, Module[1]) - - offsetof(SYSTEM_MODULE_INFORMATION, Module[0]))); + (FIELD_OFFSET(SYSTEM_MODULE_INFORMATION, Module[1]) - + FIELD_OFFSET(SYSTEM_MODULE_INFORMATION, Module[0]))); } /* EOF */ _____ Modified: trunk/reactos/lib/epsapi/enum/modules.c --- trunk/reactos/lib/epsapi/enum/modules.c 2005-06-20 19:05:25 UTC (rev 16163) +++ trunk/reactos/lib/epsapi/enum/modules.c 2005-06-20 19:14:08 UTC (rev 16164) @@ -18,9 +18,9 @@ * isolated in its own library to clear the confusion * and improve reusability */ - +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/epsapi/enum/processes.c --- trunk/reactos/lib/epsapi/enum/processes.c 2005-06-20 19:05:25 UTC (rev 16163) +++ trunk/reactos/lib/epsapi/enum/processes.c 2005-06-20 19:14:08 UTC (rev 16164) @@ -31,12 +31,15 @@ * and improve reusability */ -#include <ddk/ntddk.h> -#include <debug.h> -#include <stddef.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <epsapi.h> +#define NDEBUG +#include <debug.h> + NTSTATUS NTAPI PsaCaptureProcessesAndThreads(OUT PSYSTEM_PROCESS_INFORMATION *ProcessesAndThreads) { @@ -74,7 +77,7 @@ pInfoBuffer = pTmp; /* query the information */ - Status = NtQuerySystemInformation(SystemProcessesAndThreadsInformation, + Status = NtQuerySystemInformation(SystemProcessInformation, pInfoBuffer, nSize, NULL); @@ -262,7 +265,7 @@ static SIZE_T nOffsetOfThreads = 0; /* get the offset of the Threads field */ - nOffsetOfThreads = offsetof(SYSTEM_PROCESS_INFORMATION, TH); + nOffsetOfThreads = FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH); return (PSYSTEM_THREAD_INFORMATION)((ULONG_PTR)CurrentProcess + nOffsetOfThreads); } @@ -271,8 +274,8 @@ PsaWalkNextThread(IN PSYSTEM_THREAD_INFORMATION CurrentThread) { return (PSYSTEM_THREAD_INFORMATION)((ULONG_PTR)CurrentThread + - (offsetof(SYSTEM_PROCESS_INFORMATION, TH[1]) - - offsetof(SYSTEM_PROCESS_INFORMATION, TH[0]))); + (FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH[1]) - + FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH[0]))); } /* EOF */

1 0

[ion] 16163: Build dnsapi with NDK
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Build dnsapi with NDK Modified: trunk/reactos/lib/dnsapi/dnsapi/context.c Modified: trunk/reactos/lib/dnsapi/dnsapi/free.c Modified: trunk/reactos/lib/dnsapi/dnsapi/names.c Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c Modified: trunk/reactos/lib/dnsapi/dnsapi/stubs.c _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/context.c --- trunk/reactos/lib/dnsapi/dnsapi/context.c 2005-06-20 19:02:23 UTC (rev 16162) +++ trunk/reactos/lib/dnsapi/dnsapi/context.c 2005-06-20 19:05:25 UTC (rev 16163) @@ -12,7 +12,7 @@ #include <winerror.h> #include <windns.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> #include <internal/windns.h> /* DnsAcquireContextHandle ************* _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/free.c --- trunk/reactos/lib/dnsapi/dnsapi/free.c 2005-06-20 19:02:23 UTC (rev 16162) +++ trunk/reactos/lib/dnsapi/dnsapi/free.c 2005-06-20 19:05:25 UTC (rev 16163) @@ -13,7 +13,7 @@ #include <windns.h> #include <internal/windns.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> VOID WINAPI DnsFree ( PVOID Data, DNS_FREE_TYPE FreeType ) { _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/names.c --- trunk/reactos/lib/dnsapi/dnsapi/names.c 2005-06-20 19:02:23 UTC (rev 16162) +++ trunk/reactos/lib/dnsapi/dnsapi/names.c 2005-06-20 19:05:25 UTC (rev 16163) @@ -3,10 +3,7 @@ #include <windns.h> #include <internal/windns.h> #define NTOS_MODE_USER -#include <ntos.h> -#include <wchar.h> -#include <string.h> -#include <ctype.h> +#include <ndk/ntndk.h> static BOOL DnsIntNameContainsDots( LPCWSTR Name ) { return wcschr( Name, '.' ) ? TRUE : FALSE; _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c --- trunk/reactos/lib/dnsapi/dnsapi/query.c 2005-06-20 19:02:23 UTC (rev 16162) +++ trunk/reactos/lib/dnsapi/dnsapi/query.c 2005-06-20 19:05:25 UTC (rev 16163) @@ -12,9 +12,8 @@ #include <winerror.h> #include <windns.h> #include <internal/windns.h> -#include <string.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> /* DnsQuery **************************** * Begin a DNS query, and allow the result to be placed in the application _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/stubs.c --- trunk/reactos/lib/dnsapi/dnsapi/stubs.c 2005-06-20 19:02:23 UTC (rev 16162) +++ trunk/reactos/lib/dnsapi/dnsapi/stubs.c 2005-06-20 19:05:25 UTC (rev 16163) @@ -1,8 +1,7 @@ #include <windows.h> -/*#include <windns.h>*/ #include <winerror.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> #include <debug.h> typedef ULONG DNS_STATUS;

1 0

[ion] 16162: build smlib with NDK
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

build smlib with NDK Modified: trunk/reactos/lib/smlib/compses.c Modified: trunk/reactos/lib/smlib/connect.c Modified: trunk/reactos/lib/smlib/execpgm.c Modified: trunk/reactos/lib/smlib/lookupss.c _____ Modified: trunk/reactos/lib/smlib/compses.c --- trunk/reactos/lib/smlib/compses.c 2005-06-20 18:58:56 UTC (rev 16161) +++ trunk/reactos/lib/smlib/compses.c 2005-06-20 19:02:23 UTC (rev 16162) @@ -5,8 +5,10 @@ * FILE: lib/smlib/compses.c * PURPOSE: Call SM API SM_API_COMPLETE_SESSION */ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> + #include <sm/helper.h> #define NDEBUG _____ Modified: trunk/reactos/lib/smlib/connect.c --- trunk/reactos/lib/smlib/connect.c 2005-06-20 18:58:56 UTC (rev 16161) +++ trunk/reactos/lib/smlib/connect.c 2005-06-20 19:02:23 UTC (rev 16162) @@ -5,8 +5,10 @@ * FILE: reactos/lib/smlib/connect.c * PURPOSE: Connect to the API LPC port exposed by the SM */ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> + #include <sm/helper.h> #define NDEBUG _____ Modified: trunk/reactos/lib/smlib/execpgm.c --- trunk/reactos/lib/smlib/execpgm.c 2005-06-20 18:58:56 UTC (rev 16161) +++ trunk/reactos/lib/smlib/execpgm.c 2005-06-20 19:02:23 UTC (rev 16162) @@ -5,10 +5,11 @@ * FILE: lib/smlib/execpgm.c * PURPOSE: Call SM API SM_API_EXECPGM */ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> + #include <sm/helper.h> -#include <string.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/smlib/lookupss.c --- trunk/reactos/lib/smlib/lookupss.c 2005-06-20 18:58:56 UTC (rev 16161) +++ trunk/reactos/lib/smlib/lookupss.c 2005-06-20 19:02:23 UTC (rev 16162) @@ -4,8 +4,10 @@ * PROJECT: ReactOS system libraries * FILE: lib/smlib/lookupss.c */ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> + #include <sm/helper.h> #define NDEBUG

1 0

[ion] 16161: Remove rosrtl from advapi
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Remove rosrtl from advapi Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-20 18:55:05 UTC (rev 16160) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-20 18:58:56 UTC (rev 16161) @@ -15,7 +15,7 @@ /* PROTOTYPES ****************************************************************/ -/* FIXME: FILE NEEDS TO BE CLEANED UP AT THE END WHEN ALL THE FUNCTIONS HAVE BEEN ADDED */ +/* FIXME: FILE NEEDS SOME ALPHABETIZING AND REGROUP */ /* List Macros */ static __inline @@ -194,6 +194,16 @@ } /* + * Constant String Macro + */ +#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ +{ \ + sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ + sizeof(__SOURCE_STRING__), \ + (__SOURCE_STRING__) \ +} + +/* * Debug Functions */ _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2005-06-20 18:55:05 UTC (rev 16160) +++ trunk/reactos/lib/advapi32/advapi32.h 2005-06-20 18:58:56 UTC (rev 16161) @@ -15,5 +15,4 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -/* FIXME: ROSRTL */ -#include <rosrtl/string.h> \ No newline at end of file +/* EOF */ _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-06-20 18:55:05 UTC (rev 16160) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-06-20 18:58:56 UTC (rev 16161) @@ -179,7 +179,7 @@ OpenClassesRootKey (PHANDLE KeyHandle) { OBJECT_ATTRIBUTES Attributes; - UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\\Registry\\Machine\\Software\\CLASSES"); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\CLASSES"); DPRINT("OpenClassesRootKey()\n"); @@ -198,7 +198,7 @@ OpenLocalMachineKey (PHANDLE KeyHandle) { OBJECT_ATTRIBUTES Attributes; - UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\\Registry\\Machine"); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine"); NTSTATUS Status; DPRINT("OpenLocalMachineKey()\n"); @@ -221,7 +221,7 @@ OpenUsersKey (PHANDLE KeyHandle) { OBJECT_ATTRIBUTES Attributes; - UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\\Registry\\User"); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\User"); DPRINT("OpenUsersKey()\n"); @@ -241,7 +241,7 @@ { OBJECT_ATTRIBUTES Attributes; UNICODE_STRING KeyName = - ROS_STRING_INITIALIZER(L"\\Registry\\Machine\\System\\CurrentControlSet\ \Hardware Profiles\\Current"); + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Ha rdware Profiles\\Current"); DPRINT("OpenCurrentConfigKey()\n");

1 0

[ion] 16160: Switch Advapi32 to NDK
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Switch Advapi32 to NDK Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/advapi32/sec/lsa.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2005-06-20 18:54:47 UTC (rev 16159) +++ trunk/reactos/lib/advapi32/advapi32.h 2005-06-20 18:55:05 UTC (rev 16160) @@ -1,11 +1,19 @@ -#include <stdarg.h> -#include <string.h> -#include <wchar.h> -#include <tchar.h> -#include <ntdll/rtl.h> -#define NTOS_MODE_USER -#include <ntos.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/advapi32/advapi32.h + * PURPOSE: Win32 Advanced API Libary Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* PSDK/NDK Headers */ #include <windows.h> -#include <sddl.h> -#include <rosrtl/string.h> +#include <ntsecapi.h> #include <accctrl.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +/* FIXME: ROSRTL */ +#include <rosrtl/string.h> \ No newline at end of file _____ Modified: trunk/reactos/lib/advapi32/sec/lsa.c --- trunk/reactos/lib/advapi32/sec/lsa.c 2005-06-20 18:54:47 UTC (rev 16159) +++ trunk/reactos/lib/advapi32/sec/lsa.c 2005-06-20 18:55:05 UTC (rev 16160) @@ -12,7 +12,6 @@ */ #include "advapi32.h" -#include <ntsecapi.h> #define NDEBUG #include <debug.h>

1 0

[ion] 16159: Add missing types to NDK
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Add missing types to NDK Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwtypes.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-20 18:48:32 UTC (rev 16158) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-20 18:54:47 UTC (rev 16159) @@ -328,7 +328,69 @@ ACCESS_MASK AccessMask, PSID Sid ); - + +NTSTATUS +STDCALL +RtlAddAccessAllowedAceEx( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD AceFlags, + IN DWORD AccessMask, + IN PSID pSid +); + +NTSTATUS +STDCALL +RtlAddAccessDeniedAce( + PACL Acl, + ULONG Revision, + ACCESS_MASK AccessMask, + PSID Sid +); + +NTSTATUS +STDCALL +RtlAddAccessDeniedAceEx( + IN OUT PACL Acl, + IN ULONG Revision, + IN ULONG Flags, + IN ACCESS_MASK AccessMask, + IN PSID Sid +); + +NTSTATUS +STDCALL +RtlAddAuditAccessAceEx( + IN OUT PACL Acl, + IN ULONG Revision, + IN ULONG Flags, + IN ACCESS_MASK AccessMask, + IN PSID Sid, + IN BOOLEAN Success, + IN BOOLEAN Failure +); + +NTSTATUS +STDCALL +RtlAddAce( + PACL Acl, + ULONG Revision, + ULONG StartingIndex, + PACE AceList, + ULONG AceListLength +); + +NTSTATUS +STDCALL +RtlAddAuditAccessAce( + PACL Acl, + ULONG Revision, + ACCESS_MASK AccessMask, + PSID Sid, + BOOLEAN Success, + BOOLEAN Failure +); + NTSTATUS STDCALL RtlAllocateAndInitializeSid( @@ -345,6 +407,20 @@ OUT PSID *Sid ); +BOOLEAN +STDCALL +RtlAreAllAccessesGranted( + ACCESS_MASK GrantedAccess, + ACCESS_MASK DesiredAccess +); + +BOOLEAN +STDCALL +RtlAreAnyAccessesGranted( + ACCESS_MASK GrantedAccess, + ACCESS_MASK DesiredAccess +); + VOID STDCALL RtlCopyLuid( @@ -410,6 +486,20 @@ ULONG Revision ); +NTSTATUS +STDCALL +RtlDeleteAce( + PACL Acl, + ULONG AceIndex +); + +BOOLEAN +STDCALL +RtlEqualPrefixSid( + PSID Sid1, + PSID Sid2 +); + BOOLEAN STDCALL RtlEqualSid ( @@ -417,12 +507,35 @@ IN PSID Sid2 ); +BOOLEAN +STDCALL +RtlFirstFreeAce( + PACL Acl, + PACE* Ace +); + PVOID STDCALL RtlFreeSid ( IN PSID Sid ); +NTSTATUS +STDCALL +RtlGetAce( + PACL Acl, + ULONG AceIndex, + PACE *Ace +); + +NTSTATUS +STDCALL +RtlGetControlSecurityDescriptor( + PSECURITY_DESCRIPTOR SecurityDescriptor, + PSECURITY_DESCRIPTOR_CONTROL Control, + PULONG Revision +); + NTSTATUS STDCALL RtlGetDaclSecurityDescriptor( @@ -457,8 +570,23 @@ OUT PBOOLEAN OwnerDefaulted ); +BOOLEAN +STDCALL +RtlGetSecurityDescriptorRMControl( + PSECURITY_DESCRIPTOR SecurityDescriptor, + PUCHAR RMControl +); + +PSID_IDENTIFIER_AUTHORITY +STDCALL +RtlIdentifierAuthoritySid(PSID Sid); + NTSTATUS STDCALL +RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel); + +NTSTATUS +STDCALL RtlInitializeSid( IN OUT PSID Sid, IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, @@ -473,12 +601,19 @@ STDCALL RtlLengthSid(IN PSID Sid); -#if (VER_PRODUCTBUILD >= 2195) +NTSTATUS +STDCALL +RtlQueryInformationAcl( + PACL Acl, + PVOID Information, + ULONG InformationLength, + ACL_INFORMATION_CLASS InformationClass +); NTSTATUS STDCALL RtlSelfRelativeToAbsoluteSD( - IN PSECURITY_DESCRIPTOR SelfRelativeSD, + IN PSECURITY_DESCRIPTOR_RELATIVE SelfRelativeSD, OUT PSECURITY_DESCRIPTOR AbsoluteSD, IN PULONG AbsoluteSDSize, IN PACL Dacl, @@ -491,7 +626,13 @@ IN PULONG PrimaryGroupSize ); -#endif /* (VER_PRODUCTBUILD >= 2195) */ +NTSTATUS +STDCALL +RtlSetControlSecurityDescriptor( + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, + IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet +); NTSTATUS STDCALL @@ -510,6 +651,15 @@ IN BOOLEAN GroupDefaulted ); +NTSTATUS +STDCALL +RtlSetInformationAcl( + PACL Acl, + PVOID Information, + ULONG InformationLength, + ACL_INFORMATION_CLASS InformationClass +); + NTSTATUS STDCALL RtlSetOwnerSecurityDescriptor( @@ -527,6 +677,13 @@ IN BOOLEAN SaclDefaulted ); +VOID +STDCALL +RtlSetSecurityDescriptorRMControl( + PSECURITY_DESCRIPTOR SecurityDescriptor, + PUCHAR RMControl +); + PUCHAR STDCALL RtlSubAuthorityCountSid( @@ -542,6 +699,18 @@ BOOLEAN STDCALL +RtlValidRelativeSecurityDescriptor( + IN PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptorInput, + IN ULONG SecurityDescriptorLength, + IN SECURITY_INFORMATION RequiredInformation +); + +BOOLEAN +STDCALL +RtlValidSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor); + +BOOLEAN +STDCALL RtlValidSid(IN PSID Sid); BOOLEAN @@ -1229,9 +1398,18 @@ /* * Misc String Functions - */ + */ BOOLEAN STDCALL +RtlDosPathNameToNtPathName_U( + PWSTR DosName, + PUNICODE_STRING NtName, + PWSTR *ShortName, + PCURDIR CurrentDirectory +); + +BOOLEAN +STDCALL RtlIsNameLegalDOS8Dot3( IN PUNICODE_STRING UnicodeName, IN PANSI_STRING AnsiName, _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-20 18:48:32 UTC (rev 16158) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-20 18:54:47 UTC (rev 16159) @@ -568,6 +568,7 @@ typedef ULONG EXECUTION_STATE; /* Basic NT Types */ +#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) typedef struct _UNICODE_STRING { USHORT Length; @@ -582,10 +583,6 @@ USHORT MaximumLength; PCHAR Buffer; } STRING, *PSTRING; -typedef STRING ANSI_STRING; -typedef PSTRING PANSI_STRING; -typedef STRING OEM_STRING; -typedef PSTRING POEM_STRING; typedef struct _OBJECT_ATTRIBUTES { @@ -596,7 +593,13 @@ PVOID SecurityDescriptor; PVOID SecurityQualityOfService; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; +#endif +typedef STRING ANSI_STRING; +typedef PSTRING PANSI_STRING; +typedef STRING OEM_STRING; +typedef PSTRING POEM_STRING; + typedef struct _IO_STATUS_BLOCK { union @@ -702,9 +705,34 @@ /* Class 1 */ typedef struct _KEY_USER_FLAGS_INFORMATION { - ULONG UserFlags; + ULONG UserFlags; } KEY_USER_FLAGS_INFORMATION, *PKEY_USER_FLAGS_INFORMATION; +typedef struct _KEY_FULL_INFORMATION +{ + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG ClassOffset; + ULONG ClassLength; + ULONG SubKeys; + ULONG MaxNameLen; + ULONG MaxClassLen; + ULONG Values; + ULONG MaxValueNameLen; + ULONG MaxValueDataLen; + WCHAR Class[1]; +} KEY_FULL_INFORMATION, *PKEY_FULL_INFORMATION; + +typedef struct _KEY_NODE_INFORMATION +{ + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG ClassOffset; + ULONG ClassLength; + ULONG NameLength; + WCHAR Name[1]; +} KEY_NODE_INFORMATION, *PKEY_NODE_INFORMATION; + /* * File */ _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-20 18:48:32 UTC (rev 16158) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-20 18:54:47 UTC (rev 16159) @@ -406,6 +406,13 @@ LARGE_INTEGER UserTime; } KERNEL_USER_TIMES, *PKERNEL_USER_TIMES; +/* Class 9 */ +typedef struct _PROCESS_ACCESS_TOKEN +{ + HANDLE Token; + HANDLE Thread; +} PROCESS_ACCESS_TOKEN, *PPROCESS_ACCESS_TOKEN; + /* Class 16 */ typedef struct _PROCESS_PRIORITY_CLASS {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs