Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[tkreuzer] 38114: use setjmp/longjmp from libcntpr

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 15 14:38:21 2008 New Revision: 38114 URL: http://svn.reactos.org/svn/reactos?rev=38114&view=rev Log: use setjmp/longjmp from libcntpr Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/ Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Mon Dec 15 14:38:21 2008 @@ -17,11 +17,6 @@ <library>ntoskrnl</library> <if property="ARCH" value="i386"> <directory name="i386"> - <file>setjmplongjmp.s</file> - </directory> - </if> - <if property="ARCH" value="amd64"> - <directory name="amd64"> <file>setjmplongjmp.s</file> </directory> </if>

15 years, 9 months

[dgorbachev] 38113: Fix TLS callbacks. Testers, please test it on real software.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Dec 15 12:19:18 2008 New Revision: 38113 URL: http://svn.reactos.org/svn/reactos?rev=38113&view=rev Log: Fix TLS callbacks. Testers, please test it on real software. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Mon Dec 15 12:19:18 2008 @@ -40,7 +40,7 @@ PVOID StartAddressOfRawData; DWORD TlsDataSize; DWORD TlsZeroSize; - PIMAGE_TLS_CALLBACK TlsAddressOfCallBacks; + PIMAGE_TLS_CALLBACK *TlsAddressOfCallBacks; PLDR_DATA_TABLE_ENTRY Module; } TLS_DATA, *PTLS_DATA; @@ -151,7 +151,7 @@ static __inline VOID LdrpTlsCallback(PLDR_DATA_TABLE_ENTRY Module, ULONG dwReason) { - PIMAGE_TLS_CALLBACK TlsCallback; + PIMAGE_TLS_CALLBACK *TlsCallback; if (Module->TlsIndex != 0xFFFF && Module->LoadCount == 0xFFFF) { TlsCallback = LdrpTlsArray[Module->TlsIndex].TlsAddressOfCallBacks; @@ -160,9 +160,9 @@ while (*TlsCallback) { TRACE_LDR("%wZ - Calling tls callback at %x\n", - &Module->BaseDllName, TlsCallback); - TlsCallback(Module->DllBase, dwReason, NULL); - TlsCallback = (PIMAGE_TLS_CALLBACK)((ULONG_PTR)TlsCallback + sizeof(PVOID)); + &Module->BaseDllName, *TlsCallback); + (*TlsCallback)(Module->DllBase, dwReason, NULL); + TlsCallback++; } } } @@ -271,7 +271,7 @@ TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData; TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill; if (TlsDirectory->AddressOfCallBacks) - TlsData->TlsAddressOfCallBacks = *(PIMAGE_TLS_CALLBACK*)TlsDirectory->AddressOfCallBacks; + TlsData->TlsAddressOfCallBacks = (PIMAGE_TLS_CALLBACK *)TlsDirectory->AddressOfCallBacks; else TlsData->TlsAddressOfCallBacks = NULL; TlsData->Module = Module;

15 years, 9 months

[sginsberg] 38112: - Revert part of 37861 on kjk's request

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Dec 15 12:18:23 2008 New Revision: 38112 URL: http://svn.reactos.org/svn/reactos?rev=38112&view=rev Log: - Revert part of 37861 on kjk's request Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Dec 15 12:18:23 2008 @@ -1428,9 +1428,6 @@ "ifneq ($(ROS_GENERATE_RSYM),no)\n" ); fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); - // FIXME! workaround until rsym can extract line numbers from DWARF - fprintf ( fMakefile, - "\t$(Q)${objcopy} -R .debug_abbrev -R .debug_aranges -R .debug_frame -R .debug_info -R .debug_line -R .debug_pubnames -R .debug_macinfo -R .debug_str -R .debug_loc -R .debug_pubtypes -R .debug_ranges -R .debug_static_func -R .debug_static_vars -R .debug_types -R .debug_weaknames $@\n\n" ); fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); fprintf ( fMakefile,

15 years, 9 months

[sserapion] 38111: opps, same here.

by sserapion＠svn.reactos.org

Author: sserapion Date: Mon Dec 15 11:20:44 2008 New Revision: 38111 URL: http://svn.reactos.org/svn/reactos?rev=38111&view=rev Log: opps, same here. Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h [iso-8859-1] Mon Dec 15 11:20:44 2008 @@ -140,6 +140,7 @@ // FIXME +#undef UNALIGNED #define UNALIGNED #define RESTRICTED_POINTER

15 years, 9 months

[sserapion] 38110: - Fix UNALIGNED definition in crt. - Definition not fixed in psdk because attribute(packed) is ignored on pointers and causes warnings, that with the pedantic warnings as errors break everything.

by sserapion＠svn.reactos.org

Author: sserapion Date: Mon Dec 15 11:19:10 2008 New Revision: 38110 URL: http://svn.reactos.org/svn/reactos?rev=38110&view=rev Log: - Fix UNALIGNED definition in crt. - Definition not fixed in psdk because attribute(packed) is ignored on pointers and causes warnings, that with the pedantic warnings as errors break everything. Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Mon Dec 15 11:19:10 2008 @@ -482,7 +482,7 @@ #ifndef UNALIGNED #if defined(__ia64__) || defined(__x86_64) -//#define UNALIGNED __CRT_UNALIGNED +#define UNALIGNED __unaligned #else #define UNALIGNED #endif @@ -570,4 +570,3 @@ #pragma pack(pop) #endif - 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] Mon Dec 15 11:19:10 2008 @@ -53,6 +53,7 @@ #ifdef _X86_ #define UNALIGNED #else +#undef UNALIGNED #define UNALIGNED #endif

15 years, 9 months

[sginsberg] 38109: - Silence debug spam

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Dec 15 08:43:25 2008 New Revision: 38109 URL: http://svn.reactos.org/svn/reactos?rev=38109&view=rev Log: - Silence debug spam Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Mon Dec 15 08:43:25 2008 @@ -452,7 +452,7 @@ HANDLE hEvent; DWORD dwError; - DPRINT1("WaitForLSA() called\n"); + DPRINT("WaitForLSA() called\n"); hEvent = CreateEventW(NULL, TRUE, @@ -476,13 +476,13 @@ } } - DPRINT1("Wait for LSA!\n"); + DPRINT("Wait for LSA!\n"); WaitForSingleObject(hEvent, INFINITE); - DPRINT1("LSA is available!\n"); + DPRINT("LSA is available!\n"); CloseHandle(hEvent); - DPRINT1("WaitForLSA() done\n"); + DPRINT("WaitForLSA() done\n"); }

15 years, 9 months

