Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 15949: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/lib/kjs/include/jsconfig.h Modified: trunk/reactos/lib/kjs/include/jsint.h Modified: trunk/reactos/lib/kjs/kjs.xml Modified: trunk/reactos/lib/kjs/ksrc/compat.c Modified: trunk/reactos/lib/kjs/ksrc/js.c Modified: trunk/reactos/lib/kjs/ksrc/mrgsort.c Modified: trunk/reactos/lib/kjs/ksrc/regex.c Modified: trunk/reactos/lib/kjs/ksrc/vmjumps.c Modified: trunk/reactos/lib/kjs/ksrc/vmswitch.c Modified: trunk/reactos/lib/kjs/ksrc/vmswt0.c _____ Modified: trunk/reactos/lib/kjs/include/jsconfig.h --- trunk/reactos/lib/kjs/include/jsconfig.h 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/include/jsconfig.h 2005-06-17 07:59:43 UTC (rev 15949) @@ -168,7 +168,6 @@ #define HAVE_UNISTD_H 1 #include "ddk/ntddk.h" -#include "ntos/rtl.h" /* #include "assert.h" */ #ifndef __TYPE_UINT64 typedef unsigned __int64 __uint64; _____ Modified: trunk/reactos/lib/kjs/include/jsint.h --- trunk/reactos/lib/kjs/include/jsint.h 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/include/jsint.h 2005-06-17 07:59:43 UTC (rev 15949) @@ -32,7 +32,6 @@ /* We have always jsconfig.h */ #include <jsconfig.h> -#include "ddk/exfuncs.h" #include <stdio.h> #include <assert.h> _____ Modified: trunk/reactos/lib/kjs/kjs.xml --- trunk/reactos/lib/kjs/kjs.xml 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/kjs.xml 2005-06-17 07:59:43 UTC (rev 15949) @@ -3,6 +3,8 @@ <include base="kjs">src</include> <include base="kjs">include</include> <define name="__NO_CTYPE_INLINES" /> + <define name="__USE_W32API" /> + <define name="_NTOSKRNL_" /> <directory name="ksrc"> <file>setjmp.S</file> <file>longjmp.S</file> _____ Modified: trunk/reactos/lib/kjs/ksrc/compat.c --- trunk/reactos/lib/kjs/ksrc/compat.c 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/ksrc/compat.c 2005-06-17 07:59:43 UTC (rev 15949) @@ -1,10 +1,10 @@ #include "ddk/ntddk.h" -#include "ddk/kefuncs.h" #include "ctype.h" #include "jsconfig.h" void __kernel_abort() { - KEBUGCHECK(0); + DbgPrint("KeBugCheck (0x%X) at %s:%i\n", 0, __FILE__,__LINE__); + KeBugCheck(0); } void _assert( const char *expr, const char *file, int line ) { _____ Modified: trunk/reactos/lib/kjs/ksrc/js.c --- trunk/reactos/lib/kjs/ksrc/js.c 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/ksrc/js.c 2005-06-17 07:59:43 UTC (rev 15949) @@ -30,7 +30,6 @@ #include "js.h" #include "jsint.h" #include "kjs.h" -#include "ddk/kefuncs.h" /* * Types and definitions. @@ -226,7 +225,7 @@ options->stacktrace_on_error, s_stdin, s_stdout, s_stderr); if (interp->vm == NULL) - KEBUGCHECK(0); + __kernel_abort(); /* Set some options. */ interp->vm->warn_undef = options->warn_undef; @@ -253,17 +252,17 @@ /* Define compiler to the virtual machine. */ bc = js_bc_read_data (js_compiler_bytecode, js_compiler_bytecode_len); if (bc == NULL) - KEBUGCHECK(0); + __kernel_abort(); result = js_vm_execute (interp->vm, bc); js_bc_free (bc); if (!result) - KEBUGCHECK(0); + __kernel_abort(); } /* Initialize our extensions. */ if (!js_define_module (interp, js_core_globals)) - KEBUGCHECK(0); + __kernel_abort(); /* Ok, we'r done. */ return interp; _____ Modified: trunk/reactos/lib/kjs/ksrc/mrgsort.c --- trunk/reactos/lib/kjs/ksrc/mrgsort.c 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/ksrc/mrgsort.c 2005-06-17 07:59:43 UTC (rev 15949) @@ -28,7 +28,6 @@ */ #include "jsconfig.h" -#include "ddk/exfuncs.h" #define js_malloc(x) ExAllocatePool(NonPagedPool,x) #define js_free(x) ExFreePool(x) _____ Modified: trunk/reactos/lib/kjs/ksrc/regex.c --- trunk/reactos/lib/kjs/ksrc/regex.c 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/ksrc/regex.c 2005-06-17 07:59:43 UTC (rev 15949) @@ -72,10 +72,6 @@ extern void *js_realloc( void *, int ); extern void *js_malloc( int ); -#define realloc js_realloc -#define malloc js_malloc -#define free js_free - #ifdef _LIBC /* We have to keep the namespace clean. */ # define regfree(preg) __regfree (preg) @@ -320,6 +316,11 @@ # define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) #endif + +#define realloc js_realloc +#define malloc js_malloc +#define free js_free + /* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we use `alloca' instead of `malloc'. This is because using malloc in re_search* or re_match* could cause memory leaks when C-g is used in _____ Modified: trunk/reactos/lib/kjs/ksrc/vmjumps.c --- trunk/reactos/lib/kjs/ksrc/vmjumps.c 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/ksrc/vmjumps.c 2005-06-17 07:59:43 UTC (rev 15949) @@ -74,6 +74,7 @@ #define DONE() goto done +#undef ERROR #define ERROR(msg) \ do { \ JS_SAVE_REGS (); \ _____ Modified: trunk/reactos/lib/kjs/ksrc/vmswitch.c --- trunk/reactos/lib/kjs/ksrc/vmswitch.c 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/ksrc/vmswitch.c 2005-06-17 07:59:43 UTC (rev 15949) @@ -54,6 +54,7 @@ #define DONE() goto done +#undef ERROR #define ERROR(msg) \ do { \ JS_SAVE_REGS (); \ _____ Modified: trunk/reactos/lib/kjs/ksrc/vmswt0.c --- trunk/reactos/lib/kjs/ksrc/vmswt0.c 2005-06-17 07:57:37 UTC (rev 15948) +++ trunk/reactos/lib/kjs/ksrc/vmswt0.c 2005-06-17 07:59:43 UTC (rev 15949) @@ -272,6 +272,7 @@ #define DONE() goto done +#undef ERROR #define ERROR(msg) \ do { \ JS_SAVE_REGS (); \

