Ros-diffs

ros-diffs@reactos.org

81390 discussions

[zguo] 65646: [TREE] Cleanup of Tree utility by Lee Schroeder. CORE-8908
by zguo＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: zguo Date: Sun Dec 14 18:30:14 2014 New Revision: 65646 URL: http://svn.reactos.org/svn/reactos?rev=65646&view=rev Log: [TREE] Cleanup of Tree utility by Lee Schroeder. CORE-8908 Added: trunk/reactos/base/applications/cmdutils/tree/lang/ trunk/reactos/base/applications/cmdutils/tree/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/tree/resource.h (with props) trunk/reactos/base/applications/cmdutils/tree/tree.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt trunk/reactos/base/applications/cmdutils/tree/tree.c Modified: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] Sun Dec 14 18:30:14 2014 @@ -1,5 +1,6 @@ -add_executable(tree tree.c) +add_executable(tree tree.c tree.rc) set_module_type(tree win32cui UNICODE) +set_target_properties(tree PROPERTIES SUFFIX ".com") add_importlibs(tree msvcrt kernel32 user32) add_cd_file(TARGET tree DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/applications/cmdutils/tree/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/tree/lang/en-US.rc [iso-8859-1] Sun Dec 14 18:30:14 2014 @@ -0,0 +1,12 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "Visually displays the folder structure of a drive or path.\n\n\ +TREE [drive:][path] [/F] [/A]\n\n\ +\t/F Display the names of the files in each folder.\n\ +\t/A Use ASCII instead of extended characters.\n" + IDS_NO_SUBDIRECTORIES "No subdirectories exist" + IDS_FOLDER_PATH "Folder PATH Listing\n" + IDS_VOL_SERIAL "Volume serial number is %x:%x\n" +END Propchange: trunk/reactos/base/applications/cmdutils/tree/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/tree/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/tree/resource.h [iso-8859-1] Sun Dec 14 18:30:14 2014 @@ -0,0 +1,9 @@ +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDS_USAGE 0 +#define IDS_NO_SUBDIRECTORIES 1 +#define IDS_FOLDER_PATH 2 +#define IDS_VOL_SERIAL 3 + +#endif /* RESOURCE_H */ Propchange: trunk/reactos/base/applications/cmdutils/tree/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] Sun Dec 14 18:30:14 2014 @@ -9,16 +9,32 @@ // #include <windows.h> #include <stdio.h> +//#include <stdarg.h> + +#include "resource.h" #define STR_MAX 2048 - -const wchar_t *HELP = L"\nGraphically displays the folder structure of a drive or path. \n\nTREE [drive:][path] [/F] [/A]\n\n /F Display the names of the files in each folder.\n\n\n"; -const wchar_t *INVALID = L"No subfolders exist"; static void DrawTree(const wchar_t* strPath, const WIN32_FIND_DATA *arrFolder, const size_t szArr, UINT width, const wchar_t *prevLine, BOOL drawfolder); static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine); BOOL bShowFiles = FALSE; //if this flag is set to true, files will also be listed +BOOL bUseAscii = FALSE; //if this flag is true, ASCII characters will be used instead of UNICODE ones + +/* + * This takes strings from a resource string table + * and outputs it to the console. + */ +VOID PrintResourceString(INT resID, ...) +{ + WCHAR tmpBuffer[STR_MAX]; + va_list arg_ptr; + + va_start(arg_ptr, resID); + LoadStringW(GetModuleHandle(NULL), resID, tmpBuffer, STR_MAX); + vfwprintf(stdout, tmpBuffer, arg_ptr); + va_end(arg_ptr); +} /** * @name: HasSubFolder @@ -101,10 +117,17 @@ for(j=0;j<width-1;++j) { //if the previous line has 'â' or 'â' then the current line will add 'â' to continue the connecting line - if((BYTE)prevLine[j] == 195 || (BYTE)prevLine[j] == 179) - { - wchar_t a[]={179,0}; - wcscat(consoleOut,a); + if((BYTE)prevLine[j] == 195 || (BYTE)prevLine[j] == 179 || (BYTE)prevLine[j] == L'+' || (BYTE)prevLine[j] == L'|') + { + if (bUseAscii) + { + wchar_t a[]={179,0}; + wcscat(consoleOut,a); + } + else + { + wcscat(consoleOut,L"|"); + } } else { @@ -117,14 +140,20 @@ if(drawfolder) { // will add 'ââââFolder name - wsprintf(str, L"%c%c%c%c%s", 195, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName); + if (bUseAscii) + wsprintf(str, L"+---%s", (wchar_t*)arrFolder[i].cFileName); + else + wsprintf(str, L"%c%c%c%c%s", 195, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName); } else { if(bHasSubFolder) { // will add 'â FileNamw' //thie line is added to connect the belowfolder sub structure - wsprintf(str,L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); + if (bUseAscii) + wsprintf(str,L"| %s", (wchar_t*)arrFolder[i].cFileName); + else + wsprintf(str,L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); } else { @@ -138,14 +167,20 @@ if(drawfolder) { // 'ââââFolder name' - wsprintf(str, L"%c%c%c%c%s", 192, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName); + if (bUseAscii) + wsprintf(str, L"\\---%s", (wchar_t*)arrFolder[i].cFileName); + else + wsprintf(str, L"%c%c%c%c%s", 192, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName); } else { if(bHasSubFolder) { // 'â FileName' - wsprintf(str,L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); + if (bUseAscii) + wsprintf(str,L"| %s", (wchar_t*)arrFolder[i].cFileName); + else + wsprintf(str,L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); } else { @@ -279,14 +314,21 @@ for(i = 1; i < argc; ++i) //parse the command line { - if(wcscmp(argv[i], L"/?") == 0) - { - wprintf(HELP); //will print help and exit after - return 0; - } - else if(wcscmp(argv[i],L"/F")==0 || wcscmp(argv[i],L"/f")==0) - { - bShowFiles=TRUE; //if set to true, will populate all the files within the folder structure + if (argv[i][0] == L'-' || argv[i][0] == L'/') + { + switch (towlower(argv[i][1])) + { + case L'?': + PrintResourceString(IDS_USAGE); //will print help and exit after + return 0; + case L'f': + bShowFiles=TRUE; //if set to true, will populate all the files within the folder structure + break; + case L'a': + bUseAscii=TRUE; + break; + default:break; + } } else { @@ -294,16 +336,16 @@ BOOL b=SetCurrentDirectoryW(argv[i]); //will set the current directory for this executable if(b==FALSE) { - wprintf(INVALID); + PrintResourceString(IDS_NO_SUBDIRECTORIES); return 1; } } } - wprintf(L"Folder PATH listing\n"); + PrintResourceString(IDS_FOLDER_PATH); GetVolumeInformation(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0); - wprintf(L"Volume serial number is %x:%x\n", dwSerial >> 16, dwSerial & 0xffff); + PrintResourceString(IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff); sz = GetCurrentDirectory(1, &t); //get the buffer size strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz); //must not return before calling delete[] Added: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc (added) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Sun Dec 14 18:30:14 2014 @@ -0,0 +1,17 @@ +ï»¿#include <windef.h> +#include <winuser.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Tree Walk Utility" +#define REACTOS_STR_INTERNAL_NAME "tree" +#define REACTOS_STR_ORIGINAL_FILENAME "tree.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/tree/tree.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 65645: [NTFS] Implement GetVolumeBitmap(). This allows NFI to find which file is at which LCN: http://www.heisspiter.net/~Pierre/rostests/NTFS_NFI_LCN.png So far, NFI is not as verbos...
by pschweitzer＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: pschweitzer Date: Sun Dec 14 18:13:57 2014 New Revision: 65645 URL: http://svn.reactos.org/svn/reactos?rev=65645&view=rev Log: [NTFS] Implement GetVolumeBitmap(). This allows NFI to find which file is at which LCN: http://www.heisspiter.net/~Pierre/rostests/NTFS_NFI_LCN.png So far, NFI is not as verbose as it is on Windows in such cases, because FILE_OPEN_BY_FILE_ID is *still* unimplemented (you should consider implementing it Pierre ;-)). I checked with Windows, the correct file is found though! CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Dec 14 18:13:57 2014 @@ -666,6 +666,11 @@ PIO_STACK_LOCATION Stack; PVOLUME_BITMAP_BUFFER BitmapBuffer; LONGLONG StartingLcn; + PFILE_RECORD_HEADER BitmapRecord; + PNTFS_ATTR_CONTEXT DataContext; + ULONGLONG TotalClusters; + ULONGLONG ToCopy; + BOOLEAN Overflow = FALSE; DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); @@ -722,8 +727,59 @@ return STATUS_INVALID_PARAMETER; } - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* Round down to a multiple of 8 */ + StartingLcn = StartingLcn & ~7; + TotalClusters = DeviceExt->NtfsInfo.ClusterCount - StartingLcn; + ToCopy = TotalClusters / 8; + if ((ToCopy + FIELD_OFFSET(VOLUME_BITMAP_BUFFER, Buffer)) > Stack->Parameters.FileSystemControl.OutputBufferLength) + { + DPRINT1("Buffer too small: %x, needed: %x\n", Stack->Parameters.FileSystemControl.OutputBufferLength, (ToCopy + FIELD_OFFSET(VOLUME_BITMAP_BUFFER, Buffer))); + Overflow = TRUE; + ToCopy = Stack->Parameters.FileSystemControl.OutputBufferLength - FIELD_OFFSET(VOLUME_BITMAP_BUFFER, Buffer); + } + + BitmapRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (BitmapRecord == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(DeviceExt, NTFS_FILE_BITMAP, BitmapRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed reading volume bitmap: %lx\n", Status); + ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + return Status; + } + + Status = FindAttribute(DeviceExt, BitmapRecord, AttributeData, L"", 0, &DataContext); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed find $DATA for bitmap: %lx\n", Status); + ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + return Status; + } + + BitmapBuffer->StartingLcn.QuadPart = StartingLcn; + BitmapBuffer->BitmapSize.QuadPart = ToCopy * 8; + + Irp->IoStatus.Information = FIELD_OFFSET(VOLUME_BITMAP_BUFFER, Buffer); + _SEH2_TRY + { + Irp->IoStatus.Information += ReadAttribute(DeviceExt, DataContext, StartingLcn / 8, (PCHAR)BitmapBuffer->Buffer, ToCopy); + Status = (Overflow ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + + return STATUS_SUCCESS; }

