Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37528: - Silence "'struct Foo' has virtual functions but non-virtual destructor" warnings for kernel32, as we don't allow warnings for this module. Needed for the coming header fixes, as system_header hides this warning.
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 15:19:13 2008 New Revision: 37528 URL: http://svn.reactos.org/svn/reactos?rev=37528&view=rev Log: - Silence "'struct Foo' has virtual functions but non-virtual destructor" warnings for kernel32, as we don't allow warnings for this module. Needed for the coming header fixes, as system_header hides this warning. Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Fri Nov 21 15:19:13 2008 @@ -123,6 +123,7 @@ <compilerflag compiler="cpp">-fno-exceptions</compilerflag> <compilerflag compiler="cpp">-fno-rtti</compilerflag> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <directory name="misc"> <file>icustubs.cpp</file>

1 0

[sginsberg] 37527: - Protect NTSTATUS definition in NDK with a guard, as is done in the user mode headers which also define this type - Remove system_header from these user mode headers
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 15:12:53 2008 New Revision: 37527 URL: http://svn.reactos.org/svn/reactos?rev=37527&view=rev Log: - Protect NTSTATUS definition in NDK with a guard, as is done in the user mode headers which also define this type - Remove system_header from these user mode headers Modified: trunk/reactos/include/ndk/umtypes.h trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/psdk/ntsecpkg.h trunk/reactos/include/psdk/subauth.h Modified: trunk/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/umtypes.h [iso-8859-1] Fri Nov 21 15:12:53 2008 @@ -122,12 +122,13 @@ typedef CSHORT *PCSHORT; typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; typedef LONG KPRIORITY; -typedef LONG NTSTATUS, *PNTSTATUS; // // Basic NT Types // #if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) && !defined(_NTSECAPI_) + +typedef LONG NTSTATUS, *PNTSTATUS; typedef struct _UNICODE_STRING { Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Fri Nov 21 15:12:53 2008 @@ -1,8 +1,5 @@ #ifndef _NTSECAPI_H #define _NTSECAPI_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/ntsecpkg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecpkg.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] Fri Nov 21 15:12:53 2008 @@ -18,9 +18,6 @@ #ifndef _NTSECPKG_H #define _NTSECPKG_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif /* Flags for the MachineState field in SECPKG_PARAMETERS */ #define SECPKG_STATE_ENCRYPTION_PERMITTED 0x01 Modified: trunk/reactos/include/psdk/subauth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/subauth.h?rev… ============================================================================== --- trunk/reactos/include/psdk/subauth.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/subauth.h [iso-8859-1] Fri Nov 21 15:12:53 2008 @@ -1,8 +1,5 @@ #ifndef _SUBAUTH_H #define _SUBAUTH_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" {

1 0

[sginsberg] 37526: - Remove non-standard "PLANGID" type from NDK and use LANGID* instead. Also protect LANGID definition with a header guard, as winnt.h defines it too.
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 15:05:33 2008 New Revision: 37526 URL: http://svn.reactos.org/svn/reactos?rev=37526&view=rev Log: - Remove non-standard "PLANGID" type from NDK and use LANGID* instead. Also protect LANGID definition with a header guard, as winnt.h defines it too. Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/ex/locale.c Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Fri Nov 21 15:05:33 2008 @@ -336,7 +336,7 @@ NTSTATUS NTAPI NtQueryDefaultUILanguage( - PLANGID LanguageId + LANGID* LanguageId ); NTSYSCALLAPI @@ -365,7 +365,7 @@ NTSTATUS NTAPI NtQueryInstallUILanguage( - PLANGID LanguageId + LANGID* LanguageId ); NTSYSCALLAPI @@ -799,7 +799,7 @@ NTSTATUS NTAPI ZwQueryDefaultUILanguage( - PLANGID LanguageId + LANGID* LanguageId ); NTSYSAPI @@ -828,7 +828,7 @@ NTSTATUS NTAPI ZwQueryInstallUILanguage( - PLANGID LanguageId + LANGID* LanguageId ); NTSYSAPI Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Fri Nov 21 15:05:33 2008 @@ -49,7 +49,9 @@ // // Atom and Language IDs // -typedef USHORT LANGID, *PLANGID; +#ifndef NTOS_MODE_USER +typedef USHORT LANGID; +#endif typedef USHORT RTL_ATOM, *PRTL_ATOM; #ifndef NTOS_MODE_USER Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Fri Nov 21 15:05:33 2008 @@ -29,7 +29,7 @@ NTSTATUS NTAPI ExpGetCurrentUserUILanguage(IN PWSTR MuiName, - OUT PLANGID LanguageId) + OUT LANGID* LanguageId) { UCHAR ValueBuffer[256]; PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; @@ -313,7 +313,7 @@ */ NTSTATUS NTAPI -NtQueryInstallUILanguage(OUT PLANGID LanguageId) +NtQueryInstallUILanguage(OUT LANGID* LanguageId) { NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -347,7 +347,7 @@ */ NTSTATUS NTAPI -NtQueryDefaultUILanguage(OUT PLANGID LanguageId) +NtQueryDefaultUILanguage(OUT LANGID* LanguageId) { NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE();

