Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[tfaber] 66913: [SYSSETUP] - Open a command prompt if Shift+F10 is pressed during GUI setup, as Windows does. CORE-9428 #resolve
by tfaber＠svn.reactos.org 27 Mar '15

27 Mar '15

Author: tfaber Date: Fri Mar 27 11:21:40 2015 New Revision: 66913 URL: http://svn.reactos.org/svn/reactos?rev=66913&view=rev Log: [SYSSETUP] - Open a command prompt if Shift+F10 is pressed during GUI setup, as Windows does. CORE-9428 #resolve Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri Mar 27 11:21:40 2015 @@ -2317,6 +2317,7 @@ UINT nPages = 0; HWND hWnd; MSG msg; + ATOM hotkey; /* Clear setup data */ ZeroMemory(&SetupData, sizeof(SETUPDATA)); @@ -2408,14 +2409,43 @@ hWnd = (HWND)PropertySheet(&psh); ShowWindow(hWnd, SW_SHOW); + hotkey = GlobalAddAtomW(L"Setup Shift+F10 Hotkey"); + if (!RegisterHotKey(NULL, hotkey, MOD_SHIFT, VK_F10)) + DPRINT1("RegisterHotKey failed with %lu\n", GetLastError()); while (GetMessage(&msg, NULL, 0, 0)) { - if(!IsDialogMessage(hWnd, &msg)) + if (msg.hwnd == NULL && msg.message == WM_HOTKEY && msg.wParam == hotkey) + { + STARTUPINFOW si = { sizeof(si) }; + PROCESS_INFORMATION pi; + + if (CreateProcessW(L"cmd.exe", + NULL, + NULL, + NULL, + FALSE, + CREATE_NEW_CONSOLE, + NULL, + NULL, + &si, + &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + else + { + DPRINT1("Failed to launch command prompt: %lu\n", GetLastError()); + } + } + else if (!IsDialogMessage(hWnd, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); } } + UnregisterHotKey(NULL, hotkey); + GlobalDeleteAtom(hotkey); DeleteObject(SetupData.hTitleFont); }

1 0

[tfaber] 66912: [KERNEL32] - Add missing location friendly names - Correctly handle location ids larger than USHORT_MAX in NLS_GetGeoFriendlyName
by tfaber＠svn.reactos.org 27 Mar '15

27 Mar '15

Author: tfaber Date: Fri Mar 27 11:12:22 2015 New Revision: 66912 URL: http://svn.reactos.org/svn/reactos?rev=66912&view=rev Log: [KERNEL32] - Add missing location friendly names - Correctly handle location ids larger than USHORT_MAX in NLS_GetGeoFriendlyName Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc [iso-8859-1] Fri Mar 27 11:12:22 2015 @@ -425,4 +425,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Fri Mar 27 11:12:22 2015 @@ -3004,6 +3004,7 @@ /* FIXME: move *.nls resources out of kernel32 into locale.nls */ Location += NLSRC_OFFSET; + Location &= 0xFFFF; if(cchData == 0) return GetLocalisedText(Location, NULL, 0);

1 0

[tfaber] 66911: [CONSRV] - Make error message actually useful
by tfaber＠svn.reactos.org 27 Mar '15

27 Mar '15

Author: tfaber Date: Fri Mar 27 10:10:42 2015 New Revision: 66911 URL: http://svn.reactos.org/svn/reactos?rev=66911&view=rev Log: [CONSRV] - Make error message actually useful Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c trunk/reactos/win32ss/user/winsrv/consrv_new/console.c trunk/reactos/win32ss/user/winsrv/consrv_new/handle.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Fri Mar 27 10:10:42 2015 @@ -1223,7 +1223,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -1284,7 +1284,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Fri Mar 27 10:10:42 2015 @@ -809,7 +809,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -868,7 +868,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -938,7 +938,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -986,7 +986,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -1032,7 +1032,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -1057,7 +1057,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] Fri Mar 27 10:10:42 2015 @@ -31,7 +31,7 @@ &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new/console.c [iso-8859-1] Fri Mar 27 10:10:42 2015 @@ -506,7 +506,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -539,7 +539,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new/handle.c [iso-8859-1] Fri Mar 27 10:10:42 2015 @@ -700,7 +700,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -752,7 +752,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -775,7 +775,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; } @@ -810,7 +810,7 @@ Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("Can't get console\n"); + DPRINT1("Can't get console, status %lx\n", Status); return Status; }