1 0

[navaraf] 15948: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/lib/rtl/luid.c Modified: trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/rtl.xml Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/version.c _____ Modified: trunk/reactos/lib/rtl/luid.c --- trunk/reactos/lib/rtl/luid.c 2005-06-17 07:55:45 UTC (rev 15947) +++ trunk/reactos/lib/rtl/luid.c 2005-06-17 07:57:37 UTC (rev 15948) @@ -50,6 +50,7 @@ } +#undef RtlEqualLuid /* * @implemented */ _____ Modified: trunk/reactos/lib/rtl/mem.c --- trunk/reactos/lib/rtl/mem.c 2005-06-17 07:55:45 UTC (rev 15947) +++ trunk/reactos/lib/rtl/mem.c 2005-06-17 07:57:37 UTC (rev 15948) @@ -84,6 +84,7 @@ } +#undef RtlFillMemory /* * @implemented */ @@ -123,7 +124,7 @@ } - +#undef RtlMoveMemory /* * @implemented */ @@ -155,6 +156,8 @@ UNIMPLEMENTED; } + +#undef RtlZeroMemory /* * @implemented */ _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-06-17 07:55:45 UTC (rev 15947) +++ trunk/reactos/lib/rtl/rtl.h 2005-06-17 07:57:37 UTC (rev 15948) @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> +#include <ddk/ntifs.h> #include <windows.h> #include <ntdll/rtl.h> #include <napi/teb.h> @@ -20,6 +21,7 @@ #include <ntdll/rtl.h> #include <rosrtl/thread.h> #include <winerror.h> +#include <ntos.h> #include <stdio.h> #define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) _____ Modified: trunk/reactos/lib/rtl/rtl.xml --- trunk/reactos/lib/rtl/rtl.xml 2005-06-17 07:55:45 UTC (rev 15947) +++ trunk/reactos/lib/rtl/rtl.xml 2005-06-17 07:57:37 UTC (rev 15948) @@ -1,4 +1,6 @@ <module name="rtl" type="staticlibrary"> + <define name="__USE_W32API" /> + <define name="_NTOSKRNL_" /> <include base="rtl">.</include> <directory name="i386"> <file>allshl.s</file> _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-06-17 07:55:45 UTC (rev 15947) +++ trunk/reactos/lib/rtl/unicode.c 2005-06-17 07:57:37 UTC (rev 15948) @@ -341,8 +341,8 @@ BOOLEAN STDCALL RtlEqualUnicodeString( - IN PUNICODE_STRING String1, - IN PUNICODE_STRING String2, + IN CONST UNICODE_STRING *String1, + IN CONST UNICODE_STRING *String2, IN BOOLEAN CaseInsensitive) { ULONG i; _____ Modified: trunk/reactos/lib/rtl/version.c --- trunk/reactos/lib/rtl/version.c 2005-06-17 07:55:45 UTC (rev 15947) +++ trunk/reactos/lib/rtl/version.c 2005-06-17 07:57:37 UTC (rev 15948) @@ -29,7 +29,7 @@ */ /* INCLUDES *****************************************************************/ -#define __USE_W32API + #include "rtl.h" #define NDEBUG

