Ros-diffs January 2013

ros-diffs@reactos.org

11 participants
185 discussions

[ekohl] 58187: [SAMSRV] Fix SamrRemoveMemberFromGroup.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jan 17 22:05:37 2013 New Revision: 58187 URL: http://svn.reactos.org/svn/reactos?rev=58187&view=rev Log: [SAMSRV] Fix SamrRemoveMemberFromGroup. Modified: trunk/reactos/dll/win32/samsrv/group.c trunk/reactos/dll/win32/samsrv/user.c Modified: trunk/reactos/dll/win32/samsrv/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/group.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] Thu Jan 17 22:05:37 2013 @@ -90,17 +90,14 @@ ULONG i; NTSTATUS Status; - Status = SampGetObjectAttribute(GroupObject, - L"Members", - NULL, - NULL, - &Length); + SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &Length); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + if (Length == 0) return STATUS_MEMBER_NOT_IN_GROUP; - - if (!NT_SUCCESS(Status)) - return Status; MembersBuffer = midl_user_allocate(Length); if (MembersBuffer == NULL) @@ -126,12 +123,15 @@ { Length -= sizeof(ULONG); Status = STATUS_SUCCESS; + + if (MembersCount - i - 1 > 0) + { + CopyMemory(&MembersBuffer[i], + &MembersBuffer[i + 1], + (MembersCount - i - 1) * sizeof(ULONG)); + } + break; - } - - if (Status == STATUS_SUCCESS && i < MembersCount - 1) - { - MembersBuffer[i] = MembersBuffer[i + 1]; } } Modified: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Thu Jan 17 22:05:37 2013 @@ -117,22 +117,19 @@ ULONG GroupsCount = 0; ULONG Length = 0; ULONG i; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; TRACE("(%p %lu)\n", UserObject, GroupId); - Status = SampGetObjectAttribute(UserObject, - L"Groups", - NULL, - NULL, - &Length); - - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + if (Length == 0) return STATUS_MEMBER_NOT_IN_GROUP; - - if (!NT_SUCCESS(Status)) - return Status; GroupsBuffer = midl_user_allocate(Length); if (GroupsBuffer == NULL) @@ -158,14 +155,15 @@ { Length -= sizeof(GROUP_MEMBERSHIP); Status = STATUS_SUCCESS; + + if (GroupsCount - i - 1 > 0) + { + CopyMemory(&GroupsBuffer[i], + &GroupsBuffer[i + 1], + (GroupsCount - i - 1) * sizeof(GROUP_MEMBERSHIP)); + } + break; - } - - if (Status == STATUS_SUCCESS && i < GroupsCount - 1) - { - CopyMemory(&GroupsBuffer[i], - &GroupsBuffer[i + 1], - sizeof(GROUP_MEMBERSHIP)); } }

11 years, 9 months

[tfaber] 58186: [EXPLORER_NEW] - Hide minimized window captions (and enable shell notifications, thus fixing taskbar buttons). This should have been in r57978, but got lost. - From Andrew Green's G...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jan 17 11:02:30 2013 New Revision: 58186 URL: http://svn.reactos.org/svn/reactos?rev=58186&view=rev Log: [EXPLORER_NEW] - Hide minimized window captions (and enable shell notifications, thus fixing taskbar buttons). This should have been in r57978, but got lost. - From Andrew Green's GSoC branch. Spotted by Edijus. CORE-6899 #resolve Modified: trunk/reactos/base/shell/explorer-new/explorer.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Thu Jan 17 11:02:30 2013 @@ -348,6 +348,25 @@ return bRet; } +static VOID +HideMinimizedWindows(IN BOOL bHide) +{ + MINIMIZEDMETRICS mm; + + mm.cbSize = sizeof(mm); + if (!SystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(mm), &mm, 0)) + { + DbgPrint("SystemParametersInfo failed with %lu\n", GetLastError()); + return; + } + if (bHide) + mm.iArrange |= ARW_HIDE; + else + mm.iArrange &= ~ARW_HIDE; + if (!SystemParametersInfo(SPI_SETMINIMIZEDMETRICS, sizeof(mm), &mm, 0)) + DbgPrint("SystemParametersInfo failed with %lu\n", GetLastError()); +} + INT WINAPI _tWinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, @@ -392,6 +411,11 @@ if (RegisterTrayWindowClass() && RegisterTaskSwitchWndClass()) { Tray = CreateTrayWindow(); + /* This not only hides the minimized window captions in the bottom + left screen corner, but is also needed in order to receive + HSHELL_* notification messages (which are required for taskbar + buttons to work right) */ + HideMinimizedWindows(TRUE); if (Tray != NULL) hShellDesktop = DesktopCreateWindow(Tray); @@ -415,6 +439,7 @@ { RegisterHotKey(NULL, IDHK_RUN, MOD_WIN, 'R'); TrayMessageLoop(Tray); + HideMinimizedWindows(FALSE); ITrayWindow_Release(Tray); UnregisterTrayWindowClass(); }