1 0

[aandrejevic] 66910: [NTVDM] Fix the implementation of the "Get Device Information" IOCTL. Remove the broken implementation of the "Set Device Information" IOCTL.
by aandrejevic＠svn.reactos.org 27 Mar '15

27 Mar '15

Author: aandrejevic Date: Fri Mar 27 01:26:45 2015 New Revision: 66910 URL: http://svn.reactos.org/svn/reactos?rev=66910&view=rev Log: [NTVDM] Fix the implementation of the "Get Device Information" IOCTL. Remove the broken implementation of the "Set Device Information" IOCTL. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri Mar 27 01:26:45 2015 @@ -1207,37 +1207,46 @@ BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle) { PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(FileHandle); - PDOS_DEVICE_NODE Node; - - /* Make sure it exists and is a device */ - if (!SftEntry || SftEntry->Type != DOS_SFT_ENTRY_DEVICE) + PDOS_DEVICE_NODE Node = NULL; + + /* Make sure it exists */ + if (!SftEntry) { DosLastError = ERROR_FILE_NOT_FOUND; return FALSE; } - Node = SftEntry->DeviceNode; + if (SftEntry->Type == DOS_SFT_ENTRY_DEVICE) Node = SftEntry->DeviceNode; switch (ControlCode) { /* Get Device Information */ case 0x00: { + WORD InfoWord = 0; + /* * See Ralf Brown: http://www.ctyme.com/intr/rb-2820.htm * for a list of possible flags. */ - /* Return the device information word */ - setDX(Node->DeviceAttributes); + if (Node) + { + /* Return the device attributes with bit 7 set */ + InfoWord = Node->DeviceAttributes | (1 << 7); + } + + setDX(InfoWord); return TRUE; } /* Set Device Information */ case 0x01: { - Node->DeviceAttributes = getDX(); - return TRUE; + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; } /* Read From Device I/O Control Channel */ @@ -1245,7 +1254,7 @@ { WORD Length = getCX(); - if (!(Node->DeviceAttributes & DOS_DEVATTR_IOCTL)) + if (Node == NULL || !(Node->DeviceAttributes & DOS_DEVATTR_IOCTL)) { DosLastError = ERROR_INVALID_FUNCTION; return FALSE; @@ -1269,7 +1278,7 @@ { WORD Length = getCX(); - if (!(Node->DeviceAttributes & DOS_DEVATTR_IOCTL)) + if (Node == NULL || !(Node->DeviceAttributes & DOS_DEVATTR_IOCTL)) { DosLastError = ERROR_INVALID_FUNCTION; return FALSE;

1 0

[hbelusca] 66909: [NTVDM]: In case some app sends repeatedly beeps of Frequency == 0 (to stop beeping) but with Duration == INFINITY, do the duration fixup before actually checking whether our prev...
by hbelusca＠svn.reactos.org 27 Mar '15

27 Mar '15

Author: hbelusca Date: Fri Mar 27 00:44:44 2015 New Revision: 66909 URL: http://svn.reactos.org/svn/reactos?rev=66909&view=rev Log: [NTVDM]: In case some app sends repeatedly beeps of Frequency == 0 (to stop beeping) but with Duration == INFINITY, do the duration fixup before actually checking whether our previous beep was the same, so that we don't saturate the beep driver with beep stop IRQ requests (Windows seems to handle that properly but ReactOS seems to do not, and the real problem seems to lie in NTOS kernel and not in the beep driver, because the same problem happens even when using windows' beep.sys in ROS). Patch by Aleksander, tested by both of us. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c [iso-8859-1] Fri Mar 27 00:44:44 2015 @@ -51,14 +51,14 @@ IO_STATUS_BLOCK IoStatusBlock; BEEP_SET_PARAMETERS BeepSetParameters; + /* A null frequency means we stop beeping */ + if (Frequency == 0) Duration = 0; + /* * Do nothing if we are replaying exactly the same sound * (this avoids hiccups due to redoing the same beeps). */ if (Frequency == LastFrequency && Duration == LastDuration) return; - - /* A null frequency means we stop beeping */ - if (Frequency == 0) Duration = 0; /* * For small durations we automatically reset the beep so

1 0

