Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57757: Synchronize up to trunk's revision r57756.
by hbelusca＠svn.reactos.org 24 Nov '12

24 Nov '12

Author: hbelusca Date: Sat Nov 24 13:02:15 2012 New Revision: 57757 URL: http://svn.reactos.org/svn/reactos?rev=57757&view=rev Log: Synchronize up to trunk's revision r57756. Added: branches/ros-csrss/dll/win32/lsasrv/security.c - copied unchanged from r57756, trunk/reactos/dll/win32/lsasrv/security.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/cmdutils/doskey/doskey.c branches/ros-csrss/base/services/umpnpmgr/umpnpmgr.c branches/ros-csrss/base/system/diskpart/diskpart.c branches/ros-csrss/base/system/services/driver.c branches/ros-csrss/base/system/services/services.c branches/ros-csrss/base/system/userinit/userinit.c branches/ros-csrss/boot/freeldr/freeldr/windows/winldr.c branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt branches/ros-csrss/dll/win32/lsasrv/database.c branches/ros-csrss/dll/win32/lsasrv/lsarpc.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.h branches/ros-csrss/dll/win32/lsasrv/policy.c branches/ros-csrss/dll/win32/msgina/lang/bg-BG.rc branches/ros-csrss/dll/win32/msgina/lang/cs-CZ.rc branches/ros-csrss/dll/win32/msgina/lang/de-DE.rc branches/ros-csrss/dll/win32/msgina/lang/en-US.rc branches/ros-csrss/dll/win32/msgina/lang/es-ES.rc branches/ros-csrss/dll/win32/msgina/lang/fr-FR.rc branches/ros-csrss/dll/win32/msgina/lang/id-ID.rc branches/ros-csrss/dll/win32/msgina/lang/it-IT.rc branches/ros-csrss/dll/win32/msgina/lang/ja-JP.rc branches/ros-csrss/dll/win32/msgina/lang/no-NO.rc branches/ros-csrss/dll/win32/msgina/lang/pl-PL.rc branches/ros-csrss/dll/win32/msgina/lang/ro-RO.rc branches/ros-csrss/dll/win32/msgina/lang/ru-RU.rc branches/ros-csrss/dll/win32/msgina/lang/sk-SK.rc branches/ros-csrss/dll/win32/msgina/lang/uk-UA.rc branches/ros-csrss/dll/win32/msgina/msgina.c branches/ros-csrss/dll/win32/msgina/resources/reactos.bmp branches/ros-csrss/dll/win32/netapi32/local_group.c branches/ros-csrss/dll/win32/syssetup/install.c branches/ros-csrss/include/psdk/ntlsa.h branches/ros-csrss/include/psdk/winerror.h branches/ros-csrss/lib/sdk/crt/stdio/file.c branches/ros-csrss/media/vgafonts/CMakeLists.txt branches/ros-csrss/ntoskrnl/config/cmsysini.c branches/ros-csrss/win32ss/gdi/eng/mouse.c branches/ros-csrss/win32ss/gdi/eng/mouse.h branches/ros-csrss/win32ss/gdi/eng/pdevobj.h branches/ros-csrss/win32ss/gdi/ntgdi/dc.h branches/ros-csrss/win32ss/gdi/ntgdi/dcutil.c branches/ros-csrss/win32ss/gdi/ntgdi/dib.h branches/ros-csrss/win32ss/gdi/ntgdi/dibobj.c branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/ntuser/clipboard.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.h branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c branches/ros-csrss/win32ss/user/ntuser/display.c branches/ros-csrss/win32ss/user/ntuser/keyboard.c branches/ros-csrss/win32ss/user/ntuser/message.c branches/ros-csrss/win32ss/user/ntuser/misc/file.c branches/ros-csrss/win32ss/user/ntuser/msgqueue.c branches/ros-csrss/win32ss/user/ntuser/msgqueue.h branches/ros-csrss/win32ss/user/ntuser/timer.c branches/ros-csrss/win32ss/user/ntuser/windc.c branches/ros-csrss/win32ss/user/user32/misc/misc.c branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c branches/ros-csrss/win32ss/w32ksvc.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cmd… Modified: branches/ros-csrss/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/services/umpnpmg… Modified: branches/ros-csrss/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/diskpart/… Modified: branches/ros-csrss/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/userinit/… Modified: branches/ros-csrss/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/CMak… Modified: branches/ros-csrss/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/data… Modified: branches/ros-csrss/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsar… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/poli… Modified: branches/ros-csrss/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/msgi… Modified: branches/ros-csrss/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/reso… Modified: branches/ros-csrss/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netapi32/lo… Modified: branches/ros-csrss/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/syssetup/in… Modified: branches/ros-csrss/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/ntlsa.h?… Modified: branches/ros-csrss/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winerror… Modified: branches/ros-csrss/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/stdio/fil… Modified: branches/ros-csrss/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/vgafonts/CMakeL… Modified: branches/ros-csrss/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/config/cmsys… Modified: branches/ros-csrss/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/mouse… Modified: branches/ros-csrss/win32ss/gdi/eng/mouse.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/mouse… Modified: branches/ros-csrss/win32ss/gdi/eng/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/pdevo… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dc.… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dcu… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dib… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dib… Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… Modified: branches/ros-csrss/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/k… Modified: branches/ros-csrss/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/t… Modified: branches/ros-csrss/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… Modified: branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w… Modified: branches/ros-csrss/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/w32ksvc.h?rev…