1 0

[mkupfer] 37525: - Add key modifiers MK_CONTROL and MK_SHIFT to all mouse events. - See issue #3557 for more details.
by mkupfer＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: mkupfer Date: Fri Nov 21 14:58:07 2008 New Revision: 37525 URL: http://svn.reactos.org/svn/reactos?rev=37525&view=rev Log: - Add key modifiers MK_CONTROL and MK_SHIFT to all mouse events. - See issue #3557 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri Nov 21 14:58:07 2008 @@ -1109,6 +1109,17 @@ Msg.wParam = CurInfo->ButtonsDown; Msg.lParam = MAKELPARAM(MousePos.x, MousePos.y); Msg.pt = MousePos; + + if (gQueueKeyStateTable[VK_SHIFT] & 0xc0) + { + Msg.wParam |= MK_SHIFT; + } + + if (gQueueKeyStateTable[VK_CONTROL] & 0xc0) + { + Msg.wParam |= MK_CONTROL; + } + if(DoMove) { Msg.message = WM_MOUSEMOVE;

1 0

[spetreolle] 37524: don't redefine IDHELP.
by spetreolle＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: spetreolle Date: Fri Nov 21 14:13:22 2008 New Revision: 37524 URL: http://svn.reactos.org/svn/reactos?rev=37524&view=rev Log: don't redefine IDHELP. Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Fri Nov 21 14:13:22 2008 @@ -4,7 +4,6 @@ // #define IDC_MYICON 2 #define IDNEXT 3 -#define IDHELP 4 #define IDD_EVENTVWR_DIALOG 102 #define IDD_PROGRESSBOX 150 #define IDS_APP_TITLE 103

1 0

[sginsberg] 37523: - winternl.h is deprecated since the NDK was invented, don't use
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 13:23:42 2008 New Revision: 37523 URL: http://svn.reactos.org/svn/reactos?rev=37523&view=rev Log: - winternl.h is deprecated since the NDK was invented, don't use Modified: trunk/reactos/dll/win32/powrprof/powrprof.c Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Fri Nov 21 13:23:42 2008 @@ -23,7 +23,7 @@ #include <ntstatus.h> #define WIN32_NO_STATUS #include <windows.h> -#include <winternl.h> +#include <ntndk.h> #include <powrprof.h> #include <wchar.h> #include <stdio.h>

1 0