11 years, 9 months

[hbelusca] 58185: [EXPLORER_NEW] - Italian Translation and fix duplicate MENUITEM in fr-FR.rc, ko-KR, no-NO.rc files. Patch by Ivan Di Francesco. - Adapt a little bit French translation (by me). CO...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 16 23:24:07 2013 New Revision: 58185 URL: http://svn.reactos.org/svn/reactos?rev=58185&view=rev Log: [EXPLORER_NEW] - Italian Translation and fix duplicate MENUITEM in fr-FR.rc, ko-KR, no-NO.rc files. Patch by Ivan Di Francesco. - Adapt a little bit French translation (by me). CORE-6908 #resolve #comment Committed in r58185. Thanks ! Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc trunk/reactos/base/shell/explorer-new/lang/no-NO.rc Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Wed Jan 16 23:24:07 2013 @@ -5,27 +5,18 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&Ajuster la date/l'heure", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&Personnaliser les icÃ´nes de notification...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "&Cascade", ID_SHELL_CMD_CASCADE_WND + MENUITEM "MosaÃ¯que Hori&zontale", ID_SHELL_CMD_TILE_WND_H + MENUITEM "MosaÃ¯que &Verticale", ID_SHELL_CMD_TILE_WND_V + MENUITEM "Afficher le &Bureau", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "Ann&uler", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&Gestionnaire des tÃ¢ches", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION - MENUITEM SEPARATOR - MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR - MENUITEM SEPARATOR - MENUITEM "VÃ©roui&ller la barre de tÃ¢ches", ID_LOCKTASKBAR + MENUITEM "V&errouiller la Barre des tÃ¢ches", ID_LOCKTASKBAR MENUITEM "P&ropriÃ©tÃ©s", ID_SHELL_CMD_PROPERTIES END END @@ -54,7 +45,7 @@ MENUITEM "&SÃ©curitÃ©...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Co&nnexions au rÃ©seau", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED - MENUITEM "Barre de &tÃ¢ches et menu dÃ©marrer", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + MENUITEM "Barre des &tÃ¢ches et Menu DÃ©marrer", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END POPUP "&Chercher", IDM_SEARCH BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Wed Jan 16 23:24:07 2013 @@ -5,13 +5,13 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&Modifica Data/Ora", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&Personalizza Notifiche...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "Finestre a cascata", ID_SHELL_CMD_CASCADE_WND + MENUITEM "Affianca Finestre &Orizzontalmente", ID_SHELL_CMD_TILE_WND_H + MENUITEM "Affianca Finestre V&erticalmente", ID_SHELL_CMD_TILE_WND_V + MENUITEM "&Mostra Desktop", ID_SHELL_CMD_SHOW_DESKTOP MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR @@ -56,8 +56,8 @@ MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "&Sincronizza", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED MENUITEM "&Fine sessione %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED - MENUITEM "S&collega...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED - MENUITEM "&Disancora il computer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Disconnetti...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "&Sblocca il computer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "Spegnere il computer...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END @@ -83,7 +83,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN AUTORADIOBUTTON "&MenÃ¹ avvio", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED + LTEXT "Questo stile di menu consente di accedere facilmente alle cartelle, ai programmi preferiti e alla ricerca.", IDC_STATIC, 20,17,150,24, WS_DISABLED PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED AUTORADIOBUTTON "MenÃ¹ avvio &classico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED LTEXT "Questo stile di menÃ¹ ha funzionalitÃ e aspetto classici",-1,20,57,150,24, WS_DISABLED @@ -123,11 +123,11 @@ IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced" +CAPTION "Avanzate" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 - AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 + GROUPBOX "Opzioni Avanzate", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Mostra s&econdi", IDC_TASKBARPROP_SECONDS, 13,18,200,10 AUTOCHECKBOX "&Mostrare anteprima delle finestre (miniature)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10 END Modified: trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] Wed Jan 16 23:24:07 2013 @@ -9,15 +9,6 @@ BEGIN POPUP "" BEGIN - MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF - MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] Wed Jan 16 23:24:07 2013 @@ -4,15 +4,6 @@ BEGIN POPUP "" BEGIN - MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF - MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF

11 years, 9 months