1 0

[hbelusca] 65644: [CONSRV]: Add PCONSRV_CONSOLE --> PCONSOLE casts (needed *on purpose*).
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 18:05:50 2014 New Revision: 65644 URL: http://svn.reactos.org/svn/reactos?rev=65644&view=rev Log: [CONSRV]: Add PCONSRV_CONSOLE --> PCONSOLE casts (needed *on purpose*). Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sun Dec 14 18:05:50 2014 @@ -288,7 +288,7 @@ DPRINT("Menu item ID: %d\n", CmdId); - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; er.EventType = MENU_EVENT; er.Event.MenuEvent.dwCommandId = CmdId; @@ -753,7 +753,7 @@ PCONSRV_CONSOLE Console = GuiData->Console; INPUT_RECORD er; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; er.EventType = FOCUS_EVENT; er.Event.FocusEvent.bSetFocus = SetFocus; @@ -1151,7 +1151,7 @@ PCONSRV_CONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER ActiveBuffer; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; ActiveBuffer = GuiData->ActiveBuffer; @@ -1321,7 +1321,7 @@ SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL); - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; Buff = GuiData->ActiveBuffer; @@ -1423,7 +1423,7 @@ { PCONSRV_CONSOLE Console = GuiData->Console; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return TRUE; // TODO: Prompt for termination ? (Warn the user about possible apps running in this console) @@ -1525,7 +1525,7 @@ goto Quit; } - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) { Err = TRUE; goto Quit; @@ -1856,7 +1856,7 @@ DWORD windx, windy; UINT WidthUnit, HeightUnit; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; ActiveBuffer = GuiData->ActiveBuffer; @@ -1888,7 +1888,7 @@ /* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) @@ -1998,7 +1998,7 @@ int old_pos, Maximum; PSHORT pShowXY; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return 0; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return 0; Buff = GuiData->ActiveBuffer; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] Sun Dec 14 18:05:50 2014 @@ -177,7 +177,7 @@ PCONSRV_CONSOLE Console = GuiData->Console; BOOL FullScreen; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; /* Switch to full-screen or to windowed mode */ FullScreen = !GuiData->GuiInfo.FullScreen; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] Sun Dec 14 18:05:50 2014 @@ -131,7 +131,7 @@ if (Buffer->BitMap == NULL) return; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; rcFramebuffer->left = Buffer->ViewOrigin.X * 1 + rcView->left; rcFramebuffer->top = Buffer->ViewOrigin.Y * 1 + rcView->top; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Sun Dec 14 18:05:50 2014 @@ -238,7 +238,7 @@ DPRINT("GuiConsoleShowConsoleProperties entered\n"); - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; /* * Create a memory section to share with the applet, and map it. @@ -429,7 +429,7 @@ PTERMINAL_INFO TermInfo = NULL; PGUI_CONSOLE_INFO GuiInfo = NULL; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; /* Get the console leader process, our client */ ProcessData = ConSrvGetConsoleLeaderProcess(Console); @@ -575,7 +575,7 @@ SIZE_T Length; #endif - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; /* Get the console leader process, our client */ ProcessData = ConSrvGetConsoleLeaderProcess(Console); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Sun Dec 14 18:05:50 2014 @@ -354,7 +354,7 @@ if (Buffer->Buffer == NULL) return; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; rcFramebuffer->left = Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->left; rcFramebuffer->top = Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->top; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sun Dec 14 18:05:50 2014 @@ -291,7 +291,7 @@ } #endif - if (ConDrvValidateConsoleUnsafe(ActiveConsole->Console, CONSOLE_RUNNING, TRUE)) + if (ConDrvValidateConsoleUnsafe((PCONSOLE)ActiveConsole->Console, CONSOLE_RUNNING, TRUE)) { MSG Message; Message.hwnd = hWnd; @@ -307,7 +307,7 @@ case WM_ACTIVATE: { - if (ConDrvValidateConsoleUnsafe(ActiveConsole->Console, CONSOLE_RUNNING, TRUE)) + if (ConDrvValidateConsoleUnsafe((PCONSOLE)ActiveConsole->Console, CONSOLE_RUNNING, TRUE)) { if (LOWORD(wParam) != WA_INACTIVE) {

