Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[tfaber] 59304: [0.3.15-LT2013] - Tag the release
by tfaber＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: tfaber Date: Sun Jun 23 07:35:11 2013 New Revision: 59304 URL: http://svn.reactos.org/svn/reactos?rev=59304&view=rev Log: [0.3.15-LT2013] - Tag the release Added: tags/ReactOS-0.3.15-LT2013/ (props changed) - copied from r59303, branches/ros-branch-0_3_15-lt2013/ Removed: branches/ros-branch-0_3_15-lt2013/ Propchange: tags/ReactOS-0.3.15-LT2013/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jun 23 07:35:11 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: tags/ReactOS-0.3.15-LT2013/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: tags/ReactOS-0.3.15-LT2013/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tags/ReactOS-0.3.15-LT2013/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jun 23 07:35:11 2013 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: tags/ReactOS-0.3.15-LT2013/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jun 23 07:35:11 2013 @@ -0,0 +1,17 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_14-clt2012:56100 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/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:58534,58553,58561,58614,58627-58628,58633,58706,58727,58759,58865,58989,59015,59039,59044-59045,59049 Propchange: tags/ReactOS-0.3.15-LT2013/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[tfaber] 59303: [0.3.15] - Tag the release
by tfaber＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: tfaber Date: Sun Jun 23 07:34:18 2013 New Revision: 59303 URL: http://svn.reactos.org/svn/reactos?rev=59303&view=rev Log: [0.3.15] - Tag the release Added: tags/ReactOS-0.3.15/ (props changed) - copied from r59302, branches/ReactOS-0.3.15/ Removed: branches/ReactOS-0.3.15/ Propchange: tags/ReactOS-0.3.15/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jun 23 07:34:18 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: tags/ReactOS-0.3.15/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: tags/ReactOS-0.3.15/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tags/ReactOS-0.3.15/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jun 23 07:34:18 2013 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: tags/ReactOS-0.3.15/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jun 23 07:34:18 2013 @@ -0,0 +1,16 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/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:58534,58553,58561,58614,58627-58628,58633,58759 Propchange: tags/ReactOS-0.3.15/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[tfaber] 59302: [VS_JC] - Recreate from trunk
by tfaber＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: tfaber Date: Sun Jun 23 07:30:10 2013 New Revision: 59302 URL: http://svn.reactos.org/svn/reactos?rev=59302&view=rev Log: [VS_JC] - Recreate from trunk Added: branches/vs_jc/ - copied from r59301, trunk/

1 0

[tfaber] 59301: [VS_JC] - Clean out branch
by tfaber＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: tfaber Date: Sun Jun 23 07:28:35 2013 New Revision: 59301 URL: http://svn.reactos.org/svn/reactos?rev=59301&view=rev Log: [VS_JC] - Clean out branch Removed: branches/vs_jc/

1 0

[aandrejevic] 59300: [NTVDM] Implement NtQueryTimerResolution.
by aandrejevic＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: aandrejevic Date: Sun Jun 23 00:56:38 2013 New Revision: 59300 URL: http://svn.reactos.org/svn/reactos?rev=59300&view=rev Log: [NTVDM] Implement NtQueryTimerResolution. Modified: branches/ntvdm/ntoskrnl/ke/clock.c Modified: branches/ntvdm/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ke/clock.c?rev=5… ============================================================================== --- branches/ntvdm/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ branches/ntvdm/ntoskrnl/ke/clock.c [iso-8859-1] Sun Jun 23 00:56:38 2013 @@ -242,8 +242,26 @@ OUT PULONG MaximumResolution, OUT PULONG ActualResolution) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + _SEH2_TRY + { + /* Probe the parameters */ + ProbeForWriteUlong(MinimumResolution); + ProbeForWriteUlong(MaximumResolution); + ProbeForWriteUlong(ActualResolution); + + /* Set the parameters to the actual values */ + *MinimumResolution = KeMinimumIncrement; + *MaximumResolution = KeMaximumIncrement; + *ActualResolution = KeTimeIncrement; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Return success */ + return STATUS_SUCCESS; } NTSTATUS

1 0

[aandrejevic] 59299: [NTOSKRNL] Implement NtSetTimerResolution.
by aandrejevic＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: aandrejevic Date: Sun Jun 23 00:47:47 2013 New Revision: 59299 URL: http://svn.reactos.org/svn/reactos?rev=59299&view=rev Log: [NTOSKRNL] Implement NtSetTimerResolution. Modified: branches/ntvdm/ntoskrnl/ke/clock.c Modified: branches/ntvdm/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ke/clock.c?rev=5… ============================================================================== --- branches/ntvdm/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ branches/ntvdm/ntoskrnl/ke/clock.c [iso-8859-1] Sun Jun 23 00:47:47 2013 @@ -252,8 +252,26 @@ IN BOOLEAN SetResolution, OUT PULONG CurrentResolution) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ULONG NewResolution; + + /* Call the internal API */ + NewResolution = ExSetTimerResolution(DesiredResolution, SetResolution); + + /* Return the resolution to the caller */ + _SEH2_TRY + { + ProbeForWriteUlong(CurrentResolution); + *CurrentResolution = NewResolution; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Return success if we set the resolution */ + if (SetResolution) return STATUS_SUCCESS; + else return STATUS_TIMER_RESOLUTION_NOT_SET; } /* EOF */

1 0

[aandrejevic] 59298: [NTVDM] Perform multiple CPU instructions in one emulator cycle.
by aandrejevic＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: aandrejevic Date: Sun Jun 23 00:20:24 2013 New Revision: 59298 URL: http://svn.reactos.org/svn/reactos?rev=59298&view=rev Log: [NTVDM] Perform multiple CPU instructions in one emulator cycle. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h 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] Sun Jun 23 00:20:24 2013 @@ -156,9 +156,9 @@ } /* Continue CPU emulation */ - EmulatorStep(); + for (i = 0; i < STEPS_PER_CYCLE; i++) EmulatorStep(); - Cycles++; + Cycles += STEPS_PER_CYCLE; if ((CurrentTickCount - LastCyclePrintout) >= 1000) { DPRINT1("NTVDM: %d Instructions Per Second\n", Cycles); 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] Sun Jun 23 00:20:24 2013 @@ -32,6 +32,7 @@ #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

1 0

[hbelusca] 59297: [CONSRV] Start to separate better the CSR console server layer from the pure set of console functions (which will constitute a future console driver called... condrv :) ), and rew...
by hbelusca＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: hbelusca Date: Sun Jun 23 00:18:47 2013 New Revision: 59297 URL: http://svn.reactos.org/svn/reactos?rev=59297&view=rev Log: [CONSRV] Start to separate better the CSR console server layer from the pure set of console functions (which will constitute a future console driver called... condrv :) ), and rework the terminal frontends interface. Now load the frontends by order : - the tui if we're in console mode - the gui, otherwise. (It's a temporary solution) More modifications to come ! Added: trunk/reactos/win32ss/user/consrv/condrv/ (with props) trunk/reactos/win32ss/user/consrv/condrv/console.c - copied, changed from r59261, trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/condrv/graphics.c - copied unchanged from r59261, trunk/reactos/win32ss/user/consrv/graphics.c trunk/reactos/win32ss/user/consrv/frontendctl.c (with props) trunk/reactos/win32ss/user/consrv/frontends/input.c (with props) Removed: trunk/reactos/win32ss/user/consrv/graphics.c Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/consrv/coninput.c trunk/reactos/win32ss/user/consrv/coninput.h trunk/reactos/win32ss/user/consrv/conio.h trunk/reactos/win32ss/user/consrv/conoutput.c trunk/reactos/win32ss/user/consrv/conoutput.h trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/console.h trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/consrv/handle.c trunk/reactos/win32ss/user/consrv/include/conio.h trunk/reactos/win32ss/user/consrv/include/console.h trunk/reactos/win32ss/user/consrv/init.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… Copied: trunk/reactos/win32ss/user/consrv/condrv/console.c (from r59261, trunk/reactos/win32ss/user/consrv/console.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… Modified: trunk/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/coninp… Modified: trunk/reactos/win32ss/user/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/coninp… Modified: trunk/reactos/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conio.… Modified: trunk/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… Modified: trunk/reactos/win32ss/user/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… Modified: trunk/reactos/win32ss/user/consrv/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… Added: trunk/reactos/win32ss/user/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Added: trunk/reactos/win32ss/user/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Removed: trunk/reactos/win32ss/user/consrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/graphi… Modified: trunk/reactos/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… Modified: trunk/reactos/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… Modified: trunk/reactos/win32ss/user/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… Modified: trunk/reactos/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/init.c…

1 0

[aandrejevic] 59296: [NTVDM] Remove whitespace from empty lines.
by aandrejevic＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: aandrejevic Date: Sun Jun 23 00:11:45 2013 New Revision: 59296 URL: http://svn.reactos.org/svn/reactos?rev=59296&view=rev Log: [NTVDM] Remove whitespace from empty lines. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/hardware.c 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] Sun Jun 23 00:11:45 2013 @@ -55,27 +55,27 @@ CursorRow = ConsoleInfo.dwCursorPosition.Y; ConsoleWidth = ConsoleInfo.dwSize.X; ConsoleHeight = ConsoleInfo.dwSize.Y; - + /* Initialize the PIC */ PicWriteCommand(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4); PicWriteCommand(PIC_SLAVE_CMD, PIC_ICW1 | PIC_ICW1_ICW4); - + /* Set the interrupt offsets */ PicWriteData(PIC_MASTER_DATA, BIOS_PIC_MASTER_INT); PicWriteData(PIC_SLAVE_DATA, BIOS_PIC_SLAVE_INT); - + /* Tell the master PIC there is a slave at IRQ 2 */ PicWriteData(PIC_MASTER_DATA, 1 << 2); PicWriteData(PIC_SLAVE_DATA, 2); - + /* Make sure the PIC is in 8086 mode */ PicWriteData(PIC_MASTER_DATA, PIC_ICW4_8086); PicWriteData(PIC_SLAVE_DATA, PIC_ICW4_8086); - + /* Clear the masks for both PICs */ PicWriteData(PIC_MASTER_DATA, 0x00); PicWriteData(PIC_SLAVE_DATA, 0x00); - + PitWriteCommand(0x34); PitWriteData(0, 0x00); PitWriteData(0, 0x00); @@ -230,7 +230,7 @@ Position.X = Rect.Left; if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - LOBYTE(Eax); else Position.Y = Rect.Top + LOBYTE(Eax); - + ScrollConsoleScreenBuffer(ConsoleOutput, &Rect, &Rect, 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] Sun Jun 23 00:11:45 2013 @@ -581,7 +581,7 @@ (Eax & 0xFFFFFF00) | SystemTime.wDayOfWeek); break; } - + /* Set system date */ case 0x2B: { @@ -589,7 +589,7 @@ SystemTime.wYear = LOWORD(Ecx); SystemTime.wMonth = HIBYTE(Edx); SystemTime.wDay = LOBYTE(Edx); - + if (SetLocalTime(&SystemTime)) { /* Return success */ @@ -600,7 +600,7 @@ /* Return failure */ EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF); } - + break; } @@ -618,7 +618,7 @@ | (SystemTime.wMilliseconds / 10)); break; } - + /* Set system time */ case 0x2D: { @@ -627,7 +627,7 @@ SystemTime.wMinute = LOBYTE(Ecx); SystemTime.wSecond = HIBYTE(Edx); SystemTime.wMilliseconds = LOBYTE(Edx) * 10; - + if (SetLocalTime(&SystemTime)) { /* Return success */ @@ -638,7 +638,7 @@ /* Return failure */ EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF); } - + break; } 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] Sun Jun 23 00:11:45 2013 @@ -64,7 +64,7 @@ *Buffer = PicReadCommand(Address); break; } - + case PIC_MASTER_DATA: case PIC_SLAVE_DATA: { @@ -77,7 +77,7 @@ static VOID EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { BYTE Byte = *Buffer; - + switch (Address) { case PIT_COMMAND_PORT: @@ -85,7 +85,7 @@ PitWriteCommand(Byte); break; } - + case PIT_DATA_PORT(0): case PIT_DATA_PORT(1): case PIT_DATA_PORT(2): @@ -93,14 +93,14 @@ PitWriteData(Address - PIT_DATA_PORT(0), Byte); break; } - + case PIC_MASTER_CMD: case PIC_SLAVE_CMD: { PicWriteCommand(Address, Byte); break; } - + case PIC_MASTER_DATA: case PIC_SLAVE_DATA: { @@ -147,7 +147,7 @@ VdmRunning = FALSE; return; } - + /* Check if this was an PIC IRQ */ if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) { 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] Sun Jun 23 00:11:45 2013 @@ -61,15 +61,15 @@ { 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; } @@ -78,20 +78,20 @@ { /* 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; } #endif @@ -101,11 +101,11 @@ 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 */ @@ -122,11 +122,11 @@ 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 */ @@ -136,7 +136,7 @@ Pic->ConfigRegister = Value; return; } - + if (Value & PIC_OCW3) { /* This is an OCR3 */ @@ -145,10 +145,10 @@ /* Return the ISR on next read from command port */ Pic->ReadIsr = TRUE; } - + return; } - + /* This is an OCW2 */ if (Value & PIC_OCW2_EOI) { @@ -175,11 +175,11 @@ 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) { @@ -187,13 +187,13 @@ 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)) @@ -203,14 +203,14 @@ } 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)) { @@ -219,22 +219,22 @@ } 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 */ @@ -242,10 +242,10 @@ { 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; EmulatorInterrupt(MasterPic.IntOffset + Number); @@ -253,7 +253,7 @@ 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. @@ -263,20 +263,20 @@ { 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; EmulatorInterrupt(SlavePic.IntOffset + Number); @@ -287,7 +287,7 @@ { BYTE Channel = Value >> 6; BYTE Mode = (Value >> 1) & 0x07; - + /* Check if this is a counter latch command */ if (((Value >> 4) & 3) == 0) { @@ -295,14 +295,14 @@ 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: @@ -315,13 +315,13 @@ PitChannels[Channel].Mode = Mode; break; } - + case 6: { PitChannels[Channel].Mode = PIT_MODE_RATE_GENERATOR; break; } - + case 7: { PitChannels[Channel].Mode = PIT_MODE_SQUARE_WAVE; @@ -339,20 +339,20 @@ 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) { @@ -360,7 +360,7 @@ PitChannels[Channel].LatchSet = FALSE; } } - + switch (AccessMode) { case 1: @@ -368,14 +368,14 @@ /* Low byte */ return CurrentValue & 0x00FF; } - + case 2: { /* High byte */ return CurrentValue >> 8; } } - + /* Shouldn't get here */ return 0; } @@ -383,14 +383,14 @@ 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: @@ -400,7 +400,7 @@ PitChannels[Channel].ReloadValue |= Value; break; } - + case 2: { /* High byte */ @@ -413,7 +413,7 @@ VOID PitDecrementCount() { INT i; - + for (i = 0; i < PIT_CHANNELS; i++) { switch (PitChannels[i].Mode) @@ -422,7 +422,7 @@ { /* Decrement the value */ PitChannels[i].CurrentValue--; - + /* Did it fall to the terminal count? */ if (PitChannels[i].CurrentValue == 0 && !PitChannels[i].Pulsed) { @@ -432,40 +432,40 @@ } 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) { @@ -477,16 +477,16 @@ /* 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: { @@ -503,42 +503,42 @@ 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); }

1 0

[spetreolle] 59295: [RTL] Update WIN32 to NT errors table. Patch by Samuel Serapion. CORE-7206 #resolve
by spetreolle＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: spetreolle Date: Sat Jun 22 23:42:54 2013 New Revision: 59295 URL: http://svn.reactos.org/svn/reactos?rev=59295&view=rev Log: [RTL] Update WIN32 to NT errors table. Patch by Samuel Serapion. CORE-7206 #resolve Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/error.c?rev=59295&… ============================================================================== --- trunk/reactos/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/error.c [iso-8859-1] Sat Jun 22 23:42:54 2013 @@ -3,6 +3,7 @@ * * Copyright 2000 Alexandre Julliard * Copyright 2002 Andriy Palamarchuk + * Copyright 2010 AndrÃ© Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -251,10 +252,10 @@ ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY /* 00000121 (STATUS_DS_MEMBERSHIP_EVALUATED_LOCALLY) */ }; -static const DWORD table_40000002[12] = +static const DWORD table_40000002[36] = { ERROR_INVALID_PARAMETER, /* 40000002 (STATUS_WORKING_SET_LIMIT_RANGE) */ - 0, /* 40000003 (STATUS_IMAGE_NOT_AT_BASE) */ + ERROR_IMAGE_NOT_AT_BASE, /* 40000003 (STATUS_IMAGE_NOT_AT_BASE) */ 0, /* 40000004 (STATUS_RXACT_STATE_CREATED) */ 0, /* 40000005 (STATUS_SEGMENT_NOTIFICATION) */ ERROR_LOCAL_USER_SESSION_KEY, /* 40000006 (STATUS_LOCAL_USER_SESSION_KEY) */ @@ -264,7 +265,31 @@ 0, /* 4000000a (STATUS_FT_READ_RECOVERY_FROM_BACKUP) */ 0, /* 4000000b (STATUS_FT_WRITE_RECOVERY) */ ERROR_COUNTER_TIMEOUT, /* 4000000c (STATUS_SERIAL_COUNTER_TIMEOUT) */ - ERROR_NULL_LM_PASSWORD /* 4000000d (STATUS_NULL_LM_PASSWORD) */ + ERROR_NULL_LM_PASSWORD, /* 4000000d (STATUS_NULL_LM_PASSWORD) */ + ERROR_IMAGE_MACHINE_TYPE_MISMATCH, /* 4000000e (STATUS_IMAGE_MACHINE_TYPE_MISMATCH) */ + ERROR_RECEIVE_PARTIAL, /* 4000000f (STATUS_RECEIVE_PARTIAL) */ + ERROR_RECEIVE_EXPEDITED, /* 40000010 (STATUS_RECEIVE_EXPEDITED) */ + ERROR_RECEIVE_PARTIAL_EXPEDITED, /* 40000011 (STATUS_RECEIVE_PARTIAL_EXPEDITED) */ + ERROR_EVENT_DONE, /* 40000012 (STATUS_EVENT_DONE) */ + ERROR_EVENT_PENDING, /* 40000013 (STATUS_EVENT_PENDING) */ + ERROR_CHECKING_FILE_SYSTEM, /* 40000014 (STATUS_CHECKING_FILE_SYSTEM) */ + ERROR_FATAL_APP_EXIT, /* 40000015 (STATUS_FATAL_APP_EXIT) */ + ERROR_PREDEFINED_HANDLE, /* 40000016 (STATUS_PREDEFINED_HANDLE) */ + ERROR_WAS_UNLOCKED, /* 40000017 (STATUS_WAS_UNLOCKED) */ + ERROR_SERVICE_NOTIFICATION, /* 40000018 (STATUS_SERVICE_NOTIFICATION) */ + ERROR_WAS_LOCKED, /* 40000019 (STATUS_WAS_LOCKED) */ + ERROR_LOG_HARD_ERROR, /* 4000001a (STATUS_LOG_HARD_ERROR) */ + ERROR_ALREADY_WIN32, /* 4000001b (STATUS_ALREADY_WIN32) */ + 0, /* 4000001c (STATUS_WX86_UNSIMULATE) */ + 0, /* 4000001d (STATUS_WX86_CONTINUE) */ + 0, /* 4000001e (STATUS_WX86_SINGLE_STEP) */ + 0, /* 4000001f (STATUS_WX86_BREAKPOINT) */ + 0, /* 40000020 (STATUS_WX86_EXCEPTION_CONTINUE) */ + 0, /* 40000021 (STATUS_WX86_EXCEPTION_LASTCHANCE) */ + 0, /* 40000022 (STATUS_WX86_EXCEPTION_CHAIN) */ + ERROR_IMAGE_MACHINE_TYPE_MISMATCH_EXE, /* 40000023 (STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE) */ + ERROR_NO_YIELD_PERFORMED, /* 40000024 (STATUS_NO_YIELD_PERFORMED) */ + ERROR_TIMER_RESUME_IGNORED /* 40000025 (STATUS_TIMER_RESUME_IGNORED) */ }; static const DWORD table_40000370[1] = @@ -293,7 +318,7 @@ 0, /* 80000007 (STATUS_WAKE_SYSTEM_DEBUGGER) */ 0, /* 80000008 */ 0, /* 80000009 */ - 0, /* 8000000a (STATUS_HANDLES_CLOSED) */ + ERROR_HANDLES_CLOSED, /* 8000000a (STATUS_HANDLES_CLOSED) */ ERROR_NO_INHERITANCE, /* 8000000b (STATUS_NO_INHERITANCE) */ 0, /* 8000000c (STATUS_GUID_SUBSTITUTION_MADE) */ ERROR_PARTIAL_COPY, /* 8000000d (STATUS_PARTIAL_COPY) */ @@ -710,9 +735,9 @@ 0, /* c0000115 (STATUS_ABIOS_SELECTOR_NOT_AVAILABLE) */ 0, /* c0000116 (STATUS_ABIOS_INVALID_SELECTOR) */ ERROR_INVALID_THREAD_ID, /* c0000117 (STATUS_NO_LDT) */ - 0, /* c0000118 (STATUS_INVALID_LDT_SIZE) */ - 0, /* c0000119 (STATUS_INVALID_LDT_OFFSET) */ - 0, /* c000011a (STATUS_INVALID_LDT_DESCRIPTOR) */ + ERROR_INVALID_LDT_SIZE, /* c0000118 (STATUS_INVALID_LDT_SIZE) */ + ERROR_INVALID_LDT_OFFSET, /* c0000119 (STATUS_INVALID_LDT_OFFSET) */ + ERROR_INVALID_LDT_DESCRIPTOR, /* c000011a (STATUS_INVALID_LDT_DESCRIPTOR) */ ERROR_BAD_EXE_FORMAT, /* c000011b (STATUS_INVALID_IMAGE_NE_FORMAT) */ ERROR_RXACT_INVALID_STATE, /* c000011c (STATUS_RXACT_INVALID_STATE) */ ERROR_RXACT_COMMIT_FAILURE, /* c000011d (STATUS_RXACT_COMMIT_FAILURE) */ @@ -740,11 +765,11 @@ ERROR_TIME_SKEW, /* c0000133 (STATUS_TIME_DIFFERENCE_AT_DC) */ 0, /* c0000134 (STATUS_SYNCHRONIZATION_REQUIRED) */ ERROR_MOD_NOT_FOUND, /* c0000135 (STATUS_DLL_NOT_FOUND) */ - 0, /* c0000136 (STATUS_OPEN_FAILED) */ - 0, /* c0000137 (STATUS_IO_PRIVILEGE_FAILED) */ + ERROR_NET_OPEN_FAILED, /* c0000136 (STATUS_OPEN_FAILED) */ + ERROR_IO_PRIVILEGE_FAILED, /* c0000137 (STATUS_IO_PRIVILEGE_FAILED) */ ERROR_INVALID_ORDINAL, /* c0000138 (STATUS_ORDINAL_NOT_FOUND) */ ERROR_PROC_NOT_FOUND, /* c0000139 (STATUS_ENTRYPOINT_NOT_FOUND) */ - 0, /* c000013a (STATUS_CONTROL_C_EXIT) */ + ERROR_CONTROL_C_EXIT, /* c000013a (STATUS_CONTROL_C_EXIT) */ ERROR_NETNAME_DELETED, /* c000013b (STATUS_LOCAL_DISCONNECT) */ ERROR_NETNAME_DELETED, /* c000013c (STATUS_REMOTE_DISCONNECT) */ ERROR_REM_NOT_LIST, /* c000013d (STATUS_REMOTE_RESOURCES) */ @@ -753,18 +778,18 @@ ERROR_UNEXP_NET_ERR, /* c0000140 (STATUS_INVALID_CONNECTION) */ ERROR_UNEXP_NET_ERR, /* c0000141 (STATUS_INVALID_ADDRESS) */ ERROR_DLL_INIT_FAILED, /* c0000142 (STATUS_DLL_INIT_FAILED) */ - 0, /* c0000143 (STATUS_MISSING_SYSTEMFILE) */ - 0, /* c0000144 (STATUS_UNHANDLED_EXCEPTION) */ - 0, /* c0000145 (STATUS_APP_INIT_FAILURE) */ - 0, /* c0000146 (STATUS_PAGEFILE_CREATE_FAILED) */ - 0, /* c0000147 (STATUS_NO_PAGEFILE) */ + ERROR_MISSING_SYSTEMFILE, /* c0000143 (STATUS_MISSING_SYSTEMFILE) */ + ERROR_UNHANDLED_EXCEPTION, /* c0000144 (STATUS_UNHANDLED_EXCEPTION) */ + ERROR_APP_INIT_FAILURE, /* c0000145 (STATUS_APP_INIT_FAILURE) */ + ERROR_PAGEFILE_CREATE_FAILED, /* c0000146 (STATUS_PAGEFILE_CREATE_FAILED) */ + ERROR_NO_PAGEFILE, /* c0000147 (STATUS_NO_PAGEFILE) */ ERROR_INVALID_LEVEL, /* c0000148 (STATUS_INVALID_LEVEL) */ ERROR_INVALID_PASSWORD, /* c0000149 (STATUS_WRONG_PASSWORD_CORE) */ - 0, /* c000014a (STATUS_ILLEGAL_FLOAT_CONTEXT) */ + ERROR_ILLEGAL_FLOAT_CONTEXT, /* c000014a (STATUS_ILLEGAL_FLOAT_CONTEXT) */ ERROR_BROKEN_PIPE, /* c000014b (STATUS_PIPE_BROKEN) */ ERROR_BADDB, /* c000014c (STATUS_REGISTRY_CORRUPT) */ ERROR_REGISTRY_IO_FAILED, /* c000014d (STATUS_REGISTRY_IO_FAILED) */ - 0, /* c000014e (STATUS_NO_EVENT_PAIR) */ + ERROR_NO_EVENT_PAIR, /* c000014e (STATUS_NO_EVENT_PAIR) */ ERROR_UNRECOGNIZED_VOLUME, /* c000014f (STATUS_UNRECOGNIZED_VOLUME) */ ERROR_SERIAL_NO_DEVICE, /* c0000150 (STATUS_SERIAL_NO_DEVICE_INITED) */ ERROR_NO_SUCH_ALIAS, /* c0000151 (STATUS_NO_SUCH_ALIAS) */ @@ -780,7 +805,7 @@ ERROR_LOGON_TYPE_NOT_GRANTED, /* c000015b (STATUS_LOGON_TYPE_NOT_GRANTED) */ ERROR_NOT_REGISTRY_FILE, /* c000015c (STATUS_NOT_REGISTRY_FILE) */ ERROR_NT_CROSS_ENCRYPTION_REQUIRED, /* c000015d (STATUS_NT_CROSS_ENCRYPTION_REQUIRED) */ - 0, /* c000015e (STATUS_DOMAIN_CTRLR_CONFIG_ERROR) */ + ERROR_DOMAIN_CTRLR_CONFIG_ERROR, /* c000015e (STATUS_DOMAIN_CTRLR_CONFIG_ERROR) */ ERROR_IO_DEVICE, /* c000015f (STATUS_FT_MISSING_MEMBER) */ 0, /* c0000160 (STATUS_ILL_FORMED_SERVICE_ENTRY) */ 0, /* c0000161 (STATUS_ILLEGAL_CHARACTER) */ @@ -886,8 +911,8 @@ 0, /* c0000227 (STATUS_RECOVERY_FAILURE) */ 0, /* c0000228 (STATUS_STACK_OVERFLOW_READ) */ ERROR_INVALID_PARAMETER, /* c0000229 (STATUS_FAIL_CHECK) */ - STATUS_DUPLICATE_OBJECTID, /* c000022a (STATUS_DUPLICATE_OBJECTID) */ - STATUS_OBJECTID_EXISTS, /* c000022b (STATUS_OBJECTID_EXISTS) */ + ERROR_OBJECT_ALREADY_EXISTS, /* c000022a (STATUS_DUPLICATE_OBJECTID) */ + ERROR_OBJECT_ALREADY_EXISTS, /* c000022b (STATUS_OBJECTID_EXISTS) */ 0, /* c000022c (STATUS_CONVERT_TO_LARGE) */ ERROR_RETRY, /* c000022d (STATUS_RETRY) */ 0, /* c000022e (STATUS_FOUND_OUT_OF_SCOPE) */ @@ -927,7 +952,7 @@ 0, /* c0000250 (STATUS_INSUFFICIENT_LOGON_INFO) */ 0, /* c0000251 (STATUS_BAD_DLL_ENTRYPOINT) */ 0, /* c0000252 (STATUS_BAD_SERVICE_ENTRYPOINT) */ - ERROR_INTERNAL_ERROR, /* c0000253 (STATUS_LPC_REPLY_LOST) */ + ERROR_CONNECTION_ABORTED, /* c0000253 (STATUS_LPC_REPLY_LOST) */ 0, /* c0000254 (STATUS_IP_ADDRESS_CONFLICT1) */ 0, /* c0000255 (STATUS_IP_ADDRESS_CONFLICT2) */ 0, /* c0000256 (STATUS_REGISTRY_QUOTA_LIMIT) */ @@ -1460,7 +1485,7 @@ ERROR_CLUSTER_NETWORK_NOT_INTERNAL /* c0130016 (STATUS_CLUSTER_NETWORK_NOT_INTERNAL) */ }; -static const DWORD table_c0150001[14] = +static const DWORD table_c0150001[39] = { ERROR_SXS_SECTION_NOT_FOUND, /* c0150001 (STATUS_SXS_SECTION_NOT_FOUND) */ ERROR_SXS_CANT_GEN_ACTCTX, /* c0150002 (STATUS_SXS_CANT_GEN_ACTCTX) */ @@ -1470,18 +1495,43 @@ ERROR_SXS_MANIFEST_PARSE_ERROR, /* c0150006 (STATUS_SXS_MANIFEST_PARSE_ERROR) */ ERROR_SXS_ACTIVATION_CONTEXT_DISABLED, /* c0150007 (STATUS_SXS_ACTIVATION_CONTEXT_DISABLED) */ ERROR_SXS_KEY_NOT_FOUND, /* c0150008 (STATUS_SXS_KEY_NOT_FOUND) */ - 0, /* c0150009 (STATUS_SXS_VERSION_CONFLICT) */ + ERROR_SXS_VERSION_CONFLICT, /* c0150009 (STATUS_SXS_VERSION_CONFLICT) */ ERROR_SXS_WRONG_SECTION_TYPE, /* c015000a (STATUS_SXS_WRONG_SECTION_TYPE) */ ERROR_SXS_THREAD_QUERIES_DISABLED, /* c015000b (STATUS_SXS_THREAD_QUERIES_DISABLED) */ - 0, /* c015000c (STATUS_SXS_ASSEMBLY_MISSING) */ + ERROR_SXS_ASSEMBLY_MISSING, /* c015000c (STATUS_SXS_ASSEMBLY_MISSING) */ 0, /* c015000d */ - ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET /* c015000e (STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET) */ + ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET, /* c015000e (STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET) */ + ERROR_SXS_EARLY_DEACTIVATION, /* c015000f (STATUS_SXS_EARLY_DEACTIVATION) */ + ERROR_SXS_INVALID_DEACTIVATION, /* c0150010 (STATUS_SXS_INVALID_DEACTIVATION) */ + ERROR_SXS_MULTIPLE_DEACTIVATION, /* c0150011 (STATUS_SXS_MULTIPLE_DEACTIVATION) */ + ERROR_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY, /* c0150012 (STATUS_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY) */ + ERROR_SXS_PROCESS_TERMINATION_REQUESTED, /* c0150013 (STATUS_SXS_PROCESS_TERMINATION_REQUESTED) */ + ERROR_SXS_CORRUPT_ACTIVATION_STACK, /* c0150014 (STATUS_SXS_CORRUPT_ACTIVATION_STACK) */ + ERROR_SXS_CORRUPTION, /* c0150015 (STATUS_SXS_CORRUPTION) */ + ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE, /* c0150016 (STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE) */ + ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME, /* c0150017 (STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME) */ + ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE, /* c0150018 (STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE) */ + ERROR_SXS_IDENTITY_PARSE_ERROR, /* c0150019 (STATUS_SXS_IDENTITY_PARSE_ERROR) */ + ERROR_SXS_COMPONENT_STORE_CORRUPT, /* c015001a (STATUS_SXS_COMPONENT_STORE_CORRUPT) */ + ERROR_SXS_FILE_HASH_MISMATCH, /* c015001b (STATUS_SXS_FILE_HASH_MISMATCH) */ + ERROR_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT, /* c015001c (STATUS_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT) */ + ERROR_SXS_IDENTITIES_DIFFERENT, /* c015001d (STATUS_SXS_IDENTITIES_DIFFERENT) */ + ERROR_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT, /* c015001e (STATUS_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT) */ + ERROR_SXS_FILE_NOT_PART_OF_ASSEMBLY, /* c015001f (STATUS_SXS_FILE_NOT_PART_OF_ASSEMBLY) */ + ERROR_ADVANCED_INSTALLER_FAILED, /* c0150020 (STATUS_ADVANCED_INSTALLER_FAILED) */ + ERROR_XML_ENCODING_MISMATCH, /* c0150021 (STATUS_XML_ENCODING_MISMATCH) */ + ERROR_SXS_MANIFEST_TOO_BIG, /* c0150022 (STATUS_SXS_MANIFEST_TOO_BIG) */ + ERROR_SXS_SETTING_NOT_REGISTERED, /* c0150023 (STATUS_SXS_SETTING_NOT_REGISTERED) */ + ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE, /* c0150024 (STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE) */ + ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SXS_PRIMITIVE_INSTALLER_FAILED) */ + ERROR_GENERIC_COMMAND_FAILED, /* c0150026 (STATUS_GENERIC_COMMAND_FAILED) */ + ERROR_SXS_FILE_HASH_MISSING /* c0150027 (STATUS_SXS_FILE_HASH_MISSING) */ }; static const struct error_table error_table[] = { { 0x00000102, 0x00000122, table_00000102 }, - { 0x40000002, 0x4000000e, table_40000002 }, + { 0x40000002, 0x40000026, table_40000002 }, { 0x40000370, 0x40000371, table_40000370 }, { 0x40020056, 0x40020057, table_40020056 }, { 0x400200af, 0x400200b0, table_400200af }, @@ -1498,7 +1548,6 @@ { 0xc0030059, 0xc0030062, table_c0030059 }, { 0xc00a0001, 0xc00a0037, table_c00a0001 }, { 0xc0130001, 0xc0130017, table_c0130001 }, - { 0xc0150001, 0xc015000f, table_c0150001 }, - { 0, 0, 0 } /* last entry */ -}; - + { 0xc0150001, 0xc0150028, table_c0150001 }, + { 0, 0, NULL } /* last entry */ +};

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013