Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[hbelusca] 64007: [CONSRV] - Some code cleaning. - Bring back the terminal bell that was added in revision 58253 and disabled in revision 58447.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 31 11:58:50 2014 New Revision: 64007 URL: http://svn.reactos.org/svn/reactos?rev=64007&view=rev Log: [CONSRV] - Some code cleaning. - Bring back the terminal bell that was added in revision 58253 and disabled in revision 58447. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] Sun Aug 31 11:58:50 2014 @@ -22,12 +22,6 @@ static VOID NTAPI DummyDeinitTerminal(IN OUT PTERMINAL This) -{ -} - -static VOID NTAPI -DummyDrawRegion(IN OUT PTERMINAL This, - SMALL_RECT* Region) { } @@ -76,6 +70,12 @@ +static VOID NTAPI +DummyDrawRegion(IN OUT PTERMINAL This, + SMALL_RECT* Region) +{ +} + static BOOL NTAPI DummySetCursorInfo(IN OUT PTERMINAL This, PCONSOLE_SCREEN_BUFFER ScreenBuffer) @@ -119,15 +119,6 @@ { } -/* -static BOOL NTAPI -DummyGetSelectionInfo(IN OUT PTERMINAL This, - PCONSOLE_SELECTION_INFO pSelectionInfo) -{ - return TRUE; -} -*/ - static BOOL NTAPI DummySetPalette(IN OUT PTERMINAL This, HPALETTE PaletteHandle, @@ -147,11 +138,11 @@ { DummyInitTerminal, DummyDeinitTerminal, - DummyDrawRegion, DummyReadStream, DummyWriteStream, + DummyDrawRegion, DummySetCursorInfo, DummySetScreenInfo, DummyResizeTerminal, @@ -159,7 +150,6 @@ DummyReleaseScreenBuffer, DummyChangeTitle, DummyGetLargestConsoleWindowSize, - // DummyGetSelectionInfo, DummySetPalette, DummyShowMouseCursor, }; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sun Aug 31 11:58:50 2014 @@ -2435,7 +2435,7 @@ } case PM_CONSOLE_BEEP: - DPRINT1("Beep !!\n"); + DPRINT1("Beep\n"); Beep(800, 200); break; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Aug 31 11:58:50 2014 @@ -675,6 +675,15 @@ SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); } +/* static */ VOID NTAPI +GuiRingBell(IN OUT PFRONTEND This) +{ + PGUI_CONSOLE_DATA GuiData = This->Data; + + /* Emit an error beep sound */ + SendNotifyMessage(GuiData->hWindow, PM_CONSOLE_BEEP, 0, 0); +} + static BOOL NTAPI GuiSetCursorInfo(IN OUT PFRONTEND This, PCONSOLE_SCREEN_BUFFER Buff) @@ -1083,6 +1092,7 @@ GuiDeinitFrontEnd, GuiDrawRegion, GuiWriteStream, + GuiRingBell, GuiSetCursorInfo, GuiSetScreenInfo, GuiResizeTerminal, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Sun Aug 31 11:58:50 2014 @@ -286,14 +286,6 @@ { PFRONTEND FrontEnd = This->Data; FrontEnd->Vtbl->DeinitFrontEnd(FrontEnd); -} - -static VOID NTAPI -ConSrvTermDrawRegion(IN OUT PTERMINAL This, - SMALL_RECT* Region) -{ - PFRONTEND FrontEnd = This->Data; - FrontEnd->Vtbl->DrawRegion(FrontEnd, Region); } @@ -588,14 +580,12 @@ } continue; } - // /* --- BEL ---*/ - // else if (Buffer[i] == L'\a') - // { - // // FIXME: This MUST BE moved to the terminal emulator frontend!! - // DPRINT1("Bell\n"); - // // SendNotifyMessage(Console->hWindow, PM_CONSOLE_BEEP, 0, 0); - // continue; - // } + /* --- BEL ---*/ + else if (Buffer[i] == L'\a') + { + FrontEnd->Vtbl->RingBell(FrontEnd); + continue; + } } UpdateRect.Left = min(UpdateRect.Left, Buff->CursorPosition.X); UpdateRect.Right = max(UpdateRect.Right, Buff->CursorPosition.X); @@ -656,6 +646,14 @@ +static VOID NTAPI +ConSrvTermDrawRegion(IN OUT PTERMINAL This, + SMALL_RECT* Region) +{ + PFRONTEND FrontEnd = This->Data; + FrontEnd->Vtbl->DrawRegion(FrontEnd, Region); +} + static BOOL NTAPI ConSrvTermSetCursorInfo(IN OUT PTERMINAL This, PCONSOLE_SCREEN_BUFFER ScreenBuffer) @@ -714,16 +712,6 @@ FrontEnd->Vtbl->GetLargestConsoleWindowSize(FrontEnd, pSize); } -/* -static BOOL NTAPI -ConSrvTermGetSelectionInfo(IN OUT PTERMINAL This, - PCONSOLE_SELECTION_INFO pSelectionInfo) -{ - PFRONTEND FrontEnd = This->Data; - return FrontEnd->Vtbl->GetSelectionInfo(FrontEnd, pSelectionInfo); -} -*/ - static BOOL NTAPI ConSrvTermSetPalette(IN OUT PTERMINAL This, HPALETTE PaletteHandle, @@ -745,11 +733,11 @@ { ConSrvTermInitTerminal, ConSrvTermDeinitTerminal, - ConSrvTermDrawRegion, ConSrvTermReadStream, ConSrvTermWriteStream, + ConSrvTermDrawRegion, ConSrvTermSetCursorInfo, ConSrvTermSetScreenInfo, ConSrvTermResizeTerminal, @@ -757,7 +745,6 @@ ConSrvTermReleaseScreenBuffer, ConSrvTermChangeTitle, ConSrvTermGetLargestConsoleWindowSize, - // ConSrvTermGetSelectionInfo, ConSrvTermSetPalette, ConSrvTermShowMouseCursor, }; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Aug 31 11:58:50 2014 @@ -194,10 +194,6 @@ IN struct _CONSOLE* Console); VOID (NTAPI *DeinitTerminal)(IN OUT PTERMINAL This); - /* Interface used for both text-mode and graphics screen buffers */ - VOID (NTAPI *DrawRegion)(IN OUT PTERMINAL This, - SMALL_RECT* Region); - /************ Line discipline ***************/ @@ -222,6 +218,9 @@ + /* Interface used for both text-mode and graphics screen buffers */ + VOID (NTAPI *DrawRegion)(IN OUT PTERMINAL This, + SMALL_RECT* Region); BOOL (NTAPI *SetCursorInfo)(IN OUT PTERMINAL This, PCONSOLE_SCREEN_BUFFER ScreenBuffer); BOOL (NTAPI *SetScreenInfo)(IN OUT PTERMINAL This, @@ -239,8 +238,6 @@ VOID (NTAPI *ChangeTitle)(IN OUT PTERMINAL This); VOID (NTAPI *GetLargestConsoleWindowSize)(IN OUT PTERMINAL This, PCOORD pSize); - // BOOL (NTAPI *GetSelectionInfo)(IN OUT PTERMINAL This, - // PCONSOLE_SELECTION_INFO pSelectionInfo); BOOL (NTAPI *SetPalette)(IN OUT PTERMINAL This, HPALETTE PaletteHandle, UINT PaletteUsage); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Sun Aug 31 11:58:50 2014 @@ -58,6 +58,7 @@ UINT ScrolledLines, PWCHAR Buffer, UINT Length); + VOID (NTAPI *RingBell)(IN OUT PFRONTEND This); BOOL (NTAPI *SetCursorInfo)(IN OUT PFRONTEND This, PCONSOLE_SCREEN_BUFFER ScreenBuffer); BOOL (NTAPI *SetScreenInfo)(IN OUT PFRONTEND This, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] Sun Aug 31 11:58:50 2014 @@ -8,11 +8,7 @@ #pragma once -/* Macros used to call functions in the FRONTEND_VTBL virtual table */ - -#define TermDrawRegion(Console, Region) \ - (Console)->TermIFace.Vtbl->DrawRegion(&(Console)->TermIFace, (Region)) - +/* Macros used to call functions in the TERMINAL_VTBL virtual table */ #define TermReadStream(Console, ExeName, /**/ Unicode, /**/ Buffer, ReadControl, NumCharsToRead, NumCharsRead) \ (Console)->TermIFace.Vtbl->ReadStream(&(Console)->TermIFace, (ExeName), /**/ (Unicode), /**/ \ @@ -23,6 +19,8 @@ (Length), (Attrib)) +#define TermDrawRegion(Console, Region) \ + (Console)->TermIFace.Vtbl->DrawRegion(&(Console)->TermIFace, (Region)) #define TermSetCursorInfo(Console, ScreenBuffer) \ (Console)->TermIFace.Vtbl->SetCursorInfo(&(Console)->TermIFace, (ScreenBuffer)) #define TermSetScreenInfo(Console, ScreenBuffer, OldCursorX, OldCursorY) \ @@ -33,27 +31,30 @@ (Console)->TermIFace.Vtbl->SetActiveScreenBuffer(&(Console)->TermIFace) #define TermReleaseScreenBuffer(Console, ScreenBuffer) \ (Console)->TermIFace.Vtbl->ReleaseScreenBuffer(&(Console)->TermIFace, (ScreenBuffer)) +#define TermChangeTitle(Console) \ + (Console)->TermIFace.Vtbl->ChangeTitle(&(Console)->TermIFace) +#define TermGetLargestConsoleWindowSize(Console, pSize) \ + (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize(&(Console)->TermIFace, (pSize)) +#define TermSetPalette(Console, PaletteHandle, PaletteUsage) \ + (Console)->TermIFace.Vtbl->SetPalette(&(Console)->TermIFace, (PaletteHandle), (PaletteUsage)) +#define TermShowMouseCursor(Console, Show) \ + (Console)->TermIFace.Vtbl->ShowMouseCursor(&(Console)->TermIFace, (Show)) + + +/* Macros used to call functions in the FRONTEND_VTBL virtual table */ + #define TermRefreshInternalInfo(Console) \ (Console)->FrontEndIFace.Vtbl->RefreshInternalInfo(&(Console)->FrontEndIFace) - -#define TermChangeTitle(Console) \ - (Console)->TermIFace.Vtbl->ChangeTitle(&(Console)->TermIFace) #define TermChangeIcon(Console, IconHandle) \ (Console)->FrontEndIFace.Vtbl->ChangeIcon(&(Console)->FrontEndIFace, (IconHandle)) #define TermGetConsoleWindowHandle(Console) \ (Console)->FrontEndIFace.Vtbl->GetConsoleWindowHandle(&(Console)->FrontEndIFace) -#define TermGetLargestConsoleWindowSize(Console, pSize) \ - (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize(&(Console)->TermIFace, (pSize)) #define TermGetSelectionInfo(Console, pSelectionInfo) \ (Console)->FrontEndIFace.Vtbl->GetSelectionInfo(&(Console)->FrontEndIFace, (pSelectionInfo)) -#define TermSetPalette(Console, PaletteHandle, PaletteUsage) \ - (Console)->TermIFace.Vtbl->SetPalette(&(Console)->TermIFace, (PaletteHandle), (PaletteUsage)) #define TermGetDisplayMode(Console) \ (Console)->FrontEndIFace.Vtbl->GetDisplayMode(&(Console)->FrontEndIFace) #define TermSetDisplayMode(Console, NewMode) \ (Console)->FrontEndIFace.Vtbl->SetDisplayMode(&(Console)->FrontEndIFace, (NewMode)) -#define TermShowMouseCursor(Console, Show) \ - (Console)->TermIFace.Vtbl->ShowMouseCursor(&(Console)->TermIFace, (Show)) #define TermSetMouseCursor(Console, CursorHandle) \ (Console)->FrontEndIFace.Vtbl->SetMouseCursor(&(Console)->FrontEndIFace, (CursorHandle)) #define TermMenuControl(Console, CmdIdLow, CmdIdHigh) \