1 0

[hbelusca] 57756: [WIN32CSR] Correct the initialization of text-mode console.
by hbelusca＠svn.reactos.org 24 Nov '12

24 Nov '12

Author: hbelusca Date: Sat Nov 24 12:40:56 2012 New Revision: 57756 URL: http://svn.reactos.org/svn/reactos?rev=57756&view=rev Log: [WIN32CSR] Correct the initialization of text-mode console. Modified: trunk/reactos/win32ss/user/win32csr/console.c Modified: trunk/reactos/win32ss/user/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/cons… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/console.c [iso-8859-1] Sat Nov 24 12:40:56 2012 @@ -82,11 +82,11 @@ hInst = GetModuleHandleW(L"win32csr"); if (LoadStringW(hInst,IDS_COMMAND_PROMPT,Title,sizeof(Title)/sizeof(Title[0]))) { - RtlCreateUnicodeString(&Console->Title, Title); + RtlCreateUnicodeString(&Console->Title, Title); } else { - RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); + RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); } Console->ReferenceCount = 0; @@ -131,31 +131,47 @@ /* make console active, and insert into console list */ Console->ActiveBuffer = (PCSRSS_SCREEN_BUFFER) NewBuffer; - if (! GuiMode) - { + /* + * If we are not in GUI-mode, start the text-mode console. If we fail, + * try to start the GUI-mode console (win32k will automatically switch + * to graphical mode, therefore no additional code is needed). + */ + if (!GuiMode) + { + DPRINT1("WIN32CSR: Opening text-mode console\n"); Status = TuiInitConsole(Console); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to open text-mode console, switching to gui-mode\n"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open text-mode console, switching to gui-mode, Status = 0x%08lx\n", Status); GuiMode = TRUE; } } - else /* GuiMode */ - { + + /* + * Try to open the GUI-mode console. Two cases are possible: + * - We are in GUI-mode, therefore GuiMode == TRUE, the previous test-case + * failed and we start GUI-mode console. + * - We are in text-mode, therefore GuiMode == FALSE, the previous test-case + * succeeded BUT we failed at starting text-mode console. Then GuiMode + * was switched to TRUE in order to try to open the console in GUI-mode. + */ + if (GuiMode) + { + DPRINT1("WIN32CSR: Opening GUI-mode console\n"); Status = GuiInitConsole(Console, ShowCmd); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { HeapFree(Win32CsrApiHeap,0, NewBuffer); RtlFreeUnicodeString(&Console->Title); DeleteCriticalSection(&Console->Lock); CloseHandle(Console->ActiveEvent); - DPRINT1("GuiInitConsole: failed\n"); + DPRINT1("GuiInitConsole: failed, Status = 0x%08lx\n", Status); return Status; } } Status = CsrInitConsoleScreenBuffer(Console, NewBuffer); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ConioCleanupConsole(Console); RtlFreeUnicodeString(&Console->Title);

1 0

[spetreolle] 57755: Install the vga fonts needed for the Blue driver.
by spetreolle＠svn.reactos.org 24 Nov '12

24 Nov '12

Author: spetreolle Date: Sat Nov 24 01:23:13 2012 New Revision: 57755 URL: http://svn.reactos.org/svn/reactos?rev=57755&view=rev Log: Install the vga fonts needed for the Blue driver. Modified: trunk/reactos/media/vgafonts/CMakeLists.txt Modified: trunk/reactos/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/CMakeLists.… ============================================================================== --- trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] Sat Nov 24 01:23:13 2012 @@ -16,4 +16,5 @@ add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) -add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos NO_CAB FOR all) +add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos NO_CAB FOR all) +add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos FOR all)

1 0