[hbelusca] 58184: [CONSRV] Introduce new helper functions Win32CsrInitHandlesTable and Win32CsrAllocateConsole and use them in many places (in ConsoleConnect, SrvAllocConsole and SrvAttachConsole).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 16 22:25:12 2013 New Revision: 58184 URL: http://svn.reactos.org/svn/reactos?rev=58184&view=rev Log: [CONSRV] Introduce new helper functions Win32CsrInitHandlesTable and Win32CsrAllocateConsole and use them in many places (in ConsoleConnect, SrvAllocConsole and SrvAttachConsole). Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/handle.c Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Wed Jan 16 22:25:12 2013 @@ -210,7 +210,7 @@ DeviceNameInfo = RtlIsDosDeviceName_U(pszName); if (DeviceNameInfo != 0) { - ConsoleName = (LPCWSTR)((ULONG_PTR)ConsoleName + (ULONG_PTR)((DeviceNameInfo >> 16) & 0xFFFF)); + ConsoleName = (LPCWSTR)((ULONG_PTR)ConsoleName + ((DeviceNameInfo >> 16) & 0xFFFF)); } /* Return a standard console "file" name according to what we passed in parameters */ Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Wed Jan 16 22:25:12 2013 @@ -255,7 +255,7 @@ { current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); current_entry = current_entry->Flink; - ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); + ConioConsoleCtrlEvent(CTRL_C_EVENT, current); } if (Console->LineBuffer && !Console->LineComplete) { Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Wed Jan 16 22:25:12 2013 @@ -308,7 +308,6 @@ /** This comes from ConsoleConnect!! **/ DPRINT1("SrvAllocConsole - Checkpoint 1\n"); -#if 0000 /* * We are about to create a new console. However when ConsoleNewProcess * was called, we didn't know that we wanted to create a new console and @@ -321,13 +320,17 @@ */ Win32CsrReleaseConsole(ProcessData); // Win32CsrFreeHandlesTable(ProcessData); -#endif /* Initialize a new Console owned by the Console Leader Process */ - Status = CsrInitConsole(&ProcessData->Console, AllocConsoleRequest->ShowCmd, ConsoleLeader); + Status = Win32CsrAllocateConsole(ProcessData, + &AllocConsoleRequest->InputHandle, + &AllocConsoleRequest->OutputHandle, + &AllocConsoleRequest->ErrorHandle, + AllocConsoleRequest->ShowCmd, + ConsoleLeader); if (!NT_SUCCESS(Status)) { - DPRINT1("Console initialization failed\n"); + DPRINT1("Console allocation failed\n"); return Status; } @@ -336,75 +339,6 @@ /* Insert the process into the processes list of the console */ InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ConsoleLink); - - /* Return it to the caller */ - AllocConsoleRequest->Console = ProcessData->Console; - - - /* - * Create a new handle table - Insert the IO handles - */ - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - - /* Insert the Input handle */ - Status = Win32CsrInsertObject(ProcessData, - &AllocConsoleRequest->InputHandle, - &ProcessData->Console->Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the input handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - Win32CsrReleaseConsole(ProcessData); - // ConioDeleteConsole(ProcessData->Console); - // ProcessData->Console = NULL; - return Status; - } - - /* Insert the Output handle */ - Status = Win32CsrInsertObject(ProcessData, - &AllocConsoleRequest->OutputHandle, - &ProcessData->Console->ActiveBuffer->Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the output handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - Win32CsrReleaseConsole(ProcessData); - // Win32CsrReleaseObject(ProcessData, - // AllocConsoleRequest->InputHandle); - // ConioDeleteConsole(ProcessData->Console); - // ProcessData->Console = NULL; - return Status; - } - - /* Insert the Error handle */ - Status = Win32CsrInsertObject(ProcessData, - &AllocConsoleRequest->ErrorHandle, - &ProcessData->Console->ActiveBuffer->Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the error handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - Win32CsrReleaseConsole(ProcessData); - // Win32CsrReleaseObject(ProcessData, - // AllocConsoleRequest->OutputHandle); - // Win32CsrReleaseObject(ProcessData, - // AllocConsoleRequest->InputHandle); - // ConioDeleteConsole(ProcessData->Console); - // ProcessData->Console = NULL; - return Status; - } - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); /* Duplicate the Event */ Status = NtDuplicateObject(NtCurrentProcess(), @@ -416,19 +350,12 @@ { DPRINT1("NtDuplicateObject() failed: %lu\n", Status); Win32CsrReleaseConsole(ProcessData); - // if (NewConsole) - // { - // Win32CsrReleaseObject(ProcessData, - // AllocConsoleRequest->ErrorHandle); - // Win32CsrReleaseObject(ProcessData, - // AllocConsoleRequest->OutputHandle); - // Win32CsrReleaseObject(ProcessData, - // AllocConsoleRequest->InputHandle); - // } - // ConioDeleteConsole(ProcessData->Console); // FIXME: Just release the console ? - // ProcessData->Console = NULL; return Status; } + + /* Return it to the caller */ + AllocConsoleRequest->Console = ProcessData->Console; + /* Input Wait Handle */ AllocConsoleRequest->InputWaitHandle = ProcessData->ConsoleEvent; @@ -493,6 +420,19 @@ SourceProcessData = ConsoleGetPerProcessData(SourceProcess); /* + * We are about to create a new console. However when ConsoleNewProcess + * was called, we didn't know that we wanted to create a new console and + * therefore, we by default inherited the handles table from our parent + * process. It's only now that we notice that in fact we do not need + * them, because we've created a new console and thus we must use it. + * + * Therefore, free the console we can have and our handles table, + * and recreate a new one later on. + */ + Win32CsrReleaseConsole(TargetProcessData); + // Win32CsrFreeHandlesTable(TargetProcessData); + + /* * Inherit the console from the parent, * if any, otherwise return an error. */ @@ -504,11 +444,18 @@ } TargetProcessData->Console = SourceProcessData->Console; - DPRINT1("SrvAttachConsole - Copy the handle table (1)\n"); - Status = Win32CsrInheritHandlesTable(SourceProcessData, TargetProcessData); - DPRINT1("SrvAttachConsole - Copy the handle table (2)\n"); + /// REMARK: This code comes from Win32CsrAllocateConsole. + /* Initialize the handles table */ + Status = Win32CsrInitHandlesTable(TargetProcessData, + &AttachConsoleRequest->InputHandle, + &AttachConsoleRequest->OutputHandle, + &AttachConsoleRequest->ErrorHandle); if (!NT_SUCCESS(Status)) { + DPRINT1("Failed to initialize the handles table\n"); + + // Win32CsrReleaseConsole(TargetProcessData); + TargetProcessData->Console = NULL; goto Quit; } @@ -521,9 +468,6 @@ /* Insert the process into the processes list of the console */ InsertHeadList(&TargetProcessData->Console->ProcessList, &TargetProcessData->ConsoleLink); - - /* Return it to the caller */ - AttachConsoleRequest->Console = TargetProcessData->Console; /** Here, we inherited the console handles from the "source" process, ** so no need to reinitialize the handles table. **/ @@ -540,21 +484,12 @@ { DPRINT1("NtDuplicateObject() failed: %lu\n", Status); Win32CsrReleaseConsole(TargetProcessData); -// #if 0 - // if (NewConsole) - // { - // Win32CsrReleaseObject(TargetProcessData, - // AttachConsoleRequest->ErrorHandle); - // Win32CsrReleaseObject(TargetProcessData, - // AttachConsoleRequest->OutputHandle); - // Win32CsrReleaseObject(TargetProcessData, - // AttachConsoleRequest->InputHandle); - // } -// #endif - // ConioDeleteConsole(TargetProcessData->Console); // FIXME: Just release the console ? - // TargetProcessData->Console = NULL; goto Quit; } + + /* Return it to the caller */ + AttachConsoleRequest->Console = TargetProcessData->Console; + /* Input Wait Handle */ AttachConsoleRequest->InputWaitHandle = TargetProcessData->ConsoleEvent; Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Wed Jan 16 22:25:12 2013 @@ -140,6 +140,10 @@ CSR_API(SrvDuplicateHandle); /// CSR_API(CsrGetInputWaitHandle); +NTSTATUS FASTCALL Win32CsrInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, + OUT PHANDLE pInputHandle, + OUT PHANDLE pOutputHandle, + OUT PHANDLE pErrorHandle); NTSTATUS FASTCALL Win32CsrInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, IN PCONSOLE_PROCESS_DATA TargetProcessData); VOID FASTCALL Win32CsrFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData); @@ -157,6 +161,13 @@ VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); NTSTATUS FASTCALL Win32CsrReleaseObject(PCONSOLE_PROCESS_DATA ProcessData, HANDLE Handle); + +NTSTATUS FASTCALL Win32CsrAllocateConsole(PCONSOLE_PROCESS_DATA ProcessData, + PHANDLE pInputHandle, + PHANDLE pOutputHandle, + PHANDLE pErrorHandle, + int ShowCmd, + PCSR_PROCESS CsrProcess); VOID FASTCALL Win32CsrReleaseConsole(PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS NTAPI ConsoleNewProcess(PCSR_PROCESS SourceProcess, Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Wed Jan 16 22:25:12 2013 @@ -79,6 +79,82 @@ /* FUNCTIONS *****************************************************************/ +/* static */ NTSTATUS +FASTCALL +Win32CsrInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, + OUT PHANDLE pInputHandle, + OUT PHANDLE pOutputHandle, + OUT PHANDLE pErrorHandle) +{ + NTSTATUS Status; + HANDLE InputHandle = INVALID_HANDLE_VALUE, + OutputHandle = INVALID_HANDLE_VALUE, + ErrorHandle = INVALID_HANDLE_VALUE; + + /* + * Initialize the handles table. Use temporary variables to store + * the handles values in such a way that, if we fail, we don't + * return to the caller invalid handle values. + * + * Insert the IO handles. + */ + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + + /* Insert the Input handle */ + Status = Win32CsrInsertObject(ProcessData, + &InputHandle, + &ProcessData->Console->Header, + GENERIC_READ | GENERIC_WRITE, + TRUE, + FILE_SHARE_READ | FILE_SHARE_WRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert the input handle\n"); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrFreeHandlesTable(ProcessData); + return Status; + } + + /* Insert the Output handle */ + Status = Win32CsrInsertObject(ProcessData, + &OutputHandle, + &ProcessData->Console->ActiveBuffer->Header, + GENERIC_READ | GENERIC_WRITE, + TRUE, + FILE_SHARE_READ | FILE_SHARE_WRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert the output handle\n"); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrFreeHandlesTable(ProcessData); + return Status; + } + + /* Insert the Error handle */ + Status = Win32CsrInsertObject(ProcessData, + &ErrorHandle, + &ProcessData->Console->ActiveBuffer->Header, + GENERIC_READ | GENERIC_WRITE, + TRUE, + FILE_SHARE_READ | FILE_SHARE_WRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert the error handle\n"); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrFreeHandlesTable(ProcessData); + return Status; + } + + /* Return the newly created handles */ + *pInputHandle = InputHandle; + *pOutputHandle = OutputHandle; + *pErrorHandle = ErrorHandle; + + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return STATUS_SUCCESS; +} + NTSTATUS FASTCALL Win32CsrInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, @@ -282,6 +358,44 @@ Win32CsrUnlockConsole(Object->Console); } +NTSTATUS +FASTCALL +Win32CsrAllocateConsole(PCONSOLE_PROCESS_DATA ProcessData, + PHANDLE pInputHandle, + PHANDLE pOutputHandle, + PHANDLE pErrorHandle, + int ShowCmd, + PCSR_PROCESS CsrProcess) +{ + NTSTATUS Status = STATUS_SUCCESS; + + /* Initialize a new Console owned by the Console Leader Process */ + Status = CsrInitConsole(&ProcessData->Console, ShowCmd, CsrProcess); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Console initialization failed\n"); + return Status; + } + + /* Initialize the handles table */ + Status = Win32CsrInitHandlesTable(ProcessData, + pInputHandle, + pOutputHandle, + pErrorHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize the handles table\n"); + + // Win32CsrReleaseConsole(ProcessData); + ConioDeleteConsole(ProcessData->Console); + ProcessData->Console = NULL; + + return Status; + } + + return Status; +} + VOID FASTCALL Win32CsrReleaseConsole(PCONSOLE_PROCESS_DATA ProcessData) @@ -377,7 +491,6 @@ return Status; } - // FIXME: Do it before, or after the handles table inheritance ?? /* Temporary "inherit" the console from the parent */ TargetProcessData->ParentConsole = SourceProcessData->Console; } @@ -402,7 +515,6 @@ NTSTATUS Status = STATUS_SUCCESS; PCONSOLE_CONNECTION_INFO ConnectInfo = (PCONSOLE_CONNECTION_INFO)ConnectionInfo; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); - BOOLEAN NewConsole = FALSE; DPRINT1("ConsoleConnect\n"); @@ -440,11 +552,15 @@ Win32CsrReleaseConsole(ProcessData); /* Initialize a new Console owned by the Console Leader Process */ - NewConsole = TRUE; - Status = CsrInitConsole(&ProcessData->Console, ConnectInfo->ShowCmd, CsrProcess); + Status = Win32CsrAllocateConsole(ProcessData, + &ConnectInfo->InputHandle, + &ConnectInfo->OutputHandle, + &ConnectInfo->ErrorHandle, + ConnectInfo->ShowCmd, + CsrProcess); if (!NT_SUCCESS(Status)) { - DPRINT1("Console initialization failed\n"); + DPRINT1("Console allocation failed\n"); return Status; } } @@ -453,7 +569,6 @@ DPRINT1("ConsoleConnect - Reuse current (parent's) console\n"); /* Reuse our current console */ - NewConsole = FALSE; ProcessData->Console = ConnectInfo->Console; } @@ -463,77 +578,7 @@ /* Insert the process into the processes list of the console */ InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ConsoleLink); - /* Return it to the caller */ - ConnectInfo->Console = ProcessData->Console; - - if (NewConsole) - { - /* - * Create a new handle table - Insert the IO handles - */ - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - - /* Insert the Input handle */ - Status = Win32CsrInsertObject(ProcessData, - &ConnectInfo->InputHandle, - &ProcessData->Console->Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the input handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - Win32CsrReleaseConsole(ProcessData); - // ConioDeleteConsole(ProcessData->Console); - // ProcessData->Console = NULL; - return Status; - } - - /* Insert the Output handle */ - Status = Win32CsrInsertObject(ProcessData, - &ConnectInfo->OutputHandle, - &ProcessData->Console->ActiveBuffer->Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the output handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - Win32CsrReleaseConsole(ProcessData); - // Win32CsrReleaseObject(ProcessData, - // ConnectInfo->InputHandle); - // ConioDeleteConsole(ProcessData->Console); - // ProcessData->Console = NULL; - return Status; - } - - /* Insert the Error handle */ - Status = Win32CsrInsertObject(ProcessData, - &ConnectInfo->ErrorHandle, - &ProcessData->Console->ActiveBuffer->Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the error handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - Win32CsrReleaseConsole(ProcessData); - // Win32CsrReleaseObject(ProcessData, - // ConnectInfo->OutputHandle); - // Win32CsrReleaseObject(ProcessData, - // ConnectInfo->InputHandle); - // ConioDeleteConsole(ProcessData->Console); - // ProcessData->Console = NULL; - return Status; - } - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - } - + /// TODO: Move this up ? /* Duplicate the Event */ Status = NtDuplicateObject(NtCurrentProcess(), ProcessData->Console->ActiveEvent, @@ -544,19 +589,12 @@ { DPRINT1("NtDuplicateObject() failed: %lu\n", Status); Win32CsrReleaseConsole(ProcessData); - // if (NewConsole) - // { - // Win32CsrReleaseObject(ProcessData, - // ConnectInfo->ErrorHandle); - // Win32CsrReleaseObject(ProcessData, - // ConnectInfo->OutputHandle); - // Win32CsrReleaseObject(ProcessData, - // ConnectInfo->InputHandle); - // } - // ConioDeleteConsole(ProcessData->Console); // FIXME: Just release the console ? - // ProcessData->Console = NULL; return Status; } + + /* Return it to the caller */ + ConnectInfo->Console = ProcessData->Console; + /* Input Wait Handle */ ConnectInfo->InputWaitHandle = ProcessData->ConsoleEvent;