10 years, 3 months

[tfaber] 64006: [NTOS:CC] - Actually flush the whole file in CcFlushCache if FileOffset is NULL instead of just the first 4GB

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 31 11:47:41 2014 New Revision: 64006 URL: http://svn.reactos.org/svn/reactos?rev=64006&view=rev Log: [NTOS:CC] - Actually flush the whole file in CcFlushCache if FileOffset is NULL instead of just the first 4GB Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=640… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Aug 31 11:47:41 2014 @@ -865,6 +865,7 @@ { PROS_SHARED_CACHE_MAP SharedCacheMap; LARGE_INTEGER Offset; + LONGLONG RemainingLength; PROS_VACB current; NTSTATUS Status; KIRQL oldIrql; @@ -879,11 +880,12 @@ if (FileOffset) { Offset = *FileOffset; + RemainingLength = Length; } else { - Offset.QuadPart = (LONGLONG)0; - Length = SharedCacheMap->FileSize.u.LowPart; + Offset.QuadPart = 0; + RemainingLength = SharedCacheMap->FileSize.QuadPart; } if (IoStatus) @@ -892,7 +894,7 @@ IoStatus->Information = 0; } - while (Length > 0) + while (RemainingLength > 0) { current = CcRosLookupVacb(SharedCacheMap, Offset.u.LowPart); if (current != NULL) @@ -915,14 +917,7 @@ } Offset.QuadPart += VACB_MAPPING_GRANULARITY; - if (Length > VACB_MAPPING_GRANULARITY) - { - Length -= VACB_MAPPING_GRANULARITY; - } - else - { - Length = 0; - } + RemainingLength -= min(RemainingLength, VACB_MAPPING_GRANULARITY); } } else

10 years, 3 months

[hbelusca] 64005: [CONSRV]: Code cleaning.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 31 11:24:23 2014 New Revision: 64005 URL: http://svn.reactos.org/svn/reactos?rev=64005&view=rev Log: [CONSRV]: Code cleaning. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Sun Aug 31 11:24:23 2014 @@ -25,12 +25,13 @@ /* PRIVATE FUNCTIONS **********************************************************/ +// ConDrvAddInputEvents static NTSTATUS -ConDrvAddInputEvents(PCONSOLE Console, - PINPUT_RECORD InputRecords, // InputEvent - ULONG NumEventsToWrite, - PULONG NumEventsWritten, - BOOLEAN AppendToEnd) +AddInputEvents(PCONSOLE Console, + PINPUT_RECORD InputRecords, // InputEvent + ULONG NumEventsToWrite, + PULONG NumEventsWritten, + BOOLEAN AppendToEnd) { NTSTATUS Status = STATUS_SUCCESS; ULONG i = 0; @@ -288,6 +289,8 @@ ResetEvent(InputBuffer->ActiveEvent); } + // FIXME: If we add back UNICODE support, it's here that we need to do the translation. + /* We read all the inputs available, we return success */ return STATUS_SUCCESS; } @@ -310,11 +313,13 @@ /* Now, add the events */ if (NumEventsWritten) *NumEventsWritten = 0; - return ConDrvAddInputEvents(Console, - InputRecord, - NumEventsToWrite, - NumEventsWritten, - AppendToEnd); + // FIXME: If we add back UNICODE support, it's here that we need to do the translation. + + return AddInputEvents(Console, + InputRecord, + NumEventsToWrite, + NumEventsWritten, + AppendToEnd); } NTSTATUS NTAPI Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sun Aug 31 11:24:23 2014 @@ -15,6 +15,20 @@ #include <debug.h> /* GLOBALS ********************************************************************/ + +/* + * From MSDN: + * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. + * If they are the same, the function fails, and GetLastError returns + * ERROR_INVALID_PARAMETER." + */ +#define ConsoleOutputUnicodeToAnsiChar(Console, dChar, sWChar) \ + ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ + WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) + +#define ConsoleOutputAnsiToUnicodeChar(Console, dWChar, sChar) \ + ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ + MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1) /* PRIVATE FUNCTIONS **********************************************************/ @@ -500,7 +514,7 @@ } else { - // ConsoleUnicodeCharToAnsiChar(Console, &CurCharInfo->Char.AsciiChar, &Ptr->Char.UnicodeChar); + // ConsoleOutputUnicodeToAnsiChar(Console, &CurCharInfo->Char.AsciiChar, &Ptr->Char.UnicodeChar); WideCharToMultiByte(Console->OutputCodePage, 0, &Ptr->Char.UnicodeChar, 1, &CurCharInfo->Char.AsciiChar, 1, NULL, NULL); } @@ -563,7 +577,7 @@ } else { - ConsoleAnsiCharToUnicodeChar(Console, &Ptr->Char.UnicodeChar, &CurCharInfo->Char.AsciiChar); + ConsoleOutputAnsiToUnicodeChar(Console, &Ptr->Char.UnicodeChar, &CurCharInfo->Char.AsciiChar); } Ptr->Attributes = CurCharInfo->Attributes; ++Ptr; @@ -626,7 +640,7 @@ Ptr = ConioCoordToPointer(Buffer, CapturedWriteRegion.Left, Y); for (X = CapturedWriteRegion.Left; X <= CapturedWriteRegion.Right; ++X) { - ConsoleAnsiCharToUnicodeChar(Console, &Ptr->Char.UnicodeChar, &CurCharInfo->Char); + ConsoleOutputAnsiToUnicodeChar(Console, &Ptr->Char.UnicodeChar, &CurCharInfo->Char); Ptr->Attributes = CurCharInfo->Attributes; ++Ptr; ++CurCharInfo; @@ -787,7 +801,7 @@ switch (CodeType) { case CODE_ASCII: - ConsoleUnicodeCharToAnsiChar(Console, (PCHAR)ReadBuffer, &Ptr->Char.UnicodeChar); + ConsoleOutputUnicodeToAnsiChar(Console, (PCHAR)ReadBuffer, &Ptr->Char.UnicodeChar); break; case CODE_UNICODE: @@ -993,7 +1007,7 @@ { /* Conversion from the ASCII char to the UNICODE char */ CODE_ELEMENT tmp; - ConsoleAnsiCharToUnicodeChar(Console, &tmp.UnicodeChar, &Code.AsciiChar); + ConsoleOutputAnsiToUnicodeChar(Console, &tmp.UnicodeChar, &Code.AsciiChar); Code = tmp; } @@ -1178,7 +1192,7 @@ if (!Unicode) { WCHAR tmp; - ConsoleAnsiCharToUnicodeChar(Console, &tmp, &FillChar.Char.AsciiChar); + ConsoleOutputAnsiToUnicodeChar(Console, &tmp, &FillChar.Char.AsciiChar); FillChar.Char.UnicodeChar = tmp; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sun Aug 31 11:24:23 2014 @@ -26,23 +26,19 @@ ConSrvReleaseObject(&(Buff)->Header, (IsConsoleLocked)) - - /* * From MSDN: * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. * If they are the same, the function fails, and GetLastError returns * ERROR_INVALID_PARAMETER." */ -#define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ +#define ConsoleInputUnicodeToAnsiChar(Console, dChar, sWChar) \ ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) -#define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ +#define ConsoleInputAnsiToUnicodeChar(Console, dWChar, sChar) \ ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1) - - typedef struct _GET_INPUT_INFO @@ -62,9 +58,9 @@ { WCHAR UnicodeChar = InputEvent->Event.KeyEvent.uChar.UnicodeChar; InputEvent->Event.KeyEvent.uChar.UnicodeChar = 0; - ConsoleInputUnicodeCharToAnsiChar(Console, - &InputEvent->Event.KeyEvent.uChar.AsciiChar, - &UnicodeChar); + ConsoleInputUnicodeToAnsiChar(Console, + &InputEvent->Event.KeyEvent.uChar.AsciiChar, + &UnicodeChar); } } @@ -75,9 +71,9 @@ { CHAR AsciiChar = InputEvent->Event.KeyEvent.uChar.AsciiChar; InputEvent->Event.KeyEvent.uChar.AsciiChar = 0; - ConsoleInputAnsiCharToUnicodeChar(Console, - &InputEvent->Event.KeyEvent.uChar.UnicodeChar, - &AsciiChar); + ConsoleInputAnsiToUnicodeChar(Console, + &InputEvent->Event.KeyEvent.uChar.UnicodeChar, + &AsciiChar); } } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Aug 31 11:24:23 2014 @@ -327,21 +327,6 @@ IN PCONSOLE_PROCESS_DATA ProcessData); /* conoutput.c */ - -/* - * From MSDN: - * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. - * If they are the same, the function fails, and GetLastError returns - * ERROR_INVALID_PARAMETER." - */ -#define ConsoleUnicodeCharToAnsiChar(Console, dChar, sWChar) \ - ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ - WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) - -#define ConsoleAnsiCharToUnicodeChar(Console, dWChar, sChar) \ - ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ - MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1) - PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); VOID ConioDrawConsole(PCONSOLE Console); NTSTATUS ConioResizeBuffer(PCONSOLE Console, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Sun Aug 31 11:24:23 2014 @@ -197,21 +197,6 @@ PINPUT_RECORD InputEvent); /* conoutput.c */ - -/* - * From MSDN: - * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. - * If they are the same, the function fails, and GetLastError returns - * ERROR_INVALID_PARAMETER." - */ -#define ConsoleUnicodeCharToAnsiChar(Console, dChar, sWChar) \ - ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ - WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) - -#define ConsoleAnsiCharToUnicodeChar(Console, dWChar, sChar) \ - ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ - MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1) - PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); VOID ConioDrawConsole(PCONSRV_CONSOLE Console); NTSTATUS ConioResizeBuffer(PCONSRV_CONSOLE Console,

10 years, 3 months