[jimtabor] 37522: - Pass more bitmap cross tests, 16 bit is down to 52. I have more fixes that relate to that number, need more time to work on it. Fixed SEH abuse in CreateBitmap.
by jimtabor＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: jimtabor Date: Fri Nov 21 12:34:31 2008 New Revision: 37522 URL: http://svn.reactos.org/svn/reactos?rev=37522&view=rev Log: - Pass more bitmap cross tests, 16 bit is down to 52. I have more fixes that relate to that number, need more time to work on it. Fixed SEH abuse in CreateBitmap. Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Fri Nov 21 12:34:31 2008 @@ -362,6 +362,7 @@ { BITMAPOBJ_UnlockBitmap(BitmapObj); BITMAPOBJ_FreeBitmapByHandle(NewBitmap); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } } Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Fri Nov 21 12:34:31 2008 @@ -185,12 +185,12 @@ PVOID pvGammaRamp; // Gamma ramp pointer. + HSURF FillPatterns[HS_DDI_MAX]; + + ULONG DxDd_nCount; + DHPDEV hPDev; // DHPDEV for device. - - HSURF FillPatterns[HS_DDI_MAX]; - - ULONG DxDd_nCount; - + PVOID ppalSurf; // PEPALOBJ/PPALGDI for this device. DEVINFO DevInfo; GDIINFO GDIInfo; HSURF pSurface; // SURFACE for this device. Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Fri Nov 21 12:34:31 2008 @@ -37,5 +37,7 @@ ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); DWORD STDCALL IntGetQueueStatus(BOOL ClearChanges); VOID FASTCALL IntUserManualGuiCheck(LONG Check); +PVOID NTAPI HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); +VOID NTAPI HackUnsecureVirtualMemory(IN PVOID); #endif /* __WIN32K_MISC_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Nov 21 12:34:31 2008 @@ -110,26 +110,25 @@ UINT BitsPixel, IN OPTIONAL LPBYTE pUnsafeBits) { - HBITMAP hBitmap; - - _SEH_TRY + if (pUnsafeBits) { - if (pUnsafeBits) + BOOL Hit = FALSE; + UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * abs(Height); + + _SEH_TRY { - UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * abs(Height); ProbeForRead(pUnsafeBits, cjBits, 1); } - - hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); - + _SEH_HANDLE + { + Hit = TRUE; + } + _SEH_END + + if (Hit) return 0; } - _SEH_HANDLE - { - hBitmap = 0; - } - _SEH_END - - return hBitmap; + + return IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); } BOOL INTERNAL_CALL @@ -195,6 +194,12 @@ { HBITMAP Bmp; PDC Dc; + + if ( Width <= 0 || Height <= 0 || (Width * Height) > 0x3FFFFFFF ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } Dc = DC_LockDc(hDC);

1 0

