Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 67511: [CRT] Implement _setjmp / longjmp on ARM
by tkreuzer＠svn.reactos.org 02 May '15

02 May '15

Author: tkreuzer Date: Sat May 2 14:07:28 2015 New Revision: 67511 URL: http://svn.reactos.org/svn/reactos?rev=67511&view=rev Log: [CRT] Implement _setjmp / longjmp on ARM Added: trunk/reactos/lib/sdk/crt/setjmp/arm/ (with props) trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s (with props) Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat May 2 14:07:28 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/arm/set… ============================================================================== --- trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s (added) +++ trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s [iso-8859-1] Sat May 2 14:07:28 2015 @@ -0,0 +1,62 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of _setjmp / longjmp + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + TEXTAREA + + LEAF_ENTRY _setjmp + + mov r1, sp + + /* Store r1 (->Frame) and r4 - r11 */ + stmia r0!, {r1,r4-r11} + + /* Store r1 (->Sp), lr (->Pc), fp (->Fpscr) */ + stmia r0!, {r1,lr,fp} + + /* Store NEON registers */ + vst1.64 {d0}, [r0]! + vst1.64 {d1}, [r0]! + vst1.64 {d2}, [r0]! + vst1.64 {d3}, [r0]! + vst1.64 {d4}, [r0]! + vst1.64 {d5}, [r0]! + vst1.64 {d6}, [r0]! + vst1.64 {d7}, [r0]! + + /* Return 0 */ + mov r0, #0 + bx lr + LEAF_END _setjmp + + LEAF_ENTRY longjmp + + ldmia r0!, {r1,r4-r11} + ldmia r0!, {r1,lr,fp} + mov sp, r1 + + /* Load NEON registers */ + vld1.64 {d0}, [r0]! + vld1.64 {d1}, [r0]! + vld1.64 {d2}, [r0]! + vld1.64 {d3}, [r0]! + vld1.64 {d4}, [r0]! + vld1.64 {d5}, [r0]! + vld1.64 {d6}, [r0]! + vld1.64 {d7}, [r0]! + + /* Return 1 */ + mov r0, #1 + bx lr + LEAF_END longjmp + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 67510: [CRT] Add stub for __i64tod and C++ wrappers for ARM
by tkreuzer＠svn.reactos.org 02 May '15

02 May '15

Author: tkreuzer Date: Sat May 2 12:48:50 2015 New Revision: 67510 URL: http://svn.reactos.org/svn/reactos?rev=67510&view=rev Log: [CRT] Add stub for __i64tod and C++ wrappers for ARM Added: trunk/reactos/lib/sdk/crt/except/arm/cpp.s (with props) trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s (with props) Added: trunk/reactos/lib/sdk/crt/except/arm/cpp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/cpp… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/cpp.s (added) +++ trunk/reactos/lib/sdk/crt/except/arm/cpp.s [iso-8859-1] Sat May 2 12:48:50 2015 @@ -0,0 +1,120 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: MSVC wrappers for C++ functions + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + MACRO + DEFINE_ALIAS $FuncName, $Target + IMPORT $Target + NESTED_ENTRY $FuncName + b $Target + NESTED_END $FuncName + MEND + + DEFINE_ALIAS ??0exception@@QAE@ABQBD@Z, MSVCRT_exception_ctor + DEFINE_ALIAS ??0exception@@QAE@ABQBDH@Z, MSVCRT_exception_ctor_noalloc + DEFINE_ALIAS ??0exception@@QAE@ABV0@@Z, MSVCRT_exception_copy_ctor + DEFINE_ALIAS ??0exception@@QAE@XZ, MSVCRT_exception_default_ctor + DEFINE_ALIAS ??1exception@@UAE@XZ, MSVCRT_exception_dtor + DEFINE_ALIAS ??4exception@@QAEAAV0@ABV0@@Z, MSVCRT_exception_opequals + DEFINE_ALIAS ??_Eexception@@UAEPAXI@Z, MSVCRT_exception_vector_dtor + DEFINE_ALIAS ??_Gexception@@UAEPAXI@Z, MSVCRT_exception_scalar_dtor + DEFINE_ALIAS ?what@exception@@UBEPBDXZ, MSVCRT_what_exception + DEFINE_ALIAS ??0bad_typeid@@QAE@ABV0@@Z, MSVCRT_bad_typeid_copy_ctor + DEFINE_ALIAS ??0bad_typeid@@QAE@PBD@Z, MSVCRT_bad_typeid_ctor + DEFINE_ALIAS ??_Fbad_typeid@@QAEXXZ, MSVCRT_bad_typeid_default_ctor + DEFINE_ALIAS ??1bad_typeid@@UAE@XZ, MSVCRT_bad_typeid_dtor + DEFINE_ALIAS ??4bad_typeid@@QAEAAV0@ABV0@@Z, MSVCRT_bad_typeid_opequals + DEFINE_ALIAS ??_Ebad_typeid@@UAEPAXI@Z, MSVCRT_bad_typeid_vector_dtor + DEFINE_ALIAS ??_Gbad_typeid@@UAEPAXI@Z, MSVCRT_bad_typeid_scalar_dtor + DEFINE_ALIAS ??0__non_rtti_object@@QAE@ABV0@@Z, MSVCRT___non_rtti_object_copy_ctor + DEFINE_ALIAS ??0__non_rtti_object@@QAE@PBD@Z, MSVCRT___non_rtti_object_ctor + DEFINE_ALIAS ??1__non_rtti_object@@UAE@XZ, MSVCRT___non_rtti_object_dtor + DEFINE_ALIAS ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, MSVCRT___non_rtti_object_opequals + DEFINE_ALIAS ??_E__non_rtti_object@@UAEPAXI@Z, MSVCRT___non_rtti_object_vector_dtor + DEFINE_ALIAS ??_G__non_rtti_object@@UAEPAXI@Z, MSVCRT___non_rtti_object_scalar_dtor + DEFINE_ALIAS ??0bad_cast@@AAE@PBQBD@Z, MSVCRT_bad_cast_ctor + DEFINE_ALIAS ??0bad_cast@@QAE@ABQBD@Z, MSVCRT_bad_cast_ctor + DEFINE_ALIAS ??0bad_cast@@QAE@ABV0@@Z, MSVCRT_bad_cast_copy_ctor + DEFINE_ALIAS ??0bad_cast@@QAE@PBD@Z, MSVCRT_bad_cast_ctor_charptr + DEFINE_ALIAS ??_Fbad_cast@@QAEXXZ, MSVCRT_bad_cast_default_ctor + DEFINE_ALIAS ??1bad_cast@@UAE@XZ, MSVCRT_bad_cast_dtor + DEFINE_ALIAS ??4bad_cast@@QAEAAV0@ABV0@@Z, MSVCRT_bad_cast_opequals + DEFINE_ALIAS ??_Ebad_cast@@UAEPAXI@Z, MSVCRT_bad_cast_vector_dtor + DEFINE_ALIAS ??_Gbad_cast@@UAEPAXI@Z, MSVCRT_bad_cast_scalar_dtor + DEFINE_ALIAS ??8type_info@@QBEHABV0@@Z, MSVCRT_type_info_opequals_equals + DEFINE_ALIAS ??9type_info@@QBEHABV0@@Z, MSVCRT_type_info_opnot_equals + DEFINE_ALIAS ?before@type_info@@QBEHABV1@@Z, MSVCRT_type_info_before + DEFINE_ALIAS ??1type_info@@UAE@XZ, MSVCRT_type_info_dtor + DEFINE_ALIAS ?name@type_info@@QBEPBDXZ, MSVCRT_type_info_name + DEFINE_ALIAS ?raw_name@type_info@@QBEPBDXZ, MSVCRT_type_info_raw_name + + DEFINE_ALIAS ??_V@YAXPAX@Z, MSVCRT_operator_delete + DEFINE_ALIAS ??2@YAPAXI@Z, MSVCRT_operator_new + DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler + DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler + DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_new_handler + DEFINE_ALIAS ?_query_new_mode@@YAHXZ, MSVCRT__query_new_mode + DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, MSVCRT__set_new_mode + DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, MSVCRT__set_se_translator + DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_terminate + DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_unexpected + DEFINE_ALIAS ?terminate@@YAXXZ, MSVCRT_terminate + DEFINE_ALIAS ?unexpected@@YAXXZ, MSVCRT_unexpected + + #undef _MSVCRT_ + MACRO + START_VTABLE $ShortName, $CxxName + LCLS RttiName + LCLS VtblName + LCLS DtorName + LCLS CxxLabel +CxxLabel SETS "|$CxxName|" +RttiName SETS "|$ShortName._rtti|" +VtblName SETS "|MSVCRT_":CC:"$ShortName._vtable|" +DtorName SETS "|MSVCRT_":CC:"$ShortName._vector_dtor|" + EXTERN $RttiName + DCD $RttiName + EXPORT $VtblName +$VtblName + EXPORT $CxxLabel +$CxxLabel + EXTERN $DtorName + DCD $DtorName + MEND + + MACRO + DEFINE_EXCEPTION_VTABLE $ShortName, $CxxName + START_VTABLE $ShortName, $CxxName + EXTERN MSVCRT_what_exception + DCD MSVCRT_what_exception + MEND + + START_VTABLE type_info, __dummyname_type_info + DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ + DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ + DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ + DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ + + GBLS FuncName + + EXTERN MSVCRT_operator_delete + __ExportName ??3@YAXPAX@Z + b MSVCRT_operator_delete + + EXTERN MSVCRT_operator_new + __ExportName ??_U@YAPAXI@Z + b MSVCRT_operator_new + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/except/arm/cpp.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__i64… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s [iso-8859-1] Sat May 2 12:48:50 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of __i64tod + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY __i64tod + + __assertfail + bx lr + + LEAF_END __i64tod + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 67509: [MSPORTS] Introduce a setting that makes the driver accept resources with an IRQ instead of only resources without an IRQ. Brought to you by The ReactOS Printing Group. CORE-9645
by akhaldi＠svn.reactos.org 02 May '15

02 May '15

Author: akhaldi Date: Sat May 2 10:23:26 2015 New Revision: 67509 URL: http://svn.reactos.org/svn/reactos?rev=67509&view=rev Log: [MSPORTS] Introduce a setting that makes the driver accept resources with an IRQ instead of only resources without an IRQ. Brought to you by The ReactOS Printing Group. CORE-9645 Modified: trunk/reactos/dll/win32/msports/classinst.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Sat May 2 10:23:26 2015 @@ -381,6 +381,7 @@ WCHAR szPortName[8]; DWORD dwPortNumber = 0; DWORD dwSize; + DWORD dwValue; LONG lError; HKEY hKey; @@ -457,6 +458,23 @@ REG_SZ, (LPBYTE)szPortName, (wcslen(szPortName) + 1) * sizeof(WCHAR)); + + /* + * FIXME / HACK: + * This is to get the w2k3 parport.sys to work until we have our own. + * This setting makes the driver accept resources with an IRQ instead + * of only resources without an IRQ. + * + * We should probably also fix IO manager to actually give devices a + * chance to register without an IRQ. CORE-9645 + */ + dwValue = 0; + RegSetValueExW(hKey, + L"FilterResourceMethod", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(dwValue)); RegCloseKey(hKey); }

1 0

[akhaldi] 67508: [PARPORT] Introduce a skeleton that will serve as base for implementing the parallel port function driver. Brought to you by The ReactOS Printing Group. CORE-9644
by akhaldi＠svn.reactos.org 02 May '15

02 May '15

Author: akhaldi Date: Sat May 2 10:15:37 2015 New Revision: 67508 URL: http://svn.reactos.org/svn/reactos?rev=67508&view=rev Log: [PARPORT] Introduce a skeleton that will serve as base for implementing the parallel port function driver. Brought to you by The ReactOS Printing Group. CORE-9644 Added: trunk/reactos/drivers/parallel/parport/CMakeLists.txt (with props) trunk/reactos/drivers/parallel/parport/parport.c (with props) trunk/reactos/drivers/parallel/parport/parport.h (with props) trunk/reactos/drivers/parallel/parport/parport.rc (with props) Modified: trunk/reactos/drivers/parallel/CMakeLists.txt trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/drivers/parallel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/CMakeList… ============================================================================== --- trunk/reactos/drivers/parallel/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/CMakeLists.txt [iso-8859-1] Sat May 2 10:15:37 2015 @@ -1,2 +1,2 @@ -add_subdirectory(parallel) +add_subdirectory(parport) Added: trunk/reactos/drivers/parallel/parport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/C… ============================================================================== --- trunk/reactos/drivers/parallel/parport/CMakeLists.txt (added) +++ trunk/reactos/drivers/parallel/parport/CMakeLists.txt [iso-8859-1] Sat May 2 10:15:37 2015 @@ -0,0 +1,5 @@ + +add_library(parport SHARED parport.c parport.rc) +set_module_type(parport kernelmodedriver) +add_importlibs(parport ntoskrnl hal) +add_cd_file(TARGET parport DESTINATION reactos/system32/drivers FOR all) Propchange: trunk/reactos/drivers/parallel/parport/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/parallel/parport/parport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.c (added) +++ trunk/reactos/drivers/parallel/parport/parport.c [iso-8859-1] Sat May 2 10:15:37 2015 @@ -0,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Parallel Port Function Driver + * PURPOSE: Parport driver loading/unloading + */ + +#include "parport.h" + +static DRIVER_UNLOAD DriverUnload; +DRIVER_INITIALIZE DriverEntry; + +static +VOID +NTAPI +DriverUnload(IN PDRIVER_OBJECT DriverObject) +{ + DPRINT("Parport DriverUnload\n"); +} + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + DPRINT("Parport DriverEntry\n"); + + DriverObject->DriverUnload = DriverUnload; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/parallel/parport/parport.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/parallel/parport/parport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.h (added) +++ trunk/reactos/drivers/parallel/parport/parport.h [iso-8859-1] Sat May 2 10:15:37 2015 @@ -0,0 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Parallel Port Function Driver + * PURPOSE: Parport driver header + */ + +#ifndef _PARPORT_PCH_ +#define _PARPORT_PCH_ + +#include <ntddk.h> +#include <ntddser.h> + +//#define NDEBUG +#include <debug.h> + +#endif /* _PARPORT_PCH_ */ Propchange: trunk/reactos/drivers/parallel/parport/parport.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/parallel/parport/parport.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.rc (added) +++ trunk/reactos/drivers/parallel/parport/parport.rc [iso-8859-1] Sat May 2 10:15:37 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Parallel Port Function Driver" +#define REACTOS_STR_INTERNAL_NAME "parport" +#define REACTOS_STR_ORIGINAL_FILENAME "parport.sys" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/parallel/parport/parport.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=67… ============================================================================== --- trunk/reactos/media/inf/ports.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/ports.inf [iso-8859-1] Sat May 2 10:15:37 2015 @@ -34,18 +34,18 @@ ;---------------------------- LPT PORT DRIVER --------------------------- [LptPort_Inst.NT] -;CopyFiles = LptPort_CopyFiles.NT +CopyFiles = LptPort_CopyFiles.NT AddReg = LptPort_AddReg.NT [LptPort_CopyFiles.NT] parport.sys [LptPort_AddReg.NT] -;HKR, , "EnumPropPages32", 0, "msports.dll,ParallelPortPropPageProvider" +HKR, , "EnumPropPages32", 0, "msports.dll,ParallelPortPropPageProvider" HKR, , "PortSubClass", 1, 00 [LptPort_Inst.NT.Services] -;AddService = parport, 0x00000002, parport_Service_Inst +AddService = parport, 0x00000002, parport_Service_Inst [parport_Service_Inst] ServiceType = 1

1 0

[aandrejevic] 67507: [NTVDM] Implement INT 27h (Terminate and Stay Resident). Keep track of the last entry SS:SP in the INT 21h handler. Restore the stack in DosTerminateProcess. The number of byte...
by aandrejevic＠svn.reactos.org 02 May '15

02 May '15

Author: aandrejevic Date: Sat May 2 02:59:21 2015 New Revision: 67507 URL: http://svn.reactos.org/svn/reactos?rev=67507&view=rev Log: [NTVDM] Implement INT 27h (Terminate and Stay Resident). Keep track of the last entry SS:SP in the INT 21h handler. Restore the stack in DosTerminateProcess. The number of bytes to keep resident applies only to the block which holds the PSP, other blocks are not freed. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat May 2 02:59:21 2015 @@ -177,6 +177,10 @@ INT Return; (*InDos)++; + + /* Save the value of SS:SP on entry in the PSP */ + SEGMENT_TO_PSP(CurrentPsp)->LastStack = + MAKELONG(getSP() + (STACK_FLAGS + 1) * 2, getSS()); /* Check the value in the AH register */ switch (getAH()) @@ -1817,6 +1821,11 @@ Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } +VOID WINAPI DosInt27h(LPWORD Stack) +{ + DosTerminateProcess(getCS(), 0, (getDX() + 0x0F) >> 4); +} + VOID WINAPI DosFastConOut(LPWORD Stack) { /* @@ -2002,6 +2011,7 @@ // RegisterDosInt32(0x22, DosInt22h ); // Termination RegisterDosInt32(0x23, DosBreakInterrupt); // Ctrl-C / Ctrl-Break // RegisterDosInt32(0x24, DosInt24h ); // Critical Error + RegisterDosInt32(0x27, DosInt27h ); // Terminate and Stay Resident RegisterDosInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output RegisterDosInt32(0x2F, DosInt2Fh ); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 2 02:59:21 2015 @@ -780,23 +780,20 @@ /* Check if this block was allocated by the process */ if (CurrentMcb->OwnerPsp == Psp) { - if (KeepResident == 0) + if (KeepResident) + { + /* Check if this is the PSP block and we should reduce its size */ + if (McbSegment == Psp && KeepResident < CurrentMcb->Size) + { + /* Reduce the size of the block */ + DosResizeMemory(McbSegment + 1, KeepResident, NULL); + break; + } + } + else { /* Free this entire block */ DosFreeMemory(McbSegment + 1); - } - else if (KeepResident < CurrentMcb->Size) - { - /* Reduce the size of the block */ - DosResizeMemory(McbSegment + 1, KeepResident, NULL); - - /* No further paragraphs need to stay resident */ - KeepResident = 0; - } - else - { - /* Just reduce the amount of paragraphs we need to keep resident */ - KeepResident -= CurrentMcb->Size; } } @@ -849,6 +846,10 @@ /* Save the return code - Normal termination */ DosErrorLevel = MAKEWORD(ReturnCode, 0x00); + /* Restore the old stack */ + setSS(HIWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); + setSP(LOWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); + /* Return control to the parent process */ CpuExecute(HIWORD(PspBlock->TerminateAddress), LOWORD(PspBlock->TerminateAddress));

1 0

[hbelusca] 67506: Fix compilation.
by hbelusca＠svn.reactos.org 02 May '15

02 May '15

Author: hbelusca Date: Sat May 2 01:26:42 2015 New Revision: 67506 URL: http://svn.reactos.org/svn/reactos?rev=67506&view=rev Log: Fix compilation. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat May 2 01:26:42 2015 @@ -260,7 +260,7 @@ DPRINT1("Starting '%s' ('%.*s')...\n", AppName, CommandInfo.CmdLen >= 2 ? CommandInfo.CmdLen - 2 /* Display the command line without the terminating 0d 0a */ - : CommandInfo.CmdLen + : CommandInfo.CmdLen, CmdLine); Result = DosStartProcess(AppName, CmdLine, Env); if (Result != ERROR_SUCCESS) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 2 01:26:42 2015 @@ -633,7 +633,7 @@ */ CmdLineSize = min(*(PBYTE)FAR_POINTER(Parameters->CommandLine), DOS_CMDLINE_LENGTH); RtlCopyMemory(CmdLine, - FAR_POINTER(Parameters->CommandLine) + 1, + (LPSTR)FAR_POINTER(Parameters->CommandLine) + 1, CmdLineSize); /* NULL-terminate it */ CmdLine[CmdLineSize] = '\0';

1 0

[hbelusca] 67505: [NTVDM] - Fix command-line handling. - Disable a hack introduced in r65012 for testing purposes.
by hbelusca＠svn.reactos.org 02 May '15

02 May '15

Author: hbelusca Date: Sat May 2 01:23:27 2015 New Revision: 67505 URL: http://svn.reactos.org/svn/reactos?rev=67505&view=rev Log: [NTVDM] - Fix command-line handling. - Disable a hack introduced in r65012 for testing purposes. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat May 2 01:23:27 2015 @@ -116,29 +116,33 @@ { case 0x08: // Launch external command { -#define CMDLINE_LENGTH 1024 - BOOL Result; DWORD dwExitCode; LPSTR Command = (LPSTR)SEG_OFF_TO_PTR(getDS(), getSI()); - LPSTR CmdPtr = Command; - CHAR CommandLine[CMDLINE_LENGTH] = ""; + CHAR CmdLine[sizeof("cmd.exe /c ") + DOS_CMDLINE_LENGTH + 1] = ""; + LPSTR CmdLinePtr; + ULONG CmdLineLen; STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInformation; - /* NULL-terminate the command line by removing the return carriage character */ - while (*CmdPtr && *CmdPtr != '\r') CmdPtr++; - *CmdPtr = '\0'; - - DPRINT1("CMD Run Command '%s'\n", Command); - /* Spawn a user-defined 32-bit command preprocessor */ - /* Build the command line */ // FIXME: Use COMSPEC env var!! - strcpy(CommandLine, "cmd.exe /c "); - strcat(CommandLine, Command); + CmdLinePtr = CmdLine; + strcpy(CmdLinePtr, "cmd.exe /c "); + CmdLinePtr += strlen(CmdLinePtr); + + /* Build a Win32-compatible command-line */ + CmdLineLen = min(strlen(Command), sizeof(CmdLine) - strlen(CmdLinePtr) - 1); + RtlCopyMemory(CmdLinePtr, Command, CmdLineLen); + CmdLinePtr[CmdLineLen] = '\0'; + + /* Remove any trailing return carriage character and NULL-terminate the command line */ + while (*CmdLinePtr && *CmdLinePtr != '\r' && *CmdLinePtr != '\n') CmdLinePtr++; + *CmdLinePtr = '\0'; + + DPRINT1("CMD Run Command '%s' ('%s')\n", Command, CmdLine); RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); RtlZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); @@ -148,7 +152,7 @@ VidBiosDetachFromConsole(); Result = CreateProcessA(NULL, - CommandLine, + CmdLine, NULL, NULL, TRUE, @@ -159,7 +163,7 @@ &ProcessInformation); if (Result) { - DPRINT1("Command '%s' launched successfully\n", Command); + DPRINT1("Command '%s' ('%s') launched successfully\n", Command, CmdLine); /* Wait for process termination */ WaitForSingleObject(ProcessInformation.hProcess, INFINITE); @@ -173,7 +177,7 @@ } else { - DPRINT1("Failed when launched command '%s'\n"); + DPRINT1("Failed when launched command '%s' ('%s')\n", Command, CmdLine); dwExitCode = GetLastError(); } @@ -210,7 +214,7 @@ PVOID Env = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); UNREFERENCED_PARAMETER(Parameter); - ASSERT(Env != NULL); + ASSERT(Env); do { @@ -253,7 +257,11 @@ } /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%s')...\n", AppName, CmdLine); + DPRINT1("Starting '%s' ('%.*s')...\n", + AppName, + CommandInfo.CmdLen >= 2 ? CommandInfo.CmdLen - 2 /* Display the command line without the terminating 0d 0a */ + : CommandInfo.CmdLen + CmdLine); Result = DosStartProcess(AppName, CmdLine, Env); if (Result != ERROR_SUCCESS) { @@ -467,8 +475,7 @@ /* Start the process from the command line */ DPRINT1("Starting '%s' ('%s')...\n", ApplicationName, CommandLine); - Result = DosStartProcess(ApplicationName, - CommandLine, + Result = DosStartProcess(ApplicationName, CommandLine, SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0)); if (Result != ERROR_SUCCESS) { Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat May 2 01:23:27 2015 @@ -160,59 +160,6 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ - -VOID DosInitializePsp(WORD PspSegment, - LPCSTR CommandLine, - WORD ProgramSize, - WORD Environment, - DWORD ReturnAddress) -{ - PDOS_PSP PspBlock = SEGMENT_TO_PSP(PspSegment); - LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); - - RtlZeroMemory(PspBlock, sizeof(*PspBlock)); - - /* Set the exit interrupt */ - PspBlock->Exit[0] = 0xCD; // int 0x20 - PspBlock->Exit[1] = 0x20; - - /* Set the number of the last paragraph */ - PspBlock->LastParagraph = PspSegment + ProgramSize - 1; - - /* Save the interrupt vectors */ - PspBlock->TerminateAddress = ReturnAddress; - PspBlock->BreakAddress = IntVecTable[0x23]; - PspBlock->CriticalAddress = IntVecTable[0x24]; - - /* Set the parent PSP */ - PspBlock->ParentPsp = CurrentPsp; - - /* 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 */ - PspBlock->HandleTableSize = 20; - PspBlock->HandleTablePtr = MAKELONG(0x18, PspSegment); - - /* Set the DOS version */ - PspBlock->DosVersion = DOS_VERSION; - - /* Set the far call opcodes */ - PspBlock->FarCall[0] = 0xCD; // int 0x21 - PspBlock->FarCall[1] = 0x21; - PspBlock->FarCall[2] = 0xCB; // retf - - if (CommandLine) - { - /* Set the command line */ - PspBlock->CommandLineSize = (BYTE)min(strlen(CommandLine), DOS_CMDLINE_LENGTH - 1); - RtlCopyMemory(PspBlock->CommandLine, CommandLine, PspBlock->CommandLineSize); - PspBlock->CommandLine[PspBlock->CommandLineSize] = '\r'; - } -} VOID WINAPI DosInt20h(LPWORD Stack) { @@ -1388,30 +1335,45 @@ /* Execute */ case 0x4B: { - DOS_EXEC_TYPE LoadType = (DOS_EXEC_TYPE)getAL(); + BYTE OrgAL = getAL(); LPSTR ProgramName = SEG_OFF_TO_PTR(getDS(), getDX()); PDOS_EXEC_PARAM_BLOCK ParamBlock = SEG_OFF_TO_PTR(getES(), getBX()); DWORD ReturnAddress = MAKELONG(Stack[STACK_IP], Stack[STACK_CS]); WORD ErrorCode; - + + if (OrgAL <= DOS_LOAD_OVERLAY) + { + DOS_EXEC_TYPE LoadType = (DOS_EXEC_TYPE)OrgAL; + #ifndef STANDALONE - if (LoadType == DOS_LOAD_AND_EXECUTE) - { - /* Create a new process */ - ErrorCode = DosCreateProcess(ProgramName, ParamBlock, ReturnAddress); - } - else - { -#else - { + if (LoadType == DOS_LOAD_AND_EXECUTE) + { + /* Create a new process */ + ErrorCode = DosCreateProcess(ProgramName, + ParamBlock, + ReturnAddress); + } + else #endif - /* Just load an executable */ - ErrorCode = DosLoadExecutable(LoadType, - ProgramName, - ParamBlock, - NULL, - NULL, - ReturnAddress); + { + /* Just load an executable */ + ErrorCode = DosLoadExecutable(LoadType, + ProgramName, + ParamBlock, + NULL, + NULL, + ReturnAddress); + } + } + else if (OrgAL == 0x05) + { + // http://www.ctyme.com/intr/rb-2942.htm + DPRINT1("Set execution state is UNIMPLEMENTED\n"); + ErrorCode = ERROR_CALL_NOT_IMPLEMENTED; + } + else + { + ErrorCode = ERROR_INVALID_FUNCTION; } if (ErrorCode == ERROR_SUCCESS) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 2 01:23:27 2015 @@ -37,10 +37,13 @@ { PDOS_PSP PspBlock = SEGMENT_TO_PSP(Segment); - /* Set the command line */ - PspBlock->CommandLineSize = (BYTE)min(strlen(CommandLine), DOS_CMDLINE_LENGTH - 1); - RtlCopyMemory(PspBlock->CommandLine, CommandLine, PspBlock->CommandLineSize); - PspBlock->CommandLine[PspBlock->CommandLineSize] = '\r'; + /* + * Copy the command line block. + * Format of the CommandLine parameter: 1 byte for size; 127 bytes for contents. + */ + PspBlock->CommandLineSize = min(*(PBYTE)CommandLine, DOS_CMDLINE_LENGTH); + CommandLine++; + RtlCopyMemory(PspBlock->CommandLine, CommandLine, DOS_CMDLINE_LENGTH); } static WORD DosCopyEnvironmentBlock(LPCSTR Environment OPTIONAL, @@ -115,8 +118,8 @@ VOID DosClonePsp(WORD DestSegment, WORD SourceSegment) { - PDOS_PSP DestPsp = SEGMENT_TO_PSP(DestSegment); - PDOS_PSP SourcePsp = SEGMENT_TO_PSP(SourceSegment); + PDOS_PSP DestPsp = SEGMENT_TO_PSP(DestSegment); + PDOS_PSP SourcePsp = SEGMENT_TO_PSP(SourceSegment); LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); /* Literally copy the PSP first */ @@ -132,7 +135,7 @@ /* Set the handle table pointers to the internal handle table */ DestPsp->HandleTableSize = DEFAULT_JFT_SIZE; - DestPsp->HandleTablePtr = MAKELONG(0x18, DestSegment); + DestPsp->HandleTablePtr = MAKELONG(0x18, DestSegment); /* Copy the parent handle table without referencing the SFT */ RtlCopyMemory(FAR_POINTER(DestPsp->HandleTablePtr), @@ -142,7 +145,7 @@ VOID DosCreatePsp(WORD Segment, WORD ProgramSize) { - PDOS_PSP PspBlock = SEGMENT_TO_PSP(Segment); + PDOS_PSP PspBlock = SEGMENT_TO_PSP(Segment); LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); RtlZeroMemory(PspBlock, sizeof(*PspBlock)); @@ -170,7 +173,7 @@ /* Set the handle table pointers to the internal handle table */ PspBlock->HandleTableSize = DEFAULT_JFT_SIZE; - PspBlock->HandleTablePtr = MAKELONG(0x18, Segment); + PspBlock->HandleTablePtr = MAKELONG(0x18, Segment); /* Set the DOS version */ PspBlock->DosVersion = DOS_VERSION; @@ -203,6 +206,9 @@ WORD MaxAllocSize; DWORD i, FileSize; + /* Buffer for command line conversion: 1 byte for size; 127 bytes for contents */ + CHAR CmdLineBuffer[1 + DOS_CMDLINE_LENGTH]; + DPRINT1("DosLoadExecutable(%d, %s, 0x%08X, 0x%08X)\n", LoadType, ExecutablePath, @@ -249,24 +255,72 @@ if (LoadType != DOS_LOAD_OVERLAY) { - LPSTR CmdLinePtr; - - if (CommandLine == NULL) - { - /* Get the command line from the parameter block */ + /* If an optional Win32 command line is given... */ + if (CommandLine) + { + /* ... convert it into DOS format */ + BYTE CmdLineLen; + + PBYTE CmdLineSize = (PBYTE)CmdLineBuffer; + LPSTR CmdLineStart = CmdLineBuffer + 1; + LPSTR CmdLinePtr = CmdLineStart; + + // For debugging purposes + RtlFillMemory(CmdLineBuffer, sizeof(CmdLineBuffer), 0xFF); + + /* + * Set the command line: it is either an empty command line or has + * the format: " foo bar ..." (with at least one leading whitespace), + * and is then always followed by '\r' (and optionally by '\n'). + */ + CmdLineLen = (BYTE)strlen(CommandLine); + *CmdLineSize = 0; + + /* + * Add the leading space if the command line is not empty + * and doesn't already start with some whitespace... + */ + if (*CommandLine && *CommandLine != '\r' && *CommandLine != '\n' && + *CommandLine != ' ' && *CommandLine != '\t') + { + (*CmdLineSize)++; + *CmdLinePtr++ = ' '; + } + + /* Compute the number of characters we need to copy from the original command line */ + CmdLineLen = min(CmdLineLen, DOS_CMDLINE_LENGTH - *CmdLineSize); + + /* The trailing '\r' or '\n' do not count in the PSP command line size parameter */ + while (CmdLineLen && (CommandLine[CmdLineLen - 1] == '\r' || CommandLine[CmdLineLen - 1] == '\n')) + { + CmdLineLen--; + } + + /* Finally, set everything up */ + *CmdLineSize += CmdLineLen; + RtlCopyMemory(CmdLinePtr, CommandLine, CmdLineLen); + CmdLineStart[*CmdLineSize] = '\r'; + + /* Finally make the pointer point to the static buffer */ + CommandLine = CmdLineBuffer; + } + else + { + /* + * ... otherwise, get the one from the parameter block. + * Format of the command line: 1 byte for size; 127 bytes for contents. + */ + ASSERT(Parameters); CommandLine = (LPCSTR)FAR_POINTER(Parameters->CommandLine); } + /* If no optional environment is given... */ if (Environment == NULL) { - /* Get the environment from the parameter block */ + /* ... get the one from the parameter block */ + ASSERT(Parameters); Environment = (LPCSTR)SEG_OFF_TO_PTR(Parameters->Environment, 0); } - - /* NULL-terminate the command line by removing the return carriage character */ - CmdLinePtr = (LPSTR)CommandLine; - while (*CmdLinePtr && *CmdLinePtr != '\r') CmdLinePtr++; - *CmdLinePtr = '\0'; /* Copy the environment block to DOS memory */ EnvBlock = DosCopyEnvironmentBlock(Environment, ExecutablePath); @@ -352,6 +406,7 @@ } else { + ASSERT(Parameters); LoadSegment = Parameters->Overlay.Segment; RelocFactor = Parameters->Overlay.RelocationFactor; } @@ -391,8 +446,9 @@ } else if (LoadType == DOS_LOAD_ONLY) { + ASSERT(Parameters); Parameters->StackLocation = MAKELONG(Header->e_sp, LoadSegment + Header->e_ss); - Parameters->EntryPoint = MAKELONG(Header->e_ip, LoadSegment + Header->e_cs); + Parameters->EntryPoint = MAKELONG(Header->e_ip, LoadSegment + Header->e_cs); } } else @@ -436,9 +492,11 @@ } else { + ASSERT(Parameters); LoadSegment = Parameters->Overlay.Segment; } + /* Copy the program to the code segment */ RtlCopyMemory(SEG_OFF_TO_PTR(LoadSegment, 0), Address, FileSize); @@ -465,8 +523,9 @@ } else if (LoadType == DOS_LOAD_ONLY) { + ASSERT(Parameters); Parameters->StackLocation = MAKELONG(0xFFFE, Segment); - Parameters->EntryPoint = MAKELONG(0x0100, Segment); + Parameters->EntryPoint = MAKELONG(0x0100, Segment); } } @@ -513,8 +572,9 @@ // HACK: Simulate a ENTER key release scancode on the PS/2 port because // some apps expect to read a key release scancode (> 0x80) when they // are started. - IOWriteB(PS2_CONTROL_PORT, 0xD2); // Next write is for the first PS/2 port - IOWriteB(PS2_DATA_PORT, 0x80 | 0x1C); // ENTER key release + // (hbelusca 2 May 2015: I'm not sure it's really useful. See r65012) + // IOWriteB(PS2_CONTROL_PORT, 0xD2); // Next write is for the first PS/2 port + // IOWriteB(PS2_DATA_PORT, 0x80 | 0x1C); // ENTER key release /* Start simulation */ SetEvent(VdmTaskEvent); @@ -537,18 +597,24 @@ DWORD BinaryType; LPVOID Environment = NULL; VDM_COMMAND_INFO CommandInfo; - CHAR CmdLine[MAX_PATH]; + CHAR CmdLine[MAX_PATH]; // DOS_CMDLINE_LENGTH + 1 CHAR AppName[MAX_PATH]; CHAR PifFile[MAX_PATH]; CHAR Desktop[MAX_PATH]; CHAR Title[MAX_PATH]; + LPSTR CmdLinePtr; + ULONG CmdLineSize; ULONG EnvSize = 256; - PVOID Env = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); + PVOID Env; STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInfo; /* Get the binary type */ if (!GetBinaryTypeA(ProgramName, &BinaryType)) return GetLastError(); + + /* Initialize Win32-VDM environment */ + Env = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); + if (Env == NULL) return GetLastError(); /* Did the caller specify an environment segment? */ if (Parameters->Environment) @@ -561,9 +627,25 @@ RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); + /* + * Convert the DOS command line to Win32-compatible format. + * Format of the DOS command line: 1 byte for size; 127 bytes for contents. + */ + CmdLineSize = min(*(PBYTE)FAR_POINTER(Parameters->CommandLine), DOS_CMDLINE_LENGTH); + RtlCopyMemory(CmdLine, + FAR_POINTER(Parameters->CommandLine) + 1, + CmdLineSize); + /* NULL-terminate it */ + CmdLine[CmdLineSize] = '\0'; + + /* Remove any trailing return carriage character and NULL-terminate the command line */ + CmdLinePtr = CmdLine; + while (*CmdLinePtr && *CmdLinePtr != '\r' && *CmdLinePtr != '\n') CmdLinePtr++; + *CmdLinePtr = '\0'; + /* Create the process */ if (!CreateProcessA(ProgramName, - FAR_POINTER(Parameters->CommandLine), + CmdLine, NULL, NULL, FALSE, @@ -573,6 +655,7 @@ &StartupInfo, &ProcessInfo)) { + RtlFreeHeap(RtlGetProcessHeap(), 0, Env); return GetLastError(); }

1 0

[aandrejevic] 67504: [NTVDM] Implement INT 21h, AH = 36h "Get Free Disk Space".
by aandrejevic＠svn.reactos.org 01 May '15

01 May '15

Author: aandrejevic Date: Fri May 1 23:04:03 2015 New Revision: 67504 URL: http://svn.reactos.org/svn/reactos?rev=67504&view=rev Log: [NTVDM] Implement INT 21h, AH = 36h "Get Free Disk Space". Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 1 23:04:03 2015 @@ -832,6 +832,38 @@ break; } + /* Get Free Disk Space */ + case 0x36: + { + CHAR RootPath[3] = "X:\\"; + DWORD SectorsPerCluster; + DWORD BytesPerSector; + DWORD NumberOfFreeClusters; + DWORD TotalNumberOfClusters; + + if (getDL() == 0) RootPath[0] = 'A' + CurrentDrive; + else RootPath[0] = 'A' + getDL() - 1; + + if (GetDiskFreeSpaceA(RootPath, + &SectorsPerCluster, + &BytesPerSector, + &NumberOfFreeClusters, + &TotalNumberOfClusters)) + { + setAX(LOWORD(SectorsPerCluster)); + setCX(LOWORD(BytesPerSector)); + setBX(LOWORD(NumberOfFreeClusters)); + setDX(LOWORD(TotalNumberOfClusters)); + } + else + { + /* Error */ + setAX(0xFFFF); + } + + break; + } + /* SWITCH character - AVAILDEV */ case 0x37: {

1 0

[tfaber] 67503: [NPFS] - Correctly check for write quota in NpCommonWrite. Should fix test regressions after enabling fast I/O.
by tfaber＠svn.reactos.org 01 May '15

01 May '15

Author: tfaber Date: Fri May 1 19:40:04 2015 New Revision: 67503 URL: http://svn.reactos.org/svn/reactos?rev=67503&view=rev Log: [NPFS] - Correctly check for write quota in NpCommonWrite. Should fix test regressions after enabling fast I/O. Modified: trunk/reactos/drivers/filesystems/npfs/write.c Modified: trunk/reactos/drivers/filesystems/npfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/w… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/write.c [iso-8859-1] Fri May 1 19:40:04 2015 @@ -104,10 +104,10 @@ EventBuffer = NonPagedCcb->EventBuffer[NamedPipeEnd]; if ((WriteQueue->QueueState == ReadEntries && - WriteQueue->BytesInQueue < DataSize && - WriteQueue->Quota < DataSize - WriteQueue->BytesInQueue) || - (WriteQueue->QueueState == ReadEntries && - WriteQueue->Quota - WriteQueue->QuotaUsed < DataSize)) + WriteQueue->BytesInQueue < DataSize && + WriteQueue->Quota < DataSize - WriteQueue->BytesInQueue) || + (WriteQueue->QueueState != ReadEntries && + WriteQueue->Quota - WriteQueue->QuotaUsed < DataSize)) { if (Ccb->Fcb->NamedPipeType == FILE_PIPE_MESSAGE_TYPE && Ccb->CompletionMode[NamedPipeEnd] == FILE_PIPE_COMPLETE_OPERATION)

1 0

[pschweitzer] 67502: [NTFS] Why would you allocate NTFS global data structure twice to use it from only one location? Fix that misbehavior.
by pschweitzer＠svn.reactos.org 01 May '15

01 May '15

Author: pschweitzer Date: Fri May 1 18:58:00 2015 New Revision: 67502 URL: http://svn.reactos.org/svn/reactos?rev=67502&view=rev Log: [NTFS] Why would you allocate NTFS global data structure twice to use it from only one location? Fix that misbehavior. Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Fri May 1 18:58:00 2015 @@ -51,18 +51,28 @@ { UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(DEVICE_NAME); NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; TRACE_(NTFS, "DriverEntry(%p, '%wZ')\n", DriverObject, RegistryPath); - /* Initialize global data */ - NtfsGlobalData = ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_GLOBAL_DATA), 'GRDN'); - if (!NtfsGlobalData) + Status = IoCreateDevice(DriverObject, + sizeof(NTFS_GLOBAL_DATA), + &DeviceName, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ErrorEnd; + WARN_(NTFS, "IoCreateDevice failed with status: %lx\n", Status); + return Status; } + /* Initialize global data */ + NtfsGlobalData = DeviceObject->DeviceExtension; RtlZeroMemory(NtfsGlobalData, sizeof(NTFS_GLOBAL_DATA)); + + NtfsGlobalData->DeviceObject = DeviceObject; NtfsGlobalData->Identifier.Type = NTFS_TYPE_GLOBAL_DATA; NtfsGlobalData->Identifier.Size = sizeof(NTFS_GLOBAL_DATA); @@ -89,34 +99,11 @@ /* Driver can't be unloaded */ DriverObject->DriverUnload = NULL; - Status = IoCreateDevice(DriverObject, - sizeof(NTFS_GLOBAL_DATA), - &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &NtfsGlobalData->DeviceObject); - if (!NT_SUCCESS(Status)) - { - WARN_(NTFS, "IoCreateDevice failed with status: %lx\n", Status); - goto ErrorEnd; - } - NtfsGlobalData->DeviceObject->Flags |= DO_DIRECT_IO; /* Register file system */ IoRegisterFileSystem(NtfsGlobalData->DeviceObject); ObReferenceObject(NtfsGlobalData->DeviceObject); - -ErrorEnd: - if (!NT_SUCCESS(Status)) - { - if (NtfsGlobalData) - { - ExDeleteResourceLite(&NtfsGlobalData->Resource); - ExFreePoolWithTag(NtfsGlobalData, 'GRDN'); - } - } return Status; }

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