Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 67371: [BROWSEUI] Fix back and forward buttons so they work correctly. Brought to you by Fedor Zaytsev with an improvement suggested by Aleksey. CORE-8894
by akhaldi＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: akhaldi Date: Thu Apr 23 18:54:56 2015 New Revision: 67371 URL: http://svn.reactos.org/svn/reactos?rev=67371&view=rev Log: [BROWSEUI] Fix back and forward buttons so they work correctly. Brought to you by Fedor Zaytsev with an improvement suggested by Aleksey. CORE-8894 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Thu Apr 23 18:54:56 2015 @@ -127,6 +127,7 @@ }; static const unsigned int folderOptionsPageCountMax = 20; +static const long BTP_DONT_UPDATE_HISTORY = 0; static const long BTP_UPDATE_CUR_HISTORY = 1; static const long BTP_UPDATE_NEXT_HISTORY = 2; @@ -3001,7 +3002,7 @@ fHistoryObject = viewHistoryObject; fHistoryStream = pStream; fHistoryBindContext = pbc; - hResult = BrowseToPIDL(pidl, BTP_UPDATE_CUR_HISTORY); + hResult = BrowseToPIDL(pidl, BTP_DONT_UPDATE_HISTORY); fHistoryObject = NULL; fHistoryStream = NULL; fHistoryBindContext = NULL;

1 0

[tfaber] 67370: [NTDLL_APITEST] - Gracefully handle failures in NtMapViewOfSection test. CORE-9189 - Correctly handle unterminated strings in NtQueryKey test. Powered by DPH.
by tfaber＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: tfaber Date: Thu Apr 23 18:41:08 2015 New Revision: 67370 URL: http://svn.reactos.org/svn/reactos?rev=67370&view=rev Log: [NTDLL_APITEST] - Gracefully handle failures in NtMapViewOfSection test. CORE-9189 - Correctly handle unterminated strings in NtQueryKey test. Powered by DPH. Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c trunk/rostests/apitests/ntdll/NtQueryKey.c Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Thu Apr 23 18:41:08 2015 @@ -236,7 +236,7 @@ if (!NT_SUCCESS(Status)) return; - ok(BaseAddress == UlongToPtr(0x40000000), "Invalid BaseAddress: %p", BaseAddress); + ok(BaseAddress == UlongToPtr(0x40000000), "Invalid BaseAddress: %p\n", BaseAddress); BaseAddress = (PVOID)0x40080000; SectionOffset.QuadPart = 0x10000; @@ -253,7 +253,7 @@ PAGE_READWRITE); ok_ntstatus(Status, STATUS_SUCCESS); - ok(BaseAddress == (PVOID)0x40080000, "Invalid BaseAddress: %p", BaseAddress); + ok(BaseAddress == (PVOID)0x40080000, "Invalid BaseAddress: %p\n", BaseAddress); /* Commit a page in the section */ BaseAddress = (PVOID)0x40000000; @@ -401,7 +401,7 @@ _SEH2_END; ok_ntstatus(Status, STATUS_SUCCESS); - ok(*(PULONG)BaseAddress2 == 2, "Value in memory was wrong"); + ok(*(PULONG)BaseAddress2 == 2, "Value in memory was wrong\n"); /* Close the mapping */ NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); @@ -444,7 +444,7 @@ #else /* WoW64 returns STATUS_INSUFFICIENT_RESOURCES */ ok((Status == STATUS_INSUFFICIENT_RESOURCES) || (Status == STATUS_SECTION_TOO_BIG), - "got wrong Status: 0x%lx", Status); + "got wrong Status: 0x%lx\n", Status); #endif /* Try to create a even huger page file backed section, but only reserved */ @@ -488,7 +488,7 @@ #else /* WoW64 returns STATUS_INVALID_PARAMETER_4 */ ok((Status == STATUS_INVALID_PARAMETER_4) || (Status == STATUS_INVALID_PARAMETER_3), - "got wrong Status: 0x%lx", Status); + "got wrong Status: 0x%lx\n", Status); #endif /* Pass 0 region size */ @@ -511,7 +511,7 @@ #else /* WoW64 returns STATUS_NO_MEMORY */ ok((Status == STATUS_NO_MEMORY) || (Status == STATUS_INVALID_VIEW_SIZE), - "got wrong Status: 0x%lx", Status); + "got wrong Status: 0x%lx\n", Status); ok(ViewSize == 0, "wrong ViewSize: 0x%Ix\n", ViewSize); #endif @@ -677,6 +677,11 @@ FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); ok_ntstatus(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + skip("Failed to open file\n"); + return; + } /* Create a data section with write access */ Status = NtCreateSection(&DataSectionHandle, @@ -687,6 +692,12 @@ SEC_COMMIT, // AllocationAttributes FileHandle); ok_ntstatus(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create data section\n"); + NtClose(FileHandle); + return; + } /* Map the data section as flat mapping */ DataBase = NULL; @@ -703,6 +714,13 @@ PAGE_READWRITE); ok_ntstatus(Status, STATUS_SUCCESS); //ok(ViewSize == 0x3f95cc48, "ViewSize wrong: 0x%lx\n"); + if (!NT_SUCCESS(Status)) + { + skip("Failed to map view of data section\n"); + NtClose(DataSectionHandle); + NtClose(FileHandle); + return; + } /* Check the original data */ ok(*(ULONG*)DataBase == 0x00905a4d, "Header not ok\n"); @@ -725,6 +743,7 @@ SEC_IMAGE, // AllocationAttributes FileHandle); ok_ntstatus(Status, STATUS_INVALID_IMAGE_NOT_MZ); + if (NT_SUCCESS(Status)) NtClose(ImageSectionHandle); /* Restore the original header */ *(ULONG*)DataBase = 0x00905a4d; @@ -742,6 +761,13 @@ SEC_IMAGE, // AllocationAttributes FileHandle); ok_ntstatus(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create image section\n"); + NtClose(DataSectionHandle); + NtClose(FileHandle); + return; + } /* Map the image section */ ImageBase = NULL; @@ -761,6 +787,14 @@ #else ok_ntstatus(Status, STATUS_IMAGE_MACHINE_TYPE_MISMATCH); #endif + if (!NT_SUCCESS(Status)) + { + skip("Failed to map view of image section\n"); + NtClose(ImageSectionHandle); + NtClose(DataSectionHandle); + NtClose(FileHandle); + return; + } /* Check the header */ ok(*(ULONG*)DataBase == 0x00905a4d, "Header not ok\n"); @@ -813,6 +847,13 @@ SEC_IMAGE, // AllocationAttributes FileHandle); ok_ntstatus(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create image section\n"); + NtClose(DataSectionHandle); + NtClose(FileHandle); + return; + } /* Map the image section again */ ImageBase = NULL; @@ -832,6 +873,14 @@ #else ok_ntstatus(Status, STATUS_IMAGE_MACHINE_TYPE_MISMATCH); #endif + if (!NT_SUCCESS(Status)) + { + skip("Failed to map view of image section\n"); + NtClose(ImageSectionHandle); + NtClose(DataSectionHandle); + NtClose(FileHandle); + return; + } // This one doesn't always work, needs investigation /* Check the .data section again */ Modified: trunk/rostests/apitests/ntdll/NtQueryKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQueryKey… ============================================================================== --- trunk/rostests/apitests/ntdll/NtQueryKey.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtQueryKey.c [iso-8859-1] Thu Apr 23 18:41:08 2015 @@ -51,8 +51,9 @@ ok_size_t(InfoLength, FIELD_OFFSET(KEY_NAME_INFORMATION, Name[HKLM_Name.Length/sizeof(WCHAR)])); ok_size_t(NameInformation->NameLength, HKLM_Name.Length); - RtlInitUnicodeString(&InfoName, NameInformation->Name); + InfoName.Buffer = NameInformation->Name; InfoName.Length = NameInformation->NameLength; + InfoName.MaximumLength = NameInformation->NameLength; ok(RtlCompareUnicodeString(&InfoName, &HKLM_Name, TRUE) == 0, "%.*S\n", InfoName.Length, InfoName.Buffer); @@ -82,8 +83,9 @@ ok_size_t(InfoLength, FIELD_OFFSET(KEY_NAME_INFORMATION, Name[HKLM_Software_Name.Length/sizeof(WCHAR)])); ok_size_t(NameInformation->NameLength, HKLM_Software_Name.Length); - RtlInitUnicodeString(&InfoName, NameInformation->Name); + InfoName.Buffer = NameInformation->Name; InfoName.Length = NameInformation->NameLength; + InfoName.MaximumLength = NameInformation->NameLength; ok(RtlCompareUnicodeString(&InfoName, &HKLM_Software_Name, TRUE) == 0, "%.*S\n", InfoName.Length, InfoName.Buffer);

1 0

[aandrejevic] 67369: [NTVDM] Store the return address in INT 22h as a far pointer. The amount of memory stored in the Env variable is EnvSize, not sizeof(Env) since Env is a pointer.
by aandrejevic＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: aandrejevic Date: Thu Apr 23 15:19:48 2015 New Revision: 67369 URL: http://svn.reactos.org/svn/reactos?rev=67369&view=rev Log: [NTVDM] Store the return address in INT 22h as a far pointer. The amount of memory stored in the Env variable is EnvSize, not sizeof(Env) since Env is a pointer. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h 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] Thu Apr 23 15:19:48 2015 @@ -694,7 +694,11 @@ return &DosSystemFileTable[HandleTable[DosHandle]]; } -VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment) +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); @@ -709,7 +713,7 @@ PspBlock->LastParagraph = PspSegment + ProgramSize - 1; /* Save the interrupt vectors */ - PspBlock->TerminateAddress = IntVecTable[0x22]; + PspBlock->TerminateAddress = ReturnAddress; PspBlock->BreakAddress = IntVecTable[0x23]; PspBlock->CriticalAddress = IntVecTable[0x24]; @@ -744,6 +748,7 @@ IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, IN LPCSTR Environment OPTIONAL, + IN DWORD ReturnAddress OPTIONAL, OUT PDWORD StackLocation OPTIONAL, OUT PDWORD EntryPoint OPTIONAL) { @@ -865,7 +870,8 @@ DosInitializePsp(Segment, CommandLine, (WORD)ExeSize, - EnvBlock); + EnvBlock, + ReturnAddress); /* The process owns its own memory */ DosChangeMemoryOwner(Segment, Segment); @@ -943,7 +949,8 @@ DosInitializePsp(Segment, CommandLine, MaxAllocSize, - EnvBlock); + EnvBlock, + ReturnAddress); if (LoadType == DOS_LOAD_AND_EXECUTE) { @@ -993,11 +1000,13 @@ IN LPCSTR Environment OPTIONAL) { DWORD Result; + LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); Result = DosLoadExecutable(DOS_LOAD_AND_EXECUTE, ExecutablePath, CommandLine, Environment, + IntVecTable[0x20], // Use INT 20h NULL, NULL); @@ -1028,7 +1037,8 @@ #ifndef STANDALONE WORD DosCreateProcess(DOS_EXEC_TYPE LoadType, LPCSTR ProgramName, - PDOS_EXEC_PARAM_BLOCK Parameters) + PDOS_EXEC_PARAM_BLOCK Parameters, + DWORD ReturnAddress) { DWORD Result; DWORD BinaryType; @@ -1097,7 +1107,7 @@ CommandInfo.Title = Title; CommandInfo.TitleLen = sizeof(Title); CommandInfo.Env = Env; - CommandInfo.EnvLen = sizeof(Env); + CommandInfo.EnvLen = EnvSize; Command: /* Get the VDM command information */ @@ -1123,6 +1133,7 @@ AppName, CmdLine, Env, + ReturnAddress, &Parameters->StackLocation, &Parameters->EntryPoint); if (Result == ERROR_SUCCESS) @@ -2486,7 +2497,8 @@ DOS_EXEC_TYPE LoadType = (DOS_EXEC_TYPE)getAL(); LPSTR ProgramName = SEG_OFF_TO_PTR(getDS(), getDX()); PDOS_EXEC_PARAM_BLOCK ParamBlock = SEG_OFF_TO_PTR(getES(), getBX()); - WORD ErrorCode = DosCreateProcess(LoadType, ProgramName, ParamBlock); + DWORD ReturnAddress = MAKELONG(Stack[STACK_IP], Stack[STACK_CS]); + WORD ErrorCode = DosCreateProcess(LoadType, ProgramName, ParamBlock, ReturnAddress); if (ErrorCode == ERROR_SUCCESS) { Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Thu Apr 23 15:19:48 2015 @@ -238,19 +238,27 @@ LPDWORD NewOffset); BOOL DosFlushFileBuffers(WORD FileHandle); -VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment); +VOID DosInitializePsp( + WORD PspSegment, + LPCSTR CommandLine, + WORD ProgramSize, + WORD Environment, + DWORD ReturnAddress +); DWORD DosLoadExecutable( IN DOS_EXEC_TYPE LoadType, IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, IN LPCSTR Environment OPTIONAL, + IN DWORD ReturnAddress OPTIONAL, OUT PDWORD StackLocation OPTIONAL, OUT PDWORD EntryPoint OPTIONAL ); WORD DosCreateProcess( DOS_EXEC_TYPE LoadType, LPCSTR ProgramName, - PDOS_EXEC_PARAM_BLOCK Parameters + PDOS_EXEC_PARAM_BLOCK Parameters, + DWORD ReturnAddress ); DWORD DosStartProcess( IN LPCSTR ExecutablePath,

1 0

[cwittich] 67368: [CRT] add ARM stub for chkstk_ms (Timo please review)
by cwittich＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: cwittich Date: Thu Apr 23 12:27:08 2015 New Revision: 67368 URL: http://svn.reactos.org/svn/reactos?rev=67368&view=rev Log: [CRT] add ARM stub for chkstk_ms (Timo please review) Added: trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s (with props) Added: trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/chk… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s (added) +++ trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s [iso-8859-1] Thu Apr 23 12:27:08 2015 @@ -0,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of _chkstk and _alloca_probe + * FILE: lib/sdk/crt/except/arm/chkstk_ms.s + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Yuntian Zhang (yuntian.zh(a)gmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + TEXTAREA + +MsgUnimplemented ASCII "Unimplemented", CR, LF, NUL + + LEAF_ENTRY ___chkstk_ms + UNIMPLEMENTED chkstk_ms + bx lr + LEAF_END __chkstk_ms + + LEAF_ENTRY __alloca_probe + UNIMPLEMENTED alloca_probe + bx lr + LEAF_END __alloca_probe + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 67367: [FREELDR] rename boot.s to boot.S
by cwittich＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: cwittich Date: Thu Apr 23 12:13:54 2015 New Revision: 67367 URL: http://svn.reactos.org/svn/reactos?rev=67367&view=rev Log: [FREELDR] rename boot.s to boot.S Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.S - copied unchanged from r67365, trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s (removed) @@ -1,27 +0,0 @@ -/* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/arch/arm/boot.s - * PURPOSE: Implements the entry point for ARM machines - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -#include <ksarm.h> - - //.title "ARM FreeLDR Entry Point" - //.include "ntoskrnl/include/internal/arm/kxarm.h" - //.include "ntoskrnl/include/internal/arm/ksarm.h" - //.section .init - - NESTED_ENTRY _start - PROLOG_END _start - - //b ArmInit - - ENTRY_END _start - -//L_ArmInit: -// .long ArmInit - - END -/* EOF */

1 0

[tfaber] 67366: [URLMON_WINETEST] - Re-enable skipped protocol tests ROSTESTS-165 #resolve
by tfaber＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: tfaber Date: Thu Apr 23 11:32:20 2015 New Revision: 67366 URL: http://svn.reactos.org/svn/reactos?rev=67366&view=rev Log: [URLMON_WINETEST] - Re-enable skipped protocol tests ROSTESTS-165 #resolve Modified: trunk/rostests/winetests/urlmon/protocol.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Thu Apr 23 11:32:20 2015 @@ -3772,27 +3772,12 @@ thread_id = GetCurrentThreadId(); test_file_protocol(); - - if (!winetest_interactive) - skip("ROSTESTS-165: Skipping test_http_protocol() because of timeouts.\n"); - else - test_http_protocol(); - + test_http_protocol(); if(pCreateUri) - { - if (!winetest_interactive) - skip("ROSTESTS-165: Skipping test_https_protocol() because of timeouts.\n"); - else - test_https_protocol(); - } + test_https_protocol(); else win_skip("Skipping https tests on too old platform\n"); - - if (!winetest_interactive) - skip("ROSTESTS-165: Skipping test_ftp_protocol() because of timeouts.\n"); - else - test_ftp_protocol(); - + test_ftp_protocol(); test_gopher_protocol(); test_mk_protocol(); test_CreateBinding();

1 0

[tfaber] 67365: [WININET] - Add back our Winsock initialization ROS-diff. Wine has only partially fixed this at this point. CORE-9588
by tfaber＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: tfaber Date: Thu Apr 23 10:57:11 2015 New Revision: 67365 URL: http://svn.reactos.org/svn/reactos?rev=67365&view=rev Log: [WININET] - Add back our Winsock initialization ROS-diff. Wine has only partially fixed this at this point. CORE-9588 Modified: trunk/reactos/dll/win32/wininet/internet.c Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] Thu Apr 23 10:57:11 2015 @@ -996,6 +996,9 @@ { appinfo_t *lpwai = NULL; +#ifdef __REACTOS__ + init_winsock(); +#endif if (TRACE_ON(wininet)) { #define FE(x) { x, #x } static const wininet_flag_info access_type[] = {

1 0

[aandrejevic] 67364: [BASESRV] In BaseSrvGetNextVDMCommand, the VDM_FLAG_DONT_WAIT flag is enough to tell it not to create a wait handle.
by aandrejevic＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: aandrejevic Date: Thu Apr 23 02:53:08 2015 New Revision: 67364 URL: http://svn.reactos.org/svn/reactos?rev=67364&view=rev Log: [BASESRV] In BaseSrvGetNextVDMCommand, the VDM_FLAG_DONT_WAIT flag is enough to tell it not to create a wait handle. Modified: trunk/reactos/subsystems/win/basesrv/vdm.c Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Thu Apr 23 02:53:08 2015 @@ -1068,8 +1068,7 @@ } /* There is no command yet */ - if ((GetNextVdmCommandRequest->VDMState & (VDM_FLAG_DONT_WAIT | VDM_FLAG_RETRY)) - != (VDM_FLAG_DONT_WAIT | VDM_FLAG_RETRY)) + if (!(GetNextVdmCommandRequest->VDMState & VDM_FLAG_DONT_WAIT)) { if (ConsoleRecord->ServerEvent) {

1 0

[aandrejevic] 67363: [NTVDM][KERNEL32] In DosCreateProcess, allocate space for the environment block dynamically and expand it if needed, just like we do in CommandThreadProc. In GetNextVDMCommand, ...
by aandrejevic＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: aandrejevic Date: Thu Apr 23 02:30:53 2015 New Revision: 67363 URL: http://svn.reactos.org/svn/reactos?rev=67363&view=rev Log: [NTVDM][KERNEL32] In DosCreateProcess, allocate space for the environment block dynamically and expand it if needed, just like we do in CommandThreadProc. In GetNextVDMCommand, remove the check that checks whether VDMState is one of VDM_NOT_LOADED, VDM_NOT_READY or VDM_READY - that check makes no sense whatsoever, since those aren't input values for that structure field. Their bit masks do correspond to valid input fields, but even then the check makes no sense. Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Thu Apr 23 02:30:53 2015 @@ -1278,7 +1278,22 @@ if (CommandData != NULL) { - if (CommandData->VDMState & (VDM_NOT_LOADED | VDM_NOT_READY | VDM_READY)) + if ((CommandData->VDMState == VDM_INC_REENTER_COUNT) + || (CommandData->VDMState == VDM_DEC_REENTER_COUNT)) + { + /* Setup the input parameters */ + SetReenterCount->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + SetReenterCount->fIncDec = CommandData->VDMState; + + /* Call CSRSS */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetReenterCount), + sizeof(BASE_SET_REENTER_COUNT)); + BaseSetLastNTError(Status); + Result = NT_SUCCESS(Status); + } + else { /* Clear the structure */ ZeroMemory(GetNextVdmCommand, sizeof(*GetNextVdmCommand)); @@ -1545,26 +1560,6 @@ /* It was successful */ Result = TRUE; - } - else if ((CommandData->VDMState == VDM_INC_REENTER_COUNT) - || (CommandData->VDMState == VDM_DEC_REENTER_COUNT)) - { - /* Setup the input parameters */ - SetReenterCount->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; - SetReenterCount->fIncDec = CommandData->VDMState; - - /* Call CSRSS */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetReenterCount), - sizeof(BASE_SET_REENTER_COUNT)); - BaseSetLastNTError(Status); - Result = NT_SUCCESS(Status); - } - else - { - BaseSetLastNTError(STATUS_INVALID_PARAMETER); - Result = FALSE; } } else 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] Thu Apr 23 02:30:53 2015 @@ -1039,7 +1039,8 @@ CHAR PifFile[MAX_PATH]; CHAR Desktop[MAX_PATH]; CHAR Title[MAX_PATH]; - CHAR Env[MAX_PATH]; + ULONG EnvSize = 256; + PVOID Env = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInfo; @@ -1098,16 +1099,24 @@ CommandInfo.Env = Env; CommandInfo.EnvLen = sizeof(Env); +Command: /* Get the VDM command information */ if (!GetNextVDMCommand(&CommandInfo)) { + if (CommandInfo.EnvLen > EnvSize) + { + /* Expand the environment size */ + EnvSize = CommandInfo.EnvLen; + CommandInfo.Env = Env = RtlReAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); + + /* Repeat the request */ + CommandInfo.VDMState |= VDM_FLAG_RETRY; + goto Command; + } + /* Shouldn't happen */ ASSERT(FALSE); } - - /* Increment the re-entry count */ - CommandInfo.VDMState = VDM_INC_REENTER_COUNT; - GetNextVDMCommand(&CommandInfo); /* Load the executable */ Result = DosLoadExecutable(LoadType, @@ -1116,11 +1125,15 @@ Env, &Parameters->StackLocation, &Parameters->EntryPoint); - if (Result != ERROR_SUCCESS) + if (Result == ERROR_SUCCESS) + { + /* Increment the re-entry count */ + CommandInfo.VDMState = VDM_INC_REENTER_COUNT; + GetNextVDMCommand(&CommandInfo); + } + else { DisplayMessage(L"Could not load '%S'. Error: %u", AppName, Result); - // FIXME: Decrement the reenter count. Or, instead, just increment - // the VDM reenter count *only* if this call succeeds... } break; @@ -1133,6 +1146,8 @@ WaitForSingleObject(ProcessInfo.hProcess, INFINITE); } } + + RtlFreeHeap(RtlGetProcessHeap(), 0, Env); /* Close the handles */ CloseHandle(ProcessInfo.hProcess);

1 0

[aandrejevic] 67362: [NTVDM] Implement INT 21h, AH = 34h (Get Address of InDOS Flag).
by aandrejevic＠svn.reactos.org 23 Apr '15

23 Apr '15

Author: aandrejevic Date: Thu Apr 23 01:17:11 2015 New Revision: 67362 URL: http://svn.reactos.org/svn/reactos?rev=67362&view=rev Log: [NTVDM] Implement INT 21h, AH = 34h (Get Address of InDOS Flag). 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] Thu Apr 23 01:17:11 2015 @@ -31,6 +31,8 @@ /* PRIVATE VARIABLES **********************************************************/ +#define INDOS_POINTER MAKELONG(0x00FE, 0x0070) + CALLBACK16 DosContext; static DWORD DiskTransferArea; @@ -39,6 +41,7 @@ static CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; static DOS_SFT_ENTRY DosSystemFileTable[DOS_SFT_SIZE]; static WORD DosErrorLevel = 0x0000; +static PBYTE InDos; /* PUBLIC VARIABLES ***********************************************************/ @@ -1369,6 +1372,8 @@ PDOS_COUNTRY_CODE_BUFFER CountryCodeBuffer; INT Return; + (*InDos)++; + /* Check the value in the AH register */ switch (getAH()) { @@ -1546,7 +1551,12 @@ DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); DosPrintCharacter(DOS_OUTPUT_HANDLE, 'C'); - if (DosControlBreak()) return; + if (DosControlBreak()) + { + /* Set the character to a newline to exit the loop */ + Character = '\r'; + } + break; } @@ -1873,6 +1883,15 @@ break; } + /* Get Address of InDOS flag */ + case 0x34: + { + setES(HIWORD(INDOS_POINTER)); + setBX(LOWORD(INDOS_POINTER)); + + break; + } + /* Get Interrupt Vector */ case 0x35: { @@ -2895,6 +2914,8 @@ Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } } + + (*InDos)--; } VOID WINAPI DosBreakInterrupt(LPWORD Stack) @@ -2985,6 +3006,10 @@ FILE *Stream; WCHAR Buffer[256]; + /* Setup the InDOS flag */ + InDos = (PBYTE)FAR_POINTER(INDOS_POINTER); + *InDos = 0; + /* Clear the current directory buffer */ RtlZeroMemory(CurrentDirectories, sizeof(CurrentDirectories));

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