11 years, 9 months

[hbelusca] 58183: [KERNEL32] No need to use a UNICODE_STRING there.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 16 00:28:09 2013 New Revision: 58183 URL: http://svn.reactos.org/svn/reactos?rev=58183&view=rev Log: [KERNEL32] No need to use a UNICODE_STRING there. Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] Wed Jan 16 00:28:09 2013 @@ -116,20 +116,21 @@ IN LPCWSTR lpFileName, IN ULONG DeviceNameInfo) { - UNICODE_STRING DeviceName; + LPCWSTR DeviceName; + SIZE_T Length; _SEH2_TRY { /* DeviceNameInfo == { USHORT Offset; USHORT Length } */ - DeviceName.Length = DeviceName.MaximumLength = (USHORT)(DeviceNameInfo & 0xFFFF); - DeviceName.Buffer = (LPWSTR)((ULONG_PTR)lpFileName + ((DeviceNameInfo >> 16) & 0xFFFF)); + Length = (SIZE_T)(DeviceNameInfo & 0xFFFF); + DeviceName = (LPCWSTR)((ULONG_PTR)lpFileName + ((DeviceNameInfo >> 16) & 0xFFFF)); /* Return the data */ RtlZeroMemory(lpFindFileData, sizeof(*lpFindFileData)); lpFindFileData->dwFileAttributes = FILE_ATTRIBUTE_ARCHIVE; RtlCopyMemory(lpFindFileData->cFileName, - DeviceName.Buffer, - DeviceName.Length); + DeviceName, + Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