[hbelusca] 64004: [CONSRV][CONDRV] - Move CSR details (pre/post-processing, unicode translation) of reading/writing console inputs to consrv, where they belong. - Add a temporary solution to screen...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 31 11:07:09 2014 New Revision: 64004 URL: http://svn.reactos.org/svn/reactos?rev=64004&view=rev Log: [CONSRV][CONDRV] - Move CSR details (pre/post-processing, unicode translation) of reading/writing console inputs to consrv, where they belong. - Add a temporary solution to screenbuffer resizing notifications, to be properly fixed later on. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Sun Aug 31 11:07:09 2014 @@ -16,20 +16,6 @@ /* GLOBALS ********************************************************************/ -/* - * From MSDN: - * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. - * If they are the same, the function fails, and GetLastError returns - * ERROR_INVALID_PARAMETER." - */ -#define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ - ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ - WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) - -#define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ - ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ - MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1) - typedef struct ConsoleInput_t { LIST_ENTRY ListEntry; @@ -39,34 +25,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static VOID -ConioInputEventToAnsi(PCONSOLE Console, PINPUT_RECORD InputEvent) -{ - if (InputEvent->EventType == KEY_EVENT) - { - WCHAR UnicodeChar = InputEvent->Event.KeyEvent.uChar.UnicodeChar; - InputEvent->Event.KeyEvent.uChar.UnicodeChar = 0; - ConsoleInputUnicodeCharToAnsiChar(Console, - &InputEvent->Event.KeyEvent.uChar.AsciiChar, - &UnicodeChar); - } -} - -static VOID -ConioInputEventToUnicode(PCONSOLE Console, PINPUT_RECORD InputEvent) -{ - if (InputEvent->EventType == KEY_EVENT) - { - CHAR AsciiChar = InputEvent->Event.KeyEvent.uChar.AsciiChar; - InputEvent->Event.KeyEvent.uChar.AsciiChar = 0; - ConsoleInputAnsiCharToUnicodeChar(Console, - &InputEvent->Event.KeyEvent.uChar.UnicodeChar, - &AsciiChar); - } -} - - -NTSTATUS +static NTSTATUS ConDrvAddInputEvents(PCONSOLE Console, PINPUT_RECORD InputRecords, // InputEvent ULONG NumEventsToWrite, @@ -218,60 +177,6 @@ return Status; } - -ULONG -PreprocessInput(PCONSOLE Console, - PINPUT_RECORD InputEvent, - ULONG NumEventsToWrite); -VOID -PostprocessInput(PCONSOLE Console); - -NTSTATUS -ConioAddInputEvents(PCONSOLE Console, - PINPUT_RECORD InputRecords, // InputEvent - ULONG NumEventsToWrite, - PULONG NumEventsWritten, - BOOLEAN AppendToEnd) -{ - NTSTATUS Status = STATUS_SUCCESS; - - if (NumEventsWritten) *NumEventsWritten = 0; - - /* - * This pre-processing code MUST be IN consrv ONLY!! - */ - NumEventsToWrite = PreprocessInput(Console, InputRecords, NumEventsToWrite); - if (NumEventsToWrite == 0) return STATUS_SUCCESS; - - Status = ConDrvAddInputEvents(Console, - InputRecords, - NumEventsToWrite, - NumEventsWritten, - AppendToEnd); - - /* - * This post-processing code MUST be IN consrv ONLY!! - */ - // if (NT_SUCCESS(Status)) - if (Status == STATUS_SUCCESS) PostprocessInput(Console); - - return Status; -} - -/* Move elsewhere...*/ -NTSTATUS -ConioProcessInputEvent(PCONSOLE Console, - PINPUT_RECORD InputEvent) -{ - ULONG NumEventsWritten; - return ConioAddInputEvents(Console, - InputEvent, - 1, - &NumEventsWritten, - TRUE); -} - - VOID PurgeInputBuffer(PCONSOLE Console) { @@ -329,7 +234,6 @@ IN PCONSOLE_INPUT_BUFFER InputBuffer, IN BOOLEAN KeepEvents, IN BOOLEAN WaitForMoreEvents, - IN BOOLEAN Unicode, OUT PINPUT_RECORD InputRecord, IN ULONG NumEventsToRead, OUT PULONG NumEventsRead OPTIONAL) @@ -379,15 +283,6 @@ if (NumEventsRead) *NumEventsRead = i; - /* Now translate everything to ANSI */ - if (!Unicode) - { - for (; i > 0; --i) - { - ConioInputEventToAnsi(InputBuffer->Header.Console, --InputRecord); - } - } - if (IsListEmpty(&InputBuffer->InputEvents)) { ResetEvent(InputBuffer->ActiveEvent); @@ -400,15 +295,11 @@ NTSTATUS NTAPI ConDrvWriteConsoleInput(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, - IN BOOLEAN Unicode, IN BOOLEAN AppendToEnd, IN PINPUT_RECORD InputRecord, IN ULONG NumEventsToWrite, OUT PULONG NumEventsWritten OPTIONAL) { - NTSTATUS Status = STATUS_SUCCESS; - ULONG i; - if (Console == NULL || InputBuffer == NULL /* || InputRecord == NULL */) return STATUS_INVALID_PARAMETER; @@ -416,26 +307,14 @@ ASSERT(Console == InputBuffer->Header.Console); ASSERT((InputRecord != NULL) || (InputRecord == NULL && NumEventsToWrite == 0)); - /* First translate everything to UNICODE */ - if (!Unicode) - { - for (i = 0; i < NumEventsToWrite; ++i) - { - ConioInputEventToUnicode(Console, &InputRecord[i]); - } - } - /* Now, add the events */ - // if (NumEventsWritten) *NumEventsWritten = 0; - // ConDrvAddInputEvents - Status = ConioAddInputEvents(Console, - InputRecord, - NumEventsToWrite, - NumEventsWritten, - AppendToEnd); - // if (NumEventsWritten) *NumEventsWritten = i; - - return Status; + if (NumEventsWritten) *NumEventsWritten = 0; + + return ConDrvAddInputEvents(Console, + InputRecord, + NumEventsToWrite, + NumEventsWritten, + AppendToEnd); } NTSTATUS NTAPI Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sun Aug 31 11:07:09 2014 @@ -233,6 +233,15 @@ } } +// FIXME! +NTSTATUS NTAPI +ConDrvWriteConsoleInput(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + IN BOOLEAN AppendToEnd, + IN PINPUT_RECORD InputRecord, + IN ULONG NumEventsToWrite, + OUT PULONG NumEventsWritten OPTIONAL); + NTSTATUS ConioResizeBuffer(PCONSOLE Console, PTEXTMODE_SCREEN_BUFFER ScreenBuffer, @@ -341,12 +350,19 @@ */ if (Console->InputBuffer.Mode & ENABLE_WINDOW_INPUT) { + ULONG NumEventsWritten; INPUT_RECORD er; er.EventType = WINDOW_BUFFER_SIZE_EVENT; er.Event.WindowBufferSizeEvent.dwSize = ScreenBuffer->ScreenBufferSize; - ConioProcessInputEvent(Console, &er); + // ConioProcessInputEvent(Console, &er); + ConDrvWriteConsoleInput(Console, + &Console->InputBuffer, + TRUE, + &er, + 1, + &NumEventsWritten); } return STATUS_SUCCESS; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sun Aug 31 11:07:09 2014 @@ -26,6 +26,25 @@ ConSrvReleaseObject(&(Buff)->Header, (IsConsoleLocked)) + + +/* + * From MSDN: + * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. + * If they are the same, the function fails, and GetLastError returns + * ERROR_INVALID_PARAMETER." + */ +#define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ + ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ + WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) + +#define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ + ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ + MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1) + + + + typedef struct _GET_INPUT_INFO { PCSR_THREAD CallingThread; // The thread which called the input API. @@ -36,10 +55,33 @@ /* PRIVATE FUNCTIONS **********************************************************/ -/* - * This pre-processing code MUST be IN consrv ONLY - */ -/* static */ ULONG +static VOID +ConioInputEventToAnsi(PCONSOLE Console, PINPUT_RECORD InputEvent) +{ + if (InputEvent->EventType == KEY_EVENT) + { + WCHAR UnicodeChar = InputEvent->Event.KeyEvent.uChar.UnicodeChar; + InputEvent->Event.KeyEvent.uChar.UnicodeChar = 0; + ConsoleInputUnicodeCharToAnsiChar(Console, + &InputEvent->Event.KeyEvent.uChar.AsciiChar, + &UnicodeChar); + } +} + +static VOID +ConioInputEventToUnicode(PCONSOLE Console, PINPUT_RECORD InputEvent) +{ + if (InputEvent->EventType == KEY_EVENT) + { + CHAR AsciiChar = InputEvent->Event.KeyEvent.uChar.AsciiChar; + InputEvent->Event.KeyEvent.uChar.AsciiChar = 0; + ConsoleInputAnsiCharToUnicodeChar(Console, + &InputEvent->Event.KeyEvent.uChar.UnicodeChar, + &AsciiChar); + } +} + +static ULONG PreprocessInput(PCONSRV_CONSOLE Console, PINPUT_RECORD InputEvent, ULONG NumEventsToWrite) @@ -98,10 +140,7 @@ return NumEventsToWrite; } -/* - * This post-processing code MUST be IN consrv ONLY - */ -/* static */ VOID +static VOID PostprocessInput(PCONSRV_CONSOLE Console) { CsrNotifyWait(&Console->ReadWaitQueue, @@ -115,7 +154,58 @@ } - +NTSTATUS NTAPI +ConDrvWriteConsoleInput(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + IN BOOLEAN AppendToEnd, + IN PINPUT_RECORD InputRecord, + IN ULONG NumEventsToWrite, + OUT PULONG NumEventsWritten OPTIONAL); +static NTSTATUS +ConioAddInputEvents(PCONSOLE Console, + PINPUT_RECORD InputRecords, // InputEvent + ULONG NumEventsToWrite, + PULONG NumEventsWritten, + BOOLEAN AppendToEnd) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (NumEventsWritten) *NumEventsWritten = 0; + + NumEventsToWrite = PreprocessInput(Console, InputRecords, NumEventsToWrite); + if (NumEventsToWrite == 0) return STATUS_SUCCESS; + + // Status = ConDrvAddInputEvents(Console, + // InputRecords, + // NumEventsToWrite, + // NumEventsWritten, + // AppendToEnd); + + Status = ConDrvWriteConsoleInput(Console, + &Console->InputBuffer, + AppendToEnd, + InputRecords, + NumEventsToWrite, + NumEventsWritten); + + // if (NT_SUCCESS(Status)) + if (Status == STATUS_SUCCESS) PostprocessInput(Console); + + return Status; +} + +/* FIXME: This function can be called by CONDRV, in ConioResizeBuffer() in text.c */ +NTSTATUS +ConioProcessInputEvent(PCONSOLE Console, + PINPUT_RECORD InputEvent) +{ + ULONG NumEventsWritten; + return ConioAddInputEvents(Console, + InputEvent, + 1, + &NumEventsWritten, + TRUE); +} static NTSTATUS @@ -381,7 +471,6 @@ IN PCONSOLE_INPUT_BUFFER InputBuffer, IN BOOLEAN KeepEvents, IN BOOLEAN WaitForMoreEvents, - IN BOOLEAN Unicode, OUT PINPUT_RECORD InputRecord, IN ULONG NumEventsToRead, OUT PULONG NumEventsRead OPTIONAL); @@ -422,7 +511,6 @@ InputBuffer, (GetInputRequest->Flags & CONSOLE_READ_KEEPEVENT) != 0, (GetInputRequest->Flags & CONSOLE_READ_CONTINUE ) == 0, - GetInputRequest->Unicode, InputRecord, GetInputRequest->NumRecords, &NumEventsRead); @@ -442,6 +530,18 @@ * return the error code we were given. */ GetInputRequest->NumRecords = NumEventsRead; + + if (NT_SUCCESS(Status)) + { + /* Now translate everything to ANSI */ + if (!GetInputRequest->Unicode) + { + for (; NumEventsRead > 0; --NumEventsRead) + { + ConioInputEventToAnsi(InputBuffer->Header.Console, --InputRecord); + } + } + } return Status; // return STATUS_SUCCESS; @@ -563,14 +663,15 @@ return Status; } +#if 0 NTSTATUS NTAPI ConDrvWriteConsoleInput(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, - IN BOOLEAN Unicode, IN BOOLEAN AppendToEnd, IN PINPUT_RECORD InputRecord, IN ULONG NumEventsToWrite, OUT PULONG NumEventsWritten OPTIONAL); +#endif CSR_API(SrvWriteConsoleInput) { NTSTATUS Status; @@ -619,14 +720,32 @@ return Status; } + /* First translate everything to UNICODE */ + if (!WriteInputRequest->Unicode) + { + ULONG i; + for (i = 0; i < WriteInputRequest->NumRecords; ++i) + { + ConioInputEventToUnicode(InputBuffer->Header.Console, &InputRecord[i]); + } + } + + /* Now, add the events */ NumEventsWritten = 0; - Status = ConDrvWriteConsoleInput(InputBuffer->Header.Console, - InputBuffer, - WriteInputRequest->Unicode, - WriteInputRequest->AppendToEnd, - InputRecord, - WriteInputRequest->NumRecords, - &NumEventsWritten); + Status = ConioAddInputEvents(InputBuffer->Header.Console, + // InputBuffer, + InputRecord, + WriteInputRequest->NumRecords, + &NumEventsWritten, + WriteInputRequest->AppendToEnd); + + // Status = ConDrvWriteConsoleInput(InputBuffer->Header.Console, + // InputBuffer, + // WriteInputRequest->AppendToEnd, + // InputRecord, + // WriteInputRequest->NumRecords, + // &NumEventsWritten); + WriteInputRequest->NumRecords = NumEventsWritten; ConSrvReleaseInputBuffer(InputBuffer, TRUE); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Aug 31 11:07:09 2014 @@ -326,17 +326,6 @@ ConSrvConsoleCtrlEvent(IN ULONG CtrlEvent, IN PCONSOLE_PROCESS_DATA ProcessData); -/* coninput.c */ -NTSTATUS -ConioAddInputEvents(PCONSOLE Console, - PINPUT_RECORD InputRecords, - ULONG NumEventsToWrite, - PULONG NumEventsWritten, - BOOLEAN AppendToEnd); -NTSTATUS -ConioProcessInputEvent(PCONSOLE Console, - PINPUT_RECORD InputEvent); - /* conoutput.c */ /* Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Sun Aug 31 11:07:09 2014 @@ -193,12 +193,6 @@ DWORD Scale); NTSTATUS -ConioAddInputEvents(PCONSRV_CONSOLE Console, - PINPUT_RECORD InputRecords, - ULONG NumEventsToWrite, - PULONG NumEventsWritten, - BOOLEAN AppendToEnd); -NTSTATUS ConioProcessInputEvent(PCONSRV_CONSOLE Console, PINPUT_RECORD InputEvent);