[tkreuzer] 38108: - remove outdated files from mingw lib - remove allowwarnings=true

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 15 08:02:28 2008 New Revision: 38108 URL: http://svn.reactos.org/svn/reactos?rev=38108&view=rev Log: - remove outdated files from mingw lib - remove allowwarnings=true Removed: trunk/reactos/lib/3rdparty/mingw/CRTfmode.c trunk/reactos/lib/3rdparty/mingw/CRTglob.c trunk/reactos/lib/3rdparty/mingw/CRTinit.c trunk/reactos/lib/3rdparty/mingw/argv.c trunk/reactos/lib/3rdparty/mingw/cpu_features.c trunk/reactos/lib/3rdparty/mingw/cpu_features.h trunk/reactos/lib/3rdparty/mingw/crt1.c trunk/reactos/lib/3rdparty/mingw/dllcrt1.c trunk/reactos/lib/3rdparty/mingw/init.c trunk/reactos/lib/3rdparty/mingw/main.c trunk/reactos/lib/3rdparty/mingw/wbinmode.c trunk/reactos/lib/3rdparty/mingw/winit.c trunk/reactos/lib/3rdparty/mingw/wmain.c Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Removed: trunk/reactos/lib/3rdparty/mingw/CRTfmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRTfmod… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/CRTfmode.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/CRTfmode.c (removed) @@ -1,16 +1,0 @@ -/* - * CRTfmode.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Include this object to set _CRT_fmode to a state that will cause - * _mingw32_init_fmode to leave all file modes in their default state - * (basically text mode). - * - * To use this object include the object file in your link command: - * gcc -o foo.exe foo.o CRTfmode.o - * - */ - -int _CRT_fmode = 0; Removed: trunk/reactos/lib/3rdparty/mingw/CRTglob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRTglob… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/CRTglob.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/CRTglob.c (removed) @@ -1,16 +1,0 @@ -/* - * CRTglob.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Include this object file to set _CRT_glob to a state that will - * turn on command line globbing by default. NOTE: _CRT_glob has a default - * state of on. Specify CRT_noglob.o to turn off globbing by default. - * - * To use this object include the object file in your link command: - * gcc -o foo.exe foo.o CRTglob.o - * - */ - -int _CRT_glob = -1; Removed: trunk/reactos/lib/3rdparty/mingw/CRTinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRTinit… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/CRTinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/CRTinit.c (removed) @@ -1,24 +1,0 @@ -/* - * CRTinit.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * A dummy version of _CRT_INIT for MS compatibility. Programs, or more often - * dlls, which use the static version of the MSVC run time are supposed to - * call _CRT_INIT to initialize the run time library in DllMain. This does - * not appear to be necessary when using crtdll or the dll versions of the - * MSVC runtime, so the dummy call simply does nothing. - * - * This object file is included as a standard in the link process as provided - * by the appropriate GCC frontend. - * - * To use this object include the object file in your link command: - * gcc -o foo.exe foo.o CRTinit.o - * - */ - -void -_CRT_INIT () -{ -} Removed: trunk/reactos/lib/3rdparty/mingw/argv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/argv.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/argv.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/argv.c (removed) @@ -1,19 +1,0 @@ -#ifdef CRTDLL -#undef CRTDLL -#endif - -#include "internal.h" - -extern int _dowildcard; - -#ifdef WPRFLAG -int __CRTDECL -__wsetargv (void) -#else -int __CRTDECL -__setargv (void) -#endif -{ - _dowildcard = 1; - return 0; -} Removed: trunk/reactos/lib/3rdparty/mingw/cpu_features.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cpu_fea… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/cpu_features.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/cpu_features.c (removed) @@ -1,156 +1,0 @@ -#include "cpu_features.h" - -#if defined(_MSC_VER) -#include <intrin.h> -#endif - -/* level 1 edx bits */ -#define EDX_CX8 (1 << 8) /* CMPXCHG8B */ -#define EDX_CMOV (1 << 15) -#define EDX_MMX (1 << 23) -#define EDX_FXSR (1 << 24) /* FXSAVE and FXRSTOR */ -#define EDX_SSE (1 << 25) -#define EDX_SSE2 (1 << 26) - -/* level 1 ecx bits */ -#define ECX_SSE3 (1 << 0) -#define ECX_CX16 (1 << 13) /* CMPXCHG16B */ - -/* extended level 0x80000001 edx bits */ -#define EDX_3DNOW (1 << 31) -#define EDX_3DNOWP (1 << 30) -#define EDX_LM (1 << 29) /*LONG MODE */ - -/* Combine the different cpuid flags into a single bitmap. */ - -unsigned int __cpu_features = 0; - -#ifdef __i386__ -#if defined(__GNUC__) -#define __cpuid(level,a,b,c,d) \ - __asm__ __volatile__ ("cpuid;" \ - : "=a" (a), "=b" (b), "=c" (c), "=d" (d)\ - : "0" (level)) -#elif defined(_MSC_VER) -void ___cpuid (int level, unsigned int * a, unsigned int * b, unsigned int * c, unsigned int * d) -{ - int info[4]; - - __cpuid (info, level); - - *a = info[0]; - *b = info[1]; - *c = info[2]; - *d = info[3]; -} -#define __cpuid(level,a,b,c,d) \ - ___cpuid(level, &(a), &(b), &(c), &(d)) -#endif - -static -unsigned int __detect_cpuid (void) -{ - /* Try to change the value of CPUID bit (bit 21) in EFLAGS. - If the bit can be toggled, CPUID is supported. */ -#if defined(__GNUC__) - unsigned int eax, ebx; - asm volatile ("pushfl; pushfl; popl %0;" - "movl %0,%1; xorl %2,%0;" - "pushl %0; popfl; pushfl; popl %0; popfl" - : "=&r" (eax), "=&r" (ebx) - : "i" (0x00200000)); - - return (eax ^ ebx) & 0x00200000; -#elif defined(_MSC_VER) - unsigned int retval; - - __asm - { - pushf - pushf - pop eax - mov ebx, eax - xor eax, 00200000h - push eax - popf - pushf - pop eax - popf - xor eax, ebx - mov [retval], eax - } - - return retval & 0x00200000; -#endif -} -#endif - -void __cpu_features_init (void) -{ -#ifdef __i386__ - unsigned int eax, ebx, ecx, edx; - - if (!__detect_cpuid ()) - return; - - __cpuid (0, eax, ebx, ecx, edx); - if (eax == 0) - return; - - __cpuid (1, eax, ebx, ecx, edx); - - if (edx & EDX_CX8) - __cpu_features |= _CRT_CMPXCHG8B; - if (edx & EDX_CMOV) - __cpu_features |= _CRT_CMOV; - - if (edx & EDX_MMX) - __cpu_features |= _CRT_MMX; - if (edx & EDX_FXSR) - __cpu_features |= _CRT_FXSR; - if (edx & EDX_SSE) - __cpu_features |= _CRT_SSE; - if (edx & EDX_SSE2) - __cpu_features |= _CRT_SSE2; - - - if (ecx & ECX_SSE3) - __cpu_features |= _CRT_SSE3; - if (ecx & ECX_CX16) - __cpu_features |= _CRT_CMPXCHG16B; - - __cpuid (0x80000000, eax, ebx, ecx, edx); - if (eax < 0x80000001) - return; - __cpuid (0x80000001, eax, ebx, ecx, edx); - if (edx & EDX_3DNOW) - __cpu_features |= _CRT_3DNOW; - if (edx & EDX_3DNOWP) - __cpu_features |= _CRT_3DNOWP; -#endif -} - -#ifdef TEST - -#include <stdio.h> -#define report(feature) \ - if ((feature) & __cpu_features) printf( #feature " found\n") - -int main() -{ - __cpu_features_init(); - - report(_CRT_CMPXCHG8B); - report(_CRT_CMOV); - report(_CRT_MMX); - report(_CRT_FXSR); - report(_CRT_SSE); - report(_CRT_SSE2); - report(_CRT_SSE3); - report(_CRT_CMPXCHG16B); - report(_CRT_3DNOW); - report(_CRT_3DNOWP); - return 0; -} - -#endif Removed: trunk/reactos/lib/3rdparty/mingw/cpu_features.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cpu_fea… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/cpu_features.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/cpu_features.h (removed) @@ -1,23 +1,0 @@ -#ifndef _CPU_FEATURES_H -#define _CPU_FEATURES_H - -#define _CRT_CMPXCHG8B 0x0001 -#define _CRT_CMOV 0x0002 -#define _CRT_MMX 0x0004 -#define _CRT_FXSR 0x0008 -#define _CRT_SSE 0x0010 -#define _CRT_SSE2 0x0020 -#define _CRT_SSE3 0x0040 -#define _CRT_CMPXCHG16B 0x0080 -#define _CRT_3DNOW 0x0100 -#define _CRT_3DNOWP 0x0200 - -extern unsigned int __cpu_features; - -/* Currently we use this in fpenv functions */ -#define __HAS_SSE __cpu_features & _CRT_SSE - -void __cpu_features_init (void); - - -#endif Removed: trunk/reactos/lib/3rdparty/mingw/crt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt1.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt1.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crt1.c (removed) @@ -1,310 +1,0 @@ -/* - * crt1.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Source code for the startup proceedures used by all programs. This code - * is compiled to make crt1.o, which should be located in the library path. - * - */ - -/* Hide the declaration of _fmode with dllimport attribute in stdlib.h to - avoid problems with older GCC. */ -#define __IN_MINGW_RUNTIME -#include <stdlib.h> -#include <stdio.h> -#include <io.h> -#include <process.h> -#include <float.h> -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <signal.h> - -/* NOTE: The code for initializing the _argv, _argc, and environ variables - * has been moved to a separate .c file which is included in both - * crt1.c and dllcrt1.c. This means changes in the code don't have to - * be manually synchronized, but it does lead to this not-generally- - * a-good-idea use of include. */ -#include "init.c" -#include "cpu_features.h" - -extern void _pei386_runtime_relocator (void); - -extern int main (int, char **, char **); - -/* - * Must have the correct app type for MSVCRT. - */ - -#ifdef __MSVCRT__ -#define __UNKNOWN_APP 0 -#define __CONSOLE_APP 1 -#define __GUI_APP 2 -#ifndef _M_PPC -__MINGW_IMPORT -#endif -void __set_app_type(int); -#endif /* __MSVCRT__ */ - -/* Global _fmode for this .exe, not the one in msvcrt.dll, - The default is set in txtmode.o in libmingw32.a */ -/* Override the dllimport'd declarations in stdlib.h */ -#undef _fmode -extern int _fmode; -#ifdef __MSVCRT__ -extern int* __p__fmode(void); /* To access the dll _fmode */ -#endif - -/* - * Setup the default file handles to have the _CRT_fmode mode, as well as - * any new files created by the user. - */ -extern int _CRT_fmode; - -static void -_mingw32_init_fmode (void) -{ - /* Don't set the std file mode if the user hasn't set any value for it. */ - if (_CRT_fmode) - { - _fmode = _CRT_fmode; - - /* - * This overrides the default file mode settings for stdin, - * stdout and stderr. At first I thought you would have to - * test with isatty, but it seems that the DOS console at - * least is smart enough to handle _O_BINARY stdout and - * still display correctly. - */ - if (stdin) - { - _setmode (_fileno (stdin), _CRT_fmode); - } - if (stdout) - { - _setmode (_fileno (stdout), _CRT_fmode); - } - if (stderr) - { - _setmode (_fileno (stderr), _CRT_fmode); - } - } - - /* Now sync the dll _fmode to the one for this .exe. */ -#ifdef __MSVCRT__ - *__p__fmode() = _fmode; -#else - *_imp___fmode_dll = _fmode; -#endif -} - -/* This function will be called when a trap occurs. Thanks to Jacob - Navia for his contribution. */ -static LONG CALLBACK -_gnu_exception_handler (EXCEPTION_POINTERS * exception_data) -{ - void (*old_handler) (int); - LONG action = EXCEPTION_CONTINUE_SEARCH; - int reset_fpu = 0; - - switch (exception_data->ExceptionRecord->ExceptionCode) - { - case EXCEPTION_ACCESS_VIOLATION: - /* test if the user has set SIGSEGV */ - old_handler = signal (SIGSEGV, SIG_DFL); - if (old_handler == SIG_IGN) - { - /* this is undefined if the signal was raised by anything other - than raise (). */ - signal (SIGSEGV, SIG_IGN); - action = EXCEPTION_CONTINUE_EXECUTION; - } - else if (old_handler != SIG_DFL) - { - /* This means 'old' is a user defined function. Call it */ - (*old_handler) (SIGSEGV); - action = EXCEPTION_CONTINUE_EXECUTION; - } - break; - - case EXCEPTION_ILLEGAL_INSTRUCTION: - case EXCEPTION_PRIV_INSTRUCTION: - /* test if the user has set SIGILL */ - old_handler = signal (SIGILL, SIG_DFL); - if (old_handler == SIG_IGN) - { - /* this is undefined if the signal was raised by anything other - than raise (). */ - signal (SIGILL, SIG_IGN); - action = EXCEPTION_CONTINUE_EXECUTION; - } - else if (old_handler != SIG_DFL) - { - /* This means 'old' is a user defined function. Call it */ - (*old_handler) (SIGILL); - action = EXCEPTION_CONTINUE_EXECUTION; - } - break; - - case EXCEPTION_FLT_INVALID_OPERATION: - case EXCEPTION_FLT_DIVIDE_BY_ZERO: - case EXCEPTION_FLT_DENORMAL_OPERAND: - case EXCEPTION_FLT_OVERFLOW: - case EXCEPTION_FLT_UNDERFLOW: - case EXCEPTION_FLT_INEXACT_RESULT: - reset_fpu = 1; - /* fall through. */ - - case EXCEPTION_INT_DIVIDE_BY_ZERO: - /* test if the user has set SIGFPE */ - old_handler = signal (SIGFPE, SIG_DFL); - if (old_handler == SIG_IGN) - { - signal (SIGFPE, SIG_IGN); - if (reset_fpu) - _fpreset (); - action = EXCEPTION_CONTINUE_EXECUTION; - } - else if (old_handler != SIG_DFL) - { - /* This means 'old' is a user defined function. Call it */ - (*old_handler) (SIGFPE); - action = EXCEPTION_CONTINUE_EXECUTION; - } - break; - - default: - break; - } - return action; -} - -/* - * The function mainCRTStartup is the entry point for all console programs. - */ -static void __attribute__((noreturn)) -__mingw_CRTStartup (void) -{ - int nRet; - - /* - * Set up the top-level exception handler so that signal handling - * works as expected. The mapping between ANSI/POSIX signals and - * Win32 SE is not 1-to-1, so caveat emptore. - * - */ - SetUnhandledExceptionFilter (_gnu_exception_handler); - - /* - * Initialize floating point unit. - */ - __cpu_features_init (); /* Do we have SSE, etc.*/ - _fpreset (); /* Supplied by the runtime library. */ - - /* - * Set up __argc, __argv and _environ. - */ - _mingw32_init_mainargs (); - - /* - * Sets the default file mode. - * If _CRT_fmode is set, also set mode for stdin, stdout - * and stderr, as well - * NOTE: DLLs don't do this because that would be rude! - */ - _mingw32_init_fmode (); - - /* Adust references to dllimported data that have non-zero offsets. */ -#if defined(__i386__) - _pei386_runtime_relocator (); -#endif - -#if defined(__GNUC__) -#if defined(__i386__) - /* Align the stack to 16 bytes for the sake of SSE ops in main - or in functions inlined into main. */ - asm __volatile__ ("andl $-16, %%esp" : : : "%esp"); -#elif defined(__mips__) - /* Align the stack to 16 bytes */ - asm __volatile__ ("andi %sp,%sp,-16" : : : "%sp"); -#elif defined(__PowerPC__) - /* Align the stack to 16 bytes */ - asm __volatile__ ("li 0,15\n\tandc 1,1,0" : : : "r1"); -#else -#error Unsupported architecture -#endif -#elif defined(_MSC_VER) -#if defined(_M_IX86) - /* Align the stack to 16 bytes for the sake of SSE ops in main - or in functions inlined into main. */ - __asm and esp, 0FFFFFFF0h -#else -#error TODO -#endif -#else -#error TODO -#endif - - /* - * Call the main function. If the user does not supply one - * the one in the 'libmingw32.a' library will be linked in, and - * that one calls WinMain. See main.c in the 'lib' dir - * for more details. - */ - nRet = main (_argc, _argv, _environ); - - /* - * Perform exit processing for the C library. This means - * flushing output and calling 'atexit' registered functions. - */ - _cexit (); - - ExitProcess (nRet); -} - -/* - * The function mainCRTStartup is the entry point for all console programs. - */ -void -mainCRTStartup (void) -{ -#ifdef __MSVCRT__ - __set_app_type (__CONSOLE_APP); -#endif - __mingw_CRTStartup (); -} - -/* - * For now the GUI startup function is the same as the console one. - * This simply gets rid of the annoying warning about not being able - * to find WinMainCRTStartup when linking GUI applications. - */ -void -WinMainCRTStartup (void) -{ -#ifdef __MSVCRT__ - __set_app_type (__GUI_APP); -#endif - __mingw_CRTStartup (); -} - -#if 0 -/* - * We force use of library version of atexit, which is only - * visible in import lib as _imp__atexit - */ -extern int (*_imp__atexit)(void (*)(void)); -int atexit (void (* pfn )(void) ) -{ - return ( (*_imp__atexit)(pfn)); -} - -/* Likewise for non-ANSI _onexit */ -extern _onexit_t (*_imp___onexit)(_onexit_t); -_onexit_t -_onexit (_onexit_t pfn ) -{ - return (*_imp___onexit)(pfn); -} -#endif Removed: trunk/reactos/lib/3rdparty/mingw/dllcrt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllcrt1… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/dllcrt1.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/dllcrt1.c (removed) @@ -1,185 +1,0 @@ -/* - * dllcrt1.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Initialization code for DLLs. - * - */ -#include <stdlib.h> -#include <stdio.h> -#include <io.h> -#include <process.h> -#include <errno.h> -#include <windows.h> - -/* Unlike normal crt1, I don't initialize the FPU, because the process - * should have done that already. I also don't set the file handle modes, - * because that would be rude. */ - -#ifdef __GNUC__ -extern void __main (); -extern void __do_global_dtors (); -#endif - -typedef void (* p_atexit_fn )(void); -static p_atexit_fn* first_atexit; -static p_atexit_fn* next_atexit; - -static void -__dll_exit (void); - -/* This is based on the function in the Wine project's exit.c */ -p_atexit_fn __dllonexit (p_atexit_fn, p_atexit_fn**, p_atexit_fn**); - - -extern BOOL WINAPI DllMain (HANDLE, DWORD, LPVOID); - -extern void _pei386_runtime_relocator (void); - -BOOL WINAPI -DllMainCRTStartup (HANDLE hDll, DWORD dwReason, LPVOID lpReserved) -{ - BOOL bRet; - - if (dwReason == DLL_PROCESS_ATTACH) - { - -#ifdef DEBUG - printf ("%s: DLL_PROCESS_ATTACH (%d)\n", __FUNCTION__); -#endif - - /* Initialize private atexit table for this dll. - 32 is min size required by ANSI */ - - first_atexit = (p_atexit_fn*) malloc (32 * sizeof (p_atexit_fn)); - if (first_atexit == NULL ) /* can't allocate memory */ - { - errno=ENOMEM; - return FALSE; - } - *first_atexit = NULL; - next_atexit = first_atexit; - - /* Adust references to dllimported data (from other DLL's) - that have non-zero offsets. */ - _pei386_runtime_relocator (); - -#ifdef __GNUC__ - /* From libgcc.a, __main calls global class constructors, - __do_global_ctors, which registers __do_global_dtors - as the first entry of the private atexit table we - have just initialised */ - __main (); - -#endif - } - - /* - * Call the user-supplied DllMain subroutine. - * This has to come after initialization of atexit table and - * registration of global constructors. - * NOTE: DllMain is optional, so libmingw32.a includes a stub - * which will be used if the user does not supply one. - */ - - bRet = DllMain (hDll, dwReason, lpReserved); - /* Handle case where DllMain returns FALSE on attachment attempt. */ - - if ( (dwReason == DLL_PROCESS_ATTACH) && !bRet) - { -#ifdef DEBUG - printf ("%s: DLL_PROCESS_ATTACH failed, cleaning up\n", __FUNCTION__); -#endif - - __dll_exit (); /* Cleanup now. This will set first_atexit to NULL so we - know we've cleaned up */ - } - - if (dwReason == DLL_PROCESS_DETACH) - { -#ifdef DEBUG - printf ("%s: DLL_PROCESS_DETACH (%d)\n", __FUNCTION__); -#endif - /* If not attached, return FALSE. Cleanup already done above - if failed attachment attempt. */ - if (! first_atexit ) - bRet = FALSE; - else - /* - * We used to call __do_global_dtors () here. This is - * no longer necessary since __do_global_dtors is now - * registered at start (last out) of private atexit table. - */ - __dll_exit (); - } - return bRet; -} - -static -void -__dll_exit(void) -/* Run LIFO terminators registered in private atexit table */ -{ - if ( first_atexit ) - { - p_atexit_fn* __last = next_atexit - 1; - while ( __last >= first_atexit ) - { - if ( *__last != NULL ) - { -#ifdef DEBUG - printf ("%s: Calling exit function 0x%x from 0x%x\n", - __FUNCTION__, (unsigned)(*__last),(unsigned)__last); -#endif - (**__last) (); - } - __last--; - } - free ( first_atexit ) ; - first_atexit = NULL ; - } - /* - Make sure output buffers opened by DllMain or - atexit-registered functions are flushed before detaching, - otherwise we can have problems with redirected output. - */ - fflush (NULL); -} - -/* - * The atexit exported from msvcrt.dll causes problems in DLLs. - * Here, we override the exported version of atexit with one that passes the - * private table initialised in DllMainCRTStartup to __dllonexit. - * That means we have to hide the mscvrt.dll atexit because the - * atexit defined here gets __dllonexit from the same lib. - */ - -#if 0 -int -atexit (p_atexit_fn pfn ) -{ -#ifdef DEBUG - printf ("%s: registering exit function 0x%x at 0x%x\n", - __FUNCTION__, (unsigned)pfn, (unsigned)next_atexit); -#endif - return (__dllonexit (pfn, &first_atexit, &next_atexit) - == NULL ? -1 : 0 ); -} - -/* - * Likewise for non-ANSI function _onexit that may be called by - * code in the dll. - */ - -_onexit_t -_onexit (_onexit_t pfn ) -{ -#ifdef DEBUG - printf ("%s: registering exit function 0x%x at 0x%x\n", - __FUNCTION__, (unsigned)pfn, (unsigned)next_atexit); -#endif - return ((_onexit_t) __dllonexit ((p_atexit_fn)pfn, &first_atexit, &next_atexit)); -} -#endif Removed: trunk/reactos/lib/3rdparty/mingw/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/init.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/init.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/init.c (removed) @@ -1,67 +1,0 @@ -/* - * init.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Code to initialize standard file handles and command line arguments. - * This file is #included in both crt1.c and dllcrt1.c. - * - */ - -/* - * Access to a standard 'main'-like argument count and list. Also included - * is a table of environment variables. - */ -int _argc = 0; -char **_argv = 0; - -/* NOTE: Thanks to Pedro A. Aranda Gutiirrez <paag(a)tid.es> for pointing - * this out to me. GetMainArgs (used below) takes a fourth argument - * which is an int that controls the globbing of the command line. If - * _CRT_glob is non-zero the command line will be globbed (e.g. *.* - * expanded to be all files in the startup directory). In the mingw32 - * library a _CRT_glob variable is defined as being -1, enabling - * this command line globbing by default. To turn it off and do all - * command line processing yourself (and possibly escape bogons in - * MS's globbing code) include a line in one of your source modules - * defining _CRT_glob and setting it to zero, like this: - * int _CRT_glob = 0; - */ -extern int _CRT_glob; - -#ifdef __MSVCRT__ -typedef struct { - int newmode; -} _startupinfo; -extern void __getmainargs (int *, char ***, char ***, int, _startupinfo *); -#else -extern void __GetMainArgs (int *, char ***, char ***, int); -#endif - -/* - * Initialize the _argc, _argv and environ variables. - */ -static void -_mingw32_init_mainargs () -{ - /* The environ variable is provided directly in stdlib.h through - * a dll function call. */ - char **dummy_environ; -#ifdef __MSVCRT__ - _startupinfo start_info; - start_info.newmode = 0; -#endif - - /* - * Microsoft's runtime provides a function for doing just that. - */ -#ifdef __MSVCRT__ - (void) __getmainargs (&_argc, &_argv, &dummy_environ, _CRT_glob, - &start_info); -#else - /* CRTDLL version */ - (void) __GetMainArgs (&_argc, &_argv, &dummy_environ, _CRT_glob); -#endif -} - Removed: trunk/reactos/lib/3rdparty/mingw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/main.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/main.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/main.c (removed) @@ -1,79 +1,0 @@ -/* - * main.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Extra startup code for applications which do not have a main function - * of their own (but do have a WinMain). Generally these are GUI - * applications, but they don't *have* to be. - * - */ - -#include <stdlib.h> -#include <process.h> -#include <windows.h> - -#define ISSPACE(a) (a == ' ' || a == '\t') - -extern int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, - LPSTR szCmdLine, int nShow); - -int -main (int argc, const char *argv[]) -{ - char *szCmd; - STARTUPINFO startinfo; - int nRet; - - /* Get the command line passed to the process. */ - szCmd = GetCommandLineA (); - GetStartupInfoA (&startinfo); - - /* Strip off the name of the application and any leading - * whitespace. */ - if (szCmd) - { - while (ISSPACE (*szCmd)) - { - szCmd++; - } - - /* On my system I always get the app name enclosed - * in quotes... */ - if (*szCmd == '\"') - { - do - { - szCmd++; - } - while (*szCmd != '\"' && *szCmd != '\0'); - - if (*szCmd == '\"') - { - szCmd++; - } - } - else - { - /* If no quotes then assume first token is program - * name. */ - while (!ISSPACE (*szCmd) && *szCmd != '\0') - { - szCmd++; - } - } - - while (ISSPACE (*szCmd)) - { - szCmd++; - } - } - - nRet = WinMain (GetModuleHandle (NULL), NULL, szCmd, - (startinfo.dwFlags & STARTF_USESHOWWINDOW) ? - startinfo.wShowWindow : SW_SHOWDEFAULT); - - return nRet; -} - Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Mon Dec 15 08:02:28 2008 @@ -7,7 +7,6 @@ <library>kernel32</library> <file>_newmode.c</file> <file>_wgetopt.c</file> - <file>argv.c</file> <file>atonexit.c</file> <file>binmode.c</file> <file>charmax.c</file> @@ -30,13 +29,13 @@ <file>xthdloc.c</file> <file>xtxtmode.c</file> </module> -<module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true" crt="dll"> +<module name="mingw_main" type="staticlibrary" isstartuplib="true" crt="dll"> <include base="mingw_common">include</include> <file>crt0_c.c</file> <file>crtexe.c</file> <file>dllargv.c</file> </module> -<module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true" unicode="yes" crt="dll"> +<module name="mingw_wmain" type="staticlibrary" isstartuplib="true" unicode="yes" crt="dll"> <include base="mingw_common">include</include> <define name="WPRFLAG"/> <file>crt0_w.c</file> Removed: trunk/reactos/lib/3rdparty/mingw/wbinmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wbinmod… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/wbinmode.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/wbinmode.c (removed) @@ -1,5 +1,0 @@ -#include <fcntl.h> - -/* Set default file mode to binary */ - -int _fmode = _O_BINARY; Removed: trunk/reactos/lib/3rdparty/mingw/winit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/winit.c… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/winit.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/winit.c (removed) @@ -1,66 +1,0 @@ -/* - * init.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Code to initialize standard file handles and command line arguments. - * This file is #included in both crt1.c and dllcrt1.c. - * - */ - -/* - * Access to a standard 'main'-like argument count and list. Also included - * is a table of environment variables. - */ -int _argc = 0; -wchar_t **_wargv = 0; - -/* NOTE: Thanks to Pedro A. Aranda Gutiirrez <paag(a)tid.es> for pointing - * this out to me. GetMainArgs (used below) takes a fourth argument - * which is an int that controls the globbing of the command line. If - * _CRT_glob is non-zero the command line will be globbed (e.g. *.* - * expanded to be all files in the startup directory). In the mingw32 - * library a _CRT_glob variable is defined as being -1, enabling - * this command line globbing by default. To turn it off and do all - * command line processing yourself (and possibly escape bogons in - * MS's globbing code) include a line in one of your source modules - * defining _CRT_glob and setting it to zero, like this: - * int _CRT_glob = 0; - */ -extern int _CRT_glob; - -#ifdef __MSVCRT__ -typedef struct { - int newmode; -} _startupinfo; -extern void __wgetmainargs (int *, wchar_t ***, wchar_t ***, int, _startupinfo *); -#else -#error Cannot build unicode version against crtdll -#endif - -/* - * Initialize the _argc, _argv and environ variables. - */ -static void -_mingw32_init_wmainargs () -{ - /* The environ variable is provided directly in stdlib.h through - * a dll function call. */ - wchar_t **dummy_environ; -#ifdef __MSVCRT__ - _startupinfo start_info; - start_info.newmode = 0; -#endif - - /* - * Microsoft's runtime provides a function for doing just that. - */ -#ifdef __MSVCRT__ - (void) __wgetmainargs (&_argc, &_wargv, &dummy_environ, _CRT_glob, - &start_info); -#else -#error Cannot build unicode version against crtdll -#endif -} - Removed: trunk/reactos/lib/3rdparty/mingw/wmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wmain.c… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/wmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/wmain.c (removed) @@ -1,86 +1,0 @@ -/* - * main.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Extra startup code for applications which do not have a main function - * of their own (but do have a WinMain). Generally these are GUI - * applications, but they don't *have* to be. - * - */ - -#include <stdlib.h> -#include <process.h> -#include <windows.h> - -#define ISSPACE(a) (a == ' ' || a == '\t') - -extern void __main(); -extern int PASCAL wWinMain (HINSTANCE hInst, HINSTANCE hPrevInst, - LPWSTR szCmdLine, int nShow); - -int -wmain (int argc, const wchar_t *argv[], const wchar_t *environ[]) -{ - wchar_t *szCmd; - STARTUPINFOW startinfo; - int nRet; - -#ifdef __GNUC__ - /* C++ initialization. (gcc inserts this call automatically for - * a function called "main", but not for "wmain") */ - __main(); -#endif - - /* Get the command line passed to the process. */ - szCmd = GetCommandLineW (); - GetStartupInfoW (&startinfo); - - /* Strip off the name of the application and any leading - * whitespace. */ - if (szCmd) - { - while (ISSPACE (*szCmd)) - { - szCmd++; - } - - /* On my system I always get the app name enclosed - * in quotes... */ - if (*szCmd == '\"') - { - do - { - szCmd++; - } - while (*szCmd != '\"' && *szCmd != '\0'); - - if (*szCmd == '\"') - { - szCmd++; - } - } - else - { - /* If no quotes then assume first token is program - * name. */ - while (!ISSPACE (*szCmd) && *szCmd != '\0') - { - szCmd++; - } - } - - while (ISSPACE (*szCmd)) - { - szCmd++; - } - } - - nRet = wWinMain (GetModuleHandle (NULL), NULL, szCmd, - (startinfo.dwFlags & STARTF_USESHOWWINDOW) ? - startinfo.wShowWindow : SW_SHOWDEFAULT); - - return nRet; -} -