[hbelusca] 57754: [SERVICES] - (Re-)implement acquiring/releasing driver-loading and unloading privilege (Note: the two privileges have the same name SE_LOAD_DRIVER_NAME). - Rework the SCM initiali...
by hbelusca＠svn.reactos.org 24 Nov '12

24 Nov '12

Author: hbelusca Date: Sat Nov 24 00:53:01 2012 New Revision: 57754 URL: http://svn.reactos.org/svn/reactos?rev=57754&view=rev Log: [SERVICES] - (Re-)implement acquiring/releasing driver-loading and unloading privilege (Note: the two privileges have the same name SE_LOAD_DRIVER_NAME). - Rework the SCM initialization code. In particular, acquiring the starting lock MUST BE done BEFORE starting the RPC server, otherwise, a program can try to start a service (and during this operation, the global start lock is acquired by the SCM) DURING the initialization of SCM, and in particular between the call to ScmStartRpcServer and ScmAcquireServiceStartLock. The SCM would then see an already-acquired start lock at this point and would fail to initialize. ==> This commit corrects this behaviour. Modified: trunk/reactos/base/system/services/driver.c trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/drive… ============================================================================== --- trunk/reactos/base/system/services/driver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/driver.c [iso-8859-1] Sat Nov 24 00:53:01 2012 @@ -16,6 +16,50 @@ /* FUNCTIONS ****************************************************************/ +static DWORD EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) +{ + DWORD dwRet = ERROR_SUCCESS; + HANDLE hToken = NULL; + + if (OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken)) + { + TOKEN_PRIVILEGES tp; + + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); + + if (LookupPrivilegeValueW(NULL, + lpszPrivilegeName, + &tp.Privileges[0].Luid)) + { + if (AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL)) + { + if (GetLastError() == ERROR_NOT_ALL_ASSIGNED) + dwRet = ERROR_NOT_ALL_ASSIGNED; + } + else + { + dwRet = GetLastError(); + } + } + else + { + dwRet = GetLastError(); + } + + CloseHandle(hToken); + } + else + { + dwRet = GetLastError(); + } + + return dwRet; +} + + DWORD ScmLoadDriver(PSERVICE lpService) { @@ -40,18 +84,28 @@ RtlInitUnicodeString(&DriverPath, pszDriverPath); - /* FIXME: Acquire privilege */ - DPRINT(" Path: %wZ\n", &DriverPath); + + /* Acquire driver-loading privilege */ + dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); + if (dwError != ERROR_SUCCESS) + { + /* We encountered a failure, exit properly */ + DPRINT1("SERVICES: Cannot acquire driver-loading privilege, error = %lu\n", dwError); + goto done; + } + Status = NtLoadDriver(&DriverPath); - /* FIXME: Release privilege */ + /* Release driver-loading privilege */ + EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); if (!NT_SUCCESS(Status)) { dwError = RtlNtStatusToDosError(Status); } +done: HeapFree(GetProcessHeap(), 0, pszDriverPath); return dwError; @@ -82,17 +136,26 @@ RtlInitUnicodeString(&DriverPath, pszDriverPath); - /* FIXME: Acquire privilege */ + /* Acquire driver-unloading privilege */ + dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); + if (dwError != ERROR_SUCCESS) + { + /* We encountered a failure, exit properly */ + DPRINT1("SERVICES: Cannot acquire driver-unloading privilege, error = %lu\n", dwError); + goto done; + } Status = NtUnloadDriver(&DriverPath); - /* FIXME: Release privilege */ + /* Release driver-unloading privilege */ + EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); if (!NT_SUCCESS(Status)) { dwError = RtlNtStatusToDosError(Status); } +done: HeapFree(GetProcessHeap(), 0, pszDriverPath); return dwError; Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Sat Nov 24 00:53:01 2012 @@ -327,28 +327,6 @@ } -VOID FASTCALL -AcquireLoadDriverPrivilege(VOID) -{ - HANDLE hToken; - TOKEN_PRIVILEGES tkp; - - /* Get a token for this process */ - if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) - { - /* Get the LUID for the debug privilege */ - LookupPrivilegeValue(NULL, SE_LOAD_DRIVER_NAME, &tkp.Privileges[0].Luid); - - /* One privilege to set */ - tkp.PrivilegeCount = 1; - tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - - /* Get the debug privilege for this process */ - AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0); - } -} - - BOOL WINAPI ShutdownHandlerRoutine(DWORD dwCtrlType) { @@ -378,7 +356,7 @@ { HANDLE hScmStartEvent = NULL; SC_RPC_LOCK Lock = NULL; - BOOL bDeleteCriticalSection = FALSE; + BOOL bCanDeleteNamedPipeCriticalSection = FALSE; DWORD dwError; DPRINT("SERVICES: Service Control Manager\n"); @@ -400,6 +378,10 @@ goto done; } + /* Initialize our communication named pipe's critical section */ + ScmInitNamedPipeCriticalSection(); + bCanDeleteNamedPipeCriticalSection = TRUE; + // ScmInitThreadManager(); /* FIXME: more initialization */ @@ -422,28 +404,8 @@ /* Update service database */ ScmGetBootAndSystemDriverState(); - /* Start the RPC server */ - ScmStartRpcServer(); - /* Register service process with CSRSS */ RegisterServicesProcess(GetCurrentProcessId()); - - DPRINT("SERVICES: Initialized.\n"); - - /* Signal start event */ - SetEvent(hScmStartEvent); - - /* Register event handler (used for system shutdown) */ - SetConsoleCtrlHandler(ShutdownHandlerRoutine, TRUE); - - /* Wait for the LSA server */ - ScmWaitForLsa(); - - /* Acquire privileges to load drivers */ - AcquireLoadDriverPrivilege(); - - ScmInitNamedPipeCriticalSection(); - bDeleteCriticalSection = TRUE; /* Acquire the service start lock until autostart services have been started */ dwError = ScmAcquireServiceStartLock(TRUE, &Lock); @@ -453,6 +415,20 @@ goto done; } + /* Start the RPC server */ + ScmStartRpcServer(); + + DPRINT("SERVICES: Initialized.\n"); + + /* Signal start event */ + SetEvent(hScmStartEvent); + + /* Register event handler (used for system shutdown) */ + SetConsoleCtrlHandler(ShutdownHandlerRoutine, TRUE); + + /* Wait for the LSA server */ + ScmWaitForLsa(); + /* Start auto-start services */ ScmAutoStartServices(); @@ -467,7 +443,8 @@ WaitForSingleObject(hScmShutdownEvent, INFINITE); done: - if (bDeleteCriticalSection == TRUE) + /* Delete our communication named pipe's critical section */ + if (bCanDeleteNamedPipeCriticalSection == TRUE) ScmDeleteNamedPipeCriticalSection(); /* Close the shutdown event */