10 years, 3 months

[tfaber] 64003: [CMAKE] - Disable C4244 (implicit integer truncation) warning on MSVC builds because it causes people to add broken casts that make the situation worse.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 31 10:55:32 2014 New Revision: 64003 URL: http://svn.reactos.org/svn/reactos?rev=64003&view=rev Log: [CMAKE] - Disable C4244 (implicit integer truncation) warning on MSVC builds because it causes people to add broken casts that make the situation worse. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=64003… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Aug 31 10:55:32 2014 @@ -36,10 +36,10 @@ # Disable overly sensitive warnings as well as those that generally aren't # useful to us. # - TODO: C4018: signed/unsigned mismatch -# - TODO: C4244: integer truncation +# - C4244: implicit integer truncation # - C4290: C++ exception specification ignored #add_compile_flags("/wd4018 /wd4244 /wd4290") -add_compile_flags("/wd4290") +add_compile_flags("/wd4290 /wd4244") # The following warnings are treated as errors: # - C4013: implicit function declaration

10 years, 3 months

[tfaber] 64002: [KMTESTS:KE] - Increase timeout in KeGuardedMutex test to avoid flakiness

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 31 10:27:35 2014 New Revision: 64002 URL: http://svn.reactos.org/svn/reactos?rev=64002&view=rev Log: [KMTESTS:KE] - Increase timeout in KeGuardedMutex test to avoid flakiness Modified: trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c Modified: trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeGuarded… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c [iso-8859-1] Sun Aug 31 10:27:35 2014 @@ -240,7 +240,7 @@ THREAD_DATA ThreadDataTry; PKTHREAD Thread = KeGetCurrentThread(); LARGE_INTEGER Timeout; - Timeout.QuadPart = -10 * 1000 * 10; /* 10 ms */ + Timeout.QuadPart = -50 * 1000 * 10; /* 50 ms */ InitThreadData(&ThreadData, Mutex, KeAcquireGuardedMutex, NULL, KeReleaseGuardedMutex); InitThreadData(&ThreadData2, Mutex, KeAcquireGuardedMutex, NULL, KeReleaseGuardedMutex);

10 years, 3 months

[hbelusca] 64001: [VIDEOPRT]: "...Sesion" --> "...Session": fix a typo.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 31 00:04:20 2014 New Revision: 64001 URL: http://svn.reactos.org/svn/reactos?rev=64001&view=rev Log: [VIDEOPRT]: "...Sesion" --> "...Session": fix a typo. Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] Sun Aug 31 00:04:20 2014 @@ -295,7 +295,7 @@ static NTSTATUS -VideoPortUseDeviceInSesion( +VideoPortUseDeviceInSession( _Inout_ PDEVICE_OBJECT DeviceObject, _Inout_ PVIDEO_DEVICE_SESSION_STATUS SessionState, _In_ ULONG BufferLength, @@ -475,10 +475,10 @@ case IOCTL_VIDEO_USE_DEVICE_IN_SESSION: INFO_(VIDEOPRT, "- IOCTL_VIDEO_USE_DEVICE_IN_SESSION\n"); - Status = VideoPortUseDeviceInSesion(DeviceObject, - Irp->AssociatedIrp.SystemBuffer, - IrpStack->Parameters.DeviceIoControl.InputBufferLength, - &Irp->IoStatus.Information); + Status = VideoPortUseDeviceInSession(DeviceObject, + Irp->AssociatedIrp.SystemBuffer, + IrpStack->Parameters.DeviceIoControl.InputBufferLength, + &Irp->IoStatus.Information); break; default:

10 years, 3 months