[sginsberg] 37521: - Move ntdef.h to DDK as that is where it belongs, and remove unnecessary system_header. Also fix a #endif (kudos to hto -- bug 3888) - Fix DDK to include ntdef.h instead of windef.h - Fix a check in debug.h
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 12:18:12 2008 New Revision: 37521 URL: http://svn.reactos.org/svn/reactos?rev=37521&view=rev Log: - Move ntdef.h to DDK as that is where it belongs, and remove unnecessary system_header. Also fix a #endif (kudos to hto -- bug 3888) - Fix DDK to include ntdef.h instead of windef.h - Fix a check in debug.h Added: trunk/reactos/include/ddk/ntdef.h (with props) Removed: trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/portcls.h trunk/reactos/include/ddk/punknown.h trunk/reactos/include/ddk/unknown.h trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Fri Nov 21 12:18:12 2008 @@ -32,7 +32,6 @@ #endif #include <stdarg.h> -#include <windef.h> #include <excpt.h> #include <ntdef.h> #include <basetyps.h> Added: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h (added) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Fri Nov 21 12:18:12 2008 @@ -1,0 +1,137 @@ +#ifndef _NTDEF_H +#define _NTDEF_H + +#include <stdarg.h> +#include <windef.h> +#include <excpt.h> + +/* TODO: some compilers support this */ +#define RESTRICTED_POINTER + +#define NTAPI __stdcall +#if !defined(_M_CEE_PURE) +#define NTAPI_INLINE NTAPI +#else +#define NTAPI_INLINE +#endif + +#ifndef DECLSPEC_NOINLINE +#define DECLSPEC_NOINLINE __declspec(noinline) +#endif + +#define OBJ_INHERIT 0x00000002 +#define OBJ_PERMANENT 0x00000010 +#define OBJ_EXCLUSIVE 0x00000020 +#define OBJ_CASE_INSENSITIVE 0x00000040 +#define OBJ_OPENIF 0x00000080 +#define OBJ_OPENLINK 0x00000100 +#define OBJ_KERNEL_HANDLE 0x00000200 +#define OBJ_FORCE_ACCESS_CHECK 0x00000400 +#define OBJ_VALID_ATTRIBUTES 0x000007F2 +#define InitializeObjectAttributes(p,n,a,r,s) { \ + (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ + (p)->RootDirectory = (r); \ + (p)->Attributes = (a); \ + (p)->ObjectName = (n); \ + (p)->SecurityDescriptor = (s); \ + (p)->SecurityQualityOfService = NULL; \ +} +#ifndef NT_SUCCESS +#define NT_SUCCESS(x) ((x)>=0) +#endif +#define NT_WARNING(x) ((ULONG)(x)>>30==2) +#define NT_ERROR(x) ((ULONG)(x)>>30==3) +#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) +typedef LONG NTSTATUS, *PNTSTATUS; +typedef struct _UNICODE_STRING { + USHORT Length; + USHORT MaximumLength; + PWSTR Buffer; +} UNICODE_STRING, *PUNICODE_STRING; +typedef const UNICODE_STRING* PCUNICODE_STRING; +typedef struct _STRING { + USHORT Length; + USHORT MaximumLength; + PCHAR Buffer; +} STRING, *PSTRING; +typedef struct _CSTRING { + USHORT Length; + USHORT MaximumLength; + CONST CHAR *Buffer; +} CSTRING, *PCSTRING; +#endif +typedef STRING ANSI_STRING; +typedef PSTRING PANSI_STRING; +typedef STRING OEM_STRING; +typedef PSTRING POEM_STRING; +typedef CONST STRING* PCOEM_STRING; +typedef STRING CANSI_STRING; +typedef PSTRING PCANSI_STRING; +typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; +typedef CONST CHAR *LPCCH, *PCCH; +typedef signed char SCHAR; +typedef SCHAR *PSCHAR; +typedef enum _SECTION_INHERIT { + ViewShare = 1, + ViewUnmap = 2 +} SECTION_INHERIT; +typedef enum _NT_PRODUCT_TYPE { + NtProductWinNt = 1, + NtProductLanManNt, + NtProductServer +} NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; +#if !defined(_NTSECAPI_H) +typedef struct _OBJECT_ATTRIBUTES { + ULONG Length; + HANDLE RootDirectory; + PUNICODE_STRING ObjectName; + ULONG Attributes; + PVOID SecurityDescriptor; + PVOID SecurityQualityOfService; +} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; +#endif + +typedef struct LIST_ENTRY32 +{ + ULONG Flink; + ULONG Blink; +} LIST_ENTRY32; +typedef LIST_ENTRY32 *PLIST_ENTRY32; + +typedef struct LIST_ENTRY64 +{ + ULONGLONG Flink; + ULONGLONG Blink; +} LIST_ENTRY64; +typedef LIST_ENTRY64 *PLIST_ENTRY64; + +#define NOTHING +#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } +#define TYPE_ALIGNMENT( t ) FIELD_OFFSET( struct { char x; t test; }, test ) +#define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) +#define RTL_NUMBER_OF_V1(A) (sizeof(A)/sizeof((A)[0])) +#define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A) +#ifdef ENABLE_RTL_NUMBER_OF_V2 +#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V2(A) +#else +#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) +#endif +#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) +#define MINCHAR 0x80 +#define MAXCHAR 0x7f +#define MINSHORT 0x8000 +#define MAXSHORT 0x7fff +#define MINLONG 0x80000000 +#define MAXLONG 0x7fffffff +#define MAXUCHAR 0xff +#define MAXUSHORT 0xffff +#define MAXULONG 0xffffffff +#define MAXLONGLONG (0x7fffffffffffffffLL) + +#define __C_ASSERT_JOIN(X, Y) __C_ASSERT_DO_JOIN(X, Y) +#define __C_ASSERT_DO_JOIN(X, Y) __C_ASSERT_DO_JOIN2(X, Y) +#define __C_ASSERT_DO_JOIN2(X, Y) X##Y + +#define C_ASSERT(e) typedef char __C_ASSERT_JOIN(__C_ASSERT__, __LINE__)[(e) ? 1 : -1] + +#endif /* _NTDEF_H */ Propchange: trunk/reactos/include/ddk/ntdef.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Fri Nov 21 12:18:12 2008 @@ -123,7 +123,6 @@ #ifndef PORTCLS_H #define PORTCLS_H -//#include <windef.h> #include <ks.h> #include <punknown.h> #include <ntddk.h> Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/punknown.h [iso-8859-1] Fri Nov 21 12:18:12 2008 @@ -8,7 +8,7 @@ #ifndef _UNKNOWN_H_ #define _UNKNOWN_H_ -#include <windef.h> +#include <ntdef.h> #define COM_NO_WINDOWS_H #include <basetyps.h> Modified: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/unknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/unknown.h [iso-8859-1] Fri Nov 21 12:18:12 2008 @@ -9,7 +9,7 @@ #include <wdm.h> #endif -#include <windef.h> +#include <ntdef.h> #define COM_NO_WINDOWS_H #include <basetyps.h> #ifdef PUT_GUIDS_HERE Removed: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h (removed) @@ -1,140 +1,0 @@ -#ifndef _NTDEF_H -#define _NTDEF_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#include <stdarg.h> -#include <windef.h> -#include <excpt.h> - -/* TODO: some compilers support this */ -#define RESTRICTED_POINTER - -#define NTAPI __stdcall -#if !defined(_M_CEE_PURE) -#define NTAPI_INLINE NTAPI -#else -#define NTAPI_INLINE -#endif - -#ifndef DECLSPEC_NOINLINE -#define DECLSPEC_NOINLINE __declspec(noinline) -#endif - -#define OBJ_INHERIT 0x00000002 -#define OBJ_PERMANENT 0x00000010 -#define OBJ_EXCLUSIVE 0x00000020 -#define OBJ_CASE_INSENSITIVE 0x00000040 -#define OBJ_OPENIF 0x00000080 -#define OBJ_OPENLINK 0x00000100 -#define OBJ_KERNEL_HANDLE 0x00000200 -#define OBJ_FORCE_ACCESS_CHECK 0x00000400 -#define OBJ_VALID_ATTRIBUTES 0x000007F2 -#define InitializeObjectAttributes(p,n,a,r,s) { \ - (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ - (p)->RootDirectory = (r); \ - (p)->Attributes = (a); \ - (p)->ObjectName = (n); \ - (p)->SecurityDescriptor = (s); \ - (p)->SecurityQualityOfService = NULL; \ -} -#ifndef NT_SUCCESS -#define NT_SUCCESS(x) ((x)>=0) -#endif -#define NT_WARNING(x) ((ULONG)(x)>>30==2) -#define NT_ERROR(x) ((ULONG)(x)>>30==3) -#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) -typedef LONG NTSTATUS, *PNTSTATUS; -typedef struct _UNICODE_STRING { - USHORT Length; - USHORT MaximumLength; - PWSTR Buffer; -} UNICODE_STRING, *PUNICODE_STRING; -typedef const UNICODE_STRING* PCUNICODE_STRING; -typedef struct _STRING { - USHORT Length; - USHORT MaximumLength; - PCHAR Buffer; -} STRING, *PSTRING; -typedef struct _CSTRING { - USHORT Length; - USHORT MaximumLength; - CONST CHAR *Buffer; -} CSTRING, *PCSTRING; -#endif -typedef STRING ANSI_STRING; -typedef PSTRING PANSI_STRING; -typedef STRING OEM_STRING; -typedef PSTRING POEM_STRING; -typedef CONST STRING* PCOEM_STRING; -typedef STRING CANSI_STRING; -typedef PSTRING PCANSI_STRING; -typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; -typedef CONST CHAR *LPCCH, *PCCH; -typedef signed char SCHAR; -typedef SCHAR *PSCHAR; -typedef enum _SECTION_INHERIT { - ViewShare = 1, - ViewUnmap = 2 -} SECTION_INHERIT; -typedef enum _NT_PRODUCT_TYPE { - NtProductWinNt = 1, - NtProductLanManNt, - NtProductServer -} NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; -#if !defined(_NTSECAPI_H) -typedef struct _OBJECT_ATTRIBUTES { - ULONG Length; - HANDLE RootDirectory; - PUNICODE_STRING ObjectName; - ULONG Attributes; - PVOID SecurityDescriptor; - PVOID SecurityQualityOfService; -} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; -#endif - -typedef struct LIST_ENTRY32 -{ - ULONG Flink; - ULONG Blink; -} LIST_ENTRY32; -typedef LIST_ENTRY32 *PLIST_ENTRY32; - -typedef struct LIST_ENTRY64 -{ - ULONGLONG Flink; - ULONGLONG Blink; -} LIST_ENTRY64; -typedef LIST_ENTRY64 *PLIST_ENTRY64; - -#define NOTHING -#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } -#define TYPE_ALIGNMENT( t ) FIELD_OFFSET( struct { char x; t test; }, test ) -#define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) -#define RTL_NUMBER_OF_V1(A) (sizeof(A)/sizeof((A)[0])) -#define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A) -#endif -#ifdef ENABLE_RTL_NUMBER_OF_V2 -#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V2(A) -#else -#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) -#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) -#define MINCHAR 0x80 -#define MAXCHAR 0x7f -#define MINSHORT 0x8000 -#define MAXSHORT 0x7fff -#define MINLONG 0x80000000 -#define MAXLONG 0x7fffffff -#define MAXUCHAR 0xff -#define MAXUSHORT 0xffff -#define MAXULONG 0xffffffff -#define MAXLONGLONG (0x7fffffffffffffffLL) - -#define __C_ASSERT_JOIN(X, Y) __C_ASSERT_DO_JOIN(X, Y) -#define __C_ASSERT_DO_JOIN(X, Y) __C_ASSERT_DO_JOIN2(X, Y) -#define __C_ASSERT_DO_JOIN2(X, Y) X##Y - -#define C_ASSERT(e) typedef char __C_ASSERT_JOIN(__C_ASSERT__, __LINE__)[(e) ? 1 : -1] - -#endif /* _NTDEF_H */ Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Fri Nov 21 12:18:12 2008 @@ -20,7 +20,7 @@ #if !defined(_RTLFUNCS_H) && (!defined(_NTDDK_) || !defined(__NTDDK_H)) /* Make sure we have basic types (some people include us *before* SDK... */ -#if !defined(_NTDEF_) && !defined(_WINDEF_) && !defined(_WINDEF_H) +#if !defined(_NTDEF_) && !defined(_NTDEF_H) && !defined(_WINDEF_) && !defined(_WINDEF_H) #error Please include SDK first. #endif

