Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 59347: [KMTESTS/FSRTL] - Add all runs dumping to aid in development. - Do not try to add a mapping run with 0 LBN. Zero and negative LBNs are forbidden. - Rework other tests to work as e...
by fireball＠svn.reactos.org 27 Jun '13

27 Jun '13

Author: fireball Date: Thu Jun 27 08:32:46 2013 New Revision: 59347 URL: http://svn.reactos.org/svn/reactos?rev=59347&view=rev Log: [KMTESTS/FSRTL] - Add all runs dumping to aid in development. - Do not try to add a mapping run with 0 LBN. Zero and negative LBNs are forbidden. - Rework other tests to work as expected (plumb a hole). Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlM… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] Thu Jun 27 08:32:46 2013 @@ -14,6 +14,21 @@ { } +static VOID DumpAllRuns(PLARGE_MCB Mcb) +{ + ULONG i; + LONGLONG Vbn, Lbn, Count; + + trace("MCB %p:\n", Mcb); + + for (i = 0; FsRtlGetNextLargeMcbEntry(Mcb, i, &Vbn, &Lbn, &Count); i++) + { + // print out vbn, lbn, and count + trace("\t[%I64d,%I64d,%I64d]\n", Vbn, Lbn, Count); + } + trace("\n"); +} + static VOID FsRtlLargeMcbTest() { LARGE_MCB LargeMcb; @@ -28,6 +43,7 @@ ok(FsRtlAddLargeMcbEntry(&LargeMcb, 1, 1, 1024) == TRUE, "expected TRUE, got FALSE\n"); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + DumpAllRuns(&LargeMcb); // [0,-1,1][1,1,1024] [vbn,lbn,sc] ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 1024, "Expected Vbn 1024, got: %I64d\n", Vbn); ok(Lbn == 1024, "Expected Lbn 1024, got: %I64d\n", Lbn); @@ -39,6 +55,7 @@ ok(FsRtlAddLargeMcbEntry(&LargeMcb, 2048, 2, 1024) == TRUE, "expected TRUE, got FALSE\n"); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 4, "Expected 4 runs, got: %lu\n", NbRuns); + DumpAllRuns(&LargeMcb); // [0,-1,1][1,1,1024][1025,-1,1023][2048,2,1024] ======= [(0,1) hole] [(1,1025)=>(1,1025)] [(1025, 2048) hole] [(2048,3072)=>(2,1026)] ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 3071, "Expected Vbn 3071, got: %I64d\n", Vbn); ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); @@ -88,6 +105,7 @@ FsRtlRemoveLargeMcbEntry(&LargeMcb, 1, 1024); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + DumpAllRuns(&LargeMcb); // [0,-1,2048][2048,2,1024] ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 512, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); ok(SectorCount == 1536, "Expected SectorCount 1536, got: %I64d\n", SectorCount); @@ -102,6 +120,7 @@ ok(FsRtlSplitLargeMcb(&LargeMcb, 2048, 1024) == TRUE, "expected TRUE, got FALSE\n"); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + DumpAllRuns(&LargeMcb); // [0,-1,3072][3072,2,1024] ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 4095, "Expected Vbn 4095, got: %I64d\n", Vbn); ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); @@ -124,6 +143,7 @@ ok(FsRtlAddLargeMcbEntry(&LargeMcb, 4095, 1025, 1024) == TRUE, "expected TRUE, got FALSE\n"); NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + DumpAllRuns(&LargeMcb); // [0,-1,3072][3072,2,2047] ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 5118, "Expected Vbn 5118, got: %I64d\n", Vbn); ok(Lbn == 2048, "Expected Lbn 2048, got: %I64d\n", Lbn); @@ -133,6 +153,7 @@ ok(Index == 1, "Expected Index 1, got: %lu\n", Index); FsRtlTruncateLargeMcb(&LargeMcb, 4607); + DumpAllRuns(&LargeMcb); // [0,-1,3072][3072,2,1535] ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 4095, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); ok(SectorCount == 512, "Expected SectorCount 512, got: %I64d\n", SectorCount); @@ -150,9 +171,12 @@ * It looks like that: * ----//////-----/////-----/////// */ - ok(FsRtlAddLargeMcbEntry(&LargeMcb, 1024, 1024, 1024) == TRUE, "expected TRUE, got FALSE\n"); + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 1024, 1025, 1024) == TRUE, "expected TRUE, got FALSE\n"); + DumpAllRuns(&LargeMcb); // [0,-1,1024][1024,1024,1024] ok(FsRtlAddLargeMcbEntry(&LargeMcb, 3072, 3072, 1024) == TRUE, "expected TRUE, got FALSE\n"); + DumpAllRuns(&LargeMcb); // [0,-1,1024][1024,1024,1024][2048,-1,1024][3072,3072,1024] ok(FsRtlAddLargeMcbEntry(&LargeMcb, 5120, 5120, 1024) == TRUE, "expected TRUE, got FALSE\n"); + DumpAllRuns(&LargeMcb); // [0,-1,1024][1024,1024,1024][2048,-1,1024][3072,3072,1024][4096,-1,1024][5120,5120,1024] NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); ok(NbRuns == 6, "Expected 6 runs, got: %lu\n", NbRuns); @@ -164,7 +188,7 @@ ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 1, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 1024, "Expected Vbn 1024, got: %I64d\n", Vbn); - ok(Lbn == 1024, "Expected Lbn 1024, got: %I64d\n", Lbn); + ok(Lbn == 1025, "Expected Lbn 1024, got: %I64d\n", Lbn); ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 2, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); @@ -188,53 +212,65 @@ ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); /* Fill first hole */ - ok(FsRtlAddLargeMcbEntry(&LargeMcb, 0, 0, 1024) == TRUE, "expected TRUE, got FALSE\n"); - - NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); - ok(NbRuns == 4, "Expected 4 runs, got: %lu\n", NbRuns); - - ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); - ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); - ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); - ok(SectorCount == 3072, "Expected SectorCount 3072, got: %I64d\n", SectorCount); - - ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 1, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 0, 1, 1024) == TRUE, "expected TRUE, got FALSE\n"); + DumpAllRuns(&LargeMcb); // [0,1,2048][2048,-1,1024][3072,3072,1024][4096,-1,1024][5120,5120,1024] + + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 5, "Expected 5 runs, got: %lu\n", NbRuns); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 2048, "Expected SectorCount 2048, got: %I64d\n", SectorCount); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 1, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 2048, "Expected Vbn 2048, got: %I64d\n", Vbn); + ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 2, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 3072, "Expected Vbn 3072, got: %I64d\n", Vbn); ok(Lbn == 3072, "Expected Lbn 3072, got: %I64d\n", Lbn); ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); - ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 2, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 3, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 4096, "Expected Vbn 4096, got: %I64d\n", Vbn); ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); - ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 3, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 4, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 5120, "Expected Vbn 5120, got: %I64d\n", Vbn); ok(Lbn == 5120, "Expected Lbn 5120, got: %I64d\n", Lbn); ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); /* Fill half of the last hole and overlap */ ok(FsRtlAddLargeMcbEntry(&LargeMcb, 4608, 4608, 1024) == TRUE, "expected TRUE, got FALSE\n"); - - NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); - ok(NbRuns == 4, "Expected 4 runs, got: %lu\n", NbRuns); - - ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); - ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); - ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); - ok(SectorCount == 3072, "Expected SectorCount 3072, got: %I64d\n", SectorCount); - - ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 1, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + DumpAllRuns(&LargeMcb); // [0,1,2048][2048,-1,1024][3072,3072,1024][4096,-1,512][4608,4608,1536] + + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 5, "Expected 5 runs, got: %lu\n", NbRuns); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 2048, "Expected SectorCount 2048, got: %I64d\n", SectorCount); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 1, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 2048, "Expected Vbn 2048, got: %I64d\n", Vbn); + ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 2, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 3072, "Expected Vbn 3072, got: %I64d\n", Vbn); ok(Lbn == 3072, "Expected Lbn 3072, got: %I64d\n", Lbn); ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); - ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 2, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 3, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 4096, "Expected Vbn 4096, got: %I64d\n", Vbn); ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); ok(SectorCount == 512, "Expected SectorCount 512, got: %I64d\n", SectorCount); - ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 3, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 4, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); ok(Vbn == 4608, "Expected Vbn 4608, got: %I64d\n", Vbn); ok(Lbn == 4608, "Expected Lbn 4608, got: %I64d\n", Lbn); ok(SectorCount == 1536, "Expected SectorCount 1536, got: %I64d\n", SectorCount);

1 0

[jjones] 59346: Build of CDFS.SYS, courtesy of Mr. Wang.
by jjones＠svn.reactos.org 27 Jun '13

27 Jun '13

Author: jjones Date: Thu Jun 27 07:57:05 2013 New Revision: 59346 URL: http://svn.reactos.org/svn/reactos?rev=59346&view=rev Log: Build of CDFS.SYS, courtesy of Mr. Wang. Modified: branches/vs_jc/reactos/ (props changed) branches/vs_jc/reactos/ReactOS.sln branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj Propchange: branches/vs_jc/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 27 07:57:05 2013 @@ -15,4 +15,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:59302-59328 +/trunk/reactos:59302-59337 Modified: branches/vs_jc/reactos/ReactOS.sln URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ReactOS.sln?rev=5… ============================================================================== --- branches/vs_jc/reactos/ReactOS.sln [iso-8859-1] (original) +++ branches/vs_jc/reactos/ReactOS.sln [iso-8859-1] Thu Jun 27 07:57:05 2013 @@ -1557,9 +1557,11 @@ {83D48240-6438-4890-9350-F256CC064F18}.Release|x86_64.ActiveCfg = Release|Win32 {1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Debug|ARM.ActiveCfg = Debug|Win32 {1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Debug|x86_32.ActiveCfg = Debug|Win32 + {1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Debug|x86_32.Build.0 = Debug|Win32 {1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Debug|x86_64.ActiveCfg = Debug|Win32 {1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Release|ARM.ActiveCfg = Release|Win32 {1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Release|x86_32.ActiveCfg = Release|Win32 + {1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Release|x86_32.Build.0 = Release|Win32 {1F0D3CAE-DA53-40BD-B7EA-77A521C4BBC2}.Release|x86_64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/_IMAGES/CD_Live/C… ============================================================================== --- branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj [iso-8859-1] (original) +++ branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj [iso-8859-1] Thu Jun 27 07:57:05 2013 @@ -37,6 +37,10 @@ copy "$(SolutionDir)\base\applications\ATACTL\$(OutDir)\ATACTL.EXE" . REM "copy $(SolutionDir)\base\applications\CALC\$(OutDir)\CALC.EXE" . copy "$(SolutionDir)\media\nls\*.nls" . +mkdir drivers +cd drivers +copy "$(SolutionDir)\drivers\filesystems\CDFS\$(OutDir)\CDFS.SYS" . +cd .. mkdir config cd "$(SolutionDir)\boot\bootdata" "$(SolutionDir)\tools\mkhive\build\x86_32\$(Configuration)\mkhive.exe" "$(TargetDir)\root\reactos\system32\config" hivecls.inf hivedef.inf hivesft.inf hivesys.inf livecd.inf hiveinst.inf @@ -67,6 +71,10 @@ copy "$(SolutionDir)\base\applications\ATACTL\$(OutDir)\ATACTL.EXE" . REM "copy $(SolutionDir)\base\applications\CALC\$(OutDir)\CALC.EXE" . copy "$(SolutionDir)\media\nls\*.nls" . +mkdir drivers +cd drivers +copy "$(SolutionDir)\drivers\filesystems\CDFS\$(OutDir)\CDFS.SYS" . +cd .. mkdir config cd "$(SolutionDir)\boot\bootdata" "$(SolutionDir)\tools\mkhive\build\x86_32\$(Configuration)\mkhive.exe" "$(TargetDir)\root\reactos\system32\config" hivecls.inf hivedef.inf hivesft.inf hivesys.inf livecd.inf hiveinst.inf Modified: branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/filesyste… ============================================================================== --- branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj [iso-8859-1] (original) +++ branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj [iso-8859-1] Thu Jun 27 07:57:05 2013 @@ -17,12 +17,12 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> @@ -41,11 +41,15 @@ <LinkIncremental>true</LinkIncremental> <OutDir>build\x86_32\$(Configuration)\</OutDir> <IntDir>build\x86_32\$(Configuration)\</IntDir> + <GenerateManifest>false</GenerateManifest> + <TargetExt>.sys</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <OutDir>build\x86_32\$(Configuration)\</OutDir> <IntDir>build\x86_32\$(Configuration)\</IntDir> + <GenerateManifest>false</GenerateManifest> + <TargetExt>.sys</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -54,10 +58,26 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk;..\..\..\include\reactos\drivers</AdditionalIncludeDirectories> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> </ClCompile> <Link> - <SubSystem>Windows</SubSystem> + <SubSystem>Native</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalOptions> + </AdditionalOptions> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <Driver>Driver</Driver> + <EntryPointSymbol>DriverEntry@8</EntryPointSymbol> + <BaseAddress>0x00010000</BaseAddress> + <FixedBaseAddress> + </FixedBaseAddress> + <RandomizedBaseAddress> + </RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -69,12 +89,26 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk;..\..\..\include\reactos\drivers</AdditionalIncludeDirectories> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> </ClCompile> <Link> - <SubSystem>Windows</SubSystem> + <SubSystem>Native</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <Driver>Driver</Driver> + <EntryPointSymbol>DriverEntry@8</EntryPointSymbol> + <BaseAddress>0x00010000</BaseAddress> + <FixedBaseAddress> + </FixedBaseAddress> + <RandomizedBaseAddress> + </RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -96,12 +130,25 @@ <ClInclude Include="cdfs.h" /> </ItemGroup> <ItemGroup> - <ResourceCompile Include="cdfs.rc" /> + <ResourceCompile Include="cdfs.rc"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreStandardIncludePath> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreStandardIncludePath> + </ResourceCompile> </ItemGroup> <ItemGroup> <None Include="CMakeLists.txt" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\lib\import\HAL\HAL.vcxproj"> + <Project>{19d0d0aa-c065-4101-9f74-e45a87d35ba7}</Project> + </ProjectReference> + <ProjectReference Include="..\..\..\lib\import\ntoskrnl\ntoskrnl.vcxproj"> + <Project>{315ae91a-d723-485c-abd0-1378a1ead8e5}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>

1 0

[hbelusca] 59345: [KERNEL32] Remove a spurious cast, and add a note for the pInputControl parameter of ReadConsole. [CONSRV] - Move some input/output console function helpers to condrv. - The way w...
by hbelusca＠svn.reactos.org 27 Jun '13

27 Jun '13

Author: hbelusca Date: Thu Jun 27 00:20:58 2013 New Revision: 59345 URL: http://svn.reactos.org/svn/reactos?rev=59345&view=rev Log: [KERNEL32] Remove a spurious cast, and add a note for the pInputControl parameter of ReadConsole. [CONSRV] - Move some input/output console function helpers to condrv. - The way we notify for the presence of new input data, or for console pausing/unpausing, should be reconsidered (who should do this? The console driver? The active front-end?) Modified: trunk/reactos/dll/win32/kernel32/client/console/readwrite.c trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/consrv/condrv/coninput.c trunk/reactos/win32ss/user/consrv/condrv/text.c trunk/reactos/win32ss/user/consrv/coninput.c trunk/reactos/win32ss/user/consrv/conoutput.c Modified: trunk/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Thu Jun 27 00:20:58 2013 @@ -60,11 +60,17 @@ /* Set up the data to send to the Console Server */ ReadConsoleRequest->InputHandle = hConsoleInput; ReadConsoleRequest->Unicode = bUnicode; - ReadConsoleRequest->NrCharactersToRead = (WORD)nNumberOfCharsToRead; + ReadConsoleRequest->NrCharactersToRead = nNumberOfCharsToRead; ReadConsoleRequest->NrCharactersRead = 0; ReadConsoleRequest->CtrlWakeupMask = 0; if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) { + /* + * From MSDN (ReadConsole function), the description + * for pInputControl says: + * "This parameter requires Unicode input by default. + * For ANSI mode, set this parameter to NULL." + */ ReadConsoleRequest->NrCharactersRead = pInputControl->nInitialChars; memcpy(ReadConsoleRequest->Buffer, lpBuffer, Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Thu Jun 27 00:20:58 2013 @@ -167,8 +167,8 @@ HANDLE InputHandle; BOOL Unicode; - WORD NrCharactersToRead; - WORD NrCharactersRead; + ULONG NrCharactersToRead; + ULONG NrCharactersRead; UNICODE_STRING ExeName; DWORD CtrlWakeupMask; Modified: trunk/reactos/win32ss/user/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/coninput.c [iso-8859-1] Thu Jun 27 00:20:58 2013 @@ -43,17 +43,9 @@ INPUT_RECORD InputEvent; } ConsoleInput; -typedef struct _GET_INPUT_INFO -{ - PCSR_THREAD CallingThread; // The thread which called the input API. - PVOID HandleEntry; // The handle data associated with the wait thread. - PCONSOLE_INPUT_BUFFER InputBuffer; // The input buffer corresponding to the handle. -} GET_INPUT_INFO, *PGET_INPUT_INFO; - /* PRIVATE FUNCTIONS **********************************************************/ -#if 0 static VOID FASTCALL ConioInputEventToAnsi(PCONSOLE Console, PINPUT_RECORD InputEvent) { @@ -66,7 +58,6 @@ &UnicodeChar); } } -#endif NTSTATUS FASTCALL ConioProcessInputEvent(PCONSOLE Console, @@ -212,12 +203,230 @@ /* PUBLIC SERVER APIS *********************************************************/ NTSTATUS NTAPI +ConDrvReadConsole(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + IN BOOLEAN Unicode, + OUT PVOID Buffer, + IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN ULONG NumCharsToRead, + OUT PULONG NumCharsRead OPTIONAL) +{ + // STATUS_PENDING : Wait if more to read ; STATUS_SUCCESS : Don't wait. + NTSTATUS Status = STATUS_PENDING; + PLIST_ENTRY CurrentEntry; + ConsoleInput *Input; + ULONG i = ReadControl->nInitialChars; + + if (Console == NULL || InputBuffer == NULL || /* Buffer == NULL || */ + ReadControl == NULL || ReadControl->nLength != sizeof(CONSOLE_READCONSOLE_CONTROL)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Validity checks */ + ASSERT(Console == InputBuffer->Header.Console); + ASSERT( (Buffer != NULL && NumCharsToRead >= 0) || + (Buffer == NULL && NumCharsToRead == 0) ); + + /* We haven't read anything (yet) */ + + if (InputBuffer->Mode & ENABLE_LINE_INPUT) + { + if (Console->LineBuffer == NULL) + { + /* Starting a new line */ + Console->LineMaxSize = (WORD)max(256, NumCharsToRead); + + Console->LineBuffer = ConsoleAllocHeap(0, Console->LineMaxSize * sizeof(WCHAR)); + if (Console->LineBuffer == NULL) return STATUS_NO_MEMORY; + + Console->LineComplete = FALSE; + Console->LineUpPressed = FALSE; + Console->LineInsertToggle = 0; + Console->LineWakeupMask = ReadControl->dwCtrlWakeupMask; + Console->LineSize = ReadControl->nInitialChars; + Console->LinePos = Console->LineSize; + + /* + * Pre-filling the buffer is only allowed in the Unicode API, + * so we don't need to worry about ANSI <-> Unicode conversion. + */ + memcpy(Console->LineBuffer, Buffer, Console->LineSize * sizeof(WCHAR)); + if (Console->LineSize == Console->LineMaxSize) + { + Console->LineComplete = TRUE; + Console->LinePos = 0; + } + } + + /* If we don't have a complete line yet, process the pending input */ + while (!Console->LineComplete && !IsListEmpty(&InputBuffer->InputEvents)) + { + /* Remove input event from queue */ + CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); + if (IsListEmpty(&InputBuffer->InputEvents)) + { + ResetEvent(InputBuffer->ActiveEvent); + } + Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); + + /* Only pay attention to key down */ + if (Input->InputEvent.EventType == KEY_EVENT && + Input->InputEvent.Event.KeyEvent.bKeyDown) + { + LineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); + ReadControl->dwControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState; + } + ConsoleFreeHeap(Input); + } + + /* Check if we have a complete line to read from */ + if (Console->LineComplete) + { + while (i < NumCharsToRead && Console->LinePos != Console->LineSize) + { + WCHAR Char = Console->LineBuffer[Console->LinePos++]; + + if (Unicode) + { + ((PWCHAR)Buffer)[i] = Char; + } + else + { + ConsoleInputUnicodeCharToAnsiChar(Console, &((PCHAR)Buffer)[i], &Char); + } + ++i; + } + + if (Console->LinePos == Console->LineSize) + { + /* Entire line has been read */ + ConsoleFreeHeap(Console->LineBuffer); + Console->LineBuffer = NULL; + } + + Status = STATUS_SUCCESS; + } + } + else + { + /* Character input */ + while (i < NumCharsToRead && !IsListEmpty(&InputBuffer->InputEvents)) + { + /* Remove input event from queue */ + CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); + if (IsListEmpty(&InputBuffer->InputEvents)) + { + ResetEvent(InputBuffer->ActiveEvent); + } + Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); + + /* Only pay attention to valid ASCII chars, on key down */ + if (Input->InputEvent.EventType == KEY_EVENT && + Input->InputEvent.Event.KeyEvent.bKeyDown && + Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar != L'\0') + { + WCHAR Char = Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar; + + if (Unicode) + { + ((PWCHAR)Buffer)[i] = Char; + } + else + { + ConsoleInputUnicodeCharToAnsiChar(Console, &((PCHAR)Buffer)[i], &Char); + } + ++i; + + /* Did read something */ + Status = STATUS_SUCCESS; + } + ConsoleFreeHeap(Input); + } + } + + if (NumCharsRead) *NumCharsRead = i; + + return Status; +} + +NTSTATUS NTAPI +ConDrvGetConsoleInput(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + IN BOOLEAN WaitForMoreEvents, + IN BOOLEAN Unicode, + OUT PINPUT_RECORD InputRecord, + IN ULONG NumEventsToRead, + OUT PULONG NumEventsRead OPTIONAL) +{ + PLIST_ENTRY CurrentInput; + ConsoleInput* Input; + ULONG i = 0; + + if (Console == NULL || InputBuffer == NULL /* || InputRecord == NULL */) + return STATUS_INVALID_PARAMETER; + + /* Validity checks */ + ASSERT(Console == InputBuffer->Header.Console); + ASSERT( (InputRecord != NULL && NumEventsToRead >= 0) || + (InputRecord == NULL && NumEventsToRead == 0) ); + + // Do NOT do that !! Use the existing number of events already read, if any... + // if (NumEventsRead) *NumEventsRead = 0; + + if (IsListEmpty(&InputBuffer->InputEvents)) + { + /* + * No input is available. Wait for more input if requested, + * otherwise, we don't wait, so we return success. + */ + return (WaitForMoreEvents ? STATUS_PENDING : STATUS_SUCCESS); + } + + /* Only get input if there is any */ + CurrentInput = InputBuffer->InputEvents.Flink; + if (NumEventsRead) i = *NumEventsRead; // We will read the remaining events... + + while ((CurrentInput != &InputBuffer->InputEvents) && (i < NumEventsToRead)) + { + Input = CONTAINING_RECORD(CurrentInput, ConsoleInput, ListEntry); + + *InputRecord = Input->InputEvent; + + if (!Unicode) + { + ConioInputEventToAnsi(InputBuffer->Header.Console, InputRecord); + } + + ++InputRecord; + ++i; + CurrentInput = CurrentInput->Flink; + + if (WaitForMoreEvents) // TRUE --> Read, we remove inputs from the buffer ; FALSE --> Peek, we keep inputs. + { + RemoveEntryList(&Input->ListEntry); + ConsoleFreeHeap(Input); + } + } + + if (NumEventsRead) *NumEventsRead = i; + + if (IsListEmpty(&InputBuffer->InputEvents)) + { + ResetEvent(InputBuffer->ActiveEvent); + } + + /* We read all the inputs available, we return success */ + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI ConDrvWriteConsoleInput(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, IN BOOLEAN Unicode, IN PINPUT_RECORD InputRecord, IN ULONG NumEventsToWrite, - OUT PULONG NumEventsWritten) + OUT PULONG NumEventsWritten OPTIONAL) { NTSTATUS Status = STATUS_SUCCESS; ULONG i; @@ -230,9 +439,10 @@ ASSERT( (InputRecord != NULL && NumEventsToWrite >= 0) || (InputRecord == NULL && NumEventsToWrite == 0) ); - if (NumEventsWritten) *NumEventsWritten = 0; - - for (i = 0; i < NumEventsToWrite && NT_SUCCESS(Status); ++i) + // Do NOT do that !! Use the existing number of events already written, if any... + // if (NumEventsWritten) *NumEventsWritten = 0; + + for (i = (NumEventsWritten ? *NumEventsWritten : 0); i < NumEventsToWrite && NT_SUCCESS(Status); ++i) { if (InputRecord->EventType == KEY_EVENT && !Unicode) { Modified: trunk/reactos/win32ss/user/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/text.c [iso-8859-1] Thu Jun 27 00:20:58 2013 @@ -751,9 +751,77 @@ } NTSTATUS NTAPI -ConDrvWriteConsole(IN PCONSOLE Console) -{ - return STATUS_NOT_IMPLEMENTED; +ConDrvWriteConsole(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER ScreenBuffer, + IN BOOLEAN Unicode, + IN PVOID StringBuffer, + IN ULONG NumCharsToWrite, + OUT PULONG NumCharsWritten OPTIONAL) +{ + NTSTATUS Status = STATUS_SUCCESS; + PWCHAR Buffer = NULL; + ULONG Written = 0; + ULONG Length; + + if (Console == NULL || ScreenBuffer == NULL /* || StringBuffer == NULL */) + return STATUS_INVALID_PARAMETER; + + /* Validity checks */ + ASSERT(Console == ScreenBuffer->Header.Console); + ASSERT( (StringBuffer != NULL && NumCharsToWrite >= 0) || + (StringBuffer == NULL && NumCharsToWrite == 0) ); + + // if (Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION)) + if (Console->PauseFlags && Console->UnpauseEvent != NULL) + { + return STATUS_PENDING; + } + + if (Unicode) + { + Buffer = StringBuffer; + } + else + { + Length = MultiByteToWideChar(Console->OutputCodePage, 0, + (PCHAR)StringBuffer, + NumCharsToWrite, + NULL, 0); + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); + if (Buffer) + { + MultiByteToWideChar(Console->OutputCodePage, 0, + (PCHAR)StringBuffer, + NumCharsToWrite, + (PWCHAR)Buffer, Length); + } + else + { + Status = STATUS_NO_MEMORY; + } + } + + if (Buffer) + { + if (NT_SUCCESS(Status)) + { + Status = ConioWriteConsole(Console, + ScreenBuffer, + Buffer, + NumCharsToWrite, + TRUE); + if (NT_SUCCESS(Status)) + { + Written = NumCharsToWrite; + } + } + + if (!Unicode) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + } + + if (NumCharsWritten) *NumCharsWritten = Written; + + return Status; } NTSTATUS NTAPI Modified: trunk/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/coninp… ============================================================================== --- trunk/reactos/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/coninput.c [iso-8859-1] Thu Jun 27 00:20:58 2013 @@ -31,15 +31,6 @@ ConSrvReleaseObject(&(Buff)->Header, (IsConsoleLocked)) -#define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ - WideCharToMultiByte((Console)->CodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) - -typedef struct ConsoleInput_t -{ - LIST_ENTRY ListEntry; - INPUT_RECORD InputEvent; -} ConsoleInput; - typedef struct _GET_INPUT_INFO { PCSR_THREAD CallingThread; // The thread which called the input API. @@ -49,19 +40,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ - -static VOID FASTCALL -ConioInputEventToAnsi(PCONSOLE Console, PINPUT_RECORD InputEvent) -{ - if (InputEvent->EventType == KEY_EVENT) - { - WCHAR UnicodeChar = InputEvent->Event.KeyEvent.uChar.UnicodeChar; - InputEvent->Event.KeyEvent.uChar.UnicodeChar = 0; - ConsoleInputUnicodeCharToAnsiChar(Console, - &InputEvent->Event.KeyEvent.uChar.AsciiChar, - &UnicodeChar); - } -} static NTSTATUS WaitBeforeReading(IN PGET_INPUT_INFO InputInfo, @@ -95,6 +73,120 @@ } static NTSTATUS +ReadChars(IN PGET_INPUT_INFO InputInfo, + IN PCSR_API_MESSAGE ApiMessage, + IN BOOL CreateWaitBlock OPTIONAL); + +// Wait function CSR_WAIT_FUNCTION +static BOOLEAN +ReadCharsThread(IN PLIST_ENTRY WaitList, + IN PCSR_THREAD WaitThread, + IN PCSR_API_MESSAGE WaitApiMessage, + IN PVOID WaitContext, + IN PVOID WaitArgument1, + IN PVOID WaitArgument2, + IN ULONG WaitFlags) +{ + NTSTATUS Status; + PGET_INPUT_INFO InputInfo = (PGET_INPUT_INFO)WaitContext; + + PVOID InputHandle = WaitArgument2; + + DPRINT("ReadCharsThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); + + /* + * If we are notified of the process termination via a call + * to CsrNotifyWaitBlock triggered by CsrDestroyProcess or + * CsrDestroyThread, just return. + */ + if (WaitFlags & CsrProcessTerminating) + { + Status = STATUS_THREAD_IS_TERMINATING; + goto Quit; + } + + /* + * Somebody is closing a handle to this input buffer, + * by calling ConSrvCloseHandleEntry. + * See whether we are linked to that handle (ie. we + * are a waiter for this handle), and if so, return. + * Otherwise, ignore the call and continue waiting. + */ + if (InputHandle != NULL) + { + Status = (InputHandle == InputInfo->HandleEntry ? STATUS_ALERTED + : STATUS_PENDING); + goto Quit; + } + + /* + * If we go there, that means we are notified for some new input. + * The console is therefore already locked. + */ + Status = ReadChars(InputInfo, + WaitApiMessage, + FALSE); + +Quit: + if (Status != STATUS_PENDING) + { + WaitApiMessage->Status = Status; + ConsoleFreeHeap(InputInfo); + } + + return (Status == STATUS_PENDING ? FALSE : TRUE); +} + +NTSTATUS NTAPI +ConDrvReadConsole(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + IN BOOLEAN Unicode, + OUT PVOID Buffer, + IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN ULONG NumCharsToRead, + OUT PULONG NumCharsRead OPTIONAL); +static NTSTATUS +ReadChars(IN PGET_INPUT_INFO InputInfo, + IN PCSR_API_MESSAGE ApiMessage, + IN BOOL CreateWaitBlock OPTIONAL) +{ + NTSTATUS Status; + PCONSOLE_READCONSOLE ReadConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ReadConsoleRequest; + PCONSOLE_INPUT_BUFFER InputBuffer = InputInfo->InputBuffer; + CONSOLE_READCONSOLE_CONTROL ReadControl; + + ReadControl.nLength = sizeof(CONSOLE_READCONSOLE_CONTROL); + ReadControl.nInitialChars = ReadConsoleRequest->NrCharactersRead; + ReadControl.dwCtrlWakeupMask = ReadConsoleRequest->CtrlWakeupMask; + ReadControl.dwControlKeyState = ReadConsoleRequest->ControlKeyState; + + Status = ConDrvReadConsole(InputBuffer->Header.Console, + InputBuffer, + ReadConsoleRequest->Unicode, + ReadConsoleRequest->Buffer, + &ReadControl, + ReadConsoleRequest->NrCharactersToRead, + &ReadConsoleRequest->NrCharactersRead); + + ReadConsoleRequest->ControlKeyState = ReadControl.dwControlKeyState; + + if (Status == STATUS_PENDING) + { + /* We haven't completed a read, so start a wait */ + return WaitBeforeReading(InputInfo, + ApiMessage, + ReadCharsThread, + CreateWaitBlock); + } + else + { + /* We read all what we wanted, we return the error code we were given */ + return Status; + // return STATUS_SUCCESS; + } +} + +static NTSTATUS ReadInputBuffer(IN PGET_INPUT_INFO InputInfo, IN BOOL Wait, IN PCSR_API_MESSAGE ApiMessage, @@ -162,292 +254,47 @@ return (Status == STATUS_PENDING ? FALSE : TRUE); } +NTSTATUS NTAPI +ConDrvGetConsoleInput(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + IN BOOLEAN WaitForMoreEvents, + IN BOOLEAN Unicode, + OUT PINPUT_RECORD InputRecord, + IN ULONG NumEventsToRead, + OUT PULONG NumEventsRead); static NTSTATUS ReadInputBuffer(IN PGET_INPUT_INFO InputInfo, IN BOOL Wait, // TRUE --> Read ; FALSE --> Peek IN PCSR_API_MESSAGE ApiMessage, IN BOOL CreateWaitBlock OPTIONAL) { + NTSTATUS Status; + PCONSOLE_GETINPUT GetInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetInputRequest; PCONSOLE_INPUT_BUFFER InputBuffer = InputInfo->InputBuffer; - if (IsListEmpty(&InputBuffer->InputEvents)) - { - if (Wait) - { - return WaitBeforeReading(InputInfo, - ApiMessage, - ReadInputBufferThread, - CreateWaitBlock); - } - else - { - /* No input available and we don't wait, so we return success */ - return STATUS_SUCCESS; - } - } - else - { - PCONSOLE_GETINPUT GetInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetInputRequest; - PLIST_ENTRY CurrentInput; - ConsoleInput* Input; - ULONG Length = GetInputRequest->Length; - PINPUT_RECORD InputRecord = GetInputRequest->InputRecord; - - /* Only get input if there is any */ - CurrentInput = InputBuffer->InputEvents.Flink; - - while ( CurrentInput != &InputBuffer->InputEvents && - GetInputRequest->InputsRead < Length ) - { - Input = CONTAINING_RECORD(CurrentInput, ConsoleInput, ListEntry); - - GetInputRequest->InputsRead++; - *InputRecord = Input->InputEvent; - - if (GetInputRequest->Unicode == FALSE) - { - ConioInputEventToAnsi(InputBuffer->Header.Console, InputRecord); - } - - InputRecord++; - CurrentInput = CurrentInput->Flink; - - if (Wait) // TRUE --> Read, we remove inputs from the buffer ; FALSE --> Peek, we keep inputs. - { - RemoveEntryList(&Input->ListEntry); - ConsoleFreeHeap(Input); - } - } - - if (IsListEmpty(&InputBuffer->InputEvents)) - { - ResetEvent(InputBuffer->ActiveEvent); - } - - /* We read all the inputs available, we return success */ - return STATUS_SUCCESS; - } -} - -static NTSTATUS -ReadChars(IN PGET_INPUT_INFO InputInfo, - IN PCSR_API_MESSAGE ApiMessage, - IN BOOL CreateWaitBlock OPTIONAL); - -// Wait function CSR_WAIT_FUNCTION -static BOOLEAN -ReadCharsThread(IN PLIST_ENTRY WaitList, - IN PCSR_THREAD WaitThread, - IN PCSR_API_MESSAGE WaitApiMessage, - IN PVOID WaitContext, - IN PVOID WaitArgument1, - IN PVOID WaitArgument2, - IN ULONG WaitFlags) -{ - NTSTATUS Status; - PGET_INPUT_INFO InputInfo = (PGET_INPUT_INFO)WaitContext; - - PVOID InputHandle = WaitArgument2; - - DPRINT("ReadCharsThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); - - /* - * If we are notified of the process termination via a call - * to CsrNotifyWaitBlock triggered by CsrDestroyProcess or - * CsrDestroyThread, just return. - */ - if (WaitFlags & CsrProcessTerminating) - { - Status = STATUS_THREAD_IS_TERMINATING; - goto Quit; - } - - /* - * Somebody is closing a handle to this input buffer, - * by calling ConSrvCloseHandleEntry. - * See whether we are linked to that handle (ie. we - * are a waiter for this handle), and if so, return. - * Otherwise, ignore the call and continue waiting. - */ - if (InputHandle != NULL) - { - Status = (InputHandle == InputInfo->HandleEntry ? STATUS_ALERTED - : STATUS_PENDING); - goto Quit; - } - - /* - * If we go there, that means we are notified for some new input. - * The console is therefore already locked. - */ - Status = ReadChars(InputInfo, - WaitApiMessage, - FALSE); - -Quit: - if (Status != STATUS_PENDING) - { - WaitApiMessage->Status = Status; - ConsoleFreeHeap(InputInfo); - } - - return (Status == STATUS_PENDING ? FALSE : TRUE); -} - -static NTSTATUS -ReadChars(IN PGET_INPUT_INFO InputInfo, - IN PCSR_API_MESSAGE ApiMessage, - IN BOOL CreateWaitBlock OPTIONAL) -{ - BOOL WaitForMoreToRead = TRUE; // TRUE : Wait if more to read ; FALSE : Don't wait. - - PCONSOLE_READCONSOLE ReadConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ReadConsoleRequest; - PCONSOLE_INPUT_BUFFER InputBuffer = InputInfo->InputBuffer; - PCONSOLE Console = InputBuffer->Header.Console; - PLIST_ENTRY CurrentEntry; - ConsoleInput *Input; - PCHAR Buffer = (PCHAR)ReadConsoleRequest->Buffer; - PWCHAR UnicodeBuffer = (PWCHAR)Buffer; - ULONG nNumberOfCharsToRead = ReadConsoleRequest->NrCharactersToRead; - - /* We haven't read anything (yet) */ - - if (InputBuffer->Mode & ENABLE_LINE_INPUT) - { - if (Console->LineBuffer == NULL) - { - /* Starting a new line */ - Console->LineMaxSize = (WORD)max(256, nNumberOfCharsToRead); - Console->LineBuffer = ConsoleAllocHeap(0, Console->LineMaxSize * sizeof(WCHAR)); - if (Console->LineBuffer == NULL) - { - return STATUS_NO_MEMORY; - } - Console->LineComplete = FALSE; - Console->LineUpPressed = FALSE; - Console->LineInsertToggle = 0; - Console->LineWakeupMask = ReadConsoleRequest->CtrlWakeupMask; - Console->LineSize = ReadConsoleRequest->NrCharactersRead; - Console->LinePos = Console->LineSize; - - /* - * Pre-filling the buffer is only allowed in the Unicode API, - * so we don't need to worry about ANSI <-> Unicode conversion. - */ - memcpy(Console->LineBuffer, Buffer, Console->LineSize * sizeof(WCHAR)); - if (Console->LineSize == Console->LineMaxSize) - { - Console->LineComplete = TRUE; - Console->LinePos = 0; - } - } - - /* If we don't have a complete line yet, process the pending input */ - while ( !Console->LineComplete && - !IsListEmpty(&InputBuffer->InputEvents) ) - { - /* Remove input event from queue */ - CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); - if (IsListEmpty(&InputBuffer->InputEvents)) - { - ResetEvent(InputBuffer->ActiveEvent); - } - Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - - /* Only pay attention to key down */ - if (KEY_EVENT == Input->InputEvent.EventType - && Input->InputEvent.Event.KeyEvent.bKeyDown) - { - LineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); - ReadConsoleRequest->ControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState; - } - ConsoleFreeHeap(Input); - } - - /* Check if we have a complete line to read from */ - if (Console->LineComplete) - { - while ( ReadConsoleRequest->NrCharactersRead < nNumberOfCharsToRead && - Console->LinePos != Console->LineSize ) - { - WCHAR Char = Console->LineBuffer[Console->LinePos++]; - - if (ReadConsoleRequest->Unicode) - { - UnicodeBuffer[ReadConsoleRequest->NrCharactersRead] = Char; - } - else - { - ConsoleInputUnicodeCharToAnsiChar(Console, - &Buffer[ReadConsoleRequest->NrCharactersRead], - &Char); - } - - ReadConsoleRequest->NrCharactersRead++; - } - - if (Console->LinePos == Console->LineSize) - { - /* Entire line has been read */ - ConsoleFreeHeap(Console->LineBuffer); - Console->LineBuffer = NULL; - } - - WaitForMoreToRead = FALSE; - } - } - else - { - /* Character input */ - while ( ReadConsoleRequest->NrCharactersRead < nNumberOfCharsToRead && - !IsListEmpty(&InputBuffer->InputEvents) ) - { - /* Remove input event from queue */ - CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); - if (IsListEmpty(&InputBuffer->InputEvents)) - { - ResetEvent(InputBuffer->ActiveEvent); - } - Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - - /* Only pay attention to valid ascii chars, on key down */ - if (KEY_EVENT == Input->InputEvent.EventType - && Input->InputEvent.Event.KeyEvent.bKeyDown - && Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar != L'\0') - { - WCHAR Char = Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar; - - if (ReadConsoleRequest->Unicode) - { - UnicodeBuffer[ReadConsoleRequest->NrCharactersRead] = Char; - } - else - { - ConsoleInputUnicodeCharToAnsiChar(Console, - &Buffer[ReadConsoleRequest->NrCharactersRead], - &Char); - } - - ReadConsoleRequest->NrCharactersRead++; - - /* Did read something */ - WaitForMoreToRead = FALSE; - } - ConsoleFreeHeap(Input); - } - } - - /* We haven't completed a read, so start a wait */ - if (WaitForMoreToRead == TRUE) - { + // GetInputRequest->InputsRead = 0; + + Status = ConDrvGetConsoleInput(InputBuffer->Header.Console, + InputBuffer, + Wait, + GetInputRequest->Unicode, + GetInputRequest->InputRecord, + GetInputRequest->Length, + &GetInputRequest->InputsRead); + + if (Status == STATUS_PENDING) + { + /* We haven't completed a read, so start a wait */ return WaitBeforeReading(InputInfo, ApiMessage, - ReadCharsThread, + ReadInputBufferThread, CreateWaitBlock); } - else /* We read all what we wanted, we return success */ - { - return STATUS_SUCCESS; + else + { + /* We read all what we wanted, we return the error code we were given */ + return Status; + // return STATUS_SUCCESS; } } @@ -481,7 +328,8 @@ Status = ConSrvGetInputBufferAndHandleEntry(ProcessData, ReadConsoleRequest->InputHandle, &InputBuffer, &HandleEntry, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; - ReadConsoleRequest->NrCharactersRead = 0; + // This member is set by the caller (IntReadConsole in kernel32) + // ReadConsoleRequest->NrCharactersRead = 0; InputInfo.CallingThread = CsrGetClientThread(); InputInfo.HandleEntry = HandleEntry; @@ -493,8 +341,7 @@ ConSrvReleaseInputBuffer(InputBuffer, TRUE); - if (Status == STATUS_PENDING) - *ReplyCode = CsrReplyPending; + if (Status == STATUS_PENDING) *ReplyCode = CsrReplyPending; return Status; } @@ -518,10 +365,10 @@ return STATUS_INVALID_PARAMETER; } - GetInputRequest->InputsRead = 0; - Status = ConSrvGetInputBufferAndHandleEntry(ProcessData, GetInputRequest->InputHandle, &InputBuffer, &HandleEntry, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; + + GetInputRequest->InputsRead = 0; InputInfo.CallingThread = CsrGetClientThread(); InputInfo.HandleEntry = HandleEntry; @@ -534,8 +381,7 @@ ConSrvReleaseInputBuffer(InputBuffer, TRUE); - if (Status == STATUS_PENDING) - *ReplyCode = CsrReplyPending; + if (Status == STATUS_PENDING) *ReplyCode = CsrReplyPending; return Status; } @@ -546,13 +392,13 @@ IN BOOLEAN Unicode, IN PINPUT_RECORD InputRecord, IN ULONG NumEventsToWrite, - OUT PULONG NumEventsWritten); + OUT PULONG NumEventsWritten OPTIONAL); CSR_API(SrvWriteConsoleInput) { NTSTATUS Status; PCONSOLE_WRITEINPUT WriteInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteInputRequest; PCONSOLE_INPUT_BUFFER InputBuffer; - ULONG NumEventsWritten = 0; + ULONG NumEventsWritten; DPRINT("SrvWriteConsoleInput\n"); @@ -569,6 +415,7 @@ &InputBuffer, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; + NumEventsWritten = 0; Status = ConDrvWriteConsoleInput(InputBuffer->Header.Console, InputBuffer, WriteInputRequest->Unicode, Modified: trunk/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… ============================================================================== --- trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] Thu Jun 27 00:20:58 2013 @@ -314,30 +314,39 @@ return (Status == STATUS_PENDING ? FALSE : TRUE); } +NTSTATUS NTAPI +ConDrvWriteConsole(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER ScreenBuffer, + IN BOOLEAN Unicode, + IN PVOID StringBuffer, + IN ULONG NumCharsToWrite, + OUT PULONG NumCharsWritten OPTIONAL); static NTSTATUS DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage, IN PCSR_THREAD ClientThread, IN BOOL CreateWaitBlock OPTIONAL) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PCONSOLE_WRITECONSOLE WriteConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleRequest; - PCONSOLE Console; - PTEXTMODE_SCREEN_BUFFER Buff; - PVOID Buffer; - DWORD Written = 0; - ULONG Length; - - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(ClientThread->Process), WriteConsoleRequest->OutputHandle, &Buff, GENERIC_WRITE, FALSE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - - // if (Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION)) - if (Console->PauseFlags && Console->UnpauseEvent != NULL) + PTEXTMODE_SCREEN_BUFFER ScreenBuffer; + + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(ClientThread->Process), + WriteConsoleRequest->OutputHandle, + &ScreenBuffer, GENERIC_WRITE, FALSE); + if (!NT_SUCCESS(Status)) return Status; + + Status = ConDrvWriteConsole(ScreenBuffer->Header.Console, + ScreenBuffer, + WriteConsoleRequest->Unicode, + WriteConsoleRequest->Buffer, + WriteConsoleRequest->NrCharactersToWrite, + &WriteConsoleRequest->NrCharactersWritten); + + if (Status == STATUS_PENDING) { if (CreateWaitBlock) { - if (!CsrCreateWait(&Console->WriteWaitQueue, + if (!CsrCreateWait(&ScreenBuffer->Header.Console->WriteWaitQueue, WriteConsoleThread, ClientThread, ApiMessage, @@ -345,63 +354,17 @@ NULL)) { /* Fail */ - ConSrvReleaseScreenBuffer(Buff, FALSE); - return STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; + goto Quit; } } /* Wait until we un-pause the console */ - Status = STATUS_PENDING; - } - else - { - if (WriteConsoleRequest->Unicode) - { - Buffer = WriteConsoleRequest->Buffer; - } - else - { - Length = MultiByteToWideChar(Console->OutputCodePage, 0, - (PCHAR)WriteConsoleRequest->Buffer, - WriteConsoleRequest->NrCharactersToWrite, - NULL, 0); - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); - if (Buffer) - { - MultiByteToWideChar(Console->OutputCodePage, 0, - (PCHAR)WriteConsoleRequest->Buffer, - WriteConsoleRequest->NrCharactersToWrite, - (PWCHAR)Buffer, Length); - } - else - { - Status = STATUS_NO_MEMORY; - } - } - - if (Buffer) - { - if (NT_SUCCESS(Status)) - { - Status = ConioWriteConsole(Console, - Buff, - Buffer, - WriteConsoleRequest->NrCharactersToWrite, - TRUE); - if (NT_SUCCESS(Status)) - { - Written = WriteConsoleRequest->NrCharactersToWrite; - } - } - - if (!WriteConsoleRequest->Unicode) - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - } - - WriteConsoleRequest->NrCharactersWritten = Written; - } - - ConSrvReleaseScreenBuffer(Buff, FALSE); + // Status = STATUS_PENDING; + } + +Quit: + ConSrvReleaseScreenBuffer(ScreenBuffer, FALSE); return Status; } @@ -509,8 +472,7 @@ CsrGetClientThread(), TRUE); - if (Status == STATUS_PENDING) - *ReplyCode = CsrReplyPending; + if (Status == STATUS_PENDING) *ReplyCode = CsrReplyPending; return Status; }

1 0

[aandrejevic] 59344: [NTVDM] Clean up the code and properly separate different modules into different files.
by aandrejevic＠svn.reactos.org 26 Jun '13

26 Jun '13

Author: aandrejevic Date: Wed Jun 26 22:58:41 2013 New Revision: 59344 URL: http://svn.reactos.org/svn/reactos?rev=59344&view=rev Log: [NTVDM] Clean up the code and properly separate different modules into different files. Added: branches/ntvdm/subsystems/ntvdm/bios.h (with props) branches/ntvdm/subsystems/ntvdm/dos.h (with props) branches/ntvdm/subsystems/ntvdm/emulator.h (with props) branches/ntvdm/subsystems/ntvdm/pic.c (with props) branches/ntvdm/subsystems/ntvdm/pic.h (with props) branches/ntvdm/subsystems/ntvdm/ps2.c (with props) branches/ntvdm/subsystems/ntvdm/ps2.h (with props) branches/ntvdm/subsystems/ntvdm/timer.c (with props) branches/ntvdm/subsystems/ntvdm/timer.h (with props) Removed: branches/ntvdm/subsystems/ntvdm/hardware.c Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -5,7 +5,9 @@ bios.c dos.c emulator.c - hardware.c + pic.c + timer.c + ps2.c ntvdm.c ntvdm.rc) Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -6,10 +6,39 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#include "ntvdm.h" - -BYTE CursorRow, CursorCol; -WORD ConsoleWidth, ConsoleHeight; +/* INCLUDES *******************************************************************/ + +#include "bios.h" +#include "emulator.h" +#include "pic.h" +#include "timer.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static BYTE CursorRow, CursorCol; +static WORD ConsoleWidth, ConsoleHeight; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static COORD BiosVideoAddressToCoord(ULONG Address) +{ + COORD Result = {0, 0}; + CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; + HANDLE ConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); + + if (!GetConsoleScreenBufferInfo(ConsoleOutput, &ConsoleInfo)) + { + ASSERT(FALSE); + return Result; + } + + Result.X = ((Address - CONSOLE_VIDEO_MEM_START) >> 1) % ConsoleInfo.dwSize.X; + Result.Y = ((Address - CONSOLE_VIDEO_MEM_START) >> 1) / ConsoleInfo.dwSize.X; + + return Result; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ BOOLEAN BiosInitialize() { @@ -81,24 +110,6 @@ PitWriteData(0, 0x00); return TRUE; -} - -static COORD BiosVideoAddressToCoord(ULONG Address) -{ - COORD Result = {0, 0}; - CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; - HANDLE ConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - - if (!GetConsoleScreenBufferInfo(ConsoleOutput, &ConsoleInfo)) - { - ASSERT(FALSE); - return Result; - } - - Result.X = ((Address - CONSOLE_VIDEO_MEM_START) >> 1) % ConsoleInfo.dwSize.X; - Result.Y = ((Address - CONSOLE_VIDEO_MEM_START) >> 1) / ConsoleInfo.dwSize.X; - - return Result; } VOID BiosUpdateConsole(ULONG StartAddress, ULONG EndAddress) Added: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h (added) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,36 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: bios.h + * PURPOSE: VDM BIOS (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _BIOS_H_ +#define _BIOS_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +#define CONSOLE_VIDEO_MEM_START 0xB8000 +#define CONSOLE_VIDEO_MEM_END 0xBFFFF +#define ROM_AREA_START 0xC0000 +#define ROM_AREA_END 0xFFFFF +#define BIOS_PIC_MASTER_INT 0x08 +#define BIOS_PIC_SLAVE_INT 0x70 +#define BIOS_SEGMENT 0xF000 +#define VIDEO_BIOS_INTERRUPT 0x10 +#define CONSOLE_FONT_HEIGHT 8 + +/* FUNCTIONS ******************************************************************/ + +BOOLEAN BiosInitialize(); +VOID BiosUpdateConsole(ULONG StartAddress, ULONG EndAddress); +VOID BiosUpdateVideoMemory(ULONG StartAddress, ULONG EndAddress); +VOID BiosVideoService(); +VOID BiosHandleIrq(BYTE IrqNumber); + +#endif Propchange: branches/ntvdm/subsystems/ntvdm/bios.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -6,10 +6,17 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#include "ntvdm.h" - -WORD CurrentPsp = SYSTEM_PSP, LastError = 0; -DWORD DiskTransferArea; +/* INCLUDES *******************************************************************/ + +#include "dos.h" +#include "emulator.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static WORD CurrentPsp = SYSTEM_PSP; +static DWORD DiskTransferArea; + +/* PRIVATE FUNCTIONS **********************************************************/ static VOID DosCombineFreeBlocks(WORD StartBlock) { @@ -77,6 +84,8 @@ return DestSegment; } + +/* PUBLIC FUNCTIONS ***********************************************************/ WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable) { Added: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h (added) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,133 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: dos.h + * PURPOSE: VDM DOS Kernel (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _DOS_H_ +#define _DOS_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +#define DOS_VERSION 0x0600 +#define DOS_CONFIG_PATH L"%SystemRoot%\\system32\\CONFIG.NT" +#define DOS_COMMAND_INTERPRETER L"%SystemRoot%\\system32\\COMMAND.COM /k %SystemRoot%\\system32\\AUTOEXEC.NT" +#define FIRST_MCB_SEGMENT 0x1000 +#define USER_MEMORY_SIZE 0x8FFFF +#define SYSTEM_PSP 0x08 +#define SYSTEM_ENV_BLOCK 0x800 +#define SEGMENT_TO_MCB(seg) ((PDOS_MCB)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) +#define SEGMENT_TO_PSP(seg) ((PDOS_PSP)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) + +#pragma pack(push, 1) + +typedef struct _DOS_MCB +{ + CHAR BlockType; + WORD OwnerPsp; + WORD Size; + BYTE Unused[3]; + CHAR Name[8]; +} DOS_MCB, *PDOS_MCB; + +typedef struct _DOS_FCB +{ + BYTE DriveNumber; + CHAR FileName[8]; + CHAR FileExt[3]; + WORD BlockNumber; + WORD RecordSize; + DWORD FileSize; + WORD LastWriteDate; + WORD LastWriteTime; + BYTE Reserved[8]; + BYTE BlockRecord; + BYTE RecordNumber[3]; +} DOS_FCB, *PDOS_FCB; + +typedef struct _DOS_PSP +{ + BYTE Exit[2]; + WORD MemSize; + BYTE Reserved0[6]; + DWORD TerminateAddress; + DWORD BreakAddress; + DWORD CriticalAddress; + WORD ParentPsp; + BYTE HandleTable[20]; + WORD EnvBlock; + DWORD LastStack; + WORD HandleTableSize; + DWORD HandleTablePtr; + DWORD PreviousPsp; + DWORD Reserved1; + WORD DosVersion; + BYTE Reserved2[14]; + BYTE FarCall[3]; + BYTE Reserved3[9]; + DOS_FCB Fcb; + BYTE CommandLineSize; + CHAR CommandLine[127]; +} DOS_PSP, *PDOS_PSP; + +typedef struct _DOS_SFT_ENTRY +{ + WORD ReferenceCount; + WORD Mode; + BYTE Attribute; + WORD DeviceInfo; + DWORD DriveParamBlock; + WORD FirstCluster; + WORD FileTime; + WORD FileDate; + DWORD FileSize; + DWORD CurrentOffset; + WORD LastClusterAccessed; + DWORD DirEntSector; + BYTE DirEntryIndex; + CHAR FileName[11]; + BYTE Reserved0[6]; + WORD OwnerPsp; + BYTE Reserved1[8]; +} DOS_SFT_ENTRY, *PDOS_SFT_ENTRY; + +typedef struct _DOS_SFT +{ + DWORD NextTablePtr; + WORD FileCount; + DOS_SFT_ENTRY Entry[ANYSIZE_ARRAY]; +} DOS_SFT, *PDOS_SFT; + +typedef struct _DOS_INPUT_BUFFER +{ + BYTE MaxLength, Length; + CHAR Buffer[ANYSIZE_ARRAY]; +} DOS_INPUT_BUFFER, *PDOS_INPUT_BUFFER; + +#pragma pack(pop) + +/* FUNCTIONS ******************************************************************/ + +WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable); +BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable); +BOOLEAN DosFreeMemory(WORD BlockData); +VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment); +BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); +VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); +CHAR DosReadCharacter(); +VOID DosPrintCharacter(CHAR Character); +VOID DosInt20h(WORD CodeSegment); +VOID DosInt21h(WORD CodeSegment); +VOID DosBreakInterrupt(); +BOOLEAN DosInitialize(); + +#endif + +/* EOF */ + Propchange: branches/ntvdm/subsystems/ntvdm/dos.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -8,13 +8,20 @@ /* INCLUDES *******************************************************************/ -#include "ntvdm.h" -#include <softx86/softx86.h> -#include <softx86/softx87.h> - -softx86_ctx EmulatorContext; -softx87_ctx FpuEmulatorContext; +#include "emulator.h" +#include "bios.h" +#include "dos.h" +#include "pic.h" +#include "ps2.h" +#include "timer.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static softx86_ctx EmulatorContext; +static softx87_ctx FpuEmulatorContext; static BOOLEAN A20Line = FALSE; + +/* PRIVATE FUNCTIONS **********************************************************/ static VOID EmulatorReadMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { Added: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h (added) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,85 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: emulator.h + * PURPOSE: Minimal x86 machine emulator for the VDM (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _EMULATOR_H_ +#define _EMULATOR_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" +#include <softx86/softx86.h> +#include <softx86/softx87.h> + +/* DEFINES ********************************************************************/ + +#define EMULATOR_FLAG_CF (1 << 0) +#define EMULATOR_FLAG_PF (1 << 2) +#define EMULATOR_FLAG_AF (1 << 4) +#define EMULATOR_FLAG_ZF (1 << 6) +#define EMULATOR_FLAG_SF (1 << 7) +#define EMULATOR_FLAG_TF (1 << 8) +#define EMULATOR_FLAG_IF (1 << 9) +#define EMULATOR_FLAG_DF (1 << 10) +#define EMULATOR_FLAG_OF (1 << 11) +#define EMULATOR_FLAG_NT (1 << 14) +#define EMULATOR_FLAG_RF (1 << 16) +#define EMULATOR_FLAG_VM (1 << 17) +#define EMULATOR_FLAG_AC (1 << 18) +#define EMULATOR_FLAG_VIF (1 << 19) +#define EMULATOR_FLAG_VIP (1 << 20) +#define EMULATOR_FLAG_ID (1 << 21) +#define SPECIAL_INT_NUM 0xFF + +enum +{ + EMULATOR_EXCEPTION_DIVISION_BY_ZERO, + EMULATOR_EXCEPTION_DEBUG, + EMULATOR_EXCEPTION_NMI, + EMULATOR_EXCEPTION_BREAKPOINT, + EMULATOR_EXCEPTION_OVERFLOW, + EMULATOR_EXCEPTION_BOUND, + EMULATOR_EXCEPTION_INVALID_OPCODE, + EMULATOR_EXCEPTION_NO_FPU +}; + +typedef enum +{ + EMULATOR_REG_AX, + EMULATOR_REG_CX, + EMULATOR_REG_DX, + EMULATOR_REG_BX, + EMULATOR_REG_SI, + EMULATOR_REG_DI, + EMULATOR_REG_SP, + EMULATOR_REG_BP, + EMULATOR_REG_ES, + EMULATOR_REG_CS, + EMULATOR_REG_SS, + EMULATOR_REG_DS, +} EMULATOR_REGISTER; + +/* FUNCTIONS ******************************************************************/ + +BOOLEAN EmulatorInitialize(); +VOID EmulatorSetStack(WORD Segment, WORD Offset); +VOID EmulatorExecute(WORD Segment, WORD Offset); +VOID EmulatorInterrupt(BYTE Number); +VOID EmulatorExternalInterrupt(BYTE Number); +ULONG EmulatorGetRegister(ULONG Register); +VOID EmulatorSetRegister(ULONG Register, ULONG Value); +BOOLEAN EmulatorGetFlag(ULONG Flag); +VOID EmulatorSetFlag(ULONG Flag); +VOID EmulatorClearFlag(ULONG Flag); +VOID EmulatorStep(); +VOID EmulatorCleanup(); +VOID EmulatorSetA20(BOOLEAN Enabled); + +#endif + +/* EOF */ + Propchange: branches/ntvdm/subsystems/ntvdm/emulator.h ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c (removed) @@ -1,742 +0,0 @@ -/* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: hardware.c - * PURPOSE: Minimal hardware emulation - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> - */ - -/* INCLUDES *******************************************************************/ - -#include "ntvdm.h" - -typedef struct _PIC -{ - BOOLEAN Initialization; - BYTE MaskRegister; - BYTE InServiceRegister; - BYTE IntOffset; - BYTE ConfigRegister; - BYTE CascadeRegister; - BOOLEAN CascadeRegisterSet; - BOOLEAN AutoEoi; - BOOLEAN Slave; - BOOLEAN ReadIsr; -} PIC, *PPIC; - -enum -{ - PIT_MODE_INT_ON_TERMINAL_COUNT, - PIT_MODE_HARDWARE_ONE_SHOT, - PIT_MODE_RATE_GENERATOR, - PIT_MODE_SQUARE_WAVE, - PIT_MODE_SOFTWARE_STROBE, - PIT_MODE_HARDWARE_STROBE -}; - -typedef struct _PIT_CHANNEL -{ - WORD ReloadValue; - WORD CurrentValue; - WORD LatchedValue; - INT Mode; - BOOLEAN Pulsed; - BOOLEAN LatchSet; - BOOLEAN InputFlipFlop; - BOOLEAN OutputFlipFlop; - BYTE AccessMode; -} PIT_CHANNEL, *PPIT_CHANNEL; - -static PIC MasterPic, SlavePic; -static PIT_CHANNEL PitChannels[PIT_CHANNELS]; -static BYTE KeyboardQueue[KEYBOARD_BUFFER_SIZE]; -static BOOLEAN KeyboardQueueEmpty = TRUE; -static UINT KeyboardQueueStart = 0; -static UINT KeyboardQueueEnd = 0; -static BYTE KeyboardResponse = 0; -static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE; -static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG; - -static BOOLEAN KeyboardQueuePush(BYTE ScanCode) -{ - /* Check if the keyboard queue is full */ - if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) - { - return FALSE; - } - - /* Insert the value in the queue */ - KeyboardQueue[KeyboardQueueEnd] = ScanCode; - KeyboardQueueEnd++; - KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE; - - /* Since we inserted a value, it's not empty anymore */ - KeyboardQueueEmpty = FALSE; - - return TRUE; -} - -static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) -{ - /* Make sure the keyboard queue is not empty */ - if (KeyboardQueueEmpty) return FALSE; - - /* Get the scan code */ - *ScanCode = KeyboardQueue[KeyboardQueueStart]; - - /* Remove the value from the queue */ - KeyboardQueueStart++; - KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE; - - /* Check if the queue is now empty */ - if (KeyboardQueueStart == KeyboardQueueEnd) - { - KeyboardQueueEmpty = TRUE; - } - - return TRUE; -} - -/* PUBLIC FUNCTIONS ***********************************************************/ - -BYTE PicReadCommand(BYTE Port) -{ - PPIC Pic; - - /* Which PIC are we accessing? */ - if (Port == PIC_MASTER_CMD) Pic = &MasterPic; - else Pic = &SlavePic; - - if (Pic->ReadIsr) - { - /* Read the in-service register */ - Pic->ReadIsr = FALSE; - return Pic->InServiceRegister; - } - else - { - /* The IRR is always 0, as the emulated CPU receives the interrupt instantly */ - return 0; - } -} - -VOID PicWriteCommand(BYTE Port, BYTE Value) -{ - PPIC Pic; - - /* Which PIC are we accessing? */ - if (Port == PIC_MASTER_CMD) Pic = &MasterPic; - else Pic = &SlavePic; - - if (Value & PIC_ICW1) - { - /* Start initialization */ - Pic->Initialization = TRUE; - Pic->IntOffset = 0xFF; - Pic->CascadeRegisterSet = FALSE; - Pic->ConfigRegister = Value; - return; - } - - if (Value & PIC_OCW3) - { - /* This is an OCR3 */ - if (Value == PIC_OCW3_READ_ISR) - { - /* Return the ISR on next read from command port */ - Pic->ReadIsr = TRUE; - } - - return; - } - - /* This is an OCW2 */ - if (Value & PIC_OCW2_EOI) - { - if (Value & PIC_OCW2_SL) - { - /* If the SL bit is set, clear a specific IRQ */ - Pic->InServiceRegister &= ~(1 << (Value & PIC_OCW2_NUM_MASK)); - } - else - { - /* Otherwise, clear all of them */ - Pic->InServiceRegister = 0; - } - } -} - -BYTE PicReadData(BYTE Port) -{ - /* Read the mask register */ - if (Port == PIC_MASTER_DATA) return MasterPic.MaskRegister; - else return SlavePic.MaskRegister; -} - -VOID PicWriteData(BYTE Port, BYTE Value) -{ - PPIC Pic; - - /* Which PIC are we accessing? */ - if (Port == PIC_MASTER_DATA) Pic = &MasterPic; - else Pic = &SlavePic; - - /* Is the PIC ready? */ - if (!Pic->Initialization) - { - /* Yes, this is an OCW1 */ - Pic->MaskRegister = Value; - return; - } - - /* Has the interrupt offset been set? */ - if (Pic->IntOffset == 0xFF) - { - /* This is an ICW2, set the offset (last three bits always zero) */ - Pic->IntOffset = Value & 0xF8; - - /* Check if we are in single mode and don't need an ICW4 */ - if ((Pic->ConfigRegister & PIC_ICW1_SINGLE) - && !(Pic->ConfigRegister & PIC_ICW1_ICW4)) - { - /* Yes, done initializing */ - Pic->Initialization = FALSE; - } - return; - } - - /* Check if we are in cascade mode and the cascade register was not set */ - if (!(Pic->ConfigRegister & PIC_ICW1_SINGLE) && !Pic->CascadeRegisterSet) - { - /* This is an ICW3 */ - Pic->CascadeRegister = Value; - Pic->CascadeRegisterSet = TRUE; - - /* Check if we need an ICW4 */ - if (!(Pic->ConfigRegister & PIC_ICW1_ICW4)) - { - /* No, done initializing */ - Pic->Initialization = FALSE; - } - return; - } - - /* This must be an ICW4, we will ignore the 8086 bit (assume always set) */ - if (Value & PIC_ICW4_AEOI) - { - /* Use automatic end-of-interrupt */ - Pic->AutoEoi = TRUE; - } - - /* Done initializing */ - Pic->Initialization = FALSE; -} - -VOID PicInterruptRequest(BYTE Number) -{ - BYTE i; - - if (Number >= 0 && Number < 8) - { - /* Check if any of the higher-priorirty interrupts are busy */ - for (i = 0; i <= Number ; i++) - { - if (MasterPic.InServiceRegister & (1 << Number)) return; - } - - /* Check if the interrupt is masked */ - if (MasterPic.MaskRegister & (1 << Number)) return; - - /* Set the appropriate bit in the ISR and interrupt the CPU */ - if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << Number; - EmulatorExternalInterrupt(MasterPic.IntOffset + Number); - } - else if (Number >= 8 && Number < 16) - { - Number -= 8; - - /* - * The slave PIC is connected to IRQ 2, always! If the master PIC - * was misconfigured, don't do anything. - */ - if (!(MasterPic.CascadeRegister & (1 << 2)) - || SlavePic.CascadeRegister != 2) - { - return; - } - - /* Check if any of the higher-priorirty interrupts are busy */ - if (MasterPic.InServiceRegister != 0) return; - for (i = 0; i <= Number ; i++) - { - if (SlavePic.InServiceRegister & (1 << Number)) return; - } - - /* Check if the interrupt is masked */ - if (SlavePic.MaskRegister & (1 << Number)) return; - - /* Set the IRQ 2 bit in the master ISR */ - if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << 2; - - /* Set the appropriate bit in the ISR and interrupt the CPU */ - if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number; - EmulatorExternalInterrupt(SlavePic.IntOffset + Number); - } -} - -VOID PitWriteCommand(BYTE Value) -{ - BYTE Channel = Value >> 6; - BYTE Mode = (Value >> 1) & 0x07; - - /* Check if this is a counter latch command */ - if (((Value >> 4) & 3) == 0) - { - PitChannels[Channel].LatchSet = TRUE; - PitChannels[Channel].LatchedValue = PitChannels[Channel].CurrentValue; - return; - } - - /* Set the access mode and reset flip-flops */ - PitChannels[Channel].AccessMode = (Value >> 4) & 3; - PitChannels[Channel].Pulsed = FALSE; - PitChannels[Channel].LatchSet = FALSE; - PitChannels[Channel].InputFlipFlop = FALSE; - PitChannels[Channel].OutputFlipFlop = FALSE; - - switch (Mode) - { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - { - PitChannels[Channel].Mode = Mode; - break; - } - - case 6: - { - PitChannels[Channel].Mode = PIT_MODE_RATE_GENERATOR; - break; - } - - case 7: - { - PitChannels[Channel].Mode = PIT_MODE_SQUARE_WAVE; - break; - } - } -} - -BYTE PitReadData(BYTE Channel) -{ - WORD CurrentValue = PitChannels[Channel].CurrentValue; - BYTE AccessMode = PitChannels[Channel].AccessMode; - - /* Check if the value was latched */ - if (PitChannels[Channel].LatchSet) - { - CurrentValue = PitChannels[Channel].LatchedValue; - - if (AccessMode == 1 || AccessMode == 2) - { - /* The latched value was read as one byte */ - PitChannels[Channel].LatchSet = FALSE; - } - } - - /* Use the flip-flop for access mode 3 */ - if (AccessMode == 3) - { - AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; - PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; - - /* Check if this was the last read for the latched value */ - if (!PitChannels[Channel].InputFlipFlop) - { - /* Yes, the latch value was read as two bytes */ - PitChannels[Channel].LatchSet = FALSE; - } - } - - switch (AccessMode) - { - case 1: - { - /* Low byte */ - return CurrentValue & 0x00FF; - } - - case 2: - { - /* High byte */ - return CurrentValue >> 8; - } - } - - /* Shouldn't get here */ - return 0; -} - -VOID PitWriteData(BYTE Channel, BYTE Value) -{ - BYTE AccessMode = PitChannels[Channel].AccessMode; - - /* Use the flip-flop for access mode 3 */ - if (PitChannels[Channel].AccessMode == 3) - { - AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; - PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; - } - - switch (AccessMode) - { - case 1: - { - /* Low byte */ - PitChannels[Channel].ReloadValue &= 0xFF00; - PitChannels[Channel].ReloadValue |= Value; - break; - } - - case 2: - { - /* High byte */ - PitChannels[Channel].ReloadValue &= 0x00FF; - PitChannels[Channel].ReloadValue |= Value << 8; - } - } -} - -VOID PitDecrementCount() -{ - INT i; - - for (i = 0; i < PIT_CHANNELS; i++) - { - switch (PitChannels[i].Mode) - { - case PIT_MODE_INT_ON_TERMINAL_COUNT: - { - /* Decrement the value */ - PitChannels[i].CurrentValue--; - - /* Did it fall to the terminal count? */ - if (PitChannels[i].CurrentValue == 0 && !PitChannels[i].Pulsed) - { - /* Yes, raise the output line */ - if (i == 0) PicInterruptRequest(0); - PitChannels[i].Pulsed = TRUE; - } - break; - } - - case PIT_MODE_RATE_GENERATOR: - { - /* Decrement the value */ - PitChannels[i].CurrentValue--; - - /* Did it fall to zero? */ - if (PitChannels[i].CurrentValue != 0) break; - - /* Yes, raise the output line and reload */ - if (i == 0) PicInterruptRequest(0); - PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; - - break; - } - - case PIT_MODE_SQUARE_WAVE: - { - /* Decrement the value by 2 */ - PitChannels[i].CurrentValue -= 2; - - /* Did it fall to zero? */ - if (PitChannels[i].CurrentValue != 0) break; - - /* Yes, toggle the flip-flop */ - PitChannels[i].OutputFlipFlop = !PitChannels[i].OutputFlipFlop; - - /* Did this create a rising edge in the signal? */ - if (PitChannels[i].OutputFlipFlop) - { - /* Yes, IRQ 0 if this is channel 0 */ - if (i == 0) PicInterruptRequest(0); - } - - /* Reload the value, but make sure it's even */ - if (PitChannels[i].ReloadValue % 2) - { - /* It's odd, reduce it by 1 */ - PitChannels[i].CurrentValue = PitChannels[i].ReloadValue - 1; - } - else - { - /* It was even */ - PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; - } - - break; - } - - case PIT_MODE_SOFTWARE_STROBE: - { - // TODO: NOT IMPLEMENTED - break; - } - - case PIT_MODE_HARDWARE_ONE_SHOT: - case PIT_MODE_HARDWARE_STROBE: - { - /* These modes do not work on x86 PCs */ - break; - } - } - } -} - -BYTE KeyboardReadStatus() -{ - BYTE Status = 0; - - /* Set the first bit if the data can be read */ - if (KeyboardReadResponse || !KeyboardQueueEmpty) Status |= 1 << 0; - - /* Always set bit 2 */ - Status |= 1 << 2; - - /* Set bit 3 if the next byte goes to the controller */ - if (KeyboardWriteResponse) Status |= 1 << 3; - - return Status; -} - -VOID KeyboardWriteCommand(BYTE Command) -{ - switch (Command) - { - /* Read configuration byte */ - case 0x20: - { - KeyboardResponse = KeyboardConfig; - KeyboardReadResponse = TRUE; - - break; - } - - /* Write configuration byte */ - case 0x60: - /* Write controller output port */ - case 0xD1: - /* Write keyboard output buffer */ - case 0xD2: - /* Write mouse output buffer */ - case 0xD3: - /* Write mouse input buffer */ - case 0xD4: - { - /* These commands require a response */ - KeyboardResponse = Command; - KeyboardWriteResponse = TRUE; - - break; - } - - /* Disable mouse */ - case 0xA7: - { - // TODO: Mouse support - - break; - } - - /* Enable mouse */ - case 0xA8: - { - // TODO: Mouse support - - break; - } - - /* Test mouse port */ - case 0xA9: - { - KeyboardResponse = 0; - KeyboardReadResponse = TRUE; - - break; - } - - /* Test PS/2 controller */ - case 0xAA: - { - KeyboardResponse = 0x55; - KeyboardReadResponse = TRUE; - - break; - } - - /* Disable keyboard */ - case 0xAD: - { - // TODO: Not implemented - break; - } - - /* Enable keyboard */ - case 0xAE: - { - // TODO: Not implemented - break; - } - - /* Read controller output port */ - case 0xD0: - { - // TODO: Not implemented - break; - } - - /* CPU Reset */ - case 0xF0: - case 0xF2: - case 0xF4: - case 0xF6: - case 0xF8: - case 0xFA: - case 0xFC: - case 0xFE: - { - /* Stop the simulation */ - VdmRunning = FALSE; - - break; - } - } -} - -BYTE KeyboardReadData() -{ - BYTE Value = 0; - - /* If there was a response byte from the controller, return it */ - if (KeyboardReadResponse) - { - KeyboardReadResponse = FALSE; - return KeyboardResponse; - } - - /* Otherwise, read the data from the queue */ - KeyboardQueuePop(&Value); - - return Value; -} - -VOID KeyboardWriteData(BYTE Data) -{ - /* Check if the controller is waiting for a response */ - if (KeyboardWriteResponse) - { - KeyboardWriteResponse = FALSE; - - /* Check which command it was */ - switch (KeyboardResponse) - { - /* Write configuration byte */ - case 0x60: - { - KeyboardConfig = Data; - break; - } - - /* Write controller output */ - case 0xD1: - { - /* Check if bit 0 is unset */ - if (!(Data & (1 << 0))) - { - /* CPU disabled - end simulation */ - VdmRunning = FALSE; - } - - /* Update the A20 line setting */ - EmulatorSetA20(Data & (1 << 1)); - - break; - } - - case 0xD2: - { - /* Push the data byte to the keyboard queue */ - KeyboardQueuePush(Data); - - break; - } - - case 0xD3: - { - // TODO: Mouse support - break; - } - - case 0xD4: - { - // TODO: Mouse support - break; - } - } - - return; - } - - // TODO: Implement PS/2 device commands -} - -VOID CheckForInputEvents() -{ - PINPUT_RECORD Buffer; - HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); - DWORD i, j, Count, TotalEvents; - BYTE ScanCode; - - /* Get the number of input events */ - if (!GetNumberOfConsoleInputEvents(ConsoleInput, &Count)) return; - if (Count == 0) return; - - /* Allocate the buffer */ - Buffer = (PINPUT_RECORD)HeapAlloc(GetProcessHeap(), 0, Count * sizeof(INPUT_RECORD)); - if (Buffer == NULL) return; - - /* Peek the input events */ - if (!ReadConsoleInput(ConsoleInput, Buffer, Count, &TotalEvents)) goto Cleanup; - - for (i = 0; i < TotalEvents; i++) - { - /* Check if this is a key event */ - if (Buffer[i].EventType != KEY_EVENT) continue; - - /* Get the scan code */ - ScanCode = Buffer[i].Event.KeyEvent.wVirtualScanCode; - - /* If this is a key release, set the highest bit in the scan code */ - if (!Buffer[i].Event.KeyEvent.bKeyDown) ScanCode |= 0x80; - - /* Push the scan code onto the keyboard queue */ - for (j = 0; j < Buffer[i].Event.KeyEvent.wRepeatCount; j++) - { - KeyboardQueuePush(ScanCode); - } - - /* Yes, IRQ 1 */ - PicInterruptRequest(1); - - /* Stop the loop */ - break; - } - -Cleanup: - HeapFree(GetProcessHeap(), 0, Buffer); -} Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -6,7 +6,17 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ +/* INCLUDES *******************************************************************/ + #include "ntvdm.h" +#include "emulator.h" +#include "bios.h" +#include "dos.h" +#include "timer.h" +#include "pic.h" +#include "ps2.h" + +/* PUBLIC VARIABLES ***********************************************************/ BOOLEAN VdmRunning = TRUE; LPVOID BaseAddress = NULL; @@ -21,6 +31,8 @@ L"Invalid Opcode", L"FPU Not Available" }; + +/* PUBLIC FUNCTIONS ***********************************************************/ VOID DisplayMessage(LPCWSTR Format, ...) { Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -5,6 +5,9 @@ * PURPOSE: Header file to define commonly used stuff * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ + +#ifndef _NTVDM_H_ +#define _NTVDM_H_ /* INCLUDES *******************************************************************/ @@ -23,192 +26,7 @@ #define MAX_SEGMENT 0xFFFF #define MAX_OFFSET 0xFFFF #define MAX_ADDRESS TO_LINEAR(MAX_SEGMENT, MAX_OFFSET) -#define ROM_AREA_START 0xC0000 -#define ROM_AREA_END 0xFFFFF -#define BIOS_PIC_MASTER_INT 0x08 -#define BIOS_PIC_SLAVE_INT 0x70 -#define BIOS_SEGMENT 0xF000 -#define VIDEO_BIOS_INTERRUPT 0x10 -#define SPECIAL_INT_NUM 0xFF -#define SEGMENT_TO_MCB(seg) ((PDOS_MCB)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) -#define SEGMENT_TO_PSP(seg) ((PDOS_PSP)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) #define STEPS_PER_CYCLE 256 - -/* DOS constants */ -#define DOS_VERSION 0x0600 -#define DOS_CONFIG_PATH L"%SystemRoot%\\system32\\CONFIG.NT" -#define DOS_COMMAND_INTERPRETER L"%SystemRoot%\\system32\\COMMAND.COM /k %SystemRoot%\\system32\\AUTOEXEC.NT" -#define FIRST_MCB_SEGMENT 0x1000 -#define USER_MEMORY_SIZE 0x8FFFF -#define SYSTEM_PSP 0x08 -#define SYSTEM_ENV_BLOCK 0x800 - -/* System console constants */ -#define CONSOLE_FONT_HEIGHT 8 -#define CONSOLE_VIDEO_MEM_START 0xB8000 -#define CONSOLE_VIDEO_MEM_END 0xBFFFF - -/* Programmable interval timer (PIT) */ -#define PIT_CHANNELS 3 -#define PIT_BASE_FREQUENCY 1193182LL -#define PIT_DATA_PORT(x) (0x40 + (x)) -#define PIT_COMMAND_PORT 0x43 - -/* Programmable interrupt controller (PIC) */ -#define PIC_MASTER_CMD 0x20 -#define PIC_MASTER_DATA 0x21 -#define PIC_SLAVE_CMD 0xA0 -#define PIC_SLAVE_DATA 0xA1 -#define PIC_ICW1 0x10 -#define PIC_ICW1_ICW4 (1 << 0) -#define PIC_ICW1_SINGLE (1 << 1) -#define PIC_ICW4_8086 (1 << 0) -#define PIC_ICW4_AEOI (1 << 1) -#define PIC_OCW2_NUM_MASK 0x07 -#define PIC_OCW2_EOI (1 << 5) -#define PIC_OCW2_SL (1 << 6) -#define PIC_OCW3 (1 << 3) -#define PIC_OCW3_READ_ISR 0x0B - -/* 8042 PS/2 controller */ -#define KEYBOARD_BUFFER_SIZE 32 -#define PS2_DATA_PORT 0x60 -#define PS2_CONTROL_PORT 0x64 -#define PS2_DEFAULT_CONFIG 0x05 -#define KEYBOARD_ACK 0xFA -#define KEYBOARD_RESEND 0xFE - -#define EMULATOR_FLAG_CF (1 << 0) -#define EMULATOR_FLAG_PF (1 << 2) -#define EMULATOR_FLAG_AF (1 << 4) -#define EMULATOR_FLAG_ZF (1 << 6) -#define EMULATOR_FLAG_SF (1 << 7) -#define EMULATOR_FLAG_TF (1 << 8) -#define EMULATOR_FLAG_IF (1 << 9) -#define EMULATOR_FLAG_DF (1 << 10) -#define EMULATOR_FLAG_OF (1 << 11) -#define EMULATOR_FLAG_NT (1 << 14) -#define EMULATOR_FLAG_RF (1 << 16) -#define EMULATOR_FLAG_VM (1 << 17) -#define EMULATOR_FLAG_AC (1 << 18) -#define EMULATOR_FLAG_VIF (1 << 19) -#define EMULATOR_FLAG_VIP (1 << 20) -#define EMULATOR_FLAG_ID (1 << 21) - -enum -{ - EMULATOR_EXCEPTION_DIVISION_BY_ZERO, - EMULATOR_EXCEPTION_DEBUG, - EMULATOR_EXCEPTION_NMI, - EMULATOR_EXCEPTION_BREAKPOINT, - EMULATOR_EXCEPTION_OVERFLOW, - EMULATOR_EXCEPTION_BOUND, - EMULATOR_EXCEPTION_INVALID_OPCODE, - EMULATOR_EXCEPTION_NO_FPU -}; - -typedef enum -{ - EMULATOR_REG_AX, - EMULATOR_REG_CX, - EMULATOR_REG_DX, - EMULATOR_REG_BX, - EMULATOR_REG_SI, - EMULATOR_REG_DI, - EMULATOR_REG_SP, - EMULATOR_REG_BP, - EMULATOR_REG_ES, - EMULATOR_REG_CS, - EMULATOR_REG_SS, - EMULATOR_REG_DS, -} EMULATOR_REGISTER; - -#pragma pack(push, 1) - -typedef struct _DOS_MCB -{ - CHAR BlockType; - WORD OwnerPsp; - WORD Size; - BYTE Unused[3]; - CHAR Name[8]; -} DOS_MCB, *PDOS_MCB; - -typedef struct _DOS_FCB -{ - BYTE DriveNumber; - CHAR FileName[8]; - CHAR FileExt[3]; - WORD BlockNumber; - WORD RecordSize; - DWORD FileSize; - WORD LastWriteDate; - WORD LastWriteTime; - BYTE Reserved[8]; - BYTE BlockRecord; - BYTE RecordNumber[3]; -} DOS_FCB, *PDOS_FCB; - -typedef struct _DOS_PSP -{ - BYTE Exit[2]; - WORD MemSize; - BYTE Reserved0[6]; - DWORD TerminateAddress; - DWORD BreakAddress; - DWORD CriticalAddress; - WORD ParentPsp; - BYTE HandleTable[20]; - WORD EnvBlock; - DWORD LastStack; - WORD HandleTableSize; - DWORD HandleTablePtr; - DWORD PreviousPsp; - DWORD Reserved1; - WORD DosVersion; - BYTE Reserved2[14]; - BYTE FarCall[3]; - BYTE Reserved3[9]; - DOS_FCB Fcb; - BYTE CommandLineSize; - CHAR CommandLine[127]; -} DOS_PSP, *PDOS_PSP; - -typedef struct _DOS_SFT_ENTRY -{ - WORD ReferenceCount; - WORD Mode; - BYTE Attribute; - WORD DeviceInfo; - DWORD DriveParamBlock; - WORD FirstCluster; - WORD FileTime; - WORD FileDate; - DWORD FileSize; - DWORD CurrentOffset; - WORD LastClusterAccessed; - DWORD DirEntSector; - BYTE DirEntryIndex; - CHAR FileName[11]; - BYTE Reserved0[6]; - WORD OwnerPsp; - BYTE Reserved1[8]; -} DOS_SFT_ENTRY, *PDOS_SFT_ENTRY; - -typedef struct _DOS_SFT -{ - DWORD NextTablePtr; - WORD FileCount; - DOS_SFT_ENTRY Entry[ANYSIZE_ARRAY]; -} DOS_SFT, *PDOS_SFT; - -typedef struct _DOS_INPUT_BUFFER -{ - BYTE MaxLength, Length; - CHAR Buffer[ANYSIZE_ARRAY]; -} DOS_INPUT_BUFFER, *PDOS_INPUT_BUFFER; - -#pragma pack(pop) /* FUNCTIONS ******************************************************************/ @@ -217,47 +35,7 @@ extern LPCWSTR ExceptionName[]; VOID DisplayMessage(LPCWSTR Format, ...); -BOOLEAN BiosInitialize(); -VOID BiosUpdateConsole(ULONG StartAddress, ULONG EndAddress); -VOID BiosPrintCharacter(CHAR Character, BYTE Attribute); -BOOLEAN DosInitialize(); -WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable); -BOOLEAN DosFreeMemory(WORD BlockData); -BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable); -BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); -VOID DosInt20h(WORD CodeSegment); -VOID DosInt21h(WORD CodeSegment); -VOID DosBreakInterrupt(); -VOID BiosVideoService(); -VOID BiosHandleIrq(BYTE IrqNumber); -BYTE PicReadCommand(BYTE Port); -VOID PicWriteCommand(BYTE Port, BYTE Value); -BYTE PicReadData(BYTE Port); -VOID PicWriteData(BYTE Port, BYTE Value); -VOID PicInterruptRequest(BYTE Number); -VOID PitInitialize(); -VOID PitWriteCommand(BYTE Value); -BYTE PitReadData(BYTE Channel); -VOID PitWriteData(BYTE Channel, BYTE Value); -VOID PitDecrementCount(); -VOID CheckForInputEvents(); -BYTE KeyboardReadStatus(); -VOID KeyboardWriteCommand(BYTE Command); -BYTE KeyboardReadData(); -VOID KeyboardWriteData(BYTE Data); -VOID EmulatorSetStack(WORD Segment, WORD Offset); -VOID EmulatorExecute(WORD Segment, WORD Offset); -VOID EmulatorInterrupt(BYTE Number); -VOID EmulatorExternalInterrupt(BYTE Number); -ULONG EmulatorGetRegister(ULONG Register); -VOID EmulatorSetRegister(ULONG Register, ULONG Value); -VOID EmulatorSetFlag(ULONG Flag); -VOID EmulatorClearFlag(ULONG Flag); -BOOLEAN EmulatorGetFlag(ULONG Flag); -BOOLEAN EmulatorInitialize(); -VOID EmulatorStep(); -VOID EmulatorCleanup(); -VOID EmulatorHalt(); -VOID EmulatorSetA20(BOOLEAN Enabled); + +#endif /* EOF */ Added: branches/ntvdm/subsystems/ntvdm/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.c (added) +++ branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,205 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: pic.c + * PURPOSE: Programmable Interrupt Controller emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#include "pic.h" +#include "emulator.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static PIC MasterPic, SlavePic; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BYTE PicReadCommand(BYTE Port) +{ + PPIC Pic; + + /* Which PIC are we accessing? */ + if (Port == PIC_MASTER_CMD) Pic = &MasterPic; + else Pic = &SlavePic; + + if (Pic->ReadIsr) + { + /* Read the in-service register */ + Pic->ReadIsr = FALSE; + return Pic->InServiceRegister; + } + else + { + /* The IRR is always 0, as the emulated CPU receives the interrupt instantly */ + return 0; + } +} + +VOID PicWriteCommand(BYTE Port, BYTE Value) +{ + PPIC Pic; + + /* Which PIC are we accessing? */ + if (Port == PIC_MASTER_CMD) Pic = &MasterPic; + else Pic = &SlavePic; + + if (Value & PIC_ICW1) + { + /* Start initialization */ + Pic->Initialization = TRUE; + Pic->IntOffset = 0xFF; + Pic->CascadeRegisterSet = FALSE; + Pic->ConfigRegister = Value; + return; + } + + if (Value & PIC_OCW3) + { + /* This is an OCR3 */ + if (Value == PIC_OCW3_READ_ISR) + { + /* Return the ISR on next read from command port */ + Pic->ReadIsr = TRUE; + } + + return; + } + + /* This is an OCW2 */ + if (Value & PIC_OCW2_EOI) + { + if (Value & PIC_OCW2_SL) + { + /* If the SL bit is set, clear a specific IRQ */ + Pic->InServiceRegister &= ~(1 << (Value & PIC_OCW2_NUM_MASK)); + } + else + { + /* Otherwise, clear all of them */ + Pic->InServiceRegister = 0; + } + } +} + +BYTE PicReadData(BYTE Port) +{ + /* Read the mask register */ + if (Port == PIC_MASTER_DATA) return MasterPic.MaskRegister; + else return SlavePic.MaskRegister; +} + +VOID PicWriteData(BYTE Port, BYTE Value) +{ + PPIC Pic; + + /* Which PIC are we accessing? */ + if (Port == PIC_MASTER_DATA) Pic = &MasterPic; + else Pic = &SlavePic; + + /* Is the PIC ready? */ + if (!Pic->Initialization) + { + /* Yes, this is an OCW1 */ + Pic->MaskRegister = Value; + return; + } + + /* Has the interrupt offset been set? */ + if (Pic->IntOffset == 0xFF) + { + /* This is an ICW2, set the offset (last three bits always zero) */ + Pic->IntOffset = Value & 0xF8; + + /* Check if we are in single mode and don't need an ICW4 */ + if ((Pic->ConfigRegister & PIC_ICW1_SINGLE) + && !(Pic->ConfigRegister & PIC_ICW1_ICW4)) + { + /* Yes, done initializing */ + Pic->Initialization = FALSE; + } + return; + } + + /* Check if we are in cascade mode and the cascade register was not set */ + if (!(Pic->ConfigRegister & PIC_ICW1_SINGLE) && !Pic->CascadeRegisterSet) + { + /* This is an ICW3 */ + Pic->CascadeRegister = Value; + Pic->CascadeRegisterSet = TRUE; + + /* Check if we need an ICW4 */ + if (!(Pic->ConfigRegister & PIC_ICW1_ICW4)) + { + /* No, done initializing */ + Pic->Initialization = FALSE; + } + return; + } + + /* This must be an ICW4, we will ignore the 8086 bit (assume always set) */ + if (Value & PIC_ICW4_AEOI) + { + /* Use automatic end-of-interrupt */ + Pic->AutoEoi = TRUE; + } + + /* Done initializing */ + Pic->Initialization = FALSE; +} + +VOID PicInterruptRequest(BYTE Number) +{ + BYTE i; + + if (Number >= 0 && Number < 8) + { + /* Check if any of the higher-priorirty interrupts are busy */ + for (i = 0; i <= Number ; i++) + { + if (MasterPic.InServiceRegister & (1 << Number)) return; + } + + /* Check if the interrupt is masked */ + if (MasterPic.MaskRegister & (1 << Number)) return; + + /* Set the appropriate bit in the ISR and interrupt the CPU */ + if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << Number; + EmulatorExternalInterrupt(MasterPic.IntOffset + Number); + } + else if (Number >= 8 && Number < 16) + { + Number -= 8; + + /* + * The slave PIC is connected to IRQ 2, always! If the master PIC + * was misconfigured, don't do anything. + */ + if (!(MasterPic.CascadeRegister & (1 << 2)) + || SlavePic.CascadeRegister != 2) + { + return; + } + + /* Check if any of the higher-priorirty interrupts are busy */ + if (MasterPic.InServiceRegister != 0) return; + for (i = 0; i <= Number ; i++) + { + if (SlavePic.InServiceRegister & (1 << Number)) return; + } + + /* Check if the interrupt is masked */ + if (SlavePic.MaskRegister & (1 << Number)) return; + + /* Set the IRQ 2 bit in the master ISR */ + if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << 2; + + /* Set the appropriate bit in the ISR and interrupt the CPU */ + if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number; + EmulatorExternalInterrupt(SlavePic.IntOffset + Number); + } +} + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/pic.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.h (added) +++ branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,57 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: pic.h + * PURPOSE: Programmable Interrupt Controller emulation (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _PIC_H_ +#define _PIC_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +#define PIC_MASTER_CMD 0x20 +#define PIC_MASTER_DATA 0x21 +#define PIC_SLAVE_CMD 0xA0 +#define PIC_SLAVE_DATA 0xA1 +#define PIC_ICW1 0x10 +#define PIC_ICW1_ICW4 (1 << 0) +#define PIC_ICW1_SINGLE (1 << 1) +#define PIC_ICW4_8086 (1 << 0) +#define PIC_ICW4_AEOI (1 << 1) +#define PIC_OCW2_NUM_MASK 0x07 +#define PIC_OCW2_EOI (1 << 5) +#define PIC_OCW2_SL (1 << 6) +#define PIC_OCW3 (1 << 3) +#define PIC_OCW3_READ_ISR 0x0B + +typedef struct _PIC +{ + BOOLEAN Initialization; + BYTE MaskRegister; + BYTE InServiceRegister; + BYTE IntOffset; + BYTE ConfigRegister; + BYTE CascadeRegister; + BOOLEAN CascadeRegisterSet; + BOOLEAN AutoEoi; + BOOLEAN Slave; + BOOLEAN ReadIsr; +} PIC, *PPIC; + +/* FUNCTIONS ******************************************************************/ + +BYTE PicReadCommand(BYTE Port); +VOID PicWriteCommand(BYTE Port, BYTE Value); +BYTE PicReadData(BYTE Port); +VOID PicWriteData(BYTE Port, BYTE Value); +VOID PicInterruptRequest(BYTE Number); + +#endif + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/pic.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c (added) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,313 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: ps2.c + * PURPOSE: PS/2 controller emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#include "ps2.h" +#include "emulator.h" +#include "pic.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static BYTE KeyboardQueue[KEYBOARD_BUFFER_SIZE]; +static BOOLEAN KeyboardQueueEmpty = TRUE; +static UINT KeyboardQueueStart = 0; +static UINT KeyboardQueueEnd = 0; +static BYTE KeyboardResponse = 0; +static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE; +static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static BOOLEAN KeyboardQueuePush(BYTE ScanCode) +{ + /* Check if the keyboard queue is full */ + if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) + { + return FALSE; + } + + /* Insert the value in the queue */ + KeyboardQueue[KeyboardQueueEnd] = ScanCode; + KeyboardQueueEnd++; + KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE; + + /* Since we inserted a value, it's not empty anymore */ + KeyboardQueueEmpty = FALSE; + + return TRUE; +} + +static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) +{ + /* Make sure the keyboard queue is not empty */ + if (KeyboardQueueEmpty) return FALSE; + + /* Get the scan code */ + *ScanCode = KeyboardQueue[KeyboardQueueStart]; + + /* Remove the value from the queue */ + KeyboardQueueStart++; + KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE; + + /* Check if the queue is now empty */ + if (KeyboardQueueStart == KeyboardQueueEnd) + { + KeyboardQueueEmpty = TRUE; + } + + return TRUE; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BYTE KeyboardReadStatus() +{ + BYTE Status = 0; + + /* Set the first bit if the data can be read */ + if (KeyboardReadResponse || !KeyboardQueueEmpty) Status |= 1 << 0; + + /* Always set bit 2 */ + Status |= 1 << 2; + + /* Set bit 3 if the next byte goes to the controller */ + if (KeyboardWriteResponse) Status |= 1 << 3; + + return Status; +} + +VOID KeyboardWriteCommand(BYTE Command) +{ + switch (Command) + { + /* Read configuration byte */ + case 0x20: + { + KeyboardResponse = KeyboardConfig; + KeyboardReadResponse = TRUE; + + break; + } + + /* Write configuration byte */ + case 0x60: + /* Write controller output port */ + case 0xD1: + /* Write keyboard output buffer */ + case 0xD2: + /* Write mouse output buffer */ + case 0xD3: + /* Write mouse input buffer */ + case 0xD4: + { + /* These commands require a response */ + KeyboardResponse = Command; + KeyboardWriteResponse = TRUE; + + break; + } + + /* Disable mouse */ + case 0xA7: + { + // TODO: Mouse support + + break; + } + + /* Enable mouse */ + case 0xA8: + { + // TODO: Mouse support + + break; + } + + /* Test mouse port */ + case 0xA9: + { + KeyboardResponse = 0; + KeyboardReadResponse = TRUE; + + break; + } + + /* Test PS/2 controller */ + case 0xAA: + { + KeyboardResponse = 0x55; + KeyboardReadResponse = TRUE; + + break; + } + + /* Disable keyboard */ + case 0xAD: + { + // TODO: Not implemented + break; + } + + /* Enable keyboard */ + case 0xAE: + { + // TODO: Not implemented + break; + } + + /* Read controller output port */ + case 0xD0: + { + // TODO: Not implemented + break; + } + + /* CPU Reset */ + case 0xF0: + case 0xF2: + case 0xF4: + case 0xF6: + case 0xF8: + case 0xFA: + case 0xFC: + case 0xFE: + { + /* Stop the simulation */ + VdmRunning = FALSE; + + break; + } + } +} + +BYTE KeyboardReadData() +{ + BYTE Value = 0; + + /* If there was a response byte from the controller, return it */ + if (KeyboardReadResponse) + { + KeyboardReadResponse = FALSE; + return KeyboardResponse; + } + + /* Otherwise, read the data from the queue */ + KeyboardQueuePop(&Value); + + return Value; +} + +VOID KeyboardWriteData(BYTE Data) +{ + /* Check if the controller is waiting for a response */ + if (KeyboardWriteResponse) + { + KeyboardWriteResponse = FALSE; + + /* Check which command it was */ + switch (KeyboardResponse) + { + /* Write configuration byte */ + case 0x60: + { + KeyboardConfig = Data; + break; + } + + /* Write controller output */ + case 0xD1: + { + /* Check if bit 0 is unset */ + if (!(Data & (1 << 0))) + { + /* CPU disabled - end simulation */ + VdmRunning = FALSE; + } + + /* Update the A20 line setting */ + EmulatorSetA20(Data & (1 << 1)); + + break; + } + + case 0xD2: + { + /* Push the data byte to the keyboard queue */ + KeyboardQueuePush(Data); + + break; + } + + case 0xD3: + { + // TODO: Mouse support + break; + } + + case 0xD4: + { + // TODO: Mouse support + break; + } + } + + return; + } + + // TODO: Implement PS/2 device commands +} + +VOID CheckForInputEvents() +{ + PINPUT_RECORD Buffer; + HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); + DWORD i, j, Count, TotalEvents; + BYTE ScanCode; + + /* Get the number of input events */ + if (!GetNumberOfConsoleInputEvents(ConsoleInput, &Count)) return; + if (Count == 0) return; + + /* Allocate the buffer */ + Buffer = (PINPUT_RECORD)HeapAlloc(GetProcessHeap(), 0, Count * sizeof(INPUT_RECORD)); + if (Buffer == NULL) return; + + /* Peek the input events */ + if (!ReadConsoleInput(ConsoleInput, Buffer, Count, &TotalEvents)) goto Cleanup; + + for (i = 0; i < TotalEvents; i++) + { + /* Check if this is a key event */ + if (Buffer[i].EventType != KEY_EVENT) continue; + + /* Get the scan code */ + ScanCode = Buffer[i].Event.KeyEvent.wVirtualScanCode; + + /* If this is a key release, set the highest bit in the scan code */ + if (!Buffer[i].Event.KeyEvent.bKeyDown) ScanCode |= 0x80; + + /* Push the scan code onto the keyboard queue */ + for (j = 0; j < Buffer[i].Event.KeyEvent.wRepeatCount; j++) + { + KeyboardQueuePush(ScanCode); + } + + /* Yes, IRQ 1 */ + PicInterruptRequest(1); + + /* Stop the loop */ + break; + } + +Cleanup: + HeapFree(GetProcessHeap(), 0, Buffer); +} + +/* EOF */ + Propchange: branches/ntvdm/subsystems/ntvdm/ps2.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.h (added) +++ branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,33 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: ps2.h + * PURPOSE: PS/2 controller emulation (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _PS2_H_ +#define _PS2_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +#define KEYBOARD_BUFFER_SIZE 32 +#define PS2_DATA_PORT 0x60 +#define PS2_CONTROL_PORT 0x64 +#define PS2_DEFAULT_CONFIG 0x05 +#define KEYBOARD_ACK 0xFA +#define KEYBOARD_RESEND 0xFE + +/* FUNCTIONS ******************************************************************/ + +BYTE KeyboardReadStatus(); +VOID KeyboardWriteCommand(BYTE Command); +BYTE KeyboardReadData(); +VOID KeyboardWriteData(BYTE Data); +VOID CheckForInputEvents(); + +#endif Propchange: branches/ntvdm/subsystems/ntvdm/ps2.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.c (added) +++ branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,235 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: timer.c + * PURPOSE: Programmable Interval Timer emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#include "timer.h" +#include "pic.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static PIT_CHANNEL PitChannels[PIT_CHANNELS]; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID PitWriteCommand(BYTE Value) +{ + BYTE Channel = Value >> 6; + BYTE Mode = (Value >> 1) & 0x07; + + /* Check if this is a counter latch command */ + if (((Value >> 4) & 3) == 0) + { + PitChannels[Channel].LatchSet = TRUE; + PitChannels[Channel].LatchedValue = PitChannels[Channel].CurrentValue; + return; + } + + /* Set the access mode and reset flip-flops */ + PitChannels[Channel].AccessMode = (Value >> 4) & 3; + PitChannels[Channel].Pulsed = FALSE; + PitChannels[Channel].LatchSet = FALSE; + PitChannels[Channel].InputFlipFlop = FALSE; + PitChannels[Channel].OutputFlipFlop = FALSE; + + switch (Mode) + { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + { + PitChannels[Channel].Mode = Mode; + break; + } + + case 6: + { + PitChannels[Channel].Mode = PIT_MODE_RATE_GENERATOR; + break; + } + + case 7: + { + PitChannels[Channel].Mode = PIT_MODE_SQUARE_WAVE; + break; + } + } +} + +BYTE PitReadData(BYTE Channel) +{ + WORD CurrentValue = PitChannels[Channel].CurrentValue; + BYTE AccessMode = PitChannels[Channel].AccessMode; + + /* Check if the value was latched */ + if (PitChannels[Channel].LatchSet) + { + CurrentValue = PitChannels[Channel].LatchedValue; + + if (AccessMode == 1 || AccessMode == 2) + { + /* The latched value was read as one byte */ + PitChannels[Channel].LatchSet = FALSE; + } + } + + /* Use the flip-flop for access mode 3 */ + if (AccessMode == 3) + { + AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; + PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; + + /* Check if this was the last read for the latched value */ + if (!PitChannels[Channel].InputFlipFlop) + { + /* Yes, the latch value was read as two bytes */ + PitChannels[Channel].LatchSet = FALSE; + } + } + + switch (AccessMode) + { + case 1: + { + /* Low byte */ + return CurrentValue & 0x00FF; + } + + case 2: + { + /* High byte */ + return CurrentValue >> 8; + } + } + + /* Shouldn't get here */ + return 0; +} + +VOID PitWriteData(BYTE Channel, BYTE Value) +{ + BYTE AccessMode = PitChannels[Channel].AccessMode; + + /* Use the flip-flop for access mode 3 */ + if (PitChannels[Channel].AccessMode == 3) + { + AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; + PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; + } + + switch (AccessMode) + { + case 1: + { + /* Low byte */ + PitChannels[Channel].ReloadValue &= 0xFF00; + PitChannels[Channel].ReloadValue |= Value; + break; + } + + case 2: + { + /* High byte */ + PitChannels[Channel].ReloadValue &= 0x00FF; + PitChannels[Channel].ReloadValue |= Value << 8; + } + } +} + +VOID PitDecrementCount() +{ + INT i; + + for (i = 0; i < PIT_CHANNELS; i++) + { + switch (PitChannels[i].Mode) + { + case PIT_MODE_INT_ON_TERMINAL_COUNT: + { + /* Decrement the value */ + PitChannels[i].CurrentValue--; + + /* Did it fall to the terminal count? */ + if (PitChannels[i].CurrentValue == 0 && !PitChannels[i].Pulsed) + { + /* Yes, raise the output line */ + if (i == 0) PicInterruptRequest(0); + PitChannels[i].Pulsed = TRUE; + } + break; + } + + case PIT_MODE_RATE_GENERATOR: + { + /* Decrement the value */ + PitChannels[i].CurrentValue--; + + /* Did it fall to zero? */ + if (PitChannels[i].CurrentValue != 0) break; + + /* Yes, raise the output line and reload */ + if (i == 0) PicInterruptRequest(0); + PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; + + break; + } + + case PIT_MODE_SQUARE_WAVE: + { + /* Decrement the value by 2 */ + PitChannels[i].CurrentValue -= 2; + + /* Did it fall to zero? */ + if (PitChannels[i].CurrentValue != 0) break; + + /* Yes, toggle the flip-flop */ + PitChannels[i].OutputFlipFlop = !PitChannels[i].OutputFlipFlop; + + /* Did this create a rising edge in the signal? */ + if (PitChannels[i].OutputFlipFlop) + { + /* Yes, IRQ 0 if this is channel 0 */ + if (i == 0) PicInterruptRequest(0); + } + + /* Reload the value, but make sure it's even */ + if (PitChannels[i].ReloadValue % 2) + { + /* It's odd, reduce it by 1 */ + PitChannels[i].CurrentValue = PitChannels[i].ReloadValue - 1; + } + else + { + /* It was even */ + PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; + } + + break; + } + + case PIT_MODE_SOFTWARE_STROBE: + { + // TODO: NOT IMPLEMENTED + break; + } + + case PIT_MODE_HARDWARE_ONE_SHOT: + case PIT_MODE_HARDWARE_STROBE: + { + /* These modes do not work on x86 PCs */ + break; + } + } + } +} + +/* EOF */ + Propchange: branches/ntvdm/subsystems/ntvdm/timer.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.h (added) +++ branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] Wed Jun 26 22:58:41 2013 @@ -0,0 +1,56 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: timer.h + * PURPOSE: Programmable Interval Timer emulation (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _TIMER_H_ +#define _TIMER_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +#define PIT_CHANNELS 3 +#define PIT_BASE_FREQUENCY 1193182LL +#define PIT_DATA_PORT(x) (0x40 + (x)) +#define PIT_COMMAND_PORT 0x43 + +enum +{ + PIT_MODE_INT_ON_TERMINAL_COUNT, + PIT_MODE_HARDWARE_ONE_SHOT, + PIT_MODE_RATE_GENERATOR, + PIT_MODE_SQUARE_WAVE, + PIT_MODE_SOFTWARE_STROBE, + PIT_MODE_HARDWARE_STROBE +}; + +typedef struct _PIT_CHANNEL +{ + WORD ReloadValue; + WORD CurrentValue; + WORD LatchedValue; + INT Mode; + BOOLEAN Pulsed; + BOOLEAN LatchSet; + BOOLEAN InputFlipFlop; + BOOLEAN OutputFlipFlop; + BYTE AccessMode; +} PIT_CHANNEL, *PPIT_CHANNEL; + +/* FUNCTIONS ******************************************************************/ + +VOID PitWriteCommand(BYTE Value); +BYTE PitReadData(BYTE Channel); +VOID PitWriteData(BYTE Channel, BYTE Value); +VOID PitDecrementCount(); + +#endif + +/* EOF */ + Propchange: branches/ntvdm/subsystems/ntvdm/timer.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[aandrejevic] 59343: [NTVDM] Use 286 mode in softx86. Implement "Get / Set Disk Transfer Area". Start implementation of PS/2 controller. Improve hardware interrupts. Fix CLI / STI / HLT instruction...
by aandrejevic＠svn.reactos.org 26 Jun '13

26 Jun '13

Author: aandrejevic Date: Wed Jun 26 17:15:45 2013 New Revision: 59343 URL: http://svn.reactos.org/svn/reactos?rev=59343&view=rev Log: [NTVDM] Use 286 mode in softx86. Implement "Get / Set Disk Transfer Area". Start implementation of PS/2 controller. Improve hardware interrupts. Fix CLI / STI / HLT instruction support. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/hardware.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Wed Jun 26 17:15:45 2013 @@ -9,6 +9,7 @@ #include "ntvdm.h" WORD CurrentPsp = SYSTEM_PSP, LastError = 0; +DWORD DiskTransferArea; static VOID DosCombineFreeBlocks(WORD StartBlock) { @@ -433,6 +434,7 @@ /* Execute */ CurrentPsp = Segment; + DiskTransferArea = MAKELONG(0x80, Segment); EmulatorExecute(Segment + Header->e_cs, sizeof(DOS_PSP) + Header->e_ip); Success = TRUE; @@ -466,6 +468,7 @@ /* Execute */ CurrentPsp = Segment; + DiskTransferArea = MAKELONG(0x80, Segment); EmulatorExecute(Segment, 0x100); Success = TRUE; @@ -635,6 +638,13 @@ break; } + /* Set Disk Transfer Area */ + case 0x1A: + { + DiskTransferArea = MAKELONG(LOWORD(Edx), DataSegment); + break; + } + /* Set Interrupt Vector */ case 0x25: { @@ -721,6 +731,15 @@ break; } + /* Get Disk Transfer Area */ + case 0x2F: + { + EmulatorSetRegister(EMULATOR_REG_ES, HIWORD(DiskTransferArea)); + EmulatorSetRegister(EMULATOR_REG_BX, LOWORD(DiskTransferArea)); + + break; + } + /* Get Interrupt Vector */ case 0x35: { Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Wed Jun 26 17:15:45 2013 @@ -14,9 +14,13 @@ softx86_ctx EmulatorContext; softx87_ctx FpuEmulatorContext; +static BOOLEAN A20Line = FALSE; static VOID EmulatorReadMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { + /* If the A20 line is disabled, mask bit 20 */ + if (!A20Line) Address &= ~(1 << 20); + /* Make sure the requested address is valid */ if ((Address + Size) >= MAX_ADDRESS) return; @@ -35,6 +39,9 @@ static VOID EmulatorWriteMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { + /* If the A20 line is disabled, mask bit 20 */ + if (!A20Line) Address &= ~(1 << 20); + /* Make sure the requested address is valid */ if ((Address + Size) >= MAX_ADDRESS) return; @@ -71,25 +78,45 @@ *Buffer = PicReadData(Address); break; } - } -} - -static VOID EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) -{ - BYTE Byte = *Buffer; - - switch (Address) - { - case PIT_COMMAND_PORT: - { - PitWriteCommand(Byte); - break; - } case PIT_DATA_PORT(0): case PIT_DATA_PORT(1): case PIT_DATA_PORT(2): { + *Buffer = PitReadData(Address - PIT_DATA_PORT(0)); + break; + } + + case PS2_CONTROL_PORT: + { + *Buffer = KeyboardReadStatus(); + break; + } + + case PS2_DATA_PORT: + { + *Buffer = KeyboardReadData(); + break; + } + } +} + +static VOID EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) +{ + BYTE Byte = *Buffer; + + switch (Address) + { + case PIT_COMMAND_PORT: + { + PitWriteCommand(Byte); + break; + } + + case PIT_DATA_PORT(0): + case PIT_DATA_PORT(1): + case PIT_DATA_PORT(2): + { PitWriteData(Address - PIT_DATA_PORT(0), Byte); break; } @@ -105,6 +132,18 @@ case PIC_SLAVE_DATA: { PicWriteData(Address, Byte); + break; + } + + case PS2_CONTROL_PORT: + { + KeyboardWriteCommand(Byte); + break; + } + + case PS2_DATA_PORT: + { + KeyboardWriteData(Byte); break; } } @@ -187,6 +226,16 @@ } } +static VOID EmulatorHardwareInt(PVOID Context, BYTE Number) +{ + /* Do nothing */ +} + +static VOID EmulatorHardwareIntAck(PVOID Context, BYTE Number) +{ + /* Do nothing */ +} + /* PUBLIC FUNCTIONS ***********************************************************/ BOOLEAN EmulatorInitialize() @@ -196,7 +245,7 @@ if (BaseAddress == NULL) return FALSE; /* Initialize the softx86 CPU emulator */ - if (!softx86_init(&EmulatorContext, SX86_CPULEVEL_80186)) + if (!softx86_init(&EmulatorContext, SX86_CPULEVEL_80286)) { HeapFree(GetProcessHeap(), 0, BaseAddress); return FALSE; @@ -220,9 +269,14 @@ /* Set interrupt callbacks */ EmulatorContext.callbacks->on_sw_int = EmulatorSoftwareInt; + EmulatorContext.callbacks->on_hw_int = EmulatorHardwareInt; + EmulatorContext.callbacks->on_hw_int_ack = EmulatorHardwareIntAck; /* Connect the emulated FPU to the emulated CPU */ softx87_connect_to_CPU(&EmulatorContext, &FpuEmulatorContext); + + /* Enable interrupts */ + EmulatorSetFlag(EMULATOR_FLAG_IF); return TRUE; } @@ -252,6 +306,12 @@ softx86_make_simple_interrupt_call(&EmulatorContext, &Segment, &Offset); } +VOID EmulatorExternalInterrupt(BYTE Number) +{ + /* Call the softx86 API */ + softx86_ext_hw_signal(&EmulatorContext, Number); +} + ULONG EmulatorGetRegister(ULONG Register) { if (Register < EMULATOR_REG_ES) @@ -294,7 +354,11 @@ VOID EmulatorStep() { /* Call the softx86 API */ - softx86_step(&EmulatorContext); + if (!softx86_step(&EmulatorContext)) + { + /* Invalid opcode */ + EmulatorInterrupt(EMULATOR_EXCEPTION_INVALID_OPCODE); + } } VOID EmulatorCleanup() @@ -307,4 +371,9 @@ softx87_free(&FpuEmulatorContext); } +VOID EmulatorSetA20(BOOLEAN Enabled) +{ + A20Line = Enabled; +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Wed Jun 26 17:15:45 2013 @@ -53,6 +53,9 @@ static BOOLEAN KeyboardQueueEmpty = TRUE; static UINT KeyboardQueueStart = 0; static UINT KeyboardQueueEnd = 0; +static BYTE KeyboardResponse = 0; +static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE; +static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG; static BOOLEAN KeyboardQueuePush(BYTE ScanCode) { @@ -73,7 +76,6 @@ return TRUE; } -#if 0 static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) { /* Make sure the keyboard queue is not empty */ @@ -94,7 +96,6 @@ return TRUE; } -#endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -248,7 +249,7 @@ /* Set the appropriate bit in the ISR and interrupt the CPU */ if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << Number; - EmulatorInterrupt(MasterPic.IntOffset + Number); + EmulatorExternalInterrupt(MasterPic.IntOffset + Number); } else if (Number >= 8 && Number < 16) { @@ -279,7 +280,7 @@ /* Set the appropriate bit in the ISR and interrupt the CPU */ if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number; - EmulatorInterrupt(SlavePic.IntOffset + Number); + EmulatorExternalInterrupt(SlavePic.IntOffset + Number); } } @@ -497,6 +498,203 @@ } } +BYTE KeyboardReadStatus() +{ + BYTE Status = 0; + + /* Set the first bit if the data can be read */ + if (KeyboardReadResponse || !KeyboardQueueEmpty) Status |= 1 << 0; + + /* Always set bit 2 */ + Status |= 1 << 2; + + /* Set bit 3 if the next byte goes to the controller */ + if (KeyboardWriteResponse) Status |= 1 << 3; + + return Status; +} + +VOID KeyboardWriteCommand(BYTE Command) +{ + switch (Command) + { + /* Read configuration byte */ + case 0x20: + { + KeyboardResponse = KeyboardConfig; + KeyboardReadResponse = TRUE; + + break; + } + + /* Write configuration byte */ + case 0x60: + /* Write controller output port */ + case 0xD1: + /* Write keyboard output buffer */ + case 0xD2: + /* Write mouse output buffer */ + case 0xD3: + /* Write mouse input buffer */ + case 0xD4: + { + /* These commands require a response */ + KeyboardResponse = Command; + KeyboardWriteResponse = TRUE; + + break; + } + + /* Disable mouse */ + case 0xA7: + { + // TODO: Mouse support + + break; + } + + /* Enable mouse */ + case 0xA8: + { + // TODO: Mouse support + + break; + } + + /* Test mouse port */ + case 0xA9: + { + KeyboardResponse = 0; + KeyboardReadResponse = TRUE; + + break; + } + + /* Test PS/2 controller */ + case 0xAA: + { + KeyboardResponse = 0x55; + KeyboardReadResponse = TRUE; + + break; + } + + /* Disable keyboard */ + case 0xAD: + { + // TODO: Not implemented + break; + } + + /* Enable keyboard */ + case 0xAE: + { + // TODO: Not implemented + break; + } + + /* Read controller output port */ + case 0xD0: + { + // TODO: Not implemented + break; + } + + /* CPU Reset */ + case 0xF0: + case 0xF2: + case 0xF4: + case 0xF6: + case 0xF8: + case 0xFA: + case 0xFC: + case 0xFE: + { + /* Stop the simulation */ + VdmRunning = FALSE; + + break; + } + } +} + +BYTE KeyboardReadData() +{ + BYTE Value = 0; + + /* If there was a response byte from the controller, return it */ + if (KeyboardReadResponse) + { + KeyboardReadResponse = FALSE; + return KeyboardResponse; + } + + /* Otherwise, read the data from the queue */ + KeyboardQueuePop(&Value); + + return Value; +} + +VOID KeyboardWriteData(BYTE Data) +{ + /* Check if the controller is waiting for a response */ + if (KeyboardWriteResponse) + { + KeyboardWriteResponse = FALSE; + + /* Check which command it was */ + switch (KeyboardResponse) + { + /* Write configuration byte */ + case 0x60: + { + KeyboardConfig = Data; + break; + } + + /* Write controller output */ + case 0xD1: + { + /* Check if bit 0 is unset */ + if (!(Data & (1 << 0))) + { + /* CPU disabled - end simulation */ + VdmRunning = FALSE; + } + + /* Update the A20 line setting */ + EmulatorSetA20(Data & (1 << 1)); + + break; + } + + case 0xD2: + { + /* Push the data byte to the keyboard queue */ + KeyboardQueuePush(Data); + + break; + } + + case 0xD3: + { + // TODO: Mouse support + break; + } + + case 0xD4: + { + // TODO: Mouse support + break; + } + } + + return; + } + + // TODO: Implement PS/2 device commands +} + VOID CheckForInputEvents() { PINPUT_RECORD Buffer; Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Wed Jun 26 17:15:45 2013 @@ -74,6 +74,9 @@ #define KEYBOARD_BUFFER_SIZE 32 #define PS2_DATA_PORT 0x60 #define PS2_CONTROL_PORT 0x64 +#define PS2_DEFAULT_CONFIG 0x05 +#define KEYBOARD_ACK 0xFA +#define KEYBOARD_RESEND 0xFE #define EMULATOR_FLAG_CF (1 << 0) #define EMULATOR_FLAG_PF (1 << 2) @@ -91,6 +94,18 @@ #define EMULATOR_FLAG_VIF (1 << 19) #define EMULATOR_FLAG_VIP (1 << 20) #define EMULATOR_FLAG_ID (1 << 21) + +enum +{ + EMULATOR_EXCEPTION_DIVISION_BY_ZERO, + EMULATOR_EXCEPTION_DEBUG, + EMULATOR_EXCEPTION_NMI, + EMULATOR_EXCEPTION_BREAKPOINT, + EMULATOR_EXCEPTION_OVERFLOW, + EMULATOR_EXCEPTION_BOUND, + EMULATOR_EXCEPTION_INVALID_OPCODE, + EMULATOR_EXCEPTION_NO_FPU +}; typedef enum { @@ -226,9 +241,14 @@ VOID PitWriteData(BYTE Channel, BYTE Value); VOID PitDecrementCount(); VOID CheckForInputEvents(); +BYTE KeyboardReadStatus(); +VOID KeyboardWriteCommand(BYTE Command); +BYTE KeyboardReadData(); +VOID KeyboardWriteData(BYTE Data); VOID EmulatorSetStack(WORD Segment, WORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number); +VOID EmulatorExternalInterrupt(BYTE Number); ULONG EmulatorGetRegister(ULONG Register); VOID EmulatorSetRegister(ULONG Register, ULONG Value); VOID EmulatorSetFlag(ULONG Flag); @@ -237,5 +257,7 @@ BOOLEAN EmulatorInitialize(); VOID EmulatorStep(); VOID EmulatorCleanup(); +VOID EmulatorHalt(); +VOID EmulatorSetA20(BOOLEAN Enabled); /* EOF */

1 0

[fireball] 59342: [NTOS/FSRTL] - Develop a new implementation of Large MCBs. It's based on (tested-in-real-world) implementation from Captive NTFS project, which is improved, enhanced, cleaned and ...
by fireball＠svn.reactos.org 26 Jun '13

26 Jun '13

Author: fireball Date: Wed Jun 26 12:24:55 2013 New Revision: 59342 URL: http://svn.reactos.org/svn/reactos?rev=59342&view=rev Log: [NTOS/FSRTL] - Develop a new implementation of Large MCBs. It's based on (tested-in-real-world) implementation from Captive NTFS project, which is improved, enhanced, cleaned and beautified, using our own tests. There are some test failures and some fishy things there (you may notice them when a variable name doesn't follow ReactOS kernel functions naming convention), however it's way better than the previous implementation. Link to the original source file: http://git.jankratochvil.net/?p=captive.git;a=blob;f=src/libcaptive/fs/mcb.… Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Wed Jun 26 12:24:55 2013 @@ -1,36 +1,37 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: GPL v2 - See COPYING in the top level directory * FILE: ntoskrnl/fsrtl/largemcb.c * PURPOSE: Large Mapped Control Block (MCB) support for File System Drivers - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Pierre Schweitzer (heis_spiter(a)hotmail.com) - * Art Yerkes (art.yerkes(a)gmail.com) + * PROGRAMMERS: Aleksey Bragin <aleksey(a)reactos.org> + * Jan Kratochvil <project-captive(a)jankratochvil.net> */ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> + +#define MIN(x,y) (((x)<(y))?(x):(y)) +#define MAX(x,y) (((x)>(y))?(x):(y)) /* GLOBALS *******************************************************************/ PAGED_LOOKASIDE_LIST FsRtlFirstMappingLookasideList; NPAGED_LOOKASIDE_LIST FsRtlFastMutexLookasideList; -typedef struct _LARGE_MCB_MAPPING_ENTRY +/* We use only real 'mapping' runs; we do not store 'holes' to our GTree. */ +typedef struct _LARGE_MCB_MAPPING_ENTRY // run { LARGE_INTEGER RunStartVbn; - LARGE_INTEGER SectorCount; - LARGE_INTEGER StartingLbn; - LIST_ENTRY Sequence; + LARGE_INTEGER RunEndVbn; /* RunStartVbn+SectorCount; that means +1 after the last sector */ + LARGE_INTEGER StartingLbn; /* Lbn of 'RunStartVbn' */ } LARGE_MCB_MAPPING_ENTRY, *PLARGE_MCB_MAPPING_ENTRY; -typedef struct _LARGE_MCB_MAPPING +typedef struct _LARGE_MCB_MAPPING // mcb_priv { RTL_GENERIC_TABLE Table; - LIST_ENTRY SequenceList; } LARGE_MCB_MAPPING, *PLARGE_MCB_MAPPING; typedef struct _BASE_MCB_INTERNAL { @@ -41,6 +42,18 @@ PLARGE_MCB_MAPPING Mapping; } BASE_MCB_INTERNAL, *PBASE_MCB_INTERNAL; +static LARGE_MCB_MAPPING_ENTRY StaticRunBelow0 = { + {{-1}}, /* ignored */ + {{0}}, + {{-1}}, /* ignored */ +}; + +static PLARGE_MCB_MAPPING_ENTRY run_compare_func_last_a_run; +static PLARGE_MCB_MAPPING_ENTRY run_compare_func_last_b_run; +static PLARGE_MCB_MAPPING_ENTRY run_compare_func_minus_a_run; /* last run where we returned -1 */ +static PLARGE_MCB_MAPPING_ENTRY run_compare_func_minus_b_run; +static PLARGE_MCB_MAPPING_ENTRY run_compare_func_plus_a_run; /* last run where we returned +1 */ +static PLARGE_MCB_MAPPING_ENTRY run_compare_func_plus_b_run; static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) { @@ -57,20 +70,102 @@ ExFreePoolWithTag(Buffer, 'LMCB'); } -static RTL_GENERIC_COMPARE_RESULTS NTAPI McbMappingCompare -(PRTL_GENERIC_TABLE Table, PVOID PtrA, PVOID PtrB) +static +RTL_GENERIC_COMPARE_RESULTS +NTAPI +McbMappingCompare(PRTL_GENERIC_TABLE Table, + PVOID PtrA, + PVOID PtrB) { PLARGE_MCB_MAPPING_ENTRY A = PtrA, B = PtrB; - - return + INT r; + RTL_GENERIC_COMPARE_RESULTS Res; + + /*return (A->RunStartVbn.QuadPart + A->SectorCount.QuadPart < B->RunStartVbn.QuadPart) ? GenericLessThan : - (A->RunStartVbn.QuadPart > B->RunStartVbn.QuadPart + B->SectorCount.QuadPart) ? GenericGreaterThan : GenericEqual; -} + (A->RunStartVbn.QuadPart > B->RunStartVbn.QuadPart + B->SectorCount.QuadPart) ? GenericGreaterThan : GenericEqual;*/ + + /*return + (A->RunEndVbn.QuadPart < B->RunStartVbn.QuadPart) ? GenericLessThan : + (A->RunStartVbn.QuadPart > B->RunEndVbn.QuadPart) ? GenericGreaterThan : GenericEqual;*/ + + run_compare_func_last_a_run = A; + run_compare_func_last_b_run = B; + + if (1 + && !(r = (A->RunStartVbn.QuadPart > B->RunStartVbn.QuadPart) - (A->RunStartVbn.QuadPart < B->RunStartVbn.QuadPart)) + && !(r = (A->RunEndVbn.QuadPart > B->RunEndVbn.QuadPart ) - (A->RunEndVbn.QuadPart < B->RunEndVbn.QuadPart ))) + { + r = 0; + } + + //DPRINT("A(%d-%d,%d) %p, B(%d-%d,%d) %p, Res %d\n", A->RunStartVbn.LowPart, A->RunEndVbn.LowPart, A->StartingLbn.LowPart, A, B->RunStartVbn.LowPart, B->RunEndVbn.LowPart, B->StartingLbn.LowPart, B, r); + + /* + negative value if a < b; + zero if a = b; + positive value if a > b. + */ + if (r < 0) + Res = GenericLessThan; + else if (r > 0) + Res = GenericGreaterThan; + else + Res = GenericEqual; + + if (Res == GenericLessThan) + { + run_compare_func_minus_a_run = A; + run_compare_func_minus_b_run = B; + } + else if (Res == GenericGreaterThan) + { + run_compare_func_plus_a_run = A; + run_compare_func_plus_b_run = B; + } + + return Res; +} + +static RTL_GENERIC_COMPARE_RESULTS NTAPI McbMappingIntersectCompare(PRTL_GENERIC_TABLE Table, PVOID PtrA, PVOID PtrB) +{ + PLARGE_MCB_MAPPING_ENTRY HaystackRun = PtrA, NeedleRun = PtrB; + LARGE_MCB_MAPPING_ENTRY CommonRun; + RTL_GENERIC_COMPARE_RESULTS Res; + + if (!HaystackRun) return GenericEqual; + if (HaystackRun->RunEndVbn.QuadPart <= HaystackRun->RunStartVbn.QuadPart) return GenericEqual; + + if (!NeedleRun) return GenericEqual; + if (NeedleRun->RunEndVbn.QuadPart <= NeedleRun->RunStartVbn.QuadPart) return GenericEqual; + + CommonRun.RunStartVbn.QuadPart = MAX(HaystackRun->RunStartVbn.QuadPart, NeedleRun->RunStartVbn.QuadPart); + CommonRun.RunEndVbn.QuadPart = MIN(HaystackRun->RunEndVbn.QuadPart , NeedleRun->RunEndVbn.QuadPart ); + + if (CommonRun.RunEndVbn.QuadPart > CommonRun.RunStartVbn.QuadPart) + return GenericEqual; + + Res = McbMappingCompare(Table, NeedleRun, HaystackRun); + ASSERT(Res != GenericEqual); /* otherwise we would hit it by 'common_run' */ + return Res; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented + * @Mcb: #PLARGE_MCB initialized by FsRtlInitializeLargeMcb(). + * %NULL value is forbidden. + * @Vbn: Starting virtual block number of the wished range. + * @Lbn: Starting logical block number of the wished range. + * @SectorCount: Length of the wished range. + * Value less or equal to %0 is forbidden; FIXME: Is the reject of %0 W32 compliant? + * + * Adds the specified range @Vbn ... @Vbn+@SectorCount-1 to @Mcb. + * Any mappings previously in this range are deleted first. + * + * Returns: %TRUE if successful. */ BOOLEAN NTAPI @@ -80,64 +175,111 @@ IN LONGLONG SectorCount) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - LARGE_MCB_MAPPING_ENTRY Node; - PLARGE_MCB_MAPPING_ENTRY Existing = NULL; - BOOLEAN NewElement = FALSE; - + LARGE_MCB_MAPPING_ENTRY Node, NeedleRun; + PLARGE_MCB_MAPPING_ENTRY LowerRun, HigherRun, Existing = NULL; + BOOLEAN NewElement; + + if (Vbn < 0) return FALSE; + if (SectorCount <= 0) return FALSE; + + //DPRINT("Mcb=%p,Vbn=%lld,Lbn=%lld,SectorCount=%lld\n", Mcb, Vbn, Lbn, SectorCount); + + /* clean any possible previous entries in our range */ + FsRtlRemoveBaseMcbEntry(OpaqueMcb, Vbn, SectorCount); + + // We need to map [Vbn, Vbn+SectorCount) to [Lbn, Lbn+SectorCount), + // taking in account the fact that we need to merge these runs if + // they are adjacent or overlap, but fail if new run fully fits into another run + + /* initially we think we will be inserted as a separate run */ Node.RunStartVbn.QuadPart = Vbn; + Node.RunEndVbn.QuadPart = Vbn + SectorCount; Node.StartingLbn.QuadPart = Lbn; - Node.SectorCount.QuadPart = SectorCount; - - while (!NewElement) - { - DPRINT("Inserting %x:%x\n", Node.RunStartVbn.LowPart, Node.SectorCount.LowPart); - Existing = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); - DPRINT("Existing %x\n", Existing); - if (!Existing) break; - - DPRINT("NewElement %d\n", NewElement); - if (!NewElement) - { - // We merge the existing runs - LARGE_INTEGER StartVbn, FinalVbn; - DPRINT("Existing: %x:%x\n", Existing->RunStartVbn.LowPart, Node.SectorCount.LowPart); - if (Existing->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart) - { - StartVbn = Existing->RunStartVbn; - Node.StartingLbn = Existing->StartingLbn; - } - else - { - StartVbn = Node.RunStartVbn; - } - DPRINT("StartVbn %x\n", StartVbn.LowPart); - if (Existing->RunStartVbn.QuadPart + Existing->SectorCount.QuadPart > - Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart) - { - FinalVbn.QuadPart = Existing->RunStartVbn.QuadPart + Existing->SectorCount.QuadPart; - } - else - { - FinalVbn.QuadPart = Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart; - } - DPRINT("FinalVbn %x\n", FinalVbn.LowPart); - Node.RunStartVbn.QuadPart = StartVbn.QuadPart; - Node.SectorCount.QuadPart = FinalVbn.QuadPart - StartVbn.QuadPart; - RemoveHeadList(&Existing->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Existing); - Mcb->PairCount--; - } - else - { - DPRINT("Mapping added %x\n", Existing); - Mcb->MaximumPairCount++; - Mcb->PairCount++; - InsertHeadList(&Mcb->Mapping->SequenceList, &Existing->Sequence); - } - } - - DPRINT("!!Existing %d\n", !!Existing); - return !!Existing; + + /* optionally merge with lower run */ + NeedleRun.RunStartVbn.QuadPart = Node.RunStartVbn.QuadPart - 1; + NeedleRun.RunEndVbn.QuadPart = NeedleRun.RunStartVbn.QuadPart + 1; + //if ((LowerRun = g_tree_search(Mcb_priv->gtree,(GCompareFunc)run_intersect_compare_func, &NeedleRun))) + Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; + if ((LowerRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun))) + { + ASSERT(LowerRun->RunEndVbn.QuadPart == Node.RunStartVbn.QuadPart); + Node.RunStartVbn.QuadPart = LowerRun->RunStartVbn.QuadPart; + Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, LowerRun); + DPRINT("Intersecting lower run found (%I64d,%I64d) Lbn: %I64d\n", LowerRun->RunStartVbn.QuadPart, LowerRun->RunEndVbn.QuadPart, LowerRun->StartingLbn.QuadPart); + } + + /* optionally merge with higher run */ + NeedleRun.RunStartVbn.QuadPart = Node.RunEndVbn.QuadPart; + NeedleRun.RunEndVbn.QuadPart = NeedleRun.RunStartVbn.QuadPart + 1; + //if ((HigherRun = g_tree_search(Mcb_priv->gtree,(GCompareFunc)run_intersect_compare_func, &NeedleRun))) + Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; + if ((HigherRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun))) + { + ASSERT(HigherRun->RunStartVbn.QuadPart == Node.RunEndVbn.QuadPart); + Node.RunEndVbn.QuadPart = HigherRun->RunEndVbn.QuadPart; + Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, HigherRun); + DPRINT("Intersecting higher run found (%I64d,%I64d) Lbn: %I64d\n", HigherRun->RunStartVbn.QuadPart, HigherRun->RunEndVbn.QuadPart, HigherRun->StartingLbn.QuadPart); + } + Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; + + /* finally insert the resulting run */ + Existing = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); + DPRINT("Existing %x, NewElement %d\n", Existing, NewElement); + ASSERT(NewElement); + + // NB: Two consecutive runs can only be merged, if actual LBNs also match! + + /* 1. + Existing->RunStartVbn + | + |///////| + |/////////////| + | + Node->RunStartVbn + + 2. + Existing->RunStartVbn + | + |///////| + |//////| + | + Node->RunStartVbn + + 3. + Existing->RunStartVbn + | + |///////| + |///| + | + Node->RunStartVbn + + 4. + Existing->RunStartVbn + | + |///////| + |///////////////| + | + Node->RunStartVbn + + + Situation with holes: + 1. Holes at both ends + 2. Hole at the right, new run merged with the previous run + 3. Hole at the right, new run is not merged with the previous run + 4. Hole at the left, new run merged with the next run + 5. Hole at the left, new run is not merged with the next run + 6. No holes, exact fit to merge with both previous and next runs + 7. No holes, merges only with the next run + 8. No holes, merges only with the previous run + 9. No holes, does not merge with next or prev runs + + + Overwriting existing mapping is not possible and results in FALSE being returned + */ + return TRUE; } /* @@ -152,7 +294,7 @@ { BOOLEAN Result; - DPRINT("Mcb %x Vbn %x Lbn %x SectorCount %x\n", Mcb, Vbn, Lbn, SectorCount); + DPRINT("Mcb %x Vbn %lld Lbn %lld SectorCount %lld\n", Mcb, Vbn, Lbn, SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlAddBaseMcbEntry(&(Mcb->BaseMcb), @@ -167,7 +309,25 @@ } /* - * @unimplemented + * @implemented + * @Mcb: #PLARGE_MCB initialized by FsRtlInitializeLargeMcb(). + * %NULL value is forbidden. + * @RunIndex: Requested range index to retrieve. + * @Vbn: Returns the starting virtual block number of the wished range. + * %NULL pointer is forbidden. + * @Lbn: Returns the starting logical block number of the wished range (or -1 if it is a hole). + * %NULL pointer is forbidden. + * @SectorCount: Returns the length of the wished range. + * %NULL pointer is forbidden. + * Value less or equal to %0 is forbidden; FIXME: Is the reject of %0 W32 compliant? + * + * Retrieves the parameters of the specified run with index @RunIndex. + * + * Mapping %0 always starts at virtual block %0, either as 'hole' or as 'real' mapping. + * libcaptive does not store 'hole' information to its #GTree. + * Last run is always a 'real' run. 'hole' runs appear as mapping to constant @Lbn value %-1. + * + * Returns: %TRUE if successful. */ BOOLEAN NTAPI @@ -178,26 +338,93 @@ OUT PLONGLONG SectorCount) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - ULONG i = 0; - BOOLEAN Result = FALSE; - PLARGE_MCB_MAPPING_ENTRY Entry; - - for (Entry = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); - Entry && (i < RunIndex); - Entry = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE), i++); - - if (Entry) - { - Result = TRUE; + ULONG RunIndexRemaining; + PLARGE_MCB_MAPPING_ENTRY Run, RunFound = NULL, RunFoundLower = NULL, RunFoundHigher = NULL; + BOOLEAN First = TRUE; + + RunIndexRemaining = RunIndex; + + /* Traverse the tree */ + for (Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); + Run; + Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE)) + { + if (First) + { + /* Take care when we must emulate missing 'hole' run at start of our run list. */ + if (Run->RunStartVbn.QuadPart > 0) + { + if (RunIndexRemaining == 0) + { + RunFoundLower = &StaticRunBelow0; + RunFoundHigher = Run; + + /* stop the traversal */ + break; + } + /* If someone wants RunIndex #1 we are already on it. */ + RunIndexRemaining--; + } + First = FALSE; + } + + if (RunIndexRemaining > 0) + { + /* FIXME: performance: non-linear direct seek to the requested RunIndex */ + RunIndexRemaining--; + if (RunIndexRemaining == 0) + RunFoundLower = Run; + else + RunIndexRemaining--; + + /* continue the traversal */ + continue; + } + + if (RunFoundLower) + RunFoundHigher = Run; + else + RunFound = Run; + + /* stop the traversal */ + break; + } + + if (RunFound) DPRINT("RunFound(%d %d %d)\n", RunFound->RunStartVbn.LowPart, RunFound->RunEndVbn.LowPart, RunFound->StartingLbn.LowPart); + if (RunFoundLower) DPRINT("RunFoundLower(%d %d %d)\n", RunFoundLower->RunStartVbn.LowPart, RunFoundLower->RunEndVbn.LowPart, RunFoundLower->StartingLbn.LowPart); + if (RunFoundHigher) DPRINT("RunFoundHigher(%d %d %d)\n", RunFoundHigher->RunStartVbn.LowPart, RunFoundHigher->RunEndVbn.LowPart, RunFoundHigher->StartingLbn.LowPart); + + if (RunFound) + { + ASSERT(RunFoundLower == NULL); + ASSERT(RunFoundHigher == NULL); + if (Vbn) - *Vbn = Entry->RunStartVbn.QuadPart; + *Vbn = RunFound->RunStartVbn.QuadPart; if (Lbn) - *Lbn = Entry->StartingLbn.QuadPart; + *Lbn = RunFound->StartingLbn.QuadPart; if (SectorCount) - *SectorCount = Entry->SectorCount.QuadPart; - } - - return Result; + *SectorCount = RunFound->RunEndVbn.QuadPart - RunFound->RunStartVbn.QuadPart; + + return TRUE; + } + + if (RunFoundLower && RunFoundHigher) + { + //ASSERT(RunFoundHigher != NULL); + + if (Vbn) + *Vbn = RunFoundLower->RunEndVbn.QuadPart; + if (Lbn) + *Lbn = -1; + if (SectorCount) + *SectorCount = RunFoundHigher->RunStartVbn.QuadPart - RunFoundLower->RunEndVbn.QuadPart; + + return TRUE; + } + + ASSERT(RunFoundHigher == NULL); + return FALSE; } /* @@ -213,7 +440,7 @@ { BOOLEAN Result; - DPRINT("FsRtlGetNextLargeMcbEntry Mcb %x RunIndex %x\n", Mcb, RunIndex); + DPRINT("FsRtlGetNextLargeMcbEntry Mcb %p RunIndex %d\n", Mcb, RunIndex); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlGetNextBaseMcbEntry(&(Mcb->BaseMcb), @@ -237,7 +464,6 @@ IN POOL_TYPE PoolType) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - Mcb->PairCount = 0; if (PoolType == PagedPool) { @@ -251,13 +477,13 @@ } Mcb->PoolType = PoolType; + Mcb->PairCount = 0; Mcb->MaximumPairCount = MAXIMUM_PAIR_COUNT; RtlInitializeGenericTable(&Mcb->Mapping->Table, McbMappingCompare, McbMappingAllocate, McbMappingFree, Mcb); - InitializeListHead(&Mcb->Mapping->SequenceList); } /* @@ -325,44 +551,98 @@ OUT PULONG Index OPTIONAL) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - BOOLEAN Result = FALSE; - LARGE_MCB_MAPPING_ENTRY ToLookup; - PLARGE_MCB_MAPPING_ENTRY Entry; - - ToLookup.RunStartVbn.QuadPart = Vbn; - ToLookup.SectorCount.QuadPart = 1; - - Entry = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &ToLookup); - DPRINT("Entry %p\n", Entry); - if (!Entry) - { - // Find out if we have a following entry. The spec says we should return - // found with Lbn == -1 when we're beneath the largest map. - ToLookup.SectorCount.QuadPart = (1ull<<62) - ToLookup.RunStartVbn.QuadPart; - Entry = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &ToLookup); - DPRINT("Entry %p\n", Entry); - if (Entry) + + + ULONG RunIndex = 0; + PLARGE_MCB_MAPPING_ENTRY Run, RunFound = NULL, RunFoundLower = NULL, RunFoundHigher = NULL; + BOOLEAN First = TRUE; + + /* Traverse the tree */ + for (Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); + Run; + Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE)) + { + if (First) { - Result = TRUE; - if (Lbn) *Lbn = ~0ull; + /* Take care when we must emulate missing 'hole' run at start of our run list. */ + if (Run->RunStartVbn.QuadPart > 0) + { + RunIndex++; + RunFoundLower = &StaticRunBelow0; + } + First = FALSE; } - else + + if (Run->RunStartVbn.QuadPart <= Vbn && Vbn < Run->RunEndVbn.QuadPart) { - Result = FALSE; + RunFound = Run; + RunFoundLower = NULL; + /* stop the traversal; hit */ + break; } - } - else - { - LARGE_INTEGER Offset; - Offset.QuadPart = Vbn - Entry->RunStartVbn.QuadPart; - Result = TRUE; - if (Lbn) *Lbn = Entry->StartingLbn.QuadPart + Offset.QuadPart; - if (SectorCountFromLbn) *SectorCountFromLbn = Entry->SectorCount.QuadPart - Offset.QuadPart; - if (StartingLbn) *StartingLbn = Entry->StartingLbn.QuadPart; - if (SectorCountFromStartingLbn) *SectorCountFromStartingLbn = Entry->SectorCount.QuadPart; - } - DPRINT("Done\n"); - return Result; + + if (Run->RunEndVbn.QuadPart <= Vbn) + { + RunFoundLower = Run; + RunIndex += 2; + /* continue the traversal; not yet crossed by the run */ + continue; + } + + if (Vbn < Run->RunStartVbn.QuadPart) + { + RunFoundHigher = Run; + RunIndex++; + /* stop the traversal; the run skipped us */ + break; + } + + ASSERT(FALSE); + /* stop the traversal */ + break; + } + + if (RunFound) + { + ASSERT(RunFoundLower == NULL); + ASSERT(RunFoundHigher == NULL); + + if (Lbn) + *Lbn = RunFound->StartingLbn.QuadPart + (Vbn - RunFound->RunStartVbn.QuadPart); + + if (SectorCountFromLbn) /* FIXME: 'after' means including current 'Lbn' or without it? */ + *SectorCountFromLbn = RunFound->RunEndVbn.QuadPart - Vbn; + if (StartingLbn) + *StartingLbn = RunFound->StartingLbn.QuadPart; + if (SectorCountFromStartingLbn) + *SectorCountFromStartingLbn = RunFound->RunEndVbn.QuadPart - RunFound->RunStartVbn.QuadPart; + if (Index) + *Index = RunIndex; + + return TRUE; + } + + if (RunFoundHigher) + { + /* search for hole */ + ASSERT(RunFoundLower != NULL); + + if (Lbn) + *Lbn = ~0ull; + if (SectorCountFromLbn) /* FIXME: 'after' means including current 'Lbn' or without it? */ + *SectorCountFromLbn = RunFoundHigher->RunStartVbn.QuadPart - Vbn; + if (StartingLbn) + *StartingLbn = ~0ull; + if (SectorCountFromStartingLbn) + *SectorCountFromStartingLbn = RunFoundHigher->RunStartVbn.QuadPart - RunFoundLower->RunEndVbn.QuadPart; + if (Index) + *Index = RunIndex; + + return TRUE; + } + + /* We may have some 'RunFoundLower'. */ + return FALSE; } /* @@ -397,8 +677,57 @@ return Result; } -/* - * @unimplemented +static BOOLEAN +NTAPI +FsRtlLookupLastLargeMcbEntryAndIndex_internal(IN PBASE_MCB_INTERNAL Mcb, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn, + OUT PULONG Index OPTIONAL) +{ + LARGE_MCB_MAPPING_ENTRY NeedleRunTop; + PLARGE_MCB_MAPPING_ENTRY FoundRun; + ULONG Runs; + + NeedleRunTop.RunStartVbn.QuadPart = MAXLONGLONG - 1; + NeedleRunTop.RunEndVbn.QuadPart = MAXLONGLONG; + NeedleRunTop.StartingLbn.QuadPart = ~0ull; /* ignored*/ + + run_compare_func_last_a_run = NULL; + run_compare_func_last_b_run = NULL; + + FoundRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRunTop); + ASSERT(FoundRun == NULL); + + if (run_compare_func_last_a_run == NULL) + { + ASSERT(run_compare_func_last_b_run == NULL); + + *Vbn = -1; + *Lbn = -1; + if (Index) *Index = 0; + return FALSE; + } + ASSERT(run_compare_func_last_a_run != &NeedleRunTop); + ASSERT(run_compare_func_last_b_run == &NeedleRunTop); + + *Vbn = run_compare_func_last_a_run->RunEndVbn.QuadPart - 1; + *Lbn = run_compare_func_last_a_run->StartingLbn.QuadPart + ((run_compare_func_last_a_run->RunEndVbn.QuadPart - 1) - run_compare_func_last_a_run->RunStartVbn.QuadPart); + + if (Index) + { + Runs = FsRtlNumberOfRunsInBaseMcb((PBASE_MCB)Mcb); + + /* There must be some runs if we found _something_. */ + ASSERT(Runs > 0); + *Index = Runs - 1; + } + + return TRUE; +} + + +/* + * @implemented */ BOOLEAN NTAPI @@ -408,28 +737,8 @@ IN OUT PULONG Index) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - ULONG i = 0; - BOOLEAN Result = FALSE; - PLIST_ENTRY ListEntry; - PLARGE_MCB_MAPPING_ENTRY Entry; - PLARGE_MCB_MAPPING_ENTRY CountEntry; - - ListEntry = &Mcb->Mapping->SequenceList; - if (!IsListEmpty(ListEntry)) - { - Entry = CONTAINING_RECORD(ListEntry->Flink, LARGE_MCB_MAPPING_ENTRY, Sequence); - Result = TRUE; - *LargeVbn = Entry->RunStartVbn.QuadPart; - *LargeLbn = Entry->StartingLbn.QuadPart; - - for (i = 0, CountEntry = RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); - CountEntry != Entry; - CountEntry = RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE)); - DPRINT1("Most probably we are returning shit now\n"); - *Index = i; - } - - return Result; + + return FsRtlLookupLastLargeMcbEntryAndIndex_internal(Mcb, LargeVbn, LargeLbn, Index); } /* @@ -468,20 +777,8 @@ OUT PLONGLONG Lbn) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - BOOLEAN Result = FALSE; - PLIST_ENTRY ListEntry; - PLARGE_MCB_MAPPING_ENTRY Entry; - - ListEntry = &Mcb->Mapping->SequenceList; - if (!IsListEmpty(ListEntry)) - { - Entry = CONTAINING_RECORD(ListEntry->Flink, LARGE_MCB_MAPPING_ENTRY, Sequence); - Result = TRUE; - *Vbn = Entry->RunStartVbn.QuadPart; - *Lbn = Entry->StartingLbn.QuadPart; - } - - return Result; + + return FsRtlLookupLastLargeMcbEntryAndIndex_internal(Mcb, Vbn, Lbn, NULL); /* Index */ } /* @@ -513,10 +810,26 @@ */ ULONG NTAPI -FsRtlNumberOfRunsInBaseMcb(IN PBASE_MCB Mcb) -{ +FsRtlNumberOfRunsInBaseMcb(IN PBASE_MCB OpaqueMcb) +{ + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; + LONGLONG LbnAtVbn0 = -1; + ULONG Nodes = RtlNumberGenericTableElements(&Mcb->Mapping->Table); + + if (Nodes == 0) return 0; + + FsRtlLookupBaseMcbEntry(OpaqueMcb, + 0, /* Vbn */ + &LbnAtVbn0, /* Lbn */ + NULL, NULL, NULL, NULL); /* 4 output arguments - not interested in them */ + + /* Return the count */ - return Mcb->PairCount; + //return Mcb->PairCount; + /* Return the number of 'real' and 'hole' runs. + * If we do not have sector 0 as 'real' emulate a 'hole' there. + */ + return Nodes * 2 - (LbnAtVbn0 != -1 ? 1 : 0); /* include holes as runs */ } /* @@ -532,7 +845,7 @@ /* Read the number of runs while holding the MCB lock */ KeAcquireGuardedMutex(Mcb->GuardedMutex); - NumberOfRuns = Mcb->BaseMcb.PairCount; + NumberOfRuns = FsRtlNumberOfRunsInBaseMcb(&(Mcb->BaseMcb)); KeReleaseGuardedMutex(Mcb->GuardedMutex); DPRINT("Done %d\n", NumberOfRuns); @@ -542,7 +855,15 @@ } /* - * @unimplemented + * @implemented + * @Mcb: #PLARGE_MCB initialized by FsRtlInitializeLargeMcb(). + * %NULL value is forbidden. + * @Vbn: Starting virtual block number to specify the range to delete. + * @SectorCount: Length of the range to delete. + * Value less or equal to %0 is forbidden; FIXME: Is the reject of %0 W32 compliant? + * + * Deletes any possible @Mcb mappings in the given range @Vbn ... @Vbn+@SectorCount-1. + * This call has no problems if no mappings exist there yet. */ BOOLEAN NTAPI @@ -551,79 +872,41 @@ IN LONGLONG SectorCount) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - LARGE_MCB_MAPPING_ENTRY Node; - LARGE_MCB_MAPPING_ENTRY NewElement; - PLARGE_MCB_MAPPING_ENTRY Element; - PLARGE_MCB_MAPPING_ENTRY Reinserted, Inserted; - LARGE_INTEGER StartHole, EndHole, EndRun; - - Node.RunStartVbn.QuadPart = Vbn; - Node.SectorCount.QuadPart = SectorCount; - - while ((Element = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Node))) - { - DPRINT1("Node.RunStartVbn %I64d, Node.SectorCount %I64d\n", Node.RunStartVbn.QuadPart, Node.SectorCount.QuadPart); - DPRINT1("Element %p, .RunStartVbn %I64d, .SectorCount %I64d\n", Element, Element->RunStartVbn.QuadPart, Element->SectorCount.QuadPart); - // Must split - if (Element->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart && - Element->SectorCount.QuadPart > Node.SectorCount.QuadPart) + LARGE_MCB_MAPPING_ENTRY NeedleRun; + PLARGE_MCB_MAPPING_ENTRY HaystackRun; + + if (Vbn < 0 || SectorCount <= 0) return FALSE; + /* FIXME: We are unable to delete the absolutely last sector G_MAXINT64 by this implementation! */ + if (Vbn + SectorCount <= Vbn) return FALSE; + + NeedleRun.RunStartVbn.QuadPart = Vbn; + NeedleRun.RunEndVbn.QuadPart = Vbn + SectorCount; + + /* adjust/destroy all intersecting ranges */ + Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; + //while ((HaystackRun = g_tree_search(Mcb_priv->gtree,(GCompareFunc)run_intersect_compare_func,&needle_run))) + while ((HaystackRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun))) + { + if (HaystackRun->RunStartVbn.QuadPart < NeedleRun.RunStartVbn.QuadPart) { - LARGE_MCB_MAPPING_ENTRY Upper, Reinsert; - StartHole = Node.RunStartVbn; - EndHole.QuadPart = Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart; - - Upper.RunStartVbn.QuadPart = EndHole.QuadPart; - Upper.StartingLbn.QuadPart = Element->StartingLbn.QuadPart + EndHole.QuadPart - Element->RunStartVbn.QuadPart; - Upper.SectorCount.QuadPart = Element->SectorCount.QuadPart - (EndHole.QuadPart - Element->RunStartVbn.QuadPart); - Reinsert = *Element; - Reinsert.SectorCount.QuadPart = Element->RunStartVbn.QuadPart - StartHole.QuadPart; - RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); - Mcb->PairCount--; - - Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Reinsert, sizeof(Reinsert), NULL); - InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); - Mcb->PairCount++; - - Inserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Upper, sizeof(Upper), NULL); - InsertHeadList(&Mcb->Mapping->SequenceList, &Inserted->Sequence); - Mcb->PairCount++; + ASSERT(HaystackRun->RunEndVbn.QuadPart > NeedleRun.RunStartVbn.QuadPart); + HaystackRun->RunEndVbn.QuadPart = NeedleRun.RunStartVbn.QuadPart; } - else if (Element->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart) + else if (HaystackRun->RunEndVbn.QuadPart > NeedleRun.RunEndVbn.QuadPart) { - StartHole = Node.RunStartVbn; - NewElement.RunStartVbn = Element->RunStartVbn; - NewElement.StartingLbn = Element->StartingLbn; - NewElement.SectorCount.QuadPart = StartHole.QuadPart - Element->StartingLbn.QuadPart; - - RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); - Mcb->PairCount--; - - Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &NewElement, sizeof(NewElement), NULL); - InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); - Mcb->PairCount++; + ASSERT(HaystackRun->RunStartVbn.QuadPart < NeedleRun.RunEndVbn.QuadPart); + HaystackRun->RunStartVbn.QuadPart = NeedleRun.RunEndVbn.QuadPart; } else { - EndHole = Element->RunStartVbn; - EndRun.QuadPart = Element->RunStartVbn.QuadPart + Element->SectorCount.QuadPart; - NewElement.RunStartVbn = EndHole; - NewElement.StartingLbn.QuadPart = Element->StartingLbn.QuadPart + (EndHole.QuadPart - Element->RunStartVbn.QuadPart); - NewElement.SectorCount.QuadPart = EndRun.QuadPart - EndHole.QuadPart; - - RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); - Mcb->PairCount--; - - Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &NewElement, sizeof(NewElement), NULL); - InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); - Mcb->PairCount++; - - DPRINT1("Reinserted %p, .RunStartVbn %I64d, .SectorCount %I64d\n", Reinserted, Reinserted->RunStartVbn.QuadPart, Reinserted->SectorCount.QuadPart); - DPRINT1("NewElement .RunStartVbn %I64d, .SectorCount %I64d\n", NewElement.RunStartVbn.QuadPart, NewElement.SectorCount.QuadPart); + ASSERT(NeedleRun.RunStartVbn.QuadPart >= HaystackRun->RunStartVbn.QuadPart); + ASSERT(NeedleRun.RunEndVbn.QuadPart <= HaystackRun->RunEndVbn.QuadPart); + Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, HaystackRun); + Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; } } + Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; return TRUE; } @@ -637,7 +920,7 @@ IN LONGLONG Vbn, IN LONGLONG SectorCount) { - DPRINT("FsRtlRemoveLargeMcbEntry Mcb %x, Vbn %I64d, SectorCount %I64d\n", Mcb, (ULONG)Vbn, (ULONG)SectorCount); + DPRINT("FsRtlRemoveLargeMcbEntry Mcb %x, Vbn %I64d, SectorCount %I64d\n", Mcb, Vbn, SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); FsRtlRemoveBaseMcbEntry(&(Mcb->BaseMcb), Vbn, SectorCount); @@ -683,43 +966,6 @@ KeReleaseGuardedMutex(Mcb->GuardedMutex); } -#define MCB_BUMP_NO_MORE 0 -#define MCB_BUMP_AGAIN 1 - -static ULONG NTAPI McbBump(PBASE_MCB_INTERNAL Mcb, PLARGE_MCB_MAPPING_ENTRY FixedPart) -{ - LARGE_MCB_MAPPING_ENTRY Reimagined; - PLARGE_MCB_MAPPING_ENTRY Found = NULL; - - DPRINT("McbBump %x (%x:%x)\n", Mcb, FixedPart->RunStartVbn.LowPart, FixedPart->SectorCount.LowPart); - - Reimagined = *FixedPart; - while ((Found = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Reimagined))) - { - Reimagined = *Found; - Reimagined.RunStartVbn.QuadPart = - FixedPart->RunStartVbn.QuadPart + FixedPart->SectorCount.QuadPart; - DPRINT("Reimagined %x\n", Reimagined.RunStartVbn.LowPart); - } - - DPRINT("Found %x\n", Found); - if (!Found) return MCB_BUMP_NO_MORE; - - DPRINT1 - ("Moving %x-%x to %x because %x-%x overlaps\n", - Found->RunStartVbn.LowPart, - Found->RunStartVbn.LowPart + Found->SectorCount.QuadPart, - Reimagined.RunStartVbn.LowPart + Reimagined.SectorCount.LowPart, - Reimagined.RunStartVbn.LowPart, - Reimagined.RunStartVbn.LowPart + Reimagined.SectorCount.LowPart); - - Found->RunStartVbn.QuadPart = Reimagined.RunStartVbn.QuadPart + Reimagined.SectorCount.QuadPart; - Found->StartingLbn.QuadPart = Reimagined.StartingLbn.QuadPart + Reimagined.SectorCount.QuadPart; - - DPRINT("Again\n"); - return MCB_BUMP_AGAIN; -} - /* * @unimplemented */ @@ -729,73 +975,11 @@ IN LONGLONG Vbn, IN LONGLONG Amount) { - PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - ULONG Result; - LARGE_MCB_MAPPING_ENTRY Node; - PLARGE_MCB_MAPPING_ENTRY Existing = NULL; - - Node.RunStartVbn.QuadPart = Vbn; - Node.SectorCount.QuadPart = 0; - - Existing = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Node); - - if (Existing) - { - // We're in the middle of a run - LARGE_MCB_MAPPING_ENTRY UpperPart; - LARGE_MCB_MAPPING_ENTRY LowerPart; - PLARGE_MCB_MAPPING_ENTRY InsertedUpper; - - UpperPart.RunStartVbn.QuadPart = Node.RunStartVbn.QuadPart + Amount; - UpperPart.SectorCount.QuadPart = Existing->RunStartVbn.QuadPart + - (Existing->SectorCount.QuadPart - Node.RunStartVbn.QuadPart); - UpperPart.StartingLbn.QuadPart = Existing->StartingLbn.QuadPart + - (Node.RunStartVbn.QuadPart - Existing->RunStartVbn.QuadPart); - LowerPart.RunStartVbn.QuadPart = Existing->RunStartVbn.QuadPart; - LowerPart.SectorCount.QuadPart = Node.RunStartVbn.QuadPart - Existing->RunStartVbn.QuadPart; - LowerPart.StartingLbn.QuadPart = Existing->StartingLbn.QuadPart; - - Node = UpperPart; - - DPRINT("Loop: %x\n", Node.RunStartVbn.LowPart); - while ((Result = McbBump(Mcb, &Node)) == MCB_BUMP_AGAIN) - { - DPRINT("Node: %x\n", Node.RunStartVbn.LowPart); - } - DPRINT("Done\n"); - - if (Result == MCB_BUMP_NO_MORE) - { - Node = *Existing; - RemoveHeadList(&Existing->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Existing); - Mcb->PairCount--; - - // Adjust the element we found. - Existing->SectorCount = LowerPart.SectorCount; - - InsertedUpper = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &UpperPart, sizeof(UpperPart), NULL); - if (!InsertedUpper) - { - // Just make it like it was - Existing->SectorCount = Node.SectorCount; - return FALSE; - } - InsertHeadList(&Mcb->Mapping->SequenceList, &InsertedUpper->Sequence); - Mcb->PairCount++; - } - else - { - Node.RunStartVbn.QuadPart = Vbn; - Node.SectorCount.QuadPart = Amount; - while ((Result = McbBump(Mcb, &Node)) == MCB_BUMP_AGAIN); - return Result == MCB_BUMP_NO_MORE; - } - } - - DPRINT("Done\n"); - - return TRUE; + //PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; + + UNIMPLEMENTED; + + return FALSE; } /* @@ -830,24 +1014,8 @@ FsRtlTruncateBaseMcb(IN PBASE_MCB OpaqueMcb, IN LONGLONG Vbn) { - PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - if (!Vbn) - { - FsRtlResetBaseMcb(OpaqueMcb); - } - else - { - LARGE_MCB_MAPPING_ENTRY Truncate; - PLARGE_MCB_MAPPING_ENTRY Found; - Truncate.RunStartVbn.QuadPart = Vbn; - Truncate.SectorCount.QuadPart = (1ull<<62) - Truncate.RunStartVbn.QuadPart; - while ((Found = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Truncate))) - { - RemoveEntryList(&Found->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Found); - Mcb->PairCount--; - } - } + DPRINT("Mcb=%p, Vbn=%I64d\n", OpaqueMcb, Vbn); + FsRtlRemoveBaseMcbEntry(OpaqueMcb, Vbn, MAXLONGLONG - Vbn + 1); } /* @@ -874,7 +1042,7 @@ { FsRtlResetBaseMcb(Mcb); - if ((Mcb->PoolType == PagedPool) && (Mcb->MaximumPairCount == MAXIMUM_PAIR_COUNT)) + if ((Mcb->PoolType == PagedPool)/* && (Mcb->MaximumPairCount == MAXIMUM_PAIR_COUNT)*/) { ExFreeToPagedLookasideList(&FsRtlFirstMappingLookasideList, Mcb->Mapping);

1 0

[spetreolle] 59341: [MMCCLIENT] Copypasta--, fixes build.
by spetreolle＠svn.reactos.org 25 Jun '13

25 Jun '13

Author: spetreolle Date: Tue Jun 25 20:30:09 2013 New Revision: 59341 URL: http://svn.reactos.org/svn/reactos?rev=59341&view=rev Log: [MMCCLIENT] Copypasta--, fixes build. Modified: trunk/reactos/base/applications/mmc/rsrc.rc Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] Tue Jun 25 20:30:09 2013 @@ -59,7 +59,7 @@ #include "lang/sv-SE.rc" #endif #ifdef LANGUAGE_TR_TR - #include "lang/sv-SE.rc" + #include "lang/tr-TR.rc" #endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc"

1 0

[aandrejevic] 59340: [NTVDM] Implement the "Get Interrupt Vector" and "Set Interrupt Vector" DOS API functions.
by aandrejevic＠svn.reactos.org 25 Jun '13

25 Jun '13

Author: aandrejevic Date: Tue Jun 25 17:56:05 2013 New Revision: 59340 URL: http://svn.reactos.org/svn/reactos?rev=59340&view=rev Log: [NTVDM] Implement the "Get Interrupt Vector" and "Set Interrupt Vector" DOS API functions. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Jun 25 17:56:05 2013 @@ -635,6 +635,17 @@ break; } + /* Set Interrupt Vector */ + case 0x25: + { + DWORD FarPointer = MAKELONG(LOWORD(Edx), DataSegment); + + /* Write the new far pointer to the IDT */ + ((PDWORD)BaseAddress)[LOBYTE(Eax)] = FarPointer; + + break; + } + /* Get system date */ case 0x2A: { @@ -710,6 +721,18 @@ break; } + /* Get Interrupt Vector */ + case 0x35: + { + DWORD FarPointer = ((PDWORD)BaseAddress)[LOBYTE(Eax)]; + + /* Read the address from the IDT into ES:BX */ + EmulatorSetRegister(EMULATOR_REG_ES, HIWORD(FarPointer)); + EmulatorSetRegister(EMULATOR_REG_BX, LOWORD(FarPointer)); + + break; + } + /* Create Directory */ case 0x39: {

1 0

[aandrejevic] 59339: [NTVDM] Fix more bugs in DosResizeMemory().
by aandrejevic＠svn.reactos.org 25 Jun '13

25 Jun '13

Author: aandrejevic Date: Tue Jun 25 17:18:34 2013 New Revision: 59339 URL: http://svn.reactos.org/svn/reactos?rev=59339&view=rev Log: [NTVDM] Fix more bugs in DosResizeMemory(). Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Jun 25 17:18:34 2013 @@ -152,31 +152,41 @@ return Result + 1; } -WORD DosResizeMemory(WORD BlockData, WORD NewSize) -{ +BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable) +{ + BOOLEAN Success = TRUE; WORD Segment = BlockData - 1, ReturnSize = 0, NextSegment; PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment), NextMcb; /* Make sure this is a valid, allocated block */ if ((Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') || Mcb->OwnerPsp == 0) { - return 0; - } - - /* Check if need to expand or contract the block */ + Success = FALSE; + goto Done; + } + + ReturnSize = Mcb->Size; + + /* Check if we need to expand or contract the block */ if (NewSize > Mcb->Size) { /* We can't expand the last block */ - if (Mcb->BlockType != 'M') return Mcb->Size; - - ReturnSize = Mcb->Size; - + if (Mcb->BlockType != 'M') + { + Success = FALSE; + goto Done; + } + /* Get the pointer and segment of the next MCB */ NextSegment = Segment + Mcb->Size + 1; NextMcb = SEGMENT_TO_MCB(NextSegment); /* Make sure the next segment is free */ - if (NextMcb->OwnerPsp != 0) return Mcb->Size; + if (NextMcb->OwnerPsp != 0) + { + Success = FALSE; + goto Done; + } /* Combine this free block with adjoining free blocks */ DosCombineFreeBlocks(NextSegment); @@ -220,7 +230,15 @@ Mcb->Size = NewSize; } - return ReturnSize; +Done: + /* Check if the operation failed */ + if (!Success) + { + /* Return the maximum possible size */ + if (MaxAvailable) *MaxAvailable = ReturnSize; + } + + return Success; } BOOLEAN DosFreeMemory(WORD BlockData) @@ -785,14 +803,17 @@ /* Resize Memory Block */ case 0x4A: { - WORD Size = DosResizeMemory(ExtSegment, LOWORD(Ebx)); - - if (Size != 0) - { + WORD Size; + + if (DosResizeMemory(ExtSegment, LOWORD(Ebx), &Size)) + { + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); EmulatorSetRegister(EMULATOR_REG_BX, Size); - EmulatorClearFlag(EMULATOR_FLAG_CF); - } - else EmulatorSetFlag(EMULATOR_FLAG_CF); + } break; } Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Tue Jun 25 17:18:34 2013 @@ -208,7 +208,7 @@ BOOLEAN DosInitialize(); WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable); BOOLEAN DosFreeMemory(WORD BlockData); -WORD DosResizeMemory(WORD BlockData, WORD NewSize); +BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable); BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); VOID DosInt20h(WORD CodeSegment); VOID DosInt21h(WORD CodeSegment);

1 0

[aandrejevic] 59338: [NTVDM] Fix the VDM DOS memory manager to use the segment of the data portion of the block, rather than the MCB itself.
by aandrejevic＠svn.reactos.org 25 Jun '13

25 Jun '13

Author: aandrejevic Date: Tue Jun 25 16:46:35 2013 New Revision: 59338 URL: http://svn.reactos.org/svn/reactos?rev=59338&view=rev Log: [NTVDM] Fix the VDM DOS memory manager to use the segment of the data portion of the block, rather than the MCB itself. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Jun 25 16:46:35 2013 @@ -148,12 +148,13 @@ /* Take ownership of the block */ CurrentMcb->OwnerPsp = CurrentPsp; - return Result; -} - -WORD DosResizeMemory(WORD Segment, WORD NewSize) -{ - WORD ReturnSize = 0, NextSegment; + /* Return the segment of the data portion of the block */ + return Result + 1; +} + +WORD DosResizeMemory(WORD BlockData, WORD NewSize) +{ + WORD Segment = BlockData - 1, ReturnSize = 0, NextSegment; PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment), NextMcb; /* Make sure this is a valid, allocated block */ @@ -222,9 +223,9 @@ return ReturnSize; } -BOOLEAN DosFreeMemory(WORD Segment) -{ - PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); +BOOLEAN DosFreeMemory(WORD BlockData) +{ + PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); /* Make sure the MCB is valid */ if (Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') return FALSE; Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Tue Jun 25 16:46:35 2013 @@ -207,8 +207,8 @@ VOID BiosPrintCharacter(CHAR Character, BYTE Attribute); BOOLEAN DosInitialize(); WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable); -BOOLEAN DosFreeMemory(WORD Segment); -WORD DosResizeMemory(WORD Segment, WORD NewSize); +BOOLEAN DosFreeMemory(WORD BlockData); +WORD DosResizeMemory(WORD BlockData, WORD NewSize); BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); VOID DosInt20h(WORD CodeSegment); VOID DosInt21h(WORD CodeSegment);

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