Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jjones] 59407: Add support for compiling USBUHCI.SYS, courtesy of Mr. Wang.
by jjones＠svn.reactos.org 01 Jul '13

01 Jul '13

Author: jjones Date: Mon Jul 1 16:57:17 2013 New Revision: 59407 URL: http://svn.reactos.org/svn/reactos?rev=59407&view=rev Log: Add support for compiling USBUHCI.SYS, courtesy of Mr. Wang. Modified: branches/vs_jc/reactos/ (props changed) branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj Propchange: branches/vs_jc/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 1 16:57:17 2013 @@ -15,4 +15,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:59302-59337 +/trunk/reactos:59302-59397 Modified: branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/_IMAGES/CD_Live/C… ============================================================================== --- branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj [iso-8859-1] (original) +++ branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj [iso-8859-1] Mon Jul 1 16:57:17 2013 @@ -42,6 +42,7 @@ copy "$(SolutionDir)\drivers\filesystems\CDFS\$(OutDir)\CDFS.SYS" . copy "$(SolutionDir)\drivers\bus\PCI\$(OutDir)\PCI.SYS" . copy "$(SolutionDir)\drivers\usb\usbuhci\$(OutDir)\USBUHCI.SYS" . +copy "$(SolutionDir)\drivers\usb\usbd\$(OutDir)\USBD.SYS" . cd .. mkdir config cd "$(SolutionDir)\boot\bootdata" @@ -78,6 +79,7 @@ copy "$(SolutionDir)\drivers\filesystems\CDFS\$(OutDir)\CDFS.SYS" . copy "$(SolutionDir)\drivers\bus\PCI\$(OutDir)\PCI.SYS" . copy "$(SolutionDir)\drivers\usb\usbuhci\$(OutDir)\USBUHCI.SYS" . +copy "$(SolutionDir)\drivers\usb\usbd\$(OutDir)\USBD.SYS" . cd .. mkdir config cd "$(SolutionDir)\boot\bootdata" @@ -106,6 +108,12 @@ </ProjectReference> <ProjectReference Include="..\..\drivers\filesystems\cdfs\cdfs.vcxproj"> <Project>{1f0d3cae-da53-40bd-b7ea-77a521c4bbc2}</Project> + </ProjectReference> + <ProjectReference Include="..\..\drivers\usb\usbd\usbd.vcxproj"> + <Project>{17786c00-926d-45ff-a031-3800821afc7a}</Project> + </ProjectReference> + <ProjectReference Include="..\..\drivers\usb\usbuhci\usbuhci.vcxproj"> + <Project>{1bf87245-cd63-4e76-a594-1790bd61c498}</Project> </ProjectReference> <ProjectReference Include="..\..\hal\hal.vcxproj"> <Project>{ba5347bf-c0fd-44f0-976e-510b4d48e07b}</Project> @@ -192,4 +200,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> Modified: branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/drivers/libus… ============================================================================== --- branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj [iso-8859-1] (original) +++ branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj [iso-8859-1] Mon Jul 1 16:57:17 2013 @@ -56,7 +56,7 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\reactos</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos</AdditionalIncludeDirectories> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <CompileAs>CompileAsCpp</CompileAs> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -81,7 +81,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos</AdditionalIncludeDirectories> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <BufferSecurityCheck>false</BufferSecurityCheck> <ExceptionHandling>false</ExceptionHandling> @@ -117,4 +117,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>

1 0

[aandrejevic] 59406: [NTVDM] Implement file creation, opening, reading and writing.
by aandrejevic＠svn.reactos.org 01 Jul '13

01 Jul '13