1 0

[sginsberg] 37520: - Fix a warning
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 11:53:10 2008 New Revision: 37520 URL: http://svn.reactos.org/svn/reactos?rev=37520&view=rev Log: - Fix a warning Modified: trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] Fri Nov 21 11:53:10 2008 @@ -2557,6 +2557,7 @@ #define IDirectDrawSurface7_GetLOD(p,a) (p)->GetLOD(a) #endif #endif +#undef INTERFACE #ifdef __cplusplus };

1 0

[mjmartin] 37519: - Added EventSource structure for keeping track of EventLog Source name and associated Log File. - Added and Implemented ElfCreateEventLogHandle and ElfDeleteEventLogHandle.
by mjmartin＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: mjmartin Date: Fri Nov 21 09:40:47 2008 New Revision: 37519 URL: http://svn.reactos.org/svn/reactos?rev=37519&view=rev Log: - Added EventSource structure for keeping track of EventLog Source name and associated Log File. - Added and Implemented ElfCreateEventLogHandle and ElfDeleteEventLogHandle. Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Fri Nov 21 09:40:47 2008 @@ -94,6 +94,11 @@ LIST_ENTRY ListEntry; } LOGFILE, *PLOGFILE; +typedef struct +{ + PLOGFILE LogFile; + WCHAR *Name; +} EVENTSOURCE, *PEVENTSOURCE; /* file.c */ VOID LogfListInitialize(VOID); Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Fri Nov 21 09:40:47 2008 @@ -41,6 +41,101 @@ return 0; } +IELF_HANDLE ElfCreateEventLogHandle(WCHAR *Name) +{ + PEVENTSOURCE EventSourceHandle; + PLOGFILE currentLogFile = NULL; + HKEY hLogSourceNameKey = NULL; + WCHAR *SourceNameRegKey = NULL; + DWORD dwError, dwSize; + INT i, LogsActive; + + EventSourceHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTSOURCE)); + if (!EventSourceHandle) + { + DPRINT1("Failed to allocate Heap!\n"); + return NULL; + } + + EventSourceHandle->Name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY ,(wcslen(Name) + 1) * sizeof(WCHAR)); + if (!EventSourceHandle->Name) + { + HeapFree(GetProcessHeap(),0, EventSourceHandle); + DPRINT1("Failed to allocate Heap!\n"); + return NULL; + } + + wcscpy(EventSourceHandle->Name, Name); + + /* Get the number of Log Files the EventLog service found */ + LogsActive = LogfListItemCount(); + if (LogsActive == 0) + { + DPRINT1("EventLog service reports no log files!\n"); + goto Cleanup; + } + + /* Default to the Application Log, as documented on MSDN */ + EventSourceHandle->LogFile = LogfListItemByName(L"Application"); + + for (i = 1; i <= LogsActive; i++) + { + currentLogFile = LogfListItemByIndex(i); + //DPRINT1("LogFile = %S\n",currentLogFile->LogName); + + dwSize = 90; + dwSize += (wcslen(currentLogFile->LogName) + 3) * sizeof(WCHAR); + dwSize += (wcslen(Name) + 1) * sizeof(WCHAR); + + SourceNameRegKey = HeapAlloc(GetProcessHeap(), 0, dwSize); + + wcscpy(SourceNameRegKey, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"); + wcsncat(SourceNameRegKey, currentLogFile->LogName, wcslen(currentLogFile->LogName)); + wcsncat(SourceNameRegKey, L"\\",2); + wcsncat(SourceNameRegKey, Name, wcslen(Name)); + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + SourceNameRegKey, + 0, + KEY_READ, + &hLogSourceNameKey); + + HeapFree(GetProcessHeap(), 0, SourceNameRegKey); + + if (dwError == ERROR_SUCCESS) + { + EventSourceHandle->LogFile = currentLogFile; + break; + } + } + + /* If hLogSourceRegKey is NULL */ + if (!hLogSourceNameKey) + { + DPRINT1("Could not find subkey %S under any of the eventlog logfiles in registry. Using default of Application.\n",Name); + } + + if (hLogSourceNameKey) RegCloseKey(hLogSourceNameKey); + + return EventSourceHandle; + +Cleanup: + HeapFree(GetProcessHeap(), 0, EventSourceHandle->Name); + HeapFree(GetProcessHeap(), 0, EventSourceHandle); + return NULL; +} + +BOOL ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle) +{ + PEVENTSOURCE pHandle = (PEVENTSOURCE) EventLogHandle; + + if (pHandle->LogFile->Header.Signature != LOGFILE_SIGNATURE) + return FALSE; + + HeapFree(GetProcessHeap(),0,pHandle->Name); + HeapFree(GetProcessHeap(),0,pHandle); + return TRUE; +} /* Function 0 */ NTSTATUS ElfrClearELFW(

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