Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

[tfaber] 59504: [INFLIB] - Avoid use of swprintf, which is blatantly incompatible with -fshort-wchar CORE-6918 #resolve
by tfaber＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: tfaber Date: Thu Jul 18 20:29:18 2013 New Revision: 59504 URL: http://svn.reactos.org/svn/reactos?rev=59504&view=rev Log: [INFLIB] - Avoid use of swprintf, which is blatantly incompatible with -fshort-wchar CORE-6918 #resolve Modified: trunk/reactos/lib/inflib/CMakeLists.txt trunk/reactos/lib/inflib/infget.c Modified: trunk/reactos/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/CMakeLists.txt?… ============================================================================== --- trunk/reactos/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/CMakeLists.txt [iso-8859-1] Thu Jul 18 20:29:18 2013 @@ -21,9 +21,6 @@ infhostrtl.c) add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) - if(MSVC) - add_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS) - endif() add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) if(NOT MSVC) add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings") Modified: trunk/reactos/lib/inflib/infget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infget.c?rev=59… ============================================================================== --- trunk/reactos/lib/inflib/infget.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infget.c [iso-8859-1] Thu Jul 18 20:29:18 2013 @@ -19,6 +19,18 @@ WCHAR *buffer, unsigned int size); +static void +ShortToHex(PWCHAR Buffer, + USHORT Value) +{ + WCHAR HexDigits[] = L"0123456789abcdef"; + + Buffer[0] = HexDigits[Value >> 12 & 0xf]; + Buffer[1] = HexDigits[Value >> 8 & 0xf]; + Buffer[2] = HexDigits[Value >> 4 & 0xf]; + Buffer[3] = HexDigits[Value >> 0 & 0xf]; +} + /* retrieve the string substitution for a given string, or NULL if not found */ /* if found, len is set to the substitution length */ static PCWSTR @@ -33,7 +45,7 @@ PINFCONTEXT Context = NULL; PWCHAR Data = NULL; WCHAR ValueName[MAX_INF_STRING_LENGTH +1]; - WCHAR StringLangId[13]; + WCHAR StringLangId[] = L"Strings.XXXX"; if (!*len) /* empty string (%%) is replaced by single percent */ { @@ -48,9 +60,8 @@ if (Inf->LanguageId != 0) { - swprintf(StringLangId, - L"Strings.%04hx", - Inf->LanguageId); + ShortToHex(&StringLangId[sizeof("Strings.") - 1], + Inf->LanguageId); Status = InfpFindFirstLine(Inf, StringLangId, @@ -58,9 +69,8 @@ &Context); if (Status != INF_STATUS_SUCCESS) { - swprintf(StringLangId, - L"Strings.%04hx", - MAKELANGID(PRIMARYLANGID(Inf->LanguageId), SUBLANG_NEUTRAL)); + ShortToHex(&StringLangId[sizeof("Strings.") - 1], + MAKELANGID(PRIMARYLANGID(Inf->LanguageId), SUBLANG_NEUTRAL)); Status = InfpFindFirstLine(Inf, StringLangId,

1 0

[tfaber] 59503: [UNICODE] - Fix missing isdigit
by tfaber＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: tfaber Date: Thu Jul 18 20:08:37 2013 New Revision: 59503 URL: http://svn.reactos.org/svn/reactos?rev=59503&view=rev Log: [UNICODE] - Fix missing isdigit Modified: trunk/reactos/include/host/wine/unicode.h Modified: trunk/reactos/include/host/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/wine/unicode.… ============================================================================== --- trunk/reactos/include/host/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/host/wine/unicode.h [iso-8859-1] Thu Jul 18 20:08:37 2013 @@ -21,6 +21,7 @@ #ifndef __WINE_WINE_UNICODE_H #define __WINE_WINE_UNICODE_H +#include <ctype.h> #include <stdarg.h> #include <string.h> #include <typedefs.h>

1 0

[aandrejevic] 59502: [NTVDM] Fix several bugs.
by aandrejevic＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: aandrejevic Date: Thu Jul 18 12:31:11 2013 New Revision: 59502 URL: http://svn.reactos.org/svn/reactos?rev=59502&view=rev Log: [NTVDM] Fix several bugs. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Thu Jul 18 12:31:11 2013 @@ -398,7 +398,7 @@ return TRUE; } -BOOLEAN DosLinkUmb() +BOOLEAN DosLinkUmb(VOID) { DWORD Segment = FIRST_MCB_SEGMENT; PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); @@ -423,7 +423,7 @@ return TRUE; } -BOOLEAN DosUnlinkUmb() +BOOLEAN DosUnlinkUmb(VOID) { DWORD Segment = FIRST_MCB_SEGMENT; PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); @@ -895,6 +895,7 @@ VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode) { + WORD i; WORD McbSegment = FIRST_MCB_SEGMENT; PDOS_MCB CurrentMcb; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); @@ -903,7 +904,11 @@ /* Check if this PSP is it's own parent */ if (PspBlock->ParentPsp == Psp) goto Done; - // TODO: Close all handles opened by the process + for (i = 0; i < PspBlock->HandleTableSize; i++) + { + /* Close the handle */ + DosCloseHandle(i); + } /* Free the memory used by the process */ while (TRUE) @@ -942,7 +947,7 @@ LOWORD(PspBlock->TerminateAddress)); } -CHAR DosReadCharacter() +CHAR DosReadCharacter(VOID) { CHAR Character = '\0'; WORD BytesRead; @@ -1539,12 +1544,12 @@ } } -VOID DosBreakInterrupt() +VOID DosBreakInterrupt(VOID) { VdmRunning = FALSE; } -BOOLEAN DosInitialize() +BOOLEAN DosInitialize(VOID) { BYTE i; PDOS_MCB Mcb = SEGMENT_TO_MCB(FIRST_MCB_SEGMENT); Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Thu Jul 18 12:31:11 2013 @@ -19,7 +19,7 @@ #define DOS_CONFIG_PATH L"%SystemRoot%\\system32\\CONFIG.NT" #define DOS_COMMAND_INTERPRETER L"%SystemRoot%\\system32\\COMMAND.COM /k %SystemRoot%\\system32\\AUTOEXEC.NT" #define FIRST_MCB_SEGMENT 0x1000 -#define USER_MEMORY_SIZE 0x8FFF +#define USER_MEMORY_SIZE 0x8FFE #define SYSTEM_PSP 0x08 #define SYSTEM_ENV_BLOCK 0x800 #define INVALID_DOS_HANDLE 0xFFFF @@ -103,12 +103,12 @@ VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment); BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); -CHAR DosReadCharacter(); +CHAR DosReadCharacter(VOID); VOID DosPrintCharacter(CHAR Character); VOID DosInt20h(WORD CodeSegment); VOID DosInt21h(WORD CodeSegment); -VOID DosBreakInterrupt(); -BOOLEAN DosInitialize(); +VOID DosBreakInterrupt(VOID); +BOOLEAN DosInitialize(VOID); #endif

1 0

[aandrejevic] 59501: [NTVDM] Implement Upper Memory Blocks (UMB) support.
by aandrejevic＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: aandrejevic Date: Thu Jul 18 11:44:06 2013 New Revision: 59501 URL: http://svn.reactos.org/svn/reactos?rev=59501&view=rev Log: [NTVDM] Implement Upper Memory Blocks (UMB) support. Modified: branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Thu Jul 18 11:44:06 2013 @@ -16,7 +16,7 @@ /* DEFINES ********************************************************************/ #define CONSOLE_VIDEO_MEM_END 0xBFFFF -#define ROM_AREA_START 0xC0000 +#define ROM_AREA_START 0xE0000 #define ROM_AREA_END 0xFFFFF #define BDA_SEGMENT 0x40 #define BIOS_PIC_MASTER_INT 0x08 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] Thu Jul 18 11:44:06 2013 @@ -18,6 +18,7 @@ static DWORD DiskTransferArea; static HANDLE DosSystemFileTable[DOS_SFT_SIZE]; static WORD DosSftRefCount[DOS_SFT_SIZE]; +static BOOLEAN DosUmbLinked = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -394,6 +395,60 @@ /* Mark the block as free */ Mcb->OwnerPsp = 0; + return TRUE; +} + +BOOLEAN DosLinkUmb() +{ + DWORD Segment = FIRST_MCB_SEGMENT; + PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); + + /* Check if UMBs are already linked */ + if (DosUmbLinked) return FALSE; + + /* Find the last block */ + while ((Mcb->BlockType == 'M') && (Segment <= 0xFFFF)) + { + Segment += Mcb->Size + 1; + Mcb = SEGMENT_TO_MCB(Segment); + } + + /* Make sure it's valid */ + if (Mcb->BlockType != 'Z') return FALSE; + + /* Connect the MCB with the UMB chain */ + Mcb->BlockType = 'M'; + + DosUmbLinked = TRUE; + return TRUE; +} + +BOOLEAN DosUnlinkUmb() +{ + DWORD Segment = FIRST_MCB_SEGMENT; + PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); + + /* Check if UMBs are already unlinked */ + if (!DosUmbLinked) return FALSE; + + /* Find the block preceding the MCB that links it with the UMB chain */ + while (Segment <= 0xFFFF) + { + if ((Segment + Mcb->Size) == (FIRST_MCB_SEGMENT + USER_MEMORY_SIZE)) + { + /* This is the last non-UMB segment */ + break; + } + + /* Advance to the next MCB */ + Segment += Mcb->Size + 1; + Mcb = SEGMENT_TO_MCB(Segment); + } + + /* Mark the MCB as the last MCB */ + Mcb->BlockType = 'Z'; + + DosUmbLinked = FALSE; return TRUE; } @@ -1412,7 +1467,11 @@ { EmulatorClearFlag(EMULATOR_FLAG_CF); } - else EmulatorSetFlag(EMULATOR_FLAG_CF); + else + { + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_ARENA_TRASHED); + EmulatorSetFlag(EMULATOR_FLAG_CF); + } break; } @@ -1439,6 +1498,35 @@ case 0x4C: { DosTerminateProcess(CurrentPsp, LOBYTE(Eax)); + break; + } + + /* Get/Set Memory Management Options */ + case 0x58: + { + if (LOBYTE(Eax) == 0x02) + { + /* Get UMB link state */ + + Eax &= 0xFFFFFF00; + if (DosUmbLinked) Eax |= 1; + EmulatorSetRegister(EMULATOR_REG_AX, Eax); + } + else if (LOBYTE(Eax) == 0x03) + { + /* Set UMB link state */ + + if (Ebx) DosLinkUmb(); + else DosUnlinkUmb(); + } + else + { + /* Invalid or unsupported function */ + + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_FUNCTION); + } + break; } @@ -1470,6 +1558,18 @@ /* Initialize the MCB */ Mcb->BlockType = 'Z'; Mcb->Size = USER_MEMORY_SIZE; + Mcb->OwnerPsp = 0; + + /* Initialize the link MCB to the UMB area */ + Mcb = SEGMENT_TO_MCB(FIRST_MCB_SEGMENT + USER_MEMORY_SIZE + 1); + Mcb->BlockType = 'M'; + Mcb->Size = UMB_START_SEGMENT - FIRST_MCB_SEGMENT - USER_MEMORY_SIZE - 2; + Mcb->OwnerPsp = SYSTEM_PSP; + + /* Initialize the UMB area */ + Mcb = SEGMENT_TO_MCB(UMB_START_SEGMENT); + Mcb->BlockType = 'Z'; + Mcb->Size = UMB_END_SEGMENT - UMB_START_SEGMENT; Mcb->OwnerPsp = 0; /* Get the environment strings */ Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Thu Jul 18 11:44:06 2013 @@ -29,6 +29,8 @@ #define DOS_SFT_SIZE 255 #define SEGMENT_TO_MCB(seg) ((PDOS_MCB)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) #define SEGMENT_TO_PSP(seg) ((PDOS_PSP)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) +#define UMB_START_SEGMENT 0xC000 +#define UMB_END_SEGMENT 0xDFFF #pragma pack(push, 1)

1 0

[aandrejevic] 59500: Fix broken build after trunk merge.
by aandrejevic＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: aandrejevic Date: Thu Jul 18 05:46:06 2013 New Revision: 59500 URL: http://svn.reactos.org/svn/reactos?rev=59500&view=rev Log: Fix broken build after trunk merge. Modified: branches/ntvdm/lib/3rdparty/CMakeLists.txt Modified: branches/ntvdm/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/CMakeLists.t… ============================================================================== --- branches/ntvdm/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/lib/3rdparty/CMakeLists.txt [iso-8859-1] Thu Jul 18 05:46:06 2013 @@ -10,5 +10,8 @@ add_subdirectory(libwine) add_subdirectory(libxml2) add_subdirectory(softx86) -# add_subdirectory(stlport) FIXME: Add proper STL support +if(MSVC) + add_subdirectory(stlport) +endif() +add_subdirectory(strmbase) add_subdirectory(zlib)

1 0

