Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[pschweitzer] 68755: [NDK] Add an internal header for MUP FSCTL and its input buffer definition

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 18 20:17:17 2015 New Revision: 68755 URL: http://svn.reactos.org/svn/reactos?rev=68755&view=rev Log: [NDK] Add an internal header for MUP FSCTL and its input buffer definition Added: trunk/reactos/include/ndk/muptypes.h (with props) Added: trunk/reactos/include/ndk/muptypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/muptypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/muptypes.h (added) +++ trunk/reactos/include/ndk/muptypes.h [iso-8859-1] Tue Aug 18 20:17:17 2015 @@ -0,0 +1,25 @@ +#ifndef _MUPTYPES_H +#define _MUPTYPES_H + +// +// Dependencies +// +#include <umtypes.h> + +// +// FSCTL sent to MUP for UNC provider registration +// +#define FSCTL_MUP_REGISTER_PROVIDER CTL_CODE(FILE_DEVICE_MULTI_UNC_PROVIDER, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) + +// +// Input buffer for FSCTL_MUP_REGISTER_PROVIDER +// +typedef struct _MUP_PROVIDER_REGISTRATION_INFO +{ + ULONG RedirectorDeviceNameOffset; + ULONG RedirectorDeviceNameLength; + ULONG Reserved[2]; + BOOLEAN MailslotsSupported; +} MUP_PROVIDER_REGISTRATION_INFO, *PMUP_PROVIDER_REGISTRATION_INFO; + +#endif // _MUPTYPES_H Propchange: trunk/reactos/include/ndk/muptypes.h ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 4 months

[hbelusca] 68754: [NTVDM]: Initialize the PSP' memory control block owner name with the file name (without extension, and up to 8 chars) of the started program.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 18 12:26:38 2015 New Revision: 68754 URL: http://svn.reactos.org/svn/reactos?rev=68754&view=rev Log: [NTVDM]: Initialize the PSP' memory control block owner name with the file name (without extension, and up to 8 chars) of the started program. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c 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] Tue Aug 18 12:26:38 2015 @@ -31,17 +31,52 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static inline VOID DosSetPspCommandLine(WORD Segment, LPCSTR CommandLine) +static VOID DosInitPsp(IN WORD Segment, + IN WORD EnvBlock, + IN LPCSTR CommandLine, + IN LPCSTR ProgramName) { PDOS_PSP PspBlock = SEGMENT_TO_PSP(Segment); + PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment - 1); + LPCSTR PspName; + USHORT i; + + /* Link the environment block */ + PspBlock->EnvBlock = EnvBlock; /* - * Copy the command line block. + * Copy the command line. * 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); + + /* + * Initialize the owner name of the MCB of the PSP. + */ + + /* Find the start of the file name, skipping all the path elements */ + PspName = ProgramName; + while (*ProgramName) + { + switch (*ProgramName++) + { + /* Path delimiter, skip it */ + case ':': case '\\': case '/': + PspName = ProgramName; + break; + } + } + /* Copy the file name up to the extension... */ + for (i = 0; i < sizeof(Mcb->Name) && PspName[i] != '.' && PspName[i] != '\0'; ++i) + { + Mcb->Name[i] = RtlUpperChar(PspName[i]); + } + /* ... and NULL-terminate if needed */ + if (i < sizeof(Mcb->Name)) Mcb->Name[i] = '\0'; + + // FIXME: Initialize the FCBs } static inline VOID DosSaveState(VOID) @@ -408,10 +443,9 @@ /* Set INT 22h to the return address */ ((PULONG)BaseAddress)[0x22] = ReturnAddress; - /* Create the PSP */ + /* Create the PSP and initialize it */ DosCreatePsp(Segment, (WORD)TotalSize); - DosSetPspCommandLine(Segment, CommandLine); - SEGMENT_TO_PSP(Segment)->EnvBlock = EnvBlock; + DosInitPsp(Segment, EnvBlock, CommandLine, ExePath); /* Calculate the segment where the program should be loaded */ if (!LoadHigh) @@ -486,10 +520,9 @@ /* Set INT 22h to the return address */ ((PULONG)BaseAddress)[0x22] = ReturnAddress; - /* Create the PSP */ + /* Create the PSP and initialize it */ DosCreatePsp(Segment, MaxAllocSize); - DosSetPspCommandLine(Segment, CommandLine); - SEGMENT_TO_PSP(Segment)->EnvBlock = EnvBlock; + DosInitPsp(Segment, EnvBlock, CommandLine, ExePath); /* Calculate the segment where the program should be loaded */ LoadSegment = Segment + (sizeof(DOS_PSP) >> 4);

9 years, 4 months

[tfaber] 68753: [NTOS:MM] - Leave guarded region in failure case of MiFindContiguousPages. CORE-10026 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Aug 18 11:28:30 2015 New Revision: 68753 URL: http://svn.reactos.org/svn/reactos?rev=68753&view=rev Log: [NTOS:MM] - Leave guarded region in failure case of MiFindContiguousPages. CORE-10026 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/contmem.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Tue Aug 18 11:28:30 2015 @@ -205,6 +205,7 @@ // // And if we get here, it means no suitable physical memory runs were found // + KeLeaveGuardedRegion(); return 0; }

9 years, 4 months

[tfaber] 68752: [UNICOWS] - Get rid of this Win9x-only DLL. Adobe Reader 7 works fine without it (CORE-5053).

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Aug 18 10:29:18 2015 New Revision: 68752 URL: http://svn.reactos.org/svn/reactos?rev=68752&view=rev Log: [UNICOWS] - Get rid of this Win9x-only DLL. Adobe Reader 7 works fine without it (CORE-5053). Removed: trunk/reactos/dll/win32/unicows/ Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Tue Aug 18 10:29:18 2015 @@ -209,7 +209,6 @@ add_subdirectory(uext2) add_subdirectory(ufat) add_subdirectory(ufatx) -add_subdirectory(unicows) add_subdirectory(untfs) add_subdirectory(updspapi) add_subdirectory(url) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 18 10:29:18 2015 @@ -192,7 +192,6 @@ reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.47 reactos/dll/win32/traffic # Synced to WineStaging-1.7.47 reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) reactos/dll/win32/updspapi # Synced to WineStaging-1.7.47 reactos/dll/win32/url # Synced to WineStaging-1.7.47 reactos/dll/win32/urlmon # Synced to WineStaging-1.7.47

9 years, 4 months

[tfaber] 68751: [WIN32K:NTGDI] - Allow NULL rectangle in NtGdiSetBoundsRect as shown by the test. Fixes a bunch of annoying first chance exceptions

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Aug 18 10:25:45 2015 New Revision: 68751 URL: http://svn.reactos.org/svn/reactos?rev=68751&view=rev Log: [WIN32K:NTGDI] - Allow NULL rectangle in NtGdiSetBoundsRect as shown by the test. Fixes a bunch of annoying first chance exceptions Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Tue Aug 18 10:25:45 2015 @@ -689,7 +689,7 @@ RECTL_vSetEmptyRect(&pdc->erclBoundsApp); } - if (flags & DCB_ACCUMULATE) + if (flags & DCB_ACCUMULATE && prc != NULL) { /* Capture the rect */ _SEH2_TRY

9 years, 4 months

[tfaber] 68750: [GDI32_APITEST] - Add a simple test for SetBoundsRect

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Aug 18 10:24:01 2015 New Revision: 68750 URL: http://svn.reactos.org/svn/reactos?rev=68750&view=rev Log: [GDI32_APITEST] - Add a simple test for SetBoundsRect Added: trunk/rostests/apitests/gdi32/SetBoundsRect.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Tue Aug 18 10:24:01 2015 @@ -59,6 +59,7 @@ Rectangle.c RealizePalette.c SelectObject.c + SetBoundsRect.c SetBrushOrgEx.c SetDCPenColor.c SetDIBits.c Added: trunk/rostests/apitests/gdi32/SetBoundsRect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBoundsR… ============================================================================== --- trunk/rostests/apitests/gdi32/SetBoundsRect.c (added) +++ trunk/rostests/apitests/gdi32/SetBoundsRect.c [iso-8859-1] Tue Aug 18 10:24:01 2015 @@ -0,0 +1,56 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SetBoundsRect + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org + */ + +#include <apitest.h> +#include <winuser.h> +#include <wingdi.h> + +START_TEST(SetBoundsRect) +{ + HDC hDC; + UINT ret; + DWORD error; + + hDC = CreateCompatibleDC(GetDC(NULL)); + if (hDC == NULL) + { + skip("No DC\n"); + return; + } + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, 0); + error = GetLastError(); + ok(ret == (DCB_DISABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, DCB_ACCUMULATE); + error = GetLastError(); + ok(ret == (DCB_DISABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, DCB_DISABLE); + error = GetLastError(); + ok(ret == (DCB_DISABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, DCB_ENABLE); + error = GetLastError(); + ok(ret == (DCB_DISABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, DCB_RESET); + error = GetLastError(); + ok(ret == (DCB_ENABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + DeleteDC(hDC); +} Propchange: trunk/rostests/apitests/gdi32/SetBoundsRect.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Tue Aug 18 10:24:01 2015 @@ -60,6 +60,7 @@ extern void func_Rectangle(void); extern void func_RealizePalette(void); extern void func_SelectObject(void); +extern void func_SetBoundsRect(void); extern void func_SetBrushOrgEx(void); extern void func_SetDCPenColor(void); extern void func_SetDIBits(void); @@ -129,6 +130,7 @@ { "Rectangle", func_Rectangle }, { "RealizePalette", func_RealizePalette }, { "SelectObject", func_SelectObject }, + { "SetBoundsRect", func_SetBoundsRect }, { "SetBrushOrgEx", func_SetBrushOrgEx }, { "SetDCPenColor", func_SetDCPenColor }, { "SetDIBits", func_SetDIBits },

9 years, 4 months

[tfaber] 68749: [SHELL32] - Don't use SHELL32_GetDisplayNameOfGUIDItem on the desktop folder. Fixes file open dialog. Giannis please review ; )

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Aug 18 10:10:36 2015 New Revision: 68749 URL: http://svn.reactos.org/svn/reactos?rev=68749&view=rev Log: [SHELL32] - Don't use SHELL32_GetDisplayNameOfGUIDItem on the desktop folder. Fixes file open dialog. Giannis please review ;) Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Tue Aug 18 10:10:36 2015 @@ -650,7 +650,7 @@ if (!strRet) return E_INVALIDARG; - if (_ILIsPidlSimple(pidl) && _ILIsSpecialFolder(pidl)) + if (!_ILIsDesktop(pidl) && _ILIsPidlSimple(pidl) && _ILIsSpecialFolder(pidl)) { return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet); }

9 years, 4 months

[cwittich] 68748: [KERNEL32] lpBytesReturned must not be NULL when lpOverlapped is NULL as well

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Aug 18 07:13:02 2015 New Revision: 68748 URL: http://svn.reactos.org/svn/reactos?rev=68748&view=rev Log: [KERNEL32] lpBytesReturned must not be NULL when lpOverlapped is NULL as well Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Tue Aug 18 07:13:02 2015 @@ -426,6 +426,7 @@ IN DWORD len) { DWORD size = 1024; + DWORD br; HANDLE mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, INVALID_HANDLE_VALUE ); if (mgr == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; @@ -443,7 +444,7 @@ memset( &input, 0, sizeof(input) ); if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, &input, sizeof(input), - output, size, NULL, NULL )) + output, size, &br, NULL )) { if (GetLastError() != ERROR_MORE_DATA) break; size = output->Size;

9 years, 4 months

[hbelusca] 68747: Fix a comment and add something that was forgotten in the previous commit.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 17 20:22:10 2015 New Revision: 68747 URL: http://svn.reactos.org/svn/reactos?rev=68747&view=rev Log: Fix a comment and add something that was forgotten in the previous commit. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c 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] Mon Aug 17 20:22:10 2015 @@ -546,7 +546,7 @@ */ setDX(Segment); setDI(FinalSP); - setBP(0x091E); // DOS base stack pointer relic value + setBP(0x091E); // DOS base stack pointer relic value. In MS-DOS 5.0 and Windows' NTVDM it's 0x091C. This is in fact the old SP value inside DosData disk stack. setSI(FinalIP); setAX(0/*0xFFFF*/); // FIXME: fcbcode @@ -897,7 +897,7 @@ /* Notify VDDs of process termination */ VDDTerminateUserHook(Psp); - /* Check if this PSP is it's own parent */ + /* Check if this PSP is its own parent */ if (PspBlock->ParentPsp == Psp) goto Done; if (KeepResident == 0)

9 years, 4 months

[hbelusca] 68746: [NTVDM] Changes in preparation for CORE-9773 - Split DosLoadExecutable into DosLoadExecutable & DosLoadExecutableInternal, the latter one can be used for small programs embedded i...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 17 20:11:51 2015 New Revision: 68746 URL: http://svn.reactos.org/svn/reactos?rev=68746&view=rev Log: [NTVDM] Changes in preparation for CORE-9773 - Split DosLoadExecutable into DosLoadExecutable & DosLoadExecutableInternal, the latter one can be used for small programs embedded in ntvdm.exe (will be used for integrated command.com). - Factorize common loading code in DosLoadExecutable(Internal); just before starting a program, set the CPU registers to the default values DOS use; see comments in the code for more details (some programs expect those values). - Set a correct termination type (hiword in the returned ErrorLevel) when terminating programs (the value is different for TSRs and for regular programs). CORE-9773 CORE-9729 CORE-9711 CORE-8247 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h 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] Mon Aug 17 20:11:51 2015 @@ -73,7 +73,10 @@ { PDOS_REGISTER_STATE State; - /* Pop the state structure from the stack */ + /* + * Pop the state structure from the stack. Note that we + * already have one word allocated (the interrupt number). + */ State = SEG_OFF_TO_PTR(getSS(), getSP()); setSP(getSP() + sizeof(DOS_REGISTER_STATE) - sizeof(WORD)); @@ -89,8 +92,8 @@ setDI(State->DI); } -static WORD DosCopyEnvironmentBlock(LPCSTR Environment OPTIONAL, - LPCSTR ProgramName) +static WORD DosCopyEnvironmentBlock(IN LPCSTR Environment OPTIONAL, + IN LPCSTR ProgramName) { PCHAR Ptr, DestBuffer = NULL; ULONG TotalSize = 0; @@ -237,82 +240,29 @@ Sda->DiskTransferArea = MAKELONG(0x80, Segment); } -DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType, - IN LPCSTR ExecutablePath, - IN PDOS_EXEC_PARAM_BLOCK Parameters, - IN LPCSTR CommandLine OPTIONAL, - IN LPCSTR Environment OPTIONAL, - IN DWORD ReturnAddress OPTIONAL) +DWORD DosLoadExecutableInternal(IN DOS_EXEC_TYPE LoadType, + IN LPBYTE ExeBuffer, + IN DWORD ExeBufferSize, + IN LPCSTR ExePath, + IN PDOS_EXEC_PARAM_BLOCK Parameters, + IN LPCSTR CommandLine OPTIONAL, + IN LPCSTR Environment OPTIONAL, + IN DWORD ReturnAddress OPTIONAL) { DWORD Result = ERROR_SUCCESS; - HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; - LPBYTE Address = NULL; WORD Segment = 0; WORD EnvBlock = 0; WORD LoadSegment; WORD MaxAllocSize; - DWORD i, FileSize; - CHAR FullPath[MAX_PATH]; - CHAR ShortFullPath[MAX_PATH]; + + WORD FinalSS, FinalSP; + WORD FinalCS, FinalIP; /* 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, 0x%08X)\n", - LoadType, - ExecutablePath, - Parameters, - CommandLine, - Environment); - - /* Try to get the full path to the executable */ - if (GetFullPathNameA(ExecutablePath, sizeof(FullPath), FullPath, NULL)) - { - /* Try to shorten the full path */ - if (GetShortPathNameA(FullPath, ShortFullPath, sizeof(ShortFullPath))) - { - /* Use the shortened full path from now on */ - ExecutablePath = ShortFullPath; - } - } - - /* Open a handle to the executable */ - FileHandle = CreateFileA(ExecutablePath, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (FileHandle == INVALID_HANDLE_VALUE) - { - Result = GetLastError(); - goto Cleanup; - } - - /* Get the file size */ - FileSize = GetFileSize(FileHandle, NULL); - - /* Create a mapping object for the file */ - FileMapping = CreateFileMapping(FileHandle, - NULL, - PAGE_READONLY, - 0, - 0, - NULL); - if (FileMapping == NULL) - { - Result = GetLastError(); - goto Cleanup; - } - - /* Map the file into memory */ - Address = (LPBYTE)MapViewOfFile(FileMapping, FILE_MAP_READ, 0, 0, 0); - if (Address == NULL) - { - Result = GetLastError(); - goto Cleanup; - } + DPRINT1("DosLoadExecutableInternal(%d, 0x%p, '%s', 0x%p, 0x%p, 0x%p)\n", + LoadType, ExeBuffer, ExePath, Parameters, CommandLine, Environment); if (LoadType != DOS_LOAD_OVERLAY) { @@ -388,7 +338,7 @@ } /* Copy the environment block to DOS memory */ - EnvBlock = DosCopyEnvironmentBlock(Environment, ExecutablePath); + EnvBlock = DosCopyEnvironmentBlock(Environment, ExePath); if (EnvBlock == 0) { Result = Sda->LastErrorCode; @@ -397,18 +347,18 @@ } /* Check if this is an EXE file or a COM file */ - if (Address[0] == 'M' && Address[1] == 'Z') + if (ExeBuffer[0] == 'M' && ExeBuffer[1] == 'Z') { /* EXE file */ PIMAGE_DOS_HEADER Header; - DWORD BaseSize; + DWORD BaseSize, i; PDWORD RelocationTable; PWORD RelocWord; WORD RelocFactor; BOOLEAN LoadHigh = FALSE; /* Get the MZ header */ - Header = (PIMAGE_DOS_HEADER)Address; + Header = (PIMAGE_DOS_HEADER)ExeBuffer; /* Get the base size of the file, in paragraphs (rounded up) */ BaseSize = ((((Header->e_cp - (Header->e_cblp != 0)) * 512) @@ -452,7 +402,7 @@ } /* The process owns its own memory */ - DosChangeMemoryOwner(Segment, Segment); + DosChangeMemoryOwner(Segment , Segment); DosChangeMemoryOwner(EnvBlock, Segment); /* Set INT 22h to the return address */ @@ -480,11 +430,11 @@ /* Copy the program to the code segment */ RtlCopyMemory(SEG_OFF_TO_PTR(LoadSegment, 0), - Address + (Header->e_cparhdr << 4), - min(FileSize - (Header->e_cparhdr << 4), BaseSize << 4)); + ExeBuffer + (Header->e_cparhdr << 4), + min(ExeBufferSize - (Header->e_cparhdr << 4), BaseSize << 4)); /* Get the relocation table */ - RelocationTable = (PDWORD)(Address + Header->e_lfarlc); + RelocationTable = (PDWORD)(ExeBuffer + Header->e_lfarlc); /* Perform relocations */ for (i = 0; i < Header->e_crlc; i++) @@ -497,39 +447,13 @@ *RelocWord += RelocFactor; } - if (LoadType == DOS_LOAD_AND_EXECUTE) - { - /* Save the program state */ - if (Sda->CurrentPsp != SYSTEM_PSP) - { - /* Push the task state */ - DosSaveState(); - - /* Update the last stack in the PSP */ - SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); - } - - /* Set the initial segment registers */ - setDS(Segment); - setES(Segment); - - /* Set the stack to the location from the header */ - setSS(LoadSegment + Header->e_ss); - setSP(Header->e_sp); - - /* Notify VDDs of process execution */ - VDDCreateUserHook(Segment); - - /* Execute */ - DosSetProcessContext(Segment); - CpuExecute(LoadSegment + Header->e_cs, Header->e_ip); - } - 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); - } + /* Set the stack to the location from the header */ + FinalSS = LoadSegment + Header->e_ss; + FinalSP = Header->e_sp; + + /* Set the code segment/pointer */ + FinalCS = LoadSegment + Header->e_cs; + FinalIP = Header->e_ip; } else { @@ -541,7 +465,7 @@ DosAllocateMemory(0xFFFF, &MaxAllocSize); /* Make sure it's enough for the whole program and the PSP */ - if (((DWORD)MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) + if (((DWORD)MaxAllocSize << 4) < (ExeBufferSize + sizeof(DOS_PSP))) { Result = ERROR_NOT_ENOUGH_MEMORY; goto Cleanup; @@ -556,7 +480,7 @@ } /* The process owns its own memory */ - DosChangeMemoryOwner(Segment, Segment); + DosChangeMemoryOwner(Segment , Segment); DosChangeMemoryOwner(EnvBlock, Segment); /* Set INT 22h to the return address */ @@ -578,48 +502,75 @@ /* Copy the program to the code segment */ RtlCopyMemory(SEG_OFF_TO_PTR(LoadSegment, 0), - Address, - FileSize); - - if (LoadType == DOS_LOAD_AND_EXECUTE) - { - /* Save the program state */ - if (Sda->CurrentPsp != SYSTEM_PSP) - { - /* Push the task state */ - DosSaveState(); - - /* Update the last stack in the PSP */ - SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); - } - - /* Set the initial segment registers */ - setDS(Segment); - setES(Segment); - - /* Set the stack to the last word of the segment */ - setSS(Segment); - setSP(0xFFFE); - - /* - * Set the value on the stack to 0, so that a near return - * jumps to PSP:0000 which has the exit code. - */ - *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0; - - /* Notify VDDs of process execution */ - VDDCreateUserHook(Segment); - - /* Execute */ - DosSetProcessContext(Segment); - CpuExecute(Segment, 0x100); - } - else if (LoadType == DOS_LOAD_ONLY) - { - ASSERT(Parameters); - Parameters->StackLocation = MAKELONG(0xFFFE, Segment); - Parameters->EntryPoint = MAKELONG(0x0100, Segment); - } + ExeBuffer, ExeBufferSize); + + /* Set the stack to the last word of the segment */ + FinalSS = Segment; + FinalSP = 0xFFFE; + + /* + * Set the value on the stack to 0x0000, so that a near return + * jumps to PSP:0000 which has the exit code. + */ + *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0x0000; + + /* Set the code segment/pointer */ + FinalCS = Segment; + FinalIP = 0x0100; + } + + if (LoadType == DOS_LOAD_AND_EXECUTE) + { + /* Save the program state */ + if (Sda->CurrentPsp != SYSTEM_PSP) + { + /* Push the task state */ + DosSaveState(); + + /* Update the last stack in the PSP */ + SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); + } + + /* Set the initial segment registers */ + setDS(Segment); + setES(Segment); + + /* Set the stack */ + setSS(FinalSS); + setSP(FinalSP); + + /* + * Set the other registers as in real DOS: some demos expect them so! + * See http://www.fysnet.net/yourhelp.htm + * and http://www.beroset.com/asm/showregs.asm + */ + setDX(Segment); + setDI(FinalSP); + setBP(0x091E); // DOS base stack pointer relic value + setSI(FinalIP); + + setAX(0/*0xFFFF*/); // FIXME: fcbcode + setBX(0/*0xFFFF*/); // FIXME: fcbcode + setCX(0x00FF); + + /* + * Keep critical flags, clear test flags (OF, SF, ZF, AF, PF, CF) + * and explicitely set the interrupt flag. + */ + setEFLAGS((getEFLAGS() & ~0x08D5) | 0x0200); + + /* Notify VDDs of process execution */ + VDDCreateUserHook(Segment); + + /* Execute */ + DosSetProcessContext(Segment); + CpuExecute(FinalCS, FinalIP); + } + else if (LoadType == DOS_LOAD_ONLY) + { + ASSERT(Parameters); + Parameters->StackLocation = MAKELONG(FinalSP, FinalSS); + Parameters->EntryPoint = MAKELONG(FinalIP, FinalCS); } Cleanup: @@ -630,6 +581,85 @@ if (Segment) DosFreeMemory(Segment); } + return Result; +} + +DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType, + IN LPCSTR ExecutablePath, + IN PDOS_EXEC_PARAM_BLOCK Parameters, + IN LPCSTR CommandLine OPTIONAL, + IN LPCSTR Environment OPTIONAL, + IN DWORD ReturnAddress OPTIONAL) +{ + DWORD Result = ERROR_SUCCESS; + HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; + DWORD FileSize; + LPBYTE Address = NULL; + CHAR FullPath[MAX_PATH]; + CHAR ShortFullPath[MAX_PATH]; + + DPRINT1("DosLoadExecutable(%d, '%s', 0x%p, 0x%p, 0x%p)\n", + LoadType, ExecutablePath, Parameters, CommandLine, Environment); + + /* Try to get the full path to the executable */ + if (GetFullPathNameA(ExecutablePath, sizeof(FullPath), FullPath, NULL)) + { + /* Get the corresponding short path */ + if (GetShortPathNameA(FullPath, ShortFullPath, sizeof(ShortFullPath))) + { + /* Use the shortened full path from now on */ + ExecutablePath = ShortFullPath; + } + } + + /* Open a handle to the executable */ + FileHandle = CreateFileA(ExecutablePath, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (FileHandle == INVALID_HANDLE_VALUE) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Get the file size */ + FileSize = GetFileSize(FileHandle, NULL); + + /* Create a mapping object for the file */ + FileMapping = CreateFileMapping(FileHandle, + NULL, + PAGE_READONLY, + 0, + 0, + NULL); + if (FileMapping == NULL) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Map the file into memory */ + Address = (LPBYTE)MapViewOfFile(FileMapping, FILE_MAP_READ, 0, 0, 0); + if (Address == NULL) + { + Result = GetLastError(); + goto Cleanup; + } + + Result = DosLoadExecutableInternal(LoadType, + Address, + FileSize, + ExecutablePath, + Parameters, + CommandLine, + Environment, + ReturnAddress); + +Cleanup: /* Unmap the file*/ if (Address != NULL) UnmapViewOfFile(Address); @@ -690,9 +720,9 @@ } #ifndef STANDALONE -WORD DosCreateProcess(LPCSTR ProgramName, - PDOS_EXEC_PARAM_BLOCK Parameters, - DWORD ReturnAddress OPTIONAL) +WORD DosCreateProcess(IN LPCSTR ProgramName, + IN PDOS_EXEC_PARAM_BLOCK Parameters, + IN DWORD ReturnAddress OPTIONAL) { DWORD Result; DWORD BinaryType; @@ -851,29 +881,28 @@ VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode, WORD KeepResident) { - WORD i; WORD McbSegment = SysVars->FirstMcb; PDOS_MCB CurrentMcb; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); PDOS_PSP PspBlock = SEGMENT_TO_PSP(Psp); LPWORD Stack; + BYTE TerminationType; #ifndef STANDALONE VDM_COMMAND_INFO CommandInfo; #endif DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X, KeepResident 0x%04X\n", - Psp, - ReturnCode, - KeepResident); + Psp, ReturnCode, KeepResident); + + /* Notify VDDs of process termination */ + VDDTerminateUserHook(Psp); /* Check if this PSP is it's own parent */ if (PspBlock->ParentPsp == Psp) goto Done; - /* Notify VDDs of process termination */ - VDDTerminateUserHook(Psp); - if (KeepResident == 0) { + WORD i; for (i = 0; i < PspBlock->HandleTableSize; i++) { /* Close the handle */ @@ -923,10 +952,10 @@ IntVecTable[0x23] = PspBlock->BreakAddress; IntVecTable[0x24] = PspBlock->CriticalAddress; - /* Update the current PSP */ + /* Update the current PSP with the parent's one */ if (Psp == Sda->CurrentPsp) { - Sda->CurrentPsp = PspBlock->ParentPsp; + DosSetProcessContext(PspBlock->ParentPsp); if (Sda->CurrentPsp == SYSTEM_PSP) { ResetEvent(VdmTaskEvent); @@ -952,15 +981,19 @@ #endif - /* Save the return code - Normal termination */ - Sda->ErrorLevel = MAKEWORD(ReturnCode, 0x00); - - /* Restore the old stack */ - setSS(HIWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); - setSP(LOWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); - - /* Pop the task state */ - DosRestoreState(); + /* Save the return code - Normal termination or TSR */ + TerminationType = (KeepResident != 0 ? 0x03 : 0x00); + Sda->ErrorLevel = MAKEWORD(ReturnCode, TerminationType); + + if (Sda->CurrentPsp != SYSTEM_PSP) + { + /* Restore the parent's stack */ + setSS(HIWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); + setSP(LOWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); + + /* Pop the task state */ + DosRestoreState(); + } /* Return control to the parent process */ Stack = (LPWORD)SEG_OFF_TO_PTR(getSS(), getSP()); @@ -968,3 +1001,4 @@ Stack[STACK_IP] = LOWORD(PspBlock->TerminateAddress); } +/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] Mon Aug 17 20:11:51 2015 @@ -87,6 +87,18 @@ VOID DosCreatePsp(WORD Segment, WORD ProgramSize); VOID DosSetProcessContext(WORD Segment); +DWORD DosLoadExecutableInternal +( + IN DOS_EXEC_TYPE LoadType, + IN LPBYTE ExeBuffer, + IN DWORD ExeBufferSize, + IN LPCSTR ExePath, + IN PDOS_EXEC_PARAM_BLOCK Parameters, + IN LPCSTR CommandLine OPTIONAL, + IN LPCSTR Environment OPTIONAL, + IN DWORD ReturnAddress OPTIONAL +); + DWORD DosLoadExecutable ( IN DOS_EXEC_TYPE LoadType,

9 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015