[tkreuzer] 64000: [PSDK/...] - Add/improve some definitions in ntdef.h - fix definition of SUBLANG_SINDHI_PAKISTAN in winnt.h - enable ARRAYSIZE in winnt.h - #undef ARRAYSIZE in certain wine code t...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 30 22:26:42 2014 New Revision: 64000 URL: http://svn.reactos.org/svn/reactos?rev=64000&view=rev Log: [PSDK/...] - Add/improve some definitions in ntdef.h - fix definition of SUBLANG_SINDHI_PAKISTAN in winnt.h - enable ARRAYSIZE in winnt.h - #undef ARRAYSIZE in certain wine code to avoid redefinition - Use PCCH instead of PCCHAR in ext2lib (PCCHAR is ntdef.h only) - remove obsolete definitions from smss.h Modified: trunk/reactos/base/system/smss/smss.h trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/dll/win32/mscoree/corruntimehost.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/winhttp/request.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/fslib/ext2lib/Disk.c trunk/reactos/win32ss/user/user32/windows/spy.c Modified: trunk/reactos/base/system/smss/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.h?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.h [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -18,13 +18,6 @@ #include <winbase.h> #include <winreg.h> -#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 NTOS_MODE_USER #include <ndk/iofuncs.h> #include <ndk/obfuncs.h> Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -24,6 +24,7 @@ #include <initguid.h> #include <fil_data.h> +#undef ARRAYSIZE #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) typedef struct FilterMapper3Impl @@ -1164,7 +1165,7 @@ if (FAILED(hr)) return hr; - + while(IEnumMoniker_Next(ppEnumMoniker, 1, &IMon, &nb) == S_OK) { IMoniker_Release(IMon); @@ -1184,7 +1185,7 @@ return E_OUTOFMEMORY; } ZeroMemory(regfilters, nb_mon * sizeof(REGFILTER)); /* will prevent bad free of Name in case of error. */ - + IEnumMoniker_Reset(ppEnumMoniker); while(IEnumMoniker_Next(ppEnumMoniker, 1, &IMon, &nb) == S_OK) { @@ -1238,7 +1239,7 @@ CoTaskMemFree(regfilters[idx].Name); CoTaskMemFree(regfilters); IEnumMoniker_Release(ppEnumMoniker); - + return hr; } @@ -1259,7 +1260,7 @@ { strcpyW(wszKeyName, wszFilterSlash); strcatW(wszKeyName, wszClsid); - + lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); hr = HRESULT_FROM_WIN32(lRet); } @@ -1275,7 +1276,7 @@ { strcpyW(wszKeyName, wszClsidSlash); strcatW(wszKeyName, wszClsid); - + lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); hr = HRESULT_FROM_WIN32(lRet); } @@ -1286,7 +1287,7 @@ hr = HRESULT_FROM_WIN32(lRet); RegCloseKey(hKey); } - + CoTaskMemFree(wszClsid); return hr; @@ -1346,7 +1347,7 @@ strcpyW(wszPinsKeyName, wszPins); strcatW(wszPinsKeyName, wszSlash); strcatW(wszPinsKeyName, szName); - + lRet = RegCreateKeyExW(hKey, wszPinsKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hPinsKey, NULL); hr = HRESULT_FROM_WIN32(lRet); CoTaskMemFree(wszPinsKeyName); Modified: trunk/reactos/dll/win32/mscoree/corruntimehost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/corrunti… ============================================================================== --- trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -1205,6 +1205,7 @@ } #define CHARS_IN_GUID 39 +#undef ARRAYSIZE #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +#undef ARRAYSIZE #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) /**************************************************************************** @@ -1173,7 +1174,7 @@ return ret; } -/* The given OXID must be local to this process: +/* The given OXID must be local to this process: * * The ref parameter is here mostly to ensure people remember that * they get one, you should normally take a ref for thread safety. @@ -2482,7 +2483,7 @@ * PARAMS * riid [I] Interface whose proxy/stub CLSID is to be returned. * pclsid [O] Where to store returned proxy/stub CLSID. - * + * * RETURNS * S_OK * E_OUTOFMEMORY @@ -2594,7 +2595,7 @@ * PARAMS * riid [I] Interface whose proxy/stub CLSID is to be registered. * rclsid [I] CLSID of the proxy/stub. - * + * * RETURNS * Success: S_OK * Failure: E_OUTOFMEMORY @@ -3576,14 +3577,14 @@ if (!apt) return CO_E_NOTINITIALIZED; stubmgr = get_stub_manager_from_object(apt, pUnk); - + if (stubmgr) { if (fLock) stub_manager_ext_addref(stubmgr, 1, FALSE); else stub_manager_ext_release(stubmgr, 1, FALSE, fLastUnlockReleases); - + stub_manager_int_release(stubmgr); return S_OK; @@ -4036,7 +4037,7 @@ FIXME("(%p, %p): stub\n", pUnk, pvReserved); return S_OK; } - + /*********************************************************************** * CoQueryProxyBlanket [OLE32.@] * Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -79,6 +79,7 @@ #define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000) +#undef ARRAYSIZE #define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) WINE_DEFAULT_DEBUG_CHANNEL(rpc); @@ -407,7 +408,7 @@ } static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np *new_npc) -{ +{ /* because of the way named pipes work, we'll transfer the connected pipe * to the child, then reopen the server binding to continue listening */ @@ -448,7 +449,7 @@ strcat(strcpy(pname, prefix), old_conn->Endpoint); status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); - + return status; } @@ -714,9 +715,9 @@ HANDLE *objs = prev_array; RpcConnection_np *conn; RpcServerProtseq_np *npps = CONTAINING_RECORD(protseq, RpcServerProtseq_np, common); - + EnterCriticalSection(&protseq->cs); - + /* open and count connections */ *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); @@ -726,7 +727,7 @@ (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } - + /* make array of connections */ if (objs) objs = HeapReAlloc(GetProcessHeap(), 0, objs, *count*sizeof(HANDLE)); @@ -738,7 +739,7 @@ LeaveCriticalSection(&protseq->cs); return NULL; } - + objs[0] = npps->mgr_event; *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); @@ -763,7 +764,7 @@ DWORD res; RpcConnection *cconn; RpcConnection_np *conn; - + if (!objs) return -1; @@ -1472,7 +1473,7 @@ conn->Next = protseq->conn; protseq->conn = first_connection; LeaveCriticalSection(&protseq->cs); - + TRACE("listening on %s\n", endpoint); return RPC_S_OK; } @@ -1638,7 +1639,7 @@ RpcServerProtseq_sock *sockps = CONTAINING_RECORD(protseq, RpcServerProtseq_sock, common); EnterCriticalSection(&protseq->cs); - + /* open and count connections */ *count = 1; conn = (RpcConnection_tcp *)protseq->conn; @@ -1647,7 +1648,7 @@ (*count)++; conn = (RpcConnection_tcp *)conn->common.Next; } - + /* make array of connections */ if (poll_info) poll_info = HeapReAlloc(GetProcessHeap(), 0, poll_info, *count*sizeof(*poll_info)); @@ -1689,10 +1690,10 @@ unsigned int i; RpcConnection *cconn; RpcConnection_tcp *conn; - + if (!poll_info) return -1; - + ret = poll(poll_info, count, -1); if (ret < 0) { Modified: trunk/reactos/dll/win32/winhttp/request.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/request.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -1197,6 +1197,7 @@ return ret; } +#undef ARRAYSIZE #define ARRAYSIZE(array) (sizeof(array) / sizeof((array)[0])) static const WCHAR basicW[] = {'B','a','s','i','c',0}; Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -123,6 +123,7 @@ #define COLLECT_TIME 60000 +#undef ARRAYSIZE #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) struct HttpAuthInfo @@ -1299,7 +1300,7 @@ TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); - if (!lpszHeader) + if (!lpszHeader) return TRUE; request = (http_request_t*) get_handle_object( hHttpRequest ); @@ -3841,13 +3842,13 @@ info_mod &= ~ modifier_flags[i].val; } } - + if (info_mod) { TRACE(" Unknown (%08x)", info_mod); } TRACE("\n"); } - + request = (http_request_t*) get_handle_object( hHttpRequest ); if (NULL == request || request->hdr.htype != WH_HHTTPREQ) { @@ -4943,7 +4944,7 @@ else requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); - + TRACE("Request header -> %s\n", debugstr_w(requestString) ); res = open_http_connection(request, &reusing_connection); @@ -4991,7 +4992,7 @@ INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - + if (HTTP_GetResponseHeaders(request, &responseLen)) { http_release_netconn(request, FALSE); @@ -6038,7 +6039,7 @@ /* REPLACE wins out over ADD */ if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) dwModifier &= ~HTTP_ADDHDR_FLAG_ADD; - + if (dwModifier & HTTP_ADDHDR_FLAG_ADD) index = -1; else Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -91,95 +91,96 @@ /* Helper macro to enable gcc's extension. */ #ifndef __GNU_EXTENSION -#ifdef __GNUC__ -#define __GNU_EXTENSION __extension__ -#else -#define __GNU_EXTENSION -#endif + #ifdef __GNUC__ + #define __GNU_EXTENSION __extension__ + #else + #define __GNU_EXTENSION + #endif #endif #ifndef DUMMYUNIONNAME -#if defined(NONAMELESSUNION)// || !defined(_MSC_EXTENSIONS) -#define _ANONYMOUS_UNION -#define _UNION_NAME(x) x -#define DUMMYUNIONNAME u -#define DUMMYUNIONNAME1 u1 -#define DUMMYUNIONNAME2 u2 -#define DUMMYUNIONNAME3 u3 -#define DUMMYUNIONNAME4 u4 -#define DUMMYUNIONNAME5 u5 -#define DUMMYUNIONNAME6 u6 -#define DUMMYUNIONNAME7 u7 -#define DUMMYUNIONNAME8 u8 -#define DUMMYUNIONNAME9 u9 -#else -#define _ANONYMOUS_UNION __GNU_EXTENSION -#define _UNION_NAME(x) -#define DUMMYUNIONNAME -#define DUMMYUNIONNAME1 -#define DUMMYUNIONNAME2 -#define DUMMYUNIONNAME3 -#define DUMMYUNIONNAME4 -#define DUMMYUNIONNAME5 -#define DUMMYUNIONNAME6 -#define DUMMYUNIONNAME7 -#define DUMMYUNIONNAME8 -#define DUMMYUNIONNAME9 -#endif /* NONAMELESSUNION */ + #if defined(NONAMELESSUNION)// || !defined(_MSC_EXTENSIONS) + #define _ANONYMOUS_UNION + #define _UNION_NAME(x) x + #define DUMMYUNIONNAME u + #define DUMMYUNIONNAME1 u1 + #define DUMMYUNIONNAME2 u2 + #define DUMMYUNIONNAME3 u3 + #define DUMMYUNIONNAME4 u4 + #define DUMMYUNIONNAME5 u5 + #define DUMMYUNIONNAME6 u6 + #define DUMMYUNIONNAME7 u7 + #define DUMMYUNIONNAME8 u8 + #define DUMMYUNIONNAME9 u9 + #else + #define _ANONYMOUS_UNION __GNU_EXTENSION + #define _UNION_NAME(x) + #define DUMMYUNIONNAME + #define DUMMYUNIONNAME1 + #define DUMMYUNIONNAME2 + #define DUMMYUNIONNAME3 + #define DUMMYUNIONNAME4 + #define DUMMYUNIONNAME5 + #define DUMMYUNIONNAME6 + #define DUMMYUNIONNAME7 + #define DUMMYUNIONNAME8 + #define DUMMYUNIONNAME9 + #endif /* NONAMELESSUNION */ #endif /* !DUMMYUNIONNAME */ #ifndef DUMMYSTRUCTNAME -#if defined(NONAMELESSUNION)// || !defined(_MSC_EXTENSIONS) -#define _ANONYMOUS_STRUCT -#define _STRUCT_NAME(x) x -#define DUMMYSTRUCTNAME s -#define DUMMYSTRUCTNAME1 s1 -#define DUMMYSTRUCTNAME2 s2 -#define DUMMYSTRUCTNAME3 s3 -#define DUMMYSTRUCTNAME4 s4 -#define DUMMYSTRUCTNAME5 s5 -#else -#define _ANONYMOUS_STRUCT __GNU_EXTENSION -#define _STRUCT_NAME(x) -#define DUMMYSTRUCTNAME -#define DUMMYSTRUCTNAME1 -#define DUMMYSTRUCTNAME2 -#define DUMMYSTRUCTNAME3 -#define DUMMYSTRUCTNAME4 -#define DUMMYSTRUCTNAME5 -#endif /* NONAMELESSUNION */ + #if defined(NONAMELESSUNION)// || !defined(_MSC_EXTENSIONS) + #define _ANONYMOUS_STRUCT + #define _STRUCT_NAME(x) x + #define DUMMYSTRUCTNAME s + #define DUMMYSTRUCTNAME1 s1 + #define DUMMYSTRUCTNAME2 s2 + #define DUMMYSTRUCTNAME3 s3 + #define DUMMYSTRUCTNAME4 s4 + #define DUMMYSTRUCTNAME5 s5 + #else + #define _ANONYMOUS_STRUCT __GNU_EXTENSION + #define _STRUCT_NAME(x) + #define DUMMYSTRUCTNAME + #define DUMMYSTRUCTNAME1 + #define DUMMYSTRUCTNAME2 + #define DUMMYSTRUCTNAME3 + #define DUMMYSTRUCTNAME4 + #define DUMMYSTRUCTNAME5 + #endif /* NONAMELESSUNION */ #endif /* DUMMYSTRUCTNAME */ #if defined(STRICT_GS_ENABLED) -#pragma strict_gs_check(push, on) + #pragma strict_gs_check(push, on) #endif #if defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_PPC) || defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) -#define ALIGNMENT_MACHINE -#define UNALIGNED __unaligned -#if defined(_WIN64) -#define UNALIGNED64 __unaligned -#else -#define UNALIGNED64 -#endif -#else -#undef ALIGNMENT_MACHINE -#define UNALIGNED -#define UNALIGNED64 + #define ALIGNMENT_MACHINE + #define UNALIGNED __unaligned + #if defined(_WIN64) + #define UNALIGNED64 __unaligned + #else + #define UNALIGNED64 + #endif +#else + #undef ALIGNMENT_MACHINE + #define UNALIGNED + #define UNALIGNED64 #endif #if defined(_WIN64) || defined(_M_ALPHA) -#define MAX_NATURAL_ALIGNMENT sizeof(ULONGLONG) -#define MEMORY_ALLOCATION_ALIGNMENT 16 -#else -#define MAX_NATURAL_ALIGNMENT sizeof(ULONG) -#define MEMORY_ALLOCATION_ALIGNMENT 8 -#endif - -#if defined(_M_MRX000) && !(defined(MIDL_PASS) || defined(RC_INVOKED)) && defined(ENABLE_RESTRICTED) -#define RESTRICTED_POINTER __restrict -#else -#define RESTRICTED_POINTER + #define MAX_NATURAL_ALIGNMENT sizeof(ULONGLONG) + #define MEMORY_ALLOCATION_ALIGNMENT 16 +#else + #define MAX_NATURAL_ALIGNMENT sizeof(ULONG) + #define MEMORY_ALLOCATION_ALIGNMENT 8 +#endif + +/* C99 restrict support */ +#if defined(ENABLE_RESTRICTED) && defined(_M_MRX000) && !defined(MIDL_PASS) && !defined(RC_INVOKED) + #define RESTRICTED_POINTER __restrict +#else + #define RESTRICTED_POINTER #endif #define ARGUMENT_PRESENT(ArgumentPointer) \ @@ -187,66 +188,66 @@ /* Returns the base address of a structure from a structure member */ #ifndef CONTAINING_RECORD -#define CONTAINING_RECORD(address, type, field) \ - ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) + #define CONTAINING_RECORD(address, type, field) \ + ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) #endif /* Returns the byte offset of the specified structure's member */ #ifndef __GNUC__ -#define FIELD_OFFSET(Type, Field) ((LONG)(LONG_PTR)&(((Type*) 0)->Field)) -#else -#define FIELD_OFFSET(Type, Field) ((LONG)__builtin_offsetof(Type, Field)) + #define FIELD_OFFSET(Type, Field) ((LONG)(LONG_PTR)&(((Type*) 0)->Field)) +#else + #define FIELD_OFFSET(Type, Field) ((LONG)__builtin_offsetof(Type, Field)) #endif /* Returns the type's alignment */ #if defined(_MSC_VER) -#define TYPE_ALIGNMENT(t) __alignof(t) -#else -#define TYPE_ALIGNMENT(t) FIELD_OFFSET(struct { char x; t test; }, test) + #define TYPE_ALIGNMENT(t) __alignof(t) +#else + #define TYPE_ALIGNMENT(t) FIELD_OFFSET(struct { char x; t test; }, test) #endif #if defined(_AMD64_) || defined(_X86_) -#define PROBE_ALIGNMENT(_s) TYPE_ALIGNMENT(ULONG) + #define PROBE_ALIGNMENT(_s) TYPE_ALIGNMENT(ULONG) #elif defined(_IA64_) || defined(_ARM_) -#define PROBE_ALIGNMENT(_s) max((TYPE_ALIGNMENT(_s), TYPE_ALIGNMENT(ULONG)) -#else -#error "unknown architecture" + #define PROBE_ALIGNMENT(_s) max((TYPE_ALIGNMENT(_s), TYPE_ALIGNMENT(ULONG)) +#else + #error "unknown architecture" #endif #if defined(_WIN64) -#define PROBE_ALIGNMENT32(_s) TYPE_ALIGNMENT(ULONG) + #define PROBE_ALIGNMENT32(_s) TYPE_ALIGNMENT(ULONG) #endif #ifdef __cplusplus -#define EXTERN_C extern "C" -#else -#define EXTERN_C extern + #define EXTERN_C extern "C" +#else + #define EXTERN_C extern #endif /* Calling Conventions */ #if defined(_MANAGED) -#define FASTCALL __stdcall + #define FASTCALL __stdcall #elif defined(_M_IX86) -#define FASTCALL __fastcall -#else -#define FASTCALL + #define FASTCALL __fastcall +#else + #define FASTCALL #endif #define NTAPI __stdcall #ifndef STDMETHODCALLTYPE -#define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl -#define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl -#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE -#define STDAPI_(t) EXTERN_C t STDAPICALLTYPE -#define STDMETHODIMP HRESULT STDMETHODCALLTYPE -#define STDMETHODIMP_(t) t STDMETHODCALLTYPE -#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE -#define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE -#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE -#define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE + #define STDMETHODCALLTYPE __stdcall + #define STDMETHODVCALLTYPE __cdecl + #define STDAPICALLTYPE __stdcall + #define STDAPIVCALLTYPE __cdecl + #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE + #define STDAPI_(t) EXTERN_C t STDAPICALLTYPE + #define STDMETHODIMP HRESULT STDMETHODCALLTYPE + #define STDMETHODIMP_(t) t STDMETHODCALLTYPE + #define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE + #define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE + #define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE + #define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE #endif /* !STDMETHODCALLTYPE */ #define STDOVERRIDEMETHODIMP __override STDMETHODIMP @@ -258,7 +259,6 @@ #define IFACEMETHODIMPV __override STDMETHODIMPV #define IFACEMETHODIMPV_(t) __override STDMETHODIMPV_(t) - /* Import and Export Specifiers */ /* Done the same way as in windef.h for now */ @@ -266,138 +266,147 @@ #define DECLSPEC_NORETURN __declspec(noreturn) #ifndef DECLSPEC_ADDRSAFE -#if defined(_MSC_VER) && (defined(_M_ALPHA) || defined(_M_AXP64)) -#define DECLSPEC_ADDRSAFE __declspec(address_safe) -#else -#define DECLSPEC_ADDRSAFE -#endif + #if defined(_MSC_VER) && (defined(_M_ALPHA) || defined(_M_AXP64)) + #define DECLSPEC_ADDRSAFE __declspec(address_safe) + #else + #define DECLSPEC_ADDRSAFE + #endif #endif /* DECLSPEC_ADDRSAFE */ #ifndef DECLSPEC_NOTHROW -#if !defined(MIDL_PASS) -#define DECLSPEC_NOTHROW __declspec(nothrow) -#else -#define DECLSPEC_NOTHROW -#endif + #if !defined(MIDL_PASS) + #define DECLSPEC_NOTHROW __declspec(nothrow) + #else + #define DECLSPEC_NOTHROW + #endif #endif #ifndef NOP_FUNCTION -#if defined(_MSC_VER) -#define NOP_FUNCTION __noop -#else -#define NOP_FUNCTION (void)0 -#endif + #if defined(_MSC_VER) + #define NOP_FUNCTION __noop + #else + #define NOP_FUNCTION (void)0 + #endif #endif #if !defined(_NTSYSTEM_) -#define NTSYSAPI DECLSPEC_IMPORT -#define NTSYSCALLAPI DECLSPEC_IMPORT -#else -#define NTSYSAPI -#if defined(_NTDLLBUILD_) -#define NTSYSCALLAPI -#else -#define NTSYSCALLAPI DECLSPEC_ADDRSAFE -#endif + #define NTSYSAPI DECLSPEC_IMPORT + #define NTSYSCALLAPI DECLSPEC_IMPORT +#else + #define NTSYSAPI + #if defined(_NTDLLBUILD_) + #define NTSYSCALLAPI + #else + #define NTSYSCALLAPI DECLSPEC_ADDRSAFE + #endif #endif /* Inlines */ #ifndef FORCEINLINE -#if defined(_MSC_VER) -#define FORCEINLINE __forceinline -#elif ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) -# define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) -#else -# define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) -#endif +# if defined(_MSC_VER) +# define FORCEINLINE __forceinline +# elif ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) +# endif #endif /* FORCEINLINE */ #ifndef DECLSPEC_NOINLINE -#if (_MSC_VER >= 1300) -#define DECLSPEC_NOINLINE __declspec(noinline) -#elif defined(__GNUC__) -#define DECLSPEC_NOINLINE __attribute__((noinline)) -#else -#define DECLSPEC_NOINLINE -#endif +# if (_MSC_VER >= 1300) +# define DECLSPEC_NOINLINE __declspec(noinline) +# elif defined(__GNUC__) +# define DECLSPEC_NOINLINE __attribute__((noinline)) +# else +# define DECLSPEC_NOINLINE +# endif #endif /* DECLSPEC_NOINLINE */ #if !defined(_M_CEE_PURE) -#define NTAPI_INLINE NTAPI -#else -#define NTAPI_INLINE -#endif - -/* Use to specify structure alignment */ +# define NTAPI_INLINE NTAPI +#else +# define NTAPI_INLINE +#endif + +/* Use to specify structure alignment. Note: VS and GCC behave slightly + different. Therefore it is important to stick to the following rules: + - If you want a struct to be aligned, put DECLSPEC_ALIGN after "struct": + "typedef struct DECLSPEC_ALIGN(16) _FOO { ... } FOO, *PFOO;" + _alignof(PFOO) is sizeof(void*) here as usual. + - If you don't want the struct, but only the typedef to be aligned, + use an extra typedef. + struct _BAR { ... }; + typedef DECLSPEC_ALIGN(16) struct _BAR BAR, *ALIGNEDPBAR; + _alignof(ALIGNEDPBAR) is 16 now! */ #ifndef DECLSPEC_ALIGN -#if defined(_MSC_VER) && !defined(MIDL_PASS) -#define DECLSPEC_ALIGN(x) __declspec(align(x)) -#elif defined(__GNUC__) -#define DECLSPEC_ALIGN(x) __attribute__ ((__aligned__(x))) -#else -#define DECLSPEC_ALIGN(x) -#endif +# if defined(_MSC_VER) && !defined(MIDL_PASS) +# define DECLSPEC_ALIGN(x) __declspec(align(x)) +# elif defined(__GNUC__) +# define DECLSPEC_ALIGN(x) __attribute__ ((__aligned__(x))) +# else +# define DECLSPEC_ALIGN(x) +# endif #endif /* DECLSPEC_ALIGN */ #ifndef SYSTEM_CACHE_ALIGNMENT_SIZE -#if defined(_AMD64_) || defined(_X86_) -#define SYSTEM_CACHE_ALIGNMENT_SIZE 64 -#else -#define SYSTEM_CACHE_ALIGNMENT_SIZE 128 -#endif +# if defined(_AMD64_) || defined(_X86_) +# define SYSTEM_CACHE_ALIGNMENT_SIZE 64 +# else +# define SYSTEM_CACHE_ALIGNMENT_SIZE 128 +# endif #endif #ifndef DECLSPEC_CACHEALIGN -#define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(SYSTEM_CACHE_ALIGNMENT_SIZE) +# define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(SYSTEM_CACHE_ALIGNMENT_SIZE) #endif #ifndef DECLSPEC_UUID -#if defined(_MSC_VER) && defined(__cplusplus) -#define DECLSPEC_UUID(x) __declspec(uuid(x)) -#else -#define DECLSPEC_UUID(x) -#endif +# if defined(_MSC_VER) && defined(__cplusplus) +# define DECLSPEC_UUID(x) __declspec(uuid(x)) +# else +# define DECLSPEC_UUID(x) +# endif #endif #ifndef DECLSPEC_NOVTABLE -#if defined(_MSC_VER) && defined(__cplusplus) -#define DECLSPEC_NOVTABLE __declspec(novtable) -#else -#define DECLSPEC_NOVTABLE -#endif +# if defined(_MSC_VER) && defined(__cplusplus) +# define DECLSPEC_NOVTABLE __declspec(novtable) +# else +# define DECLSPEC_NOVTABLE +# endif #endif #ifndef DECLSPEC_SELECTANY -#if defined(_MSC_VER) || defined(__GNUC__) -#define DECLSPEC_SELECTANY __declspec(selectany) -#else -#define DECLSPEC_SELECTANY -#endif +# if defined(_MSC_VER) || defined(__GNUC__) +# define DECLSPEC_SELECTANY __declspec(selectany) +# else +# define DECLSPEC_SELECTANY +# endif #endif #ifndef DECLSPEC_DEPRECATED -#if (defined(_MSC_VER) || defined(__GNUC__)) && !defined(MIDL_PASS) -#define DECLSPEC_DEPRECATED __declspec(deprecated) -#define DEPRECATE_SUPPORTED -#else -#define DECLSPEC_DEPRECATED -#undef DEPRECATE_SUPPORTED -#endif +# if (defined(_MSC_VER) || defined(__GNUC__)) && !defined(MIDL_PASS) +# define DECLSPEC_DEPRECATED __declspec(deprecated) +# define DEPRECATE_SUPPORTED +# else +# define DECLSPEC_DEPRECATED +# undef DEPRECATE_SUPPORTED +# endif #endif #ifdef DEPRECATE_DDK_FUNCTIONS -#ifdef _NTDDK_ -#define DECLSPEC_DEPRECATED_DDK DECLSPEC_DEPRECATED -#ifdef DEPRECATE_SUPPORTED -#define PRAGMA_DEPRECATED_DDK 1 -#endif -#else -#define DECLSPEC_DEPRECATED_DDK -#define PRAGMA_DEPRECATED_DDK 1 -#endif -#else -#define DECLSPEC_DEPRECATED_DDK -#define PRAGMA_DEPRECATED_DDK 0 +# ifdef _NTDDK_ +# define DECLSPEC_DEPRECATED_DDK DECLSPEC_DEPRECATED +# ifdef DEPRECATE_SUPPORTED +# define PRAGMA_DEPRECATED_DDK 1 +# endif +# else +# define DECLSPEC_DEPRECATED_DDK +# define PRAGMA_DEPRECATED_DDK 1 +# endif +#else +# define DECLSPEC_DEPRECATED_DDK +# define PRAGMA_DEPRECATED_DDK 0 #endif /* Use to silence unused variable warnings when it is intentional */ @@ -408,15 +417,12 @@ /* min/max helper macros */ #ifndef NOMINMAX - -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - +# ifndef min +# define min(a,b) (((a) < (b)) ? (a) : (b)) +# endif +# ifndef max +# define max(a,b) (((a) > (b)) ? (a) : (b)) +# endif #endif /* NOMINMAX */ /* Tell windef.h that we have defined some basic types */ @@ -429,21 +435,27 @@ /* Handle Type */ typedef void *HANDLE, **PHANDLE;; #ifdef STRICT -#define DECLARE_HANDLE(n) typedef struct n##__{int unused;} *n -#else -#define DECLARE_HANDLE(n) typedef HANDLE n +# define DECLARE_HANDLE(n) typedef struct n##__{int unused;} *n +#else +# define DECLARE_HANDLE(n) typedef HANDLE n #endif /* Upper-Case Versions of Some Standard C Types */ #ifndef VOID -#define VOID void +# define VOID void typedef char CHAR; typedef short SHORT; + +# if defined(__ROS_LONG64__) && !defined(_M_AMD64) +typedef int LONG; +# else typedef long LONG; -#if !defined(MIDL_PASS) +# endif + +# if !defined(MIDL_PASS) typedef int INT; -#endif -#endif +# endif /* !MIDL_PASS */ +#endif /* VOID */ /* Avoid redefinition in windef.h */ #define BASETYPES @@ -474,7 +486,7 @@ typedef signed char SCHAR, *PSCHAR; #ifndef _HRESULT_DEFINED -#define _HRESULT_DEFINED +# define _HRESULT_DEFINED typedef _Return_type_success_(return >= 0) LONG HRESULT; #endif @@ -533,18 +545,19 @@ typedef const UCSCHAR *PCUCSCHAR, *PCUCSSTR; typedef UCSCHAR UNALIGNED *PUUCSCHAR, *PUUCSSTR; typedef const UCSCHAR UNALIGNED *PCUUCSCHAR, *PCUUCSSTR; -#define UCSCHAR_INVALID_CHARACTER (0xffffffff) -#define MIN_UCSCHAR (0) -#define MAX_UCSCHAR (0x0010FFFF) +# define UCSCHAR_INVALID_CHARACTER (0xffffffff) +# define MIN_UCSCHAR (0) +# define MAX_UCSCHAR (0x0010FFFF) #endif /* _WIN32_WINNT >= 0x0600 */ #ifdef UNICODE -#ifndef _TCHAR_DEFINED +# ifndef _TCHAR_DEFINED typedef WCHAR TCHAR, *PTCHAR; typedef WCHAR TUCHAR, *PTUCHAR; -#define _TCHAR_DEFINED -#endif /* !_TCHAR_DEFINED */ +# define _TCHAR_DEFINED +# endif /* !_TCHAR_DEFINED */ + typedef LPWCH LPTCH, PTCH; typedef LPCWCH LPCTCH, PCTCH; typedef LPWSTR PTSTR, LPTSTR; @@ -561,15 +574,15 @@ typedef PCNZWCH PCNZTCH; typedef PUNZWCH PUNZTCH; typedef PCUNZWCH PCUNZTCH; -#define __TEXT(quote) L##quote +# define __TEXT(quote) L##quote #else /* UNICODE */ -#ifndef _TCHAR_DEFINED +# ifndef _TCHAR_DEFINED typedef char TCHAR, *PTCHAR; typedef unsigned char TUCHAR, *PTUCHAR; -#define _TCHAR_DEFINED -#endif /* !_TCHAR_DEFINED */ +# define _TCHAR_DEFINED +# endif /* !_TCHAR_DEFINED */ typedef LPCH LPTCH, PTCH; typedef LPCCH LPCTCH, PCTCH; typedef LPSTR PTSTR, LPTSTR, PUTSTR, LPUTSTR; @@ -579,10 +592,11 @@ typedef PZPSTR PZPTSTR; typedef PNZCH PNZTCH, PUNZTCH; typedef PCNZCH PCNZTCH, PCUNZTCH; -#define __TEXT(quote) quote // r_winnt - -#endif /* UNICODE */ // r_winnt -#define TEXT(quote) __TEXT(quote) // r_winnt +#define __TEXT(quote) quote + +#endif /* UNICODE */ + +#define TEXT(quote) __TEXT(quote) /* Cardinal Data Types */ typedef char CCHAR; @@ -591,17 +605,25 @@ typedef ULONG CLONG, *PCLONG; /* NLS basics (Locale and Language Ids) */ -typedef unsigned long LCID, *PLCID; -typedef unsigned short LANGID; +typedef ULONG LCID, *PLCID; +typedef USHORT LANGID; #ifndef __COMPARTMENT_ID_DEFINED__ -#define __COMPARTMENT_ID_DEFINED__ +# define __COMPARTMENT_ID_DEFINED__ typedef enum { UNSPECIFIED_COMPARTMENT_ID = 0, DEFAULT_COMPARTMENT_ID } COMPARTMENT_ID, *PCOMPARTMENT_ID; #endif /* __COMPARTMENT_ID_DEFINED__ */ + +#ifndef __OBJECTID_DEFINED +# define __OBJECTID_DEFINED +typedef struct _OBJECTID { + GUID Lineage; + ULONG Uniquifier; +} OBJECTID; +#endif #ifdef _MSC_VER #pragma warning(push) @@ -617,6 +639,16 @@ double DoNotUseThisField; } DUMMYUNIONNAME; } QUAD, *PQUAD, UQUAD, *PUQUAD; + +typedef struct +#if defined(_M_IA64) +DECLSPEC_ALIGN(16) +#endif +_FLOAT128 { + __int64 LowPart; + __int64 HighPart; +} FLOAT128; +typedef FLOAT128 *PFLOAT128; /* Large Integer Unions */ #if defined(MIDL_PASS) @@ -668,6 +700,12 @@ LONG HighPart; } LUID, *PLUID; +#define APPLICATION_ERROR_MASK 0x20000000 +#define ERROR_SEVERITY_SUCCESS 0x00000000 +#define ERROR_SEVERITY_INFORMATIONAL 0x40000000 +#define ERROR_SEVERITY_WARNING 0x80000000 +#define ERROR_SEVERITY_ERROR 0xC0000000 + /* Native API Return Value Macros */ #define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0) #define NT_INFORMATION(Status) ((((ULONG)(Status)) >> 30) == 1) @@ -675,6 +713,43 @@ #define NT_ERROR(Status) ((((ULONG)(Status)) >> 30) == 3) /* String Types */ +typedef struct _STRING { + USHORT Length; + USHORT MaximumLength; +#ifdef MIDL_PASS + [size_is(MaximumLength), length_is(Length) ] +#endif + _Field_size_bytes_part_opt_(MaximumLength, Length) PCHAR Buffer; +} STRING, *PSTRING, + ANSI_STRING, *PANSI_STRING, + OEM_STRING, *POEM_STRING; + +typedef CONST STRING* PCOEM_STRING; +typedef STRING CANSI_STRING; +typedef PSTRING PCANSI_STRING; + +typedef struct _STRING32 { + USHORT Length; + USHORT MaximumLength; + ULONG Buffer; +} STRING32, *PSTRING32, + UNICODE_STRING32, *PUNICODE_STRING32, + ANSI_STRING32, *PANSI_STRING32; + +typedef struct _STRING64 { + USHORT Length; + USHORT MaximumLength; + ULONGLONG Buffer; +} STRING64, *PSTRING64, + UNICODE_STRING64, *PUNICODE_STRING64, + ANSI_STRING64, *PANSI_STRING64; + +typedef struct _CSTRING { + USHORT Length; + USHORT MaximumLength; + CONST CHAR *Buffer; +} CSTRING, *PCSTRING; + typedef struct _UNICODE_STRING { USHORT Length; USHORT MaximumLength; @@ -686,49 +761,44 @@ } UNICODE_STRING, *PUNICODE_STRING; typedef const UNICODE_STRING* PCUNICODE_STRING; +typedef USHORT RTL_STRING_LENGTH_TYPE; + +#ifdef __cplusplus +extern "C++" template<typename _Type> struct _RTL_remove_const_template; +extern "C++" template<typename _Type> struct _RTL_remove_const_template<const _Type&> { typedef _Type type; }; +#define _RTL_CONSTANT_STRING_remove_const_macro(s) \ + (const_cast<_RTL_remove_const_template<decltype((s)[0])>::type*>(s)) +extern "C++" template<class _Ty> struct _RTL_CONSTANT_STRING_type_check_template; +extern "C++" template<class _Ty, int _Count> struct _RTL_CONSTANT_STRING_type_check_template<const _Ty (&)[_Count]> { typedef char type; }; +#define _RTL_CONSTANT_STRING_type_check(s) _RTL_CONSTANT_STRING_type_check_template<decltype(s)>::type +#else +# define _RTL_CONSTANT_STRING_remove_const_macro(s) (s) +char _RTL_CONSTANT_STRING_type_check(const void *s); +#endif +#define RTL_CONSTANT_STRING(s) { \ + sizeof(s)-sizeof((s)[0]), \ + sizeof(s) / sizeof(_RTL_CONSTANT_STRING_type_check(s)), \ + _RTL_CONSTANT_STRING_remove_const_macro(s) } + +#define DECLARE_UNICODE_STRING_SIZE(_var, _size) \ + WCHAR _var ## _buffer[_size]; \ + __pragma(warning(push)) __pragma(warning(disable:4221)) __pragma(warning(disable:4204)) \ + UNICODE_STRING _var = { 0, (_size) * sizeof(WCHAR) , _var ## _buffer } \ + __pragma(warning(pop)) + +#define DECLARE_CONST_UNICODE_STRING(_var, _string) \ + const WCHAR _var##_buffer[] = _string; \ + __pragma(warning(push)) __pragma(warning(disable:4221)) __pragma(warning(disable:4204)) \ + const UNICODE_STRING _var = { sizeof(_string) - sizeof(WCHAR), sizeof(_string), (PWCH)_var##_buffer } \ + __pragma(warning(pop)) + +#define DECLARE_GLOBAL_CONST_UNICODE_STRING(_var, _str) \ + extern const __declspec(selectany) UNICODE_STRING _var = RTL_CONSTANT_STRING(_str) + +#define ANSI_NULL ((CHAR)0) #define UNICODE_NULL ((WCHAR)0) #define UNICODE_STRING_MAX_BYTES ((USHORT) 65534) #define UNICODE_STRING_MAX_CHARS (32767) - -typedef struct _CSTRING { - USHORT Length; - USHORT MaximumLength; - CONST CHAR *Buffer; -} CSTRING, *PCSTRING; -#define ANSI_NULL ((CHAR)0) - -typedef struct _STRING { - USHORT Length; - USHORT MaximumLength; -#ifdef MIDL_PASS - [size_is(MaximumLength), length_is(Length) ] -#endif - _Field_size_bytes_part_opt_(MaximumLength, Length) PCHAR Buffer; -} STRING, *PSTRING; - -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 struct _STRING32 { - USHORT Length; - USHORT MaximumLength; - ULONG Buffer; -} STRING32, *PSTRING32, - UNICODE_STRING32, *PUNICODE_STRING32, - ANSI_STRING32, *PANSI_STRING32; - -typedef struct _STRING64 { - USHORT Length; - USHORT MaximumLength; - ULONGLONG Buffer; -} STRING64, *PSTRING64, - UNICODE_STRING64, *PUNICODE_STRING64, - ANSI_STRING64, *PANSI_STRING64; /* Object Attributes */ typedef struct _OBJECT_ATTRIBUTES { @@ -873,24 +943,6 @@ #define RTL_FIELD_TYPE(type, field) (((type*)0)->field) #define RTL_BITS_OF(sizeOfArg) (sizeof(sizeOfArg) * 8) #define RTL_BITS_OF_FIELD(type, field) (RTL_BITS_OF(RTL_FIELD_TYPE(type, field))) - -#ifdef __cplusplus -extern "C++" template<typename _Type> struct _RTL_remove_const_template; -extern "C++" template<typename _Type> struct _RTL_remove_const_template<const _Type&> { typedef _Type type; }; -#define _RTL_CONSTANT_STRING_remove_const_macro(s) \ - (const_cast<_RTL_remove_const_template<decltype((s)[0])>::type*>(s)) -extern "C++" template<class _Ty> struct _RTL_CONSTANT_STRING_type_check_template; -extern "C++" template<class _Ty, int _Count> struct _RTL_CONSTANT_STRING_type_check_template<const _Ty (&)[_Count]> { typedef char type; }; -#define _RTL_CONSTANT_STRING_type_check(s) _RTL_CONSTANT_STRING_type_check_template<decltype(s)>::type -#else -#define _RTL_CONSTANT_STRING_remove_const_macro(s) (s) -char _RTL_CONSTANT_STRING_type_check(const void *s); -#endif -#define RTL_CONSTANT_STRING(s) { \ - sizeof(s)-sizeof((s)[0]), \ - sizeof(s) / sizeof(_RTL_CONSTANT_STRING_type_check(s)), \ - _RTL_CONSTANT_STRING_remove_const_macro(s) } - #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) #define RTL_SIZEOF_THROUGH_FIELD(type, field) \ @@ -915,6 +967,7 @@ #else #define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) #endif + #define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) #define _ARRAYSIZE(A) RTL_NUMBER_OF_V1(A) @@ -927,9 +980,9 @@ : (FIELD_OFFSET(type, field1) - FIELD_OFFSET(type, field2) - RTL_FIELD_SIZE(type, field2))) #if defined(__cplusplus) -#define RTL_CONST_CAST(type) const_cast<type> -#else -#define RTL_CONST_CAST(type) (type) +# define RTL_CONST_CAST(type) const_cast<type> +#else +# define RTL_CONST_CAST(type) (type) #endif /* Type Limits */ @@ -951,14 +1004,14 @@ #if defined(MIDL_PASS)|| defined(RC_INVOKED) || defined(_M_CEE_PURE) /* Use native math */ -#define Int64ShllMod32(a,b) ((unsigned __int64)(a)<<(b)) -#define Int64ShraMod32(a,b) (((__int64)(a))>>(b)) -#define Int64ShrlMod32(a,b) (((unsigned __int64)(a))>>(b)) +# define Int64ShllMod32(a,b) ((unsigned __int64)(a)<<(b)) +# define Int64ShraMod32(a,b) (((__int64)(a))>>(b)) +# define Int64ShrlMod32(a,b) (((unsigned __int64)(a))>>(b)) #else /* Use intrinsics */ -#define Int64ShllMod32(a,b) __ll_lshift(a,b) -#define Int64ShraMod32(a,b) __ll_rshift(a,b) -#define Int64ShrlMod32(a,b) __ull_rshift(a,b) +# define Int64ShllMod32(a,b) __ll_lshift(a,b) +# define Int64ShraMod32(a,b) __ll_rshift(a,b) +# define Int64ShrlMod32(a,b) __ull_rshift(a,b) #endif #define RotateLeft32 _rotl @@ -967,10 +1020,10 @@ #define RotateRight64 _rotr64 #if defined(_M_AMD64) -#define RotateLeft8 _rotl8 -#define RotateLeft16 _rotl16 -#define RotateRight8 _rotr8 -#define RotateRight16 _rotr16 +# define RotateLeft8 _rotl8 +# define RotateLeft16 _rotl16 +# define RotateRight8 _rotr8 +# define RotateRight16 _rotr16 #endif /* _M_AMD64 */ /* C_ASSERT Definition */ @@ -1104,7 +1157,7 @@ #define PRIMARYLANGID(lgid) ((USHORT)(lgid) & 0x3ff) #define SUBLANGID(lgid) ((USHORT)(lgid) >> 10) #define MAKELCID(lgid, srtid) ((ULONG)((((ULONG)((USHORT)(srtid))) << 16) | \ - ((ULONG)((USHORT)(lgid))))) + ((ULONG)((USHORT)(lgid))))) #define MAKESORTLCID(lgid, srtid, ver) \ ((ULONG)((MAKELCID(lgid, srtid)) | \ (((ULONG)((USHORT)(ver))) << 20))) @@ -1132,9 +1185,9 @@ #define LANG_BASQUE 0x2d #define LANG_BELARUSIAN 0x23 #define LANG_BENGALI 0x45 -#define LANG_BRETON 0x7e #define LANG_BOSNIAN 0x1a #define LANG_BOSNIAN_NEUTRAL 0x781a +#define LANG_BRETON 0x7e #define LANG_BULGARIAN 0x02 #define LANG_CATALAN 0x03 #define LANG_CENTRAL_KURDISH 0x92 @@ -1521,8 +1574,8 @@ #define SORT_GEORGIAN_TRADITIONAL 0x0 #define SORT_GEORGIAN_MODERN 0x1 -#define LANG_SYSTEM_DEFAULT MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT)) -#define LANG_USER_DEFAULT MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)) +#define LANG_SYSTEM_DEFAULT MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT) +#define LANG_USER_DEFAULT MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT) #define LOCALE_SYSTEM_DEFAULT MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT) #define LOCALE_USER_DEFAULT MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT) Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -1379,7 +1379,7 @@ #define SUBLANG_SOTHO_NORTHERN_SOUTH_AFRICA 0x01 #define SUBLANG_TSWANA_SOUTH_AFRICA 0x01 #define SUBLANG_SINDHI_AFGHANISTAN 0x02 -#define SUBLANG_SINDHI_PAKISTAN 0x01 +#define SUBLANG_SINDHI_PAKISTAN 0x02 #define SUBLANG_SINHALESE_SRI_LANKA 0x01 #define SUBLANG_SLOVAK_SLOVAKIA 0x01 #define SUBLANG_SLOVENIAN_SLOVENIA 0x01 @@ -1676,8 +1676,8 @@ #else #define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) #endif -//#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) -//#define _ARRAYSIZE(A) RTL_NUMBER_OF_V1(A) +#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) +#define _ARRAYSIZE(A) RTL_NUMBER_OF_V1(A) #define RTL_FIELD_TYPE(type, field) (((type*)0)->field) #define RTL_NUMBER_OF_FIELD(type, field) (RTL_NUMBER_OF(RTL_FIELD_TYPE(type, field))) Modified: trunk/reactos/lib/fslib/ext2lib/Disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Disk.c?r… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Disk.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Disk.c [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -15,7 +15,7 @@ /* FUNCTIONS *************************************************************/ -PCCHAR +PCCH Ext2StatusToString ( IN NTSTATUS Status ) { switch (Status) @@ -953,14 +953,14 @@ * Length : Data Length to be read * Buffer : ... * - * RETURNS: + * RETURNS: * Success: STATUS_SUCCESS * Fail: ... * - * NOTES: + * NOTES: * Both Length and Offset should be SECTOR_SIZE aligned. */ -NTSTATUS +NTSTATUS Ext2ReadDisk( PEXT2_FILESYS Ext2Sys, ULONGLONG Offset, ULONG Length, @@ -1023,11 +1023,11 @@ goto errorout; } - RtlCopyMemory( Buffer, + RtlCopyMemory( Buffer, (PUCHAR)NonPagedBuffer + (ULONG)(Offset - Address.QuadPart), Length ); } - + errorout: if (NonPagedBuffer) @@ -1047,11 +1047,11 @@ * Length : Data Length to be written * Buffer : Data to be written ... * - * RETURNS: + * RETURNS: * Success: STATUS_SUCCESS * Fail: ... * - * NOTES: + * NOTES: * Both Length and Offset should be SECTOR_SIZE aligned. */ @@ -1151,10 +1151,10 @@ * ARGUMENTS: * VolumeHandle: Volume handle. * - * RETURNS: + * RETURNS: * Success or Fail * - * NOTES: + * NOTES: * N/A */ @@ -1200,10 +1200,10 @@ * ARGUMENTS: * VolumeHandle: Volume handle. * - * RETURNS: + * RETURNS: * Success or Fail * - * NOTES: + * NOTES: * N/A */ Modified: trunk/reactos/win32ss/user/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] Sat Aug 30 22:26:42 2014 @@ -31,6 +31,7 @@ #define SPY_MAX_MSGNUM WM_USER #define SPY_INDENT_UNIT 4 /* 4 spaces */ +#undef ARRAYSIZE #define ARRAYSIZE(a) ((sizeof(a) / sizeof((a)[0]))) #define DEBUG_SPY 0 @@ -2095,7 +2096,7 @@ { INT index; if (offset < 0 && offset % 2 == 0 && ((index = -(offset + 8) / 2) < - sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) + sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) { return ClassLongOffsetNames[index]; } @@ -2680,4 +2681,4 @@ break; } SetLastError( save_error ); -} +}

