Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[hbelusca] 59314: [KERNEL32] Never EVER process instructions INSIDE a debug macro (e.g. ASSERT) because when compiling in Release Mode, the code isn't executed at all. Fix that. See revision r59310...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 23 12:55:17 2013 New Revision: 59314 URL: http://svn.reactos.org/svn/reactos?rev=59314&view=rev Log: [KERNEL32] Never EVER process instructions INSIDE a debug macro (e.g. ASSERT) because when compiling in Release Mode, the code isn't executed at all. Fix that. See revision r59310 for more details. Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Jun 23 12:55:17 2013 @@ -2541,6 +2541,7 @@ WCHAR SaveChar = 0; ULONG RetVal; UINT Error = 0; + UINT Length; BOOLEAN SearchDone = FALSE; BOOLEAN Escape = FALSE; CLIENT_ID ClientId; @@ -2630,7 +2631,13 @@ } /* Get the path to the VDM host */ - ASSERT(GetSystemDirectoryW(VdmPath, MAX_PATH - wcslen(NTVDM_STRING)) != 0); + Length = GetSystemDirectoryW(VdmPath, MAX_PATH - wcslen(NTVDM_STRING)); + if ((Length == 0) || (Length >= MAX_PATH - wcslen(NTVDM_STRING))) + { + /* System path not found for some reason, fail */ + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } wcscat(VdmPath, NTVDM_STRING); /*

11 years, 2 months

[akhaldi] 59313: [MSHTML] * Welcome to the MSVC build club. Thanks to Thomas Faber.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 23 12:49:24 2013 New Revision: 59313 URL: http://svn.reactos.org/svn/reactos?rev=59313&view=rev Log: [MSHTML] * Welcome to the MSVC build club. Thanks to Thomas Faber. Added: trunk/reactos/dll/win32/mshtml/msvc.S (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/mshtml/ifacewrap.c Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Jun 23 12:49:24 2013 @@ -93,10 +93,7 @@ add_subdirectory(msg711.acm) add_subdirectory(msgina) add_subdirectory(msgsm32.acm) -if(NOT MSVC) - #FIXME: msvc build. - add_subdirectory(mshtml) -endif() +add_subdirectory(mshtml) add_subdirectory(msi) add_subdirectory(mshtml.tlb) add_subdirectory(msimg32) Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Sun Jun 23 12:49:24 2013 @@ -89,7 +89,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) -add_library(mshtml SHARED ${SOURCE}) +if(MSVC) + add_asm_files(mshtml_asm msvc.S) +endif() + +add_library(mshtml SHARED ${SOURCE} ${mshtml_asm}) list(APPEND mshtml_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/blank.htm Modified: trunk/reactos/dll/win32/mshtml/ifacewrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/ifacewrap… ============================================================================== --- trunk/reactos/dll/win32/mshtml/ifacewrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/ifacewrap.c [iso-8859-1] Sun Jun 23 12:49:24 2013 @@ -90,6 +90,9 @@ #ifdef __i386__ +#ifdef _MSC_VER +#define DEFINE_WRAPPER_FUNC(n, off, x) HRESULT wrapper_func_##n(IUnknown*); +#else #define DEFINE_WRAPPER_FUNC(n, off, x) \ HRESULT wrapper_func_##n(IUnknown*); \ __ASM_GLOBAL_FUNC(wrapper_func_##n, \ @@ -98,6 +101,7 @@ "movl %eax, 4(%esp)\n\t" \ "movl 0(%eax), %eax\n\t" \ "jmp *" #off "(%eax)\n\t") +#endif #elif defined(__x86_64__) Added: trunk/reactos/dll/win32/mshtml/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/msvc.S?re… ============================================================================== --- trunk/reactos/dll/win32/mshtml/msvc.S (added) +++ trunk/reactos/dll/win32/mshtml/msvc.S [iso-8859-1] Sun Jun 23 12:49:24 2013 @@ -0,0 +1,114 @@ + +#include <asm.inc> + +.code + +MACRO(DEFINE_WRAPPER_FUNC, n, off, x) +PUBLIC _wrapper_func_&n& +_wrapper_func_&n&: +mov eax, [esp+4] +mov eax, [eax+4] +mov [esp+4], eax +mov eax, [eax] +jmp dword ptr [eax+off] +ENDM + +DEFINE_WRAPPER_FUNC 3, 12, 24 +DEFINE_WRAPPER_FUNC 4, 16, 32 +DEFINE_WRAPPER_FUNC 5, 20, 40 +DEFINE_WRAPPER_FUNC 6, 24, 48 +DEFINE_WRAPPER_FUNC 7, 28, 56 +DEFINE_WRAPPER_FUNC 8, 32, 64 +DEFINE_WRAPPER_FUNC 9, 36, 72 +DEFINE_WRAPPER_FUNC 10, 40, 80 +DEFINE_WRAPPER_FUNC 11, 44, 88 +DEFINE_WRAPPER_FUNC 12, 48, 96 +DEFINE_WRAPPER_FUNC 13, 52, 104 +DEFINE_WRAPPER_FUNC 14, 56, 112 +DEFINE_WRAPPER_FUNC 15, 60, 120 +DEFINE_WRAPPER_FUNC 16, 64, 128 +DEFINE_WRAPPER_FUNC 17, 68, 136 +DEFINE_WRAPPER_FUNC 18, 72, 144 +DEFINE_WRAPPER_FUNC 19, 76, 152 +DEFINE_WRAPPER_FUNC 20, 80, 160 +DEFINE_WRAPPER_FUNC 21, 84, 168 +DEFINE_WRAPPER_FUNC 22, 88, 176 +DEFINE_WRAPPER_FUNC 23, 92, 184 +DEFINE_WRAPPER_FUNC 24, 96, 192 +DEFINE_WRAPPER_FUNC 25, 100, 200 +DEFINE_WRAPPER_FUNC 26, 104, 208 +DEFINE_WRAPPER_FUNC 27, 108, 216 +DEFINE_WRAPPER_FUNC 28, 112, 224 +DEFINE_WRAPPER_FUNC 29, 116, 232 +DEFINE_WRAPPER_FUNC 30, 120, 240 +DEFINE_WRAPPER_FUNC 31, 124, 248 +DEFINE_WRAPPER_FUNC 32, 128, 256 +DEFINE_WRAPPER_FUNC 33, 132, 264 +DEFINE_WRAPPER_FUNC 34, 136, 272 +DEFINE_WRAPPER_FUNC 35, 140, 280 +DEFINE_WRAPPER_FUNC 36, 144, 288 +DEFINE_WRAPPER_FUNC 37, 148, 296 +DEFINE_WRAPPER_FUNC 38, 152, 304 +DEFINE_WRAPPER_FUNC 39, 156, 312 +DEFINE_WRAPPER_FUNC 40, 160, 320 +DEFINE_WRAPPER_FUNC 41, 164, 328 +DEFINE_WRAPPER_FUNC 42, 168, 336 +DEFINE_WRAPPER_FUNC 43, 172, 344 +DEFINE_WRAPPER_FUNC 44, 176, 352 +DEFINE_WRAPPER_FUNC 45, 180, 360 +DEFINE_WRAPPER_FUNC 46, 184, 368 +DEFINE_WRAPPER_FUNC 47, 188, 376 +DEFINE_WRAPPER_FUNC 48, 192, 384 +DEFINE_WRAPPER_FUNC 49, 196, 392 +DEFINE_WRAPPER_FUNC 50, 200, 400 +DEFINE_WRAPPER_FUNC 51, 204, 408 +DEFINE_WRAPPER_FUNC 52, 208, 416 +DEFINE_WRAPPER_FUNC 53, 212, 424 +DEFINE_WRAPPER_FUNC 54, 216, 432 +DEFINE_WRAPPER_FUNC 55, 220, 440 +DEFINE_WRAPPER_FUNC 56, 224, 448 +DEFINE_WRAPPER_FUNC 57, 228, 456 +DEFINE_WRAPPER_FUNC 58, 232, 464 +DEFINE_WRAPPER_FUNC 59, 236, 472 +DEFINE_WRAPPER_FUNC 60, 240, 480 +DEFINE_WRAPPER_FUNC 61, 244, 488 +DEFINE_WRAPPER_FUNC 62, 248, 496 +DEFINE_WRAPPER_FUNC 63, 252, 504 +DEFINE_WRAPPER_FUNC 64, 256, 512 +DEFINE_WRAPPER_FUNC 65, 260, 520 +DEFINE_WRAPPER_FUNC 66, 264, 528 +DEFINE_WRAPPER_FUNC 67, 268, 536 +DEFINE_WRAPPER_FUNC 68, 272, 544 +DEFINE_WRAPPER_FUNC 69, 276, 552 +DEFINE_WRAPPER_FUNC 70, 280, 560 +DEFINE_WRAPPER_FUNC 71, 284, 568 +DEFINE_WRAPPER_FUNC 72, 288, 576 +DEFINE_WRAPPER_FUNC 73, 292, 584 +DEFINE_WRAPPER_FUNC 74, 296, 592 +DEFINE_WRAPPER_FUNC 75, 300, 600 +DEFINE_WRAPPER_FUNC 76, 304, 608 +DEFINE_WRAPPER_FUNC 77, 308, 616 +DEFINE_WRAPPER_FUNC 78, 312, 624 +DEFINE_WRAPPER_FUNC 79, 316, 632 +DEFINE_WRAPPER_FUNC 80, 320, 640 +DEFINE_WRAPPER_FUNC 81, 324, 648 +DEFINE_WRAPPER_FUNC 82, 328, 656 +DEFINE_WRAPPER_FUNC 83, 332, 664 +DEFINE_WRAPPER_FUNC 84, 336, 672 +DEFINE_WRAPPER_FUNC 85, 340, 680 +DEFINE_WRAPPER_FUNC 86, 344, 688 +DEFINE_WRAPPER_FUNC 87, 348, 696 +DEFINE_WRAPPER_FUNC 88, 352, 704 +DEFINE_WRAPPER_FUNC 89, 356, 712 +DEFINE_WRAPPER_FUNC 90, 360, 720 +DEFINE_WRAPPER_FUNC 91, 364, 728 +DEFINE_WRAPPER_FUNC 92, 368, 736 +DEFINE_WRAPPER_FUNC 93, 372, 744) +DEFINE_WRAPPER_FUNC 94, 376, 752 +DEFINE_WRAPPER_FUNC 95, 380, 760 +DEFINE_WRAPPER_FUNC 96, 384, 768 +DEFINE_WRAPPER_FUNC 97, 388, 776 +DEFINE_WRAPPER_FUNC 98, 392, 784 +DEFINE_WRAPPER_FUNC 99, 396, 792 + +END Propchange: trunk/reactos/dll/win32/mshtml/msvc.S ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 2 months

[akhaldi] 59312: [WIDL] * Do not generate empty Vtbl structure for empty interfaces. Brought to you by Thomas Faber. * Patch is pending upstream.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 23 12:47:33 2013 New Revision: 59312 URL: http://svn.reactos.org/svn/reactos?rev=59312&view=rev Log: [WIDL] * Do not generate empty Vtbl structure for empty interfaces. Brought to you by Thomas Faber. * Patch is pending upstream. Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=59… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Sun Jun 23 12:47:33 2013 @@ -975,6 +975,15 @@ if (type_iface_get_inherit(iface)) do_write_c_method_def(header, type_iface_get_inherit(iface), name); + else if (type_iface_get_stmts(iface) == NULL) + { + fprintf(header, "#ifndef __cplusplus\n"); + indent(header, 0); + fprintf(header, "char dummy;\n"); + fprintf(header, "#endif\n"); + fprintf(header, "\n"); + return; + } STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) {

11 years, 2 months

[akhaldi] 59311: [WIDL] * Don't mix static and extern (FORCEINLINE).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 23 12:42:00 2013 New Revision: 59311 URL: http://svn.reactos.org/svn/reactos?rev=59311&view=rev Log: [WIDL] * Don't mix static and extern (FORCEINLINE). Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=59… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Sun Jun 23 12:42:00 2013 @@ -952,7 +952,7 @@ if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { const var_t *arg; - fprintf(header, "static FORCEINLINE "); + fprintf(header, "FORCEINLINE "); write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " %s_%s(", name, get_name(func)); write_args(header, type_get_function_args(func->type), name, 1, FALSE);

11 years, 2 months

[aandrejevic] 59310: [KERNEL32] Implement BasepCheckDosApp. Enable NTVDM in CreateProcessInternalW. [NTVDM] Remove the old command line parser code. The entire command line is for the DOS applicati...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Jun 23 12:33:13 2013 New Revision: 59310 URL: http://svn.reactos.org/svn/reactos?rev=59310&view=rev Log: [KERNEL32] Implement BasepCheckDosApp. Enable NTVDM in CreateProcessInternalW. [NTVDM] Remove the old command line parser code. The entire command line is for the DOS application now. Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Jun 23 12:33:13 2013 @@ -49,6 +49,7 @@ RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle); #define CMD_STRING L"cmd /c " +#define NTVDM_STRING L"\\ntvdm.exe" /* FUNCTIONS ****************************************************************/ @@ -180,6 +181,22 @@ { /* Add this to the certification list */ return BasepSaveAppCertRegistryValue(Context, ValueName, ValueData); +} + + +BOOLEAN +NTAPI +BasepCheckDosApp(IN PUNICODE_STRING ApplicationName) +{ + PWCHAR Extension; + + /* Get the extension from the file name */ + Extension = &ApplicationName->Buffer[ApplicationName->Length / + sizeof(WCHAR) - 4]; + + /* Check if the extension is .COM */ + if (_wcsnicmp(Extension, L".com", 4) == 0) return TRUE; + else return FALSE; } NTSTATUS @@ -2531,6 +2548,7 @@ PPEB RemotePeb; SIZE_T EnvSize = 0; BOOL Ret = FALSE; + WCHAR VdmPath[MAX_PATH]; /* FIXME should process * HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options @@ -2610,6 +2628,10 @@ CREATE_SEPARATE_WOW_VDM; } } + + /* Get the path to the VDM host */ + ASSERT(GetSystemDirectoryW(VdmPath, MAX_PATH - wcslen(NTVDM_STRING)) != 0); + wcscat(VdmPath, NTVDM_STRING); /* * According to some sites, ShellExecuteEx uses an undocumented flag to @@ -2847,14 +2869,13 @@ case STATUS_INVALID_IMAGE_PROTECT: case STATUS_INVALID_IMAGE_NOT_MZ: -#if 0 /* If it's a DOS app, use VDM */ if ((BasepCheckDosApp(&ApplicationName))) { DPRINT1("Launching VDM...\n"); RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer); - return CreateProcessW(L"ntvdm.exe", + return CreateProcessW(VdmPath, (LPWSTR)((ULONG_PTR)lpApplicationName), /* FIXME: Buffer must be writable!!! */ lpProcessAttributes, lpThreadAttributes, @@ -2865,7 +2886,6 @@ &StartupInfo, lpProcessInformation); } -#endif /* It's a batch file */ Extension = &ApplicationName.Buffer[ApplicationName.Length / sizeof(WCHAR) - 4]; @@ -2925,7 +2945,7 @@ DPRINT1("Launching VDM...\n"); RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer); - return CreateProcessW(L"ntvdm.exe", + return CreateProcessW(VdmPath, (LPWSTR)((ULONG_PTR)lpApplicationName), /* FIXME: Buffer must be writable!!! */ lpProcessAttributes, lpThreadAttributes, Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sun Jun 23 12:33:13 2013 @@ -55,7 +55,6 @@ INT wmain(INT argc, WCHAR *argv[]) { INT i; - BOOLEAN PrintUsage = TRUE; CHAR CommandLine[128]; DWORD CurrentTickCount, LastTickCount = 0, Cycles = 0, LastCyclePrintout = 0; LARGE_INTEGER Frequency, LastTimerTick, Counter; @@ -64,39 +63,8 @@ /* Set the handler routine */ SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); - /* Parse the command line arguments */ - for (i = 1; i < argc; i++) - { - if (argv[i][0] != L'-' && argv[i][0] != L'/') continue; - - switch (argv[i][1]) - { - case L'f': - case L'F': - { - if (argv[i+1] != NULL) - { - /* The DOS command line must be ASCII */ - WideCharToMultiByte(CP_ACP, 0, argv[i+1], -1, CommandLine, 128, NULL, NULL); - - /* This is the only mandatory parameter */ - PrintUsage = FALSE; - } - break; - } - default: - { - wprintf(L"Unknown option: %s", argv[i]); - } - } - } - - if (PrintUsage) - { - wprintf(L"ReactOS Virtual DOS Machine\n\n"); - wprintf(L"Usage: NTVDM /F <PROGRAM>\n"); - return 0; - } + /* The DOS command line must be ASCII */ + WideCharToMultiByte(CP_ACP, 0, GetCommandLine(), -1, CommandLine, 128, NULL, NULL); if (!EmulatorInitialize()) return 1;

