Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 58447: [CONSRV] - Start to sort out things that depends only of the internals of a console, and things which are only related to "terminal emulators". Do it especially for (what I will c...
by hbelusca＠svn.reactos.org 08 Mar '13

08 Mar '13

Author: hbelusca Date: Fri Mar 8 23:37:11 2013 New Revision: 58447 URL: http://svn.reactos.org/svn/reactos?rev=58447&view=rev Log: [CONSRV] - Start to sort out things that depends only of the internals of a console, and things which are only related to "terminal emulators". Do it especially for (what I will call starting from now) the "GUI terminal emulator". - Temporarily deactivate starting "TUI terminals". - Temporarily break report that the terminal window is held by the current running console application in it (see r58107). This will be fixed later on. Modified: branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/settings.h branches/ros-csrss/win32ss/user/consrv/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.h Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -15,14 +15,6 @@ #define DEFAULT_SCREEN_ATTRIB (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED) #define DEFAULT_POPUP_ATTRIB (FOREGROUND_BLUE | FOREGROUND_RED | \ BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY) - -#ifndef WM_APP -#define WM_APP 0x8000 -#endif -#define PM_CREATE_CONSOLE (WM_APP + 1) -#define PM_DESTROY_CONSOLE (WM_APP + 2) -#define PM_CONSOLE_BEEP (WM_APP + 3) -#define PM_CONSOLE_SET_TITLE (WM_APP + 4) /************************************************************************ @@ -82,16 +74,81 @@ INPUT_RECORD InputEvent; } ConsoleInput; +typedef struct _TERMINAL_VTBL +{ + /* + * Internal interface (functions called by the console server only) + */ + VOID (WINAPI *CleanupConsole)(struct _CONSOLE* Console); + VOID (WINAPI *WriteStream)(struct _CONSOLE* Console, + SMALL_RECT* Block, + LONG CursorStartX, + LONG CursorStartY, + UINT ScrolledLines, + CHAR *Buffer, + UINT Length); + VOID (WINAPI *DrawRegion)(struct _CONSOLE* Console, + SMALL_RECT* Region); + BOOL (WINAPI *SetCursorInfo)(struct _CONSOLE* Console, + PCONSOLE_SCREEN_BUFFER ScreenBuffer); + BOOL (WINAPI *SetScreenInfo)(struct _CONSOLE* Console, + PCONSOLE_SCREEN_BUFFER ScreenBuffer, + UINT OldCursorX, + UINT OldCursorY); + BOOL (WINAPI *UpdateScreenInfo)(struct _CONSOLE* Console, + PCONSOLE_SCREEN_BUFFER ScreenBuffer); + NTSTATUS (WINAPI *ResizeBuffer)(struct _CONSOLE* Console, + PCONSOLE_SCREEN_BUFFER ScreenBuffer, + COORD Size); + BOOL (WINAPI *ProcessKeyCallback)(struct _CONSOLE* Console, + MSG* msg, + BYTE KeyStateMenu, + DWORD ShiftState, + UINT VirtualKeyCode, + BOOL Down); + + /* + * External interface (functions corresponding to the Console API) + */ + VOID (WINAPI *ChangeTitle)(struct _CONSOLE* Console); + BOOL (WINAPI *ChangeIcon)(struct _CONSOLE* Console, + HICON hWindowIcon); + HWND (WINAPI *GetConsoleWindowHandle)(struct _CONSOLE* Console); + +} TERMINAL_VTBL, *PTERMINAL_VTBL; + +#define ConioDrawRegion(Console, Region) (Console)->TermIFace.Vtbl->DrawRegion((Console), (Region)) +#define ConioWriteStream(Console, Block, CurStartX, CurStartY, ScrolledLines, Buffer, Length) \ + (Console)->TermIFace.Vtbl->WriteStream((Console), (Block), (CurStartX), (CurStartY), \ + (ScrolledLines), (Buffer), (Length)) +#define ConioSetCursorInfo(Console, Buff) (Console)->TermIFace.Vtbl->SetCursorInfo((Console), (Buff)) +#define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ + (Console)->TermIFace.Vtbl->SetScreenInfo((Console), (Buff), (OldCursorX), (OldCursorY)) +#define ConioUpdateScreenInfo(Console, Buff) \ + (Console)->TermIFace.Vtbl->UpdateScreenInfo((Console), (Buff)) +#define ConioChangeTitle(Console) (Console)->TermIFace.Vtbl->ChangeTitle(Console) +#define ConioCleanupConsole(Console) (Console)->TermIFace.Vtbl->CleanupConsole(Console) +#define ConioChangeIcon(Console, hWindowIcon) (Console)->TermIFace.Vtbl->ChangeIcon((Console), (hWindowIcon)) +#define ConioResizeBuffer(Console, Buff, Size) (Console)->TermIFace.Vtbl->ResizeBuffer((Console), (Buff), (Size)) +#define ConioProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ + (Console)->TermIFace.Vtbl->ProcessKeyCallback((Console), (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) + +typedef struct _TERMINAL_IFACE +{ + PTERMINAL_VTBL Vtbl; /* Virtual table */ + PVOID Data; /* Private data */ + PVOID OldData; /* Reserved */ +} TERMINAL_IFACE, *PTERMINAL_IFACE; + typedef struct _CONSOLE { LONG ReferenceCount; /* Is incremented each time a handle to a screen-buffer or the input buffer of this console gets referenced, or the console gets locked */ CRITICAL_SECTION Lock; struct _CONSOLE *Prev, *Next; /* Next and Prev consoles in console wheel */ - struct _CONSOLE_VTBL *Vtbl; /* Using CUI or GUI consoles */ - - CLIENT_ID ConsoleLeaderCID; /* Contains the Console Leader Process CID for this console. TODO: Is it possible to compute it via the contents of the ProcessList list ?? */ - LIST_ENTRY ProcessList; + LIST_ENTRY ProcessList; /* List of processes owning the console. The first one is the so-called "Console Leader Process" */ + + TERMINAL_IFACE TermIFace; /* Terminal-specific interface */ /**************************** Input buffer and data ***************************/ CONSOLE_INPUT_BUFFER InputBuffer; /* Input buffer of the console */ @@ -129,18 +186,12 @@ ULONG NumberOfHistoryBuffers; /* Maximum number of history buffers allowed */ BOOLEAN HistoryNoDup; /* Remove old duplicate history entries */ -/******************************* Common UI data *******************************/ - UNICODE_STRING OriginalTitle; /* Original title of console, the one when the console leader is launched. It is always NULL-terminated */ - UNICODE_STRING Title; /* Title of console. It is always NULL-terminated */ +/****************************** Other properties ******************************/ + UNICODE_STRING OriginalTitle; /* Original title of console, the one when the console leader is launched. Always NULL-terminated */ + UNICODE_STRING Title; /* Title of console. Always NULL-terminated */ COORD Size; /* Size of the console (different of the size of the screen buffer */ COLORREF Colors[16]; /* Colour palette */ - -/****************************** GUI-related data ******************************/ - HWND hWindow; /* Handle to the console's window */ - HICON hIcon; /* Handle to its icon (used when freeing) */ - HICON hIconSm; - PVOID GuiData; /* PGUI_CONSOLE_DATA */ } CONSOLE, *PCONSOLE; @@ -150,28 +201,18 @@ #define GWLP_CONSOLE_LEADER_PID 0 #define GWLP_CONSOLE_LEADER_TID 4 -#define SetConsoleWndConsoleLeaderCID(Console) \ -do { \ - SetWindowLongPtrW((Console)->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)((Console)->ConsoleLeaderCID.UniqueProcess)); \ - SetWindowLongPtrW((Console)->hWindow, GWLP_CONSOLE_LEADER_TID, (LONG_PTR)((Console)->ConsoleLeaderCID.UniqueThread )); \ +#define SetConsoleWndConsoleLeaderCID(GuiData) \ +do { \ + PCONSOLE_PROCESS_DATA ProcessData; \ + CLIENT_ID ConsoleLeaderCID; \ + ProcessData = CONTAINING_RECORD((GuiData)->Console->ProcessList.Blink, \ + CONSOLE_PROCESS_DATA, \ + ConsoleLink); \ + ConsoleLeaderCID = ProcessData->Process->ClientId; \ + SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); \ + SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_TID, (LONG_PTR)(ConsoleLeaderCID.UniqueThread )); \ } while(0) /**************************************************************/ - -typedef struct _CONSOLE_VTBL -{ - VOID (WINAPI *WriteStream)(PCONSOLE Console, SMALL_RECT* Block, LONG CursorStartX, LONG CursorStartY, - UINT ScrolledLines, CHAR *Buffer, UINT Length); - VOID (WINAPI *DrawRegion)(PCONSOLE Console, SMALL_RECT* Region); - BOOL (WINAPI *SetCursorInfo)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer); - BOOL (WINAPI *SetScreenInfo)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, - UINT OldCursorX, UINT OldCursorY); - BOOL (WINAPI *UpdateScreenInfo)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer); - VOID (WINAPI *ChangeTitle)(PCONSOLE Console); - VOID (WINAPI *CleanupConsole)(PCONSOLE Console); - BOOL (WINAPI *ChangeIcon)(PCONSOLE Console, HICON hWindowIcon); - NTSTATUS (WINAPI *ResizeBuffer)(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size); - BOOL (WINAPI *ProcessKeyCallback)(PCONSOLE Console, MSG* msg, BYTE KeyStateMenu, DWORD ShiftState, UINT VirtualKeyCode, BOOL Down); -} CONSOLE_VTBL, *PCONSOLE_VTBL; /* CONSOLE_SELECTION_INFO dwFlags values */ #define CONSOLE_NO_SELECTION 0x0 @@ -179,6 +220,7 @@ #define CONSOLE_SELECTION_NOT_EMPTY 0x2 #define CONSOLE_MOUSE_SELECTION 0x4 #define CONSOLE_MOUSE_DOWN 0x8 + /* HistoryFlags values */ #define HISTORY_NO_DUP_FLAG 0x1 @@ -186,21 +228,6 @@ #define PAUSED_FROM_KEYBOARD 0x1 #define PAUSED_FROM_SCROLLBAR 0x2 #define PAUSED_FROM_SELECTION 0x4 - -#define ConioDrawRegion(Console, Region) (Console)->Vtbl->DrawRegion((Console), (Region)) -#define ConioWriteStream(Console, Block, CurStartX, CurStartY, ScrolledLines, Buffer, Length) \ - (Console)->Vtbl->WriteStream((Console), (Block), (CurStartX), (CurStartY), \ - (ScrolledLines), (Buffer), (Length)) -#define ConioSetCursorInfo(Console, Buff) (Console)->Vtbl->SetCursorInfo((Console), (Buff)) -#define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ - (Console)->Vtbl->SetScreenInfo((Console), (Buff), (OldCursorX), (OldCursorY)) -#define ConioUpdateScreenInfo(Console, Buff) \ - (Console)->Vtbl->UpdateScreenInfo((Console), (Buff)) -#define ConioChangeTitle(Console) (Console)->Vtbl->ChangeTitle(Console) -#define ConioCleanupConsole(Console) (Console)->Vtbl->CleanupConsole(Console) -#define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon((Console), (hWindowIcon)) -#define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer((Console), (Buff), (Size)) -#define ConioProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) (Console)->Vtbl->ProcessKeyCallback((Console), (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) /* console.c */ VOID WINAPI ConSrvDeleteConsole(PCONSOLE Console); Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -231,8 +231,9 @@ /* --- BEL ---*/ else if (Buffer[i] == '\a') { + // FIXME: This MUST BE moved to the terminal emulator!! DPRINT1("Bell\n"); - SendNotifyMessage(Console->hWindow, PM_CONSOLE_BEEP, 0, 0); + // SendNotifyMessage(Console->hWindow, PM_CONSOLE_BEEP, 0, 0); continue; } } Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -14,7 +14,10 @@ #include "consrv.h" #include "settings.h" #include "guiconsole.h" -#include "tuiconsole.h" + +#ifdef TUI_CONSOLE + #include "tuiconsole.h" +#endif #include <shlwapi.h> #include <shlobj.h> @@ -324,7 +327,6 @@ */ InitializeCriticalSection(&Console->Lock); Console->ReferenceCount = 0; - Console->ConsoleLeaderCID = ConsoleLeaderProcess->ClientId; InitializeListHead(&Console->ProcessList); memcpy(Console->Colors, ConsoleInfo.Colors, sizeof(ConsoleInfo.Colors)); Console->Size = ConsoleInfo.ConsoleSize; @@ -385,10 +387,6 @@ Console->NumberOfHistoryBuffers = ConsoleInfo.NumberOfHistoryBuffers; Console->HistoryNoDup = ConsoleInfo.HistoryNoDup; - /* Finish initialization */ - Console->GuiData = NULL; - Console->hIcon = Console->hIconSm = NULL; - /* Initialize the console title */ RtlCreateUnicodeString(&Console->OriginalTitle, ConsoleStartInfo->ConsoleTitle); if (ConsoleStartInfo->ConsoleTitle[0] == L'\0') @@ -408,35 +406,41 @@ } /* - * If we are not in GUI-mode, start the text-mode console. - * If we fail, try to start the GUI-mode console. + * If we are not in GUI-mode, start the text-mode terminal emulator. + * If we fail, try to start the GUI-mode terminal emulator. */ +#ifdef TUI_CONSOLE GuiMode = DtbgIsDesktopVisible(); - +#else + GuiMode = TRUE; +#endif + +#ifdef TUI_CONSOLE if (!GuiMode) { - DPRINT1("CONSRV: Opening text-mode console\n"); + DPRINT1("CONSRV: Opening text-mode terminal emulator\n"); Status = TuiInitConsole(Console, &ConsoleInfo); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open text-mode console, switching to gui-mode, Status = 0x%08lx\n", Status); + DPRINT1("Failed to open text-mode terminal emulator, switching to gui-mode, Status = 0x%08lx\n", Status); GuiMode = TRUE; } } +#endif /* - * Try to open the GUI-mode console. Two cases are possible: + * Try to open the GUI-mode terminal emulator. Two cases are possible: * - We are in GUI-mode, therefore GuiMode == TRUE, the previous test-case - * failed and we start GUI-mode console. + * failed and we start GUI-mode terminal emulator. * - We are in text-mode, therefore GuiMode == FALSE, the previous test-case - * succeeded BUT we failed at starting text-mode console. Then GuiMode - * was switched to TRUE in order to try to open the console in GUI-mode - * (win32k will automatically switch to graphical mode, therefore - * no additional code is needed). + * succeeded BUT we failed at starting text-mode terminal emulator. + * Then GuiMode was switched to TRUE in order to try to open the GUI-mode + * terminal emulator (win32k will automatically switch to graphical mode, + * therefore no additional code is needed). */ if (GuiMode) { - DPRINT1("CONSRV: Opening GUI-mode console\n"); + DPRINT1("CONSRV: Opening GUI-mode terminal emulator\n"); Status = GuiInitConsole(Console, AppPath, &ConsoleInfo, @@ -1023,7 +1027,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - GetWindowRequest->WindowHandle = Console->hWindow; + GetWindowRequest->WindowHandle = Console->TermIFace.Vtbl->GetConsoleWindowHandle(Console); ConSrvReleaseConsole(Console, TRUE); return STATUS_SUCCESS; Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/guiconsole.c - * PURPOSE: Implementation of GUI-mode consoles + * PURPOSE: GUI terminal emulator * PROGRAMMERS: */ @@ -23,6 +23,14 @@ /* GUI Console Window Class name */ #define GUI_CONSOLE_WINDOW_CLASS L"ConsoleWindowClass" + +#ifndef WM_APP + #define WM_APP 0x8000 +#endif +#define PM_CREATE_CONSOLE (WM_APP + 1) +#define PM_DESTROY_CONSOLE (WM_APP + 2) +#define PM_CONSOLE_BEEP (WM_APP + 3) +#define PM_CONSOLE_SET_TITLE (WM_APP + 4) /* Not defined in any header file */ @@ -44,15 +52,17 @@ BOOL WindowSizeLock; POINT OldCursor; - // HWND hWindow; - // HICON hIcon; - // HICON hIconSm; + HWND hWindow; /* Handle to the console's window */ + HICON hIcon; /* Handle to the console's icon (big) */ + HICON hIconSm; /* Handle to the console's icon (small) */ + // COLORREF Colors[16]; HFONT Font; UINT CharWidth; UINT CharHeight; - GUI_CONSOLE_INFO GuiInfo; + PCONSOLE Console; /* Pointer to the owned console */ + GUI_CONSOLE_INFO GuiInfo; /* GUI terminal settings */ } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; static BOOL ConsInitialized = FALSE; @@ -171,38 +181,38 @@ } static VOID -GuiConsoleCreateSysMenu(PCONSOLE Console) +GuiConsoleCreateSysMenu(HWND hWnd) { HMENU hMenu; - hMenu = GetSystemMenu(Console->hWindow, - FALSE); + hMenu = GetSystemMenu(hWnd, FALSE); if (hMenu != NULL) { - GuiConsoleAppendMenuItems(hMenu, - GuiConsoleMainMenuItems); - DrawMenuBar(Console->hWindow); - } -} - - -static VOID -GuiConsoleCopy(HWND hWnd, PCONSOLE Console); -static VOID -GuiConsolePaste(HWND hWnd, PCONSOLE Console); + GuiConsoleAppendMenuItems(hMenu, GuiConsoleMainMenuItems); + DrawMenuBar(hWnd); + } +} + + +static VOID +GuiConsoleCopy(PGUI_CONSOLE_DATA GuiData); +static VOID +GuiConsolePaste(PGUI_CONSOLE_DATA GuiData); static VOID GuiConsoleUpdateSelection(PCONSOLE Console, PCOORD coord); static VOID -GuiConsoleShowConsoleProperties(PCONSOLE Console, - HWND hWnd, - BOOL Defaults); +GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData, BOOL Defaults); +static VOID WINAPI +GuiDrawRegion(PCONSOLE Console, SMALL_RECT* Region); +static NTSTATUS WINAPI +GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size); +VOID FASTCALL +GuiConsoleInitScrollbar(PGUI_CONSOLE_DATA GuiData); + static LRESULT -GuiConsoleHandleSysMenuCommand(PCONSOLE Console, - HWND hWnd, - WPARAM wParam, LPARAM lParam) +GuiConsoleHandleSysMenuCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) { LRESULT Ret = TRUE; - COORD bottomRight = { 0, 0 }; switch (wParam) { @@ -211,18 +221,23 @@ break; case ID_SYSTEM_EDIT_COPY: - GuiConsoleCopy(hWnd, Console); + GuiConsoleCopy(GuiData); break; case ID_SYSTEM_EDIT_PASTE: - GuiConsolePaste(hWnd, Console); + GuiConsolePaste(GuiData); break; case ID_SYSTEM_EDIT_SELECTALL: + { + PCONSOLE Console = GuiData->Console; + COORD bottomRight = { 0, 0 }; + bottomRight.X = Console->Size.X - 1; bottomRight.Y = Console->Size.Y - 1; GuiConsoleUpdateSelection(Console, &bottomRight); break; + } case ID_SYSTEM_EDIT_SCROLL: DPRINT1("Scrolling is not handled yet\n"); @@ -233,27 +248,25 @@ break; case ID_SYSTEM_DEFAULTS: - GuiConsoleShowConsoleProperties(Console, hWnd, TRUE); + GuiConsoleShowConsoleProperties(GuiData, TRUE); break; case ID_SYSTEM_PROPERTIES: - GuiConsoleShowConsoleProperties(Console, hWnd, FALSE); + GuiConsoleShowConsoleProperties(GuiData, FALSE); break; default: - Ret = DefWindowProcW(hWnd, WM_SYSCOMMAND, wParam, lParam); + Ret = DefWindowProcW(GuiData->hWindow, WM_SYSCOMMAND, wParam, lParam); break; } return Ret; } static VOID -GuiConsoleShowConsoleProperties(PCONSOLE Console, - HWND hWnd, - BOOL Defaults) +GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData, BOOL Defaults) { NTSTATUS Status; - PGUI_CONSOLE_DATA GuiData = Console->GuiData; + PCONSOLE Console = GuiData->Console; PCONSOLE_PROCESS_DATA ProcessData; HANDLE hSection = NULL, hClientSection = NULL; LARGE_INTEGER SectionSize; @@ -262,8 +275,6 @@ PCONSOLE_PROPS pSharedInfo = NULL; DPRINT("GuiConsoleShowConsoleProperties entered\n"); - - if (GuiData == NULL) return; /* Create a memory section to share with the applet, and map it */ SectionSize.QuadPart = sizeof(CONSOLE_PROPS); @@ -301,7 +312,7 @@ * Setup the shared console properties structure. */ /* Header */ - pSharedInfo->hConsoleWindow = hWnd; // Console->hWindow; + pSharedInfo->hConsoleWindow = GuiData->hWindow; pSharedInfo->ShowDefaultParams = Defaults; /* Console information */ pSharedInfo->ci.HistoryBufferSize = Console->HistoryBufferSize; @@ -380,18 +391,13 @@ return; } - -static NTSTATUS WINAPI -GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size); -VOID FASTCALL -GuiConsoleInitScrollbar(PCONSOLE Console, HWND hwnd); - -static VOID -GuiApplyUserSettings(PCONSOLE Console, +static VOID +GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData, HANDLE hClientSection, BOOL SaveSettings) { NTSTATUS Status; + PCONSOLE Console = GuiData->Console; PCONSOLE_PROCESS_DATA ProcessData; HANDLE hSection = NULL; ULONG ViewSize = 0; @@ -446,6 +452,8 @@ return; } + // TODO: Check that GuiData->hWindow == pConInfo->hConsoleWindow + /* * Apply foreground and background colors for both screen and popup. * Copy the new palette. @@ -475,13 +483,9 @@ if (SizeChanged) { - PGUI_CONSOLE_DATA GuiData = Console->GuiData; - if (GuiData) - { - GuiData->WindowSizeLock = TRUE; - GuiConsoleInitScrollbar(Console, pConInfo->hConsoleWindow); - GuiData->WindowSizeLock = FALSE; - } + GuiData->WindowSizeLock = TRUE; + GuiConsoleInitScrollbar(GuiData); + GuiData->WindowSizeLock = FALSE; } /// LOCK /// LeaveCriticalSection(&Console->Lock); @@ -500,18 +504,19 @@ NtClose(hSection); } -static PCONSOLE -GuiGetWindowConsole(HWND hWnd) -{ - return (PCONSOLE)GetWindowLongPtrW(hWnd, GWLP_USERDATA); +static PGUI_CONSOLE_DATA +GuiGetGuiData(HWND hWnd) +{ + PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + return ( ((GuiData == NULL) || (GuiData->hWindow == hWnd && GuiData->Console != NULL)) ? GuiData : NULL ); } VOID FASTCALL -GuiConsoleInitScrollbar(PCONSOLE Console, HWND hwnd) -{ +GuiConsoleInitScrollbar(PGUI_CONSOLE_DATA GuiData) +{ + PCONSOLE Console = GuiData->Console; SCROLLINFO sInfo; - PGUI_CONSOLE_DATA GuiData = Console->GuiData; DWORD Width = Console->Size.X * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); DWORD Height = Console->Size.Y * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); @@ -525,13 +530,13 @@ sInfo.nMax = Console->ActiveBuffer->ScreenBufferSize.Y - 1; sInfo.nPage = Console->Size.Y; sInfo.nPos = Console->ActiveBuffer->ShowY; - SetScrollInfo(hwnd, SB_VERT, &sInfo, TRUE); + SetScrollInfo(GuiData->hWindow, SB_VERT, &sInfo, TRUE); Width += GetSystemMetrics(SM_CXVSCROLL); - ShowScrollBar(hwnd, SB_VERT, TRUE); + ShowScrollBar(GuiData->hWindow, SB_VERT, TRUE); } else { - ShowScrollBar(hwnd, SB_VERT, FALSE); + ShowScrollBar(GuiData->hWindow, SB_VERT, FALSE); } if (Console->ActiveBuffer->ScreenBufferSize.X > Console->Size.X) @@ -539,31 +544,31 @@ sInfo.nMax = Console->ActiveBuffer->ScreenBufferSize.X - 1; sInfo.nPage = Console->Size.X; sInfo.nPos = Console->ActiveBuffer->ShowX; - SetScrollInfo(hwnd, SB_HORZ, &sInfo, TRUE); + SetScrollInfo(GuiData->hWindow, SB_HORZ, &sInfo, TRUE); Height += GetSystemMetrics(SM_CYHSCROLL); - ShowScrollBar(hwnd, SB_HORZ, TRUE); + ShowScrollBar(GuiData->hWindow, SB_HORZ, TRUE); } else { - ShowScrollBar(hwnd, SB_HORZ, FALSE); - } - - SetWindowPos(hwnd, NULL, 0, 0, Width, Height, + ShowScrollBar(GuiData->hWindow, SB_HORZ, FALSE); + } + + SetWindowPos(GuiData->hWindow, NULL, 0, 0, Width, Height, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); } static BOOL GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create) { - PCONSOLE Console = (PCONSOLE)Create->lpCreateParams; - PGUI_CONSOLE_DATA GuiData = Console->GuiData; + PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Create->lpCreateParams; + PCONSOLE Console = GuiData->Console; HDC Dc; HFONT OldFont; TEXTMETRICW Metrics; SIZE CharSize; - Console->hWindow = hWnd; + GuiData->hWindow = hWnd; if (NULL == GuiData) { @@ -594,7 +599,7 @@ RtlFreeHeap(ConSrvHeap, 0, GuiData); return FALSE; } - Dc = GetDC(hWnd); + Dc = GetDC(GuiData->hWindow); if (NULL == Dc) { DPRINT1("GuiConsoleNcCreate: GetDC failed\n"); @@ -607,7 +612,7 @@ if (NULL == OldFont) { DPRINT1("GuiConsoleNcCreate: SelectObject failed\n"); - ReleaseDC(hWnd, Dc); + ReleaseDC(GuiData->hWindow, Dc); DeleteObject(GuiData->Font); DeleteCriticalSection(&GuiData->Lock); RtlFreeHeap(ConSrvHeap, 0, GuiData); @@ -617,7 +622,7 @@ { DPRINT1("GuiConsoleNcCreate: GetTextMetrics failed\n"); SelectObject(Dc, OldFont); - ReleaseDC(hWnd, Dc); + ReleaseDC(GuiData->hWindow, Dc); DeleteObject(GuiData->Font); DeleteCriticalSection(&GuiData->Lock); RtlFreeHeap(ConSrvHeap, 0, GuiData); @@ -632,7 +637,7 @@ SelectObject(Dc, OldFont); - ReleaseDC(hWnd, Dc); + ReleaseDC(GuiData->hWindow, Dc); // FIXME: Keep these instructions here ? /////////////////////////////////// Console->ActiveBuffer->CursorBlinkOn = TRUE; @@ -640,25 +645,26 @@ //////////////////////////////////////////////////////////////////////////// DPRINT("Console %p GuiData %p\n", Console, GuiData); - SetWindowLongPtrW(hWnd, GWLP_USERDATA, (DWORD_PTR)Console); - - SetTimer(hWnd, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); - GuiConsoleCreateSysMenu(Console); + SetWindowLongPtrW(GuiData->hWindow, GWLP_USERDATA, (DWORD_PTR)GuiData); + + SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); + GuiConsoleCreateSysMenu(GuiData->hWindow); GuiData->WindowSizeLock = TRUE; - GuiConsoleInitScrollbar(Console, hWnd); + GuiConsoleInitScrollbar(GuiData); GuiData->WindowSizeLock = FALSE; SetEvent(GuiData->hGuiInitEvent); - return (BOOL)DefWindowProcW(hWnd, WM_NCCREATE, 0, (LPARAM)Create); -} - -static VOID -SmallRectToRect(PCONSOLE Console, PRECT Rect, PSMALL_RECT SmallRect) -{ + return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create); +} + +static VOID +SmallRectToRect(PGUI_CONSOLE_DATA GuiData, PRECT Rect, PSMALL_RECT SmallRect) +{ + PCONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; - PGUI_CONSOLE_DATA GuiData = Console->GuiData; + Rect->left = (SmallRect->Left - Buffer->ShowX) * GuiData->CharWidth; Rect->top = (SmallRect->Top - Buffer->ShowY) * GuiData->CharHeight; Rect->right = (SmallRect->Right + 1 - Buffer->ShowX) * GuiData->CharWidth; @@ -668,10 +674,10 @@ static VOID GuiConsoleUpdateSelection(PCONSOLE Console, PCOORD coord) { + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; RECT oldRect, newRect; - HWND hWnd = Console->hWindow; - - SmallRectToRect(Console, &oldRect, &Console->Selection.srSelection); + + SmallRectToRect(GuiData, &oldRect, &Console->Selection.srSelection); if(coord != NULL) { @@ -682,7 +688,7 @@ rc.Right = max(Console->Selection.dwSelectionAnchor.X, coord->X); rc.Bottom = max(Console->Selection.dwSelectionAnchor.Y, coord->Y); - SmallRectToRect(Console, &newRect, &rc); + SmallRectToRect(GuiData, &newRect, &rc); if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) { @@ -697,7 +703,7 @@ { if(CombineRgn(rgn1, rgn2, rgn1, RGN_XOR) != ERROR) { - InvalidateRgn(hWnd, rgn1, FALSE); + InvalidateRgn(GuiData->hWindow, rgn1, FALSE); } DeleteObject(rgn2); @@ -708,7 +714,7 @@ } else { - InvalidateRect(hWnd, &newRect, FALSE); + InvalidateRect(GuiData->hWindow, &newRect, FALSE); } Console->Selection.dwFlags |= CONSOLE_SELECTION_NOT_EMPTY; Console->Selection.srSelection = rc; @@ -719,7 +725,7 @@ /* clear the selection */ if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) { - InvalidateRect(hWnd, &oldRect, FALSE); + InvalidateRect(GuiData->hWindow, &oldRect, FALSE); } Console->Selection.dwFlags = CONSOLE_NO_SELECTION; ConioUnpause(Console, PAUSED_FROM_SELECTION); @@ -758,8 +764,7 @@ if (BottomLine >= Buff->ScreenBufferSize.Y) BottomLine = Buff->ScreenBufferSize.Y - 1; if (RightChar >= Buff->ScreenBufferSize.X) RightChar = Buff->ScreenBufferSize.X - 1; - OldFont = SelectObject(hDC, - GuiData->Font); + OldFont = SelectObject(hDC, GuiData->Font); for (Line = TopLine; Line <= BottomLine; Line++) { @@ -825,39 +830,33 @@ CursorBrush = CreateSolidBrush(RGBFromAttrib(Console, Buff->ScreenDefaultAttrib)); } - OldBrush = SelectObject(hDC, - CursorBrush); + OldBrush = SelectObject(hDC, CursorBrush); PatBlt(hDC, (CursorX - Buff->ShowX) * GuiData->CharWidth, (CursorY - Buff->ShowY) * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), GuiData->CharWidth, CursorHeight, PATCOPY); - SelectObject(hDC, - OldBrush); + SelectObject(hDC, OldBrush); DeleteObject(CursorBrush); } } /// LOCK /// LeaveCriticalSection(&Buff->Header.Console->Lock); - SelectObject(hDC, - OldFont); -} - -static VOID -GuiConsoleHandlePaint(PCONSOLE Console, - HWND hWnd, - HDC hDCPaint) -{ - PGUI_CONSOLE_DATA GuiData = Console->GuiData; + SelectObject(hDC, OldFont); +} + +static VOID +GuiConsoleHandlePaint(PGUI_CONSOLE_DATA GuiData, HDC hDCPaint) +{ + PCONSOLE Console = GuiData->Console; HDC hDC; PAINTSTRUCT ps; - if (GuiData == NULL) return; if (Console->ActiveBuffer == NULL) return; - hDC = BeginPaint(hWnd, &ps); + hDC = BeginPaint(GuiData->hWindow, &ps); if (hDC != NULL && ps.rcPaint.left < ps.rcPaint.right && ps.rcPaint.top < ps.rcPaint.bottom) @@ -874,7 +873,7 @@ if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) { RECT rc; - SmallRectToRect(Console, &rc, &Console->Selection.srSelection); + SmallRectToRect(GuiData, &rc, &Console->Selection.srSelection); /* invert the selection */ if (IntersectRect(&rc, @@ -893,16 +892,16 @@ LeaveCriticalSection(&GuiData->Lock); } } - EndPaint(hWnd, &ps); -} - -static VOID -GuiConsoleHandleKey(PCONSOLE Console, HWND hWnd, - UINT msg, WPARAM wParam, LPARAM lParam) -{ + EndPaint(GuiData->hWindow, &ps); +} + +static VOID +GuiConsoleHandleKey(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam) +{ + PCONSOLE Console = GuiData->Console; MSG Message; - Message.hwnd = hWnd; + Message.hwnd = GuiData->hWindow; Message.message = msg; Message.wParam = wParam; Message.lParam = lParam; @@ -916,27 +915,6 @@ ConioProcessKey(Console, &Message); } -static BOOL WINAPI -GuiProcessKeyCallback(PCONSOLE Console, MSG* msg, BYTE KeyStateMenu, DWORD ShiftState, UINT VirtualKeyCode, BOOL Down) -{ - if ((ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED) || KeyStateMenu & 0x80) && - (VirtualKeyCode == VK_ESCAPE || VirtualKeyCode == VK_TAB || VirtualKeyCode == VK_SPACE)) - { - DefWindowProcW(msg->hwnd, msg->message, msg->wParam, msg->lParam); - return TRUE; - } - - return FALSE; -} - -static VOID WINAPI -GuiDrawRegion(PCONSOLE Console, SMALL_RECT* Region) -{ - RECT RegionRect; - SmallRectToRect(Console, &RegionRect, Region); - InvalidateRect(Console->hWindow, &RegionRect, FALSE); -} - static VOID GuiInvalidateCell(PCONSOLE Console, UINT x, UINT y) { @@ -944,100 +922,13 @@ GuiDrawRegion(Console, &CellRect); } -static VOID WINAPI -GuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, LONG CursorStartX, LONG CursorStartY, - UINT ScrolledLines, CHAR *Buffer, UINT Length) -{ - PGUI_CONSOLE_DATA GuiData = Console->GuiData; - PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; - LONG CursorEndX, CursorEndY; - RECT ScrollRect; - - if (NULL == Console->hWindow || NULL == GuiData) - { - return; - } - - if (0 != ScrolledLines) - { - ScrollRect.left = 0; - ScrollRect.top = 0; - ScrollRect.right = Console->Size.X * GuiData->CharWidth; - ScrollRect.bottom = Region->Top * GuiData->CharHeight; - - ScrollWindowEx(Console->hWindow, - 0, - -(ScrolledLines * GuiData->CharHeight), - &ScrollRect, - NULL, - NULL, - NULL, - SW_INVALIDATE); - } - - GuiDrawRegion(Console, Region); - - if (CursorStartX < Region->Left || Region->Right < CursorStartX - || CursorStartY < Region->Top || Region->Bottom < CursorStartY) - { - GuiInvalidateCell(Console, CursorStartX, CursorStartY); - } - - CursorEndX = Buff->CursorPosition.X; - CursorEndY = Buff->CursorPosition.Y; - if ((CursorEndX < Region->Left || Region->Right < CursorEndX - || CursorEndY < Region->Top || Region->Bottom < CursorEndY) - && (CursorEndX != CursorStartX || CursorEndY != CursorStartY)) - { - GuiInvalidateCell(Console, CursorEndX, CursorEndY); - } - - // Set up the update timer (very short interval) - this is a "hack" for getting the OS to - // repaint the window without having it just freeze up and stay on the screen permanently. - Buff->CursorBlinkOn = TRUE; - SetTimer(Console->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); -} - -static BOOL WINAPI -GuiSetCursorInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff) -{ - if (Console->ActiveBuffer == Buff) - { - GuiInvalidateCell(Console, Buff->CursorPosition.X, Buff->CursorPosition.Y); - } - - return TRUE; -} - -static BOOL WINAPI -GuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY) -{ - if (Console->ActiveBuffer == Buff) - { - /* Redraw char at old position (removes cursor) */ - GuiInvalidateCell(Console, OldCursorX, OldCursorY); - /* Redraw char at new position (shows cursor) */ - GuiInvalidateCell(Console, Buff->CursorPosition.X, Buff->CursorPosition.Y); - } - - return TRUE; -} - -static BOOL WINAPI -GuiUpdateScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff) -{ - return TRUE; -} - -static VOID -GuiConsoleHandleTimer(PCONSOLE Console, HWND hWnd) -{ - PGUI_CONSOLE_DATA GuiData = Console->GuiData; +static VOID +GuiConsoleHandleTimer(PGUI_CONSOLE_DATA GuiData) +{ + PCONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER Buff; - if (GuiData == NULL) return; - - SetTimer(hWnd, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL); + SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL); Buff = Console->ActiveBuffer; GuiInvalidateCell(Console, Buff->CursorPosition.X, Buff->CursorPosition.Y); @@ -1052,8 +943,8 @@ xScroll.cbSize = sizeof(SCROLLINFO); xScroll.fMask = SIF_POS; // Capture the original position of the scroll bars and save them. - if(GetScrollInfo(hWnd, SB_HORZ, &xScroll))OldScrollX = xScroll.nPos; - if(GetScrollInfo(hWnd, SB_VERT, &xScroll))OldScrollY = xScroll.nPos; + if(GetScrollInfo(GuiData->hWindow, SB_HORZ, &xScroll))OldScrollX = xScroll.nPos; + if(GetScrollInfo(GuiData->hWindow, SB_VERT, &xScroll))OldScrollY = xScroll.nPos; // If we successfully got the info for the horizontal scrollbar if(OldScrollX >= 0) @@ -1092,7 +983,7 @@ { Buff->ShowX = NewScrollX; Buff->ShowY = NewScrollY; - ScrollWindowEx(hWnd, + ScrollWindowEx(GuiData->hWindow, (OldScrollX - NewScrollX) * GuiData->CharWidth, (OldScrollY - NewScrollY) * GuiData->CharHeight, NULL, @@ -1103,14 +994,14 @@ if(NewScrollX >= 0) { xScroll.nPos = NewScrollX; - SetScrollInfo(hWnd, SB_HORZ, &xScroll, TRUE); + SetScrollInfo(GuiData->hWindow, SB_HORZ, &xScroll, TRUE); } if(NewScrollY >= 0) { xScroll.nPos = NewScrollY; - SetScrollInfo(hWnd, SB_VERT, &xScroll, TRUE); + SetScrollInfo(GuiData->hWindow, SB_VERT, &xScroll, TRUE); } - UpdateWindow(hWnd); + UpdateWindow(GuiData->hWindow); GuiData->OldCursor.x = Buff->CursorPosition.X; GuiData->OldCursor.y = Buff->CursorPosition.Y; } @@ -1118,8 +1009,9 @@ } static VOID -GuiConsoleHandleClose(PCONSOLE Console, HWND hWnd) -{ +GuiConsoleHandleClose(PGUI_CONSOLE_DATA GuiData) +{ + PCONSOLE Console = GuiData->Console; PLIST_ENTRY current_entry; PCONSOLE_PROCESS_DATA current; @@ -1148,12 +1040,12 @@ } static VOID -GuiConsoleHandleNcDestroy(PCONSOLE Console, HWND hWnd) -{ - PGUI_CONSOLE_DATA GuiData = Console->GuiData; +GuiConsoleHandleNcDestroy(PGUI_CONSOLE_DATA GuiData, HWND hWnd) +{ + PCONSOLE Console = GuiData->Console; KillTimer(hWnd, 1); - Console->GuiData = NULL; + Console->TermIFace.Data = NULL; DeleteCriticalSection(&GuiData->Lock); GetSystemMenu(hWnd, TRUE); @@ -1161,9 +1053,9 @@ } static COORD -PointToCoord(PCONSOLE Console, LPARAM lParam) -{ - PGUI_CONSOLE_DATA GuiData = Console->GuiData; +PointToCoord(PGUI_CONSOLE_DATA GuiData, LPARAM lParam) +{ + PCONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; COORD Coord; @@ -1185,54 +1077,50 @@ } static VOID -GuiConsoleLeftMouseDown(PCONSOLE Console, HWND hWnd, - LPARAM lParam) -{ - Console->Selection.dwSelectionAnchor = PointToCoord(Console, lParam); - - SetCapture(hWnd); - +GuiConsoleLeftMouseDown(PGUI_CONSOLE_DATA GuiData, LPARAM lParam) +{ + PCONSOLE Console = GuiData->Console; + + Console->Selection.dwSelectionAnchor = PointToCoord(GuiData, lParam); + SetCapture(GuiData->hWindow); Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS | CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; - GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); } static VOID -GuiConsoleLeftMouseUp(PCONSOLE Console, HWND hWnd, - LPARAM lParam) -{ +GuiConsoleLeftMouseUp(PGUI_CONSOLE_DATA GuiData, LPARAM lParam) +{ + PCONSOLE Console = GuiData->Console; COORD c; if (!(Console->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) return; - c = PointToCoord(Console, lParam); - + c = PointToCoord(GuiData, lParam); Console->Selection.dwFlags &= ~CONSOLE_MOUSE_DOWN; - GuiConsoleUpdateSelection(Console, &c); - ReleaseCapture(); } static VOID -GuiConsoleMouseMove(PCONSOLE Console, HWND hWnd, - WPARAM wParam, LPARAM lParam) -{ +GuiConsoleMouseMove(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) +{ + PCONSOLE Console = GuiData->Console; COORD c; if (!(wParam & MK_LBUTTON)) return; if (!(Console->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) return; - c = PointToCoord(Console, lParam); /* TODO: Scroll buffer to bring c into view */ - + c = PointToCoord(GuiData, lParam); /* TODO: Scroll buffer to bring c into view */ GuiConsoleUpdateSelection(Console, &c); } static VOID -GuiConsoleCopy(HWND hWnd, PCONSOLE Console) -{ - if (OpenClipboard(hWnd) == TRUE) +GuiConsoleCopy(PGUI_CONSOLE_DATA GuiData) +{ + PCONSOLE Console = GuiData->Console; + + if (OpenClipboard(GuiData->hWindow) == TRUE) { HANDLE hData; PBYTE ptr; @@ -1301,9 +1189,11 @@ } static VOID -GuiConsolePaste(HWND hWnd, PCONSOLE Console) -{ - if (OpenClipboard(hWnd) == TRUE) +GuiConsolePaste(PGUI_CONSOLE_DATA GuiData) +{ + PCONSOLE Console = GuiData->Console; + + if (OpenClipboard(GuiData->hWindow) == TRUE) { HANDLE hData; LPSTR str; @@ -1334,15 +1224,17 @@ } static VOID -GuiConsoleRightMouseDown(PCONSOLE Console, HWND hWnd) -{ +GuiConsoleRightMouseDown(PGUI_CONSOLE_DATA GuiData) +{ + PCONSOLE Console = GuiData->Console; + if (!(Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY)) { - GuiConsolePaste(hWnd, Console); + GuiConsolePaste(GuiData); } else { - GuiConsoleCopy(hWnd, Console); + GuiConsoleCopy(GuiData); /* Clear the selection */ GuiConsoleUpdateSelection(Console, NULL); @@ -1350,14 +1242,10 @@ } static VOID -GuiConsoleGetMinMaxInfo(PCONSOLE Console, - HWND hWnd, - PMINMAXINFO minMaxInfo) -{ - PGUI_CONSOLE_DATA GuiData = Console->GuiData; +GuiConsoleGetMinMaxInfo(PGUI_CONSOLE_DATA GuiData, PMINMAXINFO minMaxInfo) +{ + PCONSOLE Console = GuiData->Console; DWORD windx, windy; - - if (GuiData == NULL) return; windx = CONGUI_MIN_WIDTH * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); windy = CONGUI_MIN_HEIGHT * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); @@ -1376,13 +1264,9 @@ } static VOID -GuiConsoleResize(PCONSOLE Console, - HWND hWnd, - WPARAM wParam, LPARAM lParam) -{ - PGUI_CONSOLE_DATA GuiData = Console->GuiData; - - if (GuiData == NULL) return; +GuiConsoleResize(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) +{ + PCONSOLE Console = GuiData->Console; if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) { @@ -1423,16 +1307,19 @@ Console->Size.Y = (chary <= Buff->ScreenBufferSize.Y) ? chary : Buff->ScreenBufferSize.Y; } - GuiConsoleInitScrollbar(Console, hWnd); + GuiConsoleInitScrollbar(GuiData); // Adjust the start of the visible area if we are attempting to show nonexistent areas if((Buff->ScreenBufferSize.X - Buff->ShowX) < Console->Size.X) Buff->ShowX = Buff->ScreenBufferSize.X - Console->Size.X; if((Buff->ScreenBufferSize.Y - Buff->ShowY) < Console->Size.Y) Buff->ShowY = Buff->ScreenBufferSize.Y - Console->Size.Y; - InvalidateRect(hWnd, NULL, TRUE); + InvalidateRect(GuiData->hWindow, NULL, TRUE); GuiData->WindowSizeLock = FALSE; } } + +/* +// HACK: This functionality is standard for general scrollbars. Don't add it by hand. VOID FASTCALL @@ -1446,6 +1333,7 @@ DPRINT("CreatePopupMenu failed\n"); return; } + //InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLLHERE); //InsertItem(hMenu, MFT_SEPARATOR, MIIM_FTYPE, 0, NULL, -1); //InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLLTOP); @@ -1456,110 +1344,14 @@ //InsertItem(hMenu, MFT_SEPARATOR, MIIM_FTYPE, 0, NULL, -1); //InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLLUP); //InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLLDOWN); - -} - -static NTSTATUS WINAPI -GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size) -{ - BYTE * Buffer; - DWORD Offset = 0; - BYTE * OldPtr; - USHORT CurrentY; - BYTE * OldBuffer; -#ifdef HAVE_WMEMSET - USHORT value = MAKEWORD(' ', ScreenBuffer->ScreenDefaultAttrib); -#else - DWORD i; -#endif - DWORD diff; - - /* Buffer size is not allowed to be smaller than window size */ - if (Size.X < Console->Size.X || Size.Y < Console->Size.Y) - return STATUS_INVALID_PARAMETER; - - if (Size.X == ScreenBuffer->ScreenBufferSize.X && Size.Y == ScreenBuffer->ScreenBufferSize.Y) - return STATUS_SUCCESS; - - Buffer = RtlAllocateHeap(ConSrvHeap, 0, Size.X * Size.Y * 2); - if (!Buffer) - return STATUS_NO_MEMORY; - - DPRINT1("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y); - OldBuffer = ScreenBuffer->Buffer; - - for (CurrentY = 0; CurrentY < ScreenBuffer->ScreenBufferSize.Y && CurrentY < Size.Y; CurrentY++) - { - OldPtr = ConioCoordToPointer(ScreenBuffer, 0, CurrentY); - if (Size.X <= ScreenBuffer->ScreenBufferSize.X) - { - /* reduce size */ - RtlCopyMemory(&Buffer[Offset], OldPtr, Size.X * 2); - Offset += (Size.X * 2); - } - else - { - /* enlarge size */ - RtlCopyMemory(&Buffer[Offset], OldPtr, ScreenBuffer->ScreenBufferSize.X * 2); - Offset += (ScreenBuffer->ScreenBufferSize.X * 2); - - diff = Size.X - ScreenBuffer->ScreenBufferSize.X; - /* zero new part of it */ -#ifdef HAVE_WMEMSET - wmemset((PWCHAR)&Buffer[Offset], value, diff); -#else - for (i = 0; i < diff; i++) - { - Buffer[Offset++] = ' '; - Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; - } -#endif - } - } - - if (Size.Y > ScreenBuffer->ScreenBufferSize.Y) - { - diff = Size.X * (Size.Y - ScreenBuffer->ScreenBufferSize.Y); -#ifdef HAVE_WMEMSET - wmemset((PWCHAR)&Buffer[Offset], value, diff); -#else - for (i = 0; i < diff; i++) - { - Buffer[Offset++] = ' '; - Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; - } -#endif - } - - (void)InterlockedExchangePointer((PVOID volatile*)&ScreenBuffer->Buffer, Buffer); - RtlFreeHeap(ConSrvHeap, 0, OldBuffer); - ScreenBuffer->ScreenBufferSize = Size; - ScreenBuffer->VirtualY = 0; - - /* Ensure cursor and window are within buffer */ - if (ScreenBuffer->CursorPosition.X >= Size.X) - ScreenBuffer->CursorPosition.X = Size.X - 1; - if (ScreenBuffer->CursorPosition.Y >= Size.Y) - ScreenBuffer->CursorPosition.Y = Size.Y - 1; - if (ScreenBuffer->ShowX > Size.X - Console->Size.X) - ScreenBuffer->ShowX = Size.X - Console->Size.X; - if (ScreenBuffer->ShowY > Size.Y - Console->Size.Y) - ScreenBuffer->ShowY = Size.Y - Console->Size.Y; - - /* TODO: Should update scrollbar, but can't use anything that - * calls SendMessage or it could cause deadlock --> Use PostMessage */ - - return STATUS_SUCCESS; -} +} +*/ static LRESULT -GuiConsoleHandleScroll(PCONSOLE Console, - HWND hWnd, - UINT uMsg, - WPARAM wParam) -{ - PGUI_CONSOLE_DATA GuiData = Console->GuiData; +GuiConsoleHandleScroll(PGUI_CONSOLE_DATA GuiData, UINT uMsg, WPARAM wParam) +{ + PCONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER Buff; SCROLLINFO sInfo; int fnBar; @@ -1587,7 +1379,7 @@ sInfo.cbSize = sizeof(SCROLLINFO); sInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE | SIF_TRACKPOS; - if (!GetScrollInfo(hWnd, fnBar, &sInfo)) + if (!GetScrollInfo(GuiData->hWindow, fnBar, &sInfo)) { return FALSE; } @@ -1642,7 +1434,7 @@ USHORT OldY = Buff->ShowY; *pShowXY = sInfo.nPos; - ScrollWindowEx(hWnd, + ScrollWindowEx(GuiData->hWindow, (OldX - Buff->ShowX) * GuiData->CharWidth, (OldY - Buff->ShowY) * GuiData->CharHeight, NULL, @@ -1652,9 +1444,9 @@ SW_INVALIDATE); sInfo.fMask = SIF_POS; - SetScrollInfo(hWnd, fnBar, &sInfo, TRUE); - - UpdateWindow(hWnd); + SetScrollInfo(GuiData->hWindow, fnBar, &sInfo, TRUE); + + UpdateWindow(GuiData->hWindow); } return 0; @@ -1664,11 +1456,11 @@ GuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { LRESULT Result = 0; - PCONSOLE Console = NULL; + PGUI_CONSOLE_DATA GuiData = NULL; /* * If it's the first time we create a window - * for the console, just initialize it. + * for the terminal, just initialize it. */ if (msg == WM_NCCREATE) { @@ -1676,31 +1468,31 @@ } /* - * Now the console window is initialized. - * Get the console owned by the window. - * If there is no console, just go away. + * Now the terminal window is initialized. + * Get the terminal data via the window's data. + * If there is no data, just go away. */ - Console = GuiGetWindowConsole(hWnd); - if (Console == NULL) return 0; + GuiData = GuiGetGuiData(hWnd); + if (GuiData == NULL) return 0; // TODO: If the console is about to be destroyed, leave the loop. /* Lock the console */ - EnterCriticalSection(&Console->Lock); + EnterCriticalSection(&GuiData->Console->Lock); /* We have a console, start message dispatching. */ switch (msg) { case WM_CLOSE: - GuiConsoleHandleClose(Console, hWnd); + GuiConsoleHandleClose(GuiData); break; case WM_NCDESTROY: - GuiConsoleHandleNcDestroy(Console, hWnd); + GuiConsoleHandleNcDestroy(GuiData, hWnd); break; case WM_PAINT: - GuiConsoleHandlePaint(Console, hWnd, (HDC)wParam); + GuiConsoleHandlePaint(GuiData, (HDC)wParam); break; case WM_KEYDOWN: @@ -1708,48 +1500,48 @@ case WM_SYSKEYDOWN: case WM_SYSKEYUP: case WM_CHAR: - GuiConsoleHandleKey(Console, hWnd, msg, wParam, lParam); + GuiConsoleHandleKey(GuiData, msg, wParam, lParam); break; case WM_TIMER: - GuiConsoleHandleTimer(Console, hWnd); + GuiConsoleHandleTimer(GuiData); break; case WM_LBUTTONDOWN: - GuiConsoleLeftMouseDown(Console, hWnd, lParam); + GuiConsoleLeftMouseDown(GuiData, lParam); break; case WM_LBUTTONUP: - GuiConsoleLeftMouseUp(Console, hWnd, lParam); + GuiConsoleLeftMouseUp(GuiData, lParam); break; case WM_RBUTTONDOWN: - GuiConsoleRightMouseDown(Console, hWnd); + GuiConsoleRightMouseDown(GuiData); break; case WM_MOUSEMOVE: - GuiConsoleMouseMove(Console, hWnd, wParam, lParam); + GuiConsoleMouseMove(GuiData, wParam, lParam); break; case WM_SYSCOMMAND: - Result = GuiConsoleHandleSysMenuCommand(Console, hWnd, wParam, lParam); + Result = GuiConsoleHandleSysMenuCommand(GuiData, wParam, lParam); break; case WM_HSCROLL: case WM_VSCROLL: - Result = GuiConsoleHandleScroll(Console, hWnd, msg, wParam); + Result = GuiConsoleHandleScroll(GuiData, msg, wParam); break; case WM_GETMINMAXINFO: - GuiConsoleGetMinMaxInfo(Console, hWnd, (PMINMAXINFO)lParam); + GuiConsoleGetMinMaxInfo(GuiData, (PMINMAXINFO)lParam); break; case WM_SIZE: - GuiConsoleResize(Console, hWnd, wParam, lParam); + GuiConsoleResize(GuiData, wParam, lParam); break; case PM_APPLY_CONSOLE_INFO: - GuiApplyUserSettings(Console, (HANDLE)wParam, (BOOL)lParam); + GuiApplyUserSettings(GuiData, (HANDLE)wParam, (BOOL)lParam); break; case PM_CONSOLE_BEEP: @@ -1758,19 +1550,25 @@ break; case PM_CONSOLE_SET_TITLE: - SetWindowText(hWnd, Console->Title.Buffer); + SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer); break; default: - Result = DefWindowProcW(hWnd, msg, wParam, lParam); + Result = DefWindowProcW(GuiData->hWindow, msg, wParam, lParam); break; } /* Unlock the console */ - LeaveCriticalSection(&Console->Lock); + LeaveCriticalSection(&GuiData->Console->Lock); return Result; } + + + +/****************************************************************************** + * GUI Terminal Initialization * + ******************************************************************************/ static LRESULT CALLBACK GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -1778,14 +1576,19 @@ HWND NewWindow; LONG WindowCount; MSG Msg; - PCONSOLE Console = (PCONSOLE)lParam; + PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)lParam; + PCONSOLE Console = GuiData->Console; switch (msg) { case WM_CREATE: + { SetWindowLongW(hWnd, GWL_USERDATA, 0); return 0; + } + case PM_CREATE_CONSOLE: + { NewWindow = CreateWindowExW(WS_EX_CLIENTEDGE, GUI_CONSOLE_WINDOW_CLASS, Console->Title.Buffer, @@ -1797,40 +1600,50 @@ NULL, NULL, ConSrvDllInstance, - (PVOID)Console); + (PVOID)GuiData); if (NULL != NewWindow) { - SetConsoleWndConsoleLeaderCID(Console); - SetWindowLongW(hWnd, GWL_USERDATA, GetWindowLongW(hWnd, GWL_USERDATA) + 1); + WindowCount = GetWindowLongW(hWnd, GWL_USERDATA); + WindowCount++; + SetWindowLongW(hWnd, GWL_USERDATA, WindowCount); + + // SetConsoleWndConsoleLeaderCID(Console); DPRINT1("Set icons via PM_CREATE_CONSOLE\n"); - if (Console->hIcon == NULL) + if (GuiData->hIcon == NULL) { - DPRINT1("Not really...\n"); - Console->hIcon = ghDefaultIcon; - Console->hIconSm = ghDefaultIconSm; + DPRINT1("Not really /o\\...\n"); + GuiData->hIcon = ghDefaultIcon; + GuiData->hIconSm = ghDefaultIconSm; } - else if (Console->hIcon != ghDefaultIcon) + else if (GuiData->hIcon != ghDefaultIcon) { - DPRINT1("Yes !\n"); - SendMessageW(Console->hWindow, WM_SETICON, ICON_BIG, (LPARAM)Console->hIcon); - SendMessageW(Console->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)Console->hIconSm); + DPRINT1("Yes \\o/\n"); + SendMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG, (LPARAM)GuiData->hIcon); + SendMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm); } ShowWindow(NewWindow, (int)wParam); } + return (LRESULT)NewWindow; + } + case PM_DESTROY_CONSOLE: - /* Window creation is done using a PostMessage(), so it's possible that the - * window that we want to destroy doesn't exist yet. So first empty the message - * queue */ + { + /* + * Window creation is done using a PostMessage(), so it's possible + * that the window that we want to destroy doesn't exist yet. + * So first empty the message queue. + */ while(PeekMessageW(&Msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&Msg); DispatchMessageW(&Msg); } - DestroyWindow(Console->hWindow); - Console->hWindow = NULL; + DestroyWindow(GuiData->hWindow); + GuiData->hWindow = NULL; + WindowCount = GetWindowLongW(hWnd, GWL_USERDATA); WindowCount--; SetWindowLongW(hWnd, GWL_USERDATA, WindowCount); @@ -1838,10 +1651,13 @@ { NotifyWnd = NULL; DestroyWindow(hWnd); - PrivateCsrssManualGuiCheck(-1); + DPRINT1("CONSRV: Going to quit the Gui Thread!!\n"); PostQuitMessage(0); } + return 0; + } + default: return DefWindowProcW(hWnd, msg, wParam, lParam); } @@ -1851,7 +1667,14 @@ GuiConsoleGuiThread(PVOID Data) { MSG msg; - PHANDLE GraphicsStartupEvent = (PHANDLE) Data; + PHANDLE GraphicsStartupEvent = (PHANDLE)Data; + + /* + * This thread dispatches all the console notifications to the notify window. + * It is common for all the console windows. + */ + + PrivateCsrssManualGuiCheck(+1); NotifyWnd = CreateWindowW(L"ConSrvCreateNotify", L"", @@ -1879,6 +1702,9 @@ DispatchMessageW(&msg); } + DPRINT1("CONSRV: Quit the Gui Thread!!\n"); + PrivateCsrssManualGuiCheck(-1); + return 1; } @@ -1888,180 +1714,78 @@ WNDCLASSEXW wc; ATOM ConsoleClassAtom; + /* Exit if we were already initialized */ + // if (ConsInitialized) return TRUE; + + /* + * Initialize and register the different window classes, if needed. + */ + if (!ConsInitialized) + { + /* Initialize the notification window class */ + wc.cbSize = sizeof(WNDCLASSEXW); + wc.lpszClassName = L"ConSrvCreateNotify"; + wc.lpfnWndProc = GuiConsoleNotifyWndProc; + wc.style = 0; + wc.hInstance = ConSrvDllInstance; + wc.hIcon = NULL; + wc.hIconSm = NULL; + wc.hCursor = NULL; + wc.hbrBackground = NULL; + wc.lpszMenuName = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + if (RegisterClassExW(&wc) == 0) + { + DPRINT1("Failed to register GUI notify wndproc\n"); + return FALSE; + } + + /* Initialize the console window class */ + ghDefaultIcon = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON, + GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), + LR_SHARED); + ghDefaultIconSm = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + LR_SHARED); + ghDefaultCursor = LoadCursorW(NULL, IDC_ARROW); + wc.cbSize = sizeof(WNDCLASSEXW); + wc.lpszClassName = GUI_CONSOLE_WINDOW_CLASS; + wc.lpfnWndProc = GuiConsoleWndProc; + wc.style = 0; + wc.hInstance = ConSrvDllInstance; + wc.hIcon = ghDefaultIcon; + wc.hIconSm = ghDefaultIconSm; + wc.hCursor = ghDefaultCursor; + wc.hbrBackground = CreateSolidBrush(RGB(0,0,0)); // FIXME: Use defaults from registry. + wc.lpszMenuName = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = GWLP_CONSOLEWND_ALLOC; + + ConsoleClassAtom = RegisterClassExW(&wc); + if (ConsoleClassAtom == 0) + { + DPRINT1("Failed to register GUI console wndproc\n"); + return FALSE; + } + else + { + NtUserConsoleControl(GuiConsoleWndClassAtom, &ConsoleClassAtom, sizeof(ATOM)); + } + + ConsInitialized = TRUE; + } + + /* + * Set-up the notification window + */ if (NULL == NotifyWnd) { - PrivateCsrssManualGuiCheck(+1); - } - - /* Initialize the notification window class */ - wc.cbSize = sizeof(WNDCLASSEXW); - wc.lpszClassName = L"ConSrvCreateNotify"; - wc.lpfnWndProc = GuiConsoleNotifyWndProc; - wc.style = 0; - wc.hInstance = ConSrvDllInstance; - wc.hIcon = NULL; - wc.hIconSm = NULL; - wc.hCursor = NULL; - wc.hbrBackground = NULL; - wc.lpszMenuName = NULL; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - if (RegisterClassExW(&wc) == 0) - { - DPRINT1("Failed to register GUI notify wndproc\n"); - return FALSE; - } - - /* Initialize the console window class */ - ghDefaultIcon = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON, - GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), - LR_SHARED); - ghDefaultIconSm = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), - LR_SHARED); - ghDefaultCursor = LoadCursorW(NULL, IDC_ARROW); - wc.cbSize = sizeof(WNDCLASSEXW); - wc.lpszClassName = GUI_CONSOLE_WINDOW_CLASS; - wc.lpfnWndProc = GuiConsoleWndProc; - wc.style = 0; - wc.hInstance = ConSrvDllInstance; - wc.hIcon = ghDefaultIcon; - wc.hIconSm = ghDefaultIconSm; - wc.hCursor = ghDefaultCursor; - wc.hbrBackground = CreateSolidBrush(RGB(0,0,0)); // FIXME: Use defaults from registry. - wc.lpszMenuName = NULL; - wc.cbClsExtra = 0; - wc.cbWndExtra = GWLP_CONSOLEWND_ALLOC; - - ConsoleClassAtom = RegisterClassExW(&wc); - if (ConsoleClassAtom == 0) - { - DPRINT1("Failed to register GUI console wndproc\n"); - return FALSE; - } - else - { - NtUserConsoleControl(GuiConsoleWndClassAtom, &ConsoleClassAtom, sizeof(ATOM)); - } - - return TRUE; -} - -static VOID WINAPI -GuiChangeTitle(PCONSOLE Console) -{ - PostMessageW(Console->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); -} - -static BOOL WINAPI -GuiChangeIcon(PCONSOLE Console, HICON hWindowIcon) -{ - HICON hIcon, hIconSm; - - if (hWindowIcon == NULL) - { - hIcon = ghDefaultIcon; - hIconSm = ghDefaultIconSm; - } - else - { - hIcon = CopyIcon(hWindowIcon); - hIconSm = CopyIcon(hWindowIcon); - } - - if (hIcon == NULL) - { - return FALSE; - } - - if (hIcon != Console->hIcon) - { - if (Console->hIcon != NULL && Console->hIcon != ghDefaultIcon) - { - DestroyIcon(Console->hIcon); - } - if (Console->hIconSm != NULL && Console->hIconSm != ghDefaultIconSm) - { - DestroyIcon(Console->hIconSm); - } - - Console->hIcon = hIcon; - Console->hIconSm = hIconSm; - - DPRINT1("Set icons in GuiChangeIcon\n"); - PostMessageW(Console->hWindow, WM_SETICON, ICON_BIG, (LPARAM)Console->hIcon); - PostMessageW(Console->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)Console->hIconSm); - } - - return TRUE; -} - -static VOID WINAPI -GuiCleanupConsole(PCONSOLE Console) -{ - SendMessageW(NotifyWnd, PM_DESTROY_CONSOLE, 0, (LPARAM)Console); - - DPRINT1("Destroying icons !! - Console->hIcon = 0x%p ; ghDefaultIcon = 0x%p ; Console->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n", - Console->hIcon, ghDefaultIcon, Console->hIconSm, ghDefaultIconSm); - if (Console->hIcon != NULL && Console->hIcon != ghDefaultIcon) - { - DPRINT1("Destroy hIcon\n"); - DestroyIcon(Console->hIcon); - } - if (Console->hIconSm != NULL && Console->hIconSm != ghDefaultIconSm) - { - DPRINT1("Destroy hIconSm\n"); - DestroyIcon(Console->hIconSm); - } -} - -static CONSOLE_VTBL GuiVtbl = -{ - GuiWriteStream, - GuiDrawRegion, - GuiSetCursorInfo, - GuiSetScreenInfo, - GuiUpdateScreenInfo, - GuiChangeTitle, - GuiCleanupConsole, - GuiChangeIcon, - GuiResizeBuffer, - GuiProcessKeyCallback -}; - -NTSTATUS FASTCALL -GuiInitConsole(PCONSOLE Console, - LPCWSTR AppPath, - PCONSOLE_INFO ConsoleInfo, - LPCWSTR IconPath, - INT IconIndex) -{ - HANDLE GraphicsStartupEvent; - HANDLE ThreadHandle; - PGUI_CONSOLE_DATA GuiData; - - /* Initialize the GUI */ - if (!ConsInitialized) - { - ConsInitialized = TRUE; - if (!GuiInit()) - { - ConsInitialized = FALSE; - return STATUS_UNSUCCESSFUL; - } - } - - /* Finish to initialize the console */ - Console->Vtbl = &GuiVtbl; - Console->hWindow = NULL; - - if (NULL == NotifyWnd) - { + HANDLE ThreadHandle; + HANDLE GraphicsStartupEvent; + GraphicsStartupEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (NULL == GraphicsStartupEvent) - { - return STATUS_UNSUCCESSFUL; - } + if (NULL == GraphicsStartupEvent) return FALSE; ThreadHandle = CreateThread(NULL, 0, @@ -2073,7 +1797,7 @@ { CloseHandle(GraphicsStartupEvent); DPRINT1("CONSRV: Failed to create graphics console thread. Expect problems\n"); - return STATUS_UNSUCCESSFUL; + return FALSE; } SetThreadPriority(ThreadHandle, THREAD_PRIORITY_HIGHEST); CloseHandle(ThreadHandle); @@ -2084,9 +1808,334 @@ if (NULL == NotifyWnd) { DPRINT1("CONSRV: Failed to create notification window.\n"); - return STATUS_UNSUCCESSFUL; - } - } + return FALSE; + } + } + + // ConsInitialized = TRUE; + + return TRUE; +} + + + +/****************************************************************************** + * GUI Console Driver * + ******************************************************************************/ + +static VOID WINAPI +GuiCleanupConsole(PCONSOLE Console) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + + SendMessageW(NotifyWnd, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData); + + DPRINT1("Destroying icons !! - GuiData->hIcon = 0x%p ; ghDefaultIcon = 0x%p ; GuiData->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n", + GuiData->hIcon, ghDefaultIcon, GuiData->hIconSm, ghDefaultIconSm); + if (GuiData->hIcon != NULL && GuiData->hIcon != ghDefaultIcon) + { + DPRINT1("Destroy hIcon\n"); + DestroyIcon(GuiData->hIcon); + } + if (GuiData->hIconSm != NULL && GuiData->hIconSm != ghDefaultIconSm) + { + DPRINT1("Destroy hIconSm\n"); + DestroyIcon(GuiData->hIconSm); + } +} + +static VOID WINAPI +GuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, LONG CursorStartX, LONG CursorStartY, + UINT ScrolledLines, CHAR *Buffer, UINT Length) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; + LONG CursorEndX, CursorEndY; + RECT ScrollRect; + + if (NULL == GuiData || NULL == GuiData->hWindow) + { + return; + } + + if (0 != ScrolledLines) + { + ScrollRect.left = 0; + ScrollRect.top = 0; + ScrollRect.right = Console->Size.X * GuiData->CharWidth; + ScrollRect.bottom = Region->Top * GuiData->CharHeight; + + ScrollWindowEx(GuiData->hWindow, + 0, + -(ScrolledLines * GuiData->CharHeight), + &ScrollRect, + NULL, + NULL, + NULL, + SW_INVALIDATE); + } + + GuiDrawRegion(Console, Region); + + if (CursorStartX < Region->Left || Region->Right < CursorStartX + || CursorStartY < Region->Top || Region->Bottom < CursorStartY) + { + GuiInvalidateCell(Console, CursorStartX, CursorStartY); + } + + CursorEndX = Buff->CursorPosition.X; + CursorEndY = Buff->CursorPosition.Y; + if ((CursorEndX < Region->Left || Region->Right < CursorEndX + || CursorEndY < Region->Top || Region->Bottom < CursorEndY) + && (CursorEndX != CursorStartX || CursorEndY != CursorStartY)) + { + GuiInvalidateCell(Console, CursorEndX, CursorEndY); + } + + // Set up the update timer (very short interval) - this is a "hack" for getting the OS to + // repaint the window without having it just freeze up and stay on the screen permanently. + Buff->CursorBlinkOn = TRUE; + SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); +} + +static VOID WINAPI +GuiDrawRegion(PCONSOLE Console, SMALL_RECT* Region) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + RECT RegionRect; + + SmallRectToRect(GuiData, &RegionRect, Region); + InvalidateRect(GuiData->hWindow, &RegionRect, FALSE); +} + +static BOOL WINAPI +GuiSetCursorInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff) +{ + if (Console->ActiveBuffer == Buff) + { + GuiInvalidateCell(Console, Buff->CursorPosition.X, Buff->CursorPosition.Y); + } + + return TRUE; +} + +static BOOL WINAPI +GuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY) +{ + if (Console->ActiveBuffer == Buff) + { + /* Redraw char at old position (removes cursor) */ + GuiInvalidateCell(Console, OldCursorX, OldCursorY); + /* Redraw char at new position (shows cursor) */ + GuiInvalidateCell(Console, Buff->CursorPosition.X, Buff->CursorPosition.Y); + } + + return TRUE; +} + +static BOOL WINAPI +GuiUpdateScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff) +{ + return TRUE; +} + +static NTSTATUS WINAPI +GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size) +{ + BYTE * Buffer; + DWORD Offset = 0; + BYTE * OldPtr; + USHORT CurrentY; + BYTE * OldBuffer; +#ifdef HAVE_WMEMSET + USHORT value = MAKEWORD(' ', ScreenBuffer->ScreenDefaultAttrib); +#else + DWORD i; +#endif + DWORD diff; + + /* Buffer size is not allowed to be smaller than window size */ + if (Size.X < Console->Size.X || Size.Y < Console->Size.Y) + return STATUS_INVALID_PARAMETER; + + if (Size.X == ScreenBuffer->ScreenBufferSize.X && Size.Y == ScreenBuffer->ScreenBufferSize.Y) + return STATUS_SUCCESS; + + Buffer = RtlAllocateHeap(ConSrvHeap, 0, Size.X * Size.Y * 2); + if (!Buffer) + return STATUS_NO_MEMORY; + + DPRINT1("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y); + OldBuffer = ScreenBuffer->Buffer; + + for (CurrentY = 0; CurrentY < ScreenBuffer->ScreenBufferSize.Y && CurrentY < Size.Y; CurrentY++) + { + OldPtr = ConioCoordToPointer(ScreenBuffer, 0, CurrentY); + if (Size.X <= ScreenBuffer->ScreenBufferSize.X) + { + /* reduce size */ + RtlCopyMemory(&Buffer[Offset], OldPtr, Size.X * 2); + Offset += (Size.X * 2); + } + else + { + /* enlarge size */ + RtlCopyMemory(&Buffer[Offset], OldPtr, ScreenBuffer->ScreenBufferSize.X * 2); + Offset += (ScreenBuffer->ScreenBufferSize.X * 2); + + diff = Size.X - ScreenBuffer->ScreenBufferSize.X; + /* zero new part of it */ +#ifdef HAVE_WMEMSET + wmemset((PWCHAR)&Buffer[Offset], value, diff); +#else + for (i = 0; i < diff; i++) + { + Buffer[Offset++] = ' '; + Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; + } +#endif + } + } + + if (Size.Y > ScreenBuffer->ScreenBufferSize.Y) + { + diff = Size.X * (Size.Y - ScreenBuffer->ScreenBufferSize.Y); +#ifdef HAVE_WMEMSET + wmemset((PWCHAR)&Buffer[Offset], value, diff); +#else + for (i = 0; i < diff; i++) + { + Buffer[Offset++] = ' '; + Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; + } +#endif + } + + (void)InterlockedExchangePointer((PVOID volatile*)&ScreenBuffer->Buffer, Buffer); + RtlFreeHeap(ConSrvHeap, 0, OldBuffer); + ScreenBuffer->ScreenBufferSize = Size; + ScreenBuffer->VirtualY = 0; + + /* Ensure cursor and window are within buffer */ + if (ScreenBuffer->CursorPosition.X >= Size.X) + ScreenBuffer->CursorPosition.X = Size.X - 1; + if (ScreenBuffer->CursorPosition.Y >= Size.Y) + ScreenBuffer->CursorPosition.Y = Size.Y - 1; + if (ScreenBuffer->ShowX > Size.X - Console->Size.X) + ScreenBuffer->ShowX = Size.X - Console->Size.X; + if (ScreenBuffer->ShowY > Size.Y - Console->Size.Y) + ScreenBuffer->ShowY = Size.Y - Console->Size.Y; + + /* TODO: Should update scrollbar, but can't use anything that + * calls SendMessage or it could cause deadlock --> Use PostMessage */ + // TODO: Tell the terminal to resize its scrollbars. + + return STATUS_SUCCESS; +} + +static BOOL WINAPI +GuiProcessKeyCallback(PCONSOLE Console, MSG* msg, BYTE KeyStateMenu, DWORD ShiftState, UINT VirtualKeyCode, BOOL Down) +{ + if ((ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED) || KeyStateMenu & 0x80) && + (VirtualKeyCode == VK_ESCAPE || VirtualKeyCode == VK_TAB || VirtualKeyCode == VK_SPACE)) + { + DefWindowProcW(msg->hwnd, msg->message, msg->wParam, msg->lParam); + return TRUE; + } + + return FALSE; +} + +static VOID WINAPI +GuiChangeTitle(PCONSOLE Console) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); +} + +static BOOL WINAPI +GuiChangeIcon(PCONSOLE Console, HICON hWindowIcon) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + HICON hIcon, hIconSm; + + if (hWindowIcon == NULL) + { + hIcon = ghDefaultIcon; + hIconSm = ghDefaultIconSm; + } + else + { + hIcon = CopyIcon(hWindowIcon); + hIconSm = CopyIcon(hWindowIcon); + } + + if (hIcon == NULL) + { + return FALSE; + } + + if (hIcon != GuiData->hIcon) + { + if (GuiData->hIcon != NULL && GuiData->hIcon != ghDefaultIcon) + { + DestroyIcon(GuiData->hIcon); + } + if (GuiData->hIconSm != NULL && GuiData->hIconSm != ghDefaultIconSm) + { + DestroyIcon(GuiData->hIconSm); + } + + GuiData->hIcon = hIcon; + GuiData->hIconSm = hIconSm; + + DPRINT1("Set icons in GuiChangeIcon\n"); + PostMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG, (LPARAM)GuiData->hIcon); + PostMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm); + } + + return TRUE; +} + +static HWND WINAPI +GuiGetConsoleWindowHandle(PCONSOLE Console) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + return GuiData->hWindow; +} + +static TERMINAL_VTBL GuiVtbl = +{ + GuiCleanupConsole, + GuiWriteStream, + GuiDrawRegion, + GuiSetCursorInfo, + GuiSetScreenInfo, + GuiUpdateScreenInfo, + GuiResizeBuffer, + GuiProcessKeyCallback, + GuiChangeTitle, + GuiChangeIcon, + GuiGetConsoleWindowHandle +}; + +NTSTATUS FASTCALL +GuiInitConsole(PCONSOLE Console, + LPCWSTR AppPath, + PCONSOLE_INFO ConsoleInfo, + LPCWSTR IconPath, + INT IconIndex) +{ + PGUI_CONSOLE_DATA GuiData; + + if (Console == NULL || ConsoleInfo == NULL) + return STATUS_INVALID_PARAMETER; + + /* Initialize the GUI terminal emulator */ + if (!GuiInit()) return STATUS_UNSUCCESSFUL; + + /* Initialize the console */ + Console->TermIFace.Vtbl = &GuiVtbl; GuiData = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(GUI_CONSOLE_DATA)); @@ -2095,30 +2144,23 @@ DPRINT1("CONSRV: Failed to create GUI_CONSOLE_DATA\n"); return STATUS_UNSUCCESSFUL; } - Console->GuiData = (PVOID)GuiData; - - if (ConsoleInfo) - { - wcsncpy(GuiData->GuiInfo.FaceName, ConsoleInfo->u.GuiInfo.FaceName, LF_FACESIZE); - GuiData->GuiInfo.FontFamily = ConsoleInfo->u.GuiInfo.FontFamily; - GuiData->GuiInfo.FontSize = ConsoleInfo->u.GuiInfo.FontSize; - GuiData->GuiInfo.FontWeight = ConsoleInfo->u.GuiInfo.FontWeight; - GuiData->GuiInfo.UseRasterFonts = ConsoleInfo->u.GuiInfo.UseRasterFonts; - - GuiData->GuiInfo.ShowWindow = ConsoleInfo->u.GuiInfo.ShowWindow; - GuiData->GuiInfo.AutoPosition = ConsoleInfo->u.GuiInfo.AutoPosition; - GuiData->GuiInfo.WindowOrigin = ConsoleInfo->u.GuiInfo.WindowOrigin; - } - /* - else - { - // TODO: What could be the defaults ? - } - */ + Console->TermIFace.Data = (PVOID)GuiData; + GuiData->Console = Console; + GuiData->hWindow = NULL; + + /* Set up the GUI data */ + wcsncpy(GuiData->GuiInfo.FaceName, ConsoleInfo->u.GuiInfo.FaceName, LF_FACESIZE); + GuiData->GuiInfo.FontFamily = ConsoleInfo->u.GuiInfo.FontFamily; + GuiData->GuiInfo.FontSize = ConsoleInfo->u.GuiInfo.FontSize; + GuiData->GuiInfo.FontWeight = ConsoleInfo->u.GuiInfo.FontWeight; + GuiData->GuiInfo.UseRasterFonts = ConsoleInfo->u.GuiInfo.UseRasterFonts; + GuiData->GuiInfo.ShowWindow = ConsoleInfo->u.GuiInfo.ShowWindow; + GuiData->GuiInfo.AutoPosition = ConsoleInfo->u.GuiInfo.AutoPosition; + GuiData->GuiInfo.WindowOrigin = ConsoleInfo->u.GuiInfo.WindowOrigin; /* Initialize the icon handles to their default values */ - Console->hIcon = ghDefaultIcon; - Console->hIconSm = ghDefaultIconSm; + GuiData->hIcon = ghDefaultIcon; + GuiData->hIconSm = ghDefaultIconSm; /* Get the associated icon, if any */ if (IconPath == NULL || *IconPath == L'\0') @@ -2139,8 +2181,8 @@ if (hIcon != NULL) { DPRINT1("Effectively set the icons\n"); - Console->hIcon = hIcon; - Console->hIconSm = hIconSm; + GuiData->hIcon = hIcon; + GuiData->hIconSm = hIconSm; } } @@ -2153,11 +2195,11 @@ GuiData->hGuiInitEvent = CreateEventW(NULL, FALSE, FALSE, NULL); /* Create the GUI console */ - PostMessageW(NotifyWnd, PM_CREATE_CONSOLE, GuiData->GuiInfo.ShowWindow, (LPARAM)Console); + PostMessageW(NotifyWnd, PM_CREATE_CONSOLE, GuiData->GuiInfo.ShowWindow, (LPARAM)GuiData); /* Wait until initialization has finished */ WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); - DPRINT("Received event Console %p GuiData %p X %d Y %d\n", Console, Console->GuiData, Console->Size.X, Console->Size.Y); + DPRINT1("Received event Console %p GuiData %p X %d Y %d\n", Console, GuiData, Console->Size.X, Console->Size.Y); CloseHandle(GuiData->hGuiInitEvent); GuiData->hGuiInitEvent = NULL; Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.h [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/guiconsole.h - * PURPOSE: Interface to GUI-mode consoles + * PURPOSE: GUI terminal emulator * PROGRAMMERS: */ Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -373,7 +373,7 @@ (HandleEntry->Access & Access) == 0 || (Type != 0 && ObjectEntry->Type != Type) ) { - DPRINT1("CsrGetObject returning invalid handle (%x) of type %lu with access %lu\n", Handle, Type, Access); + DPRINT1("ConSrvGetObject returning invalid handle (%x) of type %lu with access %lu\n", Handle, Type, Access); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; } @@ -511,7 +511,6 @@ ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData) { PCONSOLE Console; - PCONSOLE_PROCESS_DATA NewProcessData; DPRINT1("ConSrvRemoveConsole\n"); @@ -532,11 +531,7 @@ RemoveEntryList(&ProcessData->ConsoleLink); /* Update the console leader process */ - NewProcessData = CONTAINING_RECORD(Console->ProcessList.Blink, - CONSOLE_PROCESS_DATA, - ConsoleLink); - Console->ConsoleLeaderCID = NewProcessData->Process->ClientId; - SetConsoleWndConsoleLeaderCID(Console); + // SetConsoleWndConsoleLeaderCID(Console); /* Release the console */ ConSrvReleaseConsole(Console, TRUE); @@ -799,7 +794,7 @@ Index >= ProcessData->HandleTableSize || ProcessData->HandleTable[Index].Object == NULL) { - DPRINT("CsrVerifyObject failed\n"); + DPRINT("SrvVerifyConsoleIoHandle failed\n"); Status = STATUS_INVALID_HANDLE; } Modified: branches/ros-csrss/win32ss/user/consrv/settings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/settings.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/settings.h [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -8,6 +8,9 @@ * NOTE: Adapted from existing code. */ +#ifndef WM_APP + #define WM_APP 0x8000 +#endif #define PM_APPLY_CONSOLE_INFO (WM_APP + 100) /* STRUCTURES *****************************************************************/ @@ -54,6 +57,7 @@ WCHAR ConsoleTitle[MAX_PATH + 1]; + // PVOID TerminalInfo; /* Terminal-specific parameters */ union { GUI_CONSOLE_INFO GuiInfo; Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -2,9 +2,11 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/tuiconsole.c - * PURPOSE: Interface to text-mode consoles + * PURPOSE: TUI terminal emulator * PROGRAMMERS: */ + +#ifdef TUI_CONSOLE #include "consrv.h" #include "settings.h" @@ -15,9 +17,21 @@ #include <debug.h> +/* GLOBALS ********************************************************************/ + /* TUI Console Window Class name */ #define TUI_CONSOLE_WINDOW_CLASS L"TuiConsoleWindowClass" +typedef struct _TUI_CONSOLE_DATA +{ + CRITICAL_SECTION Lock; + // HANDLE hTuiInitEvent; + + HWND hWindow; + + PCONSOLE Console; + // TUI_CONSOLE_INFO TuiInfo; +} TUI_CONSOLE_DATA, *PTUI_CONSOLE_DATA; CRITICAL_SECTION ActiveConsoleLock; static COORD PhysicalConsoleSize; @@ -164,7 +178,7 @@ /* alt-tab, swap consoles */ /* move SwapConsole to next console, and print its title */ EnterCriticalSection(&ActiveConsoleLock); - if (! SwapConsole) + if (!SwapConsole) { SwapConsole = ActiveConsole; } @@ -480,6 +494,12 @@ return TRUE; } +static HWND WINAPI +TuiGetConsoleWindowHandle(PCONSOLE Console) +{ + return Console->hWindow; +} + static NTSTATUS WINAPI TuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size) { @@ -507,7 +527,6 @@ return 1; } Console->hWindow = NewWindow; - SetConsoleWndConsoleLeaderCID(Console); SetForegroundWindow(Console->hWindow); @@ -528,16 +547,17 @@ return 0; } -static CONSOLE_VTBL TuiVtbl = -{ +static TERMINAL_VTBL TuiVtbl = +{ + TuiCleanupConsole, TuiWriteStream, TuiDrawRegion, TuiSetCursorInfo, TuiSetScreenInfo, TuiUpdateScreenInfo, TuiChangeTitle, - TuiCleanupConsole, TuiChangeIcon, + TuiGetConsoleWindowHandle, TuiResizeBuffer, TuiProcessKeyCallback }; @@ -558,7 +578,7 @@ } } - Console->Vtbl = &TuiVtbl; + Console->TermIFace.Vtbl = &TuiVtbl; Console->hWindow = NULL; Console->Size = PhysicalConsoleSize; Console->ActiveBuffer->ScreenBufferSize = PhysicalConsoleSize; @@ -601,4 +621,6 @@ return ActiveConsole; } +#endif + /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/tuiconsole.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.h [iso-8859-1] Fri Mar 8 23:37:11 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/tuiconsole.h - * PURPOSE: Interface to text-mode consoles + * PURPOSE: TUI terminal emulator * PROGRAMMERS: */

1 0

[hbelusca] 58446: [SERVICES-ADVAPI32] - Check for possible null pointers (invalid address) before dereferencing them. - Correct some DPRINT formatting.
by hbelusca＠svn.reactos.org 08 Mar '13

08 Mar '13

Author: hbelusca Date: Fri Mar 8 22:40:38 2013 New Revision: 58446 URL: http://svn.reactos.org/svn/reactos?rev=58446&view=rev Log: [SERVICES-ADVAPI32] - Check for possible null pointers (invalid address) before dereferencing them. - Correct some DPRINT formatting. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Mar 8 22:40:38 2013 @@ -2764,7 +2764,7 @@ lpStr += (wcslen(lpStr) + 1); /* Append the group name */ - if (lpService->lpGroup != NULL) + if ((lpService->lpGroup != NULL) && (lpService->lpGroup->lpGroupName != NULL)) { wcscpy(lpStr, lpService->lpGroup->lpGroupName); } @@ -3733,6 +3733,11 @@ DPRINT("REnumServicesStatusA() called\n"); + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + return ERROR_INVALID_ADDRESS; + } + if ((dwBufSize > 0) && (lpBuffer)) { lpStatusPtrW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwBufSize); @@ -4496,6 +4501,11 @@ { DPRINT1("Invalid service manager handle!\n"); return ERROR_INVALID_HANDLE; + } + + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + return ERROR_INVALID_ADDRESS; } *pcbBytesNeeded = 0; @@ -5750,6 +5760,11 @@ DPRINT("REnumServicesStatusExA() called\n"); + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + return ERROR_INVALID_ADDRESS; + } + if (pszGroupName) { pszGroupNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (strlen(pszGroupName) + 1) * sizeof(WCHAR)); @@ -5893,6 +5908,11 @@ { DPRINT1("Invalid service manager handle!\n"); return ERROR_INVALID_HANDLE; + } + + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + return ERROR_INVALID_ADDRESS; } *pcbBytesNeeded = 0; Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Fri Mar 8 22:40:38 2013 @@ -173,7 +173,7 @@ hPipe = (HANDLE)Context; - DPRINT("ScmNamedPipeThread(%lu) - Accepting SCM commands through named pipe\n", hPipe); + DPRINT("ScmNamedPipeThread(%p) - Accepting SCM commands through named pipe\n", hPipe); for (;;) { @@ -201,13 +201,13 @@ } } - DPRINT("ScmNamedPipeThread(%lu) - Disconnecting named pipe connection\n", hPipe); + DPRINT("ScmNamedPipeThread(%p) - Disconnecting named pipe connection\n", hPipe); FlushFileBuffers(hPipe); DisconnectNamedPipe(hPipe); CloseHandle(hPipe); - DPRINT("ScmNamedPipeThread(%lu) - Done.\n", hPipe); + DPRINT("ScmNamedPipeThread(%p) - Done.\n", hPipe); return ERROR_SUCCESS; } @@ -237,7 +237,7 @@ return FALSE; } - DPRINT("CreateNamedPipe() - calling ConnectNamedPipe(%x)\n", hPipe); + DPRINT("CreateNamedPipe() - calling ConnectNamedPipe(%p)\n", hPipe); bConnected = ConnectNamedPipe(hPipe, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED); DPRINT("CreateNamedPipe() - ConnectNamedPipe() returned %d\n", bConnected); Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Mar 8 22:40:38 2013 @@ -165,6 +165,8 @@ TRACE("ChangeServiceConfig2A() called\n"); + if (lpInfo == NULL) return TRUE; + /* Fill relevent field of the Info structure */ Info.dwInfoLevel = dwInfoLevel; switch (dwInfoLevel) @@ -184,9 +186,6 @@ return FALSE; } - if (lpInfo == NULL) - return TRUE; - RpcTryExcept { dwError = RChangeServiceConfig2A((SC_RPC_HANDLE)hService, @@ -223,6 +222,8 @@ DWORD dwError; TRACE("ChangeServiceConfig2W() called\n"); + + if (lpInfo == NULL) return TRUE; /* Fill relevent field of the Info structure */ Info.dwInfoLevel = dwInfoLevel; @@ -241,9 +242,6 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - if (lpInfo == NULL) - return TRUE; RpcTryExcept { @@ -923,6 +921,12 @@ if (!hSCManager) { SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + SetLastError(ERROR_INVALID_ADDRESS); return FALSE; } @@ -1027,6 +1031,12 @@ return FALSE; } + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + if (lpServices == NULL || cbBufSize < sizeof(ENUM_SERVICE_STATUSA)) { lpStatusPtr = &ServiceStatus; @@ -1110,6 +1120,12 @@ if (!hSCManager) { SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + SetLastError(ERROR_INVALID_ADDRESS); return FALSE; } @@ -1207,8 +1223,13 @@ return FALSE; } - if (lpServices == NULL || - cbBufSize < sizeof(ENUM_SERVICE_STATUS_PROCESSA)) + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + if (lpServices == NULL || cbBufSize < sizeof(ENUM_SERVICE_STATUS_PROCESSA)) { lpStatusPtr = &ServiceStatus; dwBufferSize = sizeof(ENUM_SERVICE_STATUS_PROCESSA); @@ -1307,8 +1328,13 @@ return FALSE; } - if (lpServices == NULL || - cbBufSize < sizeof(ENUM_SERVICE_STATUS_PROCESSW)) + if (pcbBytesNeeded == NULL || lpServicesReturned == NULL) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + if (lpServices == NULL || cbBufSize < sizeof(ENUM_SERVICE_STATUS_PROCESSW)) { lpStatusPtr = &ServiceStatus; dwBufferSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW);

1 0

[hbelusca] 58445: The 'i' variable being only used for displaying the array of parameters (when debug output is enabled), disable it also to avoid "error: unused variable 'i'".
by hbelusca＠svn.reactos.org 08 Mar '13

08 Mar '13

Author: hbelusca Date: Fri Mar 8 21:22:05 2013 New Revision: 58445 URL: http://svn.reactos.org/svn/reactos?rev=58445&view=rev Log: The 'i' variable being only used for displaying the array of parameters (when debug output is enabled), disable it also to avoid "error: unused variable 'i'". Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Mar 8 21:22:05 2013 @@ -2896,9 +2896,10 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; SC_RPC_LOCK Lock = NULL; + +#ifndef NDEBUG DWORD i; -#ifndef NDEBUG DPRINT("RStartServiceW(%p %lu %p) called\n", hService, argc, argv); DPRINT(" argc: %lu\n", argc); if (argv != NULL)

1 0

[hbelusca] 58444: [SERVICES] - Disable an unuseful DPRINT. - Remove a redundant variable lpConfig.
by hbelusca＠svn.reactos.org 08 Mar '13

08 Mar '13

Author: hbelusca Date: Fri Mar 8 21:19:12 2013 New Revision: 58444 URL: http://svn.reactos.org/svn/reactos?rev=58444&view=rev Log: [SERVICES] - Disable an unuseful DPRINT. - Remove a redundant variable lpConfig. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Mar 8 21:19:12 2013 @@ -2655,7 +2655,6 @@ LPWSTR lpDependencies = NULL; DWORD dwDependenciesLength = 0; DWORD dwRequiredSize; - LPQUERY_SERVICE_CONFIGW lpConfig = NULL; WCHAR lpEmptyString[] = {0,0}; LPWSTR lpStr; @@ -2718,7 +2717,7 @@ else dwRequiredSize += 2 * sizeof(WCHAR); - if (lpService->lpGroup != NULL) + if ((lpService->lpGroup != NULL) && (lpService->lpGroup->lpGroupName != NULL)) dwRequiredSize += (DWORD)((wcslen(lpService->lpGroup->lpGroupName) + 1) * sizeof(WCHAR)); else dwRequiredSize += 2 * sizeof(WCHAR); @@ -2744,13 +2743,12 @@ } else { - lpConfig = (LPQUERY_SERVICE_CONFIGW)lpServiceConfig; - lpConfig->dwServiceType = lpService->Status.dwServiceType; - lpConfig->dwStartType = lpService->dwStartType; - lpConfig->dwErrorControl = lpService->dwErrorControl; - lpConfig->dwTagId = lpService->dwTag; - - lpStr = (LPWSTR)(lpConfig + 1); + lpServiceConfig->dwServiceType = lpService->Status.dwServiceType; + lpServiceConfig->dwStartType = lpService->dwStartType; + lpServiceConfig->dwErrorControl = lpService->dwErrorControl; + lpServiceConfig->dwTagId = lpService->dwTag; + + lpStr = (LPWSTR)(lpServiceConfig + 1); /* Append the image path */ if (lpImagePath != NULL) @@ -2762,7 +2760,7 @@ wcscpy(lpStr, lpEmptyString); } - lpConfig->lpBinaryPathName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpBinaryPathName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); lpStr += (wcslen(lpStr) + 1); /* Append the group name */ @@ -2775,7 +2773,7 @@ wcscpy(lpStr, lpEmptyString); } - lpConfig->lpLoadOrderGroup = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpLoadOrderGroup = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); lpStr += (wcslen(lpStr) + 1); /* Append Dependencies */ @@ -2790,7 +2788,7 @@ wcscpy(lpStr, lpEmptyString); } - lpConfig->lpDependencies = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpDependencies = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); if (lpDependencies != NULL) lpStr += dwDependenciesLength; else @@ -2806,7 +2804,7 @@ wcscpy(lpStr, lpEmptyString); } - lpConfig->lpServiceStartName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpServiceStartName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); lpStr += (wcslen(lpStr) + 1); /* Append the display name */ @@ -2819,7 +2817,7 @@ wcscpy(lpStr, lpEmptyString); } - lpConfig->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); } if (pcbBytesNeeded != NULL) @@ -2900,15 +2898,17 @@ SC_RPC_LOCK Lock = NULL; DWORD i; +#ifndef NDEBUG DPRINT("RStartServiceW(%p %lu %p) called\n", hService, argc, argv); DPRINT(" argc: %lu\n", argc); if (argv != NULL) { for (i = 0; i < argc; i++) { - DPRINT(" argv[%lu]: %S\n", i, argv[i]); - } - } + DPRINT(" argv[%lu]: %S\n", i, argv[i].StringPtr); + } + } +#endif if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -3892,7 +3892,6 @@ LPWSTR lpDependencies = NULL; DWORD dwDependenciesLength = 0; DWORD dwRequiredSize; - LPQUERY_SERVICE_CONFIGA lpConfig = NULL; CHAR lpEmptyString[]={0,0}; LPSTR lpStr; @@ -3982,11 +3981,10 @@ } else { - lpConfig = (LPQUERY_SERVICE_CONFIGA)lpServiceConfig; - lpConfig->dwServiceType = lpService->Status.dwServiceType; - lpConfig->dwStartType = lpService->dwStartType; - lpConfig->dwErrorControl = lpService->dwErrorControl; - lpConfig->dwTagId = lpService->dwTag; + lpServiceConfig->dwServiceType = lpService->Status.dwServiceType; + lpServiceConfig->dwStartType = lpService->dwStartType; + lpServiceConfig->dwErrorControl = lpService->dwErrorControl; + lpServiceConfig->dwTagId = lpService->dwTag; lpStr = (LPSTR)(lpServiceConfig + 1); @@ -4009,7 +4007,7 @@ strcpy(lpStr, lpEmptyString); } - lpConfig->lpBinaryPathName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpBinaryPathName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); lpStr += (strlen((LPSTR)lpStr) + 1); if (lpService->lpGroup && lpService->lpGroup->lpGroupName) @@ -4028,7 +4026,7 @@ strcpy(lpStr, lpEmptyString); } - lpConfig->lpLoadOrderGroup = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpLoadOrderGroup = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); lpStr += (strlen(lpStr) + 1); /* Append Dependencies */ @@ -4048,7 +4046,7 @@ strcpy(lpStr, lpEmptyString); } - lpConfig->lpDependencies = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpDependencies = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); if (lpDependencies) lpStr += dwDependenciesLength; else @@ -4070,7 +4068,7 @@ strcpy(lpStr, lpEmptyString); } - lpConfig->lpServiceStartName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpServiceStartName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); lpStr += (strlen(lpStr) + 1); if (lpService->lpDisplayName) @@ -4089,7 +4087,7 @@ strcpy(lpStr, lpEmptyString); } - lpConfig->lpDisplayName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpServiceConfig->lpDisplayName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); } if (pcbBytesNeeded != NULL)

1 0

[hbelusca] 58443: [SERVICES] * Fix some format specifiers (part 2 of r58442). Thanks Amine :) * Remane two "global" static variables to avoid name collision warnings.
by hbelusca＠svn.reactos.org 08 Mar '13