11 years, 9 months

[hbelusca] 58182: [KERNEL32] Fix support for CONIN$ and CONOUT$, and add support for CON special file (now, writing to C:\CON or C:\somepath\CONIN$ or C:\anotherpath\CONOUT$ works).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 16 00:16:06 2013 New Revision: 58182 URL: http://svn.reactos.org/svn/reactos?rev=58182&view=rev Log: [KERNEL32] Fix support for CONIN$ and CONOUT$, and add support for CON special file (now, writing to C:\CON or C:\somepath\CONIN$ or C:\anotherpath\CONOUT$ works). Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/dll/win32/kernel32/client/file/create.c branches/ros-csrss/dll/win32/kernel32/include/kernel32.h branches/ros-csrss/include/reactos/subsys/win/console.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] Wed Jan 16 00:16:06 2013 @@ -23,6 +23,11 @@ extern BOOL WINAPI IsDebuggerPresent(VOID); /* GLOBALS ********************************************************************/ + +/* Console reserved "file" names */ +static LPCWSTR BaseConFileName = CONSOLE_FILE_NAME; +static LPCWSTR BaseConInputFileName = CONSOLE_INPUT_FILE_NAME; +static LPCWSTR BaseConOutputFileName = CONSOLE_OUTPUT_FILE_NAME; PHANDLER_ROUTINE InitialHandler[1]; PHANDLER_ROUTINE* CtrlHandlers; @@ -189,6 +194,51 @@ /* FUNCTIONS ******************************************************************/ +LPCWSTR +IntCheckForConsoleFileName(IN LPCWSTR pszName, + IN DWORD dwDesiredAccess) +{ + LPCWSTR ConsoleName = pszName; + ULONG DeviceNameInfo; + + /* + * Check whether we deal with a DOS device, and if so, + * strip the path till the file name. + * Therefore, things like \\.\CON or C:\some_path\CONIN$ + * are transformed into CON or CONIN$, for example. + */ + DeviceNameInfo = RtlIsDosDeviceName_U(pszName); + if (DeviceNameInfo != 0) + { + ConsoleName = (LPCWSTR)((ULONG_PTR)ConsoleName + (ULONG_PTR)((DeviceNameInfo >> 16) & 0xFFFF)); + } + + /* Return a standard console "file" name according to what we passed in parameters */ + if (_wcsicmp(ConsoleName, BaseConInputFileName) == 0) + { + return BaseConInputFileName; + } + else if (_wcsicmp(ConsoleName, BaseConOutputFileName) == 0) + { + return BaseConOutputFileName; + } + else if (_wcsicmp(ConsoleName, BaseConFileName) == 0) + { + if ((dwDesiredAccess & (GENERIC_READ | GENERIC_WRITE)) == GENERIC_READ) + { + return BaseConInputFileName; + } + else if ((dwDesiredAccess & (GENERIC_READ | GENERIC_WRITE)) == GENERIC_WRITE) + { + return BaseConOutputFileName; + } + } + + /* If we are there, that means that either the file name or the desired access are wrong */ + return NULL; +} + + /* * @unimplemented (Undocumented) */ @@ -411,11 +461,11 @@ PCONSOLE_OPENCONSOLE OpenConsoleRequest = &ApiMessage.Data.OpenConsoleRequest; CONSOLE_HANDLE_TYPE HandleType; - if (wsName && 0 == _wcsicmp(wsName, L"CONIN$")) + if (wsName && 0 == _wcsicmp(wsName, BaseConInputFileName)) { HandleType = HANDLE_INPUT; } - else if (wsName && 0 == _wcsicmp(wsName, L"CONOUT$")) + else if (wsName && 0 == _wcsicmp(wsName, BaseConOutputFileName)) { HandleType = HANDLE_OUTPUT; } @@ -425,13 +475,8 @@ return INVALID_HANDLE_VALUE; } - if (dwDesiredAccess & ~(GENERIC_READ | GENERIC_WRITE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } - - if (dwShareMode & ~(FILE_SHARE_READ | FILE_SHARE_WRITE)) + if ( (dwDesiredAccess & ~(GENERIC_READ | GENERIC_WRITE)) || + (dwShareMode & ~(FILE_SHARE_READ | FILE_SHARE_WRITE)) ) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; Modified: branches/ros-csrss/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/file/create.c [iso-8859-1] Wed Jan 16 00:16:06 2013 @@ -99,6 +99,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING NtPathU; + LPCWSTR pszConsoleFileName; HANDLE FileHandle; NTSTATUS Status; ULONG FileAttributes, Flags = 0; @@ -142,10 +143,10 @@ } /* check for console input/output */ - if (0 == _wcsicmp(L"CONOUT$", lpFileName) - || 0 == _wcsicmp(L"CONIN$", lpFileName)) - { - return OpenConsoleW(lpFileName, + pszConsoleFileName = IntCheckForConsoleFileName(lpFileName, dwDesiredAccess); + if (pszConsoleFileName) + { + return OpenConsoleW(pszConsoleFileName, dwDesiredAccess, lpSecurityAttributes ? lpSecurityAttributes->bInheritHandle : FALSE, FILE_SHARE_READ | FILE_SHARE_WRITE); Modified: branches/ros-csrss/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/in… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Wed Jan 16 00:16:06 2013 @@ -106,19 +106,20 @@ typedef struct _CODEPAGE_ENTRY { - LIST_ENTRY Entry; - UINT CodePage; - HANDLE SectionHandle; - PBYTE SectionMapping; - CPTABLEINFO CodePageTable; + LIST_ENTRY Entry; + UINT CodePage; + HANDLE SectionHandle; + PBYTE SectionMapping; + CPTABLEINFO CodePageTable; } CODEPAGE_ENTRY, *PCODEPAGE_ENTRY; -typedef struct tagLOADPARMS32 { - LPSTR lpEnvAddress; - LPSTR lpCmdLine; - WORD wMagicValue; - WORD wCmdShow; - DWORD dwReserved; +typedef struct tagLOADPARMS32 +{ + LPSTR lpEnvAddress; + LPSTR lpCmdLine; + WORD wMagicValue; + WORD wCmdShow; + DWORD dwReserved; } LOADPARMS32; typedef enum _BASE_SEARCH_PATH_TYPE @@ -194,6 +195,10 @@ HANDLE WINAPI GetConsoleInputWaitHandle(VOID); + +LPCWSTR +IntCheckForConsoleFileName(IN LPCWSTR pszName, + IN DWORD dwDesiredAccess); HANDLE WINAPI OpenConsoleW(LPCWSTR wsName, DWORD dwDesiredAccess, Modified: branches/ros-csrss/include/reactos/subsys/win/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/console.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/console.h [iso-8859-1] Wed Jan 16 00:16:06 2013 @@ -14,6 +14,11 @@ #define IsConsoleHandle(h) \ (((ULONG_PTR)(h) & 0x10000003) == 0x3) +/* Console reserved "file" names */ +#define CONSOLE_FILE_NAME L"CON" +#define CONSOLE_INPUT_FILE_NAME L"CONIN$" +#define CONSOLE_OUTPUT_FILE_NAME L"CONOUT$" + #endif // _CONSOLE_H /* EOF */