[gadamopoulos] 66908: [HIVESYS.INF] - Enable ConnectMultiplePorts for mouclass. This means that "the events generated by all pointing devices on the system are fed to the Windows subsystem in a sin...
by gadamopoulos＠svn.reactos.org 26 Mar '15

26 Mar '15

Author: gadamopoulos Date: Thu Mar 26 23:57:16 2015 New Revision: 66908 URL: http://svn.reactos.org/svn/reactos?rev=66908&view=rev Log: [HIVESYS.INF] - Enable ConnectMultiplePorts for mouclass. This means that "the events generated by all pointing devices on the system are fed to the Windows subsystem in a single input stream". Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Mar 26 23:57:16 2015 @@ -1536,6 +1536,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys" HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMultiplePorts",0x00010001,1 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass" ; Mailslot filesystem driver

1 0

[aandrejevic] 66907: [NTVDM] On DOS, CONIN$ and CONOUT$ are actually the same thing - a device called CON.
by aandrejevic＠svn.reactos.org 26 Mar '15

26 Mar '15

Author: aandrejevic Date: Thu Mar 26 23:31:01 2015 New Revision: 66907 URL: http://svn.reactos.org/svn/reactos?rev=66907&view=rev Log: [NTVDM] On DOS, CONIN$ and CONOUT$ are actually the same thing - a device called CON. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Thu Mar 26 23:31:01 2015 @@ -20,7 +20,7 @@ /* PRIVATE VARIABLES **********************************************************/ -PDOS_DEVICE_NODE ConIn = NULL, ConOut = NULL; +PDOS_DEVICE_NODE Con = NULL; BYTE ExtendedCode = 0; /* PRIVATE FUNCTIONS **********************************************************/ @@ -141,30 +141,22 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID ConDrvInitialize(PDOS_DEVICE_NODE *InputDevice, PDOS_DEVICE_NODE *OutputDevice) +VOID ConDrvInitialize(VOID) { - ConIn = DosCreateDevice(DOS_DEVATTR_STDIN - | DOS_DEVATTR_CON - | DOS_DEVATTR_CHARACTER, - "CONIN$"); - ConOut = DosCreateDevice(DOS_DEVATTR_STDOUT - | DOS_DEVATTR_CON - | DOS_DEVATTR_CHARACTER, - "CONOUT$"); - ASSERT(ConIn != NULL && ConOut != NULL); + Con = DosCreateDevice(DOS_DEVATTR_STDIN + | DOS_DEVATTR_STDOUT + | DOS_DEVATTR_CON + | DOS_DEVATTR_CHARACTER, + "CON"); - ConIn->ReadRoutine = ConDrvReadInput; - ConIn->InputStatusRoutine = ConDrvInputStatus; - ConOut->WriteRoutine = ConDrvWriteOutput; - ConIn->OpenRoutine = ConOut->OpenRoutine = ConDrvOpen; - ConIn->CloseRoutine = ConOut->CloseRoutine = ConDrvClose; - - if (InputDevice) *InputDevice = ConIn; - if (OutputDevice) *OutputDevice = ConOut; + Con->ReadRoutine = ConDrvReadInput; + Con->InputStatusRoutine = ConDrvInputStatus; + Con->WriteRoutine = ConDrvWriteOutput; + Con->OpenRoutine = ConDrvOpen; + Con->CloseRoutine = ConDrvClose; } VOID ConDrvCleanup(VOID) { - if (ConIn) DosDeleteDevice(ConIn); - if (ConOut) DosDeleteDevice(ConOut); + if (Con) DosDeleteDevice(Con); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Thu Mar 26 23:31:01 2015 @@ -311,9 +311,8 @@ { PDOS_SFT_ENTRY SftEntry; HANDLE StandardHandles[3]; - PDOS_DEVICE_NODE ConIn = DosGetDevice("CONIN$"); - PDOS_DEVICE_NODE ConOut = DosGetDevice("CONOUT$"); - ASSERT(ConIn != NULL && ConOut != NULL); + PDOS_DEVICE_NODE Con = DosGetDevice("CON"); + ASSERT(Con != NULL); /* Get the native standard handles */ StandardHandles[0] = GetStdHandle(STD_INPUT_HANDLE); @@ -322,12 +321,10 @@ for (i = 0; i < 3; i++) { - PDOS_DEVICE_NODE Device = (i == 0) ? ConIn : ConOut; - /* Find the corresponding SFT entry */ if (IsConsoleHandle(StandardHandles[i])) { - SftEntry = DosFindDeviceSftEntry(Device); + SftEntry = DosFindDeviceSftEntry(Con); } else { @@ -349,10 +346,10 @@ if (IsConsoleHandle(StandardHandles[i])) { SftEntry->Type = DOS_SFT_ENTRY_DEVICE; - SftEntry->DeviceNode = Device; + SftEntry->DeviceNode = Con; /* Call the open routine */ - if (Device->OpenRoutine) Device->OpenRoutine(Device); + if (Con->OpenRoutine) Con->OpenRoutine(Con); } else { @@ -2854,7 +2851,6 @@ CHAR CurrentDirectory[MAX_PATH]; CHAR DosDirectory[DOS_DIR_LENGTH]; LPSTR Path; - PDOS_DEVICE_NODE ConInDevice, ConOutDevice; FILE *Stream; WCHAR Buffer[256]; @@ -2915,7 +2911,7 @@ EmsDrvInitialize(); /* Load the CON driver */ - ConDrvInitialize(&ConInDevice, &ConOutDevice); + ConDrvInitialize(); #endif Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Thu Mar 26 23:31:01 2015 @@ -201,7 +201,7 @@ BOOLEAN DosBIOSInitialize(VOID); VOID EmsDrvInitialize(VOID); VOID EmsDrvCleanup(VOID); -VOID ConDrvInitialize(PDOS_DEVICE_NODE *InputDevice, PDOS_DEVICE_NODE *OutputDevice); +VOID ConDrvInitialize(VOID); VOID ConDrvCleanup(VOID); /*