Author: aandrejevic Date: Mon Jul 1 02:29:29 2013 New Revision: 59406 URL: http://svn.reactos.org/svn/reactos?rev=59406&view=rev Log: [NTVDM] Implement file creation, opening, reading and writing. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Mon Jul 1 02:29:29 2013 @@ -16,6 +16,8 @@ static WORD CurrentPsp = SYSTEM_PSP; static DWORD DiskTransferArea; +static HANDLE DosSystemFileTable[DOS_SFT_SIZE]; +static WORD DosSftRefCount[DOS_SFT_SIZE]; /* PRIVATE FUNCTIONS **********************************************************/ @@ -92,6 +94,125 @@ /* Just set the owner */ Mcb->OwnerPsp = NewOwner; +} + +static WORD DosOpenHandle(HANDLE Handle) +{ + BYTE i; + WORD DosHandle; + PDOS_PSP PspBlock; + LPBYTE HandleTable; + + /* The system PSP has no handle table */ + if (CurrentPsp == SYSTEM_PSP) return INVALID_DOS_HANDLE; + + /* Get a pointer to the handle table */ + PspBlock = SEGMENT_TO_PSP(CurrentPsp); + HandleTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + + /* Find a free entry in the JFT */ + for (DosHandle = 0; DosHandle < PspBlock->HandleTableSize; DosHandle++) + { + if (HandleTable[DosHandle] == 0xFF) break; + } + + /* If there are no free entries, fail */ + if (DosHandle == PspBlock->HandleTableSize) return INVALID_DOS_HANDLE; + + /* Check if the handle is already in the SFT */ + for (i = 0; i < DOS_SFT_SIZE; i++) + { + /* Check if this is the same handle */ + if (DosSystemFileTable[i] != Handle) continue; + + /* Already in the table, reference it */ + DosSftRefCount[i]++; + + /* Set the JFT entry to that SFT index */ + HandleTable[DosHandle] = i; + + /* Return the new handle */ + return DosHandle; + } + + /* Add the handle to the SFT */ + for (i = 0; i < DOS_SFT_SIZE; i++) + { + /* Make sure this is an empty table entry */ + if (DosSystemFileTable[i] != INVALID_HANDLE_VALUE) continue; + + /* Initialize the empty table entry */ + DosSystemFileTable[i] = Handle; + DosSftRefCount[i] = 1; + + /* Set the JFT entry to that SFT index */ + HandleTable[DosHandle] = i; + + /* Return the new handle */ + return DosHandle; + } + + /* The SFT is full */ + return INVALID_DOS_HANDLE; +} + +static HANDLE DosGetRealHandle(WORD DosHandle) +{ + PDOS_PSP PspBlock; + LPBYTE HandleTable; + + /* The system PSP has no handle table */ + if (CurrentPsp == SYSTEM_PSP) return INVALID_HANDLE_VALUE; + + /* Get a pointer to the handle table */ + PspBlock = SEGMENT_TO_PSP(CurrentPsp); + HandleTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + + /* Make sure the handle is open */ + if (HandleTable[DosHandle] == 0xFF) return INVALID_HANDLE_VALUE; + + /* Return the Win32 handle */ + return DosSystemFileTable[HandleTable[DosHandle]]; +} + +static VOID DosCopyHandleTable(LPBYTE DestinationTable) +{ + INT i; + PDOS_PSP PspBlock; + LPBYTE SourceTable; + + /* Clear the table first */ + for (i = 0; i < 20; i++) DestinationTable[i] = 0xFF; + + /* Check if this is the initial process */ + if (CurrentPsp == SYSTEM_PSP) + { + /* Set up the standard I/O devices */ + for (i = 0; i <= 2; i++) + { + /* Set the index in the SFT */ + DestinationTable[i] = i; + + /* Increase the reference count */ + DosSftRefCount[i]++; + } + + /* Done */ + return; + } + + /* Get the parent PSP block and handle table */ + PspBlock = SEGMENT_TO_PSP(CurrentPsp); + SourceTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + + /* Copy the first 20 handles into the new table */ + for (i = 0; i < 20; i++) + { + DestinationTable[i] = SourceTable[i]; + + /* Increase the reference count */ + DosSftRefCount[SourceTable[i]]++; + } } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -273,21 +394,193 @@ return TRUE; } -WORD DosCreateFile(LPCSTR FilePath) -{ - // TODO: NOT IMPLEMENTED - return 0; -} - -WORD DosOpenFile(LPCSTR FilePath) -{ - // TODO: NOT IMPLEMENTED - return 0; +WORD DosCreateFile(LPWORD Handle, LPCSTR FilePath, WORD Attributes) +{ + HANDLE FileHandle; + WORD DosHandle; + + /* Create the file */ + FileHandle = CreateFileA(FilePath, + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + CREATE_ALWAYS, + Attributes, + NULL); + + if (FileHandle == INVALID_HANDLE_VALUE) + { + /* Return the error code */ + return GetLastError(); + } + + /* Open the DOS handle */ + DosHandle = DosOpenHandle(FileHandle); + + if (DosHandle == INVALID_DOS_HANDLE) + { + /* Close the handle */ + CloseHandle(FileHandle); + + /* Return the error code */ + return ERROR_TOO_MANY_OPEN_FILES; + } + + /* It was successful */ + *Handle = DosHandle; + return ERROR_SUCCESS; +} + +WORD DosOpenFile(LPWORD Handle, LPCSTR FilePath, BYTE AccessMode) +{ + HANDLE FileHandle; + ACCESS_MASK Access = 0; + WORD DosHandle; + + /* Parse the access mode */ + switch (AccessMode & 3) + { + case 0: + { + /* Read-only */ + Access = GENERIC_READ; + break; + } + + case 1: + { + /* Write only */ + Access = GENERIC_WRITE; + break; + } + + case 2: + { + /* Read and write */ + Access = GENERIC_READ | GENERIC_WRITE; + break; + } + + default: + { + /* Invalid */ + return ERROR_INVALID_PARAMETER; + } + } + + /* Open the file */ + FileHandle = CreateFileA(FilePath, + Access, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + if (FileHandle == INVALID_HANDLE_VALUE) + { + /* Return the error code */ + return GetLastError(); + } + + /* Open the DOS handle */ + DosHandle = DosOpenHandle(FileHandle); + + if (DosHandle == INVALID_DOS_HANDLE) + { + /* Close the handle */ + CloseHandle(FileHandle); + + /* Return the error code */ + return ERROR_TOO_MANY_OPEN_FILES; + } + + /* It was successful */ + *Handle = DosHandle; + return ERROR_SUCCESS; +} + +WORD DosReadFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesRead) +{ + WORD Result = ERROR_SUCCESS; + DWORD BytesRead32 = 0; + HANDLE Handle = DosGetRealHandle(FileHandle); + + /* Make sure the handle is valid */ + if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_PARAMETER; + + /* Read the file */ + if (!ReadFile(Handle, Buffer, Count, &BytesRead32, NULL)) + { + /* Store the error code */ + Result = GetLastError(); + } + + /* The number of bytes read is always 16-bit */ + *BytesRead = LOWORD(BytesRead32); + + /* Return the error code */ + return Result; +} + +WORD DosWriteFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesWritten) +{ + WORD Result = ERROR_SUCCESS; + DWORD BytesWritten32 = 0; + HANDLE Handle = DosGetRealHandle(FileHandle); + + /* Make sure the handle is valid */ + if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_PARAMETER; + + /* Write the file */ + if (!WriteFile(Handle, Buffer, Count, &BytesWritten32, NULL)) + { + /* Store the error code */ + Result = GetLastError(); + } + + /* The number of bytes written is always 16-bit */ + *BytesWritten = LOWORD(BytesWritten32); + + /* Return the error code */ + return Result; +} + +BOOLEAN DosCloseHandle(WORD DosHandle) +{ + BYTE SftIndex; + PDOS_PSP PspBlock; + LPBYTE HandleTable; + + /* The system PSP has no handle table */ + if (CurrentPsp == SYSTEM_PSP) return FALSE; + + /* Get a pointer to the handle table */ + PspBlock = SEGMENT_TO_PSP(CurrentPsp); + HandleTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + + /* Make sure the handle is open */ + if (HandleTable[DosHandle] == 0xFF) return FALSE; + + /* Decrement the reference count of the SFT entry */ + SftIndex = HandleTable[DosHandle]; + DosSftRefCount[SftIndex]--; + + /* Check if the reference count fell to zero */ + if (!DosSftRefCount[SftIndex]) + { + /* Close the file, it's no longer needed */ + CloseHandle(DosSystemFileTable[SftIndex]); + + /* Clear the handle */ + DosSystemFileTable[SftIndex] = INVALID_HANDLE_VALUE; + } + + return TRUE; } VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment) { - INT i; PDOS_PSP PspBlock = SEGMENT_TO_PSP(PspSegment); LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); @@ -308,11 +601,10 @@ /* Set the parent PSP */ PspBlock->ParentPsp = CurrentPsp; - /* Initialize the handle table */ - for (i = 0; i < 20; i++) PspBlock->HandleTable[i] = 0xFF; - - - + /* Copy the parent handle table */ + DosCopyHandleTable(PspBlock->HandleTable); + + /* Set the environment block */ PspBlock->EnvBlock = Environment; /* Set the handle table pointers to the internal handle table */ @@ -863,6 +1155,152 @@ break; } + /* Create File */ + case 0x3C: + { + WORD FileHandle; + WORD ErrorCode = DosCreateFile(&FileHandle, + (LPCSTR)(ULONG_PTR)BaseAddress + + TO_LINEAR(DataSegment, LOWORD(Edx)), + LOWORD(Ecx)); + + if (ErrorCode == 0) + { + /* Clear CF */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + + /* Return the handle in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | FileHandle); + } + else + { + /* Set CF */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + + /* Return the error code in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | ErrorCode); + } + + break; + } + + /* Open File */ + case 0x3D: + { + WORD FileHandle; + WORD ErrorCode = DosCreateFile(&FileHandle, + (LPCSTR)(ULONG_PTR)BaseAddress + + TO_LINEAR(DataSegment, LOWORD(Edx)), + LOBYTE(Eax)); + + if (ErrorCode == 0) + { + /* Clear CF */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + + /* Return the handle in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | FileHandle); + } + else + { + /* Set CF */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + + /* Return the error code in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | ErrorCode); + } + + break; + } + + /* Close File */ + case 0x3E: + { + if (DosCloseHandle(LOWORD(Ebx))) + { + /* Clear CF */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + /* Set CF */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + + /* Return the error code in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | ERROR_INVALID_PARAMETER); + } + + break; + } + + /* Read File */ + case 0x3F: + { + WORD BytesRead = 0; + WORD ErrorCode = DosReadFile(LOWORD(Ebx), + (LPVOID)((ULONG_PTR)BaseAddress + + TO_LINEAR(DataSegment, LOWORD(Edx))), + LOWORD(Ecx), + &BytesRead); + + if (ErrorCode == 0) + { + /* Clear CF */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + + /* Return the number of bytes read in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | BytesRead); + } + else + { + /* Set CF */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + + /* Return the error code in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | ErrorCode); + } + break; + } + + /* Write File */ + case 0x40: + { + WORD BytesWritten = 0; + WORD ErrorCode = DosWriteFile(LOWORD(Ebx), + (LPVOID)((ULONG_PTR)BaseAddress + + TO_LINEAR(DataSegment, LOWORD(Edx))), + LOWORD(Ecx), + &BytesWritten); + + if (ErrorCode == 0) + { + /* Clear CF */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + + /* Return the number of bytes written in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | BytesWritten); + } + else + { + /* Set CF */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + + /* Return the error code in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | ErrorCode); + } + + break; + } + /* Allocate Memory */ case 0x48: { @@ -933,6 +1371,7 @@ BOOLEAN DosInitialize() { + BYTE i; PDOS_MCB Mcb = SEGMENT_TO_MCB(FIRST_MCB_SEGMENT); FILE *Stream; WCHAR Buffer[256]; @@ -1006,6 +1445,18 @@ fclose(Stream); } + /* Initialize the SFT */ + for (i = 0; i < DOS_SFT_SIZE; i++) + { + DosSystemFileTable[i] = INVALID_HANDLE_VALUE; + DosSftRefCount[i] = 0; + } + + /* Get handles to standard I/O devices */ + DosSystemFileTable[0] = GetStdHandle(STD_INPUT_HANDLE); + DosSystemFileTable[1] = GetStdHandle(STD_OUTPUT_HANDLE); + DosSystemFileTable[2] = GetStdHandle(STD_ERROR_HANDLE); + return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Mon Jul 1 02:29:29 2013 @@ -22,6 +22,8 @@ #define USER_MEMORY_SIZE 0x8FFFF #define SYSTEM_PSP 0x08 #define SYSTEM_ENV_BLOCK 0x800 +#define INVALID_DOS_HANDLE 0xFFFF +#define DOS_SFT_SIZE 255 #define SEGMENT_TO_MCB(seg) ((PDOS_MCB)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) #define SEGMENT_TO_PSP(seg) ((PDOS_PSP)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) @@ -76,34 +78,6 @@ CHAR CommandLine[127]; } DOS_PSP, *PDOS_PSP; -typedef struct _DOS_SFT_ENTRY -{ - WORD ReferenceCount; - WORD Mode; - BYTE Attribute; - WORD DeviceInfo; - DWORD DriveParamBlock; - WORD FirstCluster; - WORD FileTime; - WORD FileDate; - DWORD FileSize; - DWORD CurrentOffset; - WORD LastClusterAccessed; - DWORD DirEntSector; - BYTE DirEntryIndex; - CHAR FileName[11]; - BYTE Reserved0[6]; - WORD OwnerPsp; - BYTE Reserved1[8]; -} DOS_SFT_ENTRY, *PDOS_SFT_ENTRY; - -typedef struct _DOS_SFT -{ - DWORD NextTablePtr; - WORD FileCount; - DOS_SFT_ENTRY Entry[ANYSIZE_ARRAY]; -} DOS_SFT, *PDOS_SFT; - typedef struct _DOS_INPUT_BUFFER { BYTE MaxLength, Length; @@ -117,6 +91,10 @@ WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable); BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable); BOOLEAN DosFreeMemory(WORD BlockData); +WORD DosCreateFile(LPWORD Handle, LPCSTR FilePath, WORD Attributes); +WORD DosOpenFile(LPWORD Handle, LPCSTR FilePath, BYTE AccessMode); +WORD DosReadFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesRead); +WORD DosWriteFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesWritten); VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment); BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Mon Jul 1 02:29:29 2013 @@ -26,6 +26,7 @@ #define MAX_SEGMENT 0xFFFF #define MAX_OFFSET 0xFFFF #define MAX_ADDRESS TO_LINEAR(MAX_SEGMENT, MAX_OFFSET) +#define FAR_POINTER(x) ((ULONG_PTR)BaseAddress + TO_LINEAR(HIWORD(x), LOWORD(x))) #define STEPS_PER_CYCLE 256 /* FUNCTIONS ******************************************************************/