1 0

[ekohl] 57753: [LSASRV] - LsarSetInformationPolicy: Add stubs for all missing case. - Implement LsarSetAuditLog and LsarSetDefaultQuota.
by ekohl＠svn.reactos.org 24 Nov '12

24 Nov '12

Author: ekohl Date: Sat Nov 24 00:13:10 2012 New Revision: 57753 URL: http://svn.reactos.org/svn/reactos?rev=57753&view=rev Log: [LSASRV] - LsarSetInformationPolicy: Add stubs for all missing case. - Implement LsarSetAuditLog and LsarSetDefaultQuota. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Nov 24 00:13:10 2012 @@ -278,7 +278,7 @@ POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION *PolicyInformation) { - PLSA_DB_OBJECT DbObject; + PLSA_DB_OBJECT PolicyObject; ACCESS_MASK DesiredAccess = 0; NTSTATUS Status; @@ -322,74 +322,74 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, DesiredAccess, - &DbObject); + &PolicyObject); if (!NT_SUCCESS(Status)) return Status; switch (InformationClass) { case PolicyAuditLogInformation: /* 1 */ - Status = LsarQueryAuditLog(PolicyHandle, + Status = LsarQueryAuditLog(PolicyObject, PolicyInformation); break; case PolicyAuditEventsInformation: /* 2 */ - Status = LsarQueryAuditEvents(PolicyHandle, + Status = LsarQueryAuditEvents(PolicyObject, PolicyInformation); break; case PolicyPrimaryDomainInformation: /* 3 */ - Status = LsarQueryPrimaryDomain(PolicyHandle, + Status = LsarQueryPrimaryDomain(PolicyObject, PolicyInformation); break; case PolicyPdAccountInformation: /* 4 */ - Status = LsarQueryPdAccount(PolicyHandle, + Status = LsarQueryPdAccount(PolicyObject, PolicyInformation); break; case PolicyAccountDomainInformation: /* 5 */ - Status = LsarQueryAccountDomain(PolicyHandle, + Status = LsarQueryAccountDomain(PolicyObject, PolicyInformation); break; case PolicyLsaServerRoleInformation: /* 6 */ - Status = LsarQueryServerRole(PolicyHandle, + Status = LsarQueryServerRole(PolicyObject, PolicyInformation); break; case PolicyReplicaSourceInformation: /* 7 */ - Status = LsarQueryReplicaSource(PolicyHandle, + Status = LsarQueryReplicaSource(PolicyObject, PolicyInformation); break; case PolicyDefaultQuotaInformation: /* 8 */ - Status = LsarQueryDefaultQuota(PolicyHandle, + Status = LsarQueryDefaultQuota(PolicyObject, PolicyInformation); break; case PolicyModificationInformation: /* 9 */ - Status = LsarQueryModification(PolicyHandle, + Status = LsarQueryModification(PolicyObject, PolicyInformation); break; case PolicyAuditFullQueryInformation: /* 11 (0xB) */ - Status = LsarQueryAuditFull(PolicyHandle, + Status = LsarQueryAuditFull(PolicyObject, PolicyInformation); break; case PolicyDnsDomainInformation: /* 12 (0xC) */ - Status = LsarQueryDnsDomain(PolicyHandle, + Status = LsarQueryDnsDomain(PolicyObject, PolicyInformation); break; case PolicyDnsDomainInformationInt: /* 13 (0xD) */ - Status = LsarQueryDnsDomainInt(PolicyHandle, + Status = LsarQueryDnsDomainInt(PolicyObject, PolicyInformation); break; case PolicyLocalAccountDomainInformation: /* 14 (0xE) */ - Status = LsarQueryLocalAccountDomain(PolicyHandle, + Status = LsarQueryLocalAccountDomain(PolicyObject, PolicyInformation); break; @@ -408,7 +408,7 @@ POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION PolicyInformation) { - PLSA_DB_OBJECT DbObject; + PLSA_DB_OBJECT PolicyObject; ACCESS_MASK DesiredAccess = 0; NTSTATUS Status; @@ -456,61 +456,70 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, DesiredAccess, - &DbObject); + &PolicyObject); if (!NT_SUCCESS(Status)) return Status; switch (InformationClass) { case PolicyAuditLogInformation: /* 1 */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetAuditLog(PolicyObject, + (PPOLICY_AUDIT_LOG_INFO)PolicyInformation); break; case PolicyAuditEventsInformation: /* 2 */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetAuditEvents(PolicyObject, + (PLSAPR_POLICY_AUDIT_EVENTS_INFO)PolicyInformation); break; case PolicyPrimaryDomainInformation: /* 3 */ - Status = LsarSetPrimaryDomain(PolicyHandle, + Status = LsarSetPrimaryDomain(PolicyObject, (PLSAPR_POLICY_PRIMARY_DOM_INFO)PolicyInformation); break; case PolicyAccountDomainInformation: /* 5 */ - Status = LsarSetAccountDomain(PolicyHandle, + Status = LsarSetAccountDomain(PolicyObject, (PLSAPR_POLICY_ACCOUNT_DOM_INFO)PolicyInformation); break; case PolicyLsaServerRoleInformation: /* 6 */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetServerRole(PolicyObject, + (PPOLICY_LSA_SERVER_ROLE_INFO)PolicyInformation); break; case PolicyReplicaSourceInformation: /* 7 */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetReplicaSource(PolicyObject, + (PPOLICY_LSA_REPLICA_SRCE_INFO)PolicyInformation); break; case PolicyDefaultQuotaInformation: /* 8 */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetDefaultQuota(PolicyObject, + (PPOLICY_DEFAULT_QUOTA_INFO)PolicyInformation); break; case PolicyModificationInformation: /* 9 */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetModification(PolicyObject, + (PPOLICY_MODIFICATION_INFO)PolicyInformation); break; case PolicyAuditFullSetInformation: /* 10 (0xA) */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetAuditFull(PolicyObject, + (PPOLICY_AUDIT_FULL_QUERY_INFO)PolicyInformation); break; case PolicyDnsDomainInformation: /* 12 (0xC) */ - Status = LsarSetDnsDomain(PolicyHandle, + Status = LsarSetDnsDomain(PolicyObject, (PLSAPR_POLICY_DNS_DOMAIN_INFO)PolicyInformation); break; case PolicyDnsDomainInformationInt: /* 13 (0xD) */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetDnsDomainInt(PolicyObject, + (PLSAPR_POLICY_DNS_DOMAIN_INFO)PolicyInformation); break; case PolicyLocalAccountDomainInformation: /* 14 (0xE) */ - Status = STATUS_NOT_IMPLEMENTED; + Status = LsarSetLocalAccountDomain(PolicyObject, + (PLSAPR_POLICY_ACCOUNT_DOM_INFO)PolicyInformation); break; default: Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Nov 24 00:13:10 2012 @@ -202,6 +202,14 @@ PLSAPR_POLICY_INFORMATION *PolicyInformation); NTSTATUS +LsarSetAuditLog(PLSA_DB_OBJECT PolicyObject, + PPOLICY_AUDIT_LOG_INFO Info); + +NTSTATUS +LsarSetAuditEvents(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_AUDIT_EVENTS_INFO Info); + +NTSTATUS LsarSetPrimaryDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_PRIMARY_DOM_INFO Info); @@ -210,8 +218,36 @@ PLSAPR_POLICY_ACCOUNT_DOM_INFO Info); NTSTATUS +LsarSetServerRole(PLSA_DB_OBJECT PolicyObject, + PPOLICY_LSA_SERVER_ROLE_INFO Info); + +NTSTATUS +LsarSetReplicaSource(PLSA_DB_OBJECT PolicyObject, + PPOLICY_LSA_REPLICA_SRCE_INFO Info); + +NTSTATUS +LsarSetDefaultQuota(PLSA_DB_OBJECT PolicyObject, + PPOLICY_DEFAULT_QUOTA_INFO Info); + +NTSTATUS +LsarSetModification(PLSA_DB_OBJECT PolicyObject, + PPOLICY_MODIFICATION_INFO Info); + +NTSTATUS +LsarSetAuditFull(PLSA_DB_OBJECT PolicyObject, + PPOLICY_AUDIT_FULL_QUERY_INFO Info); + +NTSTATUS LsarSetDnsDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_DNS_DOMAIN_INFO Info); + +NTSTATUS +LsarSetDnsDomainInt(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_DNS_DOMAIN_INFO Info); + +NTSTATUS +LsarSetLocalAccountDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_ACCOUNT_DOM_INFO Info); /* privileges.c */ NTSTATUS Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Sat Nov 24 00:13:10 2012 @@ -423,6 +423,16 @@ NTSTATUS +LsarQueryReplicaSource(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation) +{ + FIXME("\n"); + *PolicyInformation = NULL; + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS LsarQueryDefaultQuota(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation) { @@ -451,16 +461,6 @@ } return Status; -} - - -NTSTATUS -LsarQueryReplicaSource(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation) -{ - FIXME("\n"); - *PolicyInformation = NULL; - return STATUS_NOT_IMPLEMENTED; } @@ -766,6 +766,28 @@ NTSTATUS +LsarSetAuditLog(PLSA_DB_OBJECT PolicyObject, + PPOLICY_AUDIT_LOG_INFO Info) +{ + TRACE("(%p %p)\n", PolicyObject, Info); + + return LsapSetObjectAttribute(PolicyObject, + L"PolAdtLg", + Info, + sizeof(POLICY_AUDIT_LOG_INFO)); +} + + +NTSTATUS +LsarSetAuditEvents(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_AUDIT_EVENTS_INFO Info) +{ + FIXME("\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS LsarSetPrimaryDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_PRIMARY_DOM_INFO Info) { @@ -860,12 +882,78 @@ NTSTATUS +LsarSetServerRole(PLSA_DB_OBJECT PolicyObject, + PPOLICY_LSA_SERVER_ROLE_INFO Info) +{ + FIXME("\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +LsarSetReplicaSource(PLSA_DB_OBJECT PolicyObject, + PPOLICY_LSA_REPLICA_SRCE_INFO Info) +{ + FIXME("\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +LsarSetDefaultQuota(PLSA_DB_OBJECT PolicyObject, + PPOLICY_DEFAULT_QUOTA_INFO Info) +{ + TRACE("(%p %p)\n", PolicyObject, Info); + + return LsapSetObjectAttribute(PolicyObject, + L"DefQuota", + Info, + sizeof(POLICY_DEFAULT_QUOTA_INFO)); +} + + +NTSTATUS +LsarSetModification(PLSA_DB_OBJECT PolicyObject, + PPOLICY_MODIFICATION_INFO Info) +{ + FIXME("\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +LsarSetAuditFull(PLSA_DB_OBJECT PolicyObject, + PPOLICY_AUDIT_FULL_QUERY_INFO Info) +{ + FIXME("\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS LsarSetDnsDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_DNS_DOMAIN_INFO Info) { - - return STATUS_NOT_IMPLEMENTED; -} - + FIXME("\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +LsarSetDnsDomainInt(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_DNS_DOMAIN_INFO Info) +{ + FIXME("\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +LsarSetLocalAccountDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_ACCOUNT_DOM_INFO Info) +{ + FIXME("\n"); + return STATUS_NOT_IMPLEMENTED; +} /* EOF */

