Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[jjones] 59334: Edit contents of DUMMY.txt so that it becomes self-explanatory.

by jjones＠svn.reactos.org

Author: jjones Date: Mon Jun 24 19:26:55 2013 New Revision: 59334 URL: http://svn.reactos.org/svn/reactos?rev=59334&view=rev Log: Edit contents of DUMMY.txt so that it becomes self-explanatory. Modified: branches/vs_jc/reactos/_IMAGES/DUMMY.txt Modified: branches/vs_jc/reactos/_IMAGES/DUMMY.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/_IMAGES/DUMMY.txt… ============================================================================== --- branches/vs_jc/reactos/_IMAGES/DUMMY.txt [iso-8859-1] (original) +++ branches/vs_jc/reactos/_IMAGES/DUMMY.txt [iso-8859-1] Mon Jun 24 19:26:55 2013 @@ -0,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS _IMAGES + * FILE: _IMAGES/DUMMY.TXT + * PURPOSE: Give Visual Studio's build engine a source file from which it will try to generate a target file. + * PROGRAMMERS: J. C. Jones + */ + + /* + The sole purpose of this file is to stimulate Visual Studio's build engine. When deciding when to invoke a build + tool, such as a compiler, Visual Studio always has the intent of generating a target file from a source file. If + the specified target file is non-existent, or stale, relative to the source file, then the build tool will be + invoked. Therefore, if we create a dummy source file, such as this file, DUMMY.TXT, and specify a target file that will + never be actually generated, DUMMY.ZZZ, then each time Visual Studio examines whether to build DUMMY.ZZZ, it + will always conclude that the answer is "Yes. Try to build DUMMY.TXT." In this way, we can force an operation + to occur, always, for a project. + + In this particular case, we use this technique to build ReactOS target images that can be booted, installed, etc. + The creation of a CD, for example, by copying and packing files, is ~always~ done, no matter what might have + occured previously. This same DUMMY.TXT file is used for several Visual Studio projects in the image directory. + That is why DUMMY.TXT is an immediate child of the directory _IMAGE. + */

11 years, 6 months

[jjones] 59333: Add Visual Studio 2010/2012 solution file that governs the entire solution.

by jjones＠svn.reactos.org

Author: jjones Date: Mon Jun 24 18:19:24 2013 New Revision: 59333 URL: http://svn.reactos.org/svn/reactos?rev=59333&view=rev Log: Add Visual Studio 2010/2012 solution file that governs the entire solution. Added: branches/vs_jc/reactos/ReactOS.sln (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/vs_jc/reactos/ReactOS.sln URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ReactOS.sln?rev=5…

11 years, 6 months

[jjones] 59332: These file being added would normally be generated by by the build process, but we specify them explicitly for the time being to avoid a dependency on extra tool.

by jjones＠svn.reactos.org

Author: jjones Date: Mon Jun 24 18:16:26 2013 New Revision: 59332 URL: http://svn.reactos.org/svn/reactos?rev=59332&view=rev Log: These file being added would normally be generated by by the build process, but we specify them explicitly for the time being to avoid a dependency on extra tool. Added: branches/vs_jc/reactos/include/reactos/buildno.h (with props) branches/vs_jc/reactos/include/reactos/version.h (with props) Added: branches/vs_jc/reactos/include/reactos/buildno.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/reactos/b… ============================================================================== --- branches/vs_jc/reactos/include/reactos/buildno.h (added) +++ branches/vs_jc/reactos/include/reactos/buildno.h [iso-8859-1] Mon Jun 24 18:16:26 2013 @@ -0,0 +1,18 @@ +/* Do not edit - Machine generated */ +#ifndef _INC_REACTOS_BUILDNO +#define _INC_REACTOS_BUILDNO +#define KERNEL_VERSION_BUILD 20130406 +#define KERNEL_VERSION_BUILD_HEX 0x0 +#define KERNEL_VERSION_BUILD_STR "20130406-rUNKNOWN" +#define KERNEL_VERSION_BUILD_RC "20130406-rUNKNOWN\0" +#define KERNEL_RELEASE_RC "0.4-SVN\0" +#define KERNEL_RELEASE_STR "0.4-SVN" +#define KERNEL_VERSION_RC "0.4-SVN\0" +#define KERNEL_VERSION_STR "0.4-SVN" +#define REACTOS_DLL_VERSION_MAJOR 42 +#define REACTOS_DLL_RELEASE_RC "42.4-SVN\0" +#define REACTOS_DLL_RELEASE_STR "42.4-SVN" +#define REACTOS_DLL_VERSION_RC "42.4-SVN\0" +#define REACTOS_DLL_VERSION_STR "42.4-SVN" +#endif +/* EOF */ Propchange: branches/vs_jc/reactos/include/reactos/buildno.h ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: branches/vs_jc/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/reactos/v… ============================================================================== --- branches/vs_jc/reactos/include/reactos/version.h (added) +++ branches/vs_jc/reactos/include/reactos/version.h [iso-8859-1] Mon Jun 24 18:16:26 2013 @@ -0,0 +1,31 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: include/internal/version.h + * PURPOSE: Defines the current version + * PROGRAMMER: David Welch (welch(a)mcmail.com) + * REVISIONS: + * 1999-11-06 (ea) + * Moved from include/internal in include/reactos + * to be used by buildno. + * 2002-01-17 (ea) + * KERNEL_VERSION removed. Use + * reactos/buildno.h:KERNEL_VERSION_STR instead. + */ + +#ifndef __VERSION_H +#define __VERSION_H + +#define KERNEL_VERSION_MAJOR 0 +#define KERNEL_VERSION_MINOR 4 +#define KERNEL_VERSION_PATCH_LEVEL 0 + +#define COPYRIGHT_YEAR "2013" + +/* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ +#define KERNEL_VERSION_BUILD_TYPE "SVN" + + +#endif + +/* EOF */ Propchange: branches/vs_jc/reactos/include/reactos/version.h ------------------------------------------------------------------------------ svn:eol-style = CRLF

11 years, 6 months

[aandrejevic] 59331: [NTVDM] Implement several directory operations.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Jun 24 18:15:53 2013 New Revision: 59331 URL: http://svn.reactos.org/svn/reactos?rev=59331&view=rev Log: [NTVDM] Implement several directory operations. 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] Mon Jun 24 18:15:53 2013 @@ -701,6 +701,67 @@ break; } + /* Create Directory */ + case 0x39: + { + String = (PCHAR)((ULONG_PTR)BaseAddress + + TO_LINEAR(DataSegment, LOWORD(Edx))); + + if (CreateDirectoryA(String, NULL)) + { + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | LOWORD(GetLastError())); + } + + break; + } + + /* Remove Directory */ + case 0x3A: + { + String = (PCHAR)((ULONG_PTR)BaseAddress + + TO_LINEAR(DataSegment, LOWORD(Edx))); + + if (RemoveDirectoryA(String)) + { + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | LOWORD(GetLastError())); + } + + + break; + } + + /* Set Current Directory */ + case 0x3B: + { + String = (PCHAR)((ULONG_PTR)BaseAddress + + TO_LINEAR(DataSegment, LOWORD(Edx))); + + if (SetCurrentDirectoryA(String)) + { + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | LOWORD(GetLastError())); + } + + break; + } + /* Allocate Memory */ case 0x48: {

11 years, 6 months

[jjones] 59330: Commit initial Visual Studio solution/project/extra files to support building ReactOS using Visual Studio 2010/2012. In general, we avoid adding any files beyond the .sln file, the ...

by jjones＠svn.reactos.org

Author: jjones Date: Mon Jun 24 18:08:48 2013 New Revision: 59330 URL: http://svn.reactos.org/svn/reactos?rev=59330&view=rev Log: Commit initial Visual Studio solution/project/extra files to support building ReactOS using Visual Studio 2010/2012. In general, we avoid adding any files beyond the .sln file, the .vcxproj files, and the .vcxproj.filters files so as to not interfere in any way with Trunk. However, we do add three files here as a matter of necessity: _IMAGES\CD_Live\DUMMY.TXT include\reactos\version.h include\reactos\buildno.h These files allow us to get a build while not having to depend on extra tools. Added: branches/vs_jc/reactos/_IMAGES/ (with props) branches/vs_jc/reactos/_IMAGES/CD_Live/ (with props) branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj.filters branches/vs_jc/reactos/_IMAGES/DUMMY.txt (with props) branches/vs_jc/reactos/base/applications/atactl/atactl.vcxproj branches/vs_jc/reactos/base/applications/atactl/atactl.vcxproj.filters branches/vs_jc/reactos/base/shell/cmd/cmd.vcxproj branches/vs_jc/reactos/base/shell/cmd/cmd.vcxproj.filters branches/vs_jc/reactos/base/shell/explorer-new/explorer-new.vcxproj branches/vs_jc/reactos/base/shell/explorer-new/explorer-new.vcxproj.filters branches/vs_jc/reactos/base/system/lsass/lsass.vcxproj branches/vs_jc/reactos/base/system/lsass/lsass.vcxproj.filters branches/vs_jc/reactos/base/system/services/services.vcxproj branches/vs_jc/reactos/base/system/services/services.vcxproj.filters branches/vs_jc/reactos/base/system/smss/smss.vcxproj branches/vs_jc/reactos/base/system/smss/smss.vcxproj.filters branches/vs_jc/reactos/base/system/userinit/userinit.vcxproj branches/vs_jc/reactos/base/system/userinit/userinit.vcxproj.filters branches/vs_jc/reactos/base/system/winlogon/winlogon.vcxproj branches/vs_jc/reactos/base/system/winlogon/winlogon.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/bootsect/bootsect.vcxproj branches/vs_jc/reactos/boot/freeldr/bootsect/bootsect.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/fdebug/fdebug.vcxproj branches/vs_jc/reactos/boot/freeldr/fdebug/fdebug.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/freeldr/freeldr.vcxproj branches/vs_jc/reactos/boot/freeldr/freeldr/freeldr.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/install/install.vcxproj branches/vs_jc/reactos/boot/freeldr/install/install.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/tools/deptool/ (with props) branches/vs_jc/reactos/boot/freeldr/tools/deptool/deptool.vcxproj branches/vs_jc/reactos/boot/freeldr/tools/deptool/deptool.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/tools/hosttype/ (with props) branches/vs_jc/reactos/boot/freeldr/tools/hosttype/hosttype.vcxproj branches/vs_jc/reactos/boot/freeldr/tools/hosttype/hosttype.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/tools/rcopy/ (with props) branches/vs_jc/reactos/boot/freeldr/tools/rcopy/rcopy.vcxproj branches/vs_jc/reactos/boot/freeldr/tools/rcopy/rcopy.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/tools/rdel/ (with props) branches/vs_jc/reactos/boot/freeldr/tools/rdel/rdel.vcxproj branches/vs_jc/reactos/boot/freeldr/tools/rdel/rdel.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/tools/rmkdir/ (with props) branches/vs_jc/reactos/boot/freeldr/tools/rmkdir/rmkdir.vcxproj branches/vs_jc/reactos/boot/freeldr/tools/rmkdir/rmkdir.vcxproj.filters branches/vs_jc/reactos/boot/freeldr/tools/rrmdir/ (with props) branches/vs_jc/reactos/boot/freeldr/tools/rrmdir/rrmdir.vcxproj branches/vs_jc/reactos/boot/freeldr/tools/rrmdir/rrmdir.vcxproj.filters branches/vs_jc/reactos/dll/ntdll/ntdll.vcxproj branches/vs_jc/reactos/dll/ntdll/ntdll.vcxproj.filters branches/vs_jc/reactos/dll/win32/kernel32/kernel32.vcxproj branches/vs_jc/reactos/dll/win32/kernel32/kernel32.vcxproj.filters branches/vs_jc/reactos/drivers/base/beep/beep.vcxproj branches/vs_jc/reactos/drivers/base/beep/beep.vcxproj.filters branches/vs_jc/reactos/drivers/base/bootvid/bootvid.vcxproj branches/vs_jc/reactos/drivers/base/bootvid/bootvid.vcxproj.filters branches/vs_jc/reactos/drivers/base/kdcom/kdcom.vcxproj branches/vs_jc/reactos/drivers/base/kdcom/kdcom.vcxproj.filters branches/vs_jc/reactos/drivers/base/kdrosdbg/kdrosdbg.vcxproj branches/vs_jc/reactos/drivers/base/kdrosdbg/kdrosdbg.vcxproj.filters branches/vs_jc/reactos/drivers/base/nmidebug/nmidebug.vcxproj branches/vs_jc/reactos/drivers/base/nmidebug/nmidebug.vcxproj.filters branches/vs_jc/reactos/drivers/base/null/null.vcxproj branches/vs_jc/reactos/drivers/base/null/null.vcxproj.filters branches/vs_jc/reactos/drivers/battery/battc/battc.vcxproj branches/vs_jc/reactos/drivers/battery/battc/battc.vcxproj.filters branches/vs_jc/reactos/drivers/bluetooth/fbtusb/fbtusb.vcxproj branches/vs_jc/reactos/drivers/bluetooth/fbtusb/fbtusb.vcxproj.filters branches/vs_jc/reactos/drivers/bus/isapnp/isapnp.vcxproj branches/vs_jc/reactos/drivers/bus/isapnp/isapnp.vcxproj.filters branches/vs_jc/reactos/drivers/bus/pci/pci.vcxproj branches/vs_jc/reactos/drivers/bus/pci/pci.vcxproj.filters branches/vs_jc/reactos/drivers/bus/pcix/pcix.vcxproj branches/vs_jc/reactos/drivers/bus/pcix/pcix.vcxproj.filters branches/vs_jc/reactos/drivers/bus/pcmcia/pcmcia.vcxproj branches/vs_jc/reactos/drivers/bus/pcmcia/pcmcia.vcxproj.filters branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj.filters branches/vs_jc/reactos/hal/hal.vcxproj branches/vs_jc/reactos/hal/hal.vcxproj.filters branches/vs_jc/reactos/hal/halaacpi/ (with props) branches/vs_jc/reactos/hal/halaacpi/halaacpi.vcxproj branches/vs_jc/reactos/hal/halaacpi/halaacpi.vcxproj.filters branches/vs_jc/reactos/hal/halacpi/ (with props) branches/vs_jc/reactos/hal/halacpi/halacpi.vcxproj branches/vs_jc/reactos/hal/halacpi/halacpi.vcxproj.filters branches/vs_jc/reactos/hal/halapic/ (with props) branches/vs_jc/reactos/hal/halapic/halapic.vcxproj branches/vs_jc/reactos/hal/halapic/halapic.vcxproj.filters branches/vs_jc/reactos/hal/halmaapic/ (with props) branches/vs_jc/reactos/hal/halmaapic/halmaapic.vcxproj branches/vs_jc/reactos/hal/halmaapic/halmaapic.vcxproj.filters branches/vs_jc/reactos/hal/halmacpi/ (with props) branches/vs_jc/reactos/hal/halmacpi/halmacpi.vcxproj branches/vs_jc/reactos/hal/halmacpi/halmacpi.vcxproj.filters branches/vs_jc/reactos/hal/halmapic/ (with props) branches/vs_jc/reactos/hal/halmapic/halmapic.vcxproj branches/vs_jc/reactos/hal/halmapic/halmapic.vcxproj.filters branches/vs_jc/reactos/hal/halmps/ (with props) branches/vs_jc/reactos/hal/halmps/halmps.vcxproj branches/vs_jc/reactos/hal/halmps/halmps.vcxproj.filters branches/vs_jc/reactos/hal/lib_hal_acpi/ (with props) branches/vs_jc/reactos/hal/lib_hal_acpi/lib_hal_acpi.vcxproj branches/vs_jc/reactos/hal/lib_hal_acpi/lib_hal_acpi.vcxproj.filters branches/vs_jc/reactos/hal/lib_hal_apic/ (with props) branches/vs_jc/reactos/hal/lib_hal_apic/lib_hal_apic.vcxproj branches/vs_jc/reactos/hal/lib_hal_apic/lib_hal_apic.vcxproj.filters branches/vs_jc/reactos/hal/lib_hal_generic/ (with props) branches/vs_jc/reactos/hal/lib_hal_generic/lib_hal_generic.vcxproj branches/vs_jc/reactos/hal/lib_hal_generic/lib_hal_generic.vcxproj.filters branches/vs_jc/reactos/hal/lib_hal_legacy/ (with props) branches/vs_jc/reactos/hal/lib_hal_legacy/build/ (with props) branches/vs_jc/reactos/hal/lib_hal_legacy/build/x86_32/ (with props) branches/vs_jc/reactos/hal/lib_hal_legacy/lib_hal_legacy.vcxproj branches/vs_jc/reactos/hal/lib_hal_legacy/lib_hal_legacy.vcxproj.filters branches/vs_jc/reactos/hal/lib_hal_pic/ (with props) branches/vs_jc/reactos/hal/lib_hal_pic/lib_hal_pic.vcxproj branches/vs_jc/reactos/hal/lib_hal_pic/lib_hal_pic.vcxproj.filters branches/vs_jc/reactos/hal/lib_hal_smp/ (with props) branches/vs_jc/reactos/hal/lib_hal_smp/lib_hal_smp.vcxproj branches/vs_jc/reactos/hal/lib_hal_smp/lib_hal_smp.vcxproj.filters branches/vs_jc/reactos/hal/lib_hal_up/ (with props) branches/vs_jc/reactos/hal/lib_hal_up/lib_hal_up.vcxproj branches/vs_jc/reactos/hal/lib_hal_up/lib_hal_up.vcxproj.filters branches/vs_jc/reactos/hal/minihal/ (with props) branches/vs_jc/reactos/hal/minihal/minihal.vcxproj branches/vs_jc/reactos/hal/minihal/minihal.vcxproj.filters branches/vs_jc/reactos/include/asm/asm.vcxproj branches/vs_jc/reactos/include/asm/asm.vcxproj.filters branches/vs_jc/reactos/include/psdk/build/ (with props) branches/vs_jc/reactos/include/psdk/build/x86_32/ (with props) branches/vs_jc/reactos/include/psdk/build/x86_32/Debug/ (with props) branches/vs_jc/reactos/include/psdk/psdk.vcxproj branches/vs_jc/reactos/include/psdk/psdk.vcxproj.filters branches/vs_jc/reactos/include/reactos/mc/mc.vcxproj branches/vs_jc/reactos/include/reactos/mc/mc.vcxproj.filters branches/vs_jc/reactos/lib/3rdparty/zlib/zlib.vcxproj branches/vs_jc/reactos/lib/3rdparty/zlib/zlib.vcxproj.filters branches/vs_jc/reactos/lib/cmlib/cmlib.vcxproj branches/vs_jc/reactos/lib/cmlib/cmlib.vcxproj.filters branches/vs_jc/reactos/lib/cmlibhost/ (with props) branches/vs_jc/reactos/lib/cmlibhost/cmlibhost.vcxproj branches/vs_jc/reactos/lib/cmlibhost/cmlibhost.vcxproj.filters branches/vs_jc/reactos/lib/cportlib/cportlib.vcxproj branches/vs_jc/reactos/lib/cportlib/cportlib.vcxproj.filters branches/vs_jc/reactos/lib/drivers/csq/csq.vcxproj branches/vs_jc/reactos/lib/drivers/csq/csq.vcxproj.filters branches/vs_jc/reactos/lib/import/ (with props) branches/vs_jc/reactos/lib/import/HAL/ (with props) branches/vs_jc/reactos/lib/import/HAL/HAL.vcxproj branches/vs_jc/reactos/lib/import/HAL/HAL.vcxproj.filters branches/vs_jc/reactos/lib/import/bootvid/ (with props) branches/vs_jc/reactos/lib/import/bootvid/bootvid.vcxproj branches/vs_jc/reactos/lib/import/bootvid/bootvid.vcxproj.filters branches/vs_jc/reactos/lib/import/kdcom/ (with props) branches/vs_jc/reactos/lib/import/kdcom/kdcom.vcxproj branches/vs_jc/reactos/lib/import/kdcom/kdcom.vcxproj.filters branches/vs_jc/reactos/lib/import/kernel32/ (with props) branches/vs_jc/reactos/lib/import/kernel32/kernel32.vcxproj branches/vs_jc/reactos/lib/import/kernel32/kernel32.vcxproj.filters branches/vs_jc/reactos/lib/import/ntoskrnl/ (with props) branches/vs_jc/reactos/lib/import/ntoskrnl/ntoskrnl.vcxproj branches/vs_jc/reactos/lib/import/ntoskrnl/ntoskrnl.vcxproj.filters branches/vs_jc/reactos/lib/inflib/inflib.vcxproj branches/vs_jc/reactos/lib/inflib/inflib.vcxproj.filters branches/vs_jc/reactos/lib/inflibhost/ (with props) branches/vs_jc/reactos/lib/inflibhost/inflibhost.vcxproj branches/vs_jc/reactos/lib/inflibhost/inflibhost.vcxproj.filters branches/vs_jc/reactos/lib/pseh/pseh.vcxproj branches/vs_jc/reactos/lib/pseh/pseh.vcxproj.filters branches/vs_jc/reactos/lib/rossym/rossym.vcxproj branches/vs_jc/reactos/lib/rossym/rossym.vcxproj.filters branches/vs_jc/reactos/lib/rtl/rtl.vcxproj branches/vs_jc/reactos/lib/rtl/rtl.vcxproj.filters branches/vs_jc/reactos/lib/sdk/crt/crt.vcxproj branches/vs_jc/reactos/lib/sdk/crt/crt.vcxproj.filters branches/vs_jc/reactos/lib/sdk/crt/libcntpr/ (with props) branches/vs_jc/reactos/lib/sdk/crt/libcntpr/libcntpr.vcxproj branches/vs_jc/reactos/lib/sdk/crt/libcntpr/libcntpr.vcxproj.filters branches/vs_jc/reactos/lib/sdk/ioevent/ioevent.vcxproj branches/vs_jc/reactos/lib/sdk/ioevent/ioevent.vcxproj.filters branches/vs_jc/reactos/lib/sdk/wdmguid/wdmguid.vcxproj branches/vs_jc/reactos/lib/sdk/wdmguid/wdmguid.vcxproj.filters branches/vs_jc/reactos/ntdllsys/ (with props) branches/vs_jc/reactos/ntdllsys/ntdllsys.vcxproj branches/vs_jc/reactos/ntdllsys/ntdllsys.vcxproj.filters branches/vs_jc/reactos/ntkrnlmp/ (with props) branches/vs_jc/reactos/ntkrnlmp/ntkrnlmp.vcxproj branches/vs_jc/reactos/ntkrnlmp/ntkrnlmp.vcxproj.filters branches/vs_jc/reactos/ntoskrnl/ntoskrnl.vcxproj branches/vs_jc/reactos/ntoskrnl/ntoskrnl.vcxproj.filters branches/vs_jc/reactos/subsystems/ntvdm/ntvdm.vcxproj branches/vs_jc/reactos/subsystems/ntvdm/ntvdm.vcxproj.filters branches/vs_jc/reactos/subsystems/win/basesrv/basesrv.vcxproj branches/vs_jc/reactos/subsystems/win/basesrv/basesrv.vcxproj.filters branches/vs_jc/reactos/subsystems/win32/csrsrv/csrsrv.vcxproj branches/vs_jc/reactos/subsystems/win32/csrsrv/csrsrv.vcxproj.filters branches/vs_jc/reactos/subsystems/win32/csrss/csrss.vcxproj branches/vs_jc/reactos/subsystems/win32/csrss/csrss.vcxproj.filters branches/vs_jc/reactos/tools/bin2c/ (with props) branches/vs_jc/reactos/tools/bin2c/bin2c.vcxproj branches/vs_jc/reactos/tools/bin2c/bin2c.vcxproj.filters branches/vs_jc/reactos/tools/cabman/cabman.vcxproj branches/vs_jc/reactos/tools/cabman/cabman.vcxproj.filters branches/vs_jc/reactos/tools/cdmake/cdmake.vcxproj branches/vs_jc/reactos/tools/cdmake/cdmake.vcxproj.filters branches/vs_jc/reactos/tools/create_nls/create_nls.vcxproj branches/vs_jc/reactos/tools/create_nls/create_nls.vcxproj.filters branches/vs_jc/reactos/tools/geninc/geninc.vcxproj branches/vs_jc/reactos/tools/geninc/geninc.vcxproj.filters branches/vs_jc/reactos/tools/hpp/hpp.vcxproj branches/vs_jc/reactos/tools/hpp/hpp.vcxproj.filters branches/vs_jc/reactos/tools/kbdtool/kbdtool.vcxproj branches/vs_jc/reactos/tools/kbdtool/kbdtool.vcxproj.filters branches/vs_jc/reactos/tools/log2lines/log2lines.vcxproj branches/vs_jc/reactos/tools/log2lines/log2lines.vcxproj.filters branches/vs_jc/reactos/tools/mkhive/mkhive.vcxproj branches/vs_jc/reactos/tools/mkhive/mkhive.vcxproj.filters branches/vs_jc/reactos/tools/mkshelllink/mkshelllink.vcxproj branches/vs_jc/reactos/tools/mkshelllink/mkshelllink.vcxproj.filters branches/vs_jc/reactos/tools/ms2ps/ms2ps.vcxproj branches/vs_jc/reactos/tools/ms2ps/ms2ps.vcxproj.filters branches/vs_jc/reactos/tools/nandflash/nandflash.vcxproj branches/vs_jc/reactos/tools/nandflash/nandflash.vcxproj.filters branches/vs_jc/reactos/tools/obj2bin/obj2bin.vcxproj branches/vs_jc/reactos/tools/obj2bin/obj2bin.vcxproj.filters branches/vs_jc/reactos/tools/ofw_interface/ofw_interface.vcxproj branches/vs_jc/reactos/tools/ofw_interface/ofw_interface.vcxproj.filters branches/vs_jc/reactos/tools/pipetools/pipetools.vcxproj branches/vs_jc/reactos/tools/pipetools/pipetools.vcxproj.filters branches/vs_jc/reactos/tools/regtests2xml/regtests2xml.vcxproj branches/vs_jc/reactos/tools/regtests2xml/regtests2xml.vcxproj.filters branches/vs_jc/reactos/tools/rgenstat/rgenstat.vcxproj branches/vs_jc/reactos/tools/rgenstat/rgenstat.vcxproj.filters branches/vs_jc/reactos/tools/rsym/rsym.vcxproj branches/vs_jc/reactos/tools/rsym/rsym.vcxproj.filters branches/vs_jc/reactos/tools/spec2def/spec2def.vcxproj branches/vs_jc/reactos/tools/spec2def/spec2def.vcxproj.filters branches/vs_jc/reactos/tools/unicode/unicode.vcxproj branches/vs_jc/reactos/tools/unicode/unicode.vcxproj.filters branches/vs_jc/reactos/tools/utf16le/utf16le.vcxproj branches/vs_jc/reactos/tools/utf16le/utf16le.vcxproj.filters branches/vs_jc/reactos/tools/widl/widl.vcxproj branches/vs_jc/reactos/tools/widl/widl.vcxproj.filters branches/vs_jc/reactos/tools/wpp/wpp.vcxproj branches/vs_jc/reactos/tools/wpp/wpp.vcxproj.filters Modified: branches/vs_jc/reactos/boot/freeldr/freeldr/windows/winldr.c [This mail would be too long, it was shortened to contain the URLs only.] Added: 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… Added: branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/_IMAGES/CD_Live/C… Added: branches/vs_jc/reactos/_IMAGES/DUMMY.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/_IMAGES/DUMMY.txt… Added: branches/vs_jc/reactos/base/applications/atactl/atactl.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Added: branches/vs_jc/reactos/base/applications/atactl/atactl.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Added: branches/vs_jc/reactos/base/shell/cmd/cmd.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Added: branches/vs_jc/reactos/base/shell/cmd/cmd.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Added: branches/vs_jc/reactos/base/shell/explorer-new/explorer-new.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/explor… Added: branches/vs_jc/reactos/base/shell/explorer-new/explorer-new.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/explor… Added: branches/vs_jc/reactos/base/system/lsass/lsass.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/lsass… Added: branches/vs_jc/reactos/base/system/lsass/lsass.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/lsass… Added: branches/vs_jc/reactos/base/system/services/services.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/servi… Added: branches/vs_jc/reactos/base/system/services/services.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/servi… Added: branches/vs_jc/reactos/base/system/smss/smss.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/smss/… Added: branches/vs_jc/reactos/base/system/smss/smss.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/smss/… Added: branches/vs_jc/reactos/base/system/userinit/userinit.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/useri… Added: branches/vs_jc/reactos/base/system/userinit/userinit.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/useri… Added: branches/vs_jc/reactos/base/system/winlogon/winlogon.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/winlo… Added: branches/vs_jc/reactos/base/system/winlogon/winlogon.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/system/winlo… Added: branches/vs_jc/reactos/boot/freeldr/bootsect/bootsect.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/boot… Added: branches/vs_jc/reactos/boot/freeldr/bootsect/bootsect.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/boot… Added: branches/vs_jc/reactos/boot/freeldr/fdebug/fdebug.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/fdeb… Added: branches/vs_jc/reactos/boot/freeldr/fdebug/fdebug.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/fdeb… Added: branches/vs_jc/reactos/boot/freeldr/freeldr/freeldr.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/free… Added: branches/vs_jc/reactos/boot/freeldr/freeldr/freeldr.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/free… Modified: branches/vs_jc/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/free… Added: branches/vs_jc/reactos/boot/freeldr/install/install.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/inst… Added: branches/vs_jc/reactos/boot/freeldr/install/install.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/inst… Added: branches/vs_jc/reactos/boot/freeldr/tools/deptool/deptool.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/deptool/deptool.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/hosttype/hosttype.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/hosttype/hosttype.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/rcopy/rcopy.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/rcopy/rcopy.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/rdel/rdel.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/rdel/rdel.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/rmkdir/rmkdir.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/rmkdir/rmkdir.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/rrmdir/rrmdir.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/boot/freeldr/tools/rrmdir/rrmdir.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/tool… Added: branches/vs_jc/reactos/dll/ntdll/ntdll.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/ntdll/ntdll.v… Added: branches/vs_jc/reactos/dll/ntdll/ntdll.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/ntdll/ntdll.v… Added: branches/vs_jc/reactos/dll/win32/kernel32/kernel32.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/kernel3… Added: branches/vs_jc/reactos/dll/win32/kernel32/kernel32.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/kernel3… Added: branches/vs_jc/reactos/drivers/base/beep/beep.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/beep… Added: branches/vs_jc/reactos/drivers/base/beep/beep.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/beep… Added: branches/vs_jc/reactos/drivers/base/bootvid/bootvid.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/boot… Added: branches/vs_jc/reactos/drivers/base/bootvid/bootvid.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/boot… Added: branches/vs_jc/reactos/drivers/base/kdcom/kdcom.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/kdco… Added: branches/vs_jc/reactos/drivers/base/kdcom/kdcom.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/kdco… Added: branches/vs_jc/reactos/drivers/base/kdrosdbg/kdrosdbg.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/kdro… Added: branches/vs_jc/reactos/drivers/base/kdrosdbg/kdrosdbg.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/kdro… Added: branches/vs_jc/reactos/drivers/base/nmidebug/nmidebug.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/nmid… Added: branches/vs_jc/reactos/drivers/base/nmidebug/nmidebug.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/nmid… Added: branches/vs_jc/reactos/drivers/base/null/null.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/null… Added: branches/vs_jc/reactos/drivers/base/null/null.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/base/null… Added: branches/vs_jc/reactos/drivers/battery/battc/battc.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/battery/b… Added: branches/vs_jc/reactos/drivers/battery/battc/battc.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/battery/b… Added: branches/vs_jc/reactos/drivers/bluetooth/fbtusb/fbtusb.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bluetooth… Added: branches/vs_jc/reactos/drivers/bluetooth/fbtusb/fbtusb.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bluetooth… Added: branches/vs_jc/reactos/drivers/bus/isapnp/isapnp.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/isapn… Added: branches/vs_jc/reactos/drivers/bus/isapnp/isapnp.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/isapn… Added: branches/vs_jc/reactos/drivers/bus/pci/pci.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/pci/p… Added: branches/vs_jc/reactos/drivers/bus/pci/pci.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/pci/p… Added: branches/vs_jc/reactos/drivers/bus/pcix/pcix.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/pcix/… Added: branches/vs_jc/reactos/drivers/bus/pcix/pcix.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/pcix/… Added: branches/vs_jc/reactos/drivers/bus/pcmcia/pcmcia.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/pcmci… Added: branches/vs_jc/reactos/drivers/bus/pcmcia/pcmcia.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/pcmci… Added: branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/filesyste… Added: branches/vs_jc/reactos/drivers/filesystems/cdfs/cdfs.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/filesyste… Added: branches/vs_jc/reactos/hal/hal.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/hal.vcxproj?r… Added: branches/vs_jc/reactos/hal/hal.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/hal.vcxproj.f… Added: branches/vs_jc/reactos/hal/halaacpi/halaacpi.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halaacpi/hala… Added: branches/vs_jc/reactos/hal/halaacpi/halaacpi.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halaacpi/hala… Added: branches/vs_jc/reactos/hal/halacpi/halacpi.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halacpi/halac… Added: branches/vs_jc/reactos/hal/halacpi/halacpi.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halacpi/halac… Added: branches/vs_jc/reactos/hal/halapic/halapic.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halapic/halap… Added: branches/vs_jc/reactos/hal/halapic/halapic.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halapic/halap… Added: branches/vs_jc/reactos/hal/halmaapic/halmaapic.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halmaapic/hal… Added: branches/vs_jc/reactos/hal/halmaapic/halmaapic.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halmaapic/hal… Added: branches/vs_jc/reactos/hal/halmacpi/halmacpi.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halmacpi/halm… Added: branches/vs_jc/reactos/hal/halmacpi/halmacpi.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halmacpi/halm… Added: branches/vs_jc/reactos/hal/halmapic/halmapic.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halmapic/halm… Added: branches/vs_jc/reactos/hal/halmapic/halmapic.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halmapic/halm… Added: branches/vs_jc/reactos/hal/halmps/halmps.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halmps/halmps… Added: branches/vs_jc/reactos/hal/halmps/halmps.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/halmps/halmps… Added: branches/vs_jc/reactos/hal/lib_hal_acpi/lib_hal_acpi.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_acpi/… Added: branches/vs_jc/reactos/hal/lib_hal_acpi/lib_hal_acpi.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_acpi/… Added: branches/vs_jc/reactos/hal/lib_hal_apic/lib_hal_apic.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_apic/… Added: branches/vs_jc/reactos/hal/lib_hal_apic/lib_hal_apic.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_apic/… Added: branches/vs_jc/reactos/hal/lib_hal_generic/lib_hal_generic.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_gener… Added: branches/vs_jc/reactos/hal/lib_hal_generic/lib_hal_generic.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_gener… Added: branches/vs_jc/reactos/hal/lib_hal_legacy/lib_hal_legacy.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_legac… Added: branches/vs_jc/reactos/hal/lib_hal_legacy/lib_hal_legacy.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_legac… Added: branches/vs_jc/reactos/hal/lib_hal_pic/lib_hal_pic.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_pic/l… Added: branches/vs_jc/reactos/hal/lib_hal_pic/lib_hal_pic.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_pic/l… Added: branches/vs_jc/reactos/hal/lib_hal_smp/lib_hal_smp.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_smp/l… Added: branches/vs_jc/reactos/hal/lib_hal_smp/lib_hal_smp.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_smp/l… Added: branches/vs_jc/reactos/hal/lib_hal_up/lib_hal_up.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_up/li… Added: branches/vs_jc/reactos/hal/lib_hal_up/lib_hal_up.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/lib_hal_up/li… Added: branches/vs_jc/reactos/hal/minihal/minihal.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/minihal/minih… Added: branches/vs_jc/reactos/hal/minihal/minihal.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/hal/minihal/minih… Added: branches/vs_jc/reactos/include/asm/asm.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/asm/asm.v… Added: branches/vs_jc/reactos/include/asm/asm.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/asm/asm.v… Added: branches/vs_jc/reactos/include/psdk/psdk.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/psdk… Added: branches/vs_jc/reactos/include/psdk/psdk.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/psdk… Added: branches/vs_jc/reactos/include/reactos/mc/mc.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/reactos/m… Added: branches/vs_jc/reactos/include/reactos/mc/mc.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/reactos/m… Added: branches/vs_jc/reactos/lib/3rdparty/zlib/zlib.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/3rdparty/zlib… Added: branches/vs_jc/reactos/lib/3rdparty/zlib/zlib.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/3rdparty/zlib… Added: branches/vs_jc/reactos/lib/cmlib/cmlib.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/cmlib/cmlib.v… Added: branches/vs_jc/reactos/lib/cmlib/cmlib.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/cmlib/cmlib.v… Added: branches/vs_jc/reactos/lib/cmlibhost/cmlibhost.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/cmlibhost/cml… Added: branches/vs_jc/reactos/lib/cmlibhost/cmlibhost.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/cmlibhost/cml… Added: branches/vs_jc/reactos/lib/cportlib/cportlib.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/cportlib/cpor… Added: branches/vs_jc/reactos/lib/cportlib/cportlib.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/cportlib/cpor… Added: branches/vs_jc/reactos/lib/drivers/csq/csq.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/drivers/csq/c… Added: branches/vs_jc/reactos/lib/drivers/csq/csq.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/drivers/csq/c… Added: branches/vs_jc/reactos/lib/import/HAL/HAL.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/HAL/HA… Added: branches/vs_jc/reactos/lib/import/HAL/HAL.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/HAL/HA… Added: branches/vs_jc/reactos/lib/import/bootvid/bootvid.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/bootvi… Added: branches/vs_jc/reactos/lib/import/bootvid/bootvid.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/bootvi… Added: branches/vs_jc/reactos/lib/import/kdcom/kdcom.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/kdcom/… Added: branches/vs_jc/reactos/lib/import/kdcom/kdcom.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/kdcom/… Added: branches/vs_jc/reactos/lib/import/kernel32/kernel32.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/kernel… Added: branches/vs_jc/reactos/lib/import/kernel32/kernel32.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/kernel… Added: branches/vs_jc/reactos/lib/import/ntoskrnl/ntoskrnl.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/ntoskr… Added: branches/vs_jc/reactos/lib/import/ntoskrnl/ntoskrnl.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/import/ntoskr… Added: branches/vs_jc/reactos/lib/inflib/inflib.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/inflib/inflib… Added: branches/vs_jc/reactos/lib/inflib/inflib.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/inflib/inflib… Added: branches/vs_jc/reactos/lib/inflibhost/inflibhost.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/inflibhost/in… Added: branches/vs_jc/reactos/lib/inflibhost/inflibhost.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/inflibhost/in… Added: branches/vs_jc/reactos/lib/pseh/pseh.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/pseh/pseh.vcx… Added: branches/vs_jc/reactos/lib/pseh/pseh.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/pseh/pseh.vcx… Added: branches/vs_jc/reactos/lib/rossym/rossym.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/rossym/rossym… Added: branches/vs_jc/reactos/lib/rossym/rossym.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/rossym/rossym… Added: branches/vs_jc/reactos/lib/rtl/rtl.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/rtl/rtl.vcxpr… Added: branches/vs_jc/reactos/lib/rtl/rtl.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/rtl/rtl.vcxpr… Added: branches/vs_jc/reactos/lib/sdk/crt/crt.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/crt/crt.v… Added: branches/vs_jc/reactos/lib/sdk/crt/crt.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/crt/crt.v… Added: branches/vs_jc/reactos/lib/sdk/crt/libcntpr/libcntpr.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/crt/libcn… Added: branches/vs_jc/reactos/lib/sdk/crt/libcntpr/libcntpr.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/crt/libcn… Added: branches/vs_jc/reactos/lib/sdk/ioevent/ioevent.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/ioevent/i… Added: branches/vs_jc/reactos/lib/sdk/ioevent/ioevent.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/ioevent/i… Added: branches/vs_jc/reactos/lib/sdk/wdmguid/wdmguid.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/wdmguid/w… Added: branches/vs_jc/reactos/lib/sdk/wdmguid/wdmguid.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/wdmguid/w… Added: branches/vs_jc/reactos/ntdllsys/ntdllsys.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntdllsys/ntdllsys… Added: branches/vs_jc/reactos/ntdllsys/ntdllsys.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntdllsys/ntdllsys… Added: branches/vs_jc/reactos/ntkrnlmp/ntkrnlmp.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntkrnlmp/ntkrnlmp… Added: branches/vs_jc/reactos/ntkrnlmp/ntkrnlmp.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntkrnlmp/ntkrnlmp… Added: branches/vs_jc/reactos/ntoskrnl/ntoskrnl.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntoskrnl/ntoskrnl… Added: branches/vs_jc/reactos/ntoskrnl/ntoskrnl.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntoskrnl/ntoskrnl… Added: branches/vs_jc/reactos/subsystems/ntvdm/ntvdm.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/subsystems/ntvdm/… Added: branches/vs_jc/reactos/subsystems/ntvdm/ntvdm.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/subsystems/ntvdm/… Added: branches/vs_jc/reactos/subsystems/win/basesrv/basesrv.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/subsystems/win/ba… Added: branches/vs_jc/reactos/subsystems/win/basesrv/basesrv.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/subsystems/win/ba… Added: branches/vs_jc/reactos/subsystems/win32/csrsrv/csrsrv.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/subsystems/win32/… Added: branches/vs_jc/reactos/subsystems/win32/csrsrv/csrsrv.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/subsystems/win32/… Added: branches/vs_jc/reactos/subsystems/win32/csrss/csrss.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/subsystems/win32/… Added: branches/vs_jc/reactos/subsystems/win32/csrss/csrss.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/subsystems/win32/… Added: branches/vs_jc/reactos/tools/bin2c/bin2c.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/bin2c/bin2c… Added: branches/vs_jc/reactos/tools/bin2c/bin2c.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/bin2c/bin2c… Added: branches/vs_jc/reactos/tools/cabman/cabman.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/cabman/cabm… Added: branches/vs_jc/reactos/tools/cabman/cabman.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/cabman/cabm… Added: branches/vs_jc/reactos/tools/cdmake/cdmake.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/cdmake/cdma… Added: branches/vs_jc/reactos/tools/cdmake/cdmake.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/cdmake/cdma… Added: branches/vs_jc/reactos/tools/create_nls/create_nls.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/create_nls/… Added: branches/vs_jc/reactos/tools/create_nls/create_nls.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/create_nls/… Added: branches/vs_jc/reactos/tools/geninc/geninc.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/geninc/geni… Added: branches/vs_jc/reactos/tools/geninc/geninc.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/geninc/geni… Added: branches/vs_jc/reactos/tools/hpp/hpp.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/hpp/hpp.vcx… Added: branches/vs_jc/reactos/tools/hpp/hpp.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/hpp/hpp.vcx… Added: branches/vs_jc/reactos/tools/kbdtool/kbdtool.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/kbdtool/kbd… Added: branches/vs_jc/reactos/tools/kbdtool/kbdtool.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/kbdtool/kbd… Added: branches/vs_jc/reactos/tools/log2lines/log2lines.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/log2lines/l… Added: branches/vs_jc/reactos/tools/log2lines/log2lines.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/log2lines/l… Added: branches/vs_jc/reactos/tools/mkhive/mkhive.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/mkhive/mkhi… Added: branches/vs_jc/reactos/tools/mkhive/mkhive.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/mkhive/mkhi… Added: branches/vs_jc/reactos/tools/mkshelllink/mkshelllink.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/mkshelllink… Added: branches/vs_jc/reactos/tools/mkshelllink/mkshelllink.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/mkshelllink… Added: branches/vs_jc/reactos/tools/ms2ps/ms2ps.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/ms2ps/ms2ps… Added: branches/vs_jc/reactos/tools/ms2ps/ms2ps.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/ms2ps/ms2ps… Added: branches/vs_jc/reactos/tools/nandflash/nandflash.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/nandflash/n… Added: branches/vs_jc/reactos/tools/nandflash/nandflash.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/nandflash/n… Added: branches/vs_jc/reactos/tools/obj2bin/obj2bin.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/obj2bin/obj… Added: branches/vs_jc/reactos/tools/obj2bin/obj2bin.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/obj2bin/obj… Added: branches/vs_jc/reactos/tools/ofw_interface/ofw_interface.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/ofw_interfa… Added: branches/vs_jc/reactos/tools/ofw_interface/ofw_interface.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/ofw_interfa… Added: branches/vs_jc/reactos/tools/pipetools/pipetools.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/pipetools/p… Added: branches/vs_jc/reactos/tools/pipetools/pipetools.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/pipetools/p… Added: branches/vs_jc/reactos/tools/regtests2xml/regtests2xml.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/regtests2xm… Added: branches/vs_jc/reactos/tools/regtests2xml/regtests2xml.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/regtests2xm… Added: branches/vs_jc/reactos/tools/rgenstat/rgenstat.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/rgenstat/rg… Added: branches/vs_jc/reactos/tools/rgenstat/rgenstat.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/rgenstat/rg… Added: branches/vs_jc/reactos/tools/rsym/rsym.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/rsym/rsym.v… Added: branches/vs_jc/reactos/tools/rsym/rsym.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/rsym/rsym.v… Added: branches/vs_jc/reactos/tools/spec2def/spec2def.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/spec2def/sp… Added: branches/vs_jc/reactos/tools/spec2def/spec2def.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/spec2def/sp… Added: branches/vs_jc/reactos/tools/unicode/unicode.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/unicode/uni… Added: branches/vs_jc/reactos/tools/unicode/unicode.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/unicode/uni… Added: branches/vs_jc/reactos/tools/utf16le/utf16le.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/utf16le/utf… Added: branches/vs_jc/reactos/tools/utf16le/utf16le.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/utf16le/utf… Added: branches/vs_jc/reactos/tools/widl/widl.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/widl/widl.v… Added: branches/vs_jc/reactos/tools/widl/widl.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/widl/widl.v… Added: branches/vs_jc/reactos/tools/wpp/wpp.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/wpp/wpp.vcx… Added: branches/vs_jc/reactos/tools/wpp/wpp.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/wpp/wpp.vcx…

11 years, 6 months

[jjones] 59329: Merge with trunk.

by jjones＠svn.reactos.org

Author: jjones Date: Mon Jun 24 04:01:33 2013 New Revision: 59329 URL: http://svn.reactos.org/svn/reactos?rev=59329&view=rev Log: Merge with trunk. Added: branches/vs_jc/reactos/dll/directx/dxgi/ - copied from r59328, trunk/reactos/dll/directx/dxgi/ branches/vs_jc/reactos/dll/win32/mshtml/msvc.S - copied unchanged from r59328, trunk/reactos/dll/win32/mshtml/msvc.S branches/vs_jc/reactos/dll/win32/samsrv/security.c - copied unchanged from r59328, trunk/reactos/dll/win32/samsrv/security.c branches/vs_jc/reactos/dll/win32/wbemprox/ - copied from r59328, trunk/reactos/dll/win32/wbemprox/ branches/vs_jc/reactos/include/psdk/d3d10.idl - copied unchanged from r59328, trunk/reactos/include/psdk/d3d10.idl branches/vs_jc/reactos/include/psdk/d3d10effect.h - copied unchanged from r59328, trunk/reactos/include/psdk/d3d10effect.h branches/vs_jc/reactos/include/psdk/d3d10misc.h - copied unchanged from r59328, trunk/reactos/include/psdk/d3d10misc.h branches/vs_jc/reactos/include/psdk/d3d10shader.h - copied unchanged from r59328, trunk/reactos/include/psdk/d3d10shader.h branches/vs_jc/reactos/include/psdk/d3dcommon.idl - copied unchanged from r59328, trunk/reactos/include/psdk/d3dcommon.idl branches/vs_jc/reactos/include/psdk/dxgi.idl - copied unchanged from r59328, trunk/reactos/include/psdk/dxgi.idl branches/vs_jc/reactos/include/psdk/dxgiformat.h - copied unchanged from r59328, trunk/reactos/include/psdk/dxgiformat.h branches/vs_jc/reactos/include/psdk/dxgitype.h - copied unchanged from r59328, trunk/reactos/include/psdk/dxgitype.h branches/vs_jc/reactos/include/psdk/wbemprov.idl - copied unchanged from r59328, trunk/reactos/include/psdk/wbemprov.idl branches/vs_jc/reactos/include/reactos/wine/winedxgi.idl - copied unchanged from r59328, trunk/reactos/include/reactos/wine/winedxgi.idl branches/vs_jc/reactos/win32ss/user/consrv/condrv/coninput.c - copied unchanged from r59328, trunk/reactos/win32ss/user/consrv/condrv/coninput.c branches/vs_jc/reactos/win32ss/user/consrv/condrv/conoutput.c - copied unchanged from r59328, trunk/reactos/win32ss/user/consrv/condrv/conoutput.c branches/vs_jc/reactos/win32ss/user/consrv/condrv/text.c - copied unchanged from r59328, trunk/reactos/win32ss/user/consrv/condrv/text.c Removed: branches/vs_jc/reactos/win32ss/user/consrv/text.c Modified: branches/vs_jc/reactos/ (props changed) branches/vs_jc/reactos/boot/bootdata/packages/reactos.dff.in branches/vs_jc/reactos/cmake/CMakeMacros.cmake branches/vs_jc/reactos/dll/directx/CMakeLists.txt branches/vs_jc/reactos/dll/win32/CMakeLists.txt branches/vs_jc/reactos/dll/win32/mshtml/CMakeLists.txt branches/vs_jc/reactos/dll/win32/mshtml/ifacewrap.c branches/vs_jc/reactos/dll/win32/samsrv/CMakeLists.txt branches/vs_jc/reactos/dll/win32/samsrv/database.c branches/vs_jc/reactos/dll/win32/samsrv/samsrv.c branches/vs_jc/reactos/dll/win32/samsrv/samsrv.h branches/vs_jc/reactos/dll/win32/samsrv/samsrv.spec branches/vs_jc/reactos/dll/win32/samsrv/setup.c branches/vs_jc/reactos/include/psdk/CMakeLists.txt branches/vs_jc/reactos/include/psdk/ipifcons.h branches/vs_jc/reactos/include/psdk/iptypes.h branches/vs_jc/reactos/include/psdk/wbemcli.idl branches/vs_jc/reactos/include/psdk/winternl.h branches/vs_jc/reactos/include/reactos/wine/CMakeLists.txt branches/vs_jc/reactos/media/doc/README.WINE branches/vs_jc/reactos/media/inf/syssetup.inf branches/vs_jc/reactos/ntoskrnl/se/token.c branches/vs_jc/reactos/tools/widl/header.c branches/vs_jc/reactos/win32ss/user/consrv/CMakeLists.txt branches/vs_jc/reactos/win32ss/user/consrv/condrv/console.c branches/vs_jc/reactos/win32ss/user/consrv/coninput.c branches/vs_jc/reactos/win32ss/user/consrv/conoutput.c branches/vs_jc/reactos/win32ss/user/consrv/conoutput.h branches/vs_jc/reactos/win32ss/user/consrv/console.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/vs_jc/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/bootdata/pac… Modified: branches/vs_jc/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/cmake/CMakeMacros… Modified: branches/vs_jc/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/directx/CMake… Modified: branches/vs_jc/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/CMakeLi… Modified: branches/vs_jc/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/mshtml/… Modified: branches/vs_jc/reactos/dll/win32/mshtml/ifacewrap.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/mshtml/… Modified: branches/vs_jc/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/… Modified: branches/vs_jc/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/… Modified: branches/vs_jc/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/… Modified: branches/vs_jc/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/… Modified: branches/vs_jc/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/… Modified: branches/vs_jc/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/samsrv/… Modified: branches/vs_jc/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/CMak… Modified: branches/vs_jc/reactos/include/psdk/ipifcons.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/ipif… Modified: branches/vs_jc/reactos/include/psdk/iptypes.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/ipty… Modified: branches/vs_jc/reactos/include/psdk/wbemcli.idl URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/wbem… Modified: branches/vs_jc/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/psdk/wint… Modified: branches/vs_jc/reactos/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/reactos/w… Modified: branches/vs_jc/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/media/doc/README.… Modified: branches/vs_jc/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/media/inf/syssetu… Modified: branches/vs_jc/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntoskrnl/se/token… Modified: branches/vs_jc/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/tools/widl/header… Modified: branches/vs_jc/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Removed: branches/vs_jc/reactos/win32ss/user/consrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons…

11 years, 6 months

[aandrejevic] 59328: [NTOSKRNL] Check for old-style MZ executable in PeFmtCreateSection. [NTVDM] Fix bugs. Implement MZ executable loading.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Jun 24 01:59:09 2013 New Revision: 59328 URL: http://svn.reactos.org/svn/reactos?rev=59328&view=rev Log: [NTOSKRNL] Check for old-style MZ executable in PeFmtCreateSection. [NTVDM] Fix bugs. Implement MZ executable loading. Modified: branches/ntvdm/ntoskrnl/mm/section.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/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/mm/section.c?rev… ============================================================================== --- branches/ntvdm/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/ntvdm/ntoskrnl/mm/section.c [iso-8859-1] Mon Jun 24 01:59:09 2013 @@ -236,6 +236,10 @@ /* no MZ signature */ if(pidhDosHeader->e_magic != IMAGE_DOS_SIGNATURE) DIE(("No MZ signature found, e_magic is %hX\n", pidhDosHeader->e_magic)); + + /* check if this is an old MZ executable */ + if(pidhDosHeader->e_lfarlc < 0x40) + DIE(("Old-style MZ executable found, e_lfarlc is %d\n", pidhDosHeader->e_lfarlc)); /* not a Windows executable */ if(pidhDosHeader->e_lfanew <= 0) 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] Mon Jun 24 01:59:09 2013 @@ -320,7 +320,10 @@ LPSTR ProgramFilePath, Parameters[128]; CHAR CommandLineCopy[128]; INT ParamCount = 0; - WORD Segment, FileSize; + WORD i, Segment, FileSize, ExeSize; + PIMAGE_DOS_HEADER Header; + PDWORD RelocationTable; + PWORD RelocWord; /* Save a copy of the command line */ strcpy(CommandLineCopy, CommandLine); @@ -366,8 +369,64 @@ { /* EXE file */ - // TODO: NOT IMPLEMENTED - DisplayMessage(L"EXE files are not yet supported!"); + /* Get the MZ header */ + Header = (PIMAGE_DOS_HEADER)Address; + + // TODO: Verify checksum and executable! + + /* Get the base size of the file, in paragraphs (rounded up) */ + ExeSize = (((Header->e_cp - 1) << 8) + Header->e_cblp + 0x0F) >> 4; + + /* Loop from the maximum to the minimum number of extra paragraphs */ + for (i = Header->e_maxalloc; i >= Header->e_minalloc; i--) + { + /* Try to allocate that much memory */ + Segment = DosAllocateMemory(ExeSize + (sizeof(DOS_PSP) >> 4) + i); + if (Segment != 0) break; + } + + /* Check if at least the lowest allocation was successful */ + if (Segment == 0) goto Cleanup; + + /* Initialize the PSP */ + DosInitializePsp(Segment, + CommandLine, ExeSize + (sizeof(DOS_PSP) >> 4) + i, + EnvBlock); + + /* Copy the program to Segment:0100 */ + RtlCopyMemory((PVOID)((ULONG_PTR)BaseAddress + + TO_LINEAR(Segment, 0x100)), + Address + (Header->e_cparhdr << 4), + FileSize - (Header->e_cparhdr << 4)); + + /* Get the relocation table */ + RelocationTable = (PDWORD)(Address + Header->e_lfarlc); + + /* Perform relocations */ + for (i = 0; i < Header->e_crlc; i++) + { + /* Get a pointer to the word that needs to be patched */ + RelocWord = (PWORD)((ULONG_PTR)BaseAddress + + TO_LINEAR(Segment + HIWORD(RelocationTable[i]), + 0x100 + LOWORD(RelocationTable[i]))); + + /* Add the number of the EXE segment to it */ + *RelocWord += Segment + (sizeof(DOS_PSP) >> 4); + } + + /* Set the initial segment registers */ + EmulatorSetRegister(EMULATOR_REG_DS, Segment); + EmulatorSetRegister(EMULATOR_REG_ES, Segment); + + /* Set the stack to the location from the header */ + EmulatorSetStack(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss, + Header->e_sp); + + /* Execute */ + CurrentPsp = Segment; + EmulatorExecute(Segment + Header->e_cs, sizeof(DOS_PSP) + Header->e_ip); + + Success = TRUE; } else { 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] Mon Jun 24 01:59:09 2013 @@ -254,25 +254,25 @@ ULONG EmulatorGetRegister(ULONG Register) { + if (Register < EMULATOR_REG_ES) + { + return EmulatorContext.state->general_reg[Register].val; + } + else + { + return EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val; + } +} + +VOID EmulatorSetRegister(ULONG Register, ULONG Value) +{ if (Register < EMULATOR_REG_CS) { - return EmulatorContext.state->general_reg[Register].val; + EmulatorContext.state->general_reg[Register].val = Value; } else { - return EmulatorContext.state->segment_reg[(Register >> 3) - 1].val; - } -} - -VOID EmulatorSetRegister(ULONG Register, ULONG Value) -{ - if (Register < EMULATOR_REG_CS) - { - EmulatorContext.state->general_reg[Register].val = Value; - } - else - { - EmulatorContext.state->segment_reg[(Register >> 3) - 1].val = Value; + EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val = Value; } } 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] Mon Jun 24 01:59:09 2013 @@ -42,6 +42,7 @@ { /* Perform interrupt 0x23 */ EmulatorInterrupt(0x23); + break; } default: { @@ -124,9 +125,12 @@ } /* Continue CPU emulation */ - for (i = 0; i < STEPS_PER_CYCLE; i++) EmulatorStep(); + for (i = 0; (i < STEPS_PER_CYCLE) && VdmRunning; 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] Mon Jun 24 01:59:09 2013 @@ -102,12 +102,10 @@ EMULATOR_REG_DI, EMULATOR_REG_SP, EMULATOR_REG_BP, + EMULATOR_REG_ES, EMULATOR_REG_CS, EMULATOR_REG_SS, EMULATOR_REG_DS, - EMULATOR_REG_ES, - EMULATOR_REG_FS, - EMULATOR_REG_GS } EMULATOR_REGISTER; #pragma pack(push, 1)

11 years, 6 months

[hbelusca] 59327: Revert an unwanted change committed by error.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 23 23:22:38 2013 New Revision: 59327 URL: http://svn.reactos.org/svn/reactos?rev=59327&view=rev Log: Revert an unwanted change committed by error. Modified: trunk/reactos/win32ss/user/consrv/condrv/console.c Modified: trunk/reactos/win32ss/user/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/console.c [iso-8859-1] Sun Jun 23 23:22:38 2013 @@ -549,7 +549,7 @@ Console->TermIFace.Console = Console; /* Initialize the frontend AFTER having attached it to the console */ - DPRINT1("Finish initialization of frontend\n"); + DPRINT("Finish initialization of frontend\n"); Status = Console->TermIFace.Vtbl->InitFrontEnd(&Console->TermIFace, Console); if (!NT_SUCCESS(Status)) { @@ -565,9 +565,9 @@ /* Copy buffer contents to screen */ // FrontEnd.Draw(); // ConioDrawConsole(Console); - DPRINT1("Console drawn\n"); - - DPRINT1("Terminal FrontEnd initialization done\n"); + DPRINT("Console drawn\n"); + + DPRINT("Terminal FrontEnd initialization done\n"); return STATUS_SUCCESS; } @@ -584,7 +584,7 @@ /* Detach the frontend from the console */ RtlZeroMemory(&Console->TermIFace, sizeof(Console->TermIFace)); - DPRINT1("Terminal FrontEnd unregistered\n"); + DPRINT("Terminal FrontEnd unregistered\n"); return STATUS_SUCCESS; } @@ -597,28 +597,26 @@ * Forbid validation of any console by other threads * during the deletion of this console. */ - // ConDrvLockConsoleListExclusive(); - - // /* Check the existence of the console, and if it's ok, continue */ - // if (!ConDrvValidateConsolePointer(Console)) - // { - // /* Unlock the console list and return */ - // ConDrvUnlockConsoleList(); - // return; - // } - - // /* - // * If the console is already being destroyed - // * (thus not running), just return. - // */ - // if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) - // { - // /* Unlock the console list and return */ - // ConDrvUnlockConsoleList(); - // return; - // } - - if (!ConDrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) return; + ConDrvLockConsoleListExclusive(); + + /* Check the existence of the console, and if it's ok, continue */ + if (!ConDrvValidateConsolePointer(Console)) + { + /* Unlock the console list and return */ + ConDrvUnlockConsoleList(); + return; + } + + /* + * If the console is already being destroyed + * (thus not running), just return. + */ + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + { + /* Unlock the console list and return */ + ConDrvUnlockConsoleList(); + return; + } /* * We are about to be destroyed. Signal it to other people @@ -626,9 +624,6 @@ * they cannot longer validate the console. */ Console->State = CONSOLE_TERMINATING; - - /* We really delete the console. Reset the count to be sure. */ - Console->ReferenceCount = 0; /* * Allow other threads to finish their job: basically, unlock @@ -639,25 +634,14 @@ * can see that we are in fact already deleting the console. */ LeaveCriticalSection(&Console->Lock); - // ConDrvUnlockConsoleList(); + ConDrvUnlockConsoleList(); /* FIXME: Send a terminate message to all the processes owning this console */ - /* Close all the applications which are linked to this console */ - /* - * FIXME: Windows will wait up to 5 seconds for the thread to exit. - * We shouldn't wait here, though, since the console lock is entered. - * A copy of the thread list probably needs to be made. - */ - // ConDrvConsoleProcessCtrlEvent(Console, 0, CTRL_CLOSE_EVENT); - // DPRINT1("Apps closed\n"); - // FIXME: Be sure that, starting from here, there is NO app running - // on this console anymore !!!!! - /* Cleanup the UI-oriented part */ - DPRINT1("Deregister console\n"); + DPRINT("Deregister console\n"); ConDrvDeregisterFrontEnd(Console); - DPRINT1("Console deregistered\n"); + DPRINT("Console deregistered\n"); /*** * Check that the console is in terminating state before continuing @@ -665,36 +649,30 @@ * ...unless to cancel console deletion ?). ***/ - // ConDrvLockConsoleListExclusive(); - - // /* Re-check the existence of the console, and if it's ok, continue */ - // if (!ConDrvValidateConsolePointer(Console)) - // { - // /* Unlock the console list and return */ - // ConDrvUnlockConsoleList(); - // return; - // } - - // if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_TERMINATING, TRUE)) - // { - // ConDrvUnlockConsoleList(); - // return; - // } - - if (!ConDrvValidateConsole(Console, CONSOLE_TERMINATING, TRUE)) return; + ConDrvLockConsoleListExclusive(); + + /* Re-check the existence of the console, and if it's ok, continue */ + if (!ConDrvValidateConsolePointer(Console)) + { + /* Unlock the console list and return */ + ConDrvUnlockConsoleList(); + return; + } + + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_TERMINATING, TRUE)) + { + ConDrvUnlockConsoleList(); + return; + } /* We are now in destruction */ Console->State = CONSOLE_IN_DESTRUCTION; - ///////////////////// - ConDrvLockConsoleListExclusive(); - ///////////////////// - /* Remove the console from the list */ RemoveEntryList(&Console->Entry); - /* Unlock the console list */ - ConDrvUnlockConsoleList(); + /* We really delete the console. Reset the count to be sure. */ + Console->ReferenceCount = 0; /* Discard all entries in the input event queue */ PurgeInputBuffer(Console); @@ -726,8 +704,8 @@ ConsoleFreeHeap(Console); DPRINT("ConDrvDeleteConsole - Console destroyed\n"); - // /* Unlock the console list and return */ - // ConDrvUnlockConsoleList(); + /* Unlock the console list and return */ + ConDrvUnlockConsoleList(); }

11 years, 6 months

[hbelusca] 59326: [CONSRV] - Turn some BOOLs into BOOLEANs in condrv. - Move some coninput functions into condrv.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 23 23:19:42 2013 New Revision: 59326 URL: http://svn.reactos.org/svn/reactos?rev=59326&view=rev Log: [CONSRV] - Turn some BOOLs into BOOLEANs in condrv. - Move some coninput functions into condrv. Added: trunk/reactos/win32ss/user/consrv/condrv/coninput.c - copied, changed from r59297, trunk/reactos/win32ss/user/consrv/coninput.c Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/consrv/condrv/console.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/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] Sun Jun 23 23:19:42 2013 @@ -18,6 +18,7 @@ init.c lineinput.c settings.c + condrv/coninput.c condrv/conoutput.c condrv/console.c condrv/graphics.c Copied: trunk/reactos/win32ss/user/consrv/condrv/coninput.c (from r59297, trunk/reactos/win32ss/user/consrv/coninput.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/coninput.c [iso-8859-1] Sun Jun 23 23:19:42 2013 @@ -53,6 +53,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#if 0 static VOID FASTCALL ConioInputEventToAnsi(PCONSOLE Console, PINPUT_RECORD InputEvent) { @@ -65,6 +66,7 @@ &UnicodeChar); } } +#endif NTSTATUS FASTCALL ConioProcessInputEvent(PCONSOLE Console, @@ -206,515 +208,33 @@ ConioProcessInputEvent(Console, &er); } -static NTSTATUS -WaitBeforeReading(IN PGET_INPUT_INFO InputInfo, - IN PCSR_API_MESSAGE ApiMessage, - IN CSR_WAIT_FUNCTION WaitFunction OPTIONAL, - IN BOOL CreateWaitBlock OPTIONAL) -{ - if (CreateWaitBlock) - { - PGET_INPUT_INFO CapturedInputInfo; - - CapturedInputInfo = ConsoleAllocHeap(0, sizeof(GET_INPUT_INFO)); - if (!CapturedInputInfo) return STATUS_NO_MEMORY; - - RtlMoveMemory(CapturedInputInfo, InputInfo, sizeof(GET_INPUT_INFO)); - - if (!CsrCreateWait(&InputInfo->InputBuffer->ReadWaitQueue, - WaitFunction, - InputInfo->CallingThread, - ApiMessage, - CapturedInputInfo, - NULL)) - { - ConsoleFreeHeap(CapturedInputInfo); - return STATUS_NO_MEMORY; - } - } - - /* Wait for input */ - return STATUS_PENDING; -} - -static NTSTATUS -ReadInputBuffer(IN PGET_INPUT_INFO InputInfo, - IN BOOL Wait, - IN PCSR_API_MESSAGE ApiMessage, - IN BOOL CreateWaitBlock OPTIONAL); - -// Wait function CSR_WAIT_FUNCTION -static BOOLEAN -ReadInputBufferThread(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; - PCONSOLE_GETINPUT GetInputRequest = &((PCONSOLE_API_MESSAGE)WaitApiMessage)->Data.GetInputRequest; - PGET_INPUT_INFO InputInfo = (PGET_INPUT_INFO)WaitContext; - - PVOID InputHandle = WaitArgument2; - - DPRINT("ReadInputBufferThread - 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 = ReadInputBuffer(InputInfo, - GetInputRequest->bRead, - WaitApiMessage, - FALSE); - -Quit: - if (Status != STATUS_PENDING) - { - WaitApiMessage->Status = Status; - ConsoleFreeHeap(InputInfo); - } - - return (Status == STATUS_PENDING ? FALSE : TRUE); -} - -static NTSTATUS -ReadInputBuffer(IN PGET_INPUT_INFO InputInfo, - IN BOOL Wait, // TRUE --> Read ; FALSE --> Peek - IN PCSR_API_MESSAGE ApiMessage, - IN BOOL CreateWaitBlock OPTIONAL) -{ - 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) - { - return WaitBeforeReading(InputInfo, - ApiMessage, - ReadCharsThread, - CreateWaitBlock); - } - else /* We read all what we wanted, we return success */ - { - return STATUS_SUCCESS; - } -} - /* PUBLIC SERVER APIS *********************************************************/ -CSR_API(SrvReadConsole) -{ - NTSTATUS Status; - PCONSOLE_READCONSOLE ReadConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ReadConsoleRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - PVOID HandleEntry; - PCONSOLE_INPUT_BUFFER InputBuffer; - GET_INPUT_INFO InputInfo; - - DPRINT("SrvReadConsole\n"); - - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&ReadConsoleRequest->Buffer, - ReadConsoleRequest->BufferSize, - sizeof(BYTE))) - { +NTSTATUS NTAPI +ConDrvWriteConsoleInput(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + IN BOOLEAN Unicode, + IN PINPUT_RECORD InputRecord, + IN ULONG NumEventsToWrite, + OUT PULONG NumEventsWritten) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG i; + + if (Console == NULL || InputBuffer == NULL /* || InputRecord == NULL */) return STATUS_INVALID_PARAMETER; - } - - if (ReadConsoleRequest->NrCharactersRead > ReadConsoleRequest->NrCharactersToRead) - { - return STATUS_INVALID_PARAMETER; - } - - Status = ConSrvGetInputBufferAndHandleEntry(ProcessData, ReadConsoleRequest->InputHandle, &InputBuffer, &HandleEntry, GENERIC_READ, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - ReadConsoleRequest->NrCharactersRead = 0; - - InputInfo.CallingThread = CsrGetClientThread(); - InputInfo.HandleEntry = HandleEntry; - InputInfo.InputBuffer = InputBuffer; - - Status = ReadChars(&InputInfo, - ApiMessage, - TRUE); - - ConSrvReleaseInputBuffer(InputBuffer, TRUE); - - if (Status == STATUS_PENDING) - *ReplyCode = CsrReplyPending; - - return Status; -} - -CSR_API(SrvGetConsoleInput) -{ - NTSTATUS Status; - PCONSOLE_GETINPUT GetInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetInputRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - PVOID HandleEntry; - PCONSOLE_INPUT_BUFFER InputBuffer; - GET_INPUT_INFO InputInfo; - - DPRINT("SrvGetConsoleInput\n"); - - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&GetInputRequest->InputRecord, - GetInputRequest->Length, - sizeof(INPUT_RECORD))) - { - return STATUS_INVALID_PARAMETER; - } - - GetInputRequest->InputsRead = 0; - - Status = ConSrvGetInputBufferAndHandleEntry(ProcessData, GetInputRequest->InputHandle, &InputBuffer, &HandleEntry, GENERIC_READ, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - InputInfo.CallingThread = CsrGetClientThread(); - InputInfo.HandleEntry = HandleEntry; - InputInfo.InputBuffer = InputBuffer; - - Status = ReadInputBuffer(&InputInfo, - GetInputRequest->bRead, - ApiMessage, - TRUE); - - ConSrvReleaseInputBuffer(InputBuffer, TRUE); - - if (Status == STATUS_PENDING) - *ReplyCode = CsrReplyPending; - - return Status; -} - -CSR_API(SrvWriteConsoleInput) -{ - NTSTATUS Status; - PCONSOLE_WRITEINPUT WriteInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteInputRequest; - PINPUT_RECORD InputRecord; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - PCONSOLE_INPUT_BUFFER InputBuffer; - PCONSOLE Console; - DWORD Length; - DWORD i; - - DPRINT("SrvWriteConsoleInput\n"); - - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&WriteInputRequest->InputRecord, - WriteInputRequest->Length, - sizeof(INPUT_RECORD))) - { - return STATUS_INVALID_PARAMETER; - } - - Status = ConSrvGetInputBuffer(ProcessData, WriteInputRequest->InputHandle, &InputBuffer, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; - - Console = InputBuffer->Header.Console; - InputRecord = WriteInputRequest->InputRecord; - Length = WriteInputRequest->Length; - - for (i = 0; i < Length && NT_SUCCESS(Status); i++) - { - if (!WriteInputRequest->Unicode && - InputRecord->EventType == KEY_EVENT) + + /* Validity checks */ + ASSERT(Console == InputBuffer->Header.Console); + ASSERT( (InputRecord != NULL && NumEventsToWrite >= 0) || + (InputRecord == NULL && NumEventsToWrite == 0) ); + + if (NumEventsWritten) *NumEventsWritten = 0; + + for (i = 0; i < NumEventsToWrite && NT_SUCCESS(Status); ++i) + { + if (InputRecord->EventType == KEY_EVENT && !Unicode) { CHAR AsciiChar = InputRecord->Event.KeyEvent.uChar.AsciiChar; ConsoleInputAnsiCharToUnicodeChar(Console, @@ -725,29 +245,23 @@ Status = ConioProcessInputEvent(Console, InputRecord++); } - ConSrvReleaseInputBuffer(InputBuffer, TRUE); - - WriteInputRequest->Length = i; + if (NumEventsWritten) *NumEventsWritten = i; return Status; } -CSR_API(SrvFlushConsoleInputBuffer) -{ - NTSTATUS Status; - PCONSOLE_FLUSHINPUTBUFFER FlushInputBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.FlushInputBufferRequest; +NTSTATUS NTAPI +ConDrvFlushConsoleInputBuffer(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer) +{ PLIST_ENTRY CurrentEntry; - PCONSOLE_INPUT_BUFFER InputBuffer; ConsoleInput* Event; - DPRINT("SrvFlushConsoleInputBuffer\n"); - - Status = ConSrvGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - FlushInputBufferRequest->InputHandle, - &InputBuffer, - GENERIC_WRITE, - TRUE); - if (!NT_SUCCESS(Status)) return Status; + if (Console == NULL || InputBuffer == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validity check */ + ASSERT(Console == InputBuffer->Header.Console); /* Discard all entries in the input event queue */ while (!IsListEmpty(&InputBuffer->InputEvents)) @@ -758,36 +272,31 @@ } ResetEvent(InputBuffer->ActiveEvent); - ConSrvReleaseInputBuffer(InputBuffer, TRUE); return STATUS_SUCCESS; } -CSR_API(SrvGetConsoleNumberOfInputEvents) -{ - NTSTATUS Status; - PCONSOLE_GETNUMINPUTEVENTS GetNumInputEventsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetNumInputEventsRequest; - PCONSOLE_INPUT_BUFFER InputBuffer; +NTSTATUS NTAPI +ConDrvGetConsoleNumberOfInputEvents(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + OUT PULONG NumEvents) +{ PLIST_ENTRY CurrentInput; - DWORD NumEvents; - - DPRINT("SrvGetConsoleNumberOfInputEvents\n"); - - Status = ConSrvGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), GetNumInputEventsRequest->InputHandle, &InputBuffer, GENERIC_READ, TRUE); - if (!NT_SUCCESS(Status)) return Status; - + + if (Console == NULL || InputBuffer == NULL || NumEvents == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validity check */ + ASSERT(Console == InputBuffer->Header.Console); + + *NumEvents = 0; + + /* If there are any events ... */ CurrentInput = InputBuffer->InputEvents.Flink; - /* GetNumInputEventsRequest->NumInputEvents = */ NumEvents = 0; - - /* If there are any events ... */ while (CurrentInput != &InputBuffer->InputEvents) { CurrentInput = CurrentInput->Flink; - NumEvents++; - } - - ConSrvReleaseInputBuffer(InputBuffer, TRUE); - - GetNumInputEventsRequest->NumInputEvents = NumEvents; + (*NumEvents)++; + } return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/user/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/conoutput.c [iso-8859-1] Sun Jun 23 23:19:42 2013 @@ -227,7 +227,7 @@ IN PCONSOLE_CURSOR_INFO CursorInfo) { ULONG Size; - BOOL Visible, Success = TRUE; + BOOLEAN Visible, Success = TRUE; if (Console == NULL || Buffer == NULL || CursorInfo == NULL) return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/win32ss/user/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/console.c [iso-8859-1] Sun Jun 23 23:19:42 2013 @@ -549,7 +549,7 @@ Console->TermIFace.Console = Console; /* Initialize the frontend AFTER having attached it to the console */ - DPRINT("Finish initialization of frontend\n"); + DPRINT1("Finish initialization of frontend\n"); Status = Console->TermIFace.Vtbl->InitFrontEnd(&Console->TermIFace, Console); if (!NT_SUCCESS(Status)) { @@ -565,9 +565,9 @@ /* Copy buffer contents to screen */ // FrontEnd.Draw(); // ConioDrawConsole(Console); - DPRINT("Console drawn\n"); - - DPRINT("Terminal FrontEnd initialization done\n"); + DPRINT1("Console drawn\n"); + + DPRINT1("Terminal FrontEnd initialization done\n"); return STATUS_SUCCESS; } @@ -584,7 +584,7 @@ /* Detach the frontend from the console */ RtlZeroMemory(&Console->TermIFace, sizeof(Console->TermIFace)); - DPRINT("Terminal FrontEnd unregistered\n"); + DPRINT1("Terminal FrontEnd unregistered\n"); return STATUS_SUCCESS; } @@ -597,26 +597,28 @@ * Forbid validation of any console by other threads * during the deletion of this console. */ - ConDrvLockConsoleListExclusive(); - - /* Check the existence of the console, and if it's ok, continue */ - if (!ConDrvValidateConsolePointer(Console)) - { - /* Unlock the console list and return */ - ConDrvUnlockConsoleList(); - return; - } - - /* - * If the console is already being destroyed - * (thus not running), just return. - */ - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) - { - /* Unlock the console list and return */ - ConDrvUnlockConsoleList(); - return; - } + // ConDrvLockConsoleListExclusive(); + + // /* Check the existence of the console, and if it's ok, continue */ + // if (!ConDrvValidateConsolePointer(Console)) + // { + // /* Unlock the console list and return */ + // ConDrvUnlockConsoleList(); + // return; + // } + + // /* + // * If the console is already being destroyed + // * (thus not running), just return. + // */ + // if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + // { + // /* Unlock the console list and return */ + // ConDrvUnlockConsoleList(); + // return; + // } + + if (!ConDrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) return; /* * We are about to be destroyed. Signal it to other people @@ -624,6 +626,9 @@ * they cannot longer validate the console. */ Console->State = CONSOLE_TERMINATING; + + /* We really delete the console. Reset the count to be sure. */ + Console->ReferenceCount = 0; /* * Allow other threads to finish their job: basically, unlock @@ -634,14 +639,25 @@ * can see that we are in fact already deleting the console. */ LeaveCriticalSection(&Console->Lock); - ConDrvUnlockConsoleList(); + // ConDrvUnlockConsoleList(); /* FIXME: Send a terminate message to all the processes owning this console */ + /* Close all the applications which are linked to this console */ + /* + * FIXME: Windows will wait up to 5 seconds for the thread to exit. + * We shouldn't wait here, though, since the console lock is entered. + * A copy of the thread list probably needs to be made. + */ + // ConDrvConsoleProcessCtrlEvent(Console, 0, CTRL_CLOSE_EVENT); + // DPRINT1("Apps closed\n"); + // FIXME: Be sure that, starting from here, there is NO app running + // on this console anymore !!!!! + /* Cleanup the UI-oriented part */ - DPRINT("Deregister console\n"); + DPRINT1("Deregister console\n"); ConDrvDeregisterFrontEnd(Console); - DPRINT("Console deregistered\n"); + DPRINT1("Console deregistered\n"); /*** * Check that the console is in terminating state before continuing @@ -649,30 +665,36 @@ * ...unless to cancel console deletion ?). ***/ - ConDrvLockConsoleListExclusive(); - - /* Re-check the existence of the console, and if it's ok, continue */ - if (!ConDrvValidateConsolePointer(Console)) - { - /* Unlock the console list and return */ - ConDrvUnlockConsoleList(); - return; - } - - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_TERMINATING, TRUE)) - { - ConDrvUnlockConsoleList(); - return; - } + // ConDrvLockConsoleListExclusive(); + + // /* Re-check the existence of the console, and if it's ok, continue */ + // if (!ConDrvValidateConsolePointer(Console)) + // { + // /* Unlock the console list and return */ + // ConDrvUnlockConsoleList(); + // return; + // } + + // if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_TERMINATING, TRUE)) + // { + // ConDrvUnlockConsoleList(); + // return; + // } + + if (!ConDrvValidateConsole(Console, CONSOLE_TERMINATING, TRUE)) return; /* We are now in destruction */ Console->State = CONSOLE_IN_DESTRUCTION; + ///////////////////// + ConDrvLockConsoleListExclusive(); + ///////////////////// + /* Remove the console from the list */ RemoveEntryList(&Console->Entry); - /* We really delete the console. Reset the count to be sure. */ - Console->ReferenceCount = 0; + /* Unlock the console list */ + ConDrvUnlockConsoleList(); /* Discard all entries in the input event queue */ PurgeInputBuffer(Console); @@ -704,8 +726,8 @@ ConsoleFreeHeap(Console); DPRINT("ConDrvDeleteConsole - Console destroyed\n"); - /* Unlock the console list and return */ - ConDrvUnlockConsoleList(); + // /* Unlock the console list and return */ + // ConDrvUnlockConsoleList(); } 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] Sun Jun 23 23:19:42 2013 @@ -606,7 +606,7 @@ NTSTATUS NTAPI ConDrvReadConsoleOutput(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN BOOL Unicode, + IN BOOLEAN Unicode, OUT PCHAR_INFO CharInfo/*Buffer*/, IN PCOORD BufferSize, IN PCOORD BufferCoord, @@ -680,7 +680,7 @@ NTSTATUS NTAPI ConDrvWriteConsoleOutput(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN BOOL Unicode, + IN BOOLEAN Unicode, IN PCHAR_INFO CharInfo/*Buffer*/, IN PCOORD BufferSize, IN PCOORD BufferCoord, @@ -1161,9 +1161,9 @@ NTSTATUS NTAPI ConDrvScrollConsoleScreenBuffer(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN BOOL Unicode, + IN BOOLEAN Unicode, IN PSMALL_RECT ScrollRectangle, - IN BOOL UseClipRectangle, + IN BOOLEAN UseClipRectangle, IN PSMALL_RECT ClipRectangle OPTIONAL, IN PCOORD DestinationOrigin, IN CHAR_INFO FillChar) 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] Sun Jun 23 23:19:42 2013 @@ -34,9 +34,6 @@ #define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ WideCharToMultiByte((Console)->CodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) -#define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ - MultiByteToWideChar((Console)->CodePage, 0, (sChar), 1, (dWChar), 1) - typedef struct ConsoleInput_t { LIST_ENTRY ListEntry; @@ -64,146 +61,6 @@ &InputEvent->Event.KeyEvent.uChar.AsciiChar, &UnicodeChar); } -} - -NTSTATUS FASTCALL -ConioProcessInputEvent(PCONSOLE Console, - PINPUT_RECORD InputEvent) -{ - ConsoleInput *ConInRec; - - /* Check for pause or unpause */ - if (InputEvent->EventType == KEY_EVENT && InputEvent->Event.KeyEvent.bKeyDown) - { - WORD vk = InputEvent->Event.KeyEvent.wVirtualKeyCode; - if (!(Console->PauseFlags & PAUSED_FROM_KEYBOARD)) - { - DWORD cks = InputEvent->Event.KeyEvent.dwControlKeyState; - if (Console->InputBuffer.Mode & ENABLE_LINE_INPUT && - (vk == VK_PAUSE || (vk == 'S' && - (cks & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) && - !(cks & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED))))) - { - ConioPause(Console, PAUSED_FROM_KEYBOARD); - return STATUS_SUCCESS; - } - } - else - { - if ((vk < VK_SHIFT || vk > VK_CAPITAL) && vk != VK_LWIN && - vk != VK_RWIN && vk != VK_NUMLOCK && vk != VK_SCROLL) - { - ConioUnpause(Console, PAUSED_FROM_KEYBOARD); - return STATUS_SUCCESS; - } - } - } - - /* Add event to the queue */ - ConInRec = ConsoleAllocHeap(0, sizeof(ConsoleInput)); - if (ConInRec == NULL) return STATUS_INSUFFICIENT_RESOURCES; - - ConInRec->InputEvent = *InputEvent; - InsertTailList(&Console->InputBuffer.InputEvents, &ConInRec->ListEntry); - - SetEvent(Console->InputBuffer.ActiveEvent); - CsrNotifyWait(&Console->InputBuffer.ReadWaitQueue, - WaitAny, - NULL, - NULL); - if (!IsListEmpty(&Console->InputBuffer.ReadWaitQueue)) - { - CsrDereferenceWait(&Console->InputBuffer.ReadWaitQueue); - } - - return STATUS_SUCCESS; -} - -VOID FASTCALL -PurgeInputBuffer(PCONSOLE Console) -{ - PLIST_ENTRY CurrentEntry; - ConsoleInput* Event; - - while (!IsListEmpty(&Console->InputBuffer.InputEvents)) - { - CurrentEntry = RemoveHeadList(&Console->InputBuffer.InputEvents); - Event = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - ConsoleFreeHeap(Event); - } - - CloseHandle(Console->InputBuffer.ActiveEvent); -} - -VOID NTAPI -ConDrvProcessKey(IN PCONSOLE Console, - IN BOOLEAN Down, - IN UINT VirtualKeyCode, - IN UINT VirtualScanCode, - IN WCHAR UnicodeChar, - IN ULONG ShiftState, - IN BYTE KeyStateCtrl) -{ - INPUT_RECORD er; - - /* process Ctrl-C and Ctrl-Break */ - if ( Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT && - Down && (VirtualKeyCode == VK_PAUSE || VirtualKeyCode == 'C') && - (ShiftState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) || KeyStateCtrl & 0x80) ) - { - DPRINT1("Console_Api Ctrl-C\n"); - ConDrvConsoleProcessCtrlEvent(Console, 0, CTRL_C_EVENT); - - if (Console->LineBuffer && !Console->LineComplete) - { - /* Line input is in progress; end it */ - Console->LinePos = Console->LineSize = 0; - Console->LineComplete = TRUE; - } - return; - } - - if ( (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) != 0 && - (VK_UP == VirtualKeyCode || VK_DOWN == VirtualKeyCode) ) - { - if (!Down) return; - - /* scroll up or down */ - if (VK_UP == VirtualKeyCode) - { - /* only scroll up if there is room to scroll up into */ - if (Console->ActiveBuffer->CursorPosition.Y != Console->ActiveBuffer->ScreenBufferSize.Y - 1) - { - Console->ActiveBuffer->VirtualY = (Console->ActiveBuffer->VirtualY + - Console->ActiveBuffer->ScreenBufferSize.Y - 1) % - Console->ActiveBuffer->ScreenBufferSize.Y; - Console->ActiveBuffer->CursorPosition.Y++; - } - } - else - { - /* only scroll down if there is room to scroll down into */ - if (Console->ActiveBuffer->CursorPosition.Y != 0) - { - Console->ActiveBuffer->VirtualY = (Console->ActiveBuffer->VirtualY + 1) % - Console->ActiveBuffer->ScreenBufferSize.Y; - Console->ActiveBuffer->CursorPosition.Y--; - } - } - - ConioDrawConsole(Console); - return; - } - - er.EventType = KEY_EVENT; - er.Event.KeyEvent.bKeyDown = Down; - er.Event.KeyEvent.wRepeatCount = 1; - er.Event.KeyEvent.wVirtualKeyCode = VirtualKeyCode; - er.Event.KeyEvent.wVirtualScanCode = VirtualScanCode; - er.Event.KeyEvent.uChar.UnicodeChar = UnicodeChar; - er.Event.KeyEvent.dwControlKeyState = ShiftState; - - ConioProcessInputEvent(Console, &er); } static NTSTATUS @@ -683,16 +540,19 @@ return Status; } +NTSTATUS NTAPI +ConDrvWriteConsoleInput(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + IN BOOLEAN Unicode, + IN PINPUT_RECORD InputRecord, + IN ULONG NumEventsToWrite, + OUT PULONG NumEventsWritten); CSR_API(SrvWriteConsoleInput) { NTSTATUS Status; PCONSOLE_WRITEINPUT WriteInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteInputRequest; - PINPUT_RECORD InputRecord; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCONSOLE_INPUT_BUFFER InputBuffer; - PCONSOLE Console; - DWORD Length; - DWORD i; + ULONG NumEventsWritten = 0; DPRINT("SrvWriteConsoleInput\n"); @@ -704,92 +564,69 @@ return STATUS_INVALID_PARAMETER; } - Status = ConSrvGetInputBuffer(ProcessData, WriteInputRequest->InputHandle, &InputBuffer, GENERIC_WRITE, TRUE); + Status = ConSrvGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + WriteInputRequest->InputHandle, + &InputBuffer, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; - Console = InputBuffer->Header.Console; - InputRecord = WriteInputRequest->InputRecord; - Length = WriteInputRequest->Length; - - for (i = 0; i < Length && NT_SUCCESS(Status); i++) - { - if (!WriteInputRequest->Unicode && - InputRecord->EventType == KEY_EVENT) - { - CHAR AsciiChar = InputRecord->Event.KeyEvent.uChar.AsciiChar; - ConsoleInputAnsiCharToUnicodeChar(Console, - &InputRecord->Event.KeyEvent.uChar.UnicodeChar, - &AsciiChar); - } - - Status = ConioProcessInputEvent(Console, InputRecord++); - } + Status = ConDrvWriteConsoleInput(InputBuffer->Header.Console, + InputBuffer, + WriteInputRequest->Unicode, + WriteInputRequest->InputRecord, + WriteInputRequest->Length, + &NumEventsWritten); + WriteInputRequest->Length = NumEventsWritten; ConSrvReleaseInputBuffer(InputBuffer, TRUE); - - WriteInputRequest->Length = i; - return Status; } +NTSTATUS NTAPI +ConDrvFlushConsoleInputBuffer(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer); CSR_API(SrvFlushConsoleInputBuffer) { NTSTATUS Status; PCONSOLE_FLUSHINPUTBUFFER FlushInputBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.FlushInputBufferRequest; - PLIST_ENTRY CurrentEntry; PCONSOLE_INPUT_BUFFER InputBuffer; - ConsoleInput* Event; DPRINT("SrvFlushConsoleInputBuffer\n"); Status = ConSrvGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - FlushInputBufferRequest->InputHandle, - &InputBuffer, - GENERIC_WRITE, - TRUE); + FlushInputBufferRequest->InputHandle, + &InputBuffer, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; - /* Discard all entries in the input event queue */ - while (!IsListEmpty(&InputBuffer->InputEvents)) - { - CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); - Event = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - ConsoleFreeHeap(Event); - } - ResetEvent(InputBuffer->ActiveEvent); + Status = ConDrvFlushConsoleInputBuffer(InputBuffer->Header.Console, + InputBuffer); ConSrvReleaseInputBuffer(InputBuffer, TRUE); - return STATUS_SUCCESS; -} - + return Status; +} + +NTSTATUS NTAPI +ConDrvGetConsoleNumberOfInputEvents(IN PCONSOLE Console, + IN PCONSOLE_INPUT_BUFFER InputBuffer, + OUT PULONG NumEvents); CSR_API(SrvGetConsoleNumberOfInputEvents) { NTSTATUS Status; PCONSOLE_GETNUMINPUTEVENTS GetNumInputEventsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetNumInputEventsRequest; PCONSOLE_INPUT_BUFFER InputBuffer; - PLIST_ENTRY CurrentInput; - DWORD NumEvents; DPRINT("SrvGetConsoleNumberOfInputEvents\n"); - Status = ConSrvGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), GetNumInputEventsRequest->InputHandle, &InputBuffer, GENERIC_READ, TRUE); + Status = ConSrvGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + GetNumInputEventsRequest->InputHandle, + &InputBuffer, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; - CurrentInput = InputBuffer->InputEvents.Flink; - /* GetNumInputEventsRequest->NumInputEvents = */ NumEvents = 0; - - /* If there are any events ... */ - while (CurrentInput != &InputBuffer->InputEvents) - { - CurrentInput = CurrentInput->Flink; - NumEvents++; - } + Status = ConDrvGetConsoleNumberOfInputEvents(InputBuffer->Header.Console, + InputBuffer, + &GetNumInputEventsRequest->NumInputEvents); ConSrvReleaseInputBuffer(InputBuffer, TRUE); - - GetNumInputEventsRequest->NumInputEvents = NumEvents; - - return STATUS_SUCCESS; + return Status; } /* EOF */ 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] Sun Jun 23 23:19:42 2013 @@ -411,7 +411,7 @@ NTSTATUS NTAPI ConDrvReadConsoleOutput(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN BOOL Unicode, + IN BOOLEAN Unicode, OUT PCHAR_INFO CharInfo/*Buffer*/, IN PCOORD BufferSize, IN PCOORD BufferCoord, @@ -452,7 +452,7 @@ NTSTATUS NTAPI ConDrvWriteConsoleOutput(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN BOOL Unicode, + IN BOOLEAN Unicode, IN PCHAR_INFO CharInfo/*Buffer*/, IN PCOORD BufferSize, IN PCOORD BufferCoord, @@ -762,9 +762,9 @@ NTSTATUS NTAPI ConDrvScrollConsoleScreenBuffer(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN BOOL Unicode, + IN BOOLEAN Unicode, IN PSMALL_RECT ScrollRectangle, - IN BOOL UseClipRectangle, + IN BOOLEAN UseClipRectangle, IN PSMALL_RECT ClipRectangle OPTIONAL, IN PCOORD DestinationOrigin, IN CHAR_INFO FillChar);

11 years, 6 months

[tfaber] 59325: [NTOS:SE] - Fix pool corruption of the nastiest sort. Big thanks to Amine. Also thanks to MS for idiotic unsafe typedefs.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 23 22:10:47 2013 New Revision: 59325 URL: http://svn.reactos.org/svn/reactos?rev=59325&view=rev Log: [NTOS:SE] - Fix pool corruption of the nastiest sort. Big thanks to Amine. Also thanks to MS for idiotic unsafe typedefs. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=59… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sun Jun 23 22:10:47 2013 @@ -657,7 +657,7 @@ */ uLength = sizeof(SID_AND_ATTRIBUTES) * AccessToken->UserAndGroupCount; - uLength += RtlLengthSid(User); + uLength += RtlLengthSid(User->Sid); for (i = 0; i < GroupCount; i++) uLength += RtlLengthSid(Groups[i].Sid);

11 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013