10 years, 3 months

[jgardou] 63999: [README.WINE] - Relevant update from previous commits

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Aug 30 21:43:40 2014 New Revision: 63999 URL: http://svn.reactos.org/svn/reactos?rev=63999&view=rev Log: [README.WINE] - Relevant update from previous commits Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Aug 30 21:43:40 2014 @@ -313,6 +313,16 @@ reactos/dll/win32/user32/windows/text.c # Forked (lstr.c) reactos/dll/win32/user32/windows/winpos.c # Forked +schannel.c + reactos/dll/win32/schannel/schannel_wine.c # synced to wine-1.7.17 (secur32/schannel.c) + reactos/dll/win32/schannel/schannel_gnutls.c # synced to wine-1.7.17 (secur32/schannel_gnutls.c) + reactos/dll/win32/schannel/secur32_wine.c # partial sync to wine-1.7.17 (secur32/secur32.c) + +secur32 - + reactos/dll/win32/secur32/sspi.c # partial sync to wine-1.7.17 (secur32.c) + reactos/dll/win32/secur32/thunks.c # synced to wine-1.7.17 + reactos/dll/win32/secur32/wrapper.c # synced to wine-1.7.17 + ws2_32 - reactos/dll/win32/ws2_32/misc/async.c # Synced to Wine-1.5.4

10 years, 3 months

[tkreuzer] 63998: [XDK] Initial work for autogenerating ntdef.h and winnt.h to reduce code duplication by sharing a lot of stuff.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 30 21:35:16 2014 New Revision: 63998 URL: http://svn.reactos.org/svn/reactos?rev=63998&view=rev Log: [XDK] Initial work for autogenerating ntdef.h and winnt.h to reduce code duplication by sharing a lot of stuff. Added: trunk/reactos/include/xdk/ntbasedef.h (with props) trunk/reactos/include/xdk/ntdef.template.h (with props) trunk/reactos/include/xdk/winnt.template.h (with props) trunk/reactos/include/xdk/winnt_old.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/include/xdk/ntbasedef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntbasedef.h?re… Added: trunk/reactos/include/xdk/ntdef.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntdef.template… Added: trunk/reactos/include/xdk/winnt.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt.template… Added: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re…

10 years, 3 months

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 August 2014