1 0

[aandrejevic] 66906: [NTVDM] In the DOS CON driver, for special keys, always send the scancode right after the 0x00 byte.
by aandrejevic＠svn.reactos.org 26 Mar '15

26 Mar '15

Author: aandrejevic Date: Thu Mar 26 23:19:22 2015 New Revision: 66906 URL: http://svn.reactos.org/svn/reactos?rev=66906&view=rev Log: [NTVDM] In the DOS CON driver, for special keys, always send the scancode right after the 0x00 byte. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Thu Mar 26 23:19:22 2015 @@ -21,13 +21,14 @@ /* PRIVATE VARIABLES **********************************************************/ PDOS_DEVICE_NODE ConIn = NULL, ConOut = NULL; +BYTE ExtendedCode = 0; /* PRIVATE FUNCTIONS **********************************************************/ WORD NTAPI ConDrvReadInput(PDOS_DEVICE_NODE Device, DWORD Buffer, PWORD Length) { CHAR Character; - WORD BytesRead; + WORD BytesRead = 0; PCHAR Pointer = (PCHAR)FAR_POINTER(Buffer); /* Save AX */ @@ -36,17 +37,31 @@ /* * Use BIOS Get Keystroke function */ - for (BytesRead = 0; BytesRead < *Length; BytesRead++) + while (BytesRead < *Length) { - /* Call the BIOS INT 16h, AH=00h "Get Keystroke" */ - setAH(0x00); - Int32Call(&DosContext, BIOS_KBD_INTERRUPT); + if (!ExtendedCode) + { + /* Call the BIOS INT 16h, AH=00h "Get Keystroke" */ + setAH(0x00); + Int32Call(&DosContext, BIOS_KBD_INTERRUPT); - /* Retrieve the character in AL (scan code is in AH) */ - Character = getAL(); + /* Retrieve the character in AL (scan code is in AH) */ + Character = getAL(); + } + else + { + /* Return the extended code */ + Character = ExtendedCode; + + /* And then clear it */ + ExtendedCode = 0; + } + + /* Check if this is a special character */ + if (Character == 0) ExtendedCode = getAH(); if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); - Pointer[BytesRead] = Character; + Pointer[BytesRead++] = Character; /* Stop on first carriage return */ if (Character == '\r') Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Thu Mar 26 23:19:22 2015 @@ -2030,7 +2030,7 @@ WORD BytesRead = 0; WORD ErrorCode; - DPRINT1("INT 21h, AH = 3Fh\n"); + DPRINT("DosReadFile(0x%04X)\n", getBX()); DoEcho = TRUE; ErrorCode = DosReadFile(getBX(),

1 0