11 years, 2 months

[hbelusca] 59309: Fix compilation (forgot this change).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 23 12:18:31 2013 New Revision: 59309 URL: http://svn.reactos.org/svn/reactos?rev=59309&view=rev Log: Fix compilation (forgot this change). Modified: trunk/reactos/win32ss/user/consrv/condrv/console.c Modified: trunk/reactos/win32ss/user/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/console.c [iso-8859-1] Sun Jun 23 12:18:31 2013 @@ -460,13 +460,13 @@ ScreenBufferInfo.CursorSize = ConsoleInfo->CursorSize; InitializeListHead(&Console->BufferList); - Status = ConSrvCreateScreenBuffer(&NewBuffer, + Status = ConDrvCreateScreenBuffer(&NewBuffer, Console, CONSOLE_TEXTMODE_BUFFER, &ScreenBufferInfo); if (!NT_SUCCESS(Status)) { - DPRINT1("ConSrvCreateScreenBuffer: failed, Status = 0x%08lx\n", Status); + DPRINT1("ConDrvCreateScreenBuffer: failed, Status = 0x%08lx\n", Status); CloseHandle(Console->InputBuffer.ActiveEvent); DeleteCriticalSection(&Console->Lock); ConsoleFreeHeap(Console);

11 years, 2 months