1 0

[hbelusca] 65643: [CONSRV]: Move all references to VDM screenbuffers from condrv back to consrv (only ConDrvWriteConsoleOutputVDM remains in condrv for now...)
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 17:30:38 2014 New Revision: 65643 URL: http://svn.reactos.org/svn/reactos?rev=65643&view=rev Log: [CONSRV]: Move all references to VDM screenbuffers from condrv back to consrv (only ConDrvWriteConsoleOutputVDM remains in condrv for now...) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sun Dec 14 17:30:38 2014 @@ -215,13 +215,6 @@ /* PUBLIC DRIVER APIS *********************************************************/ NTSTATUS NTAPI -ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, - IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN PCHAR_CELL CharInfo/*Buffer*/, - IN COORD CharInfoSize, - IN OUT PSMALL_RECT WriteRegion, - IN BOOLEAN DrawRegion); -NTSTATUS NTAPI ConDrvInvalidateBitMapRect(IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER Buffer, IN PSMALL_RECT Region) @@ -231,19 +224,6 @@ /* Validity check */ ASSERT(Console == Buffer->Header.Console); - - /* In text-mode only, draw the VDM buffer if present */ - if (GetType(Buffer) == TEXTMODE_BUFFER) - { - PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; - - /*Status =*/ ConDrvWriteConsoleOutputVDM(Buffer->Header.Console, - TextBuffer, - Console->VDMBuffer, - Console->VDMBufferSize, - Region, - FALSE); - } /* If the output buffer is the current one, redraw the correct portion of the screen */ if (Buffer == Console->ActiveBuffer) TermDrawRegion(Console, Region); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sun Dec 14 17:30:38 2014 @@ -597,14 +597,15 @@ /* * NOTE: This function is strongly inspired by ConDrvWriteConsoleOutput... + * FIXME: This function MUST be moved into consrv/conoutput.c because only + * consrv knows how to manipulate VDM screenbuffers. */ NTSTATUS NTAPI ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, IN PCHAR_CELL CharInfo/*Buffer*/, IN COORD CharInfoSize, - IN OUT PSMALL_RECT WriteRegion, - IN BOOLEAN DrawRegion) + IN PSMALL_RECT WriteRegion) { SHORT X, Y; SMALL_RECT ScreenBuffer; @@ -649,10 +650,6 @@ ++CurCharInfo; } } - - if (DrawRegion) TermDrawRegion(Console, &CapturedWriteRegion); - - *WriteRegion = CapturedWriteRegion; return STATUS_SUCCESS; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sun Dec 14 17:30:38 2014 @@ -16,6 +16,16 @@ /* PUBLIC SERVER APIS *********************************************************/ +/* + * FIXME: This function MUST be moved fro condrv/conoutput.c because only + * consrv knows how to manipulate VDM screenbuffers. + */ +NTSTATUS NTAPI +ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCHAR_CELL CharInfo/*Buffer*/, + IN COORD CharInfoSize, + IN PSMALL_RECT WriteRegion); NTSTATUS NTAPI ConDrvInvalidateBitMapRect(IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER Buffer, @@ -32,6 +42,18 @@ InvalidateDIBitsRequest->OutputHandle, &Buffer, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; + + /* In text-mode only, draw the VDM buffer if present */ + if (GetType(Buffer) == TEXTMODE_BUFFER) + { + PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; + + /*Status =*/ ConDrvWriteConsoleOutputVDM(Buffer->Header.Console, + TextBuffer, + Buffer->Header.Console->VDMBuffer, + Buffer->Header.Console->VDMBufferSize, + &InvalidateDIBitsRequest->Region); + } Status = ConDrvInvalidateBitMapRect(Buffer->Header.Console, Buffer, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Dec 14 17:30:38 2014 @@ -307,11 +307,11 @@ LONG ReferenceCount; /* Is incremented each time a handle to something in the console (a screen-buffer or the input buffer of this console) gets referenced */ CRITICAL_SECTION Lock; - CONSOLE_STATE State; /* State of the console */ - TERMINAL TermIFace; /* Frontend-specific interface */ - ULONG ConsoleID; /* The ID of the console */ LIST_ENTRY ListEntry; /* Entry in the list of consoles */ + + CONSOLE_STATE State; /* State of the console */ + TERMINAL TermIFace; /* Terminal-specific interface */ HANDLE UnpauseEvent; /* When != NULL, event for pausing the console */