11 years, 9 months

[hbelusca] 58181: "always", not "allways" !!!!!!!!!!!!!!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 15 23:26:45 2013 New Revision: 58181 URL: http://svn.reactos.org/svn/reactos?rev=58181&view=rev Log: "always", not "allways" !!!!!!!!!!!!!! Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Tue Jan 15 23:26:45 2013 @@ -200,7 +200,7 @@ FileAttributes = (dwFlagsAndAttributes & (FILE_ATTRIBUTE_VALID_FLAGS & ~FILE_ATTRIBUTE_DIRECTORY)); - /* handle may allways be waited on and querying attributes are allways allowed */ + /* handle may always be waited on and querying attributes are always allowed */ dwDesiredAccess |= SYNCHRONIZE | FILE_READ_ATTRIBUTES; /* FILE_FLAG_POSIX_SEMANTICS is handled later */ Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5818… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Tue Jan 15 23:26:45 2013 @@ -1932,7 +1932,7 @@ /* * @implemented * NOTES - * Oem string is allways nullterminated + * OEM string is always nullterminated * It performs a partial copy if oem is too small. */ NTSTATUS

11 years, 9 months

[hbelusca] 58180: Forgot this one.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 15 23:25:56 2013 New Revision: 58180 URL: http://svn.reactos.org/svn/reactos?rev=58180&view=rev Log: Forgot this one. Modified: trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp Modified: trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/ntoskrnl/IoEaTest… ============================================================================== --- trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] (original) +++ trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] Tue Jan 15 23:25:56 2013 @@ -318,7 +318,7 @@ printf("7.) Test : *********************\n"); /* The same test like 6.) but wrong strlen */ - /* Here EaBuffer::EaName is set and EaBuffer::EaNameLength is strlen(EaBuffer::EaName) EaBuffer::EaValueLength is strlen(EaBuffer::EaName)+1. EaLength is count: will allways end in STATUS_EA_LIST_INCONSISTENT */ + /* Here EaBuffer::EaName is set and EaBuffer::EaNameLength is strlen(EaBuffer::EaName) EaBuffer::EaValueLength is strlen(EaBuffer::EaName)+1. EaLength is count: will always end in STATUS_EA_LIST_INCONSISTENT */ for (i=0;i<TEST_BUFFER_LEN;i++) { TestEaLength = i;