[hbelusca] 59308: [CONSRV] Move some output functions to the future console driver (i.e. for the moment, CSR console server functions SrvConsole* call ConDrv* functions). Don't worry, internal head...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 23 12:13:21 2013 New Revision: 59308 URL: http://svn.reactos.org/svn/reactos?rev=59308&view=rev Log: [CONSRV] Move some output functions to the future console driver (i.e. for the moment, CSR console server functions SrvConsole* call ConDrv* functions). Don't worry, internal headers will be rearranged, so that: <ConDrv***_function_prototype>(...); CSR_API(SrvConsole***) { ... } constructions will be avoided in the future. For now, just make everything working. Added: trunk/reactos/win32ss/user/consrv/condrv/conoutput.c - copied, changed from r59297, trunk/reactos/win32ss/user/consrv/conoutput.c Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/consrv/conoutput.c trunk/reactos/win32ss/user/consrv/conoutput.h Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] Sun Jun 23 12:13:21 2013 @@ -19,6 +19,7 @@ init.c lineinput.c settings.c + condrv/conoutput.c condrv/console.c condrv/graphics.c frontends/input.c Copied: trunk/reactos/win32ss/user/consrv/condrv/conoutput.c (from r59297, trunk/reactos/win32ss/user/consrv/conoutput.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/conoutput.c [iso-8859-1] Sun Jun 23 12:13:21 2013 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/consrv/conoutput.c + * FILE: win32ss/user/consrv/condrv/conoutput.c * PURPOSE: General Console Output Functions * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) @@ -67,8 +67,9 @@ // do_nothing; } +// ConDrvCreateConsoleScreenBuffer NTSTATUS FASTCALL -ConSrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, +ConDrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, IN OUT PCONSOLE Console, IN ULONG BufferType, IN PVOID ScreenBufferInfo) @@ -104,6 +105,9 @@ return Status; } + +static VOID +ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); VOID WINAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) @@ -141,7 +145,7 @@ } } -VOID FASTCALL +static VOID ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) { PCONSOLE Console = Buffer->Header.Console; @@ -150,6 +154,30 @@ // ConioDrawConsole(Console); } +NTSTATUS NTAPI +ConDrvSetConsoleActiveScreenBuffer(IN PCONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER Buffer) +{ + if (Console == NULL || Buffer == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); + + if (Buffer == Console->ActiveBuffer) return STATUS_SUCCESS; + + /* If old buffer has no handles, it's now unreferenced */ + if (Console->ActiveBuffer->Header.HandleCount == 0) + { + ConioDeleteScreenBuffer(Console->ActiveBuffer); + } + + /* Tie console to new buffer */ + ConioSetActiveScreenBuffer(Buffer); + + return STATUS_SUCCESS; +} + PCONSOLE_SCREEN_BUFFER ConDrvGetActiveScreenBuffer(IN PCONSOLE Console) { @@ -158,270 +186,101 @@ /* PUBLIC SERVER APIS *********************************************************/ -CSR_API(SrvInvalidateBitMapRect) -{ - NTSTATUS Status; - PCONSOLE_INVALIDATEDIBITS InvalidateDIBitsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.InvalidateDIBitsRequest; - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; - - DPRINT("SrvInvalidateBitMapRect\n"); - - Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), InvalidateDIBitsRequest->OutputHandle, &Buff, GENERIC_READ, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; +NTSTATUS NTAPI +ConDrvInvalidateBitMapRect(IN PCONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER Buffer, + IN PSMALL_RECT Region) +{ + if (Console == NULL || Buffer == NULL || Region == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); /* If the output buffer is the current one, redraw the correct portion of the screen */ - if (Buff == Console->ActiveBuffer) - ConioDrawRegion(Console, &InvalidateDIBitsRequest->Region); - - ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; -} - -CSR_API(SrvGetConsoleCursorInfo) -{ - NTSTATUS Status; - PCONSOLE_GETSETCURSORINFO CursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CursorInfoRequest; - PCONSOLE_SCREEN_BUFFER Buff; - - DPRINT("SrvGetConsoleCursorInfo\n"); - - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->OutputHandle, &Buff, GENERIC_READ, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - CursorInfoRequest->Info.bVisible = Buff->CursorInfo.bVisible; - CursorInfoRequest->Info.dwSize = Buff->CursorInfo.dwSize; - - ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; -} - -CSR_API(SrvSetConsoleCursorInfo) -{ - NTSTATUS Status; - PCONSOLE_GETSETCURSORINFO CursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CursorInfoRequest; - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; - DWORD Size; + if (Buffer == Console->ActiveBuffer) ConioDrawRegion(Console, Region); + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +ConDrvGetConsoleCursorInfo(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + OUT PCONSOLE_CURSOR_INFO CursorInfo) +{ + if (Console == NULL || Buffer == NULL || CursorInfo == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); + + *CursorInfo = Buffer->CursorInfo; + // CursorInfo->bVisible = Buffer->CursorInfo.bVisible; + // CursorInfo->dwSize = Buffer->CursorInfo.dwSize; + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +ConDrvSetConsoleCursorInfo(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCONSOLE_CURSOR_INFO CursorInfo) +{ + ULONG Size; BOOL Visible, Success = TRUE; - DPRINT("SrvSetConsoleCursorInfo\n"); - - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - - Size = CursorInfoRequest->Info.dwSize; - Visible = CursorInfoRequest->Info.bVisible; - if (Size < 1) Size = 1; - if (100 < Size) Size = 100; - - if ( (Size != Buff->CursorInfo.dwSize) || - (Visible && !Buff->CursorInfo.bVisible) || - (!Visible && Buff->CursorInfo.bVisible) ) - { - Buff->CursorInfo.dwSize = Size; - Buff->CursorInfo.bVisible = Visible; - - Success = ConioSetCursorInfo(Console, Buff); - } - - ConSrvReleaseScreenBuffer(Buff, TRUE); + if (Console == NULL || Buffer == NULL || CursorInfo == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); + + Size = min(max(CursorInfo->dwSize, 1), 100); + Visible = CursorInfo->bVisible; + + if ( (Size != Buffer->CursorInfo.dwSize) || + (Visible && !Buffer->CursorInfo.bVisible) || + (!Visible && Buffer->CursorInfo.bVisible) ) + { + Buffer->CursorInfo.dwSize = Size; + Buffer->CursorInfo.bVisible = Visible; + + Success = ConioSetCursorInfo(Console, (PCONSOLE_SCREEN_BUFFER)Buffer); + } + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } -CSR_API(SrvSetConsoleCursorPosition) -{ - NTSTATUS Status = STATUS_SUCCESS; - PCONSOLE_SETCURSORPOSITION SetCursorPositionRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetCursorPositionRequest; - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; +NTSTATUS NTAPI +ConDrvSetConsoleCursorPosition(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCOORD Position) +{ SHORT OldCursorX, OldCursorY; - SHORT NewCursorX, NewCursorY; - - DPRINT("SrvSetConsoleCursorPosition\n"); - - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetCursorPositionRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - - NewCursorX = SetCursorPositionRequest->Position.X; - NewCursorY = SetCursorPositionRequest->Position.Y; - if ( NewCursorX < 0 || NewCursorX >= Buff->ScreenBufferSize.X || - NewCursorY < 0 || NewCursorY >= Buff->ScreenBufferSize.Y ) - { - Status = STATUS_INVALID_PARAMETER; - goto Quit; - } - OldCursorX = Buff->CursorPosition.X; - OldCursorY = Buff->CursorPosition.Y; - Buff->CursorPosition.X = NewCursorX; - Buff->CursorPosition.Y = NewCursorY; - if (Buff == Console->ActiveBuffer) - { - if (!ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY)) - { - Status = STATUS_UNSUCCESSFUL; - goto Quit; - } - } - -Quit: - ConSrvReleaseScreenBuffer(Buff, TRUE); - return Status; -} - -CSR_API(SrvCreateConsoleScreenBuffer) -{ - NTSTATUS Status = STATUS_INVALID_PARAMETER; - PCONSOLE_CREATESCREENBUFFER CreateScreenBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CreateScreenBufferRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; - - PVOID ScreenBufferInfo = NULL; - TEXTMODE_BUFFER_INFO TextModeInfo = {{80, 25}, - DEFAULT_SCREEN_ATTRIB, - DEFAULT_POPUP_ATTRIB , - TRUE, - CSR_DEFAULT_CURSOR_SIZE}; - GRAPHICS_BUFFER_INFO GraphicsInfo; - GraphicsInfo.Info = CreateScreenBufferRequest->GraphicsBufferInfo; // HACK for MSVC - - DPRINT("SrvCreateConsoleScreenBuffer\n"); - - Status = ConSrvGetConsole(ProcessData, &Console, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - if (CreateScreenBufferRequest->ScreenBufferType == CONSOLE_TEXTMODE_BUFFER) - { - ScreenBufferInfo = &TextModeInfo; - - /* - if (Console->ActiveBuffer) - { - TextModeInfo.ScreenBufferSize = Console->ActiveBuffer->ScreenBufferSize; - if (TextModeInfo.ScreenBufferSize.X == 0) TextModeInfo.ScreenBufferSize.X = 80; - if (TextModeInfo.ScreenBufferSize.Y == 0) TextModeInfo.ScreenBufferSize.Y = 25; - - TextModeInfo.ScreenAttrib = Console->ActiveBuffer->ScreenBuffer.TextBuffer.ScreenDefaultAttrib; - TextModeInfo.PopupAttrib = Console->ActiveBuffer->ScreenBuffer.TextBuffer.PopupDefaultAttrib; - - TextModeInfo.IsCursorVisible = Console->ActiveBuffer->CursorInfo.bVisible; - TextModeInfo.CursorSize = Console->ActiveBuffer->CursorInfo.dwSize; - } - */ - - /* - * This is Windows' behaviour - */ - - /* Use the current console size. Regularize it if needed. */ - TextModeInfo.ScreenBufferSize = Console->ConsoleSize; - if (TextModeInfo.ScreenBufferSize.X == 0) TextModeInfo.ScreenBufferSize.X = 1; - if (TextModeInfo.ScreenBufferSize.Y == 0) TextModeInfo.ScreenBufferSize.Y = 1; - - /* If we have an active screen buffer, use its attributes as the new ones */ - if (Console->ActiveBuffer && GetType(Console->ActiveBuffer) == TEXTMODE_BUFFER) - { - PTEXTMODE_SCREEN_BUFFER Buffer = (PTEXTMODE_SCREEN_BUFFER)Console->ActiveBuffer; - - TextModeInfo.ScreenAttrib = Buffer->ScreenDefaultAttrib; - TextModeInfo.PopupAttrib = Buffer->PopupDefaultAttrib; - - TextModeInfo.IsCursorVisible = Buffer->CursorInfo.bVisible; - TextModeInfo.CursorSize = Buffer->CursorInfo.dwSize; - } - } - else if (CreateScreenBufferRequest->ScreenBufferType == CONSOLE_GRAPHICS_BUFFER) - { - /* Get infos from the graphics buffer information structure */ - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&CreateScreenBufferRequest->GraphicsBufferInfo.lpBitMapInfo, - 1, - CreateScreenBufferRequest->GraphicsBufferInfo.dwBitMapInfoLength)) - { - Status = STATUS_INVALID_PARAMETER; - goto Quit; - } - - ScreenBufferInfo = &GraphicsInfo; - - /* Initialize shared variables */ - CreateScreenBufferRequest->GraphicsBufferInfo.hMutex = GraphicsInfo.Info.hMutex = INVALID_HANDLE_VALUE; - CreateScreenBufferRequest->GraphicsBufferInfo.lpBitMap = GraphicsInfo.Info.lpBitMap = NULL; - - /* A graphics screen buffer is never inheritable */ - CreateScreenBufferRequest->Inheritable = FALSE; - } - - Status = ConSrvCreateScreenBuffer(&Buff, - Console, - CreateScreenBufferRequest->ScreenBufferType, - ScreenBufferInfo); - if (!NT_SUCCESS(Status)) goto Quit; - - /* Insert the new handle inside the process handles table */ - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - - Status = ConSrvInsertObject(ProcessData, - &CreateScreenBufferRequest->OutputHandle, - &Buff->Header, - CreateScreenBufferRequest->Access, - CreateScreenBufferRequest->Inheritable, - CreateScreenBufferRequest->ShareMode); - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - - if (!NT_SUCCESS(Status)) goto Quit; - - if (CreateScreenBufferRequest->ScreenBufferType == CONSOLE_GRAPHICS_BUFFER) - { - PGRAPHICS_SCREEN_BUFFER Buffer = (PGRAPHICS_SCREEN_BUFFER)Buff; - /* - * Initialize the graphics buffer information structure - * and give it back to the client. - */ - CreateScreenBufferRequest->GraphicsBufferInfo.hMutex = Buffer->ClientMutex; - CreateScreenBufferRequest->GraphicsBufferInfo.lpBitMap = Buffer->ClientBitMap; - } - -Quit: - ConSrvReleaseConsole(Console, TRUE); - return Status; -} - -CSR_API(SrvSetConsoleActiveScreenBuffer) -{ - NTSTATUS Status; - PCONSOLE_SETACTIVESCREENBUFFER SetScreenBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetScreenBufferRequest; - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; - - DPRINT("SrvSetConsoleActiveScreenBuffer\n"); - - Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - - if (Buff == Console->ActiveBuffer) goto Quit; - - /* If old buffer has no handles, it's now unreferenced */ - if (Console->ActiveBuffer->Header.HandleCount == 0) - { - ConioDeleteScreenBuffer(Console->ActiveBuffer); - } - - /* Tie console to new buffer */ - ConioSetActiveScreenBuffer(Buff); - -Quit: - ConSrvReleaseScreenBuffer(Buff, TRUE); + + if (Console == NULL || Buffer == NULL || Position == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); + + if ( Position->X < 0 || Position->X >= Buffer->ScreenBufferSize.X || + Position->Y < 0 || Position->Y >= Buffer->ScreenBufferSize.Y ) + { + return STATUS_INVALID_PARAMETER; + } + + OldCursorX = Buffer->CursorPosition.X; + OldCursorY = Buffer->CursorPosition.Y; + Buffer->CursorPosition = *Position; + // Buffer->CursorPosition.X = Position->X; + // Buffer->CursorPosition.Y = Position->Y; + if ( ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) && + (!ConioSetScreenInfo(Console, (PCONSOLE_SCREEN_BUFFER)Buffer, OldCursorX, OldCursorY)) ) + { + return STATUS_UNSUCCESSFUL; + } + return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… ============================================================================== --- trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] Sun Jun 23 12:13:21 2013 @@ -22,256 +22,106 @@ /* PRIVATE FUNCTIONS **********************************************************/ -NTSTATUS -TEXTMODE_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, - IN PTEXTMODE_BUFFER_INFO TextModeInfo); -NTSTATUS -GRAPHICS_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, - IN PGRAPHICS_BUFFER_INFO GraphicsInfo); - -VOID -TEXTMODE_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer); -VOID -GRAPHICS_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer); - - -NTSTATUS -CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, - IN SIZE_T Size) -{ - if (Buffer == NULL || Console == NULL) - return STATUS_INVALID_PARAMETER; - - *Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, max(sizeof(CONSOLE_SCREEN_BUFFER), Size)); - if (*Buffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; - - /* Initialize the header with the default type */ - ConSrvInitObject(&(*Buffer)->Header, SCREEN_BUFFER, Console); - (*Buffer)->Vtbl = NULL; - return STATUS_SUCCESS; -} - -VOID -CONSOLE_SCREEN_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer) -{ - if (Buffer->Header.Type == TEXTMODE_BUFFER) - TEXTMODE_BUFFER_Destroy(Buffer); - else if (Buffer->Header.Type == GRAPHICS_BUFFER) - GRAPHICS_BUFFER_Destroy(Buffer); - else if (Buffer->Header.Type == SCREEN_BUFFER) - ConsoleFreeHeap(Buffer); - // else - // do_nothing; -} - -NTSTATUS FASTCALL -ConSrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, - IN ULONG BufferType, - IN PVOID ScreenBufferInfo) -{ - NTSTATUS Status = STATUS_SUCCESS; - - if ( Console == NULL || Buffer == NULL || - (BufferType != CONSOLE_TEXTMODE_BUFFER && BufferType != CONSOLE_GRAPHICS_BUFFER) ) - { - return STATUS_INVALID_PARAMETER; - } - - if (BufferType == CONSOLE_TEXTMODE_BUFFER) - { - Status = TEXTMODE_BUFFER_Initialize(Buffer, - Console, - (PTEXTMODE_BUFFER_INFO)ScreenBufferInfo); - } - else if (BufferType == CONSOLE_GRAPHICS_BUFFER) - { - Status = GRAPHICS_BUFFER_Initialize(Buffer, - Console, - (PGRAPHICS_BUFFER_INFO)ScreenBufferInfo); - } - else - { - /* Never ever go there!! */ - ASSERT(FALSE); - } - - /* Insert the newly created screen buffer into the list, if succeeded */ - if (NT_SUCCESS(Status)) InsertHeadList(&Console->BufferList, &(*Buffer)->ListEntry); - - return Status; -} - -VOID WINAPI -ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) -{ - PCONSOLE Console = Buffer->Header.Console; - PCONSOLE_SCREEN_BUFFER NewBuffer; - - RemoveEntryList(&Buffer->ListEntry); - if (Buffer == Console->ActiveBuffer) - { - /* Delete active buffer; switch to most recently created */ - Console->ActiveBuffer = NULL; - if (!IsListEmpty(&Console->BufferList)) - { - NewBuffer = CONTAINING_RECORD(Console->BufferList.Flink, - CONSOLE_SCREEN_BUFFER, - ListEntry); - ConioSetActiveScreenBuffer(NewBuffer); - } - } - - CONSOLE_SCREEN_BUFFER_Destroy(Buffer); -} - -VOID FASTCALL -ConioDrawConsole(PCONSOLE Console) -{ - SMALL_RECT Region; - PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer; - - if (ActiveBuffer) - { - ConioInitRect(&Region, 0, 0, ActiveBuffer->ViewSize.Y - 1, ActiveBuffer->ViewSize.X - 1); - ConioDrawRegion(Console, &Region); - } -} - -VOID FASTCALL -ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) -{ - PCONSOLE Console = Buffer->Header.Console; - Console->ActiveBuffer = Buffer; - ConioResizeTerminal(Console); - // ConioDrawConsole(Console); -} - -PCONSOLE_SCREEN_BUFFER -ConDrvGetActiveScreenBuffer(IN PCONSOLE Console) -{ - return (Console ? Console->ActiveBuffer : NULL); -} /* PUBLIC SERVER APIS *********************************************************/ +NTSTATUS NTAPI +ConDrvInvalidateBitMapRect(IN PCONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER Buffer, + IN PSMALL_RECT Region); CSR_API(SrvInvalidateBitMapRect) { NTSTATUS Status; PCONSOLE_INVALIDATEDIBITS InvalidateDIBitsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.InvalidateDIBitsRequest; - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; + PCONSOLE_SCREEN_BUFFER Buffer; DPRINT("SrvInvalidateBitMapRect\n"); - Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), InvalidateDIBitsRequest->OutputHandle, &Buff, GENERIC_READ, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - - /* If the output buffer is the current one, redraw the correct portion of the screen */ - if (Buff == Console->ActiveBuffer) - ConioDrawRegion(Console, &InvalidateDIBitsRequest->Region); - - ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; -} - + Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + InvalidateDIBitsRequest->OutputHandle, + &Buffer, GENERIC_READ, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Status = ConDrvInvalidateBitMapRect(Buffer->Header.Console, + Buffer, + &InvalidateDIBitsRequest->Region); + + ConSrvReleaseScreenBuffer(Buffer, TRUE); + return Status; +} + +NTSTATUS NTAPI +ConDrvGetConsoleCursorInfo(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + OUT PCONSOLE_CURSOR_INFO CursorInfo); CSR_API(SrvGetConsoleCursorInfo) { NTSTATUS Status; PCONSOLE_GETSETCURSORINFO CursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CursorInfoRequest; - PCONSOLE_SCREEN_BUFFER Buff; + PTEXTMODE_SCREEN_BUFFER Buffer; DPRINT("SrvGetConsoleCursorInfo\n"); - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->OutputHandle, &Buff, GENERIC_READ, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - CursorInfoRequest->Info.bVisible = Buff->CursorInfo.bVisible; - CursorInfoRequest->Info.dwSize = Buff->CursorInfo.dwSize; - - ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; -} - + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + CursorInfoRequest->OutputHandle, + &Buffer, GENERIC_READ, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Status = ConDrvGetConsoleCursorInfo(Buffer->Header.Console, + Buffer, + &CursorInfoRequest->Info); + + ConSrvReleaseScreenBuffer(Buffer, TRUE); + return Status; +} + +NTSTATUS NTAPI +ConDrvSetConsoleCursorInfo(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCONSOLE_CURSOR_INFO CursorInfo); CSR_API(SrvSetConsoleCursorInfo) { NTSTATUS Status; PCONSOLE_GETSETCURSORINFO CursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CursorInfoRequest; - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; - DWORD Size; - BOOL Visible, Success = TRUE; + PTEXTMODE_SCREEN_BUFFER Buffer; DPRINT("SrvSetConsoleCursorInfo\n"); - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - - Size = CursorInfoRequest->Info.dwSize; - Visible = CursorInfoRequest->Info.bVisible; - if (Size < 1) Size = 1; - if (100 < Size) Size = 100; - - if ( (Size != Buff->CursorInfo.dwSize) || - (Visible && !Buff->CursorInfo.bVisible) || - (!Visible && Buff->CursorInfo.bVisible) ) - { - Buff->CursorInfo.dwSize = Size; - Buff->CursorInfo.bVisible = Visible; - - Success = ConioSetCursorInfo(Console, Buff); - } - - ConSrvReleaseScreenBuffer(Buff, TRUE); - return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); -} - + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + CursorInfoRequest->OutputHandle, + &Buffer, GENERIC_WRITE, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Status = ConDrvSetConsoleCursorInfo(Buffer->Header.Console, + Buffer, + &CursorInfoRequest->Info); + + ConSrvReleaseScreenBuffer(Buffer, TRUE); + return Status; +} + +NTSTATUS NTAPI +ConDrvSetConsoleCursorPosition(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCOORD Position); CSR_API(SrvSetConsoleCursorPosition) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PCONSOLE_SETCURSORPOSITION SetCursorPositionRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetCursorPositionRequest; - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; - SHORT OldCursorX, OldCursorY; - SHORT NewCursorX, NewCursorY; + PTEXTMODE_SCREEN_BUFFER Buffer; DPRINT("SrvSetConsoleCursorPosition\n"); - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetCursorPositionRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - - NewCursorX = SetCursorPositionRequest->Position.X; - NewCursorY = SetCursorPositionRequest->Position.Y; - if ( NewCursorX < 0 || NewCursorX >= Buff->ScreenBufferSize.X || - NewCursorY < 0 || NewCursorY >= Buff->ScreenBufferSize.Y ) - { - Status = STATUS_INVALID_PARAMETER; - goto Quit; - } - OldCursorX = Buff->CursorPosition.X; - OldCursorY = Buff->CursorPosition.Y; - Buff->CursorPosition.X = NewCursorX; - Buff->CursorPosition.Y = NewCursorY; - if (Buff == Console->ActiveBuffer) - { - if (!ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY)) - { - Status = STATUS_UNSUCCESSFUL; - goto Quit; - } - } - -Quit: - ConSrvReleaseScreenBuffer(Buff, TRUE); + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + SetCursorPositionRequest->OutputHandle, + &Buffer, GENERIC_WRITE, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Status = ConDrvSetConsoleCursorPosition(Buffer->Header.Console, + Buffer, + &SetCursorPositionRequest->Position); + + ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status; } @@ -359,7 +209,7 @@ CreateScreenBufferRequest->Inheritable = FALSE; } - Status = ConSrvCreateScreenBuffer(&Buff, + Status = ConDrvCreateScreenBuffer(&Buff, Console, CreateScreenBufferRequest->ScreenBufferType, ScreenBufferInfo); @@ -395,34 +245,31 @@ return Status; } +NTSTATUS NTAPI +ConDrvSetConsoleActiveScreenBuffer(IN PCONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER Buffer); CSR_API(SrvSetConsoleActiveScreenBuffer) { NTSTATUS Status; PCONSOLE_SETACTIVESCREENBUFFER SetScreenBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetScreenBufferRequest; - PCONSOLE Console; - PCONSOLE_SCREEN_BUFFER Buff; + PCONSOLE_SCREEN_BUFFER Buffer; DPRINT("SrvSetConsoleActiveScreenBuffer\n"); - Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - - if (Buff == Console->ActiveBuffer) goto Quit; - - /* If old buffer has no handles, it's now unreferenced */ - if (Console->ActiveBuffer->Header.HandleCount == 0) - { - ConioDeleteScreenBuffer(Console->ActiveBuffer); - } - - /* Tie console to new buffer */ - ConioSetActiveScreenBuffer(Buff); - -Quit: - ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; -} + Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + SetScreenBufferRequest->OutputHandle, + &Buffer, GENERIC_WRITE, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Status = ConDrvSetConsoleActiveScreenBuffer(Buffer->Header.Console, + Buffer); + + ConSrvReleaseScreenBuffer(Buffer, TRUE); + return Status; +} + + +/* TEXT OUTPUT APIS ***********************************************************/ + /* EOF */ Modified: trunk/reactos/win32ss/user/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… ============================================================================== --- trunk/reactos/win32ss/user/consrv/conoutput.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/conoutput.h [iso-8859-1] Sun Jun 23 12:13:21 2013 @@ -33,12 +33,12 @@ #define ConSrvReleaseScreenBuffer(Buff, IsConsoleLocked) \ ConSrvReleaseObject(&(Buff)->Header, (IsConsoleLocked)) -NTSTATUS FASTCALL ConSrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, +NTSTATUS FASTCALL ConDrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, IN OUT PCONSOLE Console, IN ULONG BufferType, IN PVOID ScreenBufferInfo); VOID WINAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); -VOID FASTCALL ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); +// VOID FASTCALL ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); PCONSOLE_SCREEN_BUFFER ConDrvGetActiveScreenBuffer(IN PCONSOLE Console);