1 0

[hbelusca] 65642: [CONDRV]: Code reshuffling only.
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 17:02:39 2014 New Revision: 65642 URL: http://svn.reactos.org/svn/reactos?rev=65642&view=rev Log: [CONDRV]: Code reshuffling only. Added: branches/condrv_restructure/drivers/base/condrv/dispatch.c (with props) Modified: branches/condrv_restructure/drivers/base/condrv/CMakeLists.txt branches/condrv_restructure/drivers/base/condrv/condrv.c Modified: branches/condrv_restructure/drivers/base/condrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/base… ============================================================================== --- branches/condrv_restructure/drivers/base/condrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/condrv_restructure/drivers/base/condrv/CMakeLists.txt [iso-8859-1] Sun Dec 14 17:02:39 2014 @@ -1,17 +1,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) - -## spec2def(condrv.sys condrv.spec ADD_IMPORTLIB) list(APPEND SOURCE condrv.c control.c + dispatch.c condrv.h) add_library(condrv SHARED ${SOURCE} condrv.rc) - # ${CMAKE_CURRENT_BINARY_DIR}/condrv.def) set_module_type(condrv kernelmodedriver) target_link_libraries(condrv ${PSEH_LIB}) Modified: branches/condrv_restructure/drivers/base/condrv/condrv.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/base… ============================================================================== --- branches/condrv_restructure/drivers/base/condrv/condrv.c [iso-8859-1] (original) +++ branches/condrv_restructure/drivers/base/condrv/condrv.c [iso-8859-1] Sun Dec 14 17:02:39 2014 @@ -29,80 +29,6 @@ DRIVER_DISPATCH ConDrvCleanup; */ DRIVER_DISPATCH ConDrvDispatch; - -NTSTATUS NTAPI -CompleteRequest(IN PIRP Irp, - IN NTSTATUS Status, - IN ULONG_PTR Information) -{ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = Information; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; -} - -NTSTATUS NTAPI -ConDrvDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) -{ -#define HANDLE_CTRL_CODE(Code) \ - case Code : \ - { \ - DPRINT1("ConDrv: " #Code ", stack->FileObject = 0x%p\n", stack->FileObject); \ - if (stack->FileObject) \ - { \ - DPRINT1("stack->FileObject->FileName = %wZ\n", &stack->FileObject->FileName); \ - } \ - break; \ - } - - PIO_STACK_LOCATION stack = IoGetCurrentIrpStackLocation(Irp); - // ULONG ctrlCode = stack->Parameters.DeviceIoControl.IoControlCode; - ULONG MajorFunction = stack->MajorFunction; - - /* Just display all the IRP codes for now... */ - switch (MajorFunction) - { - HANDLE_CTRL_CODE(IRP_MJ_CREATE); - HANDLE_CTRL_CODE(IRP_MJ_CREATE_NAMED_PIPE); - HANDLE_CTRL_CODE(IRP_MJ_CLOSE); - HANDLE_CTRL_CODE(IRP_MJ_READ); - HANDLE_CTRL_CODE(IRP_MJ_WRITE); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_INFORMATION); - HANDLE_CTRL_CODE(IRP_MJ_SET_INFORMATION); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_EA); - HANDLE_CTRL_CODE(IRP_MJ_SET_EA); - HANDLE_CTRL_CODE(IRP_MJ_FLUSH_BUFFERS); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_VOLUME_INFORMATION); - HANDLE_CTRL_CODE(IRP_MJ_SET_VOLUME_INFORMATION); - HANDLE_CTRL_CODE(IRP_MJ_DIRECTORY_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_FILE_SYSTEM_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_INTERNAL_DEVICE_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_SHUTDOWN); - HANDLE_CTRL_CODE(IRP_MJ_LOCK_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_CLEANUP); - HANDLE_CTRL_CODE(IRP_MJ_CREATE_MAILSLOT); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_SECURITY); - HANDLE_CTRL_CODE(IRP_MJ_SET_SECURITY); - HANDLE_CTRL_CODE(IRP_MJ_POWER); - HANDLE_CTRL_CODE(IRP_MJ_SYSTEM_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CHANGE); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_QUOTA); - HANDLE_CTRL_CODE(IRP_MJ_SET_QUOTA); - HANDLE_CTRL_CODE(IRP_MJ_PNP); - // case IRP_MJ_PNP_POWER: - // case IRP_MJ_MAXIMUM_FUNCTION: - - default: - { - DPRINT1("Unknown Major %lu\n", MajorFunction); - break; - } - } - - return CompleteRequest(Irp, STATUS_SUCCESS, 0); -} NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, @@ -168,5 +94,4 @@ return; } - /* EOF */ Added: branches/condrv_restructure/drivers/base/condrv/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/base… ============================================================================== --- branches/condrv_restructure/drivers/base/condrv/dispatch.c (added) +++ branches/condrv_restructure/drivers/base/condrv/dispatch.c [iso-8859-1] Sun Dec 14 17:02:39 2014 @@ -0,0 +1,92 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Driver + * FILE: drivers/base/condrv/dispatch.c + * PURPOSE: Console Driver - Dispatching interface + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "condrv.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI +CompleteRequest(IN PIRP Irp, + IN NTSTATUS Status, + IN ULONG_PTR Information) +{ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS NTAPI +ConDrvDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ +#define HANDLE_CTRL_CODE(Code) \ + case Code : \ + { \ + DPRINT1("ConDrv: " #Code ", stack->FileObject = 0x%p\n", stack->FileObject); \ + if (stack->FileObject) \ + { \ + DPRINT1("stack->FileObject->FileName = %wZ\n", &stack->FileObject->FileName); \ + } \ + break; \ + } + + PIO_STACK_LOCATION stack = IoGetCurrentIrpStackLocation(Irp); + // ULONG ctrlCode = stack->Parameters.DeviceIoControl.IoControlCode; + ULONG MajorFunction = stack->MajorFunction; + + /* Just display all the IRP codes for now... */ + switch (MajorFunction) + { + HANDLE_CTRL_CODE(IRP_MJ_CREATE); + HANDLE_CTRL_CODE(IRP_MJ_CREATE_NAMED_PIPE); + HANDLE_CTRL_CODE(IRP_MJ_CLOSE); + HANDLE_CTRL_CODE(IRP_MJ_READ); + HANDLE_CTRL_CODE(IRP_MJ_WRITE); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_SET_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_EA); + HANDLE_CTRL_CODE(IRP_MJ_SET_EA); + HANDLE_CTRL_CODE(IRP_MJ_FLUSH_BUFFERS); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_VOLUME_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_SET_VOLUME_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_DIRECTORY_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_FILE_SYSTEM_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_INTERNAL_DEVICE_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_SHUTDOWN); + HANDLE_CTRL_CODE(IRP_MJ_LOCK_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_CLEANUP); + HANDLE_CTRL_CODE(IRP_MJ_CREATE_MAILSLOT); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_SECURITY); + HANDLE_CTRL_CODE(IRP_MJ_SET_SECURITY); + HANDLE_CTRL_CODE(IRP_MJ_POWER); + HANDLE_CTRL_CODE(IRP_MJ_SYSTEM_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CHANGE); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_QUOTA); + HANDLE_CTRL_CODE(IRP_MJ_SET_QUOTA); + HANDLE_CTRL_CODE(IRP_MJ_PNP); + // case IRP_MJ_PNP_POWER: + // case IRP_MJ_MAXIMUM_FUNCTION: + + default: + { + DPRINT1("Unknown Major %lu\n", MajorFunction); + break; + } + } + + return CompleteRequest(Irp, STATUS_SUCCESS, 0); +} + +/* EOF */ Propchange: branches/condrv_restructure/drivers/base/condrv/dispatch.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 65641: [SACDRV]: Code formatting.
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 16:54:14 2014 New Revision: 65641 URL: http://svn.reactos.org/svn/reactos?rev=65641&view=rev Log: [SACDRV]: Code formatting. Modified: trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Sun Dec 14 16:54:14 2014 @@ -1397,8 +1397,8 @@ AlteronateFont5, AlteronateFont6, AlternateFont7, - AlternatEfont8, - Alternatefont9, + AlternateFont8, + AlternateFont9, // // Additional attributes (not supported) Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Sun Dec 14 16:54:14 2014 @@ -1088,7 +1088,7 @@ /* Return success if there's nothing to echo */ if (!(Size / sizeof(WCHAR))) return Status; - /* Start with the input string*/ + /* Start with the input string */ pwch = (PWCHAR)String; /* First, figure out how much is outside of the block length alignment */