1 0

[hbelusca] 57752: [FREELDR] When filling LoadOptions, strip the '/' commutator symbol in front of each option. Now we fully comply with Windows when holding LoaderBlock->LoadOptions, and the conten...
by hbelusca＠svn.reactos.org 23 Nov '12

23 Nov '12

Author: hbelusca Date: Fri Nov 23 22:39:12 2012 New Revision: 57752 URL: http://svn.reactos.org/svn/reactos?rev=57752&view=rev Log: [FREELDR] When filling LoadOptions, strip the '/' commutator symbol in front of each option. Now we fully comply with Windows when holding LoaderBlock->LoadOptions, and the content of the registry value SystemStartOptions under HKLM\CurrentControlSet\Control display the options without their / symbol. [WIN32K] Now, the SystemStartOptions value doesn't contain / anymore. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/win32ss/user/ntuser/display.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Nov 23 22:39:12 2012 @@ -85,9 +85,10 @@ //CHAR SystemRoot[] = "\\WINNT\\"; //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; - CHAR HalPath[] = "\\"; - CHAR ArcBoot[256]; - CHAR MiscFiles[256]; + LPSTR LoadOptions, NewLoadOptions; + CHAR HalPath[] = "\\"; + CHAR ArcBoot[256]; + CHAR MiscFiles[256]; ULONG i; ULONG_PTR PathSeparator; PLOADER_PARAMETER_EXTENSION Extension; @@ -120,9 +121,18 @@ strncpy(LoaderBlock->NtHalPathName, HalPath, MAX_PATH); LoaderBlock->NtHalPathName = PaToVa(LoaderBlock->NtHalPathName); - /* Fill load options */ - LoaderBlock->LoadOptions = WinLdrSystemBlock->LoadOptions; + /* Fill LoadOptions and strip the '/' commutator symbol in front of each option */ + NewLoadOptions = LoadOptions = LoaderBlock->LoadOptions = WinLdrSystemBlock->LoadOptions; strncpy(LoaderBlock->LoadOptions, Options, MAX_OPTIONS_LENGTH); + + do + { + while (*LoadOptions == '/') + ++LoadOptions; + + *NewLoadOptions++ = *LoadOptions; + } while (*LoadOptions++); + LoaderBlock->LoadOptions = PaToVa(LoaderBlock->LoadOptions); /* Arc devices */ @@ -136,8 +146,8 @@ /* Allocate the ARC structure */ ArcDiskSig = HeapAllocate(FrLdrDefaultHeap, - sizeof(ARC_DISK_SIGNATURE_EX), - 'giSD'); + sizeof(ARC_DISK_SIGNATURE_EX), + 'giSD'); /* Copy the data over */ ArcDiskSig->DiskSignature.Signature = reactos_arc_disk_info[i].Signature; Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Fri Nov 23 22:39:12 2012 @@ -173,7 +173,7 @@ if (NT_SUCCESS(Status)) { /* Check if VGA mode is requested. */ - if (wcsstr(awcBuffer, L"/BASEVIDEO") != 0) + if (wcsstr(awcBuffer, L"BASEVIDEO") != 0) { ERR("VGA mode requested.\n"); gbBaseVideo = TRUE;