11 years, 9 months

[hbelusca] 58179: "always", not "allways" !!!!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 15 23:23:20 2013 New Revision: 58179 URL: http://svn.reactos.org/svn/reactos?rev=58179&view=rev Log: "always", not "allways" !!!! Modified: trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp Modified: trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/ntoskrnl/IoEaTest… ============================================================================== --- trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] (original) +++ trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] Tue Jan 15 23:23:20 2013 @@ -179,7 +179,7 @@ printf("2.) Test : *********************\n"); - /* Here all zero but EaBuffer::EaName is set : will allways end in STATUS_EA_LIST_INCONSISTENT */ + /* Here all zero but EaBuffer::EaName is set : will always end in STATUS_EA_LIST_INCONSISTENT */ /* There must a link to EaBuffer::EaName */ for (i=0;i<TEST_BUFFER_LEN;i++) {

11 years, 9 months

[hbelusca] 58178: [CONSRV] Code reorganization only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 15 00:10:01 2013 New Revision: 58178 URL: http://svn.reactos.org/svn/reactos?rev=58178&view=rev Log: [CONSRV] Code reorganization only. Modified: branches/ros-csrss/win32ss/user/consrv/conio.h Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Tue Jan 15 00:10:01 2013 @@ -29,16 +29,17 @@ typedef struct _CONSOLE_SCREEN_BUFFER { Object_t Header; /* Object header */ - BYTE *Buffer; /* pointer to screen buffer */ - USHORT MaxX, MaxY; /* size of the entire scrollback buffer */ - USHORT ShowX, ShowY; /* beginning offset for the actual display area */ + LIST_ENTRY ListEntry; /* Entry in console's list of buffers */ + + BYTE *Buffer; /* Pointer to screen buffer */ + USHORT MaxX, MaxY; /* Size of the entire scrollback buffer */ + USHORT ShowX, ShowY; /* Beginning offset for the actual display area */ ULONG CurrentX; /* Current X cursor position */ ULONG CurrentY; /* Current Y cursor position */ - WORD DefaultAttrib; /* default char attribute */ - USHORT VirtualY; /* top row of buffer being displayed, reported to callers */ + WORD DefaultAttrib; /* Default char attribute */ + USHORT VirtualY; /* Top row of buffer being displayed, reported to callers */ CONSOLE_CURSOR_INFO CursorInfo; USHORT Mode; - LIST_ENTRY ListEntry; /* entry in console's list of buffers */ } CONSOLE_SCREEN_BUFFER, *PCONSOLE_SCREEN_BUFFER; typedef struct _CONSOLE

11 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
19
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 January 2013