11 years, 2 months

[ekohl] 59307: [SAMSRV] Implement SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 23 11:20:32 2013 New Revision: 59307 URL: http://svn.reactos.org/svn/reactos?rev=59307&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun Jun 23 11:20:32 2013 @@ -219,6 +219,20 @@ VOID NTAPI +SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR(PSAMPR_SR_SECURITY_DESCRIPTOR Ptr) +{ + if (Ptr != NULL) + { + if (Ptr->SecurityDescriptor != NULL) + MIDL_user_free(Ptr->SecurityDescriptor); + + MIDL_user_free(Ptr); + } +} + + +VOID +NTAPI SamIFree_SAMPR_ULONG_ARRAY(PSAMPR_ULONG_ARRAY Ptr) { if (Ptr != NULL) Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sun Jun 23 11:20:32 2013 @@ -26,7 +26,7 @@ @ stub SamIFree_SAMPR_GROUP_INFO_BUFFER @ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr) @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr) -@ stub SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR +@ stdcall SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR(ptr) @ stdcall SamIFree_SAMPR_ULONG_ARRAY(ptr) @ stdcall SamIFree_SAMPR_USER_INFO_BUFFER(ptr long) @ stub SamIFree_UserInternal6Information

11 years, 2 months

[hbelusca] 59306: [CONSRV] Hey Arch, how do you define functions types?! Fix MSVC builds.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 23 10:55:18 2013 New Revision: 59306 URL: http://svn.reactos.org/svn/reactos?rev=59306&view=rev Log: [CONSRV] Hey Arch, how do you define functions types?! Fix MSVC builds. Modified: trunk/reactos/win32ss/user/consrv/console.c Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… ============================================================================== --- trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] Sun Jun 23 10:55:18 2013 @@ -57,15 +57,13 @@ /***************/ typedef -NTSTATUS NTAPI -(*FRONTEND_LOAD)(IN OUT PFRONTEND FrontEnd, - IN OUT PCONSOLE_INFO ConsoleInfo, - IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId); +NTSTATUS (NTAPI *FRONTEND_LOAD)(IN OUT PFRONTEND FrontEnd, + IN OUT PCONSOLE_INFO ConsoleInfo, + IN OUT PVOID ExtraConsoleInfo, + IN ULONG ProcessId); typedef -NTSTATUS NTAPI -(*FRONTEND_UNLOAD)(IN OUT PFRONTEND FrontEnd); +NTSTATUS (NTAPI *FRONTEND_UNLOAD)(IN OUT PFRONTEND FrontEnd); /* * If we are not in GUI-mode, start the text-mode terminal emulator.