[tfaber] 66905: [NTOS:CM] - Do not allow the creation of keys in the master hive. Fixes boot with the VMware sound driver from rapps installed (and it works, too). CORE-5381 #resolve
by tfaber＠svn.reactos.org 26 Mar '15

26 Mar '15

Author: tfaber Date: Thu Mar 26 17:02:31 2015 New Revision: 66905 URL: http://svn.reactos.org/svn/reactos?rev=66905&view=rev Log: [NTOS:CM] - Do not allow the creation of keys in the master hive. Fixes boot with the VMware sound driver from rapps installed (and it works, too). CORE-5381 #resolve Modified: trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Thu Mar 26 17:02:31 2015 @@ -1266,6 +1266,11 @@ ParentKcb, Object); } + else if (Hive == &CmiVolatileHive->Hive && CmpNoVolatileCreates) + { + /* Creating keys in the master hive is not allowed */ + Status = STATUS_INVALID_PARAMETER; + } else { /* Do the create */ 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] Thu Mar 26 17:02:31 2015 @@ -29,6 +29,7 @@ BOOLEAN CmpNoWrite; BOOLEAN CmpWasSetupBoot; BOOLEAN CmpProfileLoaded; +BOOLEAN CmpNoVolatileCreates; ULONG CmpTraceLevel = 0; extern LONG CmpFlushStarveWriters; @@ -1470,8 +1471,10 @@ L"\\Registry\\Machine\\SAM\\SAM"); /* Link S-1-5-18 to .Default */ + CmpNoVolatileCreates = FALSE; CmpLinkKeyToHive(L"\\Registry\\User\\S-1-5-18", L"\\Registry\\User\\.Default"); + CmpNoVolatileCreates = TRUE; } BOOLEAN @@ -1530,7 +1533,7 @@ } /* Build the master hive */ - Status = CmpInitializeHive((PCMHIVE*)&CmiVolatileHive, + Status = CmpInitializeHive(&CmiVolatileHive, HINIT_CREATE, HIVE_VOLATILE, HFILE_TYPE_PRIMARY, @@ -1601,6 +1604,9 @@ /* Close the handle */ NtClose(KeyHandle); + + /* After this point, do not allow creating keys in the master hive */ + CmpNoVolatileCreates = TRUE; /* Initialize the system hive */ if (!CmpInitializeSystemHive(KeLoaderBlock)) Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Thu Mar 26 17:02:31 2015 @@ -1659,6 +1659,7 @@ extern BOOLEAN CmpFlushOnLockRelease; extern BOOLEAN CmpShareSystemHives; extern BOOLEAN CmpMiniNTBoot; +extern BOOLEAN CmpNoVolatileCreates; extern EX_PUSH_LOCK CmpHiveListHeadLock, CmpLoadHiveLock; extern LIST_ENTRY CmpHiveListHead; extern POBJECT_TYPE CmpKeyObjectType;

1 0

[gadamopoulos] 66904: [MSGINA] - Stub ShellDimScreen.
by gadamopoulos＠svn.reactos.org 26 Mar '15

26 Mar '15

Author: gadamopoulos Date: Thu Mar 26 15:36:27 2015 New Revision: 66904 URL: http://svn.reactos.org/svn/reactos?rev=66904&view=rev Log: [MSGINA] - Stub ShellDimScreen. Modified: trunk/reactos/dll/win32/msgina/msgina.spec trunk/reactos/dll/win32/msgina/stubs.c Modified: trunk/reactos/dll/win32/msgina/msgina.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.sp… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] Thu Mar 26 15:36:27 2015 @@ -13,7 +13,7 @@ 13 stub -noname ShellStatusHostShuttingDown ; () 14 stub -noname ShellNotifyThemeUserChange ; (long long) 15 stub -noname ShellSwitchWhenInteractiveReady ; (long long) -16 stub -noname ShellDimScreen ; (ptr ptr) +16 stdcall -noname ShellDimScreen (ptr ptr) 17 stub -noname ShellInstallAccountFilterData ; () 18 stub -noname ShellStatusHostBegin ; (long) 19 stub -noname ShellIsUserInteractiveLogonAllowed ; (long) Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Thu Mar 26 15:36:27 2015 @@ -117,3 +117,9 @@ return FALSE; } +HRESULT WINAPI +ShellDimScreen (void* Unknown, HWND* hWindow) +{ + UNIMPLEMENTED; + return E_FAIL; +}

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015