1 0

[navaraf] 15947: A bit of W32API friendliness...
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

A bit of W32API friendliness... Modified: trunk/reactos/include/ntdll/ldr.h Modified: trunk/reactos/include/ntdll/rtl.h Modified: trunk/reactos/include/ntos/security.h _____ Modified: trunk/reactos/include/ntdll/ldr.h --- trunk/reactos/include/ntdll/ldr.h 2005-06-17 07:53:58 UTC (rev 15946) +++ trunk/reactos/include/ntdll/ldr.h 2005-06-17 07:55:45 UTC (rev 15947) @@ -5,13 +5,13 @@ #include <napi/teb.h> #include <reactos/rossym.h> -typedef NTSTATUS STDCALL_FUNC (*PEPFUNC)(PPEB); +typedef NTSTATUS (STDCALL *PEPFUNC)(PPEB); /* Type for a DLL's entry point */ -typedef BOOL STDCALL_FUNC -(* PDLLMAIN_FUNC)(HANDLE hInst, - ULONG ul_reason_for_call, - LPVOID lpReserved); +typedef BOOL +(STDCALL *PDLLMAIN_FUNC)(HANDLE hInst, + ULONG ul_reason_for_call, + LPVOID lpReserved); #if defined(__USE_W32API) || defined(__NTDLL__) /* _____ Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-06-17 07:53:58 UTC (rev 15946) +++ trunk/reactos/include/ntdll/rtl.h 2005-06-17 07:55:45 UTC (rev 15947) @@ -147,7 +147,7 @@ typedef struct _RTL_RESOURCE { - CRITICAL_SECTION Lock; + RTL_CRITICAL_SECTION Lock; HANDLE SharedSemaphore; ULONG SharedWaiters; HANDLE ExclusiveSemaphore; _____ Modified: trunk/reactos/include/ntos/security.h --- trunk/reactos/include/ntos/security.h 2005-06-17 07:53:58 UTC (rev 15946) +++ trunk/reactos/include/ntos/security.h 2005-06-17 07:55:45 UTC (rev 15947) @@ -420,8 +420,13 @@ BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; -#endif /* !__USE_W32API */ +#else /* !__USE_W32API */ +typedef struct _ACL_REVISION_INFORMATION *PACL_REVISION_INFORMATION; +typedef struct _ACL_SIZE_INFORMATION *PACL_SIZE_INFORMATION; + +#endif /* __USE_W32API */ + typedef struct { ACE_HEADER Header;

1 0