1 0

[hbelusca] 65640: [CONSRV]: Use an optional parameter for passing things to the "line discipline" functions.
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 16:53:47 2014 New Revision: 65640 URL: http://svn.reactos.org/svn/reactos?rev=65640&view=rev Log: [CONSRV]: Use an optional parameter for passing things to the "line discipline" functions. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -238,10 +238,10 @@ NTSTATUS NTAPI ConDrvReadConsole(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL) { @@ -260,10 +260,10 @@ /* Call the line-discipline */ return TermReadStream(Console, - ExeName, Unicode, Buffer, ReadControl, + Parameter, NumCharsToRead, NumCharsRead); } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -31,11 +31,11 @@ static NTSTATUS NTAPI DummyReadStream(IN OUT PTERMINAL This, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, /**PWCHAR Buffer,**/ OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL) { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -302,10 +302,10 @@ NTSTATUS NTAPI ConDrvReadConsole(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL); static NTSTATUS @@ -324,7 +324,7 @@ ULONG NrCharactersRead = 0; ULONG CharSize = (ReadConsoleRequest->Unicode ? sizeof(WCHAR) : sizeof(CHAR)); - /* Compute the executable name, if needed */ + /* Retrieve the executable name, if needed */ if (ReadConsoleRequest->InitialNumBytes == 0 && ReadConsoleRequest->ExeLength <= sizeof(ReadConsoleRequest->StaticBuffer)) { @@ -366,10 +366,10 @@ DPRINT("Calling ConDrvReadConsole(%wZ)\n", &ExeName); Status = ConDrvReadConsole(InputBuffer->Header.Console, InputBuffer, - &ExeName, ReadConsoleRequest->Unicode, Buffer, &ReadControl, + &ExeName, ReadConsoleRequest->NumBytes / CharSize, // NrCharactersToRead &NrCharactersRead); DPRINT("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n", Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -296,17 +296,18 @@ static NTSTATUS NTAPI ConSrvTermReadStream(IN OUT PTERMINAL This, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, /**PWCHAR Buffer,**/ OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL) { PFRONTEND FrontEnd = This->Data; PCONSRV_CONSOLE Console = FrontEnd->Console; PCONSOLE_INPUT_BUFFER InputBuffer = &Console->InputBuffer; + PUNICODE_STRING ExeName = Parameter; // STATUS_PENDING : Wait if more to read ; STATUS_SUCCESS : Don't wait. NTSTATUS Status = STATUS_PENDING; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -217,13 +217,13 @@ /* Interface used only for text-mode screen buffers */ NTSTATUS (NTAPI *ReadStream)(IN OUT PTERMINAL This, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ - IN BOOLEAN Unicode, - /**PWCHAR Buffer,**/ - OUT PVOID Buffer, - IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, - IN ULONG NumCharsToRead, - OUT PULONG NumCharsRead OPTIONAL); + IN BOOLEAN Unicode, + /**PWCHAR Buffer,**/ + OUT PVOID Buffer, + IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, + IN ULONG NumCharsToRead, + OUT PULONG NumCharsRead OPTIONAL); NTSTATUS (NTAPI *WriteStream)(IN OUT PTERMINAL This, PTEXTMODE_SCREEN_BUFFER Buff, PWCHAR Buffer, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -10,9 +10,9 @@ /* Macros used to call functions in the TERMINAL_VTBL virtual table */ -#define TermReadStream(Console, ExeName, /**/ Unicode, /**/ Buffer, ReadControl, NumCharsToRead, NumCharsRead) \ - (Console)->TermIFace.Vtbl->ReadStream(&(Console)->TermIFace, (ExeName), /**/ (Unicode), /**/ \ - (Buffer), (ReadControl), (NumCharsToRead), (NumCharsRead)) +#define TermReadStream(Console, /**/ Unicode, /**/ Buffer, ReadControl, Parameter, NumCharsToRead, NumCharsRead) \ + (Console)->TermIFace.Vtbl->ReadStream(&(Console)->TermIFace, /**/ (Unicode), /**/ \ + (Buffer), (ReadControl), (Parameter), (NumCharsToRead), (NumCharsRead)) #define TermWriteStream(Console, ScreenBuffer, Buffer, Length, Attrib) \ (Console)->TermIFace.Vtbl->WriteStream(&(Console)->TermIFace, (ScreenBuffer), (Buffer), \

