Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 58727: [NTOS/MM] - Fix check for address range fitting the VAD when commiting memory CORE-7065 #comment Should be fixed with r58627 #resolve
by jgardou＠svn.reactos.org 09 Apr '13

09 Apr '13

Author: jgardou Date: Tue Apr 9 23:24:50 2013 New Revision: 58727 URL: http://svn.reactos.org/svn/reactos?rev=58727&view=rev Log: [NTOS/MM] - Fix check for address range fitting the VAD when commiting memory CORE-7065 #comment Should be fixed with r58627 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Apr 9 23:24:50 2013 @@ -4081,7 +4081,7 @@ // // Make sure that this address range actually fits within the VAD for it // - if (((StartingAddress >> PAGE_SHIFT) < FoundVad->StartingVpn) && + if (((StartingAddress >> PAGE_SHIFT) < FoundVad->StartingVpn) || ((EndingAddress >> PAGE_SHIFT) > FoundVad->EndingVpn)) { DPRINT1("Address range does not fit into the VAD\n");

1 0

[hbelusca] 58726: [KERNEL32-CONSRV] - Implement GetLargestConsoleWindowSize (and add a DPRINT to see what happens when Far 1.65 is launched). - Implement SetConsoleWindowInfo in kernel32 and pre-im...
by hbelusca＠svn.reactos.org 09 Apr '13

09 Apr '13