15 years, 9 months

[dchapyshev] 38107: - Formatting fix

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Mon Dec 15 07:54:34 2008 New Revision: 38107 URL: http://svn.reactos.org/svn/reactos?rev=38107&view=rev Log: - Formatting fix Modified: trunk/reactos/include/psdk/accctrl.h Modified: trunk/reactos/include/psdk/accctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/accctrl.h?rev… ============================================================================== --- trunk/reactos/include/psdk/accctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/accctrl.h [iso-8859-1] Mon Dec 15 07:54:34 2008 @@ -6,6 +6,7 @@ #endif #define AccFree LocalFree + #define ACTRL_RESERVED 0x00000000 #define ACTRL_ACCESS_PROTECTED 0x00000001 #define ACTRL_ACCESS_ALLOWED 0x00000001 @@ -29,11 +30,13 @@ #define ACTRL_FILE_READ_ATTRIB 0x00000080 #define ACTRL_FILE_WRITE_ATTRIB 0x00000100 #define ACTRL_FILE_CREATE_PIPE 0x00000200 + #define ACTRL_DIR_LIST 0x00000001 #define ACTRL_DIR_CREATE_OBJECT 0x00000002 #define ACTRL_DIR_CREATE_CHILD 0x00000004 #define ACTRL_DIR_DELETE_CHILD 0x00000040 #define ACTRL_DIR_TRAVERSE 0x00000020 + #define ACTRL_KERNEL_TERMINATE 0x00000001 #define ACTRL_KERNEL_THREAD 0x00000002 #define ACTRL_KERNEL_VM 0x00000004 @@ -50,11 +53,13 @@ #define ACTRL_KERNEL_TOKEN 0x00002000 #define ACTRL_KERNEL_IMPERSONATE 0x00004000 #define ACTRL_KERNEL_DIMPERSONATE 0x00008000 + #define ACTRL_PRINT_SADMIN 0x00000001 #define ACTRL_PRINT_SLIST 0x00000002 #define ACTRL_PRINT_PADMIN 0x00000004 #define ACTRL_PRINT_PUSE 0x00000008 #define ACTRL_PRINT_JADMIN 0x00000010 + #define ACTRL_SVC_GET_INFO 0x00000001 #define ACTRL_SVC_SET_INFO 0x00000002 #define ACTRL_SVC_STATUS 0x00000004 @@ -64,12 +69,14 @@ #define ACTRL_SVC_PAUSE 0x00000040 #define ACTRL_SVC_INTERROGATE 0x00000080 #define ACTRL_SVC_UCONTROL 0x00000100 + #define ACTRL_REG_QUERY 0x00000001 #define ACTRL_REG_SET 0x00000002 #define ACTRL_REG_CREATE_CHILD 0x00000004 #define ACTRL_REG_LIST 0x00000008 #define ACTRL_REG_NOTIFY 0x00000010 #define ACTRL_REG_LINK 0x00000020 + #define ACTRL_WIN_CLIPBRD 0x00000001 #define ACTRL_WIN_GLOBAL_ATOMS 0x00000002 #define ACTRL_WIN_CREATE 0x00000004 @@ -79,238 +86,300 @@ #define ACTRL_WIN_WRITE_ATTRIBS 0x00000040 #define ACTRL_WIN_SCREEN 0x00000080 #define ACTRL_WIN_EXIT 0x00000100 + #define ACTRL_ACCESS_NO_OPTIONS 0x00000000 #define ACTRL_ACCESS_SUPPORTS_OBJECT_ENTRIES 0x00000001 + #define ACCCTRL_DEFAULT_PROVIDERA "Windows NT Access Provider" -#define ACCCTRL_DEFAULT_PROVIDERW L"Windows NT Access Provider" +#define ACCCTRL_DEFAULT_PROVIDERW L"Windows NT Access Provider" + #define TRUSTEE_ACCESS_ALLOWED 0x00000001L #define TRUSTEE_ACCESS_READ 0x00000002L #define TRUSTEE_ACCESS_WRITE 0x00000004L #define TRUSTEE_ACCESS_EXPLICIT 0x00000001L -#define TRUSTEE_ACCESS_READ_WRITE (TRUSTEE_ACCESS_READ | TRUSTEE_ACCESS_WRITE) +#define TRUSTEE_ACCESS_READ_WRITE (TRUSTEE_ACCESS_READ | TRUSTEE_ACCESS_WRITE) #define TRUSTEE_ACCESS_ALL 0xFFFFFFFFL -#define NO_INHERITANCE 0x0 -#define SUB_OBJECTS_ONLY_INHERIT 0x1 -#define SUB_CONTAINERS_ONLY_INHERIT 0x2 + +#define NO_INHERITANCE 0x0 +#define SUB_OBJECTS_ONLY_INHERIT 0x1 +#define SUB_CONTAINERS_ONLY_INHERIT 0x2 #define SUB_CONTAINERS_AND_OBJECTS_INHERIT 0x3 -#define INHERIT_NO_PROPAGATE 0x4 -#define INHERIT_ONLY 0x8 -#define INHERITED_ACCESS_ENTRY 0x10 -#define INHERITED_PARENT 0x10000000 -#define INHERITED_GRANDPARENT 0x20000000 - -#define SI_EDIT_PERMS 0x00000000 -#define SI_EDIT_OWNER 0x00000001 -#define SI_EDIT_AUDITS 0x00000002 -#define SI_CONTAINER 0x00000004 -#define SI_READONLY 0x00000008 -#define SI_ADVANCED 0x00000010 -#define SI_RESET 0x00000020 -#define SI_OWNER_READONLY 0x00000040 -#define SI_EDIT_PROPERTIES 0x00000080 -#define SI_OWNER_RECURSE 0x00000100 -#define SI_NO_ACL_PROTECT 0x00000200 -#define SI_NO_TREE_APPLY 0x00000400 -#define SI_PAGE_TITLE 0x00000800 -#define SI_SERVER_IS_DC 0x00001000 -#define SI_RESET_DACL_TREE 0x00004000 -#define SI_RESET_SACL_TREE 0x00008000 -#define SI_OBJECT_GUID 0x00010000 -#define SI_EDIT_EFFECTIVE 0x00020000 -#define SI_RESET_DACL 0x00040000 -#define SI_RESET_SACL 0x00080000 -#define SI_RESET_OWNER 0x00100000 -#define SI_NO_ADDITIONAL_PERMISSION 0x00200000 -#define SI_MAY_WRITE 0x10000000 -#define SI_EDIT_ALL (SI_EDIT_OWNER |SI_EDIT_PERMS | SI_EDIT_AUDITS) - -#define SI_ACCESS_SPECIFIC 0x00010000 -#define SI_ACCESS_GENERAL 0x00020000 -#define SI_ACCESS_CONTAINER 0x00040000 -#define SI_ACCESS_PROPERTY 0x00080000 +#define INHERIT_NO_PROPAGATE 0x4 +#define INHERIT_ONLY 0x8 +#define INHERITED_ACCESS_ENTRY 0x10 +#define INHERITED_PARENT 0x10000000 +#define INHERITED_GRANDPARENT 0x20000000 + +#define SI_EDIT_PERMS 0x00000000 +#define SI_EDIT_OWNER 0x00000001 +#define SI_EDIT_AUDITS 0x00000002 +#define SI_CONTAINER 0x00000004 +#define SI_READONLY 0x00000008 +#define SI_ADVANCED 0x00000010 +#define SI_RESET 0x00000020 +#define SI_OWNER_READONLY 0x00000040 +#define SI_EDIT_PROPERTIES 0x00000080 +#define SI_OWNER_RECURSE 0x00000100 +#define SI_NO_ACL_PROTECT 0x00000200 +#define SI_NO_TREE_APPLY 0x00000400 +#define SI_PAGE_TITLE 0x00000800 +#define SI_SERVER_IS_DC 0x00001000 +#define SI_RESET_DACL_TREE 0x00004000 +#define SI_RESET_SACL_TREE 0x00008000 +#define SI_OBJECT_GUID 0x00010000 +#define SI_EDIT_EFFECTIVE 0x00020000 +#define SI_RESET_DACL 0x00040000 +#define SI_RESET_SACL 0x00080000 +#define SI_RESET_OWNER 0x00100000 +#define SI_NO_ADDITIONAL_PERMISSION 0x00200000 +#define SI_MAY_WRITE 0x10000000 +#define SI_EDIT_ALL (SI_EDIT_OWNER |SI_EDIT_PERMS | SI_EDIT_AUDITS) + +#define SI_ACCESS_SPECIFIC 0x00010000 +#define SI_ACCESS_GENERAL 0x00020000 +#define SI_ACCESS_CONTAINER 0x00040000 +#define SI_ACCESS_PROPERTY 0x00080000 typedef ULONG INHERIT_FLAGS, *PINHERIT_FLAGS; typedef ULONG ACCESS_RIGHTS, *PACCESS_RIGHTS; -typedef enum _ACCESS_MODE { - NOT_USED_ACCESS = 0, - GRANT_ACCESS, - SET_ACCESS, - DENY_ACCESS, - REVOKE_ACCESS, - SET_AUDIT_SUCCESS, - SET_AUDIT_FAILURE +typedef enum _ACCESS_MODE +{ + NOT_USED_ACCESS = 0, + GRANT_ACCESS, + SET_ACCESS, + DENY_ACCESS, + REVOKE_ACCESS, + SET_AUDIT_SUCCESS, + SET_AUDIT_FAILURE } ACCESS_MODE; -typedef enum _SE_OBJECT_TYPE { - SE_UNKNOWN_OBJECT_TYPE = 0, - SE_FILE_OBJECT, - SE_SERVICE, - SE_PRINTER, - SE_REGISTRY_KEY, - SE_LMSHARE, - SE_KERNEL_OBJECT, - SE_WINDOW_OBJECT, - SE_DS_OBJECT, - SE_DS_OBJECT_ALL, - SE_PROVIDER_DEFINED_OBJECT, - SE_WMIGUID_OBJECT, - SE_REGISTRY_WOW64_32KEY + +typedef enum _SE_OBJECT_TYPE +{ + SE_UNKNOWN_OBJECT_TYPE = 0, + SE_FILE_OBJECT, + SE_SERVICE, + SE_PRINTER, + SE_REGISTRY_KEY, + SE_LMSHARE, + SE_KERNEL_OBJECT, + SE_WINDOW_OBJECT, + SE_DS_OBJECT, + SE_DS_OBJECT_ALL, + SE_PROVIDER_DEFINED_OBJECT, + SE_WMIGUID_OBJECT, + SE_REGISTRY_WOW64_32KEY } SE_OBJECT_TYPE; -typedef enum _TRUSTEE_TYPE { - TRUSTEE_IS_UNKNOWN, - TRUSTEE_IS_USER, - TRUSTEE_IS_GROUP, - TRUSTEE_IS_DOMAIN, - TRUSTEE_IS_ALIAS, - TRUSTEE_IS_WELL_KNOWN_GROUP, - TRUSTEE_IS_DELETED, - TRUSTEE_IS_INVALID, - TRUSTEE_IS_COMPUTER + +typedef enum _TRUSTEE_TYPE +{ + TRUSTEE_IS_UNKNOWN, + TRUSTEE_IS_USER, + TRUSTEE_IS_GROUP, + TRUSTEE_IS_DOMAIN, + TRUSTEE_IS_ALIAS, + TRUSTEE_IS_WELL_KNOWN_GROUP, + TRUSTEE_IS_DELETED, + TRUSTEE_IS_INVALID, + TRUSTEE_IS_COMPUTER } TRUSTEE_TYPE; -typedef enum _TRUSTEE_FORM { - TRUSTEE_IS_SID, - TRUSTEE_IS_NAME, - TRUSTEE_BAD_FORM, - TRUSTEE_IS_OBJECTS_AND_SID, - TRUSTEE_IS_OBJECTS_AND_NAME + +typedef enum _TRUSTEE_FORM +{ + TRUSTEE_IS_SID, + TRUSTEE_IS_NAME, + TRUSTEE_BAD_FORM, + TRUSTEE_IS_OBJECTS_AND_SID, + TRUSTEE_IS_OBJECTS_AND_NAME } TRUSTEE_FORM; -typedef enum _MULTIPLE_TRUSTEE_OPERATION { - NO_MULTIPLE_TRUSTEE, - TRUSTEE_IS_IMPERSONATE + +typedef enum _MULTIPLE_TRUSTEE_OPERATION +{ + NO_MULTIPLE_TRUSTEE, + TRUSTEE_IS_IMPERSONATE } MULTIPLE_TRUSTEE_OPERATION; -typedef struct _TRUSTEE_A { - struct _TRUSTEE_A *pMultipleTrustee; - MULTIPLE_TRUSTEE_OPERATION MultipleTrusteeOperation; - TRUSTEE_FORM TrusteeForm; - TRUSTEE_TYPE TrusteeType; - LPSTR ptstrName; + +typedef struct _TRUSTEE_A +{ + struct _TRUSTEE_A *pMultipleTrustee; + MULTIPLE_TRUSTEE_OPERATION MultipleTrusteeOperation; + TRUSTEE_FORM TrusteeForm; + TRUSTEE_TYPE TrusteeType; + LPSTR ptstrName; } TRUSTEE_A, *PTRUSTEE_A, TRUSTEEA, *PTRUSTEEA; -typedef struct _TRUSTEE_W { - struct _TRUSTEE_W *pMultipleTrustee; - MULTIPLE_TRUSTEE_OPERATION MultipleTrusteeOperation; - TRUSTEE_FORM TrusteeForm; - TRUSTEE_TYPE TrusteeType; - LPWSTR ptstrName; + +typedef struct _TRUSTEE_W +{ + struct _TRUSTEE_W *pMultipleTrustee; + MULTIPLE_TRUSTEE_OPERATION MultipleTrusteeOperation; + TRUSTEE_FORM TrusteeForm; + TRUSTEE_TYPE TrusteeType; + LPWSTR ptstrName; } TRUSTEE_W, *PTRUSTEE_W, TRUSTEEW, *PTRUSTEEW; -typedef struct _ACTRL_ACCESS_ENTRYA { - TRUSTEE_A Trustee; - ULONG fAccessFlags; - ACCESS_RIGHTS Access; - ACCESS_RIGHTS ProvSpecificAccess; - INHERIT_FLAGS Inheritance; - LPCSTR lpInheritProperty; + +typedef struct _ACTRL_ACCESS_ENTRYA +{ + TRUSTEE_A Trustee; + ULONG fAccessFlags; + ACCESS_RIGHTS Access; + ACCESS_RIGHTS ProvSpecificAccess; + INHERIT_FLAGS Inheritance; + LPCSTR lpInheritProperty; } ACTRL_ACCESS_ENTRYA, *PACTRL_ACCESS_ENTRYA; -typedef struct _ACTRL_ACCESS_ENTRYW { - TRUSTEE_W Trustee; - ULONG fAccessFlags; - ACCESS_RIGHTS Access; - ACCESS_RIGHTS ProvSpecificAccess; - INHERIT_FLAGS Inheritance; - LPCWSTR lpInheritProperty; + +typedef struct _ACTRL_ACCESS_ENTRYW +{ + TRUSTEE_W Trustee; + ULONG fAccessFlags; + ACCESS_RIGHTS Access; + ACCESS_RIGHTS ProvSpecificAccess; + INHERIT_FLAGS Inheritance; + LPCWSTR lpInheritProperty; } ACTRL_ACCESS_ENTRYW, *PACTRL_ACCESS_ENTRYW; -typedef struct _ACTRL_ACCESS_ENTRY_LISTA { - ULONG cEntries; - ACTRL_ACCESS_ENTRYA *pAccessList; + +typedef struct _ACTRL_ACCESS_ENTRY_LISTA +{ + ULONG cEntries; + ACTRL_ACCESS_ENTRYA *pAccessList; } ACTRL_ACCESS_ENTRY_LISTA, *PACTRL_ACCESS_ENTRY_LISTA; -typedef struct _ACTRL_ACCESS_ENTRY_LISTW { - ULONG cEntries; - ACTRL_ACCESS_ENTRYW *pAccessList; + +typedef struct _ACTRL_ACCESS_ENTRY_LISTW +{ + ULONG cEntries; + ACTRL_ACCESS_ENTRYW *pAccessList; } ACTRL_ACCESS_ENTRY_LISTW, *PACTRL_ACCESS_ENTRY_LISTW; -typedef struct _ACTRL_PROPERTY_ENTRYA { - LPCSTR lpProperty; - PACTRL_ACCESS_ENTRY_LISTA pAccessEntryList; - ULONG fListFlags; + +typedef struct _ACTRL_PROPERTY_ENTRYA +{ + LPCSTR lpProperty; + PACTRL_ACCESS_ENTRY_LISTA pAccessEntryList; + ULONG fListFlags; } ACTRL_PROPERTY_ENTRYA, *PACTRL_PROPERTY_ENTRYA; -typedef struct _ACTRL_PROPERTY_ENTRYW { - LPCWSTR lpProperty; - PACTRL_ACCESS_ENTRY_LISTW pAccessEntryList; - ULONG fListFlags; + +typedef struct _ACTRL_PROPERTY_ENTRYW +{ + LPCWSTR lpProperty; + PACTRL_ACCESS_ENTRY_LISTW pAccessEntryList; + ULONG fListFlags; } ACTRL_PROPERTY_ENTRYW, *PACTRL_PROPERTY_ENTRYW; -typedef struct _ACTRL_ALISTA { - ULONG cEntries; - PACTRL_PROPERTY_ENTRYA pPropertyAccessList; + +typedef struct _ACTRL_ALISTA +{ + ULONG cEntries; + PACTRL_PROPERTY_ENTRYA pPropertyAccessList; } ACTRL_ACCESSA, *PACTRL_ACCESSA, ACTRL_AUDITA, *PACTRL_AUDITA; -typedef struct _ACTRL_ALISTW { - ULONG cEntries; - PACTRL_PROPERTY_ENTRYW pPropertyAccessList; + +typedef struct _ACTRL_ALISTW +{ + ULONG cEntries; + PACTRL_PROPERTY_ENTRYW pPropertyAccessList; } ACTRL_ACCESSW, *PACTRL_ACCESSW, ACTRL_AUDITW, *PACTRL_AUDITW; -typedef struct _TRUSTEE_ACCESSA { - LPSTR lpProperty; - ACCESS_RIGHTS Access; - ULONG fAccessFlags; - ULONG fReturnedAccess; + +typedef struct _TRUSTEE_ACCESSA +{ + LPSTR lpProperty; + ACCESS_RIGHTS Access; + ULONG fAccessFlags; + ULONG fReturnedAccess; } TRUSTEE_ACCESSA, *PTRUSTEE_ACCESSA; -typedef struct _TRUSTEE_ACCESSW { - LPWSTR lpProperty; - ACCESS_RIGHTS Access; - ULONG fAccessFlags; - ULONG fReturnedAccess; + +typedef struct _TRUSTEE_ACCESSW +{ + LPWSTR lpProperty; + ACCESS_RIGHTS Access; + ULONG fAccessFlags; + ULONG fReturnedAccess; } TRUSTEE_ACCESSW, *PTRUSTEE_ACCESSW; -typedef struct _ACTRL_OVERLAPPED { - _ANONYMOUS_UNION - union { - PVOID Provider; - ULONG Reserved1; - } DUMMYUNIONNAME; - ULONG Reserved2; - HANDLE hEvent; + +typedef struct _ACTRL_OVERLAPPED +{ + _ANONYMOUS_UNION + union + { + PVOID Provider; + ULONG Reserved1; + } DUMMYUNIONNAME; + ULONG Reserved2; + HANDLE hEvent; } ACTRL_OVERLAPPED, *PACTRL_OVERLAPPED; -typedef struct _ACTRL_ACCESS_INFOA { - ULONG fAccessPermission; - LPSTR lpAccessPermissionName; + +typedef struct _ACTRL_ACCESS_INFOA +{ + ULONG fAccessPermission; + LPSTR lpAccessPermissionName; } ACTRL_ACCESS_INFOA, *PACTRL_ACCESS_INFOA; -typedef struct _ACTRL_ACCESS_INFOW { - ULONG fAccessPermission; - LPWSTR lpAccessPermissionName; + +typedef struct _ACTRL_ACCESS_INFOW +{ + ULONG fAccessPermission; + LPWSTR lpAccessPermissionName; } ACTRL_ACCESS_INFOW, *PACTRL_ACCESS_INFOW; -typedef struct _ACTRL_CONTROL_INFOA { - LPSTR lpControlId; - LPSTR lpControlName; + +typedef struct _ACTRL_CONTROL_INFOA +{ + LPSTR lpControlId; + LPSTR lpControlName; } ACTRL_CONTROL_INFOA, *PACTRL_CONTROL_INFOA; -typedef struct _ACTRL_CONTROL_INFOW { - LPWSTR lpControlId; - LPWSTR lpControlName; + +typedef struct _ACTRL_CONTROL_INFOW +{ + LPWSTR lpControlId; + LPWSTR lpControlName; } ACTRL_CONTROL_INFOW, *PACTRL_CONTROL_INFOW; -typedef struct _EXPLICIT_ACCESS_A { - DWORD grfAccessPermissions; - ACCESS_MODE grfAccessMode; - DWORD grfInheritance; - TRUSTEE_A Trustee; + +typedef struct _EXPLICIT_ACCESS_A +{ + DWORD grfAccessPermissions; + ACCESS_MODE grfAccessMode; + DWORD grfInheritance; + TRUSTEE_A Trustee; } EXPLICIT_ACCESS_A, *PEXPLICIT_ACCESS_A, EXPLICIT_ACCESSA, *PEXPLICIT_ACCESSA; -typedef struct _EXPLICIT_ACCESS_W { - DWORD grfAccessPermissions; - ACCESS_MODE grfAccessMode; - DWORD grfInheritance; - TRUSTEE_W Trustee; + +typedef struct _EXPLICIT_ACCESS_W +{ + DWORD grfAccessPermissions; + ACCESS_MODE grfAccessMode; + DWORD grfInheritance; + TRUSTEE_W Trustee; } EXPLICIT_ACCESS_W, *PEXPLICIT_ACCESS_W, EXPLICIT_ACCESSW, *PEXPLICIT_ACCESSW; -typedef struct _OBJECTS_AND_SID { - DWORD ObjectsPresent; - GUID ObjectTypeGuid; - GUID InheritedObjectTypeGuid; - SID * pSid; + +typedef struct _OBJECTS_AND_SID +{ + DWORD ObjectsPresent; + GUID ObjectTypeGuid; + GUID InheritedObjectTypeGuid; + SID *pSid; } OBJECTS_AND_SID, *POBJECTS_AND_SID; -typedef struct _OBJECTS_AND_NAME_A { - DWORD ObjectsPresent; - SE_OBJECT_TYPE ObjectType; - LPSTR ObjectTypeName; - LPSTR InheritedObjectTypeName; - LPSTR ptstrName; + +typedef struct _OBJECTS_AND_NAME_A +{ + DWORD ObjectsPresent; + SE_OBJECT_TYPE ObjectType; + LPSTR ObjectTypeName; + LPSTR InheritedObjectTypeName; + LPSTR ptstrName; } OBJECTS_AND_NAME_A, *POBJECTS_AND_NAME_A; -typedef struct _OBJECTS_AND_NAME_W { - DWORD ObjectsPresent; - SE_OBJECT_TYPE ObjectType; - LPWSTR ObjectTypeName; - LPWSTR InheritedObjectTypeName; - LPWSTR ptstrName; + +typedef struct _OBJECTS_AND_NAME_W +{ + DWORD ObjectsPresent; + SE_OBJECT_TYPE ObjectType; + LPWSTR ObjectTypeName; + LPWSTR InheritedObjectTypeName; + LPWSTR ptstrName; } OBJECTS_AND_NAME_W, *POBJECTS_AND_NAME_W; + #if (_WIN32_WINNT >= 0x0501) -typedef struct { - LONG GenerationGap; - LPSTR AncestorName; +typedef struct +{ + LONG GenerationGap; + LPSTR AncestorName; } INHERITED_FROMA, *PINHERITED_FROMA; -typedef struct { - LONG GenerationGap; - LPWSTR AncestorName; + +typedef struct +{ + LONG GenerationGap; + LPWSTR AncestorName; } INHERITED_FROMW, *PINHERITED_FROMW; #endif /* (_WIN32_WINNT >= 0x0501) */ @@ -323,6 +392,7 @@ LPWSTR pszPageTitle; GUID guidObjectType; } SI_OBJECT_INFO, *PSI_OBJECT_INFO; + typedef struct _SI_ACCESS { const GUID *pguid; @@ -330,15 +400,17 @@ LPCWSTR pszName; DWORD dwFlags; } SI_ACCESS, *PSI_ACCESS; + typedef struct _SI_INHERIT_TYPE { const GUID *pguid; ULONG dwFlags; LPCWSTR pszName; } SI_INHERIT_TYPE, *PSI_INHERIT_TYPE; + typedef enum _SI_PAGE_TYPE { - SI_PAGE_PERM = 0, + SI_PAGE_PERM = 0, SI_PAGE_ADVPERM, SI_PAGE_AUDIT, SI_PAGE_OWNER @@ -359,15 +431,15 @@ } PROG_INVOKE_SETTING, *PPROG_INVOKE_SETTING; typedef VOID (WINAPI *FN_PROGRESSW)(LPWSTR pObjectName, - DWORD Status, - PPROG_INVOKE_SETTING pInvokeSetting, - PVOID Args, - BOOL SecuritySet); + DWORD Status, + PPROG_INVOKE_SETTING pInvokeSetting, + PVOID Args, + BOOL SecuritySet); typedef VOID (WINAPI *FN_PROGRESSA)(LPSTR pObjectName, - DWORD Status, - PPROG_INVOKE_SETTING pInvokeSetting, - PVOID Args, - BOOL SecuritySet); + DWORD Status, + PPROG_INVOKE_SETTING pInvokeSetting, + PVOID Args, + BOOL SecuritySet); #ifdef UNICODE #define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERW @@ -383,6 +455,7 @@ typedef EXPLICIT_ACCESSW EXPLICIT_ACCESS, *PEXPLICIT_ACCESS; typedef TRUSTEE_ACCESSW TRUSTEE_ACCESS, *PTRUSTEE_ACCESS; typedef OBJECTS_AND_NAME_W OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_; + #if (_WIN32_WINNT >= 0x0501) typedef INHERITED_FROMW INHERITED_FROM, *PINHERITED_FROM; typedef FN_PROGRESSW FN_PROGRESS; @@ -402,14 +475,17 @@ typedef EXPLICIT_ACCESSA EXPLICIT_ACCESS, *PEXPLICIT_ACCESS; typedef TRUSTEE_ACCESSA TRUSTEE_ACCESS, *PTRUSTEE_ACCESS; typedef OBJECTS_AND_NAME_A OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_; + #if (_WIN32_WINNT >= 0x0501) typedef INHERITED_FROMA INHERITED_FROM, *PINHERITED_FROM; typedef FN_PROGRESSA FN_PROGRESS; #define HAS_FN_PROGRESSA -#endif +#endif /* (_WIN32_WINNT >= 0x0501) */ + #endif /* UNICODE */ #ifdef __cplusplus } #endif -#endif + +#endif /* _ACCCTRL_H */