[navaraf] 15946: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/lib/kbdda/kbdda.xml Modified: trunk/reactos/lib/kbddv/kbddv.xml Modified: trunk/reactos/lib/kbdes/kbdes.xml Modified: trunk/reactos/lib/kbdfr/kbdfr.xml Modified: trunk/reactos/lib/kbdgr/kbdgr.xml Modified: trunk/reactos/lib/kbdru/kbdru.xml Modified: trunk/reactos/lib/kbdse/kbdse.xml Modified: trunk/reactos/lib/kbdsg/kbdsg.xml Modified: trunk/reactos/lib/kbduk/kbduk.xml Modified: trunk/reactos/lib/kbdus/kbdus.xml _____ Modified: trunk/reactos/lib/kbdda/kbdda.xml --- trunk/reactos/lib/kbdda/kbdda.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbdda/kbdda.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbdda.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbdda.c</file> <file>kbdda.rc</file> </module> _____ Modified: trunk/reactos/lib/kbddv/kbddv.xml --- trunk/reactos/lib/kbddv/kbddv.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbddv/kbddv.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbddv.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbddv.c</file> <file>kbddv.rc</file> </module> _____ Modified: trunk/reactos/lib/kbdes/kbdes.xml --- trunk/reactos/lib/kbdes/kbdes.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbdes/kbdes.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbdes.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbdes.c</file> <file>kbdes.rc</file> </module> _____ Modified: trunk/reactos/lib/kbdfr/kbdfr.xml --- trunk/reactos/lib/kbdfr/kbdfr.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbdfr/kbdfr.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbdfr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbdfr.c</file> <file>kbdfr.rc</file> </module> _____ Modified: trunk/reactos/lib/kbdgr/kbdgr.xml --- trunk/reactos/lib/kbdgr/kbdgr.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbdgr/kbdgr.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbdgr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbdgr.c</file> <file>kbdgr.rc</file> </module> _____ Modified: trunk/reactos/lib/kbdru/kbdru.xml --- trunk/reactos/lib/kbdru/kbdru.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbdru/kbdru.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbdru.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbdru.c</file> <file>kbdru.rc</file> </module> _____ Modified: trunk/reactos/lib/kbdse/kbdse.xml --- trunk/reactos/lib/kbdse/kbdse.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbdse/kbdse.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbdse.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbdse.c</file> <file>kbdse.rc</file> </module> _____ Modified: trunk/reactos/lib/kbdsg/kbdsg.xml --- trunk/reactos/lib/kbdsg/kbdsg.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbdsg/kbdsg.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbdsg.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbdsg.c</file> <file>kbdsg.rc</file> </module> _____ Modified: trunk/reactos/lib/kbduk/kbduk.xml --- trunk/reactos/lib/kbduk/kbduk.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbduk/kbduk.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbduk.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbduk.c</file> <file>kbduk.rc</file> </module> _____ Modified: trunk/reactos/lib/kbdus/kbdus.xml --- trunk/reactos/lib/kbdus/kbdus.xml 2005-06-17 07:53:34 UTC (rev 15945) +++ trunk/reactos/lib/kbdus/kbdus.xml 2005-06-17 07:53:58 UTC (rev 15946) @@ -2,6 +2,8 @@ <importlibrary definition="kbdus.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> <file>kbdus.c</file> <file>kbdus.rc</file> </module>

1 0

[navaraf] 15945: - Use standard TLS instead of custom TEB field.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

- Use standard TLS instead of custom TEB field. - Use W32API. Modified: trunk/reactos/lib/libwine/debug.c Modified: trunk/reactos/lib/libwine/libwine.xml _____ Modified: trunk/reactos/lib/libwine/debug.c --- trunk/reactos/lib/libwine/debug.c 2005-06-17 07:16:01 UTC (rev 15944) +++ trunk/reactos/lib/libwine/debug.c 2005-06-17 07:53:34 UTC (rev 15945) @@ -29,6 +29,18 @@ /* ---------------------------------------------------------------------- */ +static CRITICAL_SECTION WineDebugCS; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &WineDebugCS, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { 0, 0 } +}; +static CRITICAL_SECTION WineDebugCS = { &critsect_debug, -1, 0, 0, 0, 0 }; +static DWORD WineDebugTlsIndex = TLS_OUT_OF_INDEXES; + +/* ---------------------------------------------------------------------- */ + struct debug_info { char *str_pos; /* current position in strings buffer */ @@ -37,28 +49,40 @@ char output[1024]; /* current output line */ }; -static struct debug_info tmp; +static struct debug_info tmp = { tmp.strings, tmp.output }; /* get the debug info pointer for the current thread */ static inline struct debug_info *get_info(void) { - struct debug_info *info = NtCurrentTeb()->WineDebugInfo; - if (!info) + struct debug_info *info; + + if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES) { - if (!tmp.str_pos) + EnterCriticalSection(&WineDebugCS); + if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES) { - tmp.str_pos = tmp.strings; - tmp.out_pos = tmp.output; + DWORD NewTlsIndex = TlsAlloc(); + if (NewTlsIndex == TLS_OUT_OF_INDEXES) + { + LeaveCriticalSection(&WineDebugCS); + return &tmp; + } + info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info)); + if (!info) + { + LeaveCriticalSection(&WineDebugCS); + TlsFree(NewTlsIndex); + return &tmp; + } + info->str_pos = info->strings; + info->out_pos = info->output; + TlsSetValue(NewTlsIndex, info); + WineDebugTlsIndex = NewTlsIndex; } - if (!RtlGetProcessHeap()) return &tmp; - /* setup the temp structure in case HeapAlloc wants to print something */ - NtCurrentTeb()->WineDebugInfo = &tmp; - info = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(*info)); - info->str_pos = info->strings; - info->out_pos = info->output; - NtCurrentTeb()->WineDebugInfo = info; + LeaveCriticalSection(&WineDebugCS); } - return info; + + return TlsGetValue(WineDebugTlsIndex); } /* allocate some tmp space for a string */ @@ -75,7 +99,11 @@ /* release extra space that we requested in gimme1() */ static inline void release(void *ptr) { - struct debug_info *info = NtCurrentTeb()->WineDebugInfo; + struct debug_info *info; + if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES) + info = &tmp; + else + info = TlsGetValue(WineDebugTlsIndex); info->str_pos = ptr; } _____ Modified: trunk/reactos/lib/libwine/libwine.xml --- trunk/reactos/lib/libwine/libwine.xml 2005-06-17 07:16:01 UTC (rev 15944) +++ trunk/reactos/lib/libwine/libwine.xml 2005-06-17 07:53:34 UTC (rev 15945) @@ -1,5 +1,6 @@ <module name="wine" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> <define name="__REACTOS__" /> + <define name="__USE_W32API" /> <file>debug.c</file> </module>