1 0

[hbelusca] 59405: [CMD] Fix the default input & output console modes. Now, you can use the command interpreter via serial port redirection, by: 1- Enabling a serial port on the machine on which Rea...
by hbelusca＠svn.reactos.org 01 Jul '13

01 Jul '13

Author: hbelusca Date: Mon Jul 1 00:07:39 2013 New Revision: 59405 URL: http://svn.reactos.org/svn/reactos?rev=59405&view=rev Log: [CMD] Fix the default input & output console modes. Now, you can use the command interpreter via serial port redirection, by: 1- Enabling a serial port on the machine on which ReactOS runs. 2- Launching: cmd > AUX at a command prompt. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/redir.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Jul 1 00:07:39 2013 @@ -414,21 +414,20 @@ stui.dwFlags = STARTF_USESHOWWINDOW; stui.wShowWindow = SW_SHOWDEFAULT; - // return console to standard mode + /* Set the console to standard mode */ SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), - ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT); - - if (CreateProcess (szFullName, - szFullCmdLine, - NULL, - NULL, - TRUE, - 0, /* CREATE_NEW_PROCESS_GROUP */ - NULL, - NULL, - &stui, - &prci)) - + ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + + if (CreateProcess(szFullName, + szFullCmdLine, + NULL, + NULL, + TRUE, + 0, /* CREATE_NEW_PROCESS_GROUP */ + NULL, + NULL, + &stui, + &prci)) { CloseHandle(prci.hThread); } @@ -449,32 +448,33 @@ EnterCriticalSection(&ChildProcessRunningLock); dwChildProcessId = prci.dwProcessId; - WaitForSingleObject (prci.hProcess, INFINITE); + WaitForSingleObject(prci.hProcess, INFINITE); LeaveCriticalSection(&ChildProcessRunningLock); - GetExitCodeProcess (prci.hProcess, &dwExitCode); + GetExitCodeProcess(prci.hProcess, &dwExitCode); nErrorLevel = (INT)dwExitCode; } - CloseHandle (prci.hProcess); + CloseHandle(prci.hProcess); } else { TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(Full)); - error_bad_command (first); + error_bad_command(first); dwExitCode = 1; } - // restore console mode - SetConsoleMode ( - GetStdHandle( STD_INPUT_HANDLE ), - ENABLE_PROCESSED_INPUT ); - } - - /* Get code page if it has been change */ + /* Restore our default console mode */ + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), + ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), + ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + } + + /* Get code page if it has been changed */ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); - SetConsoleTitle (szWindowTitle); + SetConsoleTitle(szWindowTitle); return dwExitCode; } @@ -1360,7 +1360,7 @@ */ BOOL -ReadLine (TCHAR *commandline, BOOL bMore) +ReadLine(TCHAR *commandline, BOOL bMore) { TCHAR readline[CMDLINE_LENGTH]; LPTSTR ip; @@ -1426,7 +1426,7 @@ /* * control-break handler. */ -BOOL WINAPI BreakHandler (DWORD dwCtrlType) +BOOL WINAPI BreakHandler(DWORD dwCtrlType) { DWORD dwWritten; INPUT_RECORD rec; @@ -1637,18 +1637,18 @@ NtReadVirtualMemoryPtr = (NtReadVirtualMemoryProc)GetProcAddress(NtDllModule, "NtReadVirtualMemory"); } - InitLocale (); + InitLocale(); /* get default input and output console handles */ - hOut = GetStdHandle (STD_OUTPUT_HANDLE); - hIn = GetStdHandle (STD_INPUT_HANDLE); + hOut = GetStdHandle(STD_OUTPUT_HANDLE); + hIn = GetStdHandle(STD_INPUT_HANDLE); /* Set EnvironmentVariable PROMPT if it does not exists any env value. for you can change the EnvirommentVariable for prompt before cmd start this patch are not 100% right, if it does not exists a PROMPT value cmd should use $P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */ if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, sizeof(lpBuffer) / sizeof(lpBuffer[0])) == 0) - SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); + SetEnvironmentVariable(_T("PROMPT"), _T("$P$G")); #ifdef FEATURE_DIR_STACK /* initialize directory stack */ @@ -1667,10 +1667,13 @@ SetEnvironmentVariable (_T("COMSPEC"), ModuleName); } - /* add ctrl break handler */ - AddBreakHandler (); - - SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); + /* Add ctrl break handler */ + AddBreakHandler(); + + /* Set our default console mode */ + SetConsoleMode(hOut, 0); // Reinitialize the console output mode + SetConsoleMode(hOut, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + SetConsoleMode(hIn , ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); cmdLine = GetCommandLine(); TRACE ("[command args: %s]\n", debugstr_aw(cmdLine)); @@ -1800,10 +1803,15 @@ /* free GetEnvVar's buffer */ GetEnvVar(NULL); - /* remove ctrl break handler */ - RemoveBreakHandler (); - SetConsoleMode(GetStdHandle( STD_INPUT_HANDLE ), - ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT); + /* Remove ctrl break handler */ + RemoveBreakHandler(); + + /* Restore the default console mode */ + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), + ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), + ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + DeleteCriticalSection(&ChildProcessRunningLock); } Modified: trunk/reactos/base/shell/cmd/redir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/redir.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/redir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/redir.c [iso-8859-1] Mon Jul 1 00:07:39 2013 @@ -61,8 +61,7 @@ static SECURITY_ATTRIBUTES SecAttr = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; /* Some parameters used for read, write, and append, respectively */ - static - struct REDIR_PARAMS + static struct REDIR_PARAMS { DWORD dwDesiredAccess; DWORD dwShareMode;

1 0

[hbelusca] 59404: [CMD] Fix whitespace
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 23:58:48 2013 New Revision: 59404 URL: http://svn.reactos.org/svn/reactos?rev=59404&view=rev Log: [CMD] Fix whitespace Modified: trunk/reactos/base/shell/cmd/error.c Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Sun Jun 30 23:58:48 2013 @@ -37,9 +37,9 @@ if (szFormat) { - va_start (arg_ptr, szFormat); - _vstprintf (szMessage, szFormat, arg_ptr); - va_end (arg_ptr); + va_start(arg_ptr, szFormat); + _vstprintf(szMessage, szFormat, arg_ptr); + va_end(arg_ptr); } if (FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER,

1 0

[jjones] 59403: Visual Studio support for driver compilation.
by jjones＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: jjones Date: Sun Jun 30 22:38:26 2013 New Revision: 59403 URL: http://svn.reactos.org/svn/reactos?rev=59403&view=rev Log: Visual Studio support for driver compilation. Added: branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj Modified: branches/vs_jc/reactos/ReactOS.sln branches/vs_jc/reactos/drivers/usb/usbuhci/usbuhci.vcxproj [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/vs_jc/reactos/ReactOS.sln URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ReactOS.sln?rev=5… Modified: branches/vs_jc/reactos/drivers/usb/usbuhci/usbuhci.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbuh… Added: branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/drivers/libus…

1 0

[ekohl] 59402: [NETAPI32] NetUserSetInfo: Implement level 1018 and ignore the usriX_max_storage in levels 2-4.
by ekohl＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: ekohl Date: Sun Jun 30 20:18:05 2013 New Revision: 59402 URL: http://svn.reactos.org/svn/reactos?rev=59402&view=rev Log: [NETAPI32] NetUserSetInfo: Implement level 1018 and ignore the usriX_max_storage in levels 2-4. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sun Jun 30 20:18:05 2013 @@ -1323,6 +1323,7 @@ PUSER_INFO_1013 UserInfo1013; PUSER_INFO_1014 UserInfo1014; PUSER_INFO_1017 UserInfo1017; + PUSER_INFO_1018 UserInfo1018; PUSER_INFO_1024 UserInfo1024; PUSER_INFO_1025 UserInfo1025; PUSER_INFO_1051 UserInfo1051; @@ -1472,7 +1473,8 @@ } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; -// UserInfo2->usri2_max_storage; + // usri2_max_storage ignored + // UserInfo2->usri2_units_per_week; // UserInfo2->usri2_logon_hours; @@ -1573,7 +1575,8 @@ } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; -// UserInfo3->usri3_max_storage; + // usri3_max_storage ignored + // UserInfo3->usri3_units_per_week; // UserInfo3->usri3_logon_hours; @@ -1696,7 +1699,8 @@ } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; -// UserInfo3->usri4_max_storage; + // usri4_max_storage ignored + // UserInfo3->usri4_units_per_week; // UserInfo3->usri4_logon_hours; @@ -1851,7 +1855,16 @@ UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; break; -// case 1018: + case 1018: + UserInfo1018 = (PUSER_INFO_1018)UserInfo; + + if (UserInfo1018->usri1018_max_storage != USER_MAXSTORAGE_UNLIMITED) + { + // FIXME: Report error + return ERROR_INVALID_PARAMETER; + } + break; + // case 1020: case 1024:

1 0

[hbelusca] 59401: [CMD] Add a helper function which checks whether we are going to output text to a console handle or to a file handle. Use it in ConWrite and in ConPrintfPaging.
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 19:55:39 2013 New Revision: 59401 URL: http://svn.reactos.org/svn/reactos?rev=59401&view=rev Log: [CMD] Add a helper function which checks whether we are going to output text to a console handle or to a file handle. Use it in ConWrite and in ConPrintfPaging. Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Jun 30 19:55:39 2013 @@ -25,6 +25,29 @@ UINT InputCodePage; UINT OutputCodePage; + +BOOL IsConsoleHandle(HANDLE hHandle) +{ + DWORD dwMode; + + /* Check whether the handle may be that of a console... */ + if ((GetFileType(hHandle) & FILE_TYPE_CHAR) == 0) return FALSE; + + /* + * It may be. Perform another test... The idea comes from the + * MSDN description of the WriteConsole API: + * + * "WriteConsole fails if it is used with a standard handle + * that is redirected to a file. If an application processes + * multilingual output that can be redirected, determine whether + * the output handle is a console handle (one method is to call + * the GetConsoleMode function and check whether it succeeds). + * If the handle is a console handle, call WriteConsole. If the + * handle is not a console handle, the output is redirected and + * you should call WriteFile to perform the I/O." + */ + return GetConsoleMode(hHandle, &dwMode); +} VOID ConInDisable(VOID) { @@ -116,8 +139,12 @@ DWORD dwWritten; HANDLE hOutput = GetStdHandle(nStdHandle); - if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) - return; + /* Check whether we are writing to a console and if so, write to it */ + if (IsConsoleHandle(hOutput)) + { + if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) + return; + } /* We're writing to a file or pipe instead of the console. Convert the * string from TCHARs to the desired output format, if the two differ */ @@ -220,9 +247,8 @@ if (szFormat == NULL) return 0; - //get the size of the visual screen that can be printed too - if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) + if (!IsConsoleHandle(hOutput) || !GetConsoleScreenBufferInfo(hOutput, &csbi)) { // we assuming its a file handle ConPrintf(szFormat, arg_ptr, nStdHandle);

1 0

[hbelusca] 59400: [CONSRV] Improve debug prints.
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 19:21:42 2013 New Revision: 59400 URL: http://svn.reactos.org/svn/reactos?rev=59400&view=rev Log: [CONSRV] Improve debug prints. Modified: trunk/reactos/win32ss/user/consrv/handle.c Modified: trunk/reactos/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… ============================================================================== --- trunk/reactos/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/handle.c [iso-8859-1] Sun Jun 30 19:21:42 2013 @@ -418,8 +418,7 @@ ASSERT(Object); if (Entry) *Entry = NULL; - // DPRINT("ConSrvGetObject, Object: %x, %x, %x\n", - // Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); + DPRINT("ConSrvGetObject -- Object: 0x%x, Handle: 0x%x\n", Object, Handle); RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -436,7 +435,9 @@ /*(Type != 0 && ObjectEntry->Type != Type)*/ (Type != 0 && (ObjectEntry->Type & Type) == 0) ) { - DPRINT1("ConSrvGetObject returning invalid handle (%x) of type %lu with access %lu ; wanted type %lu with access %lu\n", Handle, ObjectEntry->Type, HandleEntry->Access, Type, Access); + DPRINT1("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n", + Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0)); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; }

1 0

[hbelusca] 59399: [KERNEL32] Code formatting only.
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 18:48:45 2013 New Revision: 59399 URL: http://svn.reactos.org/svn/reactos?rev=59399&view=rev Log: [KERNEL32] Code formatting only. Modified: trunk/reactos/dll/win32/kernel32/client/file/rw.c Modified: trunk/reactos/dll/win32/kernel32/client/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] Sun Jun 30 18:48:45 2013 @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/rw.c * PURPOSE: Read/write functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) * UPDATE HISTORY: * Created 01/11/98 */ @@ -23,41 +23,38 @@ BOOL WINAPI WriteFile(IN HANDLE hFile, IN LPCVOID lpBuffer, - IN DWORD nNumberOfBytesToWrite OPTIONAL, - OUT LPDWORD lpNumberOfBytesWritten OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL) -{ - NTSTATUS Status; - - TRACE("WriteFile(hFile %x)\n", hFile); - - if (lpNumberOfBytesWritten != NULL) - { - *lpNumberOfBytesWritten = 0; - } - - hFile = TranslateStdHandle(hFile); - - if (IsConsoleHandle(hFile)) - { - return WriteConsoleA(hFile, + IN DWORD nNumberOfBytesToWrite OPTIONAL, + OUT LPDWORD lpNumberOfBytesWritten OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL) +{ + NTSTATUS Status; + + TRACE("WriteFile(hFile %x)\n", hFile); + + if (lpNumberOfBytesWritten != NULL) *lpNumberOfBytesWritten = 0; + + hFile = TranslateStdHandle(hFile); + + if (IsConsoleHandle(hFile)) + { + return WriteConsoleA(hFile, lpBuffer, nNumberOfBytesToWrite, lpNumberOfBytesWritten, lpOverlapped); - } - - if (lpOverlapped != NULL) - { + } + + if (lpOverlapped != NULL) + { LARGE_INTEGER Offset; PVOID ApcContext; Offset.u.LowPart = lpOverlapped->Offset; Offset.u.HighPart = lpOverlapped->OffsetHigh; - lpOverlapped->Internal = STATUS_PENDING; - ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); - - Status = NtWriteFile(hFile, + lpOverlapped->Internal = STATUS_PENDING; + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); + + Status = NtWriteFile(hFile, lpOverlapped->hEvent, NULL, ApcContext, @@ -69,18 +66,16 @@ /* return FALSE in case of failure and pending operations! */ if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) - { - BaseSetLastNTError(Status); - return FALSE; - } + { + BaseSetLastNTError(Status); + return FALSE; + } if (lpNumberOfBytesWritten != NULL) - { - *lpNumberOfBytesWritten = lpOverlapped->InternalHigh; - } - } - else - { + *lpNumberOfBytesWritten = lpOverlapped->InternalHigh; + } + else + { IO_STATUS_BLOCK Iosb; Status = NtWriteFile(hFile, @@ -93,34 +88,31 @@ NULL, NULL); - /* wait in case operation is pending */ + /* Wait in case operation is pending */ if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(hFile, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - { - Status = Iosb.Status; - } - } + { + Status = NtWaitForSingleObject(hFile, FALSE, NULL); + if (NT_SUCCESS(Status)) Status = Iosb.Status; + } if (NT_SUCCESS(Status)) - { - /* lpNumberOfBytesWritten must not be NULL here, in fact Win doesn't - check that case either and crashes (only after the operation - completed) */ - *lpNumberOfBytesWritten = Iosb.Information; - } + { + /* + * lpNumberOfBytesWritten must not be NULL here, in fact Win doesn't + * check that case either and crashes (only after the operation + * completed). + */ + *lpNumberOfBytesWritten = Iosb.Information; + } else - { - BaseSetLastNTError(Status); - return FALSE; - } - } - - TRACE("WriteFile() succeeded\n"); - return TRUE; + { + BaseSetLastNTError(Status); + return FALSE; + } + } + + TRACE("WriteFile() succeeded\n"); + return TRUE; } @@ -131,56 +123,49 @@ ReadFile(IN HANDLE hFile, IN LPVOID lpBuffer, IN DWORD nNumberOfBytesToRead, - OUT LPDWORD lpNumberOfBytesRead OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL) -{ - NTSTATUS Status; - - TRACE("ReadFile(hFile %x)\n", hFile); - - if (lpNumberOfBytesRead != NULL) - { - *lpNumberOfBytesRead = 0; - } - - if (!nNumberOfBytesToRead) - { - return TRUE; - } - - hFile = TranslateStdHandle(hFile); - - if (IsConsoleHandle(hFile)) - { + OUT LPDWORD lpNumberOfBytesRead OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL) +{ + NTSTATUS Status; + + TRACE("ReadFile(hFile %x)\n", hFile); + + if (lpNumberOfBytesRead != NULL) *lpNumberOfBytesRead = 0; + if (!nNumberOfBytesToRead) return TRUE; + + hFile = TranslateStdHandle(hFile); + + if (IsConsoleHandle(hFile)) + { if (ReadConsoleA(hFile, - lpBuffer, - nNumberOfBytesToRead, - lpNumberOfBytesRead, - NULL)) - { - DWORD dwMode; - GetConsoleMode(hFile, &dwMode); - if ((dwMode & ENABLE_PROCESSED_INPUT) && *(char *)lpBuffer == 0x1a) - { - /* EOF character entered; simulate end-of-file */ - *lpNumberOfBytesRead = 0; - } - return TRUE; - } + lpBuffer, + nNumberOfBytesToRead, + lpNumberOfBytesRead, + NULL)) + { + DWORD dwMode; + GetConsoleMode(hFile, &dwMode); + if ((dwMode & ENABLE_PROCESSED_INPUT) && *(PCHAR)lpBuffer == 0x1a) + { + /* EOF character entered; simulate end-of-file */ + *lpNumberOfBytesRead = 0; + } + return TRUE; + } return FALSE; - } - - if (lpOverlapped != NULL) - { + } + + if (lpOverlapped != NULL) + { LARGE_INTEGER Offset; PVOID ApcContext; Offset.u.LowPart = lpOverlapped->Offset; Offset.u.HighPart = lpOverlapped->OffsetHigh; - lpOverlapped->Internal = STATUS_PENDING; - ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); - - Status = NtReadFile(hFile, + lpOverlapped->Internal = STATUS_PENDING; + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); + + Status = NtReadFile(hFile, lpOverlapped->hEvent, NULL, ApcContext, @@ -192,24 +177,19 @@ /* return FALSE in case of failure and pending operations! */ if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) - { - if (Status == STATUS_END_OF_FILE && - lpNumberOfBytesRead != NULL) - { - *lpNumberOfBytesRead = 0; - } - - BaseSetLastNTError(Status); - return FALSE; - } + { + if (Status == STATUS_END_OF_FILE && lpNumberOfBytesRead != NULL) + *lpNumberOfBytesRead = 0; + + BaseSetLastNTError(Status); + return FALSE; + } if (lpNumberOfBytesRead != NULL) - { - *lpNumberOfBytesRead = lpOverlapped->InternalHigh; - } - } - else - { + *lpNumberOfBytesRead = lpOverlapped->InternalHigh; + } + else + { IO_STATUS_BLOCK Iosb; Status = NtReadFile(hFile, @@ -222,58 +202,57 @@ NULL, NULL); - /* wait in case operation is pending */ + /* Wait in case operation is pending */ if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(hFile, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - { - Status = Iosb.Status; - } - } + { + Status = NtWaitForSingleObject(hFile, FALSE, NULL); + if (NT_SUCCESS(Status)) Status = Iosb.Status; + } if (Status == STATUS_END_OF_FILE) - { - /* lpNumberOfBytesRead must not be NULL here, in fact Win doesn't - check that case either and crashes (only after the operation - completed) */ - *lpNumberOfBytesRead = 0; - return TRUE; - } + { + /* + * lpNumberOfBytesRead must not be NULL here, in fact Win doesn't + * check that case either and crashes (only after the operation + * completed). + */ + *lpNumberOfBytesRead = 0; + return TRUE; + } if (NT_SUCCESS(Status)) - { - /* lpNumberOfBytesRead must not be NULL here, in fact Win doesn't - check that case either and crashes (only after the operation - completed) */ - *lpNumberOfBytesRead = Iosb.Information; - } + { + /* + * lpNumberOfBytesRead must not be NULL here, in fact Win doesn't + * check that case either and crashes (only after the operation + * completed). + */ + *lpNumberOfBytesRead = Iosb.Information; + } else - { - BaseSetLastNTError(Status); - return FALSE; - } - } - - TRACE("ReadFile() succeeded\n"); - return TRUE; + { + BaseSetLastNTError(Status); + return FALSE; + } + } + + TRACE("ReadFile() succeeded\n"); + return TRUE; } VOID WINAPI ApcRoutine(PVOID ApcContext, - struct _IO_STATUS_BLOCK* IoStatusBlock, - ULONG Reserved) -{ - DWORD dwErrorCode; - LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine = - (LPOVERLAPPED_COMPLETION_ROUTINE)ApcContext; - - dwErrorCode = RtlNtStatusToDosError(IoStatusBlock->Status); - lpCompletionRoutine(dwErrorCode, - IoStatusBlock->Information, - (LPOVERLAPPED)IoStatusBlock); + PIO_STATUS_BLOCK IoStatusBlock, + ULONG Reserved) +{ + DWORD dwErrorCode; + LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine = + (LPOVERLAPPED_COMPLETION_ROUTINE)ApcContext; + + dwErrorCode = RtlNtStatusToDosError(IoStatusBlock->Status); + lpCompletionRoutine(dwErrorCode, + IoStatusBlock->Information, + (LPOVERLAPPED)IoStatusBlock); } @@ -283,71 +262,71 @@ BOOL WINAPI WriteFileEx(IN HANDLE hFile, IN LPCVOID lpBuffer, - IN DWORD nNumberOfBytesToWrite OPTIONAL, + IN DWORD nNumberOfBytesToWrite OPTIONAL, IN LPOVERLAPPED lpOverlapped, IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - LARGE_INTEGER Offset; - NTSTATUS Status; - - Offset.u.LowPart = lpOverlapped->Offset; - Offset.u.HighPart = lpOverlapped->OffsetHigh; - lpOverlapped->Internal = STATUS_PENDING; - - Status = NtWriteFile(hFile, + LARGE_INTEGER Offset; + NTSTATUS Status; + + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; + + Status = NtWriteFile(hFile, + NULL, + ApcRoutine, + lpCompletionRoutine, + (PIO_STATUS_BLOCK)lpOverlapped, + (PVOID)lpBuffer, + nNumberOfBytesToWrite, + &Offset, + NULL); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +ReadFileEx(IN HANDLE hFile, + IN LPVOID lpBuffer, + IN DWORD nNumberOfBytesToRead OPTIONAL, + IN LPOVERLAPPED lpOverlapped, + IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + LARGE_INTEGER Offset; + NTSTATUS Status; + + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; + + Status = NtReadFile(hFile, NULL, ApcRoutine, lpCompletionRoutine, (PIO_STATUS_BLOCK)lpOverlapped, - (PVOID)lpBuffer, - nNumberOfBytesToWrite, + lpBuffer, + nNumberOfBytesToRead, &Offset, NULL); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -ReadFileEx(IN HANDLE hFile, - IN LPVOID lpBuffer, - IN DWORD nNumberOfBytesToRead OPTIONAL, - IN LPOVERLAPPED lpOverlapped, - IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) -{ - LARGE_INTEGER Offset; - NTSTATUS Status; - - Offset.u.LowPart = lpOverlapped->Offset; - Offset.u.HighPart = lpOverlapped->OffsetHigh; - lpOverlapped->Internal = STATUS_PENDING; - - Status = NtReadFile(hFile, - NULL, - ApcRoutine, - lpCompletionRoutine, - (PIO_STATUS_BLOCK)lpOverlapped, - lpBuffer, - nNumberOfBytesToRead, - &Offset, - NULL); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; }

1 0

[jjones] 59398: Sync by merging from trunk.
by jjones＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: jjones Date: Sun Jun 30 18:10:06 2013 New Revision: 59398 URL: http://svn.reactos.org/svn/reactos?rev=59398&view=rev Log: Sync by merging from trunk. Added: branches/vs_jc/reactos/base/applications/rapps/rapps/dvdwritenow.txt - copied unchanged from r59397, trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt branches/vs_jc/reactos/base/applications/rapps/rapps/lazaruside.txt - copied unchanged from r59397, trunk/reactos/base/applications/rapps/rapps/lazaruside.txt branches/vs_jc/reactos/dll/win32/getuname/lang/ - copied from r59397, trunk/reactos/dll/win32/getuname/lang/ branches/vs_jc/reactos/dll/win32/msports/parallel.c - copied unchanged from r59397, trunk/reactos/dll/win32/msports/parallel.c Modified: branches/vs_jc/reactos/base/applications/mmc/rsrc.rc branches/vs_jc/reactos/base/applications/rapps/rapps/7zip.txt branches/vs_jc/reactos/base/applications/rapps/rapps/abyss.txt branches/vs_jc/reactos/base/applications/rapps/rapps/doublecommander.txt branches/vs_jc/reactos/base/applications/rapps/rapps/fap.txt branches/vs_jc/reactos/base/applications/rapps/rapps/firefox5.txt branches/vs_jc/reactos/base/applications/rapps/rapps/freebasic.txt branches/vs_jc/reactos/base/applications/rapps/rapps/irfanview.txt branches/vs_jc/reactos/base/applications/rapps/rapps/irfanviewplugins.txt branches/vs_jc/reactos/base/applications/rapps/rapps/libreoffice.txt branches/vs_jc/reactos/base/applications/rapps/rapps/mirandaim.txt branches/vs_jc/reactos/base/applications/rapps/rapps/mpc.txt branches/vs_jc/reactos/base/applications/rapps/rapps/npp.txt branches/vs_jc/reactos/base/applications/rapps/rapps/openttd.txt branches/vs_jc/reactos/base/applications/rapps/rapps/scite.txt branches/vs_jc/reactos/base/applications/rapps/rapps/scummvm.txt branches/vs_jc/reactos/base/applications/rapps/rapps/thunderbird5.txt branches/vs_jc/reactos/base/applications/rapps/rapps/vlc.txt branches/vs_jc/reactos/base/applications/regedit/childwnd.c branches/vs_jc/reactos/base/applications/regedit/main.h branches/vs_jc/reactos/base/applications/regedit/settings.c branches/vs_jc/reactos/base/applications/regedit/treeview.c branches/vs_jc/reactos/base/services/svchost/svchost.c branches/vs_jc/reactos/base/services/svchost/svchost.h branches/vs_jc/reactos/base/shell/cmd/alias.c branches/vs_jc/reactos/base/shell/cmd/assoc.c branches/vs_jc/reactos/base/shell/cmd/attrib.c branches/vs_jc/reactos/base/shell/cmd/batch.c branches/vs_jc/reactos/base/shell/cmd/batch.h branches/vs_jc/reactos/base/shell/cmd/beep.c branches/vs_jc/reactos/base/shell/cmd/call.c branches/vs_jc/reactos/base/shell/cmd/chcp.c branches/vs_jc/reactos/base/shell/cmd/choice.c branches/vs_jc/reactos/base/shell/cmd/cls.c branches/vs_jc/reactos/base/shell/cmd/cmd.c branches/vs_jc/reactos/base/shell/cmd/cmd.h branches/vs_jc/reactos/base/shell/cmd/cmd.rc branches/vs_jc/reactos/base/shell/cmd/cmdinput.c branches/vs_jc/reactos/base/shell/cmd/cmdtable.c branches/vs_jc/reactos/base/shell/cmd/color.c branches/vs_jc/reactos/base/shell/cmd/console.c branches/vs_jc/reactos/base/shell/cmd/copy.c branches/vs_jc/reactos/base/shell/cmd/date.c branches/vs_jc/reactos/base/shell/cmd/del.c branches/vs_jc/reactos/base/shell/cmd/delay.c branches/vs_jc/reactos/base/shell/cmd/dir.c branches/vs_jc/reactos/base/shell/cmd/dirstack.c branches/vs_jc/reactos/base/shell/cmd/echo.c branches/vs_jc/reactos/base/shell/cmd/error.c branches/vs_jc/reactos/base/shell/cmd/filecomp.c branches/vs_jc/reactos/base/shell/cmd/for.c branches/vs_jc/reactos/base/shell/cmd/free.c branches/vs_jc/reactos/base/shell/cmd/goto.c branches/vs_jc/reactos/base/shell/cmd/history.c branches/vs_jc/reactos/base/shell/cmd/if.c branches/vs_jc/reactos/base/shell/cmd/internal.c branches/vs_jc/reactos/base/shell/cmd/label.c branches/vs_jc/reactos/base/shell/cmd/lang/de-DE.rc branches/vs_jc/reactos/base/shell/cmd/lang/el-GR.rc branches/vs_jc/reactos/base/shell/cmd/lang/en-US.rc branches/vs_jc/reactos/base/shell/cmd/lang/es-ES.rc branches/vs_jc/reactos/base/shell/cmd/lang/fr-FR.rc branches/vs_jc/reactos/base/shell/cmd/lang/hu-HU.rc branches/vs_jc/reactos/base/shell/cmd/lang/id-ID.rc branches/vs_jc/reactos/base/shell/cmd/lang/it-IT.rc branches/vs_jc/reactos/base/shell/cmd/lang/ja-JP.rc branches/vs_jc/reactos/base/shell/cmd/lang/no-NO.rc branches/vs_jc/reactos/base/shell/cmd/lang/pl-PL.rc branches/vs_jc/reactos/base/shell/cmd/lang/ro-RO.rc branches/vs_jc/reactos/base/shell/cmd/lang/ru-RU.rc branches/vs_jc/reactos/base/shell/cmd/lang/sk-SK.rc branches/vs_jc/reactos/base/shell/cmd/lang/sv-SE.rc branches/vs_jc/reactos/base/shell/cmd/lang/uk-UA.rc branches/vs_jc/reactos/base/shell/cmd/lang/zh-CN.rc branches/vs_jc/reactos/base/shell/cmd/locale.c branches/vs_jc/reactos/base/shell/cmd/memory.c branches/vs_jc/reactos/base/shell/cmd/misc.c branches/vs_jc/reactos/base/shell/cmd/mklink.c branches/vs_jc/reactos/base/shell/cmd/move.c branches/vs_jc/reactos/base/shell/cmd/msgbox.c branches/vs_jc/reactos/base/shell/cmd/parser.c branches/vs_jc/reactos/base/shell/cmd/path.c branches/vs_jc/reactos/base/shell/cmd/pause.c branches/vs_jc/reactos/base/shell/cmd/prompt.c branches/vs_jc/reactos/base/shell/cmd/readme.txt branches/vs_jc/reactos/base/shell/cmd/redir.c branches/vs_jc/reactos/base/shell/cmd/ren.c branches/vs_jc/reactos/base/shell/cmd/ren.txt branches/vs_jc/reactos/base/shell/cmd/replace.c branches/vs_jc/reactos/base/shell/cmd/resource.h branches/vs_jc/reactos/base/shell/cmd/screen.c branches/vs_jc/reactos/base/shell/cmd/set.c branches/vs_jc/reactos/base/shell/cmd/setlocal.c branches/vs_jc/reactos/base/shell/cmd/shift.c branches/vs_jc/reactos/base/shell/cmd/start.c branches/vs_jc/reactos/base/shell/cmd/strtoclr.c branches/vs_jc/reactos/base/shell/cmd/time.c branches/vs_jc/reactos/base/shell/cmd/timer.c branches/vs_jc/reactos/base/shell/cmd/title.c branches/vs_jc/reactos/base/shell/cmd/todo.txt branches/vs_jc/reactos/base/shell/cmd/type.c branches/vs_jc/reactos/base/shell/cmd/ver.c branches/vs_jc/reactos/base/shell/cmd/verify.c branches/vs_jc/reactos/base/shell/cmd/vol.c branches/vs_jc/reactos/base/shell/cmd/where.c branches/vs_jc/reactos/base/shell/cmd/window.c branches/vs_jc/reactos/base/shell/explorer/CMakeLists.txt branches/vs_jc/reactos/boot/freeldr/freeldr/ui/tui.c branches/vs_jc/reactos/configure.cmd branches/vs_jc/reactos/dll/cpl/desk/general.c branches/vs_jc/reactos/dll/win32/getuname/CMakeLists.txt branches/vs_jc/reactos/dll/win32/getuname/getuname.c branches/vs_jc/reactos/dll/win32/getuname/getuname.rc branches/vs_jc/reactos/dll/win32/kernel32/client/console/readwrite.c branches/vs_jc/reactos/dll/win32/kernel32/client/path.c branches/vs_jc/reactos/dll/win32/kernel32/client/vdm.c branches/vs_jc/reactos/dll/win32/msports/CMakeLists.txt branches/vs_jc/reactos/dll/win32/msports/lang/bg-BG.rc branches/vs_jc/reactos/dll/win32/msports/lang/de-DE.rc branches/vs_jc/reactos/dll/win32/msports/lang/en-US.rc branches/vs_jc/reactos/dll/win32/msports/lang/he-IL.rc branches/vs_jc/reactos/dll/win32/msports/lang/pl-PL.rc branches/vs_jc/reactos/dll/win32/msports/lang/ro-RO.rc branches/vs_jc/reactos/dll/win32/msports/lang/uk-UA.rc branches/vs_jc/reactos/dll/win32/msports/msports.spec branches/vs_jc/reactos/dll/win32/msports/resource.h branches/vs_jc/reactos/dll/win32/netapi32/CMakeLists.txt branches/vs_jc/reactos/dll/win32/netapi32/netapi32.h branches/vs_jc/reactos/dll/win32/netapi32/user.c branches/vs_jc/reactos/drivers/filesystems/mup/create.c branches/vs_jc/reactos/include/ddk/ntifs.h branches/vs_jc/reactos/include/ndk/lpcfuncs.h branches/vs_jc/reactos/include/reactos/subsys/win/conmsg.h branches/vs_jc/reactos/lib/lsalib/lsa.c branches/vs_jc/reactos/lib/rtl/path.c branches/vs_jc/reactos/lib/sdk/crt/misc/environ.c branches/vs_jc/reactos/lib/sdk/crt/string/scanf.h branches/vs_jc/reactos/ntoskrnl/fsrtl/largemcb.c branches/vs_jc/reactos/ntoskrnl/fstub/fstubex.c branches/vs_jc/reactos/win32ss/user/consrv/condrv/coninput.c branches/vs_jc/reactos/win32ss/user/consrv/condrv/text.c branches/vs_jc/reactos/win32ss/user/consrv/coninput.c branches/vs_jc/reactos/win32ss/user/consrv/conoutput.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/vs_jc/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/services/svc… Modified: branches/vs_jc/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/services/svc… Modified: branches/vs_jc/reactos/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/al… Modified: branches/vs_jc/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/as… Modified: branches/vs_jc/reactos/base/shell/cmd/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/at… Modified: branches/vs_jc/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ba… Modified: branches/vs_jc/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ba… Modified: branches/vs_jc/reactos/base/shell/cmd/beep.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/be… Modified: branches/vs_jc/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ca… Modified: branches/vs_jc/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ch… Modified: branches/vs_jc/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ch… Modified: branches/vs_jc/reactos/base/shell/cmd/cls.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cl… Modified: branches/vs_jc/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/co… Modified: branches/vs_jc/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/co… Modified: branches/vs_jc/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/co… Modified: branches/vs_jc/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/da… Modified: branches/vs_jc/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/de… Modified: branches/vs_jc/reactos/base/shell/cmd/delay.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/de… Modified: branches/vs_jc/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/di… Modified: branches/vs_jc/reactos/base/shell/cmd/dirstack.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/di… Modified: branches/vs_jc/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ec… Modified: branches/vs_jc/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/er… Modified: branches/vs_jc/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/fi… Modified: branches/vs_jc/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/fo… Modified: branches/vs_jc/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/fr… Modified: branches/vs_jc/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/go… Modified: branches/vs_jc/reactos/base/shell/cmd/history.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/hi… Modified: branches/vs_jc/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/if… Modified: branches/vs_jc/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/in… Modified: branches/vs_jc/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/lo… Modified: branches/vs_jc/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/me… Modified: branches/vs_jc/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/mi… Modified: branches/vs_jc/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/mk… Modified: branches/vs_jc/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/mo… Modified: branches/vs_jc/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ms… Modified: branches/vs_jc/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/pa… Modified: branches/vs_jc/reactos/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/pa… Modified: branches/vs_jc/reactos/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/pa… Modified: branches/vs_jc/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/pr… Modified: branches/vs_jc/reactos/base/shell/cmd/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/redir.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/sc… Modified: branches/vs_jc/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/se… Modified: branches/vs_jc/reactos/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/se… Modified: branches/vs_jc/reactos/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/sh… Modified: branches/vs_jc/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/st… Modified: branches/vs_jc/reactos/base/shell/cmd/strtoclr.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/st… Modified: branches/vs_jc/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ti… Modified: branches/vs_jc/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ti… Modified: branches/vs_jc/reactos/base/shell/cmd/title.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ti… Modified: branches/vs_jc/reactos/base/shell/cmd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/to… Modified: branches/vs_jc/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ty… Modified: branches/vs_jc/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ve… Modified: branches/vs_jc/reactos/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ve… Modified: branches/vs_jc/reactos/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/vo… Modified: branches/vs_jc/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/wh… Modified: branches/vs_jc/reactos/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/wi… Modified: branches/vs_jc/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/explor… Modified: branches/vs_jc/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/free… Modified: branches/vs_jc/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/configure.cmd?rev… Modified: branches/vs_jc/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/cpl/desk/gene… Modified: branches/vs_jc/reactos/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/getunam… Modified: branches/vs_jc/reactos/dll/win32/getuname/getuname.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/getunam… Modified: branches/vs_jc/reactos/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/getunam… Modified: branches/vs_jc/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/kernel3… Modified: branches/vs_jc/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/kernel3… Modified: branches/vs_jc/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/kernel3… Modified: branches/vs_jc/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/msports.spec URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/resource.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/netapi3… Modified: branches/vs_jc/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/netapi3… Modified: branches/vs_jc/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/netapi3… Modified: branches/vs_jc/reactos/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/filesyste… Modified: branches/vs_jc/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/ddk/ntifs… Modified: branches/vs_jc/reactos/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/ndk/lpcfu… Modified: branches/vs_jc/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/reactos/s… Modified: branches/vs_jc/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/lsalib/lsa.c?… Modified: branches/vs_jc/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/rtl/path.c?re… Modified: branches/vs_jc/reactos/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/crt/misc/… Modified: branches/vs_jc/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/crt/strin… Modified: branches/vs_jc/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntoskrnl/fsrtl/la… Modified: branches/vs_jc/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntoskrnl/fstub/fs… Modified: branches/vs_jc/reactos/win32ss/user/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons…

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