Author: hbelusca Date: Tue Apr 9 15:21:14 2013 New Revision: 58726 URL: http://svn.reactos.org/svn/reactos?rev=58726&view=rev Log: [KERNEL32-CONSRV] - Implement GetLargestConsoleWindowSize (and add a DPRINT to see what happens when Far 1.65 is launched). - Implement SetConsoleWindowInfo in kernel32 and pre-implement its CONSRV counterpart. Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/api.h branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c branches/ros-csrss/win32ss/user/consrv/include/conio.h branches/ros-csrss/win32ss/user/consrv/init.c Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Tue Apr 9 15:21:14 2013 @@ -306,6 +306,12 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETDISPLAYMODE GetDisplayModeRequest = &ApiMessage.Data.GetDisplayModeRequest; + if (lpModeFlags == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + // GetDisplayModeRequest->OutputHandle = hConsoleOutput; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -357,7 +363,7 @@ /* * @implemented (Undocumented) */ -DWORD +BOOL WINAPI GetConsoleHardwareState(HANDLE hConsoleOutput, DWORD Flags, @@ -368,6 +374,12 @@ PCONSOLE_GETSETHWSTATE HardwareStateRequest = &ApiMessage.Data.HardwareStateRequest; DPRINT1("GetConsoleHardwareState(%d, 0x%p) UNIMPLEMENTED!\n", Flags, State); + + if (State == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } HardwareStateRequest->OutputHandle = hConsoleOutput; @@ -523,7 +535,7 @@ SetDisplayModeRequest->OutputHandle = hConsoleOutput; SetDisplayModeRequest->DisplayMode = dwFlags; - SetDisplayModeRequest->NewSBDim = (COORD){0,0}; + SetDisplayModeRequest->NewSBDim = (COORD){0, 0}; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, @@ -535,7 +547,9 @@ return FALSE; } - *lpNewScreenBufferDimensions = SetDisplayModeRequest->NewSBDim; + if (lpNewScreenBufferDimensions) + *lpNewScreenBufferDimensions = SetDisplayModeRequest->NewSBDim; + return TRUE; } @@ -1022,6 +1036,12 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &ApiMessage.Data.ConsoleModeRequest; + if (lpMode == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + ConsoleModeRequest->ConsoleHandle = hConsoleHandle; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -1082,16 +1102,30 @@ /*-------------------------------------------------------------- * GetLargestConsoleWindowSize * - * @unimplemented + * @implemented */ COORD WINAPI GetLargestConsoleWindowSize(HANDLE hConsoleOutput) { - COORD Coord = {80,25}; - DPRINT1("GetLargestConsoleWindowSize(0x%x) UNIMPLEMENTED!\n", hConsoleOutput); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return Coord; + NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_GETLARGESTWINDOWSIZE GetLargestWindowSizeRequest = &ApiMessage.Data.GetLargestWindowSizeRequest; + + GetLargestWindowSizeRequest->OutputHandle = hConsoleOutput; + GetLargestWindowSizeRequest->Size = (COORD){0, 0}; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetLargestWindowSize), + sizeof(CONSOLE_GETLARGESTWINDOWSIZE)); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + } + + DPRINT1("GetLargestConsoleWindowSize, X = %d, Y = %d\n", GetLargestWindowSizeRequest->Size.X, GetLargestWindowSizeRequest->Size.Y); + return GetLargestWindowSizeRequest->Size; } @@ -1390,7 +1424,7 @@ /*-------------------------------------------------------------- * SetConsoleWindowInfo * - * @unimplemented + * @implemented */ BOOL WINAPI @@ -1398,9 +1432,31 @@ BOOL bAbsolute, CONST SMALL_RECT *lpConsoleWindow) { - DPRINT1("SetConsoleWindowInfo(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, bAbsolute, lpConsoleWindow); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SETWINDOWINFO SetWindowInfoRequest = &ApiMessage.Data.SetWindowInfoRequest; + + if (lpConsoleWindow == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SetWindowInfoRequest->OutputHandle = hConsoleOutput; + SetWindowInfoRequest->Absolute = bAbsolute; + SetWindowInfoRequest->WindowRect = *lpConsoleWindow; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetWindowInfo), + sizeof(CONSOLE_SETWINDOWINFO)); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; } Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Tue Apr 9 15:21:14 2013 @@ -39,11 +39,11 @@ ConsolepSetMode, ConsolepSetActiveScreenBuffer, ConsolepFlushInputBuffer, - // ConsolepGetLargestWindowSize, + ConsolepGetLargestWindowSize, ConsolepSetScreenBufferSize, ConsolepSetCursorPosition, ConsolepSetCursorInfo, - // ConsolepSetWindowInfo, + ConsolepSetWindowInfo, ConsolepScrollScreenBuffer, ConsolepSetTextAttribute, // ConsolepSetFont, @@ -455,6 +455,20 @@ typedef struct { + HANDLE OutputHandle; + COORD Size; +} CONSOLE_GETLARGESTWINDOWSIZE, *PCONSOLE_GETLARGESTWINDOWSIZE; + +typedef struct +{ + HANDLE OutputHandle; + BOOL Absolute; + SMALL_RECT WindowRect; // New console window position in the screen-buffer frame (Absolute == TRUE) + // or in the old window position frame (Absolute == FALSE). +} CONSOLE_SETWINDOWINFO, *PCONSOLE_SETWINDOWINFO; + +typedef struct +{ HWND WindowHandle; } CONSOLE_GETWINDOW, *PCONSOLE_GETWINDOW; @@ -575,9 +589,13 @@ ULONG Reserved; union { + /* Console initialization and uninitialization */ CONSOLE_ALLOCCONSOLE AllocConsoleRequest; CONSOLE_ATTACHCONSOLE AttachConsoleRequest; CONSOLE_FREECONSOLE FreeConsoleRequest; + + /* Process list */ + CONSOLE_GETPROCESSLIST GetProcessListRequest; /* Handles */ CONSOLE_OPENCONSOLE OpenConsoleRequest; @@ -589,7 +607,7 @@ CONSOLE_GETSETCURSORINFO CursorInfoRequest; CONSOLE_SETCURSORPOSITION SetCursorPositionRequest; - /* Screen buffer */ + /* Screen-buffer */ CONSOLE_CREATESCREENBUFFER CreateScreenBufferRequest; CONSOLE_SETACTIVESCREENBUFFER SetScreenBufferRequest; CONSOLE_GETSCREENBUFFERINFO ScreenBufferInfoRequest; @@ -607,6 +625,8 @@ /* Console window */ CONSOLE_GETSETCONSOLETITLE TitleRequest; + CONSOLE_GETLARGESTWINDOWSIZE GetLargestWindowSizeRequest; + CONSOLE_SETWINDOWINFO SetWindowInfoRequest; CONSOLE_GETWINDOW GetWindowRequest; CONSOLE_SETICON SetIconRequest; @@ -644,8 +664,6 @@ /* Input and Output Code Pages */ CONSOLE_GETSETINPUTOUTPUTCP ConsoleCPRequest; - - CONSOLE_GETPROCESSLIST GetProcessListRequest; } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; Modified: branches/ros-csrss/win32ss/user/consrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/api.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/api.h [iso-8859-1] Tue Apr 9 15:21:14 2013 @@ -52,6 +52,8 @@ CSR_API(SrvSetConsoleHardwareState); CSR_API(SrvGetConsoleDisplayMode); CSR_API(SrvSetConsoleDisplayMode); +CSR_API(SrvGetLargestConsoleWindowSize); +CSR_API(SrvSetConsoleWindowInfo); CSR_API(SrvGetConsoleWindow); CSR_API(SrvSetConsoleIcon); CSR_API(SrvGetConsoleCP); 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] Tue Apr 9 15:21:14 2013 @@ -25,6 +25,8 @@ #define ConioResizeTerminal(Console) (Console)->TermIFace.Vtbl->ResizeTerminal((Console)) #define ConioProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ (Console)->TermIFace.Vtbl->ProcessKeyCallback((Console), (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) +#define ConioGetLargestConsoleWindowSize(Console, pSize) \ + (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize((Console), (pSize)) #define ConioGetConsoleWindowHandle(Console) \ (Console)->TermIFace.Vtbl->GetConsoleWindowHandle((Console)) #define ConioRefreshInternalInfo(Console) \ 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] Tue Apr 9 15:21:14 2013 @@ -1261,10 +1261,10 @@ PCONSOLE Console; Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - HardwareStateRequest->OutputHandle, - &Buff, - GENERIC_READ, - TRUE); + HardwareStateRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get console handle in SrvGetConsoleHardwareState\n"); @@ -1286,10 +1286,10 @@ PCONSOLE Console; Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - HardwareStateRequest->OutputHandle, - &Buff, - GENERIC_WRITE, - TRUE); + HardwareStateRequest->OutputHandle, + &Buff, + GENERIC_WRITE, + TRUE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get console handle in SrvSetConsoleHardwareState\n"); @@ -1365,6 +1365,87 @@ return Status; } +CSR_API(SrvGetLargestConsoleWindowSize) +{ + NTSTATUS Status; + PCONSOLE_GETLARGESTWINDOWSIZE GetLargestWindowSizeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetLargestWindowSizeRequest; + PCONSOLE_SCREEN_BUFFER Buff; + PCONSOLE Console; + + Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + GetLargestWindowSizeRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Console = Buff->Header.Console; + ConioGetLargestConsoleWindowSize(Console, &GetLargestWindowSizeRequest->Size); + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_SUCCESS; +} + +CSR_API(SrvSetConsoleWindowInfo) +{ +#if 0 + NTSTATUS Status; +#endif + PCONSOLE_SETWINDOWINFO SetWindowInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetWindowInfoRequest; +#if 0 + PCONSOLE_SCREEN_BUFFER Buff; + PCONSOLE Console; +#endif + SMALL_RECT WindowRect = SetWindowInfoRequest->WindowRect; + +#if 0 + Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + SetWindowInfoRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Console = Buff->Header.Console; + + if (SetWindowInfoRequest->Absolute == FALSE) + { + /* Relative positions given. Transform them to absolute ones */ + WindowRect.Left += Buff->ShowX; + WindowRect.Top += Buff->ShowY; + WindowRect.Right += Buff->ShowX + Console->ConsoleSize.X - 1; + WindowRect.Bottom += Buff->ShowY + Console->ConsoleSize.Y - 1; + } + + if ( (WindowRect.Left < 0) || (WindowRect.Top < 0) || + (WindowRect.Right > ScreenBufferSize.X) || + (WindowRect.Bottom > ScreenBufferSize.Y) || + (WindowRect.Right <= WindowRect.Left) || + (WindowRect.Bottom <= WindowRect.Top) ) + { + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_INVALID_PARAMETER; + } + + Buff->ShowX = WindowRect.Left; + Buff->ShowY = WindowRect.Top; + + // These two lines are frontend-specific. + Console->ConsoleSize.X = WindowRect.Right - WindowRect.Left + 1; + Console->ConsoleSize.Y = WindowRect.Bottom - WindowRect.Top + 1; + + // ConioGetLargestConsoleWindowSize(Console, &GetLargestWindowSizeRequest->Size); + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_SUCCESS; +#else + DPRINT1("SrvSetConsoleWindowInfo(0x%08x, %d, {L%d, T%d, R%d, B%d}) UNIMPLEMENTED\n", + SetWindowInfoRequest->OutputHandle, SetWindowInfoRequest->Absolute, + WindowRect.Left, WindowRect.Top, WindowRect.Right, WindowRect.Bottom); + return STATUS_NOT_IMPLEMENTED; +#endif +} + CSR_API(SrvGetConsoleWindow) { NTSTATUS Status; @@ -1375,8 +1456,8 @@ if (!NT_SUCCESS(Status)) return Status; GetWindowRequest->WindowHandle = ConioGetConsoleWindowHandle(Console); + ConSrvReleaseConsole(Console, TRUE); - return STATUS_SUCCESS; } @@ -1394,7 +1475,6 @@ : STATUS_UNSUCCESSFUL); ConSrvReleaseConsole(Console, TRUE); - return Status; } Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Tue Apr 9 15:21:14 2013 @@ -1326,7 +1326,7 @@ if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; - windx = CONGUI_MIN_WIDTH * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); + 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); minMaxInfo->ptMinTrackSize.x = windx; @@ -2321,6 +2321,39 @@ return GuiData->hWindow; } +static VOID WINAPI +GuiGetLargestConsoleWindowSize(PCONSOLE Console, PCOORD pSize) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + HWND hDesktop; + RECT desktop; + LONG width, height; + + if (!pSize) return; + + /* + * This is one solution. Surely better solutions exist : + * http://stackoverflow.com/questions/4631292/how-detect-current-screen-resolu… + * http://www.clearevo.com/blog/programming/2011/08/30/windows_c_c++_-_get_mon… + */ + hDesktop = GetDesktopWindow(); + if (!hDesktop) return; + + GetWindowRect(hDesktop, &desktop); + + width = desktop.right; + height = desktop.bottom; + + width -= (2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE))); + height -= (2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION)); + + if (width < 0) width = 0; + if (height < 0) height = 0; + + pSize->X = (SHORT)(width / GuiData->CharWidth ); + pSize->Y = (SHORT)(height / GuiData->CharHeight); +} + static FRONTEND_VTBL GuiVtbl = { GuiCleanupConsole, @@ -2335,7 +2368,8 @@ GuiRefreshInternalInfo, GuiChangeTitle, GuiChangeIcon, - GuiGetConsoleWindowHandle + GuiGetConsoleWindowHandle, + GuiGetLargestConsoleWindowSize }; NTSTATUS FASTCALL Modified: branches/ros-csrss/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] Tue Apr 9 15:21:14 2013 @@ -125,6 +125,8 @@ BOOL (WINAPI *ChangeIcon)(struct _CONSOLE* Console, HICON hWindowIcon); HWND (WINAPI *GetConsoleWindowHandle)(struct _CONSOLE* Console); + VOID (WINAPI *GetLargestConsoleWindowSize)(struct _CONSOLE* Console, + PCOORD pSize); } FRONTEND_VTBL, *PFRONTEND_VTBL; Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Tue Apr 9 15:21:14 2013 @@ -47,11 +47,11 @@ SrvSetConsoleMode, SrvSetConsoleActiveScreenBuffer, SrvFlushConsoleInputBuffer, - // SrvGetLargestConsoleWindowSize, + SrvGetLargestConsoleWindowSize, SrvSetConsoleScreenBufferSize, SrvSetConsoleCursorPosition, SrvSetConsoleCursorInfo, - // SrvSetConsoleWindowInfo, + SrvSetConsoleWindowInfo, SrvScrollConsoleScreenBuffer, SrvSetConsoleTextAttribute, // SrvSetConsoleFont, @@ -138,11 +138,11 @@ FALSE, // SrvSetConsoleMode, FALSE, // SrvSetConsoleActiveScreenBuffer, FALSE, // SrvFlushConsoleInputBuffer, - // FALSE, // SrvGetLargestConsoleWindowSize, + FALSE, // SrvGetLargestConsoleWindowSize, FALSE, // SrvSetConsoleScreenBufferSize, FALSE, // SrvSetConsoleCursorPosition, FALSE, // SrvSetConsoleCursorInfo, - // FALSE, // SrvSetConsoleWindowInfo, + FALSE, // SrvSetConsoleWindowInfo, FALSE, // SrvScrollConsoleScreenBuffer, FALSE, // SrvSetConsoleTextAttribute, // FALSE, // SrvSetConsoleFont, @@ -229,11 +229,11 @@ "SetConsoleMode", "SetConsoleActiveScreenBuffer", "FlushConsoleInputBuffer", - // "GetLargestConsoleWindowSize", + "GetLargestConsoleWindowSize", "SetConsoleScreenBufferSize", "SetConsoleCursorPosition", "SetConsoleCursorInfo", - // "SetConsoleWindowInfo", + "SetConsoleWindowInfo", "ScrollConsoleScreenBuffer", "SetConsoleTextAttribute", // "SetConsoleFont",