08 Mar '13

Author: hbelusca Date: Fri Mar 8 20:56:18 2013 New Revision: 58443 URL: http://svn.reactos.org/svn/reactos?rev=58443&view=rev Log: [SERVICES] * Fix some format specifiers (part 2 of r58442). Thanks Amine :) * Remane two "global" static variables to avoid name collision warnings. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Fri Mar 8 20:56:18 2013 @@ -36,10 +36,10 @@ LIST_ENTRY ServiceListHead; static RTL_RESOURCE DatabaseLock; -static DWORD dwResumeCount = 1; +static DWORD ResumeCount = 1; static CRITICAL_SECTION ControlServiceCriticalSection; -static DWORD dwPipeTimeout = 30000; /* 30 Seconds */ +static DWORD PipeTimeout = 30000; /* 30 Seconds */ /* FUNCTIONS *****************************************************************/ @@ -110,7 +110,7 @@ 100, 8000, 4, - dwPipeTimeout, + PipeTimeout, NULL); DPRINT("CreateNamedPipeW(%S) done\n", szControlPipeName); if (pServiceImage->hControlPipe == INVALID_HANDLE_VALUE) @@ -380,7 +380,7 @@ lpService->lpDisplayName = lpService->lpServiceName; /* Set the resume count */ - lpService->dwResumeCount = dwResumeCount++; + lpService->dwResumeCount = ResumeCount++; /* Append service record */ InsertTailList(&ServiceListHead, @@ -941,7 +941,7 @@ DPRINT1("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, - dwPipeTimeout); + PipeTimeout); DPRINT1("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) @@ -995,7 +995,7 @@ DPRINT1("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, - dwPipeTimeout); + PipeTimeout); DPRINT1("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) @@ -1192,7 +1192,7 @@ DPRINT1("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, - dwPipeTimeout); + PipeTimeout); DPRINT1("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) @@ -1246,7 +1246,7 @@ DPRINT1("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, - dwPipeTimeout); + PipeTimeout); DPRINT1("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) @@ -1354,7 +1354,7 @@ DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, - dwPipeTimeout); + PipeTimeout); DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) @@ -1411,7 +1411,7 @@ DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, - dwPipeTimeout); + PipeTimeout); if (dwError == WAIT_TIMEOUT) { DPRINT("WaitForSingleObject() returned WAIT_TIMEOUT\n"); @@ -1927,7 +1927,7 @@ L"ServicesPipeTimeout", 0, NULL, - (LPBYTE)&dwPipeTimeout, + (LPBYTE)&PipeTimeout, &dwKeySize); RegCloseKey(hKey); Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Fri Mar 8 20:56:18 2013 @@ -153,7 +153,7 @@ PVOID Reply, LPDWORD ReplySize) { - DbgPrint("SCM READ: %s\n", Request); + DbgPrint("SCM READ: %p\n", Request); *ReplySize = 0; return FALSE; @@ -173,7 +173,7 @@ hPipe = (HANDLE)Context; - DPRINT("ScmNamedPipeThread(%x) - Accepting SCM commands through named pipe\n", hPipe); + DPRINT("ScmNamedPipeThread(%lu) - Accepting SCM commands through named pipe\n", hPipe); for (;;) { @@ -201,13 +201,13 @@ } } - DPRINT("ScmNamedPipeThread(%x) - Disconnecting named pipe connection\n", hPipe); + DPRINT("ScmNamedPipeThread(%lu) - Disconnecting named pipe connection\n", hPipe); FlushFileBuffers(hPipe); DisconnectNamedPipe(hPipe); CloseHandle(hPipe); - DPRINT("ScmNamedPipeThread(%x) - Done.\n", hPipe); + DPRINT("ScmNamedPipeThread(%lu) - Done.\n", hPipe); return ERROR_SUCCESS; } @@ -278,7 +278,7 @@ ScmNamedPipeListenerThread(LPVOID Context) { // HANDLE hPipe; - DPRINT("ScmNamedPipeListenerThread(%x) - aka SCM.\n", Context); + DPRINT("ScmNamedPipeListenerThread(%p) - aka SCM.\n", Context); // hPipe = (HANDLE)Context; for (;;) @@ -294,7 +294,7 @@ DPRINT("\nSCM: named pipe session created.\n"); Sleep(10); } - DPRINT("\n\nWARNING: ScmNamedPipeListenerThread(%x) - Aborted.\n\n", Context); + DPRINT("\n\nWARNING: ScmNamedPipeListenerThread(%p) - Aborted.\n\n", Context); return ERROR_SUCCESS; }

1 0

[akhaldi] 58442: [SERVICES] * Fix some format specifiers.
by akhaldi＠svn.reactos.org 08 Mar '13

08 Mar '13

Author: akhaldi Date: Fri Mar 8 20:49:03 2013 New Revision: 58442 URL: http://svn.reactos.org/svn/reactos?rev=58442&view=rev Log: [SERVICES] * Fix some format specifiers. Modified: trunk/reactos/base/system/services/groupdb.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/groupdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/group… ============================================================================== --- trunk/reactos/base/system/services/groupdb.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/groupdb.c [iso-8859-1] Fri Mar 8 20:49:03 2013 @@ -96,7 +96,7 @@ { PSERVICE_GROUP Group; - DPRINT("CreateGroupOrderListRoutine(%S, %x, %x, %x, %x, %x)\n", + DPRINT("CreateGroupOrderListRoutine(%S, %x, %p, %x, %p, %p)\n", ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); if (ValueType == REG_BINARY && @@ -172,7 +172,7 @@ QueryTable, (PVOID)Group, NULL); - DPRINT("%x %d %S\n", Status, Group->TagCount, (PWSTR)ValueData); + DPRINT("%x %lu %S\n", Status, Group->TagCount, (PWSTR)ValueData); InsertTailList(&GroupListHead, &Group->GroupListEntry); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Mar 8 20:49:03 2013 @@ -1619,7 +1619,7 @@ WCHAR szErrorBuffer[32]; DPRINT("RSetServiceStatus() called\n"); - DPRINT("hServiceStatus = %p\n", hServiceStatus); + DPRINT("hServiceStatus = %lu\n", hServiceStatus); DPRINT("dwServiceType = %lu\n", lpServiceStatus->dwServiceType); DPRINT("dwCurrentState = %lu\n", lpServiceStatus->dwCurrentState); DPRINT("dwControlsAccepted = %lu\n", lpServiceStatus->dwControlsAccepted); Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Fri Mar 8 20:49:03 2013 @@ -55,7 +55,7 @@ L"Service Control Manager"); if (hLog == NULL) { - DPRINT1("ScmLogEvent: RegisterEventSourceW failed %d\n", GetLastError()); + DPRINT1("ScmLogEvent: RegisterEventSourceW failed %lu\n", GetLastError()); return; } @@ -69,7 +69,7 @@ lpStrings, NULL)) { - DPRINT1("ScmLogEvent: ReportEventW failed %d\n", GetLastError()); + DPRINT1("ScmLogEvent: ReportEventW failed %lu\n", GetLastError()); } DeregisterEventSource(hLog); @@ -233,7 +233,7 @@ NULL); if (hPipe == INVALID_HANDLE_VALUE) { - DPRINT("CreateNamedPipe() failed (%d)\n", GetLastError()); + DPRINT("CreateNamedPipe() failed (%lu)\n", GetLastError()); return FALSE; } @@ -253,7 +253,7 @@ &dwThreadId); if (!hThread) { - DPRINT("Could not create thread (%d)\n", GetLastError()); + DPRINT("Could not create thread (%lu)\n", GetLastError()); DisconnectNamedPipe(hPipe); CloseHandle(hPipe); DPRINT("CreateNamedPipe() - returning FALSE\n");

1 0

[akhaldi] 58441: [CRT] * Annotate excpt.h.
by akhaldi＠svn.reactos.org 08 Mar '13

08 Mar '13

Author: akhaldi Date: Fri Mar 8 13:55:06 2013 New Revision: 58441 URL: http://svn.reactos.org/svn/reactos?rev=58441&view=rev Log: [CRT] * Annotate excpt.h. Modified: trunk/reactos/include/crt/excpt.h Modified: trunk/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/excpt.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/excpt.h [iso-8859-1] Fri Mar 8 13:55:06 2013 @@ -26,7 +26,14 @@ struct _EXCEPTION_RECORD; struct _CONTEXT; - EXCEPTION_DISPOSITION __cdecl _except_handler(struct _EXCEPTION_RECORD *_ExceptionRecord,void *_EstablisherFrame,struct _CONTEXT *_ContextRecord,void *_DispatcherContext); + EXCEPTION_DISPOSITION + __cdecl + _except_handler( + _In_ struct _EXCEPTION_RECORD *_ExceptionRecord, + _In_ void *_EstablisherFrame, + _Inout_ struct _CONTEXT *_ContextRecord, + _Inout_ void *_DispatcherContext); + #elif defined(__ia64__) typedef struct _EXCEPTION_POINTERS *Exception_info_ptr; @@ -34,14 +41,33 @@ struct _CONTEXT; struct _DISPATCHER_CONTEXT; - __MINGW_EXTENSION _CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (struct _EXCEPTION_RECORD *_ExceptionRecord,unsigned __int64 _MemoryStackFp,unsigned __int64 _BackingStoreFp,struct _CONTEXT *_ContextRecord,struct _DISPATCHER_CONTEXT *_DispatcherContext,unsigned __int64 _GlobalPointer); + __MINGW_EXTENSION + _CRTIMP + EXCEPTION_DISPOSITION + __cdecl + __C_specific_handler( + _In_ struct _EXCEPTION_RECORD *_ExceptionRecord, + _In_ unsigned __int64 _MemoryStackFp, + _In_ unsigned __int64 _BackingStoreFp, + _Inout_ struct _CONTEXT *_ContextRecord, + _Inout_ struct _DISPATCHER_CONTEXT *_DispatcherContext, + _In_ unsigned __int64 _GlobalPointer); + #elif defined(__x86_64) struct _EXCEPTION_RECORD; struct _CONTEXT; struct _DISPATCHER_CONTEXT; - _CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (struct _EXCEPTION_RECORD *_ExceptionRecord,void *_EstablisherFrame,struct _CONTEXT *_ContextRecord,struct _DISPATCHER_CONTEXT *_DispatcherContext); + _CRTIMP + EXCEPTION_DISPOSITION + __cdecl + __C_specific_handler( + _In_ struct _EXCEPTION_RECORD *_ExceptionRecord, + _In_ void *_EstablisherFrame, + _Inout_ struct _CONTEXT *_ContextRecord, + _Inout_ struct _DISPATCHER_CONTEXT *_DispatcherContext); + #endif #ifdef _MSC_VER

1 0

[akhaldi] 58440: [CRT] * Annotate wchar.h.
by akhaldi＠svn.reactos.org 07 Mar '13

07 Mar '13

Author: akhaldi Date: Thu Mar 7 16:46:59 2013 New Revision: 58440 URL: http://svn.reactos.org/svn/reactos?rev=58440&view=rev Log: [CRT] * Annotate wchar.h. Modified: trunk/reactos/include/crt/wchar.h Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Thu Mar 7 16:46:59 2013 @@ -183,42 +183,43 @@ #ifndef _WCTYPE_DEFINED #define _WCTYPE_DEFINED - _CRTIMP int __cdecl iswalpha(wint_t _C); - _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswupper(wint_t _C); - _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswlower(wint_t _C); - _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswdigit(wint_t _C); - _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswxdigit(wint_t _C); - _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswspace(wint_t _C); - _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswpunct(wint_t _C); - _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswalnum(wint_t _C); - _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswprint(wint_t _C); - _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswgraph(wint_t _C); - _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswcntrl(wint_t _C); - _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswascii(wint_t _C); - _CRTIMP int __cdecl isleadbyte(int _C); - _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl towupper(wint_t _C); - _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl towlower(wint_t _C); - _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type); - _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale); - _CRTIMP int __cdecl __iswcsymf(wint_t _C); - _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl __iswcsym(wint_t _C); - _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); + _Check_return_ _CRTIMP int __cdecl iswalpha(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswalpha_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswupper(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswupper_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswlower(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswlower_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswdigit(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswdigit_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswxdigit(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswxdigit_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswspace(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswspace_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswpunct(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswpunct_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswalnum(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswalnum_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswprint(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswprint_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswgraph(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswgraph_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswcntrl(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswcntrl_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswascii(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl isleadbyte(_In_ int _C); + _Check_return_ _CRTIMP int __cdecl _isleadbyte_l(_In_ int _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP wint_t __cdecl towupper(_In_ wint_t _C); + _Check_return_ _CRTIMP wint_t __cdecl _towupper_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP wint_t __cdecl towlower(_In_ wint_t _C); + _Check_return_ _CRTIMP wint_t __cdecl _towlower_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswctype(_In_ wint_t _C, _In_ wctype_t _Type); + _Check_return_ _CRTIMP int __cdecl _iswctype_l(_In_ wint_t _C, _In_ wctype_t _Type, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl __iswcsymf(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswcsymf_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl __iswcsym(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswcsym_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _CRTIMP int __cdecl is_wctype(_In_ wint_t _C, _In_ wctype_t _Type); + #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) _CRTIMP int __cdecl iswblank(wint_t _C); #endif @@ -226,33 +227,185 @@ #ifndef _WDIRECT_DEFINED #define _WDIRECT_DEFINED - _CRTIMP wchar_t *__cdecl _wgetcwd(wchar_t *_DstBuf,int _SizeInWords); - _CRTIMP wchar_t *__cdecl _wgetdcwd(int _Drive,wchar_t *_DstBuf,int _SizeInWords); - wchar_t *__cdecl _wgetdcwd_nolock(int _Drive,wchar_t *_DstBuf,int _SizeInWords); - _CRTIMP int __cdecl _wchdir(const wchar_t *_Path); - _CRTIMP int __cdecl _wmkdir(const wchar_t *_Path); - _CRTIMP int __cdecl _wrmdir(const wchar_t *_Path); -#endif + + _Check_return_ + _Ret_opt_z_ + _CRTIMP + wchar_t* + __cdecl + _wgetcwd( + _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf, + _In_ int _SizeInWords); + + _Check_return_ + _Ret_opt_z_ + _CRTIMP + wchar_t* + __cdecl + _wgetdcwd( + _In_ int _Drive, + _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf, + _In_ int _SizeInWords); + + _Check_return_ + _Ret_opt_z_ + wchar_t* + __cdecl + _wgetdcwd_nolock( + _In_ int _Drive, + _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf, + _In_ int _SizeInWords); + + _Check_return_ + _CRTIMP + int + __cdecl + _wchdir( + _In_z_ const wchar_t *_Path); + + _Check_return_ + _CRTIMP + int + __cdecl + _wmkdir( + _In_z_ const wchar_t *_Path); + + _Check_return_ + _CRTIMP + int + __cdecl + _wrmdir( + _In_z_ const wchar_t *_Path); + +#endif /* _WDIRECT_DEFINED */ #ifndef _WIO_DEFINED #define _WIO_DEFINED - _CRTIMP int __cdecl _waccess(const wchar_t *_Filename,int _AccessMode); - _CRTIMP int __cdecl _wchmod(const wchar_t *_Filename,int _Mode); - _CRTIMP int __cdecl _wcreat(const wchar_t *_Filename,int _PermissionMode); - _CRTIMP intptr_t __cdecl _wfindfirst32(const wchar_t *_Filename,struct _wfinddata32_t *_FindData); - _CRTIMP int __cdecl _wfindnext32(intptr_t _FindHandle,struct _wfinddata32_t *_FindData); - _CRTIMP int __cdecl _wunlink(const wchar_t *_Filename); - _CRTIMP int __cdecl _wrename(const wchar_t *_NewFilename,const wchar_t *_OldFilename); - _CRTIMP wchar_t *__cdecl _wmktemp(wchar_t *_TemplateName); + + _Check_return_ + _CRTIMP + int + __cdecl + _waccess( + _In_z_ const wchar_t *_Filename, + _In_ int _AccessMode); + + _Check_return_ + _CRTIMP + int + __cdecl + _wchmod( + _In_z_ const wchar_t *_Filename, + _In_ int _Mode); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcreat( + _In_z_ const wchar_t *_Filename, + _In_ int _PermissionMode); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _wfindfirst32( + _In_z_ const wchar_t *_Filename, + _Out_ struct _wfinddata32_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wfindnext32( + _In_ intptr_t _FindHandle, + _Out_ struct _wfinddata32_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wunlink( + _In_z_ const wchar_t *_Filename); + + _Check_return_ + _CRTIMP + int + __cdecl + _wrename( + _In_z_ const wchar_t *_OldFilename, + _In_z_ const wchar_t *_NewFilename); + + _CRTIMP + wchar_t* + __cdecl + _wmktemp( + _Inout_z_ wchar_t *_TemplateName); + #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP intptr_t __cdecl _wfindfirst32i64(const wchar_t *_Filename,struct _wfinddata32i64_t *_FindData); - _CRTIMP intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i32_t *_FindData); - _CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t *_Filename,struct _wfinddata64_t *_FindData); - _CRTIMP int __cdecl _wfindnext32i64(intptr_t _FindHandle,struct _wfinddata32i64_t *_FindData); - _CRTIMP int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_FindData); - _CRTIMP int __cdecl _wfindnext64(intptr_t _FindHandle,struct _wfinddata64_t *_FindData); -#endif - _CRTIMP errno_t __cdecl _wsopen_s(int *_FileHandle,const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionFlag); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _wfindfirst32i64( + _In_z_ const wchar_t *_Filename, + _Out_ struct _wfinddata32i64_t *_FindData); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _wfindfirst64i32( + _In_z_ const wchar_t *_Filename, + _Out_ struct _wfinddata64i32_t *_FindData); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _wfindfirst64( + _In_z_ const wchar_t *_Filename, + _Out_ struct _wfinddata64_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wfindnext32i64( + _In_ intptr_t _FindHandle, + _Out_ struct _wfinddata32i64_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wfindnext64i32( + _In_ intptr_t _FindHandle, + _Out_ struct _wfinddata64i32_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wfindnext64( + _In_ intptr_t _FindHandle, + _Out_ struct _wfinddata64_t *_FindData); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wsopen_s( + _Out_ int *_FileHandle, + _In_z_ const wchar_t *_Filename, + _In_ int _OpenFlag, + _In_ int _ShareFlag, + _In_ int _PermissionFlag); + #if !defined(__cplusplus) || !(defined(_X86_) && !defined(__x86_64)) _CRTIMP int __cdecl _wopen(const wchar_t *_Filename,int _OpenFlag,...); _CRTIMP int __cdecl _wsopen(const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,...); @@ -260,35 +413,164 @@ extern "C++" _CRTIMP int __cdecl _wopen(const wchar_t *_Filename,int _OpenFlag,int _PermissionMode = 0); extern "C++" _CRTIMP int __cdecl _wsopen(const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionMode = 0); #endif + #endif /* !_WIO_DEFINED */ #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED - _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale); + _Check_return_opt_ + _CRTIMP + wchar_t* + __cdecl + _wsetlocale( + _In_ int _Category, + _In_opt_z_ const wchar_t *_Locale); #endif #ifndef _WPROCESS_DEFINED #define _WPROCESS_DEFINED - _CRTIMP intptr_t __cdecl _wexecl(const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wexecle(const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wexeclp(const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wexeclpe(const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wexecv(const wchar_t *_Filename,const wchar_t *const *_ArgList); - _CRTIMP intptr_t __cdecl _wexecve(const wchar_t *_Filename,const wchar_t *const *_ArgList,const wchar_t *const *_Env); - _CRTIMP intptr_t __cdecl _wexecvp(const wchar_t *_Filename,const wchar_t *const *_ArgList); - _CRTIMP intptr_t __cdecl _wexecvpe(const wchar_t *_Filename,const wchar_t *const *_ArgList,const wchar_t *const *_Env); - _CRTIMP intptr_t __cdecl _wspawnl(int _Mode,const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wspawnle(int _Mode,const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wspawnlp(int _Mode,const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wspawnlpe(int _Mode,const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wspawnv(int _Mode,const wchar_t *_Filename,const wchar_t *const *_ArgList); - _CRTIMP intptr_t __cdecl _wspawnve(int _Mode,const wchar_t *_Filename,const wchar_t *const *_ArgList,const wchar_t *const *_Env); - _CRTIMP intptr_t __cdecl _wspawnvp(int _Mode,const wchar_t *_Filename,const wchar_t *const *_ArgList); - _CRTIMP intptr_t __cdecl _wspawnvpe(int _Mode,const wchar_t *_Filename,const wchar_t *const *_ArgList,const wchar_t *const *_Env); + + _CRTIMP + intptr_t + __cdecl + _wexecl( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wexecle( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wexeclp( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wexeclpe( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wexecv( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList); + + _CRTIMP + intptr_t + __cdecl + _wexecve( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList, + _In_opt_z_ const wchar_t *const *_Env); + + _CRTIMP + intptr_t + __cdecl + _wexecvp( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList); + + _CRTIMP + intptr_t + __cdecl + _wexecvpe( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList, + _In_opt_z_ const wchar_t *const *_Env); + + _CRTIMP + intptr_t + __cdecl + _wspawnl( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wspawnle( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wspawnlp( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wspawnlpe( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wspawnv( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList); + + _CRTIMP + intptr_t + __cdecl + _wspawnve( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList, + _In_opt_z_ const wchar_t *const *_Env); + + _CRTIMP + intptr_t + __cdecl + _wspawnvp( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList); + + _CRTIMP + intptr_t + __cdecl + _wspawnvpe( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList, + _In_opt_z_ const wchar_t *const *_Env); + #ifndef _CRT_WSYSTEM_DEFINED #define _CRT_WSYSTEM_DEFINED - _CRTIMP int __cdecl _wsystem(const wchar_t *_Command); + _CRTIMP + int + __cdecl + _wsystem( + _In_opt_z_ const wchar_t *_Command); #endif /* !_CRT_WSYSTEM_DEFINED */ + #endif /* !_WPROCESS_DEFINED */ #ifndef _WCTYPE_INLINE_DEFINED @@ -329,7 +611,7 @@ #ifndef _INO_T_DEFINED #define _INO_T_DEFINED typedef unsigned short _ino_t; -#ifndef NO_OLDNAMES +#ifndef NO_OLDNAMES typedef unsigned short ino_t; #endif #endif @@ -337,7 +619,7 @@ #ifndef _DEV_T_DEFINED #define _DEV_T_DEFINED typedef unsigned int _dev_t; -#ifndef NO_OLDNAMES +#ifndef NO_OLDNAMES typedef unsigned int dev_t; #endif #endif @@ -456,40 +738,195 @@ #ifndef _WSTAT_DEFINED #define _WSTAT_DEFINED - _CRTIMP int __cdecl _wstat(const wchar_t *_Name,struct _stat *_Stat); - _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat); + + _CRTIMP + int + __cdecl + _wstat( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat *_Stat); + + _CRTIMP + int + __cdecl + _wstat32( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat32 *_Stat); + #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat); - _CRTIMP int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); - _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat); -#endif -#endif -#endif + + _CRTIMP + int + __cdecl + _wstat32i64( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat32i64 *_Stat); + + _CRTIMP + int + __cdecl + _wstat64i32( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat64i32 *_Stat); + + _CRTIMP + int + __cdecl + _wstat64( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat64 *_Stat); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + +#endif /* _WSTAT_DEFINED */ + +#endif /* !defined(_POSIX_) || defined(__GNUC__) */ #ifndef _WCONIO_DEFINED #define _WCONIO_DEFINED - _CRTIMP wchar_t *_cgetws(wchar_t *_Buffer); - _CRTIMP wint_t __cdecl _getwch(void); - _CRTIMP wint_t __cdecl _getwche(void); - _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); - _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); - _CRTIMP int __cdecl _cputws(const wchar_t *_String); - _CRTIMP int __cdecl _cwprintf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_p(const wchar_t *_Format,...); - _CRTIMP int __cdecl _vcwprintf_p(const wchar_t *_Format,va_list _ArgList); - - _CRTIMP int __cdecl _cwprintf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - wint_t __cdecl _putwch_nolock(wchar_t _WCh); - wint_t __cdecl _getwch_nolock(void); - wint_t __cdecl _getwche_nolock(void); - wint_t __cdecl _ungetwch_nolock(wint_t _WCh); -#endif + + _CRTIMP + wchar_t* + _cgetws( + _Inout_z_ wchar_t *_Buffer); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _getwch(void); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _getwche(void); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _putwch( + wchar_t _WCh); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _ungetwch( + wint_t _WCh); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cputws( + _In_z_ const wchar_t *_String); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwscanf( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwscanf_l( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vcwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vcwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _CRTIMP + int + __cdecl + _cwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _CRTIMP + int + __cdecl + _vcwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _CRTIMP + int + __cdecl + _cwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _CRTIMP + int + __cdecl + _vcwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + wint_t + __cdecl + _putwch_nolock( + wchar_t _WCh); + + _Check_return_ + wint_t + __cdecl + _getwch_nolock(void); + + _Check_return_ + wint_t + __cdecl + _getwche_nolock(void); + + _Check_return_opt_ + wint_t + __cdecl + _ungetwch_nolock( + wint_t _WCh); + +#endif /* _WCONIO_DEFINED */ #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED @@ -497,33 +934,191 @@ #ifdef _POSIX_ _CRTIMP FILE *__cdecl _wfsopen(const wchar_t *_Filename,const wchar_t *_Mode); #else - _CRTIMP FILE *__cdecl _wfsopen(const wchar_t *_Filename,const wchar_t *_Mode,int _ShFlag); -#endif - - _CRTIMP_ALT wint_t __cdecl fgetwc(FILE *_File); - _CRTIMP wint_t __cdecl _fgetwchar(void); - _CRTIMP wint_t __cdecl fputwc(wchar_t _Ch,FILE *_File); - _CRTIMP wint_t __cdecl _fputwchar(wchar_t _Ch); - _CRTIMP wint_t __cdecl getwc(FILE *_File); - _CRTIMP wint_t __cdecl getwchar(void); - _CRTIMP wint_t __cdecl putwc(wchar_t _Ch,FILE *_File); - _CRTIMP wint_t __cdecl putwchar(wchar_t _Ch); - _CRTIMP_ALT wint_t __cdecl ungetwc(wint_t _Ch,FILE *_File); - _CRTIMP wchar_t *__cdecl fgetws(wchar_t *_Dst,int _SizeInWords,FILE *_File); - _CRTIMP int __cdecl fputws(const wchar_t *_Str,FILE *_File); - _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String); - _CRTIMP int __cdecl _putws(const wchar_t *_Str); - _CRTIMP int __cdecl fwprintf(FILE *_File,const wchar_t *_Format,...); - _CRTIMP int __cdecl wprintf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _scwprintf(const wchar_t *_Format,...); - _CRTIMP int __cdecl vfwprintf(FILE *_File,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl vwprintf(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl swprintf(wchar_t*, const wchar_t*, ...); - _CRTIMP int __cdecl vswprintf(wchar_t*, const wchar_t*,va_list); - _CRTIMP int __cdecl _swprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vswprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,va_list _ArgList); + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wfsopen( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode, + _In_ int _ShFlag); +#endif + + _Check_return_opt_ + _CRTIMP_ALT + wint_t + __cdecl + fgetwc( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _fgetwchar(void); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + fputwc( + _In_ wchar_t _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _fputwchar( + _In_ wchar_t _Ch); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + getwc( + _Inout_ FILE *_File); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + getwchar(void); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + putwc( + _In_ wchar_t _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + putwchar( + _In_ wchar_t _Ch); + + _Check_return_opt_ + _CRTIMP_ALT + wint_t + __cdecl + ungetwc( + _In_ wint_t _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wchar_t* + __cdecl + fgetws( + _Out_writes_z_(_SizeInWords) wchar_t *_Dst, + _In_ int _SizeInWords, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fputws( + _In_z_ const wchar_t *_Str, + _Inout_ FILE *_File); + + _CRTIMP + wchar_t* + __cdecl + _getws( + _Pre_notnull_ _Post_z_ wchar_t *_String); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _putws( + _In_z_ const wchar_t *_Str); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fwprintf( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + wprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + vfwprintf( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + vwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _CRTIMP + int + __cdecl + swprintf( + _Out_ wchar_t*, + const wchar_t*, + ...); + + _CRTIMP + int + __cdecl + vswprintf( + _Out_ wchar_t*, + const wchar_t*, + va_list); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_c( + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_c( + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + _CRTIMP int __cdecl _snwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,...); _CRTIMP int __cdecl _vsnwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,va_list _Args); + #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ _CRTIMP int __cdecl snwprintf (wchar_t *s, size_t n, const wchar_t * format, ...); __CRT_INLINE int __cdecl vsnwprintf (wchar_t *s, size_t n, const wchar_t *format, va_list arg) { return _vsnwprintf(s,n,format,arg); } @@ -531,33 +1126,263 @@ _CRTIMP int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); _CRTIMP int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); #endif - _CRTIMP int __cdecl _fwprintf_p(FILE *_File,const wchar_t *_Format,...); - _CRTIMP int __cdecl _wprintf_p(const wchar_t *_Format,...); - _CRTIMP int __cdecl _vfwprintf_p(FILE *_File,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _vwprintf_p(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _swprintf_p(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vswprintf_p(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _scwprintf_p(const wchar_t *_Format,...); - _CRTIMP int __cdecl _vscwprintf_p(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _wprintf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _wprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fwprintf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _fwprintf_p_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vfwprintf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vfwprintf_p_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _swprintf_c_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _swprintf_p_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vswprintf_c_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vswprintf_p_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _scwprintf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _scwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vscwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _snwprintf_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsnwprintf_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _swprintf(wchar_t *_Dest,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vswprintf(wchar_t *_Dest,const wchar_t *_Format,va_list _Args); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_p( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_p( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_p( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_p( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_p_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_p_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_c_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_p_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_c_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_p_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwprintf_l( + _Out_writes_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnwprintf_l( + _Out_writes_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _CRTIMP + int + __cdecl + _swprintf( + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _CRTIMP + int + __cdecl + _vswprintf( + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _Args); + + _CRTIMP int __cdecl __swprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,...); _CRTIMP int __cdecl __vswprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,va_list _Args); @@ -572,34 +1397,185 @@ #endif #endif - _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix); - _CRTIMP int __cdecl _vscwprintf(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _vscwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - int __cdecl fwscanf(FILE *_File,const wchar_t *_Format,...); - _CRTIMP int __cdecl _fwscanf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - int __cdecl swscanf(const wchar_t *_Src,const wchar_t *_Format,...); - _CRTIMP int __cdecl _swscanf_l(const wchar_t *_Src,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snwscanf(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _snwscanf_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - int __cdecl wscanf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _wscanf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP FILE *__cdecl _wfdopen(int _FileHandle ,const wchar_t *_Mode); - _CRTIMP FILE *__cdecl _wfopen(const wchar_t *_Filename,const wchar_t *_Mode); - _CRTIMP FILE *__cdecl _wfreopen(const wchar_t *_Filename,const wchar_t *_Mode,FILE *_OldFile); + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wtempnam( + _In_opt_z_ const wchar_t *_Directory, + _In_opt_z_ const wchar_t *_FilePrefix); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_ + int + __cdecl + fwscanf( + _Inout_ FILE *_File, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwscanf_l( + _Inout_ FILE *_File, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + int + __cdecl + swscanf( + _In_z_ const wchar_t *_Src, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swscanf_l( + _In_z_ const wchar_t *_Src, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf_l( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + int + __cdecl + wscanf( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wscanf_l( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wfdopen( + _In_ int _FileHandle, + _In_z_ const wchar_t *_Mode); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wfopen( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wfreopen( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode, + _Inout_ FILE *_OldFile); #ifndef _CRT_WPERROR_DEFINED #define _CRT_WPERROR_DEFINED - _CRTIMP void __cdecl _wperror(const wchar_t *_ErrMsg); -#endif - _CRTIMP FILE *__cdecl _wpopen(const wchar_t *_Command,const wchar_t *_Mode); + _CRTIMP + void + __cdecl + _wperror( + _In_opt_z_ const wchar_t *_ErrMsg); +#endif + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wpopen( + _In_z_ const wchar_t *_Command, + _In_z_ const wchar_t *_Mode); + #if !defined(NO_OLDNAMES) && !defined(wpopen) -#define wpopen _wpopen -#endif - _CRTIMP int __cdecl _wremove(const wchar_t *_Filename); - _CRTIMP wchar_t *__cdecl _wtmpnam(wchar_t *_Buffer); - _CRTIMP wint_t __cdecl _fgetwc_nolock(FILE *_File); - _CRTIMP wint_t __cdecl _fputwc_nolock(wchar_t _Ch,FILE *_File); - _CRTIMP wint_t __cdecl _ungetwc_nolock(wint_t _Ch,FILE *_File); +#define wpopen _wpopen +#endif + + _Check_return_ + _CRTIMP + int + __cdecl + _wremove( + _In_z_ const wchar_t *_Filename); + + _CRTIMP + wchar_t* + __cdecl + _wtmpnam( + _Pre_maybenull_ _Post_z_ wchar_t *_Buffer); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _fgetwc_nolock( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _fputwc_nolock( + _In_ wchar_t _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _ungetwc_nolock( + _In_ wint_t _Ch, + _Inout_ FILE *_File); #undef _CRT_GETPUTWCHAR_NOINLINE @@ -607,127 +1583,682 @@ #define getwchar() fgetwc(stdin) #define putwchar(_c) fputwc((_c),stdout) #else - __CRT_INLINE wint_t __cdecl getwchar() {return (fgetwc(stdin)); } - __CRT_INLINE wint_t __cdecl putwchar(wchar_t _C) {return (fputwc(_C,stdout)); } + _Check_return_ __CRT_INLINE wint_t __cdecl getwchar() {return (fgetwc(stdin)); } + _Check_return_opt_ __CRT_INLINE wint_t __cdecl putwchar(_In_ wchar_t _C) {return (fputwc(_C,stdout)); } #endif #define getwc(_stm) fgetwc(_stm) #define putwc(_c,_stm) fputwc(_c,_stm) #define _putwc_nolock(_c,_stm) _fputwc_nolock(_c,_stm) #define _getwc_nolock(_c) _fgetwc_nolock(_c) -#endif + +#endif /* _WSTDIO_DEFINED */ #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED - _CRTIMP wchar_t *__cdecl _itow(int _Value,wchar_t *_Dest,int _Radix); - _CRTIMP wchar_t *__cdecl _ltow(long _Value,wchar_t *_Dest,int _Radix); - _CRTIMP wchar_t *__cdecl _ultow(unsigned long _Value,wchar_t *_Dest,int _Radix); - double __cdecl wcstod(const wchar_t *_Str,wchar_t **_EndPtr); - _CRTIMP double __cdecl _wcstod_l(const wchar_t *_Str,wchar_t **_EndPtr,_locale_t _Locale); + _CRTIMP + wchar_t* + __cdecl + _itow( + _In_ int _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _CRTIMP + wchar_t* + __cdecl + _ltow( + _In_ long _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _CRTIMP + wchar_t* + __cdecl + _ultow( + _In_ unsigned long _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _Check_return_ + double + __cdecl + wcstod( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr); + + _Check_return_ + _CRTIMP + double + __cdecl + _wcstod_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_opt_ _locale_t _Locale); + float __cdecl wcstof( const wchar_t *nptr, wchar_t **endptr); + #if !defined __NO_ISOCEXT /* in libmingwex.a */ float __cdecl wcstof (const wchar_t * __restrict__, wchar_t ** __restrict__); long double __cdecl wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__); #endif /* __NO_ISOCEXT */ - long __cdecl wcstol(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - _CRTIMP long __cdecl _wcstol_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - unsigned long __cdecl wcstoul(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - _CRTIMP unsigned long __cdecl _wcstoul_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wgetenv(const wchar_t *_VarName); + + _Check_return_ + long + __cdecl + wcstol( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + long + __cdecl + _wcstol_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + unsigned long + __cdecl + wcstoul( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + unsigned long + __cdecl + _wcstoul_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wgetenv( + _In_z_ const wchar_t *_VarName); + #ifndef _CRT_WSYSTEM_DEFINED #define _CRT_WSYSTEM_DEFINED - _CRTIMP int __cdecl _wsystem(const wchar_t *_Command); -#endif - _CRTIMP double __cdecl _wtof(const wchar_t *_Str); - _CRTIMP double __cdecl _wtof_l(const wchar_t *_Str,_locale_t _Locale); - _CRTIMP int __cdecl _wtoi(const wchar_t *_Str); - _CRTIMP int __cdecl _wtoi_l(const wchar_t *_Str,_locale_t _Locale); - _CRTIMP long __cdecl _wtol(const wchar_t *_Str); - _CRTIMP long __cdecl _wtol_l(const wchar_t *_Str,_locale_t _Locale); + _CRTIMP + int + __cdecl + _wsystem( + _In_opt_z_ const wchar_t *_Command); +#endif + + _Check_return_ + _CRTIMP + double + __cdecl + _wtof( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + double + __cdecl + _wtof_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wtoi( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _wtoi_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + long + __cdecl + _wtol( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + long + __cdecl + _wtol_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION _CRTIMP wchar_t *__cdecl _i64tow(__int64 _Val,wchar_t *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP wchar_t *__cdecl _ui64tow(unsigned __int64 _Val,wchar_t *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wtoi64(const wchar_t *_Str); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wtoi64_l(const wchar_t *_Str,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wcstoi64(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); -#endif -#endif + + __MINGW_EXTENSION + _CRTIMP + wchar_t* + __cdecl + _i64tow( + _In_ __int64 _Val, + _Pre_notnull_ _Post_z_ wchar_t *_DstBuf, + _In_ int _Radix); + + __MINGW_EXTENSION + _CRTIMP + wchar_t* + __cdecl + _ui64tow( + _In_ unsigned __int64 _Val, + _Pre_notnull_ _Post_z_ wchar_t *_DstBuf, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wtoi64( + _In_z_ const wchar_t *_Str); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wtoi64_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wcstoi64( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wcstoi64_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _wcstoui64( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _wcstoui64_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + +#endif /* _WSTDLIB_DEFINED */ #ifndef _POSIX_ + #ifndef _WSTDLIBP_DEFINED #define _WSTDLIBP_DEFINED - _CRTIMP wchar_t *__cdecl _wfullpath(wchar_t *_FullPath,const wchar_t *_Path,size_t _SizeInWords); - _CRTIMP void __cdecl _wmakepath(wchar_t *_ResultPath,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wfullpath( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_FullPath, + _In_z_ const wchar_t *_Path, + _In_ size_t _SizeInWords); + + _CRTIMP + void + __cdecl + _wmakepath( + _Pre_notnull_ _Post_z_ wchar_t *_ResultPath, + _In_opt_z_ const wchar_t *_Drive, + _In_opt_z_ const wchar_t *_Dir, + _In_opt_z_ const wchar_t *_Filename, + _In_opt_z_ const wchar_t *_Ext); + #ifndef _CRT_WPERROR_DEFINED #define _CRT_WPERROR_DEFINED - _CRTIMP void __cdecl _wperror(const wchar_t *_ErrMsg); -#endif - _CRTIMP int __cdecl _wputenv(const wchar_t *_EnvString); - _CRTIMP void __cdecl _wsearchenv(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath); - _CRTIMP void __cdecl _wsplitpath(const wchar_t *_FullPath,wchar_t *_Drive,wchar_t *_Dir,wchar_t *_Filename,wchar_t *_Ext); -#endif -#endif + _CRTIMP + void + __cdecl + _wperror( + _In_opt_z_ const wchar_t *_ErrMsg); +#endif + + _Check_return_ + _CRTIMP + int + __cdecl + _wputenv( + _In_z_ const wchar_t *_EnvString); + + _CRTIMP + void + __cdecl + _wsearchenv( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_EnvVar, + _Pre_notnull_ _Post_z_ wchar_t *_ResultPath); + + _CRTIMP + void + __cdecl + _wsplitpath( + _In_z_ const wchar_t *_FullPath, + _Pre_maybenull_ _Post_z_ wchar_t *_Drive, + _Pre_maybenull_ _Post_z_ wchar_t *_Dir, + _Pre_maybenull_ _Post_z_ wchar_t *_Filename, + _Pre_maybenull_ _Post_z_ wchar_t *_Ext); + +#endif /* _WSTDLIBP_DEFINED */ + +#endif /* _POSIX_ */ #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED - _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); - wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); - _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); - int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); - wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); - size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); - size_t __cdecl wcslen(const wchar_t *_Str); - size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); - wchar_t *__cdecl wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - wchar_t *__cdecl wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); - _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); - size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); - _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); - wchar_t *__cdecl wcstok(wchar_t *_Str,const wchar_t *_Delim); - _CRTIMP wchar_t *__cdecl _wcserror(int _ErrNum); - _CRTIMP wchar_t *__cdecl __wcserror(const wchar_t *_Str); - _CRTIMP int __cdecl _wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcsicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsnicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - _CRTIMP wchar_t *__cdecl _wcsrev(wchar_t *_Str); - _CRTIMP wchar_t *__cdecl _wcsset(wchar_t *_Str,wchar_t _Val); - _CRTIMP wchar_t *__cdecl _wcslwr(wchar_t *_String); - _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String); - _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale); - size_t __cdecl wcsxfrm(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount); - _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcsicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsncoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsncoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _wcsnicoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - -#ifndef NO_OLDNAMES - _CRTIMP wchar_t *__cdecl wcsdup(const wchar_t *_Str); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wcsdup( + _In_z_ const wchar_t *_Str); + + wchar_t* + __cdecl + wcscat( + _Inout_updates_z_(_String_length_(_Dest) + _String_length_(_Source) + 1) wchar_t *_Dest, + _In_z_ const wchar_t *_Source); + + _CONST_RETURN + wchar_t* + __cdecl + wcschr( + _In_z_ const wchar_t *_Str, + wchar_t _Ch); + + _Check_return_ + int + __cdecl + wcscmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + wchar_t* + __cdecl + wcscpy( + _Out_writes_z_(_String_length_(_Source) + 1) wchar_t *_Dest, + _In_z_ const wchar_t *_Source); + + _Check_return_ + size_t + __cdecl + wcscspn( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + size_t + __cdecl + wcslen( + _In_z_ const wchar_t *_Str); + + _When_(_MaxCount > _String_length_(_Src), + _Post_satisfies_(return == _String_length_(_Src))) + _When_(_MaxCount <= _String_length_(_Src), + _Post_satisfies_(return == _MaxCount)) + size_t + __cdecl + wcsnlen( + _In_reads_or_z_(_MaxCount) const wchar_t *_Src, + _In_ size_t _MaxCount); + + wchar_t* + __cdecl + wcsncat( + wchar_t *_Dest, + const wchar_t *_Source, + size_t _Count); + + _Check_return_ + int + __cdecl + wcsncmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + wchar_t* + __cdecl + wcsncpy( + wchar_t *_Dest, + const wchar_t *_Source, + size_t _Count); + + _Check_return_ + _CONST_RETURN + wchar_t* + __cdecl + wcspbrk( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _Check_return_ + _CONST_RETURN + wchar_t* + __cdecl + wcsrchr( + _In_z_ const wchar_t *_Str, + _In_ wchar_t _Ch); + + _Check_return_ + size_t + __cdecl + wcsspn( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _CONST_RETURN + wchar_t* + __cdecl + wcsstr( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_SubStr); + + _Check_return_ + wchar_t* + __cdecl + wcstok( + _Inout_opt_z_ wchar_t *_Str, + _In_z_ const wchar_t *_Delim); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wcserror( + _In_ int _ErrNum); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + __wcserror( + _In_opt_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicmp_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicmp_l( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + wchar_t* + __cdecl + _wcsnset( + wchar_t *_Str, + wchar_t _Val, + size_t _MaxCount); + + _CRTIMP + wchar_t* + __cdecl + _wcsrev( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + wchar_t* + __cdecl + _wcsset( + wchar_t *_Str, + wchar_t _Val); + + _CRTIMP + wchar_t* + __cdecl + _wcslwr( + _Inout_z_ wchar_t *_String); + + _CRTIMP + wchar_t* + _wcslwr_l( + wchar_t *_String, + _locale_t _Locale); + + _CRTIMP + wchar_t* + __cdecl + _wcsupr( + _Inout_z_ wchar_t *_String); + + _CRTIMP + wchar_t* + _wcsupr_l( + wchar_t *_String, + _locale_t _Locale); + + _Check_return_opt_ + size_t + __cdecl + wcsxfrm( + _Out_writes_opt_(_MaxCount) _Post_maybez_ wchar_t *_Dst, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _wcsxfrm_l( + _Out_writes_opt_(_MaxCount) _Post_maybez_ wchar_t *_Dst, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + int + __cdecl + wcscoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcscoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsncoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsncoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + +#ifndef NO_OLDNAMES + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + wcsdup( + _In_z_ const wchar_t *_Str); + #define wcswcs wcsstr - _CRTIMP int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP wchar_t *__cdecl wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - _CRTIMP wchar_t *__cdecl wcsrev(wchar_t *_Str); - _CRTIMP wchar_t *__cdecl wcsset(wchar_t *_Str,wchar_t _Val); - _CRTIMP wchar_t *__cdecl wcslwr(wchar_t *_Str); - _CRTIMP wchar_t *__cdecl wcsupr(wchar_t *_Str); - _CRTIMP int __cdecl wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); -#endif -#endif + + _Check_return_ + _CRTIMP + int + __cdecl + wcsicmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + wcsnicmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _CRTIMP + wchar_t* + __cdecl + wcsnset( + _Inout_updates_z_(_MaxCount) wchar_t *_Str, + _In_ wchar_t _Val, + _In_ size_t _MaxCount); + + _CRTIMP + wchar_t* + __cdecl + wcsrev( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + wchar_t* + __cdecl + wcsset( + _Inout_z_ wchar_t *_Str, + wchar_t _Val); + + _CRTIMP + wchar_t* + __cdecl + wcslwr( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + wchar_t* + __cdecl + wcsupr( + _Inout_z_ wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + wcsicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + +#endif /* NO_OLDNAMES */ + +#endif /* _WSTRING_DEFINED */ #ifndef _TM_DEFINED #define _TM_DEFINED @@ -747,22 +2278,97 @@ #ifndef _WTIME_DEFINED #define _WTIME_DEFINED - _CRTIMP wchar_t *__cdecl _wasctime(const struct tm *_Tm); - _CRTIMP wchar_t *__cdecl _wctime32(const __time32_t *_Time); - size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); - _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer); - _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer); - - _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); - _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); + _CRTIMP + wchar_t* + __cdecl + _wasctime( + _In_ const struct tm *_Tm); + + _CRTIMP + wchar_t* + __cdecl + _wctime32( + _In_ const __time32_t *_Time); + + _Success_(return > 0) + size_t + __cdecl + wcsftime( + _Out_writes_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_ const struct tm *_Tm); + + _Success_(return > 0) + _CRTIMP + size_t + __cdecl + _wcsftime_l( + _Out_writes_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_ const struct tm *_Tm, + _In_opt_ _locale_t _Locale); + + _CRTIMP + wchar_t* + __cdecl + _wstrdate( + _Out_writes_z_(9) wchar_t *_Buffer); + + _CRTIMP + wchar_t* + __cdecl + _wstrtime( + _Out_writes_z_(9) wchar_t *_Buffer); + + _CRTIMP + errno_t + __cdecl + _wasctime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const struct tm *_Tm); + + _CRTIMP + errno_t + __cdecl + _wctime32_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time32_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wstrdate_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_range_(>=, 9) size_t _SizeInWords); + + _CRTIMP + errno_t + __cdecl + _wstrtime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_ size_t _SizeInWords); #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP wchar_t *__cdecl _wctime64(const __time64_t *_Time); - _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); -#endif + + _CRTIMP + wchar_t* + __cdecl + _wctime64( + _In_ const __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wctime64_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time64_t *_Time); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ #if !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) #define _INC_WTIME_INL @@ -778,33 +2384,216 @@ typedef int mbstate_t; typedef wchar_t _Wint_t; - wint_t __cdecl btowc(int); - size_t __cdecl mbrlen(const char *_Ch,size_t _SizeInBytes,mbstate_t *_State); - size_t __cdecl mbrtowc(wchar_t *_DstCh,const char *_SrcCh,size_t _SizeInBytes,mbstate_t *_State); - size_t __cdecl mbsrtowcs(wchar_t *_Dest,const char **_PSrc,size_t _Count,mbstate_t *_State); - size_t __cdecl wcrtomb(char *_Dest,wchar_t _Source,mbstate_t *_State); - size_t __cdecl wcsrtombs(char *_Dest,const wchar_t **_PSource,size_t _Count,mbstate_t *_State); - int __cdecl wctob(wint_t _WCh); + wint_t + __cdecl + btowc( + int); + + size_t + __cdecl + mbrlen( + _In_reads_bytes_opt_(_SizeInBytes) _Pre_opt_z_ const char *_Ch, + _In_ size_t _SizeInBytes, + _Out_opt_ mbstate_t *_State); + + size_t + __cdecl + mbrtowc( + _Pre_maybenull_ _Post_z_ wchar_t *_DstCh, + _In_reads_bytes_opt_(_SizeInBytes) _Pre_opt_z_ const char *_SrcCh, + _In_ size_t _SizeInBytes, + _Out_opt_ mbstate_t *_State); + + size_t + __cdecl + mbsrtowcs( + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _Inout_ _Deref_prepost_opt_valid_ const char **_PSrc, + _In_ size_t _Count, + _Inout_opt_ mbstate_t *_State); + + size_t + __cdecl + wcrtomb( + _Pre_maybenull_ _Post_z_ char *_Dest, + _In_ wchar_t _Source, + _Out_opt_ mbstate_t *_State); + + size_t + __cdecl + wcsrtombs( + _Pre_maybenull_ _Post_z_ char *_Dest, + _Inout_ _Deref_prepost_z_ const wchar_t **_PSource, + _In_ size_t _Count, + _Out_opt_ mbstate_t *_State); + + int + __cdecl + wctob( + _In_ wint_t _WCh); #ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */ - wchar_t *__cdecl wmemset(wchar_t *s, wchar_t c, size_t n); - _CONST_RETURN wchar_t *__cdecl wmemchr(const wchar_t *s, wchar_t c, size_t n); - int wmemcmp(const wchar_t *s1, const wchar_t *s2,size_t n); - wchar_t *__cdecl wmemcpy(wchar_t *s1,const wchar_t *s2,size_t n); - wchar_t *__cdecl wmemmove(wchar_t *s1, const wchar_t *s2, size_t n); - __MINGW_EXTENSION long long __cdecl wcstoll(const wchar_t *nptr,wchar_t **endptr, int base); - __MINGW_EXTENSION unsigned long long __cdecl wcstoull(const wchar_t *nptr,wchar_t **endptr, int base); + + wchar_t* + __cdecl + wmemset( + _Out_writes_all_(_N) wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N); + + _CONST_RETURN + wchar_t* + __cdecl + wmemchr( + _In_reads_(_N) const wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N); + + int + wmemcmp( + _In_reads_(_N) const wchar_t *_S1, + _In_reads_(_N) const wchar_t *_S2, + _In_ size_t _N); + + _Post_equal_to_(_S1) + _At_buffer_(_S1, _Iter_, _N, _Post_satisfies_(_S1[_Iter_] == _S2[_Iter_])) + wchar_t* + __cdecl + wmemcpy( + _Out_writes_all_(_N) wchar_t *_S1, + _In_reads_(_N) const wchar_t *_S2, + _In_ size_t _N); + + wchar_t* + __cdecl + wmemmove( + _Out_writes_all_opt_(_N) wchar_t *_S1, + _In_reads_opt_(_N) const wchar_t *_S2, + _In_ size_t _N); + + __MINGW_EXTENSION + long long + __cdecl + wcstoll( + const wchar_t *nptr, + wchar_t **endptr, + int base); + + __MINGW_EXTENSION + unsigned long long + __cdecl + wcstoull( + const wchar_t *nptr, + wchar_t **endptr, + int base); + #endif /* __NO_ISOCEXT */ - void *__cdecl memmove(void *_Dst,const void *_Src,size_t _MaxCount); - void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _MaxCount); - __CRT_INLINE int __cdecl fwide(FILE *_F,int _M) { (void)_F; return (_M); } - __CRT_INLINE int __cdecl mbsinit(const mbstate_t *_P) { return (!_P || *_P==0); } - __CRT_INLINE _CONST_RETURN wchar_t *__cdecl wmemchr(const wchar_t *_S,wchar_t _C,size_t _N) { for (;0<_N;++_S,--_N) if (*_S==_C) return (_CONST_RETURN wchar_t *)(_S); return (0); } - __CRT_INLINE int __cdecl wmemcmp(const wchar_t *_S1,const wchar_t *_S2,size_t _N) { for (; 0 < _N; ++_S1,++_S2,--_N) if (*_S1!=*_S2) return (*_S1 < *_S2 ? -1 : +1); return (0); } - __CRT_INLINE wchar_t *__cdecl wmemcpy(wchar_t *_S1,const wchar_t *_S2,size_t _N) { return (wchar_t *)memcpy(_S1,_S2,_N*sizeof(wchar_t)); } - __CRT_INLINE wchar_t *__cdecl wmemmove(wchar_t *_S1,const wchar_t *_S2,size_t _N) { return (wchar_t *)memmove(_S1,_S2,_N*sizeof(wchar_t)); } - __CRT_INLINE wchar_t *__cdecl wmemset(wchar_t *_S,wchar_t _C,size_t _N) { + void* + __cdecl + memmove( + _Out_writes_bytes_all_opt_(_MaxCount) void *_Dst, + _In_reads_bytes_opt_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _MaxCount, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == ((unsigned char*)_Src)[_Iter_])) + void* + __cdecl + memcpy( + _Out_writes_bytes_all_(_MaxCount) void *_Dst, + _In_reads_bytes_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + __CRT_INLINE + int + __cdecl + fwide( + _In_opt_ FILE *_F, + int _M) + { + (void)_F; + return (_M); + } + + __CRT_INLINE + int + __cdecl + mbsinit( + _In_opt_ const mbstate_t *_P) + { + return (!_P || *_P==0); + } + + __CRT_INLINE + _CONST_RETURN + wchar_t* + __cdecl + wmemchr( + _In_reads_(_N) const wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N) + { + for (;0<_N;++_S,--_N) + { + if (*_S==_C) return (_CONST_RETURN wchar_t *)(_S); + } + return (0); + } + + __CRT_INLINE + int + __cdecl + wmemcmp( + _In_reads_(_N) const wchar_t *_S1, + _In_reads_(_N) const wchar_t *_S2, + _In_ size_t _N) + { + for (; 0 < _N; ++_S1,++_S2,--_N) + { + if (*_S1!=*_S2) return (*_S1 < *_S2 ? -1 : +1); + } + return (0); + } + + _Post_equal_to_(_S1) + _At_buffer_(_S1, + _Iter_, + _N, + _Post_satisfies_(_S1[_Iter_] == _S2[_Iter_])) + __CRT_INLINE + wchar_t* + __cdecl + wmemcpy( + _Out_writes_all_(_N) wchar_t *_S1, + _In_reads_(_N) const wchar_t *_S2, + _In_ size_t _N) + { + return (wchar_t *)memcpy(_S1,_S2,_N*sizeof(wchar_t)); + } + + __CRT_INLINE + wchar_t* + __cdecl + wmemmove( + _Out_writes_all_opt_(_N) wchar_t *_S1, + _In_reads_opt_(_N) const wchar_t *_S2, + _In_ size_t _N) + { + return (wchar_t *)memmove(_S1,_S2,_N*sizeof(wchar_t)); + } + + __CRT_INLINE + wchar_t* + __cdecl + wmemset( + _Out_writes_all_(_N) wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N) + { wchar_t *_Su = _S; for (;0<_N;++_Su,--_N) { *_Su = _C;

1 0

[akhaldi] 58439: [CRT] * Annotate string.h.
by akhaldi＠svn.reactos.org 07 Mar '13

07 Mar '13

Author: akhaldi Date: Thu Mar 7 16:45:18 2013 New Revision: 58439 URL: http://svn.reactos.org/svn/reactos?rev=58439&view=rev Log: [CRT] * Annotate string.h. Modified: trunk/reactos/include/crt/string.h Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Thu Mar 7 16:45:18 2013 @@ -27,163 +27,1114 @@ #ifndef _CRT_MEMORY_DEFINED #define _CRT_MEMORY_DEFINED - _CRTIMP void *__cdecl _memccpy(void *_Dst,const void *_Src,int _Val,size_t _MaxCount); - _CRTIMP _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); - _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); - _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); - int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); - _CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _Size); - void *__cdecl memset(void *_Dst,int _Val,size_t _Size); -#ifndef NO_OLDNAMES - _CRTIMP _CRT_NONSTDC_DEPRECATE(_memccpy) void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_memicmp) int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); -#endif -#endif - - char *__cdecl _strset(char *_Str,int _Val); - char *__cdecl strcpy(char *_Dest,const char *_Source); - char *__cdecl strcat(char *_Dest,const char *_Source); - int __cdecl strcmp(const char *_Str1,const char *_Str2); - size_t __cdecl strlen(const char *_Str); - _CRTIMP size_t __cdecl strnlen(const char *_Str,size_t _MaxCount); - - _CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) void *__cdecl memmove(void *_Dst,const void *_Src,size_t _Size); - _CRTIMP char *__cdecl _strdup(const char *_Src); - _CRTIMP _CONST_RETURN char *__cdecl strchr(const char *_Str,int _Val); - _CRTIMP int __cdecl _stricmp(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _strcmpi(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _stricmp_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl strcoll(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _strcoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _stricoll(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _stricoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _strncoll (const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _strncoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _strnicoll (const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _strnicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP size_t __cdecl strcspn(const char *_Str,const char *_Control); - _CRTIMP _CRT_INSECURE_DEPRECATE(_strerror_s) char *__cdecl _strerror(const char *_ErrMsg); - _CRTIMP _CRT_INSECURE_DEPRECATE(strerror_s) char *__cdecl strerror(int); - _CRTIMP char *__cdecl _strlwr(char *_String); - char *strlwr_l(char *_String,_locale_t _Locale); - char *__cdecl strncat(char *_Dest,const char *_Source,size_t _Count); - int __cdecl strncmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _strnicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _strnicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - char *strncpy(char *_Dest,const char *_Source,size_t _Count); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_strnset_s) char *__cdecl _strnset(char *_Str,int _Val,size_t _MaxCount); - _CRTIMP _CONST_RETURN char *__cdecl strpbrk(const char *_Str,const char *_Control); - _CRTIMP _CONST_RETURN char *__cdecl strrchr(const char *_Str,int _Ch); - _CRTIMP char *__cdecl _strrev(char *_Str); - _CRTIMP size_t __cdecl strspn(const char *_Str,const char *_Control); - _CRTIMP _CONST_RETURN char *__cdecl strstr(const char *_Str,const char *_SubStr); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(strtok_s) char *__cdecl strtok(char *_Str,const char *_Delim); - _CRTIMP char *__cdecl _strupr(char *_String); - _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale); - _CRTIMP size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP size_t __cdecl _strxfrm_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); + + _CRTIMP + void* + __cdecl + _memccpy( + _Out_writes_bytes_opt_(_MaxCount) void *_Dst, + _In_ const void *_Src, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Must_inspect_result_ + _CRTIMP + _CONST_RETURN + void* + __cdecl + memchr( + _In_reads_bytes_opt_(_MaxCount) const void *_Buf, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Must_inspect_result_ + _CRTIMP + int + __cdecl + _memicmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + + _Must_inspect_result_ + _CRTIMP + int + __cdecl + _memicmp_l( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Must_inspect_result_ + int + __cdecl + memcmp( + _In_reads_bytes_(_Size) const void *_Buf1, + _In_reads_bytes_(_Size) const void *_Buf2, + _In_ size_t _Size); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _MaxCount, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == ((unsigned char*)_Src)[_Iter_])) + _CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) + void* + __cdecl + memcpy( + _Out_writes_bytes_all_(_MaxCount) void *_Dst, + _In_reads_bytes_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _Size, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == _Val)) + void* + __cdecl + memset( + _Out_writes_bytes_all_(_Size) void *_Dst, + _In_ int _Val, + _In_ size_t _Size); + +#ifndef NO_OLDNAMES + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_memccpy) + void* + __cdecl + memccpy( + _Out_writes_bytes_opt_(_Size) void *_Dst, + _In_reads_bytes_opt_(_Size) const void *_Src, + _In_ int _Val, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_memicmp) + int + __cdecl + memicmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + +#endif /* NO_OLDNAMES */ + +#endif /* _CRT_MEMORY_DEFINED */ + + char* + __cdecl + _strset( + _Inout_z_ char *_Str, + _In_ int _Val); + + char* + __cdecl + strcpy( + _Out_writes_z_(_String_length_(_Source) + 1) char *_Dest, + _In_z_ const char *_Source); + + char* + __cdecl + strcat( + _Inout_updates_z_(_String_length_(_Dest) + _String_length_(_Source) + 1) char *_Dest, + _In_z_ const char *_Source); + + _Check_return_ + int + __cdecl + strcmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + size_t + __cdecl + strlen( + _In_z_ const char *_Str); + + _When_(_MaxCount > _String_length_(_Str), + _Post_satisfies_(return == _String_length_(_Str))) + _When_(_MaxCount <= _String_length_(_Str), + _Post_satisfies_(return == _MaxCount)) + _CRTIMP + size_t + __cdecl + strnlen( + _In_reads_or_z_(_MaxCount) const char *_Str, + _In_ size_t _MaxCount); + + _CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) + void* + __cdecl + memmove( + _Out_writes_bytes_all_opt_(_MaxCount) void *_Dst, + _In_reads_bytes_opt_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + char* + __cdecl + _strdup( + _In_opt_z_ const char *_Src); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + strchr( + _In_z_ const char *_Str, + _In_ int _Val); + + _Check_return_ + _CRTIMP + int + __cdecl + _stricmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _strcmpi( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _stricmp_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + strcoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _strcoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _stricoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _stricoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _strncoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _strncoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _strnicoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _strnicoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + strcspn( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(_strerror_s) + char* + __cdecl + _strerror( + _In_opt_z_ const char *_ErrMsg); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(strerror_s) + char* + __cdecl + strerror( + _In_ int); + + _CRTIMP + char* + __cdecl + _strlwr( + _Inout_z_ char *_String); + + char* + strlwr_l( + char *_String, + _locale_t _Locale); + + char* + __cdecl + strncat( + char *_Dest, + const char *_Source, + size_t _Count); + + _Check_return_ + int + __cdecl + strncmp( + _In_reads_or_z_(_MaxCount) const char *_Str1, + _In_reads_or_z_(_MaxCount) const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _strnicmp( + _In_reads_or_z_(_MaxCount) const char *_Str1, + _In_reads_or_z_(_MaxCount) const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _strnicmp_l( + _In_reads_or_z_(_MaxCount) const char *_Str1, + _In_reads_or_z_(_MaxCount) const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + char* + strncpy( + char *_Dest, + const char *_Source, + size_t _Count); + + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(_strnset_s) + char* + __cdecl + _strnset( + char *_Str, + int _Val, + size_t _MaxCount); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + strpbrk( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + strrchr( + _In_z_ const char *_Str, + _In_ int _Ch); + + _CRTIMP + char* + __cdecl + _strrev( + _Inout_z_ char *_Str); + + _Check_return_ + _CRTIMP + size_t + __cdecl + strspn( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + strstr( + _In_z_ const char *_Str, + _In_z_ const char *_SubStr); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(strtok_s) + char* + __cdecl + strtok( + _Inout_opt_z_ char *_Str, + _In_z_ const char *_Delim); + + _CRTIMP + char* + __cdecl + _strupr( + _Inout_z_ char *_String); + + _CRTIMP + char* + _strupr_l( + char *_String, + _locale_t _Locale); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + strxfrm( + _Out_writes_opt_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _strxfrm_l( + _Out_writes_opt_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + #if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl _strset_s(char *_Dst,size_t _DstSize,int _Value); - _CRTIMP errno_t __cdecl _strerror_s(char *_Buf,size_t _SizeInBytes,const char *_ErrMsg); - _CRTIMP errno_t __cdecl _strlwr_s(char *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _strlwr_s_l(char *_Str,size_t _Size,_locale_t _Locale); - _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); - _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); - _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); - _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); -#endif - -#ifndef NO_OLDNAMES - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strdup) char *__cdecl strdup(const char *_Src); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strcmpi) int __cdecl strcmpi(const char *_Str1,const char *_Str2); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_stricmp) int __cdecl stricmp(const char *_Str1,const char *_Str2); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strlwr) char *__cdecl strlwr(char *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strnicmp) int __cdecl strnicmp(const char *_Str1,const char *_Str,size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strset_s( + _Inout_updates_z_(_DstSize) char *_Dst, + _In_ size_t _DstSize, + _In_ int _Value); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strerror_s( + _Out_writes_z_(_SizeInBytes) char *_Buf, + _In_ size_t _SizeInBytes, + _In_opt_z_ const char *_ErrMsg); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strlwr_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strlwr_s_l( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strnset_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strupr_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strupr_s_l( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + strcpy_s( + _Out_writes_z_(_Size) char *_Dst, + _In_ size_t _Size, + _In_z_ const char *_Src); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + strcat_s( + _Inout_updates_z_(_Size) char *_Dst, + _In_ size_t _Size, + _In_z_ const char *_Src); + +#endif /* __STDC_WANT_SECURE_LIB__ */ + +#ifndef NO_OLDNAMES + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strdup) + char* + __cdecl + strdup( + _In_opt_z_ const char *_Src); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strcmpi) + int + __cdecl + strcmpi( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_stricmp) + int + __cdecl + stricmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strlwr) + char* + __cdecl + strlwr( + _Inout_z_ char *_Str); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strnicmp) + int + __cdecl + strnicmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str, + _In_ size_t _MaxCount); + // __CRT_INLINE int __cdecl strncasecmp (const char *__sz1, const char *__sz2, size_t __sizeMaxCompare) { return _strnicmp (__sz1, __sz2, __sizeMaxCompare); } // __CRT_INLINE int __cdecl strcasecmp (const char *__sz1, const char *__sz2) { return _stricmp (__sz1, __sz2); } - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strnset) char *__cdecl strnset(char *_Str,int _Val,size_t _MaxCount); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strrev) char *__cdecl strrev(char *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strset) char *__cdecl strset(char *_Str,int _Val); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strupr) char *__cdecl strupr(char *_Str); -#endif + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strnset) + char* + __cdecl + strnset( + _Inout_updates_z_(_MaxCount) char *_Str, + _In_ int _Val, + _In_ size_t _MaxCount); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strrev) + char* + __cdecl + strrev( + _Inout_z_ char *_Str); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strset) + char* + __cdecl + strset( + _Inout_z_ char *_Str, + _In_ int _Val); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strupr) + char* + __cdecl + strupr( + _Inout_z_ char *_Str); + +#endif /* NO_OLDNAMES */ #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED - _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); - _CRTIMP _CRT_INSECURE_DEPRECATE(wcsat_s) wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); - _CRTIMP _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); - _CRTIMP int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); - _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); - _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - -_Ret_range_(==,_String_length_(_Str)) -_CRTIMP -size_t -__cdecl -wcslen( + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wcsdup( _In_z_ const wchar_t *_Str); - _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); - _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - _CRTIMP _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); - _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); - _CRTIMP size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); - _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(wcstok_s) wchar_t *__cdecl wcstok(wchar_t *_Str,const wchar_t *_Delim); - _CRTIMP _CRT_INSECURE_DEPRECATE(_wcserror_s) wchar_t *__cdecl _wcserror(int _ErrNum); - _CRTIMP _CRT_INSECURE_DEPRECATE(__wcserror_s) wchar_t *__cdecl __wcserror(const wchar_t *_Str); - _CRTIMP int __cdecl _wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcsicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsnicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_wcsnset_s) wchar_t *__cdecl _wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - _CRTIMP wchar_t *__cdecl _wcsrev(wchar_t *_Str); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_wcsset_s) wchar_t *__cdecl _wcsset(wchar_t *_Str,wchar_t _Val); - _CRTIMP wchar_t *__cdecl _wcslwr(wchar_t *_String); - _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String); - _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale); - _CRTIMP size_t __cdecl wcsxfrm(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount); - _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcsicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsncoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsncoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _wcsnicoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); + _CRTIMP + _CRT_INSECURE_DEPRECATE(wcsat_s) + wchar_t* + __cdecl + wcscat( + _Inout_updates_z_(_String_length_(_Dest) + _String_length_(_Source) + 1) wchar_t *_Dest, + _In_z_ const wchar_t *_Source); + + _Check_return_ + _When_(return != 0, _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) + _CRTIMP + _CONST_RETURN + wchar_t* + __cdecl + wcschr( + _In_z_ const wchar_t *_Str, + wchar_t _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + wcscmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(wcscpy_s) + wchar_t* + __cdecl + wcscpy( + _Out_writes_z_(_String_length_(_Source) + 1) wchar_t *_Dest, + _In_z_ const wchar_t *_Source); + + _Check_return_ + _CRTIMP + size_t + __cdecl + wcscspn( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _CRTIMP + wchar_t* + wcsncat( + wchar_t *_Dest, + const wchar_t *_Source, + size_t _Count); + + _Ret_range_(==,_String_length_(_Str)) + _CRTIMP + size_t + __cdecl + wcslen( + _In_z_ const wchar_t *_Str); + + _When_(_MaxCount > _String_length_(_Src), + _Post_satisfies_(return == _String_length_(_Src))) + _When_(_MaxCount <= _String_length_(_Src), + _Post_satisfies_(return == _MaxCount)) + _CRTIMP + _CRT_INSECURE_DEPRECATE(wcsnlen_s) + size_t + __cdecl + wcsnlen( + _In_reads_or_z_(_MaxCount) const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + wcsncmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(wcsncpy_s) + wchar_t* + wcsncpy( + wchar_t *_Dest, + const wchar_t *_Source, + size_t _Count); + + _Check_return_ + _CRTIMP + _CONST_RETURN + wchar_t* + __cdecl + wcspbrk( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + wchar_t* + __cdecl + wcsrchr( + _In_z_ const wchar_t *_Str, + _In_ wchar_t _Ch); + + _Check_return_ + _CRTIMP + size_t + __cdecl + wcsspn( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _When_(return != 0, + _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) + _CRTIMP + _CONST_RETURN + wchar_t* + __cdecl + wcsstr( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_SubStr); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(wcstok_s) + wchar_t* + __cdecl + wcstok( + _Inout_opt_z_ wchar_t *_Str, + _In_z_ const wchar_t *_Delim); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(_wcserror_s) + wchar_t* + __cdecl + _wcserror( + _In_ int _ErrNum); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(__wcserror_s) + wchar_t* + __cdecl + __wcserror( + _In_opt_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicmp_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicmp_l( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(_wcsnset_s) + wchar_t* + __cdecl + _wcsnset( + wchar_t *_Str, + wchar_t _Val, + size_t _MaxCount); + + _CRTIMP + wchar_t* + __cdecl + _wcsrev( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(_wcsset_s) + wchar_t* + __cdecl + _wcsset( + wchar_t *_Str, + wchar_t _Val); + + _CRTIMP + wchar_t* + __cdecl + _wcslwr( + _Inout_z_ wchar_t *_String); + + _CRTIMP + wchar_t* + _wcslwr_l( + wchar_t *_String, + _locale_t _Locale); + + _CRTIMP + wchar_t* + __cdecl + _wcsupr( + _Inout_z_ wchar_t *_String); + + _CRTIMP + wchar_t* + _wcsupr_l( + wchar_t *_String, + _locale_t _Locale); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + wcsxfrm( + _Out_writes_opt_(_MaxCount) _Post_maybez_ wchar_t *_Dst, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _wcsxfrm_l( + _Out_writes_opt_(_MaxCount) _Post_maybez_ wchar_t *_Dst, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + wcscoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcscoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsncoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsncoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + #if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); - _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); - _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); - _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); - _CRTIMP errno_t __cdecl _wcserror_s(wchar_t *_Buf,size_t _SizeInWords,int _ErrNum); - _CRTIMP errno_t __cdecl __wcserror_s(wchar_t *_Buffer,size_t _SizeInWords,const wchar_t *_ErrMsg); - _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); - _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); - _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); - _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); -#endif - -#ifndef NO_OLDNAMES - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsdup) wchar_t *__cdecl wcsdup(const wchar_t *_Str); + + _CRTIMP + errno_t + __cdecl + wcsat_s( + wchar_t *Dest, + size_t SizeInWords, + const wchar_t *_Source); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcscpy_s( + _Out_writes_z_(SizeInWords) wchar_t *Dest, + _In_ size_t SizeInWords, + _In_z_ const wchar_t *_Source); + + _CRTIMP + errno_t + __cdecl + wcsnlen_s( + wchar_t **_Src, + size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcsncpy_s( + _Out_writes_z_(SizeInWords) wchar_t *_Dest, + _In_ size_t SizeInWords, + _In_z_ const wchar_t *_Source, + _In_ size_t _Count); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcserror_s( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ int _ErrNum); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + __wcserror_s( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Buffer, + _In_ size_t _SizeInWords, + _In_z_ const wchar_t *_ErrMsg); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsnset_s( + _Inout_updates_z_(_DstSizeInWords) wchar_t *_Dst, + _In_ size_t _DstSizeInWords, + _In_ wchar_t _Val, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsset_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords, + _In_ wchar_t _Val); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcslwr_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcslwr_s_l( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsupr_s( + _Inout_updates_z_(_Size) wchar_t *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsupr_s_l( + _Inout_updates_z_(_Size) wchar_t *_Str, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + +#endif /* __STDC_WANT_SECURE_LIB__ */ + +#ifndef NO_OLDNAMES + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsdup) + wchar_t* + __cdecl + wcsdup( + _In_z_ const wchar_t *_Str); + #define wcswcs wcsstr - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsicmp) int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsnicmp) int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsnset) wchar_t *__cdecl wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsrev) wchar_t *__cdecl wcsrev(wchar_t *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsset) wchar_t *__cdecl wcsset(wchar_t *_Str,wchar_t _Val); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcslwr) wchar_t *__cdecl wcslwr(wchar_t *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsupr) wchar_t *__cdecl wcsupr(wchar_t *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsicoll) int __cdecl wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); -#endif + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsicmp) + int + __cdecl + wcsicmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsnicmp) + int + __cdecl + wcsnicmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsnset) + wchar_t* + __cdecl + wcsnset( + _Inout_updates_z_(_MaxCount) wchar_t *_Str, + _In_ wchar_t _Val, + _In_ size_t _MaxCount); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsrev) + wchar_t* + __cdecl + wcsrev( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsset) + wchar_t* + __cdecl + wcsset( + _Inout_z_ wchar_t *_Str, + wchar_t _Val); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcslwr) + wchar_t* + __cdecl + wcslwr( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsupr) + wchar_t* + __cdecl + wcsupr( + _Inout_z_ wchar_t *_Str); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsicoll) + int + __cdecl + wcsicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + +#endif /* NO_OLDNAMES */ #endif /* !_WSTRING_DEFINED */

1 0

[akhaldi] 58438: [CMAKE] * Add "/nologo" to the MSVC resource compilation rule. Brought to you by Yu Pan (binsys {at} 163 dot com). CORE-6997 #resolve #comment Committed in r58438.
by akhaldi＠svn.reactos.org 07 Mar '13

07 Mar '13

Author: akhaldi Date: Thu Mar 7 16:22:49 2013 New Revision: 58438 URL: http://svn.reactos.org/svn/reactos?rev=58438&view=rev Log: [CMAKE] * Add "/nologo" to the MSVC resource compilation rule. Brought to you by Yu Pan (binsys {at} 163 dot com). CORE-6997 #resolve #comment Committed in r58438. 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=58438… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Mar 7 16:22:49 2013 @@ -57,7 +57,7 @@ # for VS builds we'll only have en-US in resource files add_definitions(/DLANGUAGE_EN_US) else() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") set(CMAKE_ASM_COMPILE_OBJECT "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")

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