1 0

[pschweitzer] 65639: [NTFS] - In the VCB, directly store the total number of clusters available in the volume, this will save a few recurrent divisions - Use this everywhere it is possible - Valida...
by pschweitzer＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: pschweitzer Date: Sun Dec 14 14:38:44 2014 New Revision: 65639 URL: http://svn.reactos.org/svn/reactos?rev=65639&view=rev Log: [NTFS] - In the VCB, directly store the total number of clusters available in the volume, this will save a few recurrent divisions - Use this everywhere it is possible - Validate input in GetVolumeBitmap(): make sure we don't want bitmap beyond end of the volume CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Dec 14 14:38:44 2014 @@ -226,6 +226,7 @@ NtfsInfo->SectorsPerCluster = BootSector->BPB.SectorsPerCluster; NtfsInfo->BytesPerCluster = BootSector->BPB.BytesPerSector * BootSector->BPB.SectorsPerCluster; NtfsInfo->SectorCount = BootSector->EBPB.SectorCount; + NtfsInfo->ClusterCount = DeviceExt->NtfsInfo.SectorCount / (ULONGLONG)DeviceExt->NtfsInfo.SectorsPerCluster; NtfsInfo->MftStart.QuadPart = BootSector->EBPB.MftLocation; NtfsInfo->MftMirrStart.QuadPart = BootSector->EBPB.MftMirrLocation; @@ -547,7 +548,7 @@ DataBuffer->VolumeSerialNumber.QuadPart = DeviceExt->NtfsInfo.SerialNumber; DataBuffer->NumberSectors.QuadPart = DeviceExt->NtfsInfo.SectorCount; - DataBuffer->TotalClusters.QuadPart = DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster; + DataBuffer->TotalClusters.QuadPart = DeviceExt->NtfsInfo.ClusterCount; DataBuffer->FreeClusters.QuadPart = NtfsGetFreeClusters(DeviceExt); DataBuffer->TotalReserved.QuadPart = 0LL; // FIXME DataBuffer->BytesPerSector = DeviceExt->NtfsInfo.BytesPerSector; @@ -664,6 +665,7 @@ NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION Stack; PVOLUME_BITMAP_BUFFER BitmapBuffer; + LONGLONG StartingLcn; DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); @@ -713,6 +715,13 @@ return Status; } + StartingLcn = ((PSTARTING_LCN_INPUT_BUFFER)Stack->Parameters.FileSystemControl.Type3InputBuffer)->StartingLcn.QuadPart; + if (StartingLcn > DeviceExt->NtfsInfo.ClusterCount) + { + DPRINT1("Requested bitmap start beyond partition end: %I64x %I64x\n", DeviceExt->NtfsInfo.ClusterCount, StartingLcn); + return STATUS_INVALID_PARAMETER; + } + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Dec 14 14:38:44 2014 @@ -62,6 +62,7 @@ ULONG SectorsPerCluster; ULONG BytesPerCluster; ULONGLONG SectorCount; + ULONGLONG ClusterCount; ULARGE_INTEGER MftStart; ULARGE_INTEGER MftMirrStart; ULONG BytesPerFileRecord; Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Sun Dec 14 14:38:44 2014 @@ -70,7 +70,7 @@ } BitmapDataSize = AttributeDataLength(&DataContext->Record); - ASSERT((BitmapDataSize * 8) >= (DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster)); + ASSERT((BitmapDataSize * 8) >= DeviceExt->NtfsInfo.ClusterCount); BitmapData = ExAllocatePoolWithTag(NonPagedPool, ROUND_UP(BitmapDataSize, DeviceExt->NtfsInfo.BytesPerSector), TAG_NTFS); if (BitmapData == NULL) { @@ -86,11 +86,11 @@ } ReleaseAttributeContext(DataContext); - DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster); + DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount); DPRINT1("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); - DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - (DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster)) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); - - RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster); + DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); + + RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.ClusterCount); FreeClusters = RtlNumberOfClearBits(&Bitmap); ExFreePoolWithTag(BitmapData, TAG_NTFS); @@ -198,7 +198,7 @@ DeviceExt = DeviceObject->DeviceExtension; FsSizeInfo->AvailableAllocationUnits.QuadPart = NtfsGetFreeClusters(DeviceExt); - FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster; + FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->NtfsInfo.ClusterCount; FsSizeInfo->SectorsPerAllocationUnit = DeviceExt->NtfsInfo.SectorsPerCluster; FsSizeInfo->BytesPerSector = DeviceExt->NtfsInfo.BytesPerSector;