15 years, 9 months

[tkreuzer] 38106: For some reason SVN didn't sync the line ending changes, although it's a binary file.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 15 07:19:02 2008 New Revision: 38106 URL: http://svn.reactos.org/svn/reactos?rev=38106&view=rev Log: For some reason SVN didn't sync the line ending changes, although it's a binary file. Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/bzip2/sample3.ref Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/bzip2/sample3.ref URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== Binary files - no diff available.

15 years, 9 months

[tkreuzer] 38105: Use KeGetCurrentPrcb() instead of KeGetPcr()->Prcb / KeGetPcr()->CurrentPrcb

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 15 06:56:15 2008 New Revision: 38105 URL: http://svn.reactos.org/svn/reactos?rev=38105&view=rev Log: Use KeGetCurrentPrcb() instead of KeGetPcr()->Prcb / KeGetPcr()->CurrentPrcb Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Dec 15 06:56:15 2008 @@ -905,11 +905,7 @@ } CurrentTime.QuadPart = KeQueryInterruptTime(); -#ifndef _M_AMD64 - Prcb = KeGetPcr()->Prcb; -#else - Prcb = KeGetPcr()->CurrentPrcb; -#endif + Prcb = KeGetCurrentPrcb(); for (i = 0; i < KeNumberProcessors; i++) { @@ -1967,4 +1963,4 @@ return KeGetCurrentProcessorNumber(); } -/* EOF */ +/* EOF */

15 years, 9 months

← Newer
1
...
36
37
38
39
40
41
42
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008