11 years, 2 months

[aandrejevic] 59305: [NTOSKRNL] Fix NtQueryTimerResolution and NtSetTimerResolution to work in kernel mode.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Jun 23 08:44:46 2013 New Revision: 59305 URL: http://svn.reactos.org/svn/reactos?rev=59305&view=rev Log: [NTOSKRNL] Fix NtQueryTimerResolution and NtSetTimerResolution to work in kernel mode. Modified: branches/ntvdm/ntoskrnl/ke/clock.c Modified: branches/ntvdm/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ke/clock.c?rev=5… ============================================================================== --- branches/ntvdm/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ branches/ntvdm/ntoskrnl/ke/clock.c [iso-8859-1] Sun Jun 23 08:44:46 2013 @@ -242,23 +242,37 @@ OUT PULONG MaximumResolution, OUT PULONG ActualResolution) { - _SEH2_TRY - { - /* Probe the parameters */ - ProbeForWriteUlong(MinimumResolution); - ProbeForWriteUlong(MaximumResolution); - ProbeForWriteUlong(ActualResolution); - - /* Set the parameters to the actual values */ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + + /* Check if the call came from user mode */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + /* Probe the parameters */ + ProbeForWriteUlong(MinimumResolution); + ProbeForWriteUlong(MaximumResolution); + ProbeForWriteUlong(ActualResolution); + + /* Try to set the parameters to the actual values */ + *MinimumResolution = KeMinimumIncrement; + *MaximumResolution = KeMaximumIncrement; + *ActualResolution = KeTimeIncrement; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + /* The call came from kernel mode. Use the pointers directly */ *MinimumResolution = KeMinimumIncrement; *MaximumResolution = KeMaximumIncrement; *ActualResolution = KeTimeIncrement; } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; /* Return success */ return STATUS_SUCCESS; @@ -271,21 +285,32 @@ OUT PULONG CurrentResolution) { ULONG NewResolution; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); /* Call the internal API */ NewResolution = ExSetTimerResolution(DesiredResolution, SetResolution); - /* Return the resolution to the caller */ - _SEH2_TRY - { - ProbeForWriteUlong(CurrentResolution); + /* Check if the call came from user mode */ + if (PreviousMode != KernelMode) + { + /* Try to write the value */ + _SEH2_TRY + { + ProbeForWriteUlong(CurrentResolution); + *CurrentResolution = NewResolution; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + /* The call came from kernel mode. Use the pointer directly */ *CurrentResolution = NewResolution; } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; /* Return success if we set the resolution */ if (SetResolution) return STATUS_SUCCESS;

11 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013