1 0

[pschweitzer] 65638: [NTFS] - Implement NtfsGetUserBuffer() that will (attempt to) return the user output buffer for METHOD_NEITHER IOCTL. - Implement parameters checking GetVolumeBitmap() CORE-8725
by pschweitzer＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: pschweitzer Date: Sun Dec 14 12:24:18 2014 New Revision: 65638 URL: http://svn.reactos.org/svn/reactos?rev=65638&view=rev Log: [NTFS] - Implement NtfsGetUserBuffer() that will (attempt to) return the user output buffer for METHOD_NEITHER IOCTL. - Implement parameters checking GetVolumeBitmap() CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Sun Dec 14 12:24:18 2014 @@ -20,6 +20,7 @@ add_library(ntfs SHARED ${SOURCE} ntfs.rc) set_module_type(ntfs kernelmodedriver) +target_link_libraries(ntfs ${PSEH_LIB}) add_importlibs(ntfs ntoskrnl hal) add_pch(ntfs ntfs.h SOURCE) add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Dec 14 12:24:18 2014 @@ -661,7 +661,57 @@ GetVolumeBitmap(PDEVICE_EXTENSION DeviceExt, PIRP Irp) { + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION Stack; + PVOLUME_BITMAP_BUFFER BitmapBuffer; + DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); + + Stack = IoGetCurrentIrpStackLocation(Irp); + + if (Stack->Parameters.FileSystemControl.InputBufferLength < sizeof(STARTING_LCN_INPUT_BUFFER)) + { + DPRINT1("Invalid input! %d\n", Stack->Parameters.FileSystemControl.InputBufferLength); + return STATUS_INVALID_PARAMETER; + } + + if (Stack->Parameters.FileSystemControl.OutputBufferLength < sizeof(VOLUME_BITMAP_BUFFER)) + { + DPRINT1("Invalid output! %d\n", Stack->Parameters.FileSystemControl.OutputBufferLength); + return STATUS_BUFFER_TOO_SMALL; + } + + BitmapBuffer = NtfsGetUserBuffer(Irp); + if (Irp->RequestorMode == UserMode) + { + _SEH2_TRY + { + ProbeForRead(Stack->Parameters.FileSystemControl.Type3InputBuffer, + Stack->Parameters.FileSystemControl.InputBufferLength, + sizeof(CHAR)); + ProbeForWrite(BitmapBuffer, Stack->Parameters.FileSystemControl.OutputBufferLength, + sizeof(CHAR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + if (Stack->Parameters.FileSystemControl.Type3InputBuffer == NULL || + BitmapBuffer == NULL) + { + Status = STATUS_INVALID_PARAMETER; + } + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid buffer! %p %p\n", Stack->Parameters.FileSystemControl.Type3InputBuffer, BitmapBuffer); + return Status; + } UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Sun Dec 14 12:24:18 2014 @@ -112,4 +112,17 @@ *FileAttributes = FILE_ATTRIBUTE_NORMAL; } +PVOID +NtfsGetUserBuffer(PIRP Irp) +{ + if (Irp->MdlAddress != NULL) + { + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, HighPagePriority); + } + else + { + return Irp->UserBuffer; + } +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Dec 14 12:24:18 2014 @@ -2,6 +2,7 @@ #define NTFS_H #include <ntifs.h> +#include <pseh/pseh2.h> #define CACHEPAGESIZE(pDeviceExt) \ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ @@ -729,6 +730,9 @@ NtfsAllocateIrpContext(PDEVICE_OBJECT DeviceObject, PIRP Irp); +PVOID +NtfsGetUserBuffer(PIRP Irp); + #if 0 BOOLEAN wstrcmpjoki(PWSTR s1, PWSTR s2);