1 0

[hbelusca] 57751: [NTOSKRNL] SystemBootDevice should be the ARC-formatted boot device (see what Windows does).
by hbelusca＠svn.reactos.org 23 Nov '12

23 Nov '12

Author: hbelusca Date: Fri Nov 23 20:41:28 2012 New Revision: 57751 URL: http://svn.reactos.org/svn/reactos?rev=57751&view=rev Log: [NTOSKRNL] SystemBootDevice should be the ARC-formatted boot device (see what Windows does). Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Fri Nov 23 20:41:28 2012 @@ -359,9 +359,9 @@ CmpLoadOptions.Length); if (!NT_SUCCESS(Status)) goto Quickie; - /* Setup value name for system boot device */ + /* Setup value name for system boot device in ARC format */ RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); - RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->NtBootPathName); + RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->ArcBootDeviceName); Status = NtSetValueKey(KeyHandle, &KeyName, 0,

1 0

[hbelusca] 57750: The console boot switch is really named CONSOLE, not CMDCONS, since r29948.
by hbelusca＠svn.reactos.org 23 Nov '12

23 Nov '12

Author: hbelusca Date: Fri Nov 23 20:05:35 2012 New Revision: 57750 URL: http://svn.reactos.org/svn/reactos?rev=57750&view=rev Log: The console boot switch is really named CONSOLE, not CMDCONS, since r29948. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/system/userinit/userinit.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Nov 23 20:05:35 2012 @@ -3025,7 +3025,7 @@ if (rc != ERROR_SUCCESS) goto cleanup; - /* Check for CMDCONS in SystemStartOptions */ + /* Check for CONSOLE switch in SystemStartOptions */ CurrentOption = SystemStartOptions; while (CurrentOption) { Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Fri Nov 23 20:05:35 2012 @@ -114,7 +114,7 @@ goto cleanup; } - /* Check for CONSOLE in SystemStartOptions */ + /* Check for CONSOLE switch in SystemStartOptions */ CurrentOption = SystemStartOptions; while (CurrentOption) { Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Fri Nov 23 20:05:35 2012 @@ -108,7 +108,7 @@ if (rc != ERROR_SUCCESS) goto cleanup; - /* Check for CMDCONS in SystemStartOptions */ + /* Check for CONSOLE switch in SystemStartOptions */ CurrentOption = SystemStartOptions; while (CurrentOption) { Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Fri Nov 23 20:05:35 2012 @@ -558,7 +558,7 @@ if (rc != ERROR_SUCCESS) goto cleanup; - /* Check for CMDCONS in SystemStartOptions */ + /* Check for CONSOLE switch in SystemStartOptions */ pwszCurrentOption = pwszSystemStartOptions; while (pwszCurrentOption) {