[aandrejevic] 59499: Synchronize with trunk.
by aandrejevic＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: aandrejevic Date: Thu Jul 18 00:46:28 2013 New Revision: 59499 URL: http://svn.reactos.org/svn/reactos?rev=59499&view=rev Log: Synchronize with trunk. Added: branches/ntvdm/base/applications/fontview/lang/tr-TR.rc - copied unchanged from r59468, trunk/reactos/base/applications/fontview/lang/tr-TR.rc branches/ntvdm/base/applications/mmc/lang/tr-TR.rc - copied unchanged from r59468, trunk/reactos/base/applications/mmc/lang/tr-TR.rc branches/ntvdm/base/applications/msconfig/lang/tr-TR.rc - copied unchanged from r59468, trunk/reactos/base/applications/msconfig/lang/tr-TR.rc branches/ntvdm/base/applications/rapps/rapps/dvdwritenow.txt - copied unchanged from r59468, trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt branches/ntvdm/base/applications/rapps/rapps/lazaruside.txt - copied unchanged from r59468, trunk/reactos/base/applications/rapps/rapps/lazaruside.txt branches/ntvdm/base/applications/regedit/clb/lang/tr-TR.rc - copied unchanged from r59468, trunk/reactos/base/applications/regedit/clb/lang/tr-TR.rc branches/ntvdm/base/applications/regedit/lang/tr-TR.rc - copied unchanged from r59468, trunk/reactos/base/applications/regedit/lang/tr-TR.rc branches/ntvdm/base/applications/taskmgr/lang/tr-TR.rc - copied unchanged from r59468, trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc branches/ntvdm/dll/directx/dxgi/ - copied from r59468, trunk/reactos/dll/directx/dxgi/ branches/ntvdm/dll/directx/quartz/control_tlb.idl - copied unchanged from r59468, trunk/reactos/dll/directx/quartz/control_tlb.idl branches/ntvdm/dll/directx/quartz/control_tlb.rgs - copied unchanged from r59468, trunk/reactos/dll/directx/quartz/control_tlb.rgs branches/ntvdm/dll/directx/quartz/fil_data.idl - copied unchanged from r59468, trunk/reactos/dll/directx/quartz/fil_data.idl branches/ntvdm/dll/directx/quartz/quartz_strmif.rgs - copied unchanged from r59468, trunk/reactos/dll/directx/quartz/quartz_strmif.rgs branches/ntvdm/dll/directx/quartz/vmr9.c - copied unchanged from r59468, trunk/reactos/dll/directx/quartz/vmr9.c branches/ntvdm/dll/win32/getuname/lang/ - copied from r59468, trunk/reactos/dll/win32/getuname/lang/ branches/ntvdm/dll/win32/mshtml/msvc.S - copied unchanged from r59468, trunk/reactos/dll/win32/mshtml/msvc.S branches/ntvdm/dll/win32/msports/parallel.c - copied unchanged from r59468, trunk/reactos/dll/win32/msports/parallel.c branches/ntvdm/dll/win32/samsrv/security.c - copied unchanged from r59468, trunk/reactos/dll/win32/samsrv/security.c branches/ntvdm/dll/win32/wbemprox/ - copied from r59468, trunk/reactos/dll/win32/wbemprox/ branches/ntvdm/drivers/base/condrv/ (props changed) - copied from r59468, trunk/reactos/drivers/base/condrv/ branches/ntvdm/drivers/network/dd/rtl8139/CMakeLists.txt - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/CMakeLists.txt branches/ntvdm/drivers/network/dd/rtl8139/debug.h - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/debug.h branches/ntvdm/drivers/network/dd/rtl8139/hardware.c - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/hardware.c branches/ntvdm/drivers/network/dd/rtl8139/info.c - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/info.c branches/ntvdm/drivers/network/dd/rtl8139/interrupt.c - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/interrupt.c branches/ntvdm/drivers/network/dd/rtl8139/ndis.c - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/ndis.c branches/ntvdm/drivers/network/dd/rtl8139/nic.h - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/nic.h branches/ntvdm/drivers/network/dd/rtl8139/rtl8139.rc - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/rtl8139.rc branches/ntvdm/drivers/network/dd/rtl8139/rtlhw.h - copied unchanged from r59468, trunk/reactos/drivers/network/dd/rtl8139/rtlhw.h branches/ntvdm/include/psdk/d3d10.idl - copied unchanged from r59468, trunk/reactos/include/psdk/d3d10.idl branches/ntvdm/include/psdk/d3d10effect.h - copied unchanged from r59468, trunk/reactos/include/psdk/d3d10effect.h branches/ntvdm/include/psdk/d3d10misc.h - copied unchanged from r59468, trunk/reactos/include/psdk/d3d10misc.h branches/ntvdm/include/psdk/d3d10shader.h - copied unchanged from r59468, trunk/reactos/include/psdk/d3d10shader.h branches/ntvdm/include/psdk/d3dcommon.idl - copied unchanged from r59468, trunk/reactos/include/psdk/d3dcommon.idl branches/ntvdm/include/psdk/dxgi.idl - copied unchanged from r59468, trunk/reactos/include/psdk/dxgi.idl branches/ntvdm/include/psdk/dxgiformat.h - copied unchanged from r59468, trunk/reactos/include/psdk/dxgiformat.h branches/ntvdm/include/psdk/dxgitype.h - copied unchanged from r59468, trunk/reactos/include/psdk/dxgitype.h branches/ntvdm/include/psdk/wbemprov.idl - copied unchanged from r59468, trunk/reactos/include/psdk/wbemprov.idl branches/ntvdm/include/reactos/drivers/condrv/ (props changed) - copied from r59468, trunk/reactos/include/reactos/drivers/condrv/ branches/ntvdm/include/reactos/wine/strmbase.h - copied unchanged from r59468, trunk/reactos/include/reactos/wine/strmbase.h branches/ntvdm/include/reactos/wine/winedxgi.idl - copied unchanged from r59468, trunk/reactos/include/reactos/wine/winedxgi.idl branches/ntvdm/lib/3rdparty/strmbase/ - copied from r59468, trunk/reactos/lib/3rdparty/strmbase/ branches/ntvdm/lib/sdk/cpprt/ (props changed) - copied from r59468, trunk/reactos/lib/sdk/cpprt/ branches/ntvdm/media/inf/netrtl.inf - copied unchanged from r59468, trunk/reactos/media/inf/netrtl.inf branches/ntvdm/win32ss/user/winsrv/consrv/ (props changed) - copied from r59468, trunk/reactos/win32ss/user/winsrv/consrv/ branches/ntvdm/win32ss/user/winsrv/consrv.cmake - copied unchanged from r59468, trunk/reactos/win32ss/user/winsrv/consrv.cmake branches/ntvdm/win32ss/user/winsrv/usersrv/ (props changed) - copied from r59468, trunk/reactos/win32ss/user/winsrv/usersrv/ branches/ntvdm/win32ss/user/winsrv/usersrv.cmake - copied unchanged from r59468, trunk/reactos/win32ss/user/winsrv/usersrv.cmake Removed: branches/ntvdm/dll/directx/quartz/control.c branches/ntvdm/dll/directx/quartz/control_private.h branches/ntvdm/dll/directx/quartz/enumpins.c branches/ntvdm/dll/directx/quartz/transform.c branches/ntvdm/dll/directx/quartz/transform.h branches/ntvdm/drivers/network/dd/rtl8139/include/ branches/ntvdm/include/dxsdk/strmif.idl branches/ntvdm/tools/getdate.c branches/ntvdm/tools/getdate.cmd branches/ntvdm/tools/getdate.exe branches/ntvdm/win32ss/user/consrv/ branches/ntvdm/win32ss/user/winsrv/api.h branches/ntvdm/win32ss/user/winsrv/harderror.c branches/ntvdm/win32ss/user/winsrv/lang/ branches/ntvdm/win32ss/user/winsrv/register.c branches/ntvdm/win32ss/user/winsrv/resource.h branches/ntvdm/win32ss/user/winsrv/rsrc.rc branches/ntvdm/win32ss/user/winsrv/shutdown.c branches/ntvdm/win32ss/user/winsrv/winsrv.h Modified: branches/ntvdm/ (props changed) branches/ntvdm/CMakeLists.txt branches/ntvdm/base/applications/atactl/CMakeLists.txt branches/ntvdm/base/applications/calc/lang/tr-TR.rc branches/ntvdm/base/applications/charmap/lang/tr-TR.rc branches/ntvdm/base/applications/dxdiag/lang/tr-TR.rc branches/ntvdm/base/applications/fontview/fontview.c branches/ntvdm/base/applications/fontview/fontview.h branches/ntvdm/base/applications/fontview/fontview.rc branches/ntvdm/base/applications/games/solitaire/CMakeLists.txt branches/ntvdm/base/applications/games/solitaire/lang/tr-TR.rc branches/ntvdm/base/applications/games/spider/CMakeLists.txt branches/ntvdm/base/applications/games/spider/lang/tr-TR.rc branches/ntvdm/base/applications/games/winmine/lang/tr-TR.rc branches/ntvdm/base/applications/kbswitch/kbswitch.c branches/ntvdm/base/applications/kbswitch/lang/tr-TR.rc branches/ntvdm/base/applications/magnify/lang/tr-TR.rc branches/ntvdm/base/applications/magnify/magnifier.c branches/ntvdm/base/applications/magnify/magnifier.h branches/ntvdm/base/applications/mmc/rsrc.rc branches/ntvdm/base/applications/mplay32/lang/tr-TR.rc branches/ntvdm/base/applications/msconfig/rsrc.rc branches/ntvdm/base/applications/mscutils/devmgmt/devmgmt.c branches/ntvdm/base/applications/mscutils/devmgmt/precomp.h branches/ntvdm/base/applications/mscutils/servman/precomp.h branches/ntvdm/base/applications/mscutils/servman/servman.c branches/ntvdm/base/applications/mspaint/lang/tr-TR.rc branches/ntvdm/base/applications/mstsc/lang/tr-TR.rc branches/ntvdm/base/applications/network/CMakeLists.txt branches/ntvdm/base/applications/network/telnet/CMakeLists.txt branches/ntvdm/base/applications/network/telnet/src/precomp.h branches/ntvdm/base/applications/notepad/lang/tr-TR.rc branches/ntvdm/base/applications/notepad/main.c branches/ntvdm/base/applications/rapps/lang/tr-TR.rc branches/ntvdm/base/applications/rapps/rapps/7zip.txt branches/ntvdm/base/applications/rapps/rapps/abyss.txt branches/ntvdm/base/applications/rapps/rapps/doublecommander.txt branches/ntvdm/base/applications/rapps/rapps/fap.txt branches/ntvdm/base/applications/rapps/rapps/firefox5.txt branches/ntvdm/base/applications/rapps/rapps/freebasic.txt branches/ntvdm/base/applications/rapps/rapps/irfanview.txt branches/ntvdm/base/applications/rapps/rapps/irfanviewplugins.txt branches/ntvdm/base/applications/rapps/rapps/libreoffice.txt branches/ntvdm/base/applications/rapps/rapps/mirandaim.txt branches/ntvdm/base/applications/rapps/rapps/mpc.txt branches/ntvdm/base/applications/rapps/rapps/npp.txt branches/ntvdm/base/applications/rapps/rapps/openttd.txt branches/ntvdm/base/applications/rapps/rapps/scite.txt branches/ntvdm/base/applications/rapps/rapps/scummvm.txt branches/ntvdm/base/applications/rapps/rapps/thunderbird5.txt branches/ntvdm/base/applications/rapps/rapps/vlc.txt branches/ntvdm/base/applications/rapps/winmain.c branches/ntvdm/base/applications/regedit/childwnd.c branches/ntvdm/base/applications/regedit/clb/rsrc.rc branches/ntvdm/base/applications/regedit/main.c branches/ntvdm/base/applications/regedit/main.h branches/ntvdm/base/applications/regedit/rsrc.rc branches/ntvdm/base/applications/regedit/settings.c branches/ntvdm/base/applications/regedit/treeview.c branches/ntvdm/base/applications/sndrec32/CMakeLists.txt branches/ntvdm/base/applications/sndrec32/lang/tr-TR.rc branches/ntvdm/base/applications/taskmgr/rsrc.rc branches/ntvdm/base/services/svchost/svchost.c branches/ntvdm/base/services/svchost/svchost.h branches/ntvdm/base/shell/CMakeLists.txt branches/ntvdm/base/shell/cmd/alias.c branches/ntvdm/base/shell/cmd/assoc.c branches/ntvdm/base/shell/cmd/attrib.c branches/ntvdm/base/shell/cmd/batch.c branches/ntvdm/base/shell/cmd/batch.h branches/ntvdm/base/shell/cmd/beep.c branches/ntvdm/base/shell/cmd/call.c branches/ntvdm/base/shell/cmd/chcp.c branches/ntvdm/base/shell/cmd/choice.c branches/ntvdm/base/shell/cmd/cls.c branches/ntvdm/base/shell/cmd/cmd.c branches/ntvdm/base/shell/cmd/cmd.h branches/ntvdm/base/shell/cmd/cmd.rc branches/ntvdm/base/shell/cmd/cmdinput.c branches/ntvdm/base/shell/cmd/cmdtable.c branches/ntvdm/base/shell/cmd/color.c branches/ntvdm/base/shell/cmd/console.c branches/ntvdm/base/shell/cmd/copy.c branches/ntvdm/base/shell/cmd/date.c branches/ntvdm/base/shell/cmd/del.c branches/ntvdm/base/shell/cmd/delay.c branches/ntvdm/base/shell/cmd/dir.c branches/ntvdm/base/shell/cmd/dirstack.c branches/ntvdm/base/shell/cmd/echo.c branches/ntvdm/base/shell/cmd/error.c branches/ntvdm/base/shell/cmd/filecomp.c branches/ntvdm/base/shell/cmd/for.c branches/ntvdm/base/shell/cmd/free.c branches/ntvdm/base/shell/cmd/goto.c branches/ntvdm/base/shell/cmd/history.c branches/ntvdm/base/shell/cmd/if.c branches/ntvdm/base/shell/cmd/internal.c branches/ntvdm/base/shell/cmd/label.c branches/ntvdm/base/shell/cmd/lang/de-DE.rc branches/ntvdm/base/shell/cmd/lang/el-GR.rc branches/ntvdm/base/shell/cmd/lang/en-US.rc branches/ntvdm/base/shell/cmd/lang/es-ES.rc branches/ntvdm/base/shell/cmd/lang/fr-FR.rc branches/ntvdm/base/shell/cmd/lang/hu-HU.rc branches/ntvdm/base/shell/cmd/lang/id-ID.rc branches/ntvdm/base/shell/cmd/lang/it-IT.rc branches/ntvdm/base/shell/cmd/lang/ja-JP.rc branches/ntvdm/base/shell/cmd/lang/no-NO.rc branches/ntvdm/base/shell/cmd/lang/pl-PL.rc branches/ntvdm/base/shell/cmd/lang/ro-RO.rc branches/ntvdm/base/shell/cmd/lang/ru-RU.rc branches/ntvdm/base/shell/cmd/lang/sk-SK.rc branches/ntvdm/base/shell/cmd/lang/sv-SE.rc branches/ntvdm/base/shell/cmd/lang/uk-UA.rc branches/ntvdm/base/shell/cmd/lang/zh-CN.rc branches/ntvdm/base/shell/cmd/locale.c branches/ntvdm/base/shell/cmd/memory.c branches/ntvdm/base/shell/cmd/misc.c branches/ntvdm/base/shell/cmd/mklink.c branches/ntvdm/base/shell/cmd/move.c branches/ntvdm/base/shell/cmd/msgbox.c branches/ntvdm/base/shell/cmd/parser.c branches/ntvdm/base/shell/cmd/path.c branches/ntvdm/base/shell/cmd/pause.c branches/ntvdm/base/shell/cmd/prompt.c branches/ntvdm/base/shell/cmd/readme.txt branches/ntvdm/base/shell/cmd/redir.c branches/ntvdm/base/shell/cmd/ren.c branches/ntvdm/base/shell/cmd/ren.txt branches/ntvdm/base/shell/cmd/replace.c branches/ntvdm/base/shell/cmd/resource.h branches/ntvdm/base/shell/cmd/screen.c branches/ntvdm/base/shell/cmd/set.c branches/ntvdm/base/shell/cmd/setlocal.c branches/ntvdm/base/shell/cmd/shift.c branches/ntvdm/base/shell/cmd/start.c branches/ntvdm/base/shell/cmd/strtoclr.c branches/ntvdm/base/shell/cmd/time.c branches/ntvdm/base/shell/cmd/timer.c branches/ntvdm/base/shell/cmd/title.c branches/ntvdm/base/shell/cmd/todo.txt branches/ntvdm/base/shell/cmd/type.c branches/ntvdm/base/shell/cmd/ver.c branches/ntvdm/base/shell/cmd/verify.c branches/ntvdm/base/shell/cmd/vol.c branches/ntvdm/base/shell/cmd/where.c branches/ntvdm/base/shell/cmd/window.c branches/ntvdm/base/shell/explorer/CMakeLists.txt branches/ntvdm/boot/bootdata/hivesys.inf branches/ntvdm/boot/bootdata/packages/reactos.dff.in branches/ntvdm/boot/freeldr/freeldr/ui/tui.c branches/ntvdm/cmake/CMakeMacros.cmake branches/ntvdm/cmake/compilerflags.cmake branches/ntvdm/cmake/gcc.cmake branches/ntvdm/cmake/msvc.cmake branches/ntvdm/configure.cmd branches/ntvdm/configure.sh branches/ntvdm/dll/cpl/console/CMakeLists.txt branches/ntvdm/dll/cpl/desk/general.c branches/ntvdm/dll/cpl/desk/lang/bg-BG.rc branches/ntvdm/dll/cpl/desk/lang/cs-CZ.rc branches/ntvdm/dll/cpl/desk/lang/de-DE.rc branches/ntvdm/dll/cpl/desk/lang/el-GR.rc branches/ntvdm/dll/cpl/desk/lang/en-US.rc branches/ntvdm/dll/cpl/desk/lang/es-ES.rc branches/ntvdm/dll/cpl/desk/lang/fr-FR.rc branches/ntvdm/dll/cpl/desk/lang/he-IL.rc branches/ntvdm/dll/cpl/desk/lang/hu-HU.rc branches/ntvdm/dll/cpl/desk/lang/id-ID.rc branches/ntvdm/dll/cpl/desk/lang/it-IT.rc branches/ntvdm/dll/cpl/desk/lang/ja-JP.rc branches/ntvdm/dll/cpl/desk/lang/nl-NL.rc branches/ntvdm/dll/cpl/desk/lang/no-NO.rc branches/ntvdm/dll/cpl/desk/lang/pl-PL.rc branches/ntvdm/dll/cpl/desk/lang/ro-RO.rc branches/ntvdm/dll/cpl/desk/lang/ru-RU.rc branches/ntvdm/dll/cpl/desk/lang/sk-SK.rc branches/ntvdm/dll/cpl/desk/lang/sv-SE.rc branches/ntvdm/dll/cpl/desk/lang/uk-UA.rc branches/ntvdm/dll/cpl/desk/lang/zh-CN.rc branches/ntvdm/dll/cpl/usrmgr/lang/de-DE.rc branches/ntvdm/dll/directx/CMakeLists.txt branches/ntvdm/dll/directx/devenum/createdevenum.c branches/ntvdm/dll/directx/ksproxy/CMakeLists.txt branches/ntvdm/dll/directx/quartz/CMakeLists.txt branches/ntvdm/dll/directx/quartz/acmwrapper.c branches/ntvdm/dll/directx/quartz/avidec.c branches/ntvdm/dll/directx/quartz/avisplit.c branches/ntvdm/dll/directx/quartz/dsoundrender.c branches/ntvdm/dll/directx/quartz/enumfilters.c branches/ntvdm/dll/directx/quartz/enummedia.c branches/ntvdm/dll/directx/quartz/enummoniker.c branches/ntvdm/dll/directx/quartz/enumregfilters.c branches/ntvdm/dll/directx/quartz/filesource.c branches/ntvdm/dll/directx/quartz/filtergraph.c branches/ntvdm/dll/directx/quartz/filtermapper.c branches/ntvdm/dll/directx/quartz/main.c branches/ntvdm/dll/directx/quartz/memallocator.c branches/ntvdm/dll/directx/quartz/mpegsplit.c branches/ntvdm/dll/directx/quartz/nullrenderer.c branches/ntvdm/dll/directx/quartz/parser.c branches/ntvdm/dll/directx/quartz/parser.h branches/ntvdm/dll/directx/quartz/pin.c branches/ntvdm/dll/directx/quartz/pin.h branches/ntvdm/dll/directx/quartz/quartz_private.h branches/ntvdm/dll/directx/quartz/quartz_strmif.idl branches/ntvdm/dll/directx/quartz/regsvr.c branches/ntvdm/dll/directx/quartz/systemclock.c branches/ntvdm/dll/directx/quartz/version.rc branches/ntvdm/dll/directx/quartz/videorenderer.c branches/ntvdm/dll/directx/quartz/waveparser.c branches/ntvdm/dll/opengl/glu32/CMakeLists.txt branches/ntvdm/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt branches/ntvdm/dll/opengl/mesa/src/glsl/CMakeLists.txt branches/ntvdm/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt branches/ntvdm/dll/opengl/mesa/src/mesa/CMakeLists.txt branches/ntvdm/dll/win32/CMakeLists.txt branches/ntvdm/dll/win32/advapi32/misc/logon.c branches/ntvdm/dll/win32/advapi32/sec/sid.c branches/ntvdm/dll/win32/avicap32/avicap32.c branches/ntvdm/dll/win32/browseui/CMakeLists.txt branches/ntvdm/dll/win32/browseui/aclmulti.h branches/ntvdm/dll/win32/browseui/addressband.h branches/ntvdm/dll/win32/browseui/addresseditbox.h branches/ntvdm/dll/win32/browseui/bandsite.h branches/ntvdm/dll/win32/browseui/bandsitemenu.cpp branches/ntvdm/dll/win32/browseui/bandsitemenu.h branches/ntvdm/dll/win32/browseui/brandband.h branches/ntvdm/dll/win32/browseui/browseui.cpp branches/ntvdm/dll/win32/browseui/commonbrowser.cpp branches/ntvdm/dll/win32/browseui/commonbrowser.h branches/ntvdm/dll/win32/browseui/globalfoldersettings.h branches/ntvdm/dll/win32/browseui/regtreeoptions.h branches/ntvdm/dll/win32/getuname/CMakeLists.txt branches/ntvdm/dll/win32/getuname/getuname.c branches/ntvdm/dll/win32/getuname/getuname.rc branches/ntvdm/dll/win32/kernel32/client/console/console.c branches/ntvdm/dll/win32/kernel32/client/console/init.c branches/ntvdm/dll/win32/kernel32/client/console/readwrite.c branches/ntvdm/dll/win32/kernel32/client/file/rw.c branches/ntvdm/dll/win32/kernel32/client/path.c branches/ntvdm/dll/win32/kernel32/client/synch.c branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/dll/win32/mshtml/CMakeLists.txt branches/ntvdm/dll/win32/mshtml/ifacewrap.c branches/ntvdm/dll/win32/msports/CMakeLists.txt branches/ntvdm/dll/win32/msports/lang/bg-BG.rc branches/ntvdm/dll/win32/msports/lang/de-DE.rc branches/ntvdm/dll/win32/msports/lang/en-US.rc branches/ntvdm/dll/win32/msports/lang/he-IL.rc branches/ntvdm/dll/win32/msports/lang/pl-PL.rc branches/ntvdm/dll/win32/msports/lang/ro-RO.rc branches/ntvdm/dll/win32/msports/lang/uk-UA.rc branches/ntvdm/dll/win32/msports/msports.spec branches/ntvdm/dll/win32/msports/resource.h branches/ntvdm/dll/win32/msv1_0/msv1_0.c branches/ntvdm/dll/win32/netapi32/CMakeLists.txt branches/ntvdm/dll/win32/netapi32/netapi32.h branches/ntvdm/dll/win32/netapi32/user.c branches/ntvdm/dll/win32/netshell/CMakeLists.txt branches/ntvdm/dll/win32/samlib/samlib.c branches/ntvdm/dll/win32/samsrv/CMakeLists.txt branches/ntvdm/dll/win32/samsrv/database.c branches/ntvdm/dll/win32/samsrv/samrpc.c branches/ntvdm/dll/win32/samsrv/samsrv.c branches/ntvdm/dll/win32/samsrv/samsrv.h branches/ntvdm/dll/win32/samsrv/samsrv.spec branches/ntvdm/dll/win32/samsrv/setup.c branches/ntvdm/dll/win32/shell32/CMakeLists.txt branches/ntvdm/drivers/base/CMakeLists.txt branches/ntvdm/drivers/filesystems/ext2/CMakeLists.txt branches/ntvdm/drivers/filesystems/mup/create.c branches/ntvdm/drivers/filesystems/npfs/create.c branches/ntvdm/drivers/hid/hidparse/ (props changed) branches/ntvdm/drivers/hid/hidusb/ (props changed) branches/ntvdm/drivers/network/dd/CMakeLists.txt branches/ntvdm/drivers/network/ndis/ndis/io.c branches/ntvdm/drivers/network/tcpip/include/titypes.h branches/ntvdm/drivers/network/tcpip/tcpip/dispatch.c branches/ntvdm/drivers/storage/ide/uniata/CMakeLists.txt branches/ntvdm/drivers/usb/usbehci/ (props changed) branches/ntvdm/drivers/usb/usbehci/CMakeLists.txt branches/ntvdm/drivers/usb/usbhub/ (props changed) branches/ntvdm/drivers/usb/usbohci/ (props changed) branches/ntvdm/drivers/usb/usbohci/CMakeLists.txt branches/ntvdm/drivers/usb/usbuhci/CMakeLists.txt branches/ntvdm/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt branches/ntvdm/include/c++/stlport/stl/config/_reactos.h branches/ntvdm/include/ddk/ntifs.h branches/ntvdm/include/ddk/wdm.h branches/ntvdm/include/dxsdk/CMakeLists.txt branches/ntvdm/include/dxsdk/axextend.idl branches/ntvdm/include/ndk/lpcfuncs.h branches/ntvdm/include/ndk/rtlfuncs.h branches/ntvdm/include/psdk/CMakeLists.txt branches/ntvdm/include/psdk/control.idl branches/ntvdm/include/psdk/ipifcons.h branches/ntvdm/include/psdk/iptypes.h branches/ntvdm/include/psdk/ntdef.h branches/ntvdm/include/psdk/shldisp.idl branches/ntvdm/include/psdk/shlguid.h branches/ntvdm/include/psdk/shlguid_undoc.h branches/ntvdm/include/psdk/shlobj.h branches/ntvdm/include/psdk/shobjidl.idl branches/ntvdm/include/psdk/strmif.idl branches/ntvdm/include/psdk/wbemcli.idl branches/ntvdm/include/psdk/winbase.h branches/ntvdm/include/psdk/winternl.h branches/ntvdm/include/reactos/libs/zlib/zconf.h branches/ntvdm/include/reactos/libs/zlib/zlib.h branches/ntvdm/include/reactos/subsys/win/conmsg.h branches/ntvdm/include/reactos/version.cmake branches/ntvdm/include/reactos/wine/CMakeLists.txt branches/ntvdm/include/xdk/extypes.h branches/ntvdm/lib/3rdparty/stlport/CMakeLists.txt branches/ntvdm/lib/3rdparty/zlib/ChangeLog branches/ntvdm/lib/3rdparty/zlib/Makefile.in branches/ntvdm/lib/3rdparty/zlib/README branches/ntvdm/lib/3rdparty/zlib/compress.c branches/ntvdm/lib/3rdparty/zlib/configure branches/ntvdm/lib/3rdparty/zlib/deflate.c branches/ntvdm/lib/3rdparty/zlib/deflate.h branches/ntvdm/lib/3rdparty/zlib/gzguts.h branches/ntvdm/lib/3rdparty/zlib/gzlib.c branches/ntvdm/lib/3rdparty/zlib/gzread.c branches/ntvdm/lib/3rdparty/zlib/gzwrite.c branches/ntvdm/lib/3rdparty/zlib/infback.c branches/ntvdm/lib/3rdparty/zlib/inffast.c branches/ntvdm/lib/3rdparty/zlib/inflate.c branches/ntvdm/lib/3rdparty/zlib/inftrees.c branches/ntvdm/lib/3rdparty/zlib/trees.c branches/ntvdm/lib/3rdparty/zlib/uncompr.c branches/ntvdm/lib/3rdparty/zlib/zutil.c branches/ntvdm/lib/3rdparty/zlib/zutil.h branches/ntvdm/lib/atl/CMakeLists.txt branches/ntvdm/lib/atl/atlbase.h branches/ntvdm/lib/drivers/libusb/CMakeLists.txt branches/ntvdm/lib/drivers/libusb/common_interfaces.h (props changed) branches/ntvdm/lib/drivers/libusb/hcd_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/hub_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.h (props changed) branches/ntvdm/lib/drivers/libusb/memory_manager.cpp (props changed) branches/ntvdm/lib/drivers/libusb/misc.cpp (props changed) branches/ntvdm/lib/drivers/libusb/purecall.cpp (props changed) branches/ntvdm/lib/drivers/libusb/usb_device.cpp (props changed) branches/ntvdm/lib/drivers/lwip/src/rostcp.c branches/ntvdm/lib/drivers/sound/stdunk/CMakeLists.txt branches/ntvdm/lib/lsalib/lsa.c branches/ntvdm/lib/rtl/error.c branches/ntvdm/lib/rtl/path.c branches/ntvdm/lib/sdk/CMakeLists.txt branches/ntvdm/lib/sdk/comsupp/CMakeLists.txt branches/ntvdm/lib/sdk/cpprt/i386/ (props changed) branches/ntvdm/lib/sdk/crt/misc/environ.c branches/ntvdm/lib/sdk/crt/string/scanf.h branches/ntvdm/lib/sdk/uuid/otherguids.c branches/ntvdm/media/doc/README.WINE branches/ntvdm/media/inf/CMakeLists.txt branches/ntvdm/media/inf/shortcuts.inf branches/ntvdm/media/inf/syssetup.inf branches/ntvdm/ntoskrnl/fsrtl/largemcb.c branches/ntvdm/ntoskrnl/fstub/fstubex.c branches/ntvdm/ntoskrnl/se/token.c branches/ntvdm/tools/widl/header.c branches/ntvdm/win32ss/CMakeLists.txt branches/ntvdm/win32ss/gdi/ntgdi/icm.c branches/ntvdm/win32ss/gdi/ntgdi/stockobj.c branches/ntvdm/win32ss/user/ntuser/hotkey.c branches/ntvdm/win32ss/user/winsrv/CMakeLists.txt branches/ntvdm/win32ss/user/winsrv/consrv/condrv/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv/frontends/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv/frontends/gui/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv/frontends/gui/lang/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv/frontends/gui/res/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv/frontends/tui/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv/lang/ (props changed) branches/ntvdm/win32ss/user/winsrv/init.c branches/ntvdm/win32ss/user/winsrv/usersrv/lang/ (props changed) branches/ntvdm/win32ss/user/winsrv/winsrv.rc branches/ntvdm/win32ss/user/winsrv/winsrv.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/CMakeLists.txt?rev=59499&… Modified: branches/ntvdm/base/applications/atactl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/atactl/… Modified: branches/ntvdm/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/calc/la… Modified: branches/ntvdm/base/applications/charmap/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/charmap… Modified: branches/ntvdm/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/dxdiag/… Modified: branches/ntvdm/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/fontvie… Modified: branches/ntvdm/base/applications/fontview/fontview.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/fontvie… Modified: branches/ntvdm/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/fontvie… Modified: branches/ntvdm/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/games/s… Modified: branches/ntvdm/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/games/s… Modified: branches/ntvdm/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/games/s… Modified: branches/ntvdm/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/games/s… Modified: branches/ntvdm/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/games/w… Modified: branches/ntvdm/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/kbswitc… Modified: branches/ntvdm/base/applications/kbswitch/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/kbswitc… Modified: branches/ntvdm/base/applications/magnify/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/magnify… Modified: branches/ntvdm/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/magnify… Modified: branches/ntvdm/base/applications/magnify/magnifier.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/magnify… Modified: branches/ntvdm/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mmc/rsr… Modified: branches/ntvdm/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mplay32… Modified: branches/ntvdm/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/msconfi… Modified: branches/ntvdm/base/applications/mscutils/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mscutil… Modified: branches/ntvdm/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mscutil… Modified: branches/ntvdm/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mscutil… Modified: branches/ntvdm/base/applications/mscutils/servman/servman.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mscutil… Modified: branches/ntvdm/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mspaint… Modified: branches/ntvdm/base/applications/mstsc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mstsc/l… Modified: branches/ntvdm/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/network… Modified: branches/ntvdm/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/network… Modified: branches/ntvdm/base/applications/network/telnet/src/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/network… Modified: branches/ntvdm/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/notepad… Modified: branches/ntvdm/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/notepad… Modified: branches/ntvdm/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/l… Modified: branches/ntvdm/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/w… Modified: branches/ntvdm/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/sndrec3… Modified: branches/ntvdm/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/sndrec3… Modified: branches/ntvdm/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/taskmgr… Modified: branches/ntvdm/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/services/svchost/svc… Modified: branches/ntvdm/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/services/svchost/svc… Modified: branches/ntvdm/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/CMakeLists.txt… Modified: branches/ntvdm/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/alias.c?re… Modified: branches/ntvdm/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/assoc.c?re… Modified: branches/ntvdm/base/shell/cmd/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/attrib.c?r… Modified: branches/ntvdm/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/batch.c?re… Modified: branches/ntvdm/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/batch.h?re… Modified: branches/ntvdm/base/shell/cmd/beep.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/beep.c?rev… Modified: branches/ntvdm/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/call.c?rev… Modified: branches/ntvdm/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/chcp.c?rev… Modified: branches/ntvdm/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/choice.c?r… Modified: branches/ntvdm/base/shell/cmd/cls.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/cls.c?rev=… Modified: branches/ntvdm/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/cmd.c?rev=… Modified: branches/ntvdm/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/cmd.h?rev=… Modified: branches/ntvdm/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/cmd.rc?rev… Modified: branches/ntvdm/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/cmdinput.c… Modified: branches/ntvdm/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/cmdtable.c… Modified: branches/ntvdm/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/color.c?re… Modified: branches/ntvdm/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/console.c?… Modified: branches/ntvdm/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/copy.c?rev… Modified: branches/ntvdm/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/date.c?rev… Modified: branches/ntvdm/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/del.c?rev=… Modified: branches/ntvdm/base/shell/cmd/delay.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/delay.c?re… Modified: branches/ntvdm/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/dir.c?rev=… Modified: branches/ntvdm/base/shell/cmd/dirstack.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/dirstack.c… Modified: branches/ntvdm/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/echo.c?rev… Modified: branches/ntvdm/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/error.c?re… Modified: branches/ntvdm/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/filecomp.c… Modified: branches/ntvdm/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/for.c?rev=… Modified: branches/ntvdm/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/free.c?rev… Modified: branches/ntvdm/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/goto.c?rev… Modified: branches/ntvdm/base/shell/cmd/history.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/history.c?… Modified: branches/ntvdm/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/if.c?rev=5… Modified: branches/ntvdm/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/internal.c… Modified: branches/ntvdm/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/label.c?re… Modified: branches/ntvdm/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/de-DE… Modified: branches/ntvdm/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/el-GR… Modified: branches/ntvdm/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/en-US… Modified: branches/ntvdm/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/es-ES… Modified: branches/ntvdm/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/fr-FR… Modified: branches/ntvdm/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/hu-HU… Modified: branches/ntvdm/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/id-ID… Modified: branches/ntvdm/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/it-IT… Modified: branches/ntvdm/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/ja-JP… Modified: branches/ntvdm/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/no-NO… Modified: branches/ntvdm/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/pl-PL… Modified: branches/ntvdm/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/ro-RO… Modified: branches/ntvdm/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/ru-RU… Modified: branches/ntvdm/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/sk-SK… Modified: branches/ntvdm/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/sv-SE… Modified: branches/ntvdm/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/uk-UA… Modified: branches/ntvdm/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/lang/zh-CN… Modified: branches/ntvdm/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/locale.c?r… Modified: branches/ntvdm/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/memory.c?r… Modified: branches/ntvdm/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/misc.c?rev… Modified: branches/ntvdm/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/mklink.c?r… Modified: branches/ntvdm/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/move.c?rev… Modified: branches/ntvdm/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/msgbox.c?r… Modified: branches/ntvdm/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/parser.c?r… Modified: branches/ntvdm/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/path.c?rev… Modified: branches/ntvdm/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/pause.c?re… Modified: branches/ntvdm/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/prompt.c?r… Modified: branches/ntvdm/base/shell/cmd/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/readme.txt… Modified: branches/ntvdm/base/shell/cmd/redir.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/redir.c?re… Modified: branches/ntvdm/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/ren.c?rev=… Modified: branches/ntvdm/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/ren.txt?re… Modified: branches/ntvdm/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/replace.c?… Modified: branches/ntvdm/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/resource.h… Modified: branches/ntvdm/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/screen.c?r… Modified: branches/ntvdm/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/set.c?rev=… Modified: branches/ntvdm/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/setlocal.c… Modified: branches/ntvdm/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/shift.c?re… Modified: branches/ntvdm/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/start.c?re… Modified: branches/ntvdm/base/shell/cmd/strtoclr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/strtoclr.c… Modified: branches/ntvdm/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/time.c?rev… Modified: branches/ntvdm/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/timer.c?re… Modified: branches/ntvdm/base/shell/cmd/title.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/title.c?re… Modified: branches/ntvdm/base/shell/cmd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/todo.txt?r… Modified: branches/ntvdm/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/type.c?rev… Modified: branches/ntvdm/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/ver.c?rev=… Modified: branches/ntvdm/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/verify.c?r… Modified: branches/ntvdm/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/vol.c?rev=… Modified: branches/ntvdm/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/where.c?re… Modified: branches/ntvdm/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/window.c?r… Modified: branches/ntvdm/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/explorer/CMake… Modified: branches/ntvdm/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/boot/bootdata/hivesys.inf… Modified: branches/ntvdm/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/boot/bootdata/packages/re… Modified: branches/ntvdm/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/boot/freeldr/freeldr/ui/t… Modified: branches/ntvdm/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/CMakeMacros.cmake?r… Modified: branches/ntvdm/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/compilerflags.cmake… Modified: branches/ntvdm/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/gcc.cmake?rev=59499… Modified: branches/ntvdm/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/msvc.cmake?rev=5949… Modified: branches/ntvdm/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/configure.cmd?rev=59499&r… Modified: branches/ntvdm/configure.sh URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/configure.sh?rev=59499&r1… Modified: branches/ntvdm/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/console/CMakeList… Modified: branches/ntvdm/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/general.c?re… Modified: branches/ntvdm/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/bg-BG.r… Modified: branches/ntvdm/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/cs-CZ.r… Modified: branches/ntvdm/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/de-DE.r… Modified: branches/ntvdm/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/el-GR.r… Modified: branches/ntvdm/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/en-US.r… Modified: branches/ntvdm/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/es-ES.r… Modified: branches/ntvdm/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/fr-FR.r… Modified: branches/ntvdm/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/he-IL.r… Modified: branches/ntvdm/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/hu-HU.r… Modified: branches/ntvdm/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/id-ID.r… Modified: branches/ntvdm/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/it-IT.r… Modified: branches/ntvdm/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/ja-JP.r… Modified: branches/ntvdm/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/nl-NL.r… Modified: branches/ntvdm/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/no-NO.r… Modified: branches/ntvdm/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/pl-PL.r… Modified: branches/ntvdm/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/ro-RO.r… Modified: branches/ntvdm/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/ru-RU.r… Modified: branches/ntvdm/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/sk-SK.r… Modified: branches/ntvdm/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/sv-SE.r… Modified: branches/ntvdm/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/uk-UA.r… Modified: branches/ntvdm/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/desk/lang/zh-CN.r… Modified: branches/ntvdm/dll/cpl/usrmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/usrmgr/lang/de-DE… Modified: branches/ntvdm/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/CMakeLists.tx… Modified: branches/ntvdm/dll/directx/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/devenum/creat… Modified: branches/ntvdm/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/ksproxy/CMake… Modified: branches/ntvdm/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/CMakeL… Modified: branches/ntvdm/dll/directx/quartz/acmwrapper.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/acmwra… Modified: branches/ntvdm/dll/directx/quartz/avidec.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/avidec… Modified: branches/ntvdm/dll/directx/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/avispl… Removed: branches/ntvdm/dll/directx/quartz/control.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/contro… Removed: branches/ntvdm/dll/directx/quartz/control_private.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/contro… Modified: branches/ntvdm/dll/directx/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/dsound… Modified: branches/ntvdm/dll/directx/quartz/enumfilters.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/enumfi… Modified: branches/ntvdm/dll/directx/quartz/enummedia.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/enumme… Modified: branches/ntvdm/dll/directx/quartz/enummoniker.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/enummo… Removed: branches/ntvdm/dll/directx/quartz/enumpins.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/enumpi… Modified: branches/ntvdm/dll/directx/quartz/enumregfilters.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/enumre… Modified: branches/ntvdm/dll/directx/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/fileso… Modified: branches/ntvdm/dll/directx/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/filter… Modified: branches/ntvdm/dll/directx/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/filter… Modified: branches/ntvdm/dll/directx/quartz/main.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/main.c… Modified: branches/ntvdm/dll/directx/quartz/memallocator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/memall… Modified: branches/ntvdm/dll/directx/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/mpegsp… Modified: branches/ntvdm/dll/directx/quartz/nullrenderer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/nullre… Modified: branches/ntvdm/dll/directx/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/parser… Modified: branches/ntvdm/dll/directx/quartz/parser.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/parser… Modified: branches/ntvdm/dll/directx/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/pin.c?… Modified: branches/ntvdm/dll/directx/quartz/pin.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/pin.h?… Modified: branches/ntvdm/dll/directx/quartz/quartz_private.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/quartz… Modified: branches/ntvdm/dll/directx/quartz/quartz_strmif.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/quartz… Modified: branches/ntvdm/dll/directx/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/regsvr… Modified: branches/ntvdm/dll/directx/quartz/systemclock.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/system… Removed: branches/ntvdm/dll/directx/quartz/transform.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/transf… Removed: branches/ntvdm/dll/directx/quartz/transform.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/transf… Modified: branches/ntvdm/dll/directx/quartz/version.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/versio… Modified: branches/ntvdm/dll/directx/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/videor… Modified: branches/ntvdm/dll/directx/quartz/waveparser.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/wavepa… Modified: branches/ntvdm/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/opengl/glu32/CMakeLis… Modified: branches/ntvdm/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/opengl/mesa/src/galli… Modified: branches/ntvdm/dll/opengl/mesa/src/glsl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/opengl/mesa/src/glsl/… Modified: branches/ntvdm/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/opengl/mesa/src/mapi/… Modified: branches/ntvdm/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/opengl/mesa/src/mesa/… Modified: branches/ntvdm/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/CMakeLists.txt?… Modified: branches/ntvdm/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/advapi32/misc/l… Modified: branches/ntvdm/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/advapi32/sec/si… Modified: branches/ntvdm/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/avicap32/avicap… Modified: branches/ntvdm/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/CMakeL… Modified: branches/ntvdm/dll/win32/browseui/aclmulti.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/aclmul… Modified: branches/ntvdm/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/addres… Modified: branches/ntvdm/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/addres… Modified: branches/ntvdm/dll/win32/browseui/bandsite.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/bandsi… Modified: branches/ntvdm/dll/win32/browseui/bandsitemenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/bandsi… Modified: branches/ntvdm/dll/win32/browseui/bandsitemenu.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/bandsi… Modified: branches/ntvdm/dll/win32/browseui/brandband.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/brandb… Modified: branches/ntvdm/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/browse… Modified: branches/ntvdm/dll/win32/browseui/commonbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/common… Modified: branches/ntvdm/dll/win32/browseui/commonbrowser.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/common… Modified: branches/ntvdm/dll/win32/browseui/globalfoldersettings.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/global… Modified: branches/ntvdm/dll/win32/browseui/regtreeoptions.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/regtre… Modified: branches/ntvdm/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/getuname/CMakeL… Modified: branches/ntvdm/dll/win32/getuname/getuname.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/getuname/getuna… Modified: branches/ntvdm/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/getuname/getuna… Modified: branches/ntvdm/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/file/rw.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/synch.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/mshtml/CMakeLis… Modified: branches/ntvdm/dll/win32/mshtml/ifacewrap.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/mshtml/ifacewra… Modified: branches/ntvdm/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/CMakeLi… Modified: branches/ntvdm/dll/win32/msports/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/lang/bg… Modified: branches/ntvdm/dll/win32/msports/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/lang/de… Modified: branches/ntvdm/dll/win32/msports/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/lang/en… Modified: branches/ntvdm/dll/win32/msports/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/lang/he… Modified: branches/ntvdm/dll/win32/msports/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/lang/pl… Modified: branches/ntvdm/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/lang/ro… Modified: branches/ntvdm/dll/win32/msports/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/lang/uk… Modified: branches/ntvdm/dll/win32/msports/msports.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/msports… Modified: branches/ntvdm/dll/win32/msports/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msports/resourc… Modified: branches/ntvdm/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msv1_0/msv1_0.c… Modified: branches/ntvdm/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netapi32/CMakeL… Modified: branches/ntvdm/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netapi32/netapi… Modified: branches/ntvdm/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netapi32/user.c… Modified: branches/ntvdm/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/CMakeL… Modified: branches/ntvdm/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samlib/samlib.c… Modified: branches/ntvdm/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/CMakeLis… Modified: branches/ntvdm/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/database… Modified: branches/ntvdm/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samrpc.c… Modified: branches/ntvdm/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samsrv.c… Modified: branches/ntvdm/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samsrv.h… Modified: branches/ntvdm/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samsrv.s… Modified: branches/ntvdm/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/setup.c?… Modified: branches/ntvdm/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/CMakeLi… Modified: branches/ntvdm/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/base/CMakeLists.t… Modified: branches/ntvdm/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/ext2/… Modified: branches/ntvdm/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/mup/c… Modified: branches/ntvdm/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/npfs/… Modified: branches/ntvdm/drivers/network/dd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/dd/CMakeL… Modified: branches/ntvdm/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/ndis/ndis… Modified: branches/ntvdm/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/inc… Modified: branches/ntvdm/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/tcp… Modified: branches/ntvdm/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/storage/ide/uniat… Modified: branches/ntvdm/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbehci/CMake… Modified: branches/ntvdm/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbohci/CMake… Modified: branches/ntvdm/drivers/usb/usbuhci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbuhci/CMake… Modified: branches/ntvdm/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/wdm/audio/backpln… Modified: branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/wdm/audio/drivers… Modified: branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/wdm/audio/drivers… Modified: branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/wdm/audio/drivers… Modified: branches/ntvdm/include/c++/stlport/stl/config/_reactos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/c%2B%2B/stlport/s… Modified: branches/ntvdm/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/ntifs.h?rev=5… Modified: branches/ntvdm/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/wdm.h?rev=594… Modified: branches/ntvdm/include/dxsdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/dxsdk/CMakeLists.… Modified: branches/ntvdm/include/dxsdk/axextend.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/dxsdk/axextend.id… Removed: branches/ntvdm/include/dxsdk/strmif.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/dxsdk/strmif.idl?… Modified: branches/ntvdm/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ndk/lpcfuncs.h?re… Modified: branches/ntvdm/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ndk/rtlfuncs.h?re… Modified: branches/ntvdm/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/CMakeLists.t… Modified: branches/ntvdm/include/psdk/control.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/control.idl?… Modified: branches/ntvdm/include/psdk/ipifcons.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/ipifcons.h?r… Modified: branches/ntvdm/include/psdk/iptypes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/iptypes.h?re… Modified: branches/ntvdm/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/ntdef.h?rev=… Modified: branches/ntvdm/include/psdk/shldisp.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/shldisp.idl?… Modified: branches/ntvdm/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/shlguid.h?re… Modified: branches/ntvdm/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/shlguid_undo… Modified: branches/ntvdm/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/shlobj.h?rev… Modified: branches/ntvdm/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/shobjidl.idl… Modified: branches/ntvdm/include/psdk/strmif.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/strmif.idl?r… Modified: branches/ntvdm/include/psdk/wbemcli.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/wbemcli.idl?… Modified: branches/ntvdm/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/winbase.h?re… Modified: branches/ntvdm/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/winternl.h?r… Modified: branches/ntvdm/include/reactos/libs/zlib/zconf.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/zlib… Modified: branches/ntvdm/include/reactos/libs/zlib/zlib.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/zlib… Modified: branches/ntvdm/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/subsys/wi… Modified: branches/ntvdm/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/version.c… Modified: branches/ntvdm/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/wine/CMak… Modified: branches/ntvdm/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/xdk/extypes.h?rev… Modified: branches/ntvdm/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/stlport/CMak… Modified: branches/ntvdm/lib/3rdparty/zlib/ChangeLog URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/ChangeL… Modified: branches/ntvdm/lib/3rdparty/zlib/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/Makefil… Modified: branches/ntvdm/lib/3rdparty/zlib/README URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/README?… Modified: branches/ntvdm/lib/3rdparty/zlib/compress.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/compres… Modified: branches/ntvdm/lib/3rdparty/zlib/configure URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/configu… Modified: branches/ntvdm/lib/3rdparty/zlib/deflate.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/deflate… Modified: branches/ntvdm/lib/3rdparty/zlib/deflate.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/deflate… Modified: branches/ntvdm/lib/3rdparty/zlib/gzguts.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/gzguts.… Modified: branches/ntvdm/lib/3rdparty/zlib/gzlib.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/gzlib.c… Modified: branches/ntvdm/lib/3rdparty/zlib/gzread.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/gzread.… Modified: branches/ntvdm/lib/3rdparty/zlib/gzwrite.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/gzwrite… Modified: branches/ntvdm/lib/3rdparty/zlib/infback.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/infback… Modified: branches/ntvdm/lib/3rdparty/zlib/inffast.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/inffast… Modified: branches/ntvdm/lib/3rdparty/zlib/inflate.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/inflate… Modified: branches/ntvdm/lib/3rdparty/zlib/inftrees.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/inftree… Modified: branches/ntvdm/lib/3rdparty/zlib/trees.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/trees.c… Modified: branches/ntvdm/lib/3rdparty/zlib/uncompr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/uncompr… Modified: branches/ntvdm/lib/3rdparty/zlib/zutil.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/zutil.c… Modified: branches/ntvdm/lib/3rdparty/zlib/zutil.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/zlib/zutil.h… Modified: branches/ntvdm/lib/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/atl/CMakeLists.txt?re… Modified: branches/ntvdm/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/atl/atlbase.h?rev=594… Modified: branches/ntvdm/lib/drivers/libusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/libusb/CMakeL… Modified: branches/ntvdm/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/lwip/src/rost… Modified: branches/ntvdm/lib/drivers/sound/stdunk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/sound/stdunk/… Modified: branches/ntvdm/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/lsalib/lsa.c?rev=5949… Modified: branches/ntvdm/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/rtl/error.c?rev=59499… Modified: branches/ntvdm/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/rtl/path.c?rev=59499&… Modified: branches/ntvdm/lib/sdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/sdk/CMakeLists.txt?re… Modified: branches/ntvdm/lib/sdk/comsupp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/sdk/comsupp/CMakeList… Modified: branches/ntvdm/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/sdk/crt/misc/environ.… Modified: branches/ntvdm/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/sdk/crt/string/scanf.… Modified: branches/ntvdm/lib/sdk/uuid/otherguids.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/sdk/uuid/otherguids.c… Modified: branches/ntvdm/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/media/doc/README.WINE?rev… Modified: branches/ntvdm/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/media/inf/CMakeLists.txt?… Modified: branches/ntvdm/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/media/inf/shortcuts.inf?r… Modified: branches/ntvdm/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/media/inf/syssetup.inf?re… Modified: branches/ntvdm/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/fsrtl/largemcb.c… Modified: branches/ntvdm/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/fstub/fstubex.c?… Modified: branches/ntvdm/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/se/token.c?rev=5… Removed: branches/ntvdm/tools/getdate.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/getdate.c?rev=59498 Removed: branches/ntvdm/tools/getdate.cmd URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/getdate.cmd?rev=594… Removed: branches/ntvdm/tools/getdate.exe URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/getdate.exe?rev=594… Modified: branches/ntvdm/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/widl/header.c?rev=5… Modified: branches/ntvdm/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/CMakeLists.txt?re… Modified: branches/ntvdm/win32ss/gdi/ntgdi/icm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/gdi/ntgdi/icm.c?r… Modified: branches/ntvdm/win32ss/gdi/ntgdi/stockobj.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/gdi/ntgdi/stockob… Modified: branches/ntvdm/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/ntuser/hotke… Modified: branches/ntvdm/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/CMake… Removed: branches/ntvdm/win32ss/user/winsrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/api.h… Removed: branches/ntvdm/win32ss/user/winsrv/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/harde… Modified: branches/ntvdm/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/init.… Removed: branches/ntvdm/win32ss/user/winsrv/register.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/regis… Removed: branches/ntvdm/win32ss/user/winsrv/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/resou… Removed: branches/ntvdm/win32ss/user/winsrv/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/rsrc.… Removed: branches/ntvdm/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/shutd… Removed: branches/ntvdm/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/winsr… Modified: branches/ntvdm/win32ss/user/winsrv/winsrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/winsr… Modified: branches/ntvdm/win32ss/user/winsrv/winsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/winsr…