1 0

[hbelusca] 65637: [COMP]: Minor code style changes + whitespace fixes.
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 12:04:45 2014 New Revision: 65637 URL: http://svn.reactos.org/svn/reactos?rev=65637&view=rev Log: [COMP]: Minor code style changes + whitespace fixes. Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Sun Dec 14 12:04:45 2014 @@ -27,7 +27,6 @@ * */ - #include <windows.h> #include <tchar.h> #include <stdio.h> @@ -43,17 +42,18 @@ return fread(buff, 1, STRBUF, in); } -INT FileSize(FILE * fd) { +INT FileSize(FILE * fd) +{ INT result = -1; if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1) { - //restoring file pointer + /* Restoring file pointer */ rewind(fd); } return result; } -/* print program usage */ +/* Print program usage */ VOID Usage(VOID) { _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n" @@ -68,16 +68,18 @@ int _tmain (int argc, TCHAR *argv[]) { INT i; - // file pointers + + /* File pointers */ FILE *fp1 = NULL; FILE *fp2 = NULL; + INT BufLen1, BufLen2; PTCHAR Buff1 = NULL; PTCHAR Buff2 = NULL; - TCHAR File1[_MAX_PATH + 1], // file paths + TCHAR File1[_MAX_PATH + 1], // File paths File2[_MAX_PATH + 1]; - BOOL bAscii = FALSE, // /A switch - bLineNos = FALSE; // /L switch + BOOL bAscii = FALSE, // /A switch + bLineNos = FALSE; // /L switch UINT LineNumber; UINT Offset; INT FileSizeFile1; @@ -86,24 +88,31 @@ INT FilesOK = 1; INT Status = EXIT_SUCCESS; - /* parse command line for options */ + /* Parse command line for options */ for (i = 1; i < argc; i++) { if (argv[i][0] == '/') { - switch (argv[i][1]) { - case 'A': bAscii = TRUE; - NumberOfOptions++; - break; - case 'L': bLineNos = TRUE; - NumberOfOptions++; - break; - case '?': Usage(); - return EXIT_SUCCESS; - default: - _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]); - Usage(); - return EXIT_FAILURE; + switch (argv[i][1]) + { + case 'A': + bAscii = TRUE; + NumberOfOptions++; + break; + + case 'L': + bLineNos = TRUE; + NumberOfOptions++; + break; + + case '?': + Usage(); + return EXIT_SUCCESS; + + default: + _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]); + Usage(); + return EXIT_FAILURE; } } } @@ -112,11 +121,13 @@ { _tcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH); _tcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH); - } else { + } + else + { _tprintf(_T("Bad command line syntax\n")); return EXIT_FAILURE; } - + Buff1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); if (Buff1 == NULL) { @@ -149,7 +160,7 @@ _tprintf(_T("Comparing %s and %s...\n"), File1, File2); FileSizeFile1 = FileSize(fp1); - if (FileSizeFile1 == -1) + if (FileSizeFile1 == -1) { _tprintf(_T("Can't determine size of file: %s\n"), File1); Status = EXIT_FAILURE; @@ -157,7 +168,7 @@ } FileSizeFile2 = FileSize(fp2); - if (FileSizeFile2 == -1) + if (FileSizeFile2 == -1) { _tprintf(_T("Can't determine size of file: %s\n"), File2); Status = EXIT_FAILURE; @@ -173,30 +184,30 @@ LineNumber = 1; Offset = 0; - while (1) + while (1) { BufLen1 = GetBuff(Buff1, fp1); BufLen2 = GetBuff(Buff2, fp2); - if (ferror(fp1) || ferror(fp2)) + if (ferror(fp1) || ferror(fp2)) { _tprintf(_T("Files read error.\n")); Status = EXIT_FAILURE; goto Cleanup; } - if (!BufLen1 && !BufLen2) + if (!BufLen1 && !BufLen2) break; assert(BufLen1 == BufLen2); - for (i = 0; i < BufLen1; i++) + for (i = 0; i < BufLen1; i++) { if (Buff1[i] != Buff2[i]) { FilesOK = 0; - //Reporting here a mismatch - if (bLineNos) + /* Reporting here a mismatch */ + if (bLineNos) { _tprintf(_T("Compare error at LINE %d\n"), LineNumber); } @@ -204,7 +215,7 @@ { _tprintf(_T("Compare error at OFFSET %d\n"), Offset); } - + if (bAscii) { _tprintf(_T("file1 = %c\n"), Buff1[i]); @@ -226,19 +237,19 @@ if (FilesOK) _tprintf(_T("Files compare OK\n")); - + Cleanup: - - if(fp1) + if (fp1) fclose(fp1); - if(fp2) + if (fp2) fclose(fp2); - if(Buff1) + if (Buff1) free(Buff1); - if(Buff2) + if (Buff2) free(Buff2); return Status; } + /* EOF */

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