1 0

[navaraf] 15944: Add definitions of ACCESS_MAX_MS_V2_ACE_TYPE, ACCESS_ALLOWED_COMPOUND_ACE_TYPE, ACCESS_MAX_MS_V3_ACE_TYPE, ACCESS_MIN_MS_OBJECT_ACE_TYPE, ACCESS_ALLOWED_OBJECT_ACE_TYPE, ACCESS_DENIED_OBJECT_ACE_TYPE, SYSTEM_AUDIT_OBJECT_ACE_TYPE, SYSTEM_ALARM_OBJECT_ACE_TYPE, ACCESS_MAX_MS_OBJECT_ACE_TYPE, ACCESS_MAX_MS_V4_ACE_TYPE, ACCESS_MAX_MS_ACE_TYPE, ACCESS_ALLOWED_CALLBACK_ACE_TYPE, ACCESS_DENIED_CALLBACK_ACE_TYPE, ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE, ACCESS_DENIED_CALLBACK_OBJECT_AC
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Add definitions of ACCESS_MAX_MS_V2_ACE_TYPE, ACCESS_ALLOWED_COMPOUND_ACE_TYPE, ACCESS_MAX_MS_V3_ACE_TYPE, ACCESS_MIN_MS_OBJECT_ACE_TYPE, ACCESS_ALLOWED_OBJECT_ACE_TYPE, ACCESS_DENIED_OBJECT_ACE_TYPE, SYSTEM_AUDIT_OBJECT_ACE_TYPE, SYSTEM_ALARM_OBJECT_ACE_TYPE, ACCESS_MAX_MS_OBJECT_ACE_TYPE, ACCESS_MAX_MS_V4_ACE_TYPE, ACCESS_MAX_MS_ACE_TYPE, ACCESS_ALLOWED_CALLBACK_ACE_TYPE, ACCESS_DENIED_CALLBACK_ACE_TYPE, ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE, ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE, SYSTEM_AUDIT_CALLBACK_ACE_TYPE, SYSTEM_ALARM_CALLBACK_ACE_TYPE, SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE, SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE, ACCESS_MAX_MS_V5_ACE_TYPE, SID_MAX_SUB_AUTHORITIES, SID_RECOMMENDED_SUB_AUTHORITIES, SE_OWNER_DEFAULTED, SE_GROUP_DEFAULTED, SE_DACL_PRESENT, SE_DACL_DEFAULTED, SE_SACL_PRESENT, SE_SACL_DEFAULTED, SE_DACL_UNTRUSTED, SE_SERVER_SECURITY, SE_DACL_AUTO_INHERIT_REQ, SE_SACL_AUTO_INHERIT_REQ, SE_DACL_AUTO_INHERITED, SE_SACL_AUTO_INHERITED, SE_DACL_PROTECTED, SE_SACL_PROTECTED, SE_RM_CONTROL_VALID and SE_SELF_RELATIVE. Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-17 07:12:16 UTC (rev 15943) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-17 07:16:01 UTC (rev 15944) @@ -63,10 +63,31 @@ #define DOS_DOT (L'"') /* also in winnt.h */ -#define ACCESS_ALLOWED_ACE_TYPE (0x0) -#define ACCESS_DENIED_ACE_TYPE (0x1) -#define SYSTEM_AUDIT_ACE_TYPE (0x2) -#define SYSTEM_ALARM_ACE_TYPE (0x3) +#define ACCESS_MIN_MS_ACE_TYPE (0x0) +#define ACCESS_ALLOWED_ACE_TYPE (0x0) +#define ACCESS_DENIED_ACE_TYPE (0x1) +#define SYSTEM_AUDIT_ACE_TYPE (0x2) +#define SYSTEM_ALARM_ACE_TYPE (0x3) +#define ACCESS_MAX_MS_V2_ACE_TYPE (0x3) +#define ACCESS_ALLOWED_COMPOUND_ACE_TYPE (0x4) +#define ACCESS_MAX_MS_V3_ACE_TYPE (0x4) +#define ACCESS_MIN_MS_OBJECT_ACE_TYPE (0x5) +#define ACCESS_ALLOWED_OBJECT_ACE_TYPE (0x5) +#define ACCESS_DENIED_OBJECT_ACE_TYPE (0x6) +#define SYSTEM_AUDIT_OBJECT_ACE_TYPE (0x7) +#define SYSTEM_ALARM_OBJECT_ACE_TYPE (0x8) +#define ACCESS_MAX_MS_OBJECT_ACE_TYPE (0x8) +#define ACCESS_MAX_MS_V4_ACE_TYPE (0x8) +#define ACCESS_MAX_MS_ACE_TYPE (0x8) +#define ACCESS_ALLOWED_CALLBACK_ACE_TYPE (0x9) +#define ACCESS_DENIED_CALLBACK_ACE_TYPE (0xA) +#define ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE (0xB) +#define ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE (0xC) +#define SYSTEM_AUDIT_CALLBACK_ACE_TYPE (0xD) +#define SYSTEM_ALARM_CALLBACK_ACE_TYPE (0xE) +#define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE (0xF) +#define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE (0x10) +#define ACCESS_MAX_MS_V5_ACE_TYPE (0x10) #define COMPRESSION_FORMAT_NONE (0x0000) #define COMPRESSION_FORMAT_DEFAULT (0x0001) @@ -306,6 +327,8 @@ #define SECURITY_WORLD_RID (0x00000000L) #define SID_REVISION 1 +#define SID_MAX_SUB_AUTHORITIES 15 +#define SID_RECOMMENDED_SUB_AUTHORITIES 1 #define TOKEN_ASSIGN_PRIMARY (0x0001) #define TOKEN_DUPLICATE (0x0002) @@ -350,6 +373,23 @@ #define VACB_MAPPING_GRANULARITY (0x40000) #define VACB_OFFSET_SHIFT (18) +#define SE_OWNER_DEFAULTED 0x0001 +#define SE_GROUP_DEFAULTED 0x0002 +#define SE_DACL_PRESENT 0x0004 +#define SE_DACL_DEFAULTED 0x0008 +#define SE_SACL_PRESENT 0x0010 +#define SE_SACL_DEFAULTED 0x0020 +#define SE_DACL_UNTRUSTED 0x0040 +#define SE_SERVER_SECURITY 0x0080 +#define SE_DACL_AUTO_INHERIT_REQ 0x0100 +#define SE_SACL_AUTO_INHERIT_REQ 0x0200 +#define SE_DACL_AUTO_INHERITED 0x0400 +#define SE_SACL_AUTO_INHERITED 0x0800 +#define SE_DACL_PROTECTED 0x1000 +#define SE_SACL_PROTECTED 0x2000 +#define SE_RM_CONTROL_VALID 0x4000 +#define SE_SELF_RELATIVE 0x8000 + #define FSCTL_REQUEST_OPLOCK_LEVEL_1 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_REQUEST_OPLOCK_LEVEL_2 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_REQUEST_BATCH_OPLOCK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)