1 0

[hbelusca] 57749: [KERNEL32] Deactivate the code of GetConsoleInputWaitHandle, because it calls a function that doesn't seem to appear in the console server apis listed in http://j00ru.vexillium.or...
by hbelusca＠svn.reactos.org 23 Nov '12

23 Nov '12

Author: hbelusca Date: Fri Nov 23 19:37:20 2012 New Revision: 57749 URL: http://svn.reactos.org/svn/reactos?rev=57749&view=rev Log: [KERNEL32] Deactivate the code of GetConsoleInputWaitHandle, because it calls a function that doesn't seem to appear in the console server apis listed in http://j00ru.vexillium.org/csrss_list/api_list.html (and that I haven't included in the console server apis list), until I find a better solution. It fixes compilation. [CONSRV] - Code reorganization - Introduce the CONSOLE_CONNECTION_INFO structure needed for initializing consoles when launching a program (see http://svn.reactos.org/svn/reactos/trunk/reactos/lib/kernel32/misc/dllmain.…), instead of calling AllocConsole. Not used at this time. Now the branch compiles. Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h 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] Fri Nov 23 19:37:20 2012 @@ -321,20 +321,26 @@ WINAPI GetConsoleInputWaitHandle(VOID) { - CSR_API_MESSAGE Request; - NTSTATUS Status; - - Status = CsrClientCallServer(&Request, - NULL, - CSR_CREATE_API_NUMBER(CSR_CONSOLE, GET_INPUT_WAIT_HANDLE), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) +/// HACK !!!!!!!!!!!!! + ASSERT(FALSE); + return NULL; + +#if 0 + NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, GET_INPUT_WAIT_HANDLE), + sizeof(CSRSS_GET_INPUT_WAIT_HANDLE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { BaseSetLastNTError(Status); return 0; } - return Request.Data.GetConsoleInputWaitHandle.InputWaitHandle; + return ApiMessage.Data.GetConsoleInputWaitHandle.InputWaitHandle; +#endif } 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] Fri Nov 23 19:37:20 2012 @@ -112,15 +112,21 @@ } CONSRV_API_NUMBER, *PCONSRV_API_NUMBER; -#define CONSOLE_INPUT_MODE_VALID (0x0f) -#define CONSOLE_OUTPUT_MODE_VALID (0x03) +typedef struct _CONSOLE_CONNECTION_INFO +{ + +} CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO; + + +#define CONSOLE_INPUT_MODE_VALID 0x0f +#define CONSOLE_OUTPUT_MODE_VALID 0x03 typedef struct { USHORT nMaxIds; + ULONG nProcessIdsTotal; PDWORD pProcessIds; - ULONG nProcessIdsTotal; } CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST; typedef struct

1 0

[cfinck] 57748: Revert 57718
by cfinck＠svn.reactos.org 23 Nov '12

23 Nov '12

Author: cfinck Date: Fri Nov 23 11:22:46 2012 New Revision: 57748 URL: http://svn.reactos.org/svn/reactos?rev=57748&view=rev Log: Revert 57718 Modified: trunk/reactos/base/applications/sc/CMakeLists.txt Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Fri Nov 23 11:22:46 2012 @@ -14,7 +14,7 @@ add_executable(sc ${SOURCE}) -set_module_type(sc win32cui) +set_module_type(sc win32cui UNICODE) add_importlibs(sc advapi32 msvcrt kernel32) add_pch(sc sc.h) add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all)

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