1 0

[hbelusca] 59498: [NTVDM] Fix the TESTING case, in case you run ntvdm without other parameters.
by hbelusca＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: hbelusca Date: Thu Jul 18 00:17:04 2013 New Revision: 59498 URL: http://svn.reactos.org/svn/reactos?rev=59498&view=rev Log: [NTVDM] Fix the TESTING case, in case you run ntvdm without other parameters. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c 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] Thu Jul 18 00:17:04 2013 @@ -15,6 +15,12 @@ #include "timer.h" #include "pic.h" #include "ps2.h" + +/* + * Activate this line if you want to be able to test NTVDM with: + * ntvdm.exe <program> + */ +// #define TESTING /* PUBLIC VARIABLES ***********************************************************/ @@ -84,7 +90,16 @@ /* The DOS command line must be ASCII */ WideCharToMultiByte(CP_ACP, 0, GetCommandLine(), -1, CommandLine, 128, NULL, NULL); #else - WideCharToMultiByte(CP_ACP, 0, argv[1], -1, CommandLine, 128, NULL, NULL); + if (argc == 2 && argv[1] != NULL) + { + WideCharToMultiByte(CP_ACP, 0, argv[1], -1, CommandLine, 128, NULL, NULL); + } + else + { + wprintf(L"\nReactOS Virtual DOS Machine\n\n" + L"Usage: NTVDM <executable>\n"); + return 0; + } #endif if (!EmulatorInitialize())