1 0

[navaraf] 15943: - Declare POLICY_NOTIFICATION_INFORMATION_CLASS and SECURITY_LOGON_SESSION_DATA.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

- Declare POLICY_NOTIFICATION_INFORMATION_CLASS and SECURITY_LOGON_SESSION_DATA. - Fix declaration of CRITICAL_SECTION and RTL_CRITICAL_SECTION. Modified: trunk/reactos/w32api/include/ntsecapi.h Modified: trunk/reactos/w32api/include/winbase.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/w32api/include/ntsecapi.h --- trunk/reactos/w32api/include/ntsecapi.h 2005-06-17 00:13:44 UTC (rev 15942) +++ trunk/reactos/w32api/include/ntsecapi.h 2005-06-17 07:12:16 UTC (rev 15943) @@ -229,6 +229,15 @@ PolicyDomainLockoutInformation, PolicyDomainKerberosTicketInformation } POLICY_DOMAIN_INFORMATION_CLASS, *PPOLICY_DOMAIN_INFORMATION_CLASS; +typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS { + PolicyNotifyAuditEventsInformation = 1, + PolicyNotifyAccountDomainInformation, + PolicyNotifyServerRoleInformation, + PolicyNotifyDnsDomainInformation, + PolicyNotifyDomainEfsInformation, + PolicyNotifyDomainKerberosTicketInformation, + PolicyNotifyMachineAccountPasswordInformation +} POLICY_NOTIFICATION_INFORMATION_CLASS, *PPOLICY_NOTIFICATION_INFORMATION_CLASS; typedef enum _SECURITY_LOGON_TYPE { Interactive = 2, Network, @@ -237,6 +246,20 @@ Proxy, Unlock } SECURITY_LOGON_TYPE, *PSECURITY_LOGON_TYPE; +typedef struct _SECURITY_LOGON_SESSION_DATA { + ULONG Size; + LUID LogonId; + LSA_UNICODE_STRING UserName; + LSA_UNICODE_STRING LogonDomain; + LSA_UNICODE_STRING AuthenticationPackage; + ULONG LogonType; + ULONG Session; + PSID Sid; + LARGE_INTEGER LogonTime; + LSA_UNICODE_STRING LogonServer; + LSA_UNICODE_STRING DnsDomainName; + LSA_UNICODE_STRING Upn; +} SECURITY_LOGON_SESSION_DATA, *PSECURITY_LOGON_SESSION_DATA; typedef enum _TRUSTED_INFORMATION_CLASS { TrustedDomainNameInformation = 1, TrustedControllersInformation, _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-06-17 00:13:44 UTC (rev 15942) +++ trunk/reactos/w32api/include/winbase.h 2005-06-17 07:12:16 UTC (rev 15943) @@ -766,7 +766,7 @@ LONG RecursionCount; HANDLE OwningThread; HANDLE LockSemaphore; - DWORD SpinCount; + ULONG_PTR SpinCount; } CRITICAL_SECTION,*PCRITICAL_SECTION,*LPCRITICAL_SECTION; typedef struct _SYSTEMTIME { WORD wYear; _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-06-17 00:13:44 UTC (rev 15942) +++ trunk/reactos/w32api/include/winnt.h 2005-06-17 07:12:16 UTC (rev 15943) @@ -2287,7 +2287,7 @@ LONG RecursionCount; HANDLE OwningThread; HANDLE LockSemaphore; - DWORD Reserved; + ULONG_PTR SpinCount; } RTL_CRITICAL_SECTION,*PRTL_CRITICAL_SECTION; typedef struct _EVENTLOGRECORD { DWORD Length;

1 0

[ion] 15942: Fix bug in gate code
by ion＠svn.reactos.com 17 Jun '05

17 Jun '05

Fix bug in gate code Modified: trunk/reactos/ntoskrnl/ke/gate.c _____ Modified: trunk/reactos/ntoskrnl/ke/gate.c --- trunk/reactos/ntoskrnl/ke/gate.c 2005-06-17 00:13:10 UTC (rev 15941) +++ trunk/reactos/ntoskrnl/ke/gate.c 2005-06-17 00:13:44 UTC (rev 15942) @@ -44,8 +44,8 @@ do { /* Lock the APC Queue */ - KeAcquireSpinLock(&CurrentThread->ApcQueueLock, &OldIrql); - + OldIrql = KeAcquireDispatcherDatabaseLock(); + /* Check if it's already signaled */ if (!Gate->Header.SignalState) { @@ -53,7 +53,7 @@ Gate->Header.SignalState = 0; /* Unlock the Queue and return */ - KeReleaseSpinLock(&CurrentThread->ApcQueueLock, OldIrql); + KeReleaseDispatcherDatabaseLock(OldIrql); return; } @@ -78,9 +78,6 @@ KiWakeQueue(CurrentThread->Queue); } - /* Unlock the Queue*/ - KeReleaseSpinLock(&CurrentThread->ApcQueueLock, OldIrql); - /* Block the Thread */ DPRINT("Blocking the Thread: %x\n", CurrentThread); KiBlockThread(&Status,

1 0

[ion] 15941: Fix strpbrk
by ion＠svn.reactos.com 17 Jun '05

17 Jun '05

Fix strpbrk Modified: trunk/reactos/lib/string/strpbrk.c _____ Modified: trunk/reactos/lib/string/strpbrk.c --- trunk/reactos/lib/string/strpbrk.c 2005-06-16 22:15:43 UTC (rev 15940) +++ trunk/reactos/lib/string/strpbrk.c 2005-06-17 00:13:10 UTC (rev 15941) @@ -44,7 +44,7 @@ { if (char_map[*str / BIT_SIZE] & (1 << (*str % BIT_SIZE))) { - return str; + return (char*)str; } str++; }

1 0

[gvg] 15940: Declare Guarded Mutex functions and export them
by gvg＠svn.reactos.com 16 Jun '05

16 Jun '05

Declare Guarded Mutex functions and export them Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-06-16 21:02:52 UTC (rev 15939) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-06-16 22:15:43 UTC (rev 15940) @@ -508,6 +508,8 @@ Ke386IoSetAccessProcess@8 Ke386QueryIoAccessMap@8 Ke386SetIoAccessMap@8 +@KeAcquireGuardedMutex@4 +@KeAcquireGuardedMutexUnsafe@4 KeAcquireSpinLockAtDpcLevel@4 @KeAcquireDispatcherDatabaseLockAtDpcLevel@0 @KeAcquireInStackQueuedSpinLockAtDpcLevel@8 @@ -529,6 +531,7 @@ KeDetachProcess@0 KeDisconnectInterrupt@4 KeEnterCriticalRegion@0 +KeEnterGuardedRegion@0 KeEnterKernelDebugger@0 KeFindConfigurationEntry@16 KeFindConfigurationNextEntry@20 @@ -552,6 +555,7 @@ KeInitializeDeviceQueue@4 KeInitializeDpc@12 KeInitializeEvent@12 +@KeInitializeGuardedMutex@4 KeInitializeInterrupt@44 KeInitializeMutant@8 KeInitializeMutex@8 @@ -569,6 +573,7 @@ KeIsAttachedProcess@0 KeIsExecutingDpc@0 KeLeaveCriticalRegion@0 +KeLeaveGuardedRegion@0 KeLoaderBlock DATA KeNumberProcessors DATA KeProfileInterrupt@4 @@ -591,6 +596,8 @@ KeRegisterBugCheckCallback@20 KeRegisterBugCheckReasonCallback@16 @KeReleaseDispatcherDatabaseLockFromDpcLevel@0 +@KeReleaseGuardedMutexUnsafe@4 +@KeReleaseGuardedMutex@4 @KeReleaseInStackQueuedSpinLockFromDpcLevel@4 KeReleaseInterruptSpinLock@8 KeReleaseMutant@16 @@ -633,6 +640,7 @@ KeSynchronizeExecution@12 KeTerminateThread@4 KeTickCount DATA +@KeTryToAcquireGuardedMutex@4 KeUpdateRunTime@8 KeUpdateSystemTime@8 KeUnstackDetachProcess@4 _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-16 21:02:52 UTC (rev 15939) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-16 22:15:43 UTC (rev 15940) @@ -5350,6 +5350,52 @@ #endif +/* Guarded Mutex routines */ + +VOID +FASTCALL +KeAcquireGuardedMutex( + PKGUARDED_MUTEX GuardedMutex +); + +VOID +FASTCALL +KeAcquireGuardedMutexUnsafe( + PKGUARDED_MUTEX GuardedMutex +); + +VOID +STDCALL +KeEnterGuardedRegion(VOID); + +VOID +STDCALL +KeLeaveGuardedRegion(VOID); + +VOID +FASTCALL +KeInitializeGuardedMutex( + PKGUARDED_MUTEX GuardedMutex +); + +VOID +FASTCALL +KeReleaseGuardedMutexUnsafe( + PKGUARDED_MUTEX GuardedMutex +); + +VOID +FASTCALL +KeReleaseGuardedMutex( + PKGUARDED_MUTEX GuardedMutex +); + +BOOL +FASTCALL +KeTryToAcquireGuardedMutex( + PKGUARDED_MUTEX GuardedMutex +); + /** Executive support routines **/ NTOSAPI

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