1 0

[hbelusca] 58725: [CONSRV] "Hack-fix" some headers to remove the forward declaration of typedef struct _CONSOLE *PCONSOLE; , which makes GCC 4.4.3 angry, but makes GCC 4.7.2 stay imperturbable.
by hbelusca＠svn.reactos.org 08 Apr '13

08 Apr '13

Author: hbelusca Date: Mon Apr 8 21:03:24 2013 New Revision: 58725 URL: http://svn.reactos.org/svn/reactos?rev=58725&view=rev Log: [CONSRV] "Hack-fix" some headers to remove the forward declaration of typedef struct _CONSOLE *PCONSOLE;, which makes GCC 4.4.3 angry, but makes GCC 4.7.2 stay imperturbable. Modified: branches/ros-csrss/win32ss/user/consrv/console.h branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/include/conio.h branches/ros-csrss/win32ss/user/consrv/procinit.h Modified: branches/ros-csrss/win32ss/user/consrv/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.h [iso-8859-1] Mon Apr 8 21:03:24 2013 @@ -10,14 +10,14 @@ VOID WINAPI ConSrvInitConsoleSupport(VOID); -NTSTATUS WINAPI ConSrvInitConsole(OUT PCONSOLE* NewConsole, +NTSTATUS WINAPI ConSrvInitConsole(OUT struct _CONSOLE** /* PCONSOLE* */ NewConsole, IN OUT PCONSOLE_START_INFO ConsoleStartInfo, IN PCSR_PROCESS ConsoleLeaderProcess); -VOID WINAPI ConSrvDeleteConsole(PCONSOLE Console); +VOID WINAPI ConSrvDeleteConsole(struct _CONSOLE* /* PCONSOLE */ Console); NTSTATUS FASTCALL ConSrvGetConsole(PCONSOLE_PROCESS_DATA ProcessData, - PCONSOLE* Console, + struct _CONSOLE** /* PCONSOLE* */ Console, BOOL LockConsole); -VOID FASTCALL ConSrvReleaseConsole(PCONSOLE Console, +VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* /* PCONSOLE */ Console, BOOL WasConsoleLocked); /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Mon Apr 8 21:03:24 2013 @@ -49,10 +49,6 @@ extern HINSTANCE ConSrvDllInstance; extern HANDLE ConSrvHeap; -/* Opaque pointers */ -typedef struct _CONSOLE_IO_HANDLE *PCONSOLE_IO_HANDLE; -typedef struct _CONSOLE *PCONSOLE; - #define ConsoleGetPerProcessData(Process) \ ((PCONSOLE_PROCESS_DATA)((Process)->ServerData[CONSRV_SERVERDLL_INDEX])) @@ -61,14 +57,14 @@ LIST_ENTRY ConsoleLink; PCSR_PROCESS Process; // Process owning this structure. HANDLE ConsoleEvent; - PCONSOLE Console; - PCONSOLE ParentConsole; + struct _CONSOLE* /* PCONSOLE */ Console; + struct _CONSOLE* /* PCONSOLE */ ParentConsole; BOOL ConsoleApp; // TRUE if it is a CUI app, FALSE otherwise. RTL_CRITICAL_SECTION HandleTableLock; ULONG HandleTableSize; - PCONSOLE_IO_HANDLE HandleTable; // Length-varying table + struct _CONSOLE_IO_HANDLE* /* PCONSOLE_IO_HANDLE */ HandleTable; // Length-varying table LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE PropDispatcher; // We hold the property dialog handler there, till all the GUI thingie moves out from CSRSS. Modified: branches/ros-csrss/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] Mon Apr 8 21:03:24 2013 @@ -25,7 +25,7 @@ typedef struct _CONSOLE_IO_OBJECT { CONSOLE_IO_OBJECT_TYPE Type; - PCONSOLE Console; + struct _CONSOLE* /* PCONSOLE */ Console; LONG AccessRead, AccessWrite; LONG ExclusiveRead, ExclusiveWrite; LONG HandleCount; @@ -88,43 +88,43 @@ /* * Internal interface (functions called by the console server only) */ - VOID (WINAPI *CleanupConsole)(PCONSOLE Console); - VOID (WINAPI *WriteStream)(PCONSOLE Console, + 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)(PCONSOLE Console, + VOID (WINAPI *DrawRegion)(struct _CONSOLE* Console, SMALL_RECT* Region); - BOOL (WINAPI *SetCursorInfo)(PCONSOLE Console, + BOOL (WINAPI *SetCursorInfo)(struct _CONSOLE* Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer); - BOOL (WINAPI *SetScreenInfo)(PCONSOLE Console, + BOOL (WINAPI *SetScreenInfo)(struct _CONSOLE* Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, UINT OldCursorX, UINT OldCursorY); - BOOL (WINAPI *UpdateScreenInfo)(PCONSOLE Console, + BOOL (WINAPI *UpdateScreenInfo)(struct _CONSOLE* Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer); - NTSTATUS (WINAPI *ResizeBuffer)(PCONSOLE Console, + NTSTATUS (WINAPI *ResizeBuffer)(struct _CONSOLE* Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size); - VOID (WINAPI *ResizeTerminal)(PCONSOLE Console); - BOOL (WINAPI *ProcessKeyCallback)(PCONSOLE Console, + VOID (WINAPI *ResizeTerminal)(struct _CONSOLE* Console); + BOOL (WINAPI *ProcessKeyCallback)(struct _CONSOLE* Console, MSG* msg, BYTE KeyStateMenu, DWORD ShiftState, UINT VirtualKeyCode, BOOL Down); - VOID (WINAPI *RefreshInternalInfo)(PCONSOLE Console); + VOID (WINAPI *RefreshInternalInfo)(struct _CONSOLE* Console); /* * External interface (functions corresponding to the Console API) */ - VOID (WINAPI *ChangeTitle)(PCONSOLE Console); - BOOL (WINAPI *ChangeIcon)(PCONSOLE Console, + VOID (WINAPI *ChangeTitle)(struct _CONSOLE* Console); + BOOL (WINAPI *ChangeIcon)(struct _CONSOLE* Console, HICON hWindowIcon); - HWND (WINAPI *GetConsoleWindowHandle)(PCONSOLE Console); + HWND (WINAPI *GetConsoleWindowHandle)(struct _CONSOLE* Console); } FRONTEND_VTBL, *PFRONTEND_VTBL; Modified: branches/ros-csrss/win32ss/user/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/p… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/procinit.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/procinit.h [iso-8859-1] Mon Apr 8 21:03:24 2013 @@ -14,7 +14,7 @@ PHANDLE pErrorHandle, PCONSOLE_START_INFO ConsoleStartInfo); NTSTATUS FASTCALL ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData, - PCONSOLE Console, + struct _CONSOLE* /* PCONSOLE */ Console, BOOL CreateNewHandlesTable, PHANDLE pInputHandle, PHANDLE pOutputHandle,

1 0

[zguo] 58724: Merge in revision 58633, which was supposed to be merged in but was left out of the list I was given. This had better be the last code change.
by zguo＠svn.reactos.org 08 Apr '13

08 Apr '13

Author: zguo Date: Mon Apr 8 18:19:59 2013 New Revision: 58724 URL: http://svn.reactos.org/svn/reactos?rev=58724&view=rev Log: Merge in revision 58633, which was supposed to be merged in but was left out of the list I was given. This had better be the last code change. Modified: branches/ReactOS-0.3.15/ (props changed) branches/ReactOS-0.3.15/win32ss/user/ntuser/focus.c Propchange: branches/ReactOS-0.3.15/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 8 18:19:59 2013 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:58534,58553,58561,58614,58627-58628 +/trunk/reactos:58534,58553,58561,58614,58627-58628,58633 Modified: branches/ReactOS-0.3.15/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/win32ss/user/ntu… ============================================================================== --- branches/ReactOS-0.3.15/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/win32ss/user/ntuser/focus.c [iso-8859-1] Mon Apr 8 18:19:59 2013 @@ -930,7 +930,8 @@ } else { // Rule #3, last input event in force. - ptiLastInput = ppi->ptiList; + ERR("Fixme: ptiLastInput is SET!!\n"); + //ptiLastInput = ppi->ptiList; ObDereferenceObject(Process); } return TRUE;

1 0

[akhaldi] 58723: [HHCTRL.OCX] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 08 Apr '13

08 Apr '13

Author: akhaldi Date: Mon Apr 8 16:35:35 2013 New Revision: 58723 URL: http://svn.reactos.org/svn/reactos?rev=58723&view=rev Log: [HHCTRL.OCX] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl_tlb.idl (with props) trunk/reactos/dll/win32/hhctrl.ocx/hhtoolbar.bmp (with props) trunk/reactos/dll/win32/hhctrl.ocx/hhtreeview.bmp (with props) Removed: trunk/reactos/dll/win32/hhctrl.ocx/version.rc Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt trunk/reactos/dll/win32/hhctrl.ocx/chm.c trunk/reactos/dll/win32/hhctrl.ocx/content.c trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc trunk/reactos/dll/win32/hhctrl.ocx/index.c trunk/reactos/dll/win32/hhctrl.ocx/resource.h trunk/reactos/dll/win32/hhctrl.ocx/search.c trunk/reactos/dll/win32/hhctrl.ocx/stream.c trunk/reactos/dll/win32/hhctrl.ocx/stream.h trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/CMake… Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/chm.c… Modified: trunk/reactos/dll/win32/hhctrl.ocx/content.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/conte… Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.… Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… Added: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… Added: trunk/reactos/dll/win32/hhctrl.ocx/hhtoolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhtoo… Added: trunk/reactos/dll/win32/hhctrl.ocx/hhtreeview.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhtre… Modified: trunk/reactos/dll/win32/hhctrl.ocx/index.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/index… Modified: trunk/reactos/dll/win32/hhctrl.ocx/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/resou… Modified: trunk/reactos/dll/win32/hhctrl.ocx/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/searc… Modified: trunk/reactos/dll/win32/hhctrl.ocx/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/strea… Modified: trunk/reactos/dll/win32/hhctrl.ocx/stream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/strea… Removed: trunk/reactos/dll/win32/hhctrl.ocx/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/versi… Modified: trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/webbr… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 58722: [CRYPTUI_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 08 Apr '13

08 Apr '13

Author: akhaldi Date: Mon Apr 8 16:31:12 2013 New Revision: 58722 URL: http://svn.reactos.org/svn/reactos?rev=58722&view=rev Log: [CRYPTUI_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/cryptui/cryptui.c trunk/rostests/winetests/cryptui/testlist.c Modified: trunk/rostests/winetests/cryptui/cryptui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/cryptui… ============================================================================== --- trunk/rostests/winetests/cryptui/cryptui.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptui/cryptui.c [iso-8859-1] Mon Apr 8 16:31:12 2013 @@ -18,16 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> -#include <stdio.h> +//#include <stdio.h> #define NONAMELESSUNION #include <windef.h> #include <winbase.h> -#include <winerror.h> +//#include <winerror.h> #include <winuser.h> -#include <wincrypt.h> +//#include <wincrypt.h> #include <cryptuiapi.h> -#include "wine/test.h" +#include <wine/test.h> static BYTE v1CertWithValidPubKey[] = { 0x30,0x81,0xcf,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, Modified: trunk/rostests/winetests/cryptui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/testlis… ============================================================================== --- trunk/rostests/winetests/cryptui/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptui/testlist.c [iso-8859-1] Mon Apr 8 16:31:12 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_cryptui(void);

1 0

[akhaldi] 58721: [CRYPTDLG] [CRYPTDLL] [CRYPTUI] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 08 Apr '13

08 Apr '13

Author: akhaldi Date: Mon Apr 8 16:31:05 2013 New Revision: 58721 URL: http://svn.reactos.org/svn/reactos?rev=58721&view=rev Log: [CRYPTDLG] [CRYPTDLL] [CRYPTUI] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/cryptdlg/main.c trunk/reactos/dll/win32/cryptdll/cryptdll.c trunk/reactos/dll/win32/cryptui/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptdlg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/main.c?… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] Mon Apr 8 16:31:05 2013 @@ -278,7 +278,7 @@ { trust = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - if (root) + if (trust) { for (i = 0; i < cert->cTrustStores; i++) CertAddStoreToCollection(trust, cert->rghstoreTrust[i], 0, 0); Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.c [iso-8859-1] Mon Apr 8 16:31:05 2013 @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); -static HMODULE CRYPTDLL_hModule; - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -39,7 +37,6 @@ case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - CRYPTDLL_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH: Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Mon Apr 8 16:31:05 2013 @@ -299,7 +299,7 @@ { if (comma) *comma = 0; - add_oid_to_usage(usage, ptr); + usage = add_oid_to_usage(usage, ptr); } } return usage; @@ -327,7 +327,7 @@ { PCCRYPT_OID_INFO *ptr; - for (ptr = usages; *ptr; ptr++) + for (ptr = usages; advancedUsage && *ptr; ptr++) { DWORD i; BOOL disabled = FALSE; @@ -338,7 +338,7 @@ (*ptr)->pszOID)) disabled = TRUE; if (!disabled) - add_oid_to_usage(advancedUsage, + advancedUsage = add_oid_to_usage(advancedUsage, (LPSTR)(*ptr)->pszOID); } /* The individual strings are pointers to disabledUsagesStr, @@ -1808,7 +1808,6 @@ DWORD conn; LPDATAOBJECT dataObject = NULL; HBITMAP bitmap = NULL; - RECT rect; STGMEDIUM stgm; LPOLECLIENTSITE clientSite = NULL; REOBJECT reObject; @@ -1847,9 +1846,6 @@ LR_DEFAULTSIZE | LR_LOADTRANSPARENT); if (!bitmap) goto end; - rect.left = rect.top = 0; - rect.right = GetSystemMetrics(SM_CXICON); - rect.bottom = GetSystemMetrics(SM_CYICON); stgm.tymed = TYMED_GDI; stgm.u.hBitmap = bitmap; stgm.pUnkForRelease = NULL; @@ -2844,7 +2840,7 @@ static void add_v1_fields(HWND hwnd, struct detail_data *data) { - int i; + unsigned int i; PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; /* The last item in v1_fields is the public key, which is not in the loop @@ -3776,7 +3772,7 @@ static void free_detail_fields(struct detail_data *data) { - DWORD i; + int i; for (i = 0; i < data->cFields; i++) HeapFree(GetProcessHeap(), 0, data->fields[i].detailed_value); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Apr 8 16:31:05 2013 @@ -53,10 +53,10 @@ reactos/dll/win32/compstui # Synced to Wine-1.5.19 reactos/dll/win32/credui # Synced to Wine-1.5.4 reactos/dll/win32/crypt32 # Synced to Wine-1.5.26 -reactos/dll/win32/cryptdlg # Synced to Wine-1.5.4 -reactos/dll/win32/cryptdll # Synced to Wine-1.5.4 +reactos/dll/win32/cryptdlg # Synced to Wine-1.5.26 +reactos/dll/win32/cryptdll # Synced to Wine-1.5.26 reactos/dll/win32/cryptnet # Synced to Wine-1.5.26 -reactos/dll/win32/cryptui # Synced to Wine-1.5.4 +reactos/dll/win32/cryptui # Synced to Wine-1.5.26 reactos/dll/win32/dbghelp # Synced to Wine-1.3.37 reactos/dll/win32/dciman32 # Synced to Wine-1.5.19 reactos/dll/win32/dwmapi # Synced to Wine-1.5.19

1 0

[akhaldi] 58720: [CRYPTNET_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 08 Apr '13

08 Apr '13

Author: akhaldi Date: Mon Apr 8 16:22:36 2013 New Revision: 58720 URL: http://svn.reactos.org/svn/reactos?rev=58720&view=rev Log: [CRYPTNET_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/cryptnet/cryptnet.c trunk/rostests/winetests/cryptnet/testlist.c Modified: trunk/rostests/winetests/cryptnet/cryptnet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/cryptn… ============================================================================== --- trunk/rostests/winetests/cryptnet/cryptnet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptnet/cryptnet.c [iso-8859-1] Mon Apr 8 16:22:36 2013 @@ -17,14 +17,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +//#include <stdarg.h> #include <stdio.h> #define NONAMELESSUNION #include <windef.h> #include <winbase.h> -#include <winerror.h> +//#include <winerror.h> #include <wincrypt.h> -#include "wine/test.h" +#include <wine/test.h> static const BYTE bigCert[] = { 0x30,0x78,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x14,0x31,0x12,0x30,0x10, @@ -365,9 +365,12 @@ SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */ + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG + * or OSS_DATA_ERROR. + */ ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || - broken(GetLastError() == CRYPT_E_ASN1_BADTAG)), + broken(GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR)), "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); /* only newer versions of cryptnet do the cleanup */ @@ -698,6 +701,11 @@ * bad authority key ID extension and can't be matched with the issuer * cert, hence the revocation status should be unknown. */ + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("CERT_CONTEXT_REVOCATION_TYPE unsupported, skipping\n"); + return; + } ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); Modified: trunk/rostests/winetests/cryptnet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/testli… ============================================================================== --- trunk/rostests/winetests/cryptnet/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptnet/testlist.c [iso-8859-1] Mon Apr 8 16:22:36 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_cryptnet(void);

1 0

[akhaldi] 58719: [CRYPTNET] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 08 Apr '13

08 Apr '13

Author: akhaldi Date: Mon Apr 8 16:22:12 2013 New Revision: 58719 URL: http://svn.reactos.org/svn/reactos?rev=58719&view=rev Log: [CRYPTNET] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Mon Apr 8 16:22:12 2013 @@ -43,22 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - /* Do uninitialisation here */ - break; - default: break; - } - return TRUE; -} static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', 'd','l','l',0 }; @@ -521,24 +505,26 @@ TRACE("(%s, %p, %p)\n", debugstr_w(pszURL), pObject, pAuxInfo); - ret = GetUrlCacheEntryInfoW(pszURL, NULL, &size); - if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - pCacheInfo = CryptMemAlloc(size); - if (pCacheInfo) - ret = TRUE; - else - SetLastError(ERROR_OUTOFMEMORY); - } - if (ret && (ret = GetUrlCacheEntryInfoW(pszURL, pCacheInfo, &size))) + RetrieveUrlCacheEntryFileW(pszURL, NULL, &size, 0); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + + pCacheInfo = CryptMemAlloc(size); + if (!pCacheInfo) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + if ((ret = RetrieveUrlCacheEntryFileW(pszURL, pCacheInfo, &size, 0))) { FILETIME ft; GetSystemTimeAsFileTime(&ft); if (CompareFileTime(&pCacheInfo->ExpireTime, &ft) >= 0) { - HANDLE hFile = CreateFileW(pCacheInfo->lpszLocalFileName, - GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hFile = CreateFileW(pCacheInfo->lpszLocalFileName, GENERIC_READ, + FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile != INVALID_HANDLE_VALUE) { @@ -565,6 +551,7 @@ DeleteUrlCacheEntryW(pszURL); ret = FALSE; } + UnlockUrlCacheEntryFileW(pszURL, 0); } CryptMemFree(pCacheInfo); TRACE("returning %d\n", ret); @@ -733,21 +720,24 @@ DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; - DWORD size = 0; - BOOL ret, create = FALSE; + HANDLE hCacheFile; + DWORD size = 0, entryType; + FILETIME ft; GetUrlCacheEntryInfoW(pszURL, NULL, &size); if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { INTERNET_CACHE_ENTRY_INFOW *info = CryptMemAlloc(size); - if (info) - { - FILETIME ft; - - ret = GetUrlCacheEntryInfoW(pszURL, info, &size); - if (ret) - lstrcpyW(cacheFileName, info->lpszLocalFileName); + if (!info) + { + ERR("out of memory\n"); + return; + } + + if (GetUrlCacheEntryInfoW(pszURL, info, &size)) + { + lstrcpyW(cacheFileName, info->lpszLocalFileName); /* Check if the existing cache entry is up to date. If it isn't, * remove the existing cache entry, and create a new one with the * new value. @@ -755,51 +745,38 @@ GetSystemTimeAsFileTime(&ft); if (CompareFileTime(&info->ExpireTime, &ft) < 0) { - create = TRUE; DeleteUrlCacheEntryW(pszURL); } - CryptMemFree(info); - } - else - ret = FALSE; - } + else + { + info->ExpireTime = expires; + SetUrlCacheEntryInfoW(pszURL, info, CACHE_ENTRY_EXPTIME_FC); + CryptMemFree(info); + return; + } + } + CryptMemFree(info); + } + + if (!CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, cacheFileName, 0)) + return; + + hCacheFile = CreateFileW(cacheFileName, GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(hCacheFile == INVALID_HANDLE_VALUE) + return; + + WriteFile(hCacheFile, pObject->rgBlob[0].pbData, + pObject->rgBlob[0].cbData, &size, NULL); + CloseHandle(hCacheFile); + + if (!(dwRetrievalFlags & CRYPT_STICKY_CACHE_RETRIEVAL)) + entryType = NORMAL_CACHE_ENTRY; else - { - ret = CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, - cacheFileName, 0); - create = TRUE; - } - if (ret) - { - DWORD entryType; - FILETIME ft = { 0 }; - - if (create) - { - HANDLE hCacheFile = CreateFileW(cacheFileName, GENERIC_WRITE, 0, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - - if (hCacheFile != INVALID_HANDLE_VALUE) - { - DWORD bytesWritten; - - WriteFile(hCacheFile, pObject->rgBlob[0].pbData, - pObject->rgBlob[0].cbData, &bytesWritten, NULL); - CloseHandle(hCacheFile); - } - else - ret = FALSE; - } - if (ret) - { - if (!(dwRetrievalFlags & CRYPT_STICKY_CACHE_RETRIEVAL)) - entryType = NORMAL_CACHE_ENTRY; - else - entryType = STICKY_CACHE_ENTRY; - CommitUrlCacheEntryW(pszURL, cacheFileName, expires, ft, entryType, - NULL, 0, NULL, NULL); - } - } + entryType = STICKY_CACHE_ENTRY; + memset(&ft, 0, sizeof(ft)); + CommitUrlCacheEntryW(pszURL, cacheFileName, expires, ft, entryType, + NULL, 0, NULL, NULL); } static void CALLBACK CRYPT_InetStatusCallback(HINTERNET hInt, @@ -966,18 +943,15 @@ else ret = TRUE; } - /* We don't set ret to TRUE in this block to avoid masking - * an error from HttpSendRequestExW. - */ - if (!HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + if (ret && + !(ret = HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context)) && GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event, context->timeout) == WAIT_TIMEOUT) - { SetLastError(ERROR_TIMEOUT); - ret = FALSE; - } + else + ret = TRUE; } if (ret) ret = CRYPT_DownloadObject(dwRetrievalFlags, hHttp, @@ -1056,8 +1030,8 @@ /* Try to create the file directly - Wine handles / in pathnames */ lstrcpynW(path, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { /* Try again on the current drive */ @@ -1066,8 +1040,8 @@ { lstrcpynW(path + 2, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } if (hFile == INVALID_HANDLE_VALUE) { @@ -1077,8 +1051,8 @@ { lstrcpynW(path + 2, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } } } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Apr 8 16:22:12 2013 @@ -55,7 +55,7 @@ reactos/dll/win32/crypt32 # Synced to Wine-1.5.26 reactos/dll/win32/cryptdlg # Synced to Wine-1.5.4 reactos/dll/win32/cryptdll # Synced to Wine-1.5.4 -reactos/dll/win32/cryptnet # Synced to Wine-1.3.37 +reactos/dll/win32/cryptnet # Synced to Wine-1.5.26 reactos/dll/win32/cryptui # Synced to Wine-1.5.4 reactos/dll/win32/dbghelp # Synced to Wine-1.3.37 reactos/dll/win32/dciman32 # Synced to Wine-1.5.19

1 0

[hbelusca] 58718: [BASESRV-CONSRV-WINSRV] Code reorganization only: put public server apis definitions in a dedicated include to be included in the respective init.c files.
by hbelusca＠svn.reactos.org 07 Apr '13

07 Apr '13

Author: hbelusca Date: Sun Apr 7 23:39:39 2013 New Revision: 58718 URL: http://svn.reactos.org/svn/reactos?rev=58718&view=rev Log: [BASESRV-CONSRV-WINSRV] Code reorganization only: put public server apis definitions in a dedicated include to be included in the respective init.c files. Added: branches/ros-csrss/subsystems/win/basesrv/api.h (with props) branches/ros-csrss/win32ss/user/winsrv/api.h (with props) Modified: branches/ros-csrss/include/reactos/subsys/win/console.h branches/ros-csrss/subsystems/win/basesrv/basesrv.h branches/ros-csrss/subsystems/win/basesrv/dosdev.c branches/ros-csrss/subsystems/win/basesrv/init.c branches/ros-csrss/subsystems/win/basesrv/proc.c branches/ros-csrss/subsystems/win/basesrv/sndsntry.c branches/ros-csrss/win32ss/user/consrv/api.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/lineinput.c branches/ros-csrss/win32ss/user/winsrv/init.c branches/ros-csrss/win32ss/user/winsrv/winsrv.h Modified: branches/ros-csrss/include/reactos/subsys/win/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/console.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/console.h [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -14,7 +14,7 @@ #define IsConsoleHandle(h) \ (((ULONG_PTR)(h) & 0x10000003) == 0x3) -/* Console reserved "file" names */ +/* Console-reserved device "file" names */ #define CONSOLE_FILE_NAME L"CON" #define CONSOLE_INPUT_FILE_NAME L"CONIN$" #define CONSOLE_OUTPUT_FILE_NAME L"CONOUT$" Added: branches/ros-csrss/subsystems/win/basesrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/api.h (added) +++ branches/ros-csrss/subsystems/win/basesrv/api.h [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -1,0 +1,28 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Base API Server DLL + * FILE: subsystems/win/basesrv/api.h + * PURPOSE: Public server APIs definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#pragma once + +/* dosdev.c */ +VOID BaseInitDefineDosDevice(VOID); +VOID BaseCleanupDefineDosDevice(VOID); + +CSR_API(BaseSrvDefineDosDevice); + +/* proc.c */ +CSR_API(BaseSrvGetTempFile); +CSR_API(BaseSrvCreateProcess); +CSR_API(BaseSrvCreateThread); +CSR_API(BaseSrvExitProcess); +CSR_API(BaseSrvGetProcessShutdownParam); +CSR_API(BaseSrvSetProcessShutdownParam); + +/* sndsntry.c */ +CSR_API(BaseSrvSoundSentryNotification); + +/* EOF */ Propchange: branches/ros-csrss/subsystems/win/basesrv/api.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/basesrv.h [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server + * PROJECT: ReactOS Base API Server DLL * FILE: subsystems/win/basesrv/basesrv.h * PURPOSE: Main header - Definitions * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) @@ -25,27 +25,11 @@ #include <win/base.h> +/* Globals */ extern HANDLE BaseSrvHeap; extern HANDLE BaseSrvSharedHeap; extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; -/* dosdev.c */ -VOID BaseInitDefineDosDevice(VOID); -VOID BaseCleanupDefineDosDevice(VOID); - -CSR_API(BaseSrvDefineDosDevice); - -/* proc.c */ -CSR_API(BaseSrvGetTempFile); -CSR_API(BaseSrvCreateProcess); -CSR_API(BaseSrvCreateThread); -CSR_API(BaseSrvExitProcess); -CSR_API(BaseSrvGetProcessShutdownParam); -CSR_API(BaseSrvSetProcessShutdownParam); - -/* sndsntry.c */ -CSR_API(BaseSrvSoundSentryNotification); - #endif // __BASESRV_H__ /* EOF */ Modified: branches/ros-csrss/subsystems/win/basesrv/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/dosdev.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/dosdev.c [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server + * PROJECT: ReactOS Base API Server DLL * FILE: subsystems/win/basesrv/dosdev.c * PURPOSE: DOS Devices Management * PROGRAMMERS: Pierre Schweitzer (pierre.schweitzer(a)reactos.org) Modified: branches/ros-csrss/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server + * PROJECT: ReactOS Base API Server DLL * FILE: subsystems/win/basesrv/init.c * PURPOSE: Initialization * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "basesrv.h" +#include "api.h" #define NDEBUG #include <debug.h> Modified: branches/ros-csrss/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/proc.c [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server + * PROJECT: ReactOS Base API Server DLL * FILE: subsystems/win/basesrv/proc.c * PURPOSE: Process and Thread Management * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) Modified: branches/ros-csrss/subsystems/win/basesrv/sndsntry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/sndsntry.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/sndsntry.c [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server + * PROJECT: ReactOS Base API Server DLL * FILE: subsystems/win/basesrv/sndsntry.c * PURPOSE: Sound Sentry Notifications * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) Modified: branches/ros-csrss/win32ss/user/consrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/api.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/api.h [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -17,22 +17,22 @@ CSR_API(SrvGetConsoleAliasExesLength); /* coninput.c */ +CSR_API(SrvReadConsole); CSR_API(SrvGetConsoleInput); CSR_API(SrvWriteConsoleInput); -CSR_API(SrvReadConsole); CSR_API(SrvFlushConsoleInputBuffer); CSR_API(SrvGetConsoleNumberOfInputEvents); /* conoutput.c */ CSR_API(SrvReadConsoleOutput); +CSR_API(SrvWriteConsole); CSR_API(SrvWriteConsoleOutput); CSR_API(SrvReadConsoleOutputString); CSR_API(SrvWriteConsoleOutputString); CSR_API(SrvFillConsoleOutput); -CSR_API(SrvWriteConsole); -CSR_API(SrvSetConsoleCursorPosition); CSR_API(SrvGetConsoleCursorInfo); CSR_API(SrvSetConsoleCursorInfo); +CSR_API(SrvSetConsoleCursorPosition); CSR_API(SrvSetConsoleTextAttribute); CSR_API(SrvCreateConsoleScreenBuffer); CSR_API(SrvGetConsoleScreenBufferInfo); @@ -41,14 +41,13 @@ CSR_API(SrvSetConsoleScreenBufferSize); /* console.c */ -CSR_API(SrvOpenConsole); CSR_API(SrvAllocConsole); CSR_API(SrvAttachConsole); CSR_API(SrvFreeConsole); +CSR_API(SrvGetConsoleMode); CSR_API(SrvSetConsoleMode); -CSR_API(SrvGetConsoleMode); +CSR_API(SrvGetConsoleTitle); CSR_API(SrvSetConsoleTitle); -CSR_API(SrvGetConsoleTitle); CSR_API(SrvGetConsoleHardwareState); CSR_API(SrvSetConsoleHardwareState); CSR_API(SrvGetConsoleDisplayMode); @@ -62,13 +61,14 @@ CSR_API(SrvGetConsoleSelectionInfo); /* handle.c */ +CSR_API(SrvOpenConsole); CSR_API(SrvCloseHandle); CSR_API(SrvVerifyConsoleIoHandle); CSR_API(SrvDuplicateHandle); /* lineinput.c */ +CSR_API(SrvGetConsoleCommandHistory); CSR_API(SrvGetConsoleCommandHistoryLength); -CSR_API(SrvGetConsoleCommandHistory); CSR_API(SrvExpungeConsoleCommandHistory); CSR_API(SrvSetConsoleNumberOfCommands); CSR_API(SrvGetConsoleHistory); 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] Sun Apr 7 23:39:39 2013 @@ -1003,6 +1003,50 @@ return STATUS_SUCCESS; } +CSR_API(SrvGetConsoleMode) +{ + NTSTATUS Status; + PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleModeRequest; + PCONSOLE_IO_OBJECT Object = NULL; + + Status = ConSrvGetObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + ConsoleModeRequest->ConsoleHandle, + &Object, NULL, GENERIC_READ, TRUE, 0); + if (!NT_SUCCESS(Status)) return Status; + + Status = STATUS_SUCCESS; + + if (INPUT_BUFFER == Object->Type) + { + PCONSOLE_INPUT_BUFFER InputBuffer = (PCONSOLE_INPUT_BUFFER)Object; + PCONSOLE Console = InputBuffer->Header.Console; + DWORD ConsoleMode = InputBuffer->Mode; + + if (Console->QuickEdit || Console->InsertMode) + { + // Windows does this, even if it's not documented on MSDN + ConsoleMode |= ENABLE_EXTENDED_FLAGS; + + if (Console->QuickEdit ) ConsoleMode |= ENABLE_QUICK_EDIT_MODE; + if (Console->InsertMode) ConsoleMode |= ENABLE_INSERT_MODE; + } + + ConsoleModeRequest->ConsoleMode = ConsoleMode; + } + else if (SCREEN_BUFFER == Object->Type) + { + PCONSOLE_SCREEN_BUFFER Buffer = (PCONSOLE_SCREEN_BUFFER)Object; + ConsoleModeRequest->ConsoleMode = Buffer->Mode; + } + else + { + Status = STATUS_INVALID_HANDLE; + } + + ConSrvReleaseObject(Object, TRUE); + return Status; +} + CSR_API(SrvSetConsoleMode) { #define CONSOLE_VALID_CONTROL_MODES ( ENABLE_EXTENDED_FLAGS | ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE ) @@ -1086,48 +1130,41 @@ return Status; } -CSR_API(SrvGetConsoleMode) +CSR_API(SrvGetConsoleTitle) { NTSTATUS Status; - PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleModeRequest; - PCONSOLE_IO_OBJECT Object = NULL; - - Status = ConSrvGetObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - ConsoleModeRequest->ConsoleHandle, - &Object, NULL, GENERIC_READ, TRUE, 0); - if (!NT_SUCCESS(Status)) return Status; - - Status = STATUS_SUCCESS; - - if (INPUT_BUFFER == Object->Type) - { - PCONSOLE_INPUT_BUFFER InputBuffer = (PCONSOLE_INPUT_BUFFER)Object; - PCONSOLE Console = InputBuffer->Header.Console; - DWORD ConsoleMode = InputBuffer->Mode; - - if (Console->QuickEdit || Console->InsertMode) - { - // Windows does this, even if it's not documented on MSDN - ConsoleMode |= ENABLE_EXTENDED_FLAGS; - - if (Console->QuickEdit ) ConsoleMode |= ENABLE_QUICK_EDIT_MODE; - if (Console->InsertMode) ConsoleMode |= ENABLE_INSERT_MODE; - } - - ConsoleModeRequest->ConsoleMode = ConsoleMode; - } - else if (SCREEN_BUFFER == Object->Type) - { - PCONSOLE_SCREEN_BUFFER Buffer = (PCONSOLE_SCREEN_BUFFER)Object; - ConsoleModeRequest->ConsoleMode = Buffer->Mode; - } - else - { - Status = STATUS_INVALID_HANDLE; - } - - ConSrvReleaseObject(Object, TRUE); - return Status; + PCONSOLE_GETSETCONSOLETITLE TitleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.TitleRequest; + // PCSR_PROCESS Process = CsrGetClientThread()->Process; + PCONSOLE Console; + DWORD Length; + + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID)&TitleRequest->Title, + TitleRequest->Length, + sizeof(BYTE))) + { + return STATUS_INVALID_PARAMETER; + } + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } + + /* Copy title of the console to the user title buffer */ + if (TitleRequest->Length >= sizeof(WCHAR)) + { + Length = min(TitleRequest->Length - sizeof(WCHAR), Console->Title.Length); + memcpy(TitleRequest->Title, Console->Title.Buffer, Length); + TitleRequest->Title[Length / sizeof(WCHAR)] = L'\0'; + } + + TitleRequest->Length = Console->Title.Length; + + ConSrvReleaseConsole(Console, TRUE); + return STATUS_SUCCESS; } CSR_API(SrvSetConsoleTitle) @@ -1179,43 +1216,6 @@ ConSrvReleaseConsole(Console, TRUE); return Status; -} - -CSR_API(SrvGetConsoleTitle) -{ - NTSTATUS Status; - PCONSOLE_GETSETCONSOLETITLE TitleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.TitleRequest; - // PCSR_PROCESS Process = CsrGetClientThread()->Process; - PCONSOLE Console; - DWORD Length; - - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID)&TitleRequest->Title, - TitleRequest->Length, - sizeof(BYTE))) - { - return STATUS_INVALID_PARAMETER; - } - - Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Can't get console\n"); - return Status; - } - - /* Copy title of the console to the user title buffer */ - if (TitleRequest->Length >= sizeof(WCHAR)) - { - Length = min(TitleRequest->Length - sizeof(WCHAR), Console->Title.Length); - memcpy(TitleRequest->Title, Console->Title.Buffer, Length); - TitleRequest->Title[Length / sizeof(WCHAR)] = L'\0'; - } - - TitleRequest->Length = Console->Title.Length; - - ConSrvReleaseConsole(Console, TRUE); - return STATUS_SUCCESS; } /********************************************************************** Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -446,39 +446,6 @@ /* PUBLIC SERVER APIS *********************************************************/ -CSR_API(SrvGetConsoleCommandHistoryLength) -{ - PCONSOLE_GETCOMMANDHISTORYLENGTH GetCommandHistoryLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryLengthRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - PCONSOLE Console; - NTSTATUS Status; - PHISTORY_BUFFER Hist; - ULONG Length = 0; - INT i; - - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&GetCommandHistoryLengthRequest->ExeName.Buffer, - GetCommandHistoryLengthRequest->ExeName.Length, - sizeof(BYTE))) - { - return STATUS_INVALID_PARAMETER; - } - - Status = ConSrvGetConsole(ProcessData, &Console, TRUE); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &GetCommandHistoryLengthRequest->ExeName); - if (Hist) - { - for (i = 0; i < Hist->NumEntries; i++) - Length += Hist->Entries[i].Length + sizeof(WCHAR); - } - GetCommandHistoryLengthRequest->Length = Length; - ConSrvReleaseConsole(Console, TRUE); - } - return Status; -} - CSR_API(SrvGetConsoleCommandHistory) { PCONSOLE_GETCOMMANDHISTORY GetCommandHistoryRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryRequest; @@ -522,6 +489,39 @@ } } GetCommandHistoryRequest->Length = Buffer - (PBYTE)GetCommandHistoryRequest->History; + ConSrvReleaseConsole(Console, TRUE); + } + return Status; +} + +CSR_API(SrvGetConsoleCommandHistoryLength) +{ + PCONSOLE_GETCOMMANDHISTORYLENGTH GetCommandHistoryLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryLengthRequest; + PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); + PCONSOLE Console; + NTSTATUS Status; + PHISTORY_BUFFER Hist; + ULONG Length = 0; + INT i; + + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&GetCommandHistoryLengthRequest->ExeName.Buffer, + GetCommandHistoryLengthRequest->ExeName.Length, + sizeof(BYTE))) + { + return STATUS_INVALID_PARAMETER; + } + + Status = ConSrvGetConsole(ProcessData, &Console, TRUE); + if (NT_SUCCESS(Status)) + { + Hist = HistoryFindBuffer(Console, &GetCommandHistoryLengthRequest->ExeName); + if (Hist) + { + for (i = 0; i < Hist->NumEntries; i++) + Length += Hist->Entries[i].Length + sizeof(WCHAR); + } + GetCommandHistoryLengthRequest->Length = Length; ConSrvReleaseConsole(Console, TRUE); } return Status; Added: branches/ros-csrss/win32ss/user/winsrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/a… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/api.h (added) +++ branches/ros-csrss/win32ss/user/winsrv/api.h [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -1,0 +1,25 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/api.h + * PURPOSE: Public server APIs definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#pragma once + +/* init.c */ +BOOL WINAPI _UserSoundSentry(VOID); + +/* harderror.c */ +VOID WINAPI UserServerHardError(IN PCSR_THREAD ThreadData, + IN PHARDERROR_MSG Message); + +/* register.c */ +CSR_API(SrvRegisterServicesProcess); +CSR_API(SrvRegisterLogonProcess); + +/* shutdown.c */ +CSR_API(SrvExitWindowsEx); + +/* EOF */ Propchange: branches/ros-csrss/win32ss/user/winsrv/api.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -10,6 +10,7 @@ /* INCLUDES *******************************************************************/ #include "winsrv.h" +#include "api.h" #define NDEBUG #include <debug.h> Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] Sun Apr 7 23:39:39 2013 @@ -51,24 +51,10 @@ #include "resource.h" +/* Globals */ extern HINSTANCE UserServerDllInstance; extern HANDLE UserServerHeap; - extern ULONG_PTR LogonProcessId; - -/* init.c */ -BOOL WINAPI _UserSoundSentry(VOID); - -/* harderror.c */ -VOID WINAPI UserServerHardError(IN PCSR_THREAD ThreadData, - IN PHARDERROR_MSG Message); - -/* register.c */ -CSR_API(SrvRegisterServicesProcess); -CSR_API(SrvRegisterLogonProcess); - -/* shutdown.c */ -CSR_API(SrvExitWindowsEx); #endif // __WINSRV_H__

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