1 0

[aandrejevic] 59497: [NTVDM] Add a compile-time option (not default) to run ntvdm manually with the target executable as a parameter. Fix screen clearing bug. Rewrite several INT 10h functions to w...
by aandrejevic＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: aandrejevic Date: Thu Jul 18 00:01:18 2013 New Revision: 59497 URL: http://svn.reactos.org/svn/reactos?rev=59497&view=rev Log: [NTVDM] Add a compile-time option (not default) to run ntvdm manually with the target executable as a parameter. Fix screen clearing bug. Rewrite several INT 10h functions to work for all video pages. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Thu Jul 18 00:01:18 2013 @@ -661,11 +661,10 @@ VOID BiosVideoService() { - INT CursorHeight; + INT i, CursorHeight; BOOLEAN Invisible = FALSE; COORD Position; CONSOLE_CURSOR_INFO CursorInfo; - CONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo; CHAR_INFO Character; SMALL_RECT Rect; DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); @@ -673,7 +672,6 @@ DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); DWORD Ebx = EmulatorGetRegister(EMULATOR_REG_BX); - // TODO: Add support for multiple pages! switch (HIBYTE(Eax)) { /* Set Video Mode */ @@ -691,6 +689,10 @@ CursorHeight = (HIBYTE(Ecx) & 0x1F) - (LOBYTE(Ecx) & 0x1F); if (CursorHeight < 1) CursorHeight = 1; if (CursorHeight > 100) CursorHeight = 100; + + /* Update the BDA */ + Bda->CursorStartLine = HIBYTE(Ecx); + Bda->CursorEndLine = LOBYTE(Ecx) & 0x1F; /* Set the cursor */ CursorInfo.dwSize = (CursorHeight * 100) / CONSOLE_FONT_HEIGHT; @@ -723,20 +725,13 @@ /* Get Cursor Position */ case 0x03: { - INT StartLine; - /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - /* Retrieve the data */ - GetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); - - /* Find the first line */ - StartLine = 32 - ((CursorInfo.dwSize * 32) / 100); - /* Return the result */ EmulatorSetRegister(EMULATOR_REG_AX, 0); - EmulatorSetRegister(EMULATOR_REG_CX, (StartLine << 8) | 0x1F); + EmulatorSetRegister(EMULATOR_REG_CX, + (Bda->CursorStartLine << 8) | Bda->CursorEndLine); EmulatorSetRegister(EMULATOR_REG_DX, Bda->CursorPosition[HIBYTE(Ebx)]); break; @@ -758,9 +753,12 @@ } /* Scroll Up/Down Window */ + // TODO: Implement for different pages case 0x06: case 0x07: { + BYTE Lines = LOBYTE(Eax); + Rect.Top = HIBYTE(Ecx); Rect.Left = LOBYTE(Ecx); Rect.Bottom = HIBYTE(Edx); @@ -769,115 +767,94 @@ Character.Attributes = HIBYTE(Ebx); Position.X = Rect.Left; - if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - LOBYTE(Eax); - else Position.Y = Rect.Top + LOBYTE(Eax); + /* 0 means clear entire window */ + if (Lines == 0) Lines = Rect.Bottom - Rect.Top; + + if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - Lines; + else Position.Y = Rect.Top + Lines; ScrollConsoleScreenBuffer(BiosConsoleOutput, &Rect, &Rect, Position, &Character); + break; } /* Read Character And Attribute At Cursor Position */ case 0x08: { - COORD BufferSize = { 1, 1 }, Origin = { 0, 0 }; + DWORD Address; + + /* Make sure this is text mode */ + if (!VideoModes[CurrentVideoMode].Text) break; /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - - if (HIBYTE(Ebx) == CurrentVideoPage) - { - /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, - &ScreenBufferInfo); - - /* Read at cursor position */ - Rect.Left = ScreenBufferInfo.dwCursorPosition.X; - Rect.Top = ScreenBufferInfo.dwCursorPosition.Y; - /* Read the console output */ - ReadConsoleOutput(BiosConsoleOutput, - &Character, - BufferSize, - Origin, - &Rect); - - /* Return the result */ - EmulatorSetRegister(EMULATOR_REG_AX, - (LOBYTE(Character.Attributes) << 8) - | Character.Char.AsciiChar); - } - else - { - // TODO: NOT IMPLEMENTED - } + /* Find the address */ + Address = BiosGetVideoMemoryStart() + + HIBYTE(Ebx) * BiosGetVideoPageSize() + + (HIBYTE(Bda->CursorPosition[HIBYTE(Ebx)]) + * VideoModes[CurrentVideoMode].Height + + LOBYTE(Bda->CursorPosition[HIBYTE(Ebx)])) + * VideoModes[CurrentVideoMode].Bpp / 8; + + /* Update the video memory at that address */ + BiosUpdateVideoMemory(Address, + Address + VideoModes[CurrentVideoMode].Bpp / 8); + + /* Return the result in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + *((LPWORD)((ULONG_PTR)BaseAddress + Address))); break; } /* Write Character And Attribute At Cursor Position */ case 0x09: - { - DWORD CharsWritten; + case 0x0A: + { + BYTE PixelSize = VideoModes[CurrentVideoMode].Bpp / 8; + WORD Data = (LOBYTE(Ebx) << 8) | LOBYTE(Eax); + WORD Repeat = LOWORD(Ecx); + DWORD Address = BiosGetVideoMemoryStart() + + CurrentVideoPage * BiosGetVideoPageSize() + + (HIBYTE(Bda->CursorPosition[CurrentVideoPage]) + * VideoModes[CurrentVideoMode].Height + + LOBYTE(Bda->CursorPosition[CurrentVideoPage])) + * PixelSize; + + /* Make sure this is text mode */ + if (!VideoModes[CurrentVideoMode].Text) break; /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - if (HIBYTE(Ebx) == CurrentVideoPage) + /* Make sure we don't write over the end of video memory */ + Repeat = min(Repeat, + (CONSOLE_VIDEO_MEM_END - Address) + / PixelSize); + + /* Copy the values to the memory */ + for (i = 0; i < Repeat; i++) { - /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, - &ScreenBufferInfo); - - /* Write the attribute to the output */ - FillConsoleOutputAttribute(BiosConsoleOutput, - LOBYTE(Ebx), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); - - /* Write the character to the output */ - FillConsoleOutputCharacterA(BiosConsoleOutput, - LOBYTE(Eax), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); + if (PixelSize == sizeof(BYTE) || HIBYTE(Eax) == 0x0A) + { + /* Just characters, no attributes */ + *((LPBYTE)((ULONG_PTR)BaseAddress + Address) + i * PixelSize) = LOBYTE(Data); + } + else if (PixelSize == sizeof(WORD)) + { + /* First byte for characters, second for attributes */ + *((LPWORD)((ULONG_PTR)BaseAddress + Address) + i) = Data; + } } - else - { - // TODO: NOT IMPLEMENTED - } - - break; - } - - /* Write Character Only At Cursor Position */ - case 0x0A: - { - DWORD CharsWritten; - - /* Make sure the selected video page exists */ - if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - - if (HIBYTE(Ebx) == CurrentVideoPage) - { - /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, &ScreenBufferInfo); - - /* Write the character to the output */ - FillConsoleOutputCharacterA(BiosConsoleOutput, - LOBYTE(Eax), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); - } - else - { - // TODO: NOT IMPLEMENTED - } + + /* Update the range */ + BiosUpdateConsole(Address, + Address + Repeat * (VideoModes[CurrentVideoMode].Bpp / 8)); break; } @@ -911,6 +888,32 @@ MAKEWORD(Bda->VideoMode, Bda->ScreenColumns)); EmulatorSetRegister(EMULATOR_REG_BX, MAKEWORD(LOBYTE(Ebx), Bda->VideoPage)); + + break; + } + + /* Scroll Window */ + case 0x12: + { + Rect.Top = HIBYTE(Ecx); + Rect.Left = LOBYTE(Ecx); + Rect.Bottom = HIBYTE(Edx); + Rect.Right = LOBYTE(Edx); + Character.Char.UnicodeChar = L' '; + Character.Attributes = 0x07; + Position.X = Rect.Left; + Position.Y = Rect.Top; + + if (LOBYTE(Ebx) == 0) Position.Y -= LOBYTE(Eax); + else if (LOBYTE(Ebx) == 1) Position.Y += LOBYTE(Eax); + else if (LOBYTE(Ebx) == 2) Position.X -= LOBYTE(Eax); + else if (LOBYTE(Ebx) == 3) Position.X += LOBYTE(Eax); + + ScrollConsoleScreenBuffer(BiosConsoleOutput, + &Rect, + &Rect, + Position, + &Character); break; } 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] Thu Jul 18 00:01:18 2013 @@ -1393,10 +1393,14 @@ if (Segment != 0) { EmulatorSetRegister(EMULATOR_REG_AX, Segment); + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_NOT_ENOUGH_MEMORY); EmulatorSetRegister(EMULATOR_REG_BX, MaxAvailable); - EmulatorClearFlag(EMULATOR_FLAG_CF); - } - else EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetFlag(EMULATOR_FLAG_CF); + } break; } 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] Thu Jul 18 00:01:18 2013 @@ -80,8 +80,12 @@ /* Set the handler routine */ SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); +#ifndef TESTING /* The DOS command line must be ASCII */ WideCharToMultiByte(CP_ACP, 0, GetCommandLine(), -1, CommandLine, 128, NULL, NULL); +#else + WideCharToMultiByte(CP_ACP, 0, argv[1], -1, CommandLine, 128, NULL, NULL); +#endif if (!EmulatorInitialize()) {

1 0

[akhaldi] 59496: [RSYM] * Formatting. No intended code changes.
by akhaldi＠svn.reactos.org 17 Jul '13

17 Jul '13

Author: akhaldi Date: Wed Jul 17 14:42:33 2013 New Revision: 59496 URL: http://svn.reactos.org/svn/reactos?rev=59496&view=rev Log: [RSYM] * Formatting. No intended code changes. Modified: trunk/reactos/tools/rsym/rsym.c Modified: trunk/reactos/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=5949… ============================================================================== --- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Wed Jul 17 14:42:33 2013 @@ -30,17 +30,17 @@ static int CompareSymEntry(const PROSSYM_ENTRY SymEntry1, const PROSSYM_ENTRY SymEntry2) { - if (SymEntry1->Address < SymEntry2->Address) - { - return -1; - } - - if (SymEntry2->Address < SymEntry1->Address) - { - return +1; - } - - return 0; + if (SymEntry1->Address < SymEntry2->Address) + { + return -1; + } + + if (SymEntry2->Address < SymEntry1->Address) + { + return +1; + } + + return 0; } static int @@ -49,38 +49,36 @@ ULONG *StabSymbolsLength, void **StabSymbolsBase, ULONG *StabStringsLength, void **StabStringsBase) { - ULONG Idx; - - /* Load .stab and .stabstr sections if available */ - *StabSymbolsBase = NULL; - *StabSymbolsLength = 0; - *StabStringsBase = NULL; - *StabStringsLength = 0; - - for (Idx = 0; Idx < PEFileHeader->NumberOfSections; Idx++) - { - /* printf("section: '%.08s'\n", PESectionHeaders[Idx].Name); */ - if ((strncmp((char *) PESectionHeaders[Idx].Name, ".stab", 5) == 0) - && (PESectionHeaders[Idx].Name[5] == 0)) - { - /* printf(".stab section found. Size %d\n", - PESectionHeaders[Idx].SizeOfRawData); */ - - *StabSymbolsLength = PESectionHeaders[Idx].SizeOfRawData; - *StabSymbolsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); - } - - if (strncmp((char *) PESectionHeaders[Idx].Name, ".stabstr", 8) == 0) - { - /* printf(".stabstr section found. Size %d\n", - PESectionHeaders[Idx].SizeOfRawData); */ - - *StabStringsLength = PESectionHeaders[Idx].SizeOfRawData; - *StabStringsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); - } - } - - return 0; + ULONG Idx; + + /* Load .stab and .stabstr sections if available */ + *StabSymbolsBase = NULL; + *StabSymbolsLength = 0; + *StabStringsBase = NULL; + *StabStringsLength = 0; + + for (Idx = 0; Idx < PEFileHeader->NumberOfSections; Idx++) + { + /* printf("section: '%.08s'\n", PESectionHeaders[Idx].Name); */ + if ((strncmp((char *) PESectionHeaders[Idx].Name, ".stab", 5) == 0) + && (PESectionHeaders[Idx].Name[5] == 0)) + { + /* printf(".stab section found. Size %d\n", PESectionHeaders[Idx].SizeOfRawData); */ + + *StabSymbolsLength = PESectionHeaders[Idx].SizeOfRawData; + *StabSymbolsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); + } + + if (strncmp((char *) PESectionHeaders[Idx].Name, ".stabstr", 8) == 0) + { + /* printf(".stabstr section found. Size %d\n", PESectionHeaders[Idx].SizeOfRawData); */ + + *StabStringsLength = PESectionHeaders[Idx].SizeOfRawData; + *StabStringsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); + } + } + + return 0; } static int @@ -90,44 +88,44 @@ ULONG *CoffStringsLength, void **CoffStringsBase) { - if (0 == PEFileHeader->PointerToSymbolTable || 0 == PEFileHeader->NumberOfSymbols) - { - /* No COFF symbol table */ - *CoffSymbolsLength = 0; - *CoffStringsLength = 0; - } - else - { - *CoffSymbolsLength = PEFileHeader->NumberOfSymbols * sizeof(COFF_SYMENT); - *CoffSymbolsBase = (void *)((char *) FileData + PEFileHeader->PointerToSymbolTable); - *CoffStringsLength = *((ULONG *) ((char *) *CoffSymbolsBase + *CoffSymbolsLength)); - *CoffStringsBase = (void *)((char *) *CoffSymbolsBase + *CoffSymbolsLength); - } - - return 0; + if (PEFileHeader->PointerToSymbolTable == 0 || PEFileHeader->NumberOfSymbols == 0) + { + /* No COFF symbol table */ + *CoffSymbolsLength = 0; + *CoffStringsLength = 0; + } + else + { + *CoffSymbolsLength = PEFileHeader->NumberOfSymbols * sizeof(COFF_SYMENT); + *CoffSymbolsBase = (void *)((char *) FileData + PEFileHeader->PointerToSymbolTable); + *CoffStringsLength = *((ULONG *) ((char *) *CoffSymbolsBase + *CoffSymbolsLength)); + *CoffStringsBase = (void *)((char *) *CoffSymbolsBase + *CoffSymbolsLength); + } + + return 0; } static ULONG FindOrAddString(char *StringToFind, ULONG *StringsLength, void *StringsBase) { - char *Search, *End; - - Search = (char *) StringsBase; - End = Search + *StringsLength; - - while (Search < End) - { - if (0 == strcmp(Search, StringToFind)) - { - return Search - (char *) StringsBase; - } - Search += strlen(Search) + 1; - } - - strcpy(Search, StringToFind); - *StringsLength += strlen(StringToFind) + 1; - - return Search - (char *) StringsBase; + char *Search, *End; + + Search = (char *)StringsBase; + End = Search + *StringsLength; + + while (Search < End) + { + if (strcmp(Search, StringToFind) == 0) + { + return Search - (char *)StringsBase; + } + Search += strlen(Search) + 1; + } + + strcpy(Search, StringToFind); + *StringsLength += strlen(StringToFind) + 1; + + return Search - (char *)StringsBase; } static int @@ -138,129 +136,130 @@ ULONG_PTR ImageBase, PIMAGE_FILE_HEADER PEFileHeader, PIMAGE_SECTION_HEADER PESectionHeaders) { - PSTAB_ENTRY StabEntry; - ULONG Count, i; - ULONG_PTR Address, LastFunctionAddress; - int First = 1; - char *Name; - ULONG NameLen; - char FuncName[256]; - PROSSYM_ENTRY Current; - - StabEntry = StabSymbolsBase; - Count = StabSymbolsLength / sizeof(STAB_ENTRY); - *SymbolsCount = 0; - if (Count == 0) - { - /* No symbol info */ - *SymbolsBase = NULL; - return 0; - } - - *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); - if (NULL == *SymbolsBase) - { - fprintf(stderr, "Failed to allocate memory for converted .stab symbols\n"); - return 1; - } - Current = *SymbolsBase; - memset ( Current, 0, sizeof(*Current) ); - - LastFunctionAddress = 0; - for (i = 0; i < Count; i++) - { - if ( 0 == LastFunctionAddress ) - { - Address = StabEntry[i].n_value - ImageBase; - } - else - { - Address = LastFunctionAddress + StabEntry[i].n_value; - } - switch (StabEntry[i].n_type) - { - case N_SO: - case N_SOL: - case N_BINCL: - Name = (char *) StabStringsBase + StabEntry[i].n_strx; - if (StabStringsLength < StabEntry[i].n_strx - ||'\0' == *Name || '/' == Name[strlen(Name) - 1] - || '\\' == Name[strlen(Name) - 1] - || StabEntry[i].n_value < ImageBase) - { - continue; - } - if ( First || Address != Current->Address ) - { - if ( !First ) - { - memset ( ++Current, 0, sizeof(*Current) ); - Current->FunctionOffset = Current[-1].FunctionOffset; - } - else - First = 0; - Current->Address = Address; - } - Current->FileOffset = FindOrAddString((char *)StabStringsBase - + StabEntry[i].n_strx, - StringsLength, - StringsBase); - break; - case N_FUN: - if (0 == StabEntry[i].n_desc || StabEntry[i].n_value < ImageBase) - { - LastFunctionAddress = 0; /* line # 0 = end of function */ - continue; - } - if ( First || Address != Current->Address ) - { - if ( !First ) - memset ( ++Current, 0, sizeof(*Current) ); - else - First = 0; - Current->Address = Address; - Current->FileOffset = Current[-1].FileOffset; - } - Name = (char *) StabStringsBase + StabEntry[i].n_strx; - NameLen = strcspn(Name, ":"); - if (sizeof(FuncName) <= NameLen) - { - free(*SymbolsBase); - fprintf(stderr, "Function name too long\n"); - return 1; - } - memcpy(FuncName, Name, NameLen); - FuncName[NameLen] = '\0'; - Current->FunctionOffset = FindOrAddString(FuncName, + PSTAB_ENTRY StabEntry; + ULONG Count, i; + ULONG_PTR Address, LastFunctionAddress; + int First = 1; + char *Name; + ULONG NameLen; + char FuncName[256]; + PROSSYM_ENTRY Current; + + StabEntry = StabSymbolsBase; + Count = StabSymbolsLength / sizeof(STAB_ENTRY); + *SymbolsCount = 0; + + if (Count == 0) + { + /* No symbol info */ + *SymbolsBase = NULL; + return 0; + } + + *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); + if (*SymbolsBase == NULL) + { + fprintf(stderr, "Failed to allocate memory for converted .stab symbols\n"); + return 1; + } + Current = *SymbolsBase; + memset(Current, 0, sizeof(*Current)); + + LastFunctionAddress = 0; + for (i = 0; i < Count; i++) + { + if (LastFunctionAddress == 0) + { + Address = StabEntry[i].n_value - ImageBase; + } + else + { + Address = LastFunctionAddress + StabEntry[i].n_value; + } + switch (StabEntry[i].n_type) + { + case N_SO: + case N_SOL: + case N_BINCL: + Name = (char *) StabStringsBase + StabEntry[i].n_strx; + if (StabStringsLength < StabEntry[i].n_strx + || *Name == '\0' || Name[strlen(Name) - 1] == '/' + || Name[strlen(Name) - 1] == '\\' + || StabEntry[i].n_value < ImageBase) + { + continue; + } + if (First || Address != Current->Address) + { + if (!First) + { + memset(++Current, 0, sizeof(*Current)); + Current->FunctionOffset = Current[-1].FunctionOffset; + } + else + First = 0; + Current->Address = Address; + } + Current->FileOffset = FindOrAddString((char *)StabStringsBase + + StabEntry[i].n_strx, StringsLength, StringsBase); - Current->SourceLine = 0; - LastFunctionAddress = Address; - break; - case N_SLINE: - if ( First || Address != Current->Address ) - { - if ( !First ) - { - memset ( ++Current, 0, sizeof(*Current) ); + break; + case N_FUN: + if (StabEntry[i].n_desc == 0 || StabEntry[i].n_value < ImageBase) + { + LastFunctionAddress = 0; /* line # 0 = end of function */ + continue; + } + if (First || Address != Current->Address) + { + if (!First) + memset(++Current, 0, sizeof(*Current)); + else + First = 0; + Current->Address = Address; Current->FileOffset = Current[-1].FileOffset; - Current->FunctionOffset = Current[-1].FunctionOffset; - } - else - First = 0; - Current->Address = Address; - } - Current->SourceLine = StabEntry[i].n_desc; - break; - default: - continue; - } - } - *SymbolsCount = (Current - *SymbolsBase + 1); - - qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); - - return 0; + } + Name = (char *)StabStringsBase + StabEntry[i].n_strx; + NameLen = strcspn(Name, ":"); + if (sizeof(FuncName) <= NameLen) + { + free(*SymbolsBase); + fprintf(stderr, "Function name too long\n"); + return 1; + } + memcpy(FuncName, Name, NameLen); + FuncName[NameLen] = '\0'; + Current->FunctionOffset = FindOrAddString(FuncName, + StringsLength, + StringsBase); + Current->SourceLine = 0; + LastFunctionAddress = Address; + break; + case N_SLINE: + if (First || Address != Current->Address) + { + if (!First) + { + memset(++Current, 0, sizeof(*Current)); + Current->FileOffset = Current[-1].FileOffset; + Current->FunctionOffset = Current[-1].FunctionOffset; + } + else + First = 0; + Current->Address = Address; + } + Current->SourceLine = StabEntry[i].n_desc; + break; + default: + continue; + } + } + *SymbolsCount = (Current - *SymbolsBase + 1); + + qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); + + return 0; } static int @@ -271,76 +270,80 @@ ULONG_PTR ImageBase, PIMAGE_FILE_HEADER PEFileHeader, PIMAGE_SECTION_HEADER PESectionHeaders) { - ULONG Count, i; - PCOFF_SYMENT CoffEntry; - char FuncName[256]; - char *p; - PROSSYM_ENTRY Current; - - CoffEntry = (PCOFF_SYMENT) CoffSymbolsBase; - Count = CoffSymbolsLength / sizeof(COFF_SYMENT); - *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); - if (NULL == *SymbolsBase) - { - fprintf(stderr, "Unable to allocate memory for converted COFF symbols\n"); - return 1; - } - *SymbolsCount = 0; - Current = *SymbolsBase; - - for (i = 0; i < Count; i++) - { - if (ISFCN(CoffEntry[i].e_type) || C_EXT == CoffEntry[i].e_sclass) - { - Current->Address = CoffEntry[i].e_value; - if (0 < CoffEntry[i].e_scnum) - { - if (PEFileHeader->NumberOfSections < CoffEntry[i].e_scnum) + ULONG Count, i; + PCOFF_SYMENT CoffEntry; + char FuncName[256]; + char *p; + PROSSYM_ENTRY Current; + + CoffEntry = (PCOFF_SYMENT) CoffSymbolsBase; + Count = CoffSymbolsLength / sizeof(COFF_SYMENT); + + *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); + if (*SymbolsBase == NULL) + { + fprintf(stderr, "Unable to allocate memory for converted COFF symbols\n"); + return 1; + } + *SymbolsCount = 0; + Current = *SymbolsBase; + + for (i = 0; i < Count; i++) + { + if (ISFCN(CoffEntry[i].e_type) || C_EXT == CoffEntry[i].e_sclass) + { + Current->Address = CoffEntry[i].e_value; + if (CoffEntry[i].e_scnum > 0) + { + if (PEFileHeader->NumberOfSections < CoffEntry[i].e_scnum) { - free(*SymbolsBase); - fprintf(stderr, "Invalid section number %d in COFF symbols (only %d sections present)\n", - CoffEntry[i].e_scnum, PEFileHeader->NumberOfSections); - return 1; + free(*SymbolsBase); + fprintf(stderr, + "Invalid section number %d in COFF symbols (only %d sections present)\n", + CoffEntry[i].e_scnum, + PEFileHeader->NumberOfSections); + return 1; } - Current->Address += PESectionHeaders[CoffEntry[i].e_scnum - 1].VirtualAddress; - } - Current->FileOffset = 0; - if (0 == CoffEntry[i].e.e.e_zeroes) - { - if (sizeof(FuncName) <= strlen((char *) CoffStringsBase + CoffEntry[i].e.e.e_offset)) + Current->Address += PESectionHeaders[CoffEntry[i].e_scnum - 1].VirtualAddress; + } + Current->FileOffset = 0; + if (CoffEntry[i].e.e.e_zeroes == 0) + { + if (sizeof(FuncName) <= strlen((char *) CoffStringsBase + CoffEntry[i].e.e.e_offset)) { - free(*SymbolsBase); - fprintf(stderr, "Function name too long\n"); - return 1; + free(*SymbolsBase); + fprintf(stderr, "Function name too long\n"); + return 1; } - strcpy(FuncName, (char *) CoffStringsBase + CoffEntry[i].e.e.e_offset); - } - else - { - memcpy(FuncName, CoffEntry[i].e.e_name, E_SYMNMLEN); - FuncName[E_SYMNMLEN] = '\0'; - } - - /* Name demangling: stdcall */ - p = strrchr(FuncName, '@'); - if (NULL != p) - { - *p = '\0'; - } - p = ('_' == FuncName[0] || '@' == FuncName[0] ? FuncName + 1 : FuncName); - Current->FunctionOffset = FindOrAddString(p, - StringsLength, - StringsBase); - Current->SourceLine = 0; - memset ( ++Current, 0, sizeof(*Current) ); - } - i += CoffEntry[i].e_numaux; - } - - *SymbolsCount = (Current - *SymbolsBase + 1); - qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); - - return 0; + strcpy(FuncName, (char *) CoffStringsBase + CoffEntry[i].e.e.e_offset); + } + else + { + memcpy(FuncName, CoffEntry[i].e.e_name, E_SYMNMLEN); + FuncName[E_SYMNMLEN] = '\0'; + } + + /* Name demangling: stdcall */ + p = strrchr(FuncName, '@'); + if (p != NULL) + { + *p = '\0'; + } + p = ('_' == FuncName[0] || '@' == FuncName[0] ? FuncName + 1 : FuncName); + Current->FunctionOffset = FindOrAddString(p, + StringsLength, + StringsBase); + Current->SourceLine = 0; + memset(++Current, 0, sizeof(*Current)); + } + + i += CoffEntry[i].e_numaux; + } + + *SymbolsCount = (Current - *SymbolsBase + 1); + qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); + + return 0; } static int @@ -348,87 +351,88 @@ ULONG StabSymbolsCount, PROSSYM_ENTRY StabSymbols, ULONG CoffSymbolsCount, PROSSYM_ENTRY CoffSymbols) { - ULONG StabIndex, j; - ULONG CoffIndex; - ULONG_PTR StabFunctionStartAddress; - ULONG StabFunctionStringOffset, NewStabFunctionStringOffset; - - *MergedSymbolCount = 0; - if (StabSymbolsCount == 0) - { - *MergedSymbols = NULL; - return 0; - } - *MergedSymbols = malloc(StabSymbolsCount * sizeof(ROSSYM_ENTRY)); - if (NULL == *MergedSymbols) - { - fprintf(stderr, "Unable to allocate memory for merged symbols\n"); - return 1; - } - - StabFunctionStartAddress = 0; - StabFunctionStringOffset = 0; - CoffIndex = 0; - for (StabIndex = 0; StabIndex < StabSymbolsCount; StabIndex++) - { - (*MergedSymbols)[*MergedSymbolCount] = StabSymbols[StabIndex]; - for (j = StabIndex + 1; - j < StabSymbolsCount && StabSymbols[j].Address == StabSymbols[StabIndex].Address; - j++) - { - if (0 != StabSymbols[j].FileOffset && 0 == (*MergedSymbols)[*MergedSymbolCount].FileOffset) - { - (*MergedSymbols)[*MergedSymbolCount].FileOffset = StabSymbols[j].FileOffset; - } - if (0 != StabSymbols[j].FunctionOffset && 0 == (*MergedSymbols)[*MergedSymbolCount].FunctionOffset) - { - (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = StabSymbols[j].FunctionOffset; - } - if (0 != StabSymbols[j].SourceLine && 0 == (*MergedSymbols)[*MergedSymbolCount].SourceLine) - { - (*MergedSymbols)[*MergedSymbolCount].SourceLine = StabSymbols[j].SourceLine; - } - } - StabIndex = j - 1; - while (CoffIndex < CoffSymbolsCount - && CoffSymbols[CoffIndex + 1].Address <= (*MergedSymbols)[*MergedSymbolCount].Address) - { - CoffIndex++; - } - NewStabFunctionStringOffset = (*MergedSymbols)[*MergedSymbolCount].FunctionOffset; - if (CoffSymbolsCount > 0 && - CoffSymbols[CoffIndex].Address < (*MergedSymbols)[*MergedSymbolCount].Address - && StabFunctionStartAddress < CoffSymbols[CoffIndex].Address - && 0 != CoffSymbols[CoffIndex].FunctionOffset) - { - (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = CoffSymbols[CoffIndex].FunctionOffset; - } - if (StabFunctionStringOffset != NewStabFunctionStringOffset) - { - StabFunctionStartAddress = (*MergedSymbols)[*MergedSymbolCount].Address; - } - StabFunctionStringOffset = NewStabFunctionStringOffset; - (*MergedSymbolCount)++; - } - - return 0; + ULONG StabIndex, j; + ULONG CoffIndex; + ULONG_PTR StabFunctionStartAddress; + ULONG StabFunctionStringOffset, NewStabFunctionStringOffset; + + *MergedSymbolCount = 0; + if (StabSymbolsCount == 0) + { + *MergedSymbols = NULL; + return 0; + } + *MergedSymbols = malloc(StabSymbolsCount * sizeof(ROSSYM_ENTRY)); + if (*MergedSymbols == NULL) + { + fprintf(stderr, "Unable to allocate memory for merged symbols\n"); + return 1; + } + + StabFunctionStartAddress = 0; + StabFunctionStringOffset = 0; + CoffIndex = 0; + for (StabIndex = 0; StabIndex < StabSymbolsCount; StabIndex++) + { + (*MergedSymbols)[*MergedSymbolCount] = StabSymbols[StabIndex]; + for (j = StabIndex + 1; + j < StabSymbolsCount && StabSymbols[j].Address == StabSymbols[StabIndex].Address; + j++) + { + if (StabSymbols[j].FileOffset != 0 && (*MergedSymbols)[*MergedSymbolCount].FileOffset == 0) + { + (*MergedSymbols)[*MergedSymbolCount].FileOffset = StabSymbols[j].FileOffset; + } + if (StabSymbols[j].FunctionOffset != 0 && (*MergedSymbols)[*MergedSymbolCount].FunctionOffset == 0) + { + (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = StabSymbols[j].FunctionOffset; + } + if (StabSymbols[j].SourceLine != 0 && (*MergedSymbols)[*MergedSymbolCount].SourceLine == 0) + { + (*MergedSymbols)[*MergedSymbolCount].SourceLine = StabSymbols[j].SourceLine; + } + } + StabIndex = j - 1; + + while (CoffIndex < CoffSymbolsCount && + CoffSymbols[CoffIndex + 1].Address <= (*MergedSymbols)[*MergedSymbolCount].Address) + { + CoffIndex++; + } + NewStabFunctionStringOffset = (*MergedSymbols)[*MergedSymbolCount].FunctionOffset; + if (CoffSymbolsCount > 0 && + CoffSymbols[CoffIndex].Address < (*MergedSymbols)[*MergedSymbolCount].Address && + StabFunctionStartAddress < CoffSymbols[CoffIndex].Address && + CoffSymbols[CoffIndex].FunctionOffset != 0) + { + (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = CoffSymbols[CoffIndex].FunctionOffset; + } + if (StabFunctionStringOffset != NewStabFunctionStringOffset) + { + StabFunctionStartAddress = (*MergedSymbols)[*MergedSymbolCount].Address; + } + StabFunctionStringOffset = NewStabFunctionStringOffset; + (*MergedSymbolCount)++; + } + + return 0; } static PIMAGE_SECTION_HEADER FindSectionForRVA(DWORD RVA, unsigned NumberOfSections, PIMAGE_SECTION_HEADER SectionHeaders) { - unsigned Section; - - for (Section = 0; Section < NumberOfSections; Section++) - { - if (SectionHeaders[Section].VirtualAddress <= RVA && - RVA < SectionHeaders[Section].VirtualAddress + SectionHeaders[Section].Misc.VirtualSize) - { - return SectionHeaders + Section; - } - } - - return NULL; + unsigned Section; + + for (Section = 0; Section < NumberOfSections; Section++) + { + if (SectionHeaders[Section].VirtualAddress <= RVA && + RVA < SectionHeaders[Section].VirtualAddress + SectionHeaders[Section].Misc.VirtualSize) + { + return SectionHeaders + Section; + } + } + + return NULL; } static int @@ -436,70 +440,74 @@ void *RawData, PIMAGE_OPTIONAL_HEADER OptHeader, unsigned NumberOfSections, PIMAGE_SECTION_HEADER SectionHeaders) { - PIMAGE_SECTION_HEADER RelocSectionHeader, TargetSectionHeader; - PIMAGE_BASE_RELOCATION BaseReloc, End, AcceptedRelocs; - int Found; - - if (OptHeader->NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_BASERELOC - || 0 == OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress) - { - /* No relocation entries */ - *ProcessedRelocsLength = 0; - *ProcessedRelocs = NULL; - return 0; - } - - RelocSectionHeader = FindSectionForRVA(OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress, - NumberOfSections, SectionHeaders); - if (NULL == RelocSectionHeader) - { - fprintf(stderr, "Can't find section header for relocation data\n"); - return 1; - } - - *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); - if (NULL == *ProcessedRelocs) - { - fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (unsigned int)RelocSectionHeader->SizeOfRawData); - return 1; - } - *ProcessedRelocsLength = 0; - - BaseReloc = (PIMAGE_BASE_RELOCATION) ((char *) RawData - + RelocSectionHeader->PointerToRawData - + (OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress - + PIMAGE_SECTION_HEADER RelocSectionHeader, TargetSectionHeader; + PIMAGE_BASE_RELOCATION BaseReloc, End, AcceptedRelocs; + int Found; + + if (OptHeader->NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_BASERELOC || + OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress == 0) + { + /* No relocation entries */ + *ProcessedRelocsLength = 0; + *ProcessedRelocs = NULL; + return 0; + } + + RelocSectionHeader = FindSectionForRVA(OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress, + NumberOfSections, SectionHeaders); + if (RelocSectionHeader == NULL) + { + fprintf(stderr, "Can't find section header for relocation data\n"); + return 1; + } + + *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); + if (*ProcessedRelocs == NULL) + { + fprintf(stderr, + "Failed to allocate %u bytes for relocations\n", + (unsigned int)RelocSectionHeader->SizeOfRawData); + return 1; + } + *ProcessedRelocsLength = 0; + + BaseReloc = (PIMAGE_BASE_RELOCATION) ((char *) RawData + + RelocSectionHeader->PointerToRawData + + (OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress - RelocSectionHeader->VirtualAddress)); - End = (PIMAGE_BASE_RELOCATION) ((char *) BaseReloc - + OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size); - - while (BaseReloc < End && 0 < BaseReloc->SizeOfBlock) - { - TargetSectionHeader = FindSectionForRVA(BaseReloc->VirtualAddress, NumberOfSections, - SectionHeaders); - if (NULL != TargetSectionHeader) - { - AcceptedRelocs = *ProcessedRelocs; - Found = 0; - while (AcceptedRelocs < (PIMAGE_BASE_RELOCATION) ((char *) *ProcessedRelocs + - *ProcessedRelocsLength) - && ! Found) - { - Found = BaseReloc->SizeOfBlock == AcceptedRelocs->SizeOfBlock - && 0 == memcmp(BaseReloc, AcceptedRelocs, AcceptedRelocs->SizeOfBlock); - AcceptedRelocs= (PIMAGE_BASE_RELOCATION) ((char *) AcceptedRelocs + - AcceptedRelocs->SizeOfBlock); - } - if (! Found) - { - memcpy((char *) *ProcessedRelocs + *ProcessedRelocsLength, - BaseReloc, BaseReloc->SizeOfBlock); - *ProcessedRelocsLength += BaseReloc->SizeOfBlock; - } - } - BaseReloc = (PIMAGE_BASE_RELOCATION)((char *) BaseReloc + BaseReloc->SizeOfBlock); - } - - return 0; + End = (PIMAGE_BASE_RELOCATION) ((char *) BaseReloc + + OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size); + + while (BaseReloc < End && BaseReloc->SizeOfBlock > 0) + { + TargetSectionHeader = FindSectionForRVA(BaseReloc->VirtualAddress, + NumberOfSections, + SectionHeaders); + if (TargetSectionHeader != NULL) + { + AcceptedRelocs = *ProcessedRelocs; + Found = 0; + while (AcceptedRelocs < (PIMAGE_BASE_RELOCATION) ((char *) *ProcessedRelocs + + *ProcessedRelocsLength) + && !Found) + { + Found = BaseReloc->SizeOfBlock == AcceptedRelocs->SizeOfBlock && + memcmp(BaseReloc, AcceptedRelocs, AcceptedRelocs->SizeOfBlock) == 0; + AcceptedRelocs = (PIMAGE_BASE_RELOCATION) ((char *) AcceptedRelocs + + AcceptedRelocs->SizeOfBlock); + } + if (!Found) + { + memcpy((char *) *ProcessedRelocs + *ProcessedRelocsLength, + BaseReloc, + BaseReloc->SizeOfBlock); + *ProcessedRelocsLength += BaseReloc->SizeOfBlock; + } + } + BaseReloc = (PIMAGE_BASE_RELOCATION)((char *) BaseReloc + BaseReloc->SizeOfBlock); + } + + return 0; } static int @@ -508,449 +516,502 @@ PIMAGE_OPTIONAL_HEADER InOptHeader, PIMAGE_SECTION_HEADER InSectionHeaders, ULONG RosSymLength, void *RosSymSection) { - ULONG StartOfRawData; - unsigned Section; - void *OutHeader, *ProcessedRelocs, *PaddedRosSym, *Data; - PIMAGE_DOS_HEADER OutDosHeader; - PIMAGE_FILE_HEADER OutFileHeader; - PIMAGE_OPTIONAL_HEADER OutOptHeader; - PIMAGE_SECTION_HEADER OutSectionHeaders, CurrentSectionHeader; - DWORD CheckSum; - ULONG Length, i; - ULONG ProcessedRelocsLength; - ULONG RosSymOffset, RosSymFileLength; - int InRelocSectionIndex; - PIMAGE_SECTION_HEADER OutRelocSection; - - StartOfRawData = 0; - for (Section = 0; Section < InFileHeader->NumberOfSections; Section++) - { - if ((0 == StartOfRawData - || InSectionHeaders[Section].PointerToRawData < StartOfRawData) - && 0 != InSectionHeaders[Section].PointerToRawData - && 0 != (strncmp((char *) InSectionHeaders[Section].Name, ".stab", 5))) - { - StartOfRawData = InSectionHeaders[Section].PointerToRawData; - } - } - OutHeader = malloc(StartOfRawData); - if (NULL == OutHeader) - { - fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (unsigned int)StartOfRawData); - return 1; - } - memset(OutHeader, '\0', StartOfRawData); - - OutDosHeader = (PIMAGE_DOS_HEADER) OutHeader; - memcpy(OutDosHeader, InDosHeader, InDosHeader->e_lfanew + sizeof(ULONG)); - - OutFileHeader = (PIMAGE_FILE_HEADER)((char *) OutHeader + OutDosHeader->e_lfanew + sizeof(ULONG)); - memcpy(OutFileHeader, InFileHeader, sizeof(IMAGE_FILE_HEADER)); - OutFileHeader->PointerToSymbolTable = 0; - OutFileHeader->NumberOfSymbols = 0; - OutFileHeader->Characteristics &= ~(IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_LOCAL_SYMS_STRIPPED | - IMAGE_FILE_DEBUG_STRIPPED); - - OutOptHeader = (PIMAGE_OPTIONAL_HEADER)(OutFileHeader + 1); - memcpy(OutOptHeader, InOptHeader, sizeof(IMAGE_OPTIONAL_HEADER)); - OutOptHeader->CheckSum = 0; - - OutSectionHeaders = (PIMAGE_SECTION_HEADER)((char *) OutOptHeader + OutFileHeader->SizeOfOptionalHeader); - - if (ProcessRelocations(&ProcessedRelocsLength, &ProcessedRelocs, InData, InOptHeader, - InFileHeader->NumberOfSections, InSectionHeaders)) - { - return 1; - } - if (InOptHeader->NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_BASERELOC - || 0 == InOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress) - { - InRelocSectionIndex = -1; - } - else - { - InRelocSectionIndex = FindSectionForRVA(InOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress, - InFileHeader->NumberOfSections, InSectionHeaders) - InSectionHeaders; - } - - OutFileHeader->NumberOfSections = 0; - CurrentSectionHeader = OutSectionHeaders; - OutOptHeader->SizeOfImage = 0; - RosSymOffset = 0; - OutRelocSection = NULL; - for (Section = 0; Section < InFileHeader->NumberOfSections; Section++) - { - if (0 != (strncmp((char *) InSectionHeaders[Section].Name, ".stab", 5))) - { - *CurrentSectionHeader = InSectionHeaders[Section]; - CurrentSectionHeader->PointerToLinenumbers = 0; - CurrentSectionHeader->NumberOfLinenumbers = 0; - if (OutOptHeader->SizeOfImage < CurrentSectionHeader->VirtualAddress + - CurrentSectionHeader->Misc.VirtualSize) - { - OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + - CurrentSectionHeader->Misc.VirtualSize, - OutOptHeader->SectionAlignment); - } - if (RosSymOffset < CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData) - { - RosSymOffset = CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData; - } - if (Section == (ULONG)InRelocSectionIndex) - { - OutRelocSection = CurrentSectionHeader; - } - (OutFileHeader->NumberOfSections) ++; - CurrentSectionHeader++; - } - } - - if (OutRelocSection == CurrentSectionHeader - 1) - { - OutOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = ProcessedRelocsLength; - if (OutOptHeader->SizeOfImage == OutRelocSection->VirtualAddress + - ROUND_UP(OutRelocSection->Misc.VirtualSize, - OutOptHeader->SectionAlignment)) - { - OutOptHeader->SizeOfImage = OutRelocSection->VirtualAddress + - ROUND_UP(ProcessedRelocsLength, - OutOptHeader->SectionAlignment); - } - OutRelocSection->Misc.VirtualSize = ProcessedRelocsLength; - if (RosSymOffset == OutRelocSection->PointerToRawData - + OutRelocSection->SizeOfRawData) - { - RosSymOffset = OutRelocSection->PointerToRawData + - ROUND_UP(ProcessedRelocsLength, OutOptHeader->FileAlignment); - } - OutRelocSection->SizeOfRawData = ROUND_UP(ProcessedRelocsLength, - OutOptHeader->FileAlignment); - } - - if (RosSymLength > 0) - { - RosSymFileLength = ROUND_UP(RosSymLength, OutOptHeader->FileAlignment); - memcpy(CurrentSectionHeader->Name, ".rossym", 8); /* We're lucky: string is exactly 8 bytes long */ - CurrentSectionHeader->Misc.VirtualSize = RosSymLength; - CurrentSectionHeader->VirtualAddress = OutOptHeader->SizeOfImage; - CurrentSectionHeader->SizeOfRawData = RosSymFileLength; - CurrentSectionHeader->PointerToRawData = RosSymOffset; - CurrentSectionHeader->PointerToRelocations = 0; - CurrentSectionHeader->PointerToLinenumbers = 0; - CurrentSectionHeader->NumberOfRelocations = 0; - CurrentSectionHeader->NumberOfLinenumbers = 0; - CurrentSectionHeader->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE - | IMAGE_SCN_LNK_REMOVE | IMAGE_SCN_TYPE_NOLOAD; - OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + - CurrentSectionHeader->Misc.VirtualSize, - OutOptHeader->SectionAlignment); - (OutFileHeader->NumberOfSections)++; - - PaddedRosSym = malloc(RosSymFileLength); - if (NULL == PaddedRosSym) - { - fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (unsigned int)RosSymFileLength); - return 1; - } - memcpy(PaddedRosSym, RosSymSection, RosSymLength); - memset((char *) PaddedRosSym + RosSymLength, '\0', RosSymFileLength - RosSymLength); - } - else - { - PaddedRosSym = NULL; - } - CheckSum = 0; - for (i = 0; i < StartOfRawData / 2; i++) - { - CheckSum += ((unsigned short*) OutHeader)[i]; - CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); - } - Length = StartOfRawData; - for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) - { - DWORD SizeOfRawData; - if (OutRelocSection == OutSectionHeaders + Section) - { - Data = (void *) ProcessedRelocs; - SizeOfRawData = ProcessedRelocsLength; - } - else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) - { - Data = (void *) PaddedRosSym; - SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; - } - else - { - Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); - SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; - } - for (i = 0; i < SizeOfRawData / 2; i++) - { - CheckSum += ((unsigned short*) Data)[i]; - CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); - } - Length += OutSectionHeaders[Section].SizeOfRawData; - } - CheckSum += Length; - OutOptHeader->CheckSum = CheckSum; - - if (fwrite(OutHeader, 1, StartOfRawData, OutFile) != StartOfRawData) - { - perror("Error writing output header\n"); - free(OutHeader); - return 1; - } - - for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) - { - if (0 != OutSectionHeaders[Section].SizeOfRawData) - { - DWORD SizeOfRawData; - fseek(OutFile, OutSectionHeaders[Section].PointerToRawData, SEEK_SET); - if (OutRelocSection == OutSectionHeaders + Section) - { - Data = (void *) ProcessedRelocs; - SizeOfRawData = ProcessedRelocsLength; - } - else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) - { - Data = (void *) PaddedRosSym; - SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; - } - else - { - Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); - SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; - } - if (fwrite(Data, 1, SizeOfRawData, OutFile) != SizeOfRawData) - { - perror("Error writing section data\n"); - free(PaddedRosSym); - free(OutHeader); - return 1; - } - } - } - - if (PaddedRosSym) - { - free(PaddedRosSym); - } - free(OutHeader); - - return 0; + ULONG StartOfRawData; + unsigned Section; + void *OutHeader, *ProcessedRelocs, *PaddedRosSym, *Data; + PIMAGE_DOS_HEADER OutDosHeader; + PIMAGE_FILE_HEADER OutFileHeader; + PIMAGE_OPTIONAL_HEADER OutOptHeader; + PIMAGE_SECTION_HEADER OutSectionHeaders, CurrentSectionHeader; + DWORD CheckSum; + ULONG Length, i; + ULONG ProcessedRelocsLength; + ULONG RosSymOffset, RosSymFileLength; + int InRelocSectionIndex; + PIMAGE_SECTION_HEADER OutRelocSection; + + StartOfRawData = 0; + for (Section = 0; Section < InFileHeader->NumberOfSections; Section++) + { + if ((StartOfRawData == 0 || + InSectionHeaders[Section].PointerToRawData < StartOfRawData) + && InSectionHeaders[Section].PointerToRawData != 0 + && (strncmp((char *) InSectionHeaders[Section].Name, ".stab", 5)) != 0) + { + StartOfRawData = InSectionHeaders[Section].PointerToRawData; + } + } + OutHeader = malloc(StartOfRawData); + if (OutHeader == NULL) + { + fprintf(stderr, + "Failed to allocate %u bytes for output file header\n", + (unsigned int)StartOfRawData); + return 1; + } + memset(OutHeader, '\0', StartOfRawData); + + OutDosHeader = (PIMAGE_DOS_HEADER) OutHeader; + memcpy(OutDosHeader, InDosHeader, InDosHeader->e_lfanew + sizeof(ULONG)); + + OutFileHeader = (PIMAGE_FILE_HEADER)((char *) OutHeader + OutDosHeader->e_lfanew + sizeof(ULONG)); + memcpy(OutFileHeader, InFileHeader, sizeof(IMAGE_FILE_HEADER)); + OutFileHeader->PointerToSymbolTable = 0; + OutFileHeader->NumberOfSymbols = 0; + OutFileHeader->Characteristics &= ~(IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_LOCAL_SYMS_STRIPPED | + IMAGE_FILE_DEBUG_STRIPPED); + + OutOptHeader = (PIMAGE_OPTIONAL_HEADER)(OutFileHeader + 1); + memcpy(OutOptHeader, InOptHeader, sizeof(IMAGE_OPTIONAL_HEADER)); + OutOptHeader->CheckSum = 0; + + OutSectionHeaders = (PIMAGE_SECTION_HEADER)((char *) OutOptHeader + OutFileHeader->SizeOfOptionalHeader); + + if (ProcessRelocations(&ProcessedRelocsLength, + &ProcessedRelocs, + InData, + InOptHeader, + InFileHeader->NumberOfSections, + InSectionHeaders)) + { + return 1; + } + if (InOptHeader->NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_BASERELOC || + InOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress == 0) + { + InRelocSectionIndex = -1; + } + else + { + InRelocSectionIndex = FindSectionForRVA(InOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress, + InFileHeader->NumberOfSections, InSectionHeaders) - InSectionHeaders; + } + + OutFileHeader->NumberOfSections = 0; + CurrentSectionHeader = OutSectionHeaders; + OutOptHeader->SizeOfImage = 0; + RosSymOffset = 0; + OutRelocSection = NULL; + for (Section = 0; Section < InFileHeader->NumberOfSections; Section++) + { + if ((strncmp((char *) InSectionHeaders[Section].Name, ".stab", 5)) != 0) + { + *CurrentSectionHeader = InSectionHeaders[Section]; + CurrentSectionHeader->PointerToLinenumbers = 0; + CurrentSectionHeader->NumberOfLinenumbers = 0; + if (OutOptHeader->SizeOfImage < CurrentSectionHeader->VirtualAddress + + CurrentSectionHeader->Misc.VirtualSize) + { + OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + + CurrentSectionHeader->Misc.VirtualSize, + OutOptHeader->SectionAlignment); + } + if (RosSymOffset < CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData) + { + RosSymOffset = CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData; + } + if (Section == (ULONG)InRelocSectionIndex) + { + OutRelocSection = CurrentSectionHeader; + } + (OutFileHeader->NumberOfSections)++; + CurrentSectionHeader++; + } + } + + if (OutRelocSection == CurrentSectionHeader - 1) + { + OutOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = ProcessedRelocsLength; + if (OutOptHeader->SizeOfImage == OutRelocSection->VirtualAddress + + ROUND_UP(OutRelocSection->Misc.VirtualSize, + OutOptHeader->SectionAlignment)) + { + OutOptHeader->SizeOfImage = OutRelocSection->VirtualAddress + + ROUND_UP(ProcessedRelocsLength, + OutOptHeader->SectionAlignment); + } + OutRelocSection->Misc.VirtualSize = ProcessedRelocsLength; + if (RosSymOffset == OutRelocSection->PointerToRawData + + OutRelocSection->SizeOfRawData) + { + RosSymOffset = OutRelocSection->PointerToRawData + + ROUND_UP(ProcessedRelocsLength, + OutOptHeader->FileAlignment); + } + OutRelocSection->SizeOfRawData = ROUND_UP(ProcessedRelocsLength, + OutOptHeader->FileAlignment); + } + + if (RosSymLength > 0) + { + RosSymFileLength = ROUND_UP(RosSymLength, OutOptHeader->FileAlignment); + memcpy(CurrentSectionHeader->Name, ".rossym", 8); /* We're lucky: string is exactly 8 bytes long */ + CurrentSectionHeader->Misc.VirtualSize = RosSymLength; + CurrentSectionHeader->VirtualAddress = OutOptHeader->SizeOfImage; + CurrentSectionHeader->SizeOfRawData = RosSymFileLength; + CurrentSectionHeader->PointerToRawData = RosSymOffset; + CurrentSectionHeader->PointerToRelocations = 0; + CurrentSectionHeader->PointerToLinenumbers = 0; + CurrentSectionHeader->NumberOfRelocations = 0; + CurrentSectionHeader->NumberOfLinenumbers = 0; + CurrentSectionHeader->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE + | IMAGE_SCN_LNK_REMOVE | IMAGE_SCN_TYPE_NOLOAD; + OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + CurrentSectionHeader->Misc.VirtualSize, + OutOptHeader->SectionAlignment); + (OutFileHeader->NumberOfSections)++; + + PaddedRosSym = malloc(RosSymFileLength); + if (PaddedRosSym == NULL) + { + fprintf(stderr, + "Failed to allocate %u bytes for padded .rossym\n", + (unsigned int)RosSymFileLength); + return 1; + } + memcpy(PaddedRosSym, RosSymSection, RosSymLength); + memset((char *) PaddedRosSym + RosSymLength, + '\0', + RosSymFileLength - RosSymLength); + } + else + { + PaddedRosSym = NULL; + } + CheckSum = 0; + for (i = 0; i < StartOfRawData / 2; i++) + { + CheckSum += ((unsigned short*) OutHeader)[i]; + CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); + } + Length = StartOfRawData; + for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) + { + DWORD SizeOfRawData; + if (OutRelocSection == OutSectionHeaders + Section) + { + Data = (void *) ProcessedRelocs; + SizeOfRawData = ProcessedRelocsLength; + } + else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) + { + Data = (void *) PaddedRosSym; + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + else + { + Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + for (i = 0; i < SizeOfRawData / 2; i++) + { + CheckSum += ((unsigned short*) Data)[i]; + CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); + } + Length += OutSectionHeaders[Section].SizeOfRawData; + } + CheckSum += Length; + OutOptHeader->CheckSum = CheckSum; + + if (fwrite(OutHeader, 1, StartOfRawData, OutFile) != StartOfRawData) + { + perror("Error writing output header\n"); + free(OutHeader); + return 1; + } + + for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) + { + if (OutSectionHeaders[Section].SizeOfRawData != 0) + { + DWORD SizeOfRawData; + fseek(OutFile, OutSectionHeaders[Section].PointerToRawData, SEEK_SET); + if (OutRelocSection == OutSectionHeaders + Section) + { + Data = (void *) ProcessedRelocs; + SizeOfRawData = ProcessedRelocsLength; + } + else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) + { + Data = (void *) PaddedRosSym; + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + else + { + Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + if (fwrite(Data, 1, SizeOfRawData, OutFile) != SizeOfRawData) + { + perror("Error writing section data\n"); + free(PaddedRosSym); + free(OutHeader); + return 1; + } + } + } + + if (PaddedRosSym) + { + free(PaddedRosSym); + } + free(OutHeader); + + return 0; } int main(int argc, char* argv[]) { - PSYMBOLFILE_HEADER SymbolFileHeader; - PIMAGE_DOS_HEADER PEDosHeader; - PIMAGE_FILE_HEADER PEFileHeader; - PIMAGE_OPTIONAL_HEADER PEOptHeader; - PIMAGE_SECTION_HEADER PESectionHeaders; - ULONG ImageBase; - void *StabBase; - ULONG StabsLength; - void *StabStringBase; - ULONG StabStringsLength; - void *CoffBase = NULL; - ULONG CoffsLength; - void *CoffStringBase = NULL; - ULONG CoffStringsLength; - char* path1; - char* path2; - FILE* out; - void *StringBase; - ULONG StringsLength; - ULONG StabSymbolsCount; - PROSSYM_ENTRY StabSymbols; - ULONG CoffSymbolsCount; - PROSSYM_ENTRY CoffSymbols; - ULONG MergedSymbolsCount; - PROSSYM_ENTRY MergedSymbols; - size_t FileSize; - void *FileData; - ULONG RosSymLength; - void *RosSymSection; - char elfhdr[4] = { '\177', 'E', 'L', 'F' }; - - if (3 != argc) - { - fprintf(stderr, "Usage: rsym <exefile> <symfile>\n"); - exit(1); - } - - path1 = convert_path(argv[1]); - path2 = convert_path(argv[2]); - - FileData = load_file ( path1, &FileSize ); - if ( !FileData ) - { - fprintf ( stderr, "An error occured loading '%s'\n", path1 ); - exit(1); - } - - /* Check if MZ header exists */ - PEDosHeader = (PIMAGE_DOS_HEADER) FileData; - if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) - { - /* Ignore elf */ - if (!memcmp(PEDosHeader, elfhdr, sizeof(elfhdr))) - exit(0); - perror("Input file is not a PE image.\n"); - free(FileData); - exit(1); - } - - /* Locate PE file header */ - /* sizeof(ULONG) = sizeof(MAGIC) */ - PEFileHeader = (PIMAGE_FILE_HEADER)((char *) FileData + PEDosHeader->e_lfanew + sizeof(ULONG)); - - /* Locate optional header */ - assert(sizeof(ULONG) == 4); - PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); - ImageBase = PEOptHeader->ImageBase; - - /* Locate PE section headers */ - PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *) PEOptHeader + PEFileHeader->SizeOfOptionalHeader); - - if (GetStabInfo(FileData, PEFileHeader, PESectionHeaders, &StabsLength, &StabBase, - &StabStringsLength, &StabStringBase)) - { - free(FileData); - exit(1); - } - - if (GetCoffInfo(FileData, PEFileHeader, PESectionHeaders, &CoffsLength, &CoffBase, - &CoffStringsLength, &CoffStringBase)) - { - free(FileData); - exit(1); - } - - StringBase = malloc(1 + StabStringsLength + CoffStringsLength + - (CoffsLength / sizeof(ROSSYM_ENTRY)) * (E_SYMNMLEN + 1)); - if (NULL == StringBase) - { - free(FileData); - fprintf(stderr, "Failed to allocate memory for strings table\n"); - exit(1); - } - /* Make offset 0 into an empty string */ - *((char *) StringBase) = '\0'; - StringsLength = 1; - - if (ConvertStabs(&StabSymbolsCount, &StabSymbols, &StringsLength, StringBase, - StabsLength, StabBase, StabStringsLength, StabStringBase, - ImageBase, PEFileHeader, PESectionHeaders)) - { - free(StringBase); - free(FileData); - fprintf(stderr, "Failed to allocate memory for strings table\n"); - exit(1); - } - - if (ConvertCoffs(&CoffSymbolsCount, &CoffSymbols, &StringsLength, StringBase, - CoffsLength, CoffBase, CoffStringsLength, CoffStringBase, - ImageBase, PEFileHeader, PESectionHeaders)) - { - if (StabSymbols) - { - free(StabSymbols); - } - free(StringBase); - free(FileData); - exit(1); - } - - if (MergeStabsAndCoffs(&MergedSymbolsCount, &MergedSymbols, - StabSymbolsCount, StabSymbols, - CoffSymbolsCount, CoffSymbols)) - { - if (CoffSymbols) - { - free(CoffSymbols); - } - if (StabSymbols) - { - free(StabSymbols); - } - free(StringBase); - free(FileData); - exit(1); - } - - if (CoffSymbols) - { - free(CoffSymbols); - } - if (StabSymbols) - { - free(StabSymbols); - } - if (MergedSymbolsCount == 0) - { - RosSymLength = 0; - RosSymSection = NULL; - } - else - { - RosSymLength = sizeof(SYMBOLFILE_HEADER) + MergedSymbolsCount * sizeof(ROSSYM_ENTRY) - + StringsLength; - RosSymSection = malloc(RosSymLength); - if (NULL == RosSymSection) - { - free(MergedSymbols); - free(StringBase); - free(FileData); - fprintf(stderr, "Unable to allocate memory for .rossym section\n"); - exit(1); - } - memset(RosSymSection, '\0', RosSymLength); - - SymbolFileHeader = (PSYMBOLFILE_HEADER) RosSymSection; - SymbolFileHeader->SymbolsOffset = sizeof(SYMBOLFILE_HEADER); - SymbolFileHeader->SymbolsLength = MergedSymbolsCount * sizeof(ROSSYM_ENTRY); - SymbolFileHeader->StringsOffset = SymbolFileHeader->SymbolsOffset + SymbolFileHeader->SymbolsLength; - SymbolFileHeader->StringsLength = StringsLength; - - memcpy((char *) RosSymSection + SymbolFileHeader->SymbolsOffset, MergedSymbols, - SymbolFileHeader->SymbolsLength); - memcpy((char *) RosSymSection + SymbolFileHeader->StringsOffset, StringBase, - SymbolFileHeader->StringsLength); - - free(MergedSymbols); - } - free(StringBase); - out = fopen(path2, "wb"); - if (out == NULL) - { - perror("Cannot open output file"); - free(RosSymSection); - free(FileData); - exit(1); - } - - if (CreateOutputFile(out, FileData, PEDosHeader, PEFileHeader, PEOptHeader, - PESectionHeaders, RosSymLength, RosSymSection)) - { - fclose(out); - if (RosSymSection) - { - free(RosSymSection); - } - free(FileData); - exit(1); - } - - fclose(out); - if (RosSymSection) - { - free(RosSymSection); - } - free(FileData); - - return 0; + PSYMBOLFILE_HEADER SymbolFileHeader; + PIMAGE_DOS_HEADER PEDosHeader; + PIMAGE_FILE_HEADER PEFileHeader; + PIMAGE_OPTIONAL_HEADER PEOptHeader; + PIMAGE_SECTION_HEADER PESectionHeaders; + ULONG ImageBase; + void *StabBase; + ULONG StabsLength; + void *StabStringBase; + ULONG StabStringsLength; + void *CoffBase = NULL; + ULONG CoffsLength; + void *CoffStringBase = NULL; + ULONG CoffStringsLength; + char* path1; + char* path2; + FILE* out; + void *StringBase; + ULONG StringsLength; + ULONG StabSymbolsCount; + PROSSYM_ENTRY StabSymbols; + ULONG CoffSymbolsCount; + PROSSYM_ENTRY CoffSymbols; + ULONG MergedSymbolsCount; + PROSSYM_ENTRY MergedSymbols; + size_t FileSize; + void *FileData; + ULONG RosSymLength; + void *RosSymSection; + char elfhdr[4] = { '\177', 'E', 'L', 'F' }; + + if (argc != 3) + { + fprintf(stderr, "Usage: rsym <exefile> <symfile>\n"); + exit(1); + } + + path1 = convert_path(argv[1]); + path2 = convert_path(argv[2]); + + FileData = load_file(path1, &FileSize); + if (!FileData) + { + fprintf(stderr, "An error occured loading '%s'\n", path1); + exit(1); + } + + /* Check if MZ header exists */ + PEDosHeader = (PIMAGE_DOS_HEADER) FileData; + if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || + PEDosHeader->e_lfanew == 0L) + { + /* Ignore elf */ + if (!memcmp(PEDosHeader, elfhdr, sizeof(elfhdr))) + exit(0); + perror("Input file is not a PE image.\n"); + free(FileData); + exit(1); + } + + /* Locate PE file header */ + /* sizeof(ULONG) = sizeof(MAGIC) */ + PEFileHeader = (PIMAGE_FILE_HEADER)((char *) FileData + PEDosHeader->e_lfanew + sizeof(ULONG)); + + /* Locate optional header */ + assert(sizeof(ULONG) == 4); + PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); + ImageBase = PEOptHeader->ImageBase; + + /* Locate PE section headers */ + PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *) PEOptHeader + PEFileHeader->SizeOfOptionalHeader); + + if (GetStabInfo(FileData, + PEFileHeader, + PESectionHeaders, + &StabsLength, + &StabBase, + &StabStringsLength, + &StabStringBase)) + { + free(FileData); + exit(1); + } + + if (GetCoffInfo(FileData, + PEFileHeader, + PESectionHeaders, + &CoffsLength, + &CoffBase, + &CoffStringsLength, + &CoffStringBase)) + { + free(FileData); + exit(1); + } + + StringBase = malloc(1 + StabStringsLength + CoffStringsLength + + (CoffsLength / sizeof(ROSSYM_ENTRY)) * (E_SYMNMLEN + 1)); + if (StringBase == NULL) + { + free(FileData); + fprintf(stderr, "Failed to allocate memory for strings table\n"); + exit(1); + } + /* Make offset 0 into an empty string */ + *((char *) StringBase) = '\0'; + StringsLength = 1; + + if (ConvertStabs(&StabSymbolsCount, + &StabSymbols, + &StringsLength, + StringBase, + StabsLength, + StabBase, + StabStringsLength, + StabStringBase, + ImageBase, + PEFileHeader, + PESectionHeaders)) + { + free(StringBase); + free(FileData); + fprintf(stderr, "Failed to allocate memory for strings table\n"); + exit(1); + } + + if (ConvertCoffs(&CoffSymbolsCount, + &CoffSymbols, + &StringsLength, + StringBase, + CoffsLength, + CoffBase, + CoffStringsLength, + CoffStringBase, + ImageBase, + PEFileHeader, + PESectionHeaders)) + { + if (StabSymbols) + { + free(StabSymbols); + } + free(StringBase); + free(FileData); + exit(1); + } + + if (MergeStabsAndCoffs(&MergedSymbolsCount, + &MergedSymbols, + StabSymbolsCount, + StabSymbols, + CoffSymbolsCount, + CoffSymbols)) + { + if (CoffSymbols) + { + free(CoffSymbols); + } + if (StabSymbols) + { + free(StabSymbols); + } + free(StringBase); + free(FileData); + exit(1); + } + + if (CoffSymbols) + { + free(CoffSymbols); + } + if (StabSymbols) + { + free(StabSymbols); + } + if (MergedSymbolsCount == 0) + { + RosSymLength = 0; + RosSymSection = NULL; + } + else + { + RosSymLength = sizeof(SYMBOLFILE_HEADER) + + MergedSymbolsCount * sizeof(ROSSYM_ENTRY) + + StringsLength; + + RosSymSection = malloc(RosSymLength); + if (RosSymSection == NULL) + { + free(MergedSymbols); + free(StringBase); + free(FileData); + fprintf(stderr, "Unable to allocate memory for .rossym section\n"); + exit(1); + } + memset(RosSymSection, '\0', RosSymLength); + + SymbolFileHeader = (PSYMBOLFILE_HEADER)RosSymSection; + SymbolFileHeader->SymbolsOffset = sizeof(SYMBOLFILE_HEADER); + SymbolFileHeader->SymbolsLength = MergedSymbolsCount * sizeof(ROSSYM_ENTRY); + SymbolFileHeader->StringsOffset = SymbolFileHeader->SymbolsOffset + + SymbolFileHeader->SymbolsLength; + SymbolFileHeader->StringsLength = StringsLength; + + memcpy((char *) RosSymSection + SymbolFileHeader->SymbolsOffset, + MergedSymbols, + SymbolFileHeader->SymbolsLength); + + memcpy((char *) RosSymSection + SymbolFileHeader->StringsOffset, + StringBase, + SymbolFileHeader->StringsLength); + + free(MergedSymbols); + } + + free(StringBase); + out = fopen(path2, "wb"); + if (out == NULL) + { + perror("Cannot open output file"); + free(RosSymSection); + free(FileData); + exit(1); + } + + if (CreateOutputFile(out, + FileData, + PEDosHeader, + PEFileHeader, + PEOptHeader, + PESectionHeaders, + RosSymLength, + RosSymSection)) + { + fclose(out); + if (RosSymSection) + { + free(RosSymSection); + } + free(FileData); + exit(1); + } + + fclose(out); + if (RosSymSection) + { + free(RosSymSection); + } + free(FileData); + + return 0; } /* EOF */

1 0

[fireball] 59495: [NTOS] - Fix CcMdlReadComplete2 prototype. - Fix a bug in Dominique Cote's code: when performing FsRtlGetFileSize, the length of the buffer should be set accordingly to the inform...
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 22:37:01 2013 New Revision: 59495 URL: http://svn.reactos.org/svn/reactos?rev=59495&view=rev Log: [NTOS] - Fix CcMdlReadComplete2 prototype. - Fix a bug in Dominique Cote's code: when performing FsRtlGetFileSize, the length of the buffer should be set accordingly to the information class asked for, that is - FILE_STANDARD_INFORMATION structure. Previous calculation formula makes no sense at all and leads to memory corruption (if filesystem driver is stupid enough) or inability to get file size (if filesystem driver is coded by good developers). Modified: trunk/reactos/ntoskrnl/cache/mdlsup.c trunk/reactos/ntoskrnl/cache/newcc.h trunk/reactos/ntoskrnl/cc/mdl.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cache/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/mdlsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/mdlsup.c [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -80,8 +80,8 @@ VOID NTAPI -CcMdlReadComplete2(IN PMDL MdlChain, - IN PFILE_OBJECT FileObject) +CcMdlReadComplete2(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain) { UNIMPLEMENTED } Modified: trunk/reactos/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/newcc.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -44,8 +44,8 @@ VOID NTAPI -CcMdlReadComplete2(IN PMDL MemoryDescriptorList, - IN PFILE_OBJECT FileObject); +CcMdlReadComplete2(IN PFILE_OBJECT FileObject, + IN PMDL MemoryDescriptorList); VOID NTAPI Modified: trunk/reactos/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev=5949… ============================================================================== --- trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -51,8 +51,9 @@ VOID NTAPI CcMdlReadComplete2 ( - IN PMDL MemoryDescriptorList, - IN PFILE_OBJECT FileObject) + IN PFILE_OBJECT FileObject, + IN PMDL MemoryDescriptorList +) { PMDL Mdl; @@ -104,7 +105,7 @@ } /* Use slow path */ - CcMdlReadComplete2(MdlChain, FileObject); + CcMdlReadComplete2(FileObject, MdlChain); } /* Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -880,7 +880,7 @@ IoStackLocation->FileObject = FileObject; IoStackLocation->DeviceObject = DeviceObject; IoStackLocation->Parameters.QueryFile.Length = - ALIGN_UP(sizeof(FILE_INFORMATION_CLASS), ULONG); + sizeof(FILE_STANDARD_INFORMATION); IoStackLocation->Parameters.QueryFile.FileInformationClass = FileStandardInformation; @@ -1019,7 +1019,7 @@ IN PDEVICE_OBJECT DeviceObject) { /* Call the Cache Manager */ - CcMdlReadComplete2(MemoryDescriptorList, FileObject); + CcMdlReadComplete2(FileObject, MemoryDescriptorList); return TRUE; } Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -172,8 +172,8 @@ VOID NTAPI CcMdlReadComplete2( - IN PMDL MemoryDescriptorList, - IN PFILE_OBJECT FileObject + IN PFILE_OBJECT FileObject, + IN PMDL MemoryDescriptorList ); VOID

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2013