Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[hbelusca] 62312: [NTVDM] - BIOS location must be aligned on 32bit boundaries (or 16, I have to check). This fixes BIOS images loading when they miss a (null) byte to make them (e.g.) 8192 bytes lo...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 23 20:40:09 2014 New Revision: 62312 URL: http://svn.reactos.org/svn/reactos?rev=62312&view=rev Log: [NTVDM] - BIOS location must be aligned on 32bit boundaries (or 16, I have to check). This fixes BIOS images loading when they miss a (null) byte to make them (e.g.) 8192 bytes long (example: the BIOS image of windows ntvdm). - Add useful alignment (and others) macros. Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/callback.c branches/ntvdm/subsystems/ntvdm/emulator.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sun Feb 23 20:40:09 2014 @@ -20,9 +20,9 @@ dos/dos32krnl/dos.c dos/dem.c bop.c + callback.c clock.c emulator.c - callback.c io.c registers.c vddsup.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sun Feb 23 20:40:09 2014 @@ -30,6 +30,7 @@ BOOL Success; HANDLE hBiosFile; DWORD BiosSize; + PVOID BiosLocation; /* Open the BIOS file */ SetLastError(0); // For debugging purposes @@ -62,30 +63,33 @@ return FALSE; } + /* BIOS location needs to be aligned on 32-bit boundary */ + /* (PVOID)((ULONG_PTR)BaseAddress + ROM_AREA_END + 1 - BiosSize) */ + BiosLocation = (PVOID)MEM_ALIGN_DOWN((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) + 1 - BiosSize, sizeof(ULONG)); + DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", - (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) + 1 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 1 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 2 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 3 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 4 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 5 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 6 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 7 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 8 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 9 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 0xa - BiosSize), + BiosLocation, + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 0), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 1), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 2), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 3), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 4), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 5), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 6), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 7), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 8), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 9), - (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) - 2), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 2), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 1), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 0)); + (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) - 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 1), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 0)); /* Attempt to load the BIOS file into memory */ SetLastError(0); // For debugging purposes Success = ReadFile(hBiosFile, - (PVOID)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 1 - BiosSize), - /* (PVOID)((ULONG_PTR)BaseAddress + ROM_AREA_END + 1 - BiosSize) */ + REAL_TO_PHYS(BiosLocation), BiosSize, &BiosSize, NULL); @@ -96,22 +100,22 @@ DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", - (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) + 1 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 1 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 2 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 3 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 4 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 5 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 6 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 7 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 8 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 9 - BiosSize), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 0xa - BiosSize), + BiosLocation, + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 0), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 1), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 2), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 3), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 4), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 5), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 6), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 7), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 8), + *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 9), - (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) - 2), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 2), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 1), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 0)); + (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) - 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 1), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 0)); DisplayMessage(L"POST at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x", TO_LINEAR(getCS(), getIP()), Modified: branches/ntvdm/subsystems/ntvdm/callback.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/callback… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/callback.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/callback.c [iso-8859-1] Sun Feb 23 20:40:09 2014 @@ -31,9 +31,6 @@ /* 32-bit Interrupt dispatcher function code for the Control BOP Handler */ #define BOP_CONTROL_INT32 0xFF - -// #define ALIGN(ptr) (((ULONG_PTR)(ptr) + 15) & ~15) -#define ALIGN(ptr) (ptr) #define BOP(num) LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), (num) #define UnSimulate16 MAKELONG(EMULATOR_BOP, BOP_UNSIMULATE) // BOP(BOP_UNSIMULATE) Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Sun Feb 23 20:40:09 2014 @@ -44,6 +44,9 @@ /* Basic Memory Management */ +#define MEM_ALIGN_UP(ptr, align) MEM_ALIGN_DOWN((ULONG_PTR)(ptr) + (align) - 1l, (align)) +#define MEM_ALIGN_DOWN(ptr, align) ((ULONG_PTR)(ptr) & ~((align) - 1l)) + #define TO_LINEAR(seg, off) (((seg) << 4) + (off)) #define MAX_SEGMENT 0xFFFF #define MAX_OFFSET 0xFFFF @@ -54,6 +57,9 @@ #define SEG_OFF_TO_PTR(seg, off) \ (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), (off))) + +#define REAL_TO_PHYS(ptr) (PVOID)((ULONG_PTR)(ptr) + (ULONG_PTR)BaseAddress) +#define PHYS_TO_REAL(ptr) (PVOID)((ULONG_PTR)(ptr) - (ULONG_PTR)BaseAddress) /* BCD-Binary conversion */

10 years, 10 months

[hbelusca] 62311: [NTVDM]: We can call now directly the interrupts instead of the internal functions BiosPeekCharacter and VidBiosPrintCharacter (so that if some program hooks them, we behave corre...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 23 19:43:31 2014 New Revision: 62311 URL: http://svn.reactos.org/svn/reactos?rev=62311&view=rev Log: [NTVDM]: We can call now directly the interrupts instead of the internal functions BiosPeekCharacter and VidBiosPrintCharacter (so that if some program hooks them, we behave correctly). Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/bios.c branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sun Feb 23 19:43:31 2014 @@ -81,7 +81,7 @@ return TRUE; } -WORD BiosPeekCharacter(VOID) +static WORD BiosPeekCharacter(VOID) { WORD CharacterData = 0; Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] Sun Feb 23 19:43:31 2014 @@ -38,7 +38,6 @@ /* FUNCTIONS ******************************************************************/ -WORD BiosPeekCharacter(VOID); WORD BiosGetCharacter(VOID); BOOLEAN KbdBios32Initialize(HANDLE ConsoleInput); Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Sun Feb 23 19:43:31 2014 @@ -1045,7 +1045,7 @@ return TRUE; } -VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) +static VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) { WORD CharData = MAKEWORD(Character, Attribute); BYTE Row, Column; Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] Sun Feb 23 19:43:31 2014 @@ -36,8 +36,6 @@ /* FUNCTIONS ******************************************************************/ -VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page); - BOOLEAN VidBios32Initialize(HANDLE BiosConsoleOutput); VOID VidBios32Cleanup(VOID); Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Sun Feb 23 19:43:31 2014 @@ -93,8 +93,18 @@ if (IsConsoleHandle(Handle)) { + /* Save AX */ + USHORT AX = getAX(); + /* Call the BIOS */ - return (BiosPeekCharacter() != 0xFFFF); + setAH(0x01); // or 0x11 for enhanced, but what to choose? + Int32Call(&DosContext, BIOS_KBD_INTERRUPT); + + /* Restore AX */ + setAX(AX); + + /* Return keyboard status */ + return (getZF() == 0); } else { Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Feb 23 19:43:31 2014 @@ -809,8 +809,23 @@ { for (i = 0; i < Count; i++) { - /* Call the BIOS to print the character */ - VidBiosPrintCharacter(((LPBYTE)Buffer)[i], DOS_CHAR_ATTRIBUTE, Bda->VideoPage); + /* Save AX and BX */ + USHORT AX = getAX(); + USHORT BX = getBX(); + + /* Set the parameters */ + setAL(((PCHAR)Buffer)[i]); + setBL(DOS_CHAR_ATTRIBUTE); + setBH(Bda->VideoPage); + + /* Call the BIOS INT 10h, AH=0Eh "Teletype Output" */ + setAH(0x0E); + Int32Call(&DosContext, BIOS_VIDEO_INTERRUPT); + + /* Restore AX and BX */ + setBX(BX); + setAX(AX); + BytesWritten32++; } } @@ -2513,14 +2528,17 @@ USHORT AX = getAX(); USHORT BX = getBX(); + /* Set the parameters (AL = character, already set) */ setBL(DOS_CHAR_ATTRIBUTE); setBH(Bda->VideoPage); + + /* Call the BIOS INT 10h, AH=0Eh "Teletype Output" */ setAH(0x0E); - Int32Call(&DosContext, 0x10); + Int32Call(&DosContext, BIOS_VIDEO_INTERRUPT); /* Restore AX and BX */ + setBX(BX); setAX(AX); - setBX(BX); #endif }

10 years, 10 months

[akhaldi] 62310: * Sync up to trunk HEAD (r62309).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 23 18:28:37 2014 New Revision: 62310 URL: http://svn.reactos.org/svn/reactos?rev=62310&view=rev Log: * Sync up to trunk HEAD (r62309). Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/cmake/msvc.cmake branches/shell-experiments/dll/win32/msgina/gui.c branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc branches/shell-experiments/dll/win32/msgina/lang/en-US.rc branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc branches/shell-experiments/dll/win32/netapi32/wksta.c branches/shell-experiments/dll/win32/syssetup/logfile.c Propchange: branches/shell-experiments/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Feb 23 18:28:37 2014 @@ -16,4 +16,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:61927-62285 +/trunk/reactos:61927-62309 Modified: branches/shell-experiments/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/msvc.cm… ============================================================================== --- branches/shell-experiments/cmake/msvc.cmake [iso-8859-1] (original) +++ branches/shell-experiments/cmake/msvc.cmake [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -121,7 +121,14 @@ if(PCH) macro(add_pch _target _pch _sources) - set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + + # Workaround for the MSVC toolchain (MSBUILD) /MP bug + set(_temp_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + if(MSVC_IDE) + file(TO_NATIVE_PATH ${_temp_gch} _gch) + else() + set(_gch ${_temp_gch}) + endif() if(IS_CPP) set(_pch_language CXX) @@ -343,9 +350,9 @@ get_directory_property(_defines COMPILE_DEFINITIONS) foreach(_source_file ${ARGN}) get_filename_component(_source_file_base_name ${_source_file} NAME_WE) + get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.tmp) set(_object_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.obj) - set(_source_file_full_path ${CMAKE_CURRENT_SOURCE_DIR}/${_source_file}) get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) unset(_source_file_defines) foreach(_define ${_defines_semicolon_list}) Modified: branches/shell-experiments/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -145,10 +145,20 @@ &ThreadId); if (Thread) { + /* 'msg' will be freed by 'StartupWindowThread' */ + CloseHandle(Thread); WaitForSingleObject(msg->StartupEvent, INFINITE); CloseHandle(msg->StartupEvent); return TRUE; + } + else + { + /* + * The 'StartupWindowThread' thread couldn't be created, + * so we need to free the allocated 'msg'. + */ + HeapFree(GetProcessHeap(), 0, msg); } return FALSE; @@ -641,6 +651,7 @@ IN PGINA_CONTEXT pgContext) { WCHAR szBuffer[256]; + WCHAR szBuffer2[256]; HWND hwndList; INT idx, count, i; @@ -651,7 +662,8 @@ /* Log off */ LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + wsprintfW(szBuffer2, szBuffer, pgContext->UserName); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer2); if (idx != CB_ERR) SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_LOGOFF); Modified: branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -155,14 +155,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -150,15 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ - + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -149,14 +149,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -158,14 +158,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -159,14 +159,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -155,14 +155,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -158,14 +158,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: branches/shell-experiments/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/net… ============================================================================== --- branches/shell-experiments/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/netapi32/wksta.c [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -570,6 +570,9 @@ { FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + if (Name == NULL || type == NULL) + return ERROR_INVALID_PARAMETER; + *Name = NULL; *type = NetSetupUnknownStatus; Modified: branches/shell-experiments/dll/win32/syssetup/logfile.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sys… ============================================================================== --- branches/shell-experiments/dll/win32/syssetup/logfile.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/syssetup/logfile.c [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -97,6 +97,8 @@ DWORD dwMessageSize; DWORD dwWritten; CHAR Buffer[6]; + CHAR TimeBuffer[30]; + SYSTEMTIME stTime; /* Get the severity code string */ switch (dwSeverity) @@ -148,6 +150,28 @@ NULL, FILE_END); + /* Write Time/Date */ + GetLocalTime(&stTime); + + snprintf(TimeBuffer, sizeof(TimeBuffer), + "%02d/%02d/%02d %02d:%02d:%02d.%03d", + stTime.wMonth, + stTime.wDay, + stTime.wYear, + stTime.wHour, + stTime.wMinute, + stTime.wSecond, + stTime.wMilliseconds); + + WriteFile(hLogFile, + TimeBuffer, + strlen(TimeBuffer), + &dwWritten, + NULL); + + /* Write comma */ + WriteFile(hLogFile, ",", 1, &dwWritten, NULL); + /* Write file name */ WriteFile(hLogFile, lpFileName,

10 years, 10 months

[dquintana] 62309: [CMAKE] * Actually do what I said.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Feb 23 18:15:20 2014 New Revision: 62309 URL: http://svn.reactos.org/svn/reactos?rev=62309&view=rev Log: [CMAKE] * Actually do what I said. Modified: branches/shell-experiments/cmake/msvc.cmake Modified: branches/shell-experiments/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/msvc.cm… ============================================================================== --- branches/shell-experiments/cmake/msvc.cmake [iso-8859-1] (original) +++ branches/shell-experiments/cmake/msvc.cmake [iso-8859-1] Sun Feb 23 18:15:20 2014 @@ -121,14 +121,7 @@ if(PCH) macro(add_pch _target _pch _sources) - - # Workaround for the MSVC toolchain (MSBUILD) /MP bug - set(_temp_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) - if(MSVC_IDE) - file(TO_NATIVE_PATH ${_temp_gch} _gch) - else() - set(_gch ${_temp_gch}) - endif() + set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) if(IS_CPP) set(_pch_language CXX)

10 years, 10 months

[dquintana] 62308: [CMAKE] * Revert change from r62307. Will do a proper merge instead. [RSHELL] * CMenuBand: Use SHGetImageList instead of Shell_GetImageLists. * CMenuBand: Remove minwidth in the ...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Feb 23 18:13:43 2014 New Revision: 62308 URL: http://svn.reactos.org/svn/reactos?rev=62308&view=rev Log: [CMAKE] * Revert change from r62307. Will do a proper merge instead. [RSHELL] * CMenuBand: Use SHGetImageList instead of Shell_GetImageLists. * CMenuBand: Remove minwidth in the size calculation. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Feb 23 18:13:43 2014 @@ -19,7 +19,16 @@ */ #include "precomp.h" #include <windowsx.h> +#include <CommonControls.h> #include <shlwapi_undoc.h> + +extern "C" +HRESULT WINAPI SHGetImageList( + _In_ int iImageList, + _In_ REFIID riid, + _Out_ void **ppv + ); + #define TBSTYLE_EX_VERTICAL 4 @@ -629,9 +638,6 @@ /* Identify the version of the used Common Controls DLL by sending the size of the TBBUTTON structure */ SendMessageW(m_hwnd, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - HIMAGELIST ilBig, ilSmall; - Shell_GetImageLists(&ilBig, &ilSmall); - //if (dwFlags & SMINIT_TOPLEVEL) //{ // /* Hide the placeholders for the button images */ @@ -640,11 +646,18 @@ //else if (m_menuBand->UseBigIcons()) { - SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(ilBig)); + IImageList * piml; + HRESULT hr = SHGetImageList(SHIL_LARGE, IID_PPV_ARG(IImageList, &piml)); + + SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); + SendMessageW(m_hwnd, TB_SETPADDING, 0, MAKELPARAM(0, 0)); } else { - SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(ilSmall)); + IImageList * piml; + HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); + + SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); } SetWindowLongPtr(m_hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this)); @@ -1586,8 +1599,6 @@ pdbi->dwMask = DBIM_MINSIZE | DBIM_MAXSIZE | DBIM_INTEGRAL | DBIM_ACTUAL | DBIM_TITLE | DBIM_MODEFLAGS | DBIM_BKCOLOR; } -#define MIN_WIDTH 220 - if (pdbi->dwMask & DBIM_MINSIZE) { SIZE sizeStatic = { 0 }; @@ -1596,7 +1607,7 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStatic)); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFld)); - pdbi->ptMinSize.x = MIN_WIDTH; + pdbi->ptMinSize.x = 0; pdbi->ptMinSize.y = sizeStatic.cy + sizeShlFld.cy; } if (pdbi->dwMask & DBIM_MAXSIZE) @@ -1607,7 +1618,7 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeStatic)); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeShlFld)); - pdbi->ptMaxSize.x = max(MIN_WIDTH, max(sizeStatic.cx, sizeShlFld.cx)); // ignored + pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx); // ignored pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; } if (pdbi->dwMask & DBIM_INTEGRAL) @@ -1774,7 +1785,7 @@ { if (nCmdID == 16) // set (big) icon size { - this->m_useBigIcons = TRUE; + this->m_useBigIcons = nCmdexecopt == 2; return S_OK; } else if (nCmdID == 19) // popup-related

10 years, 10 months

[dquintana] 62307: [CMAKE] * Take MSVC workaround from trunk. [RSHELL] * Fix GCC build. * Add a couple error checks.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Feb 23 16:44:54 2014 New Revision: 62307 URL: http://svn.reactos.org/svn/reactos?rev=62307&view=rev Log: [CMAKE] * Take MSVC workaround from trunk. [RSHELL] * Fix GCC build. * Add a couple error checks. Modified: branches/shell-experiments/base/applications/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/cmake/msvc.cmake Modified: branches/shell-experiments/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… ============================================================================== --- branches/shell-experiments/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/applications/CMakeLists.txt [iso-8859-1] Sun Feb 23 16:44:54 2014 @@ -16,6 +16,7 @@ add_subdirectory(logoff) add_subdirectory(magnify) add_subdirectory(mmc) +add_subdirectory(mplay32) add_subdirectory(msconfig) add_subdirectory(mscutils) add_subdirectory(mstsc) Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Feb 23 16:44:54 2014 @@ -1118,7 +1118,9 @@ tbb.fsStyle = 0; CComPtr<IShellItem> psi; - SHCreateShellItem(NULL, m_shellFolder, item, &psi); + hr = SHCreateShellItem(NULL, m_shellFolder, item, &psi); + if (FAILED(hr)) + return hr; hr = psi->GetDisplayName(SIGDN_NORMALDISPLAY, &MenuString); if (FAILED(hr)) @@ -1150,7 +1152,7 @@ if (i == 0) { TBBUTTON tbb = { 0 }; - PWSTR MenuString = L"(Empty)"; + PCWSTR MenuString = L"(Empty)"; tbb.fsState = 0/*TBSTATE_DISABLED*/; tbb.fsStyle = 0; @@ -1301,7 +1303,9 @@ { HRESULT hr; CComPtr<IShellItem> psi; - SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem), &psi); + hr = SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem), &psi); + if (FAILED(hr)) + return S_FALSE; SFGAOF attrs; hr = psi->GetAttributes(SFGAO_FOLDER, &attrs); @@ -1312,14 +1316,14 @@ } CMenuBand::CMenuBand() : + m_staticToolbar(NULL), + m_SFToolbar(NULL), m_site(NULL), m_psmc(NULL), - m_staticToolbar(NULL), - m_SFToolbar(NULL), + m_subMenuChild(NULL), m_useBigIcons(FALSE), m_hotBar(NULL), - m_hotItem(-1), - m_subMenuChild(NULL) + m_hotItem(-1) { m_focusManager = CMenuFocusManager::AcquireManager(); } Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Sun Feb 23 16:44:54 2014 @@ -266,7 +266,7 @@ }; extern "C" -HRESULT +HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv) { IShellMenu* pShellMenu; Modified: branches/shell-experiments/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/msvc.cm… ============================================================================== --- branches/shell-experiments/cmake/msvc.cmake [iso-8859-1] (original) +++ branches/shell-experiments/cmake/msvc.cmake [iso-8859-1] Sun Feb 23 16:44:54 2014 @@ -121,7 +121,14 @@ if(PCH) macro(add_pch _target _pch _sources) - set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + + # Workaround for the MSVC toolchain (MSBUILD) /MP bug + set(_temp_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + if(MSVC_IDE) + file(TO_NATIVE_PATH ${_temp_gch} _gch) + else() + set(_gch ${_temp_gch}) + endif() if(IS_CPP) set(_pch_language CXX)

10 years, 10 months

[hbelusca] 62306: [NTVDM] - Use callbacks in BIOS/DOS (and disable int32.c) - Move DOS bops to dem.c

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 23 16:09:35 2014 New Revision: 62306 URL: http://svn.reactos.org/svn/reactos?rev=62306&view=rev Log: [NTVDM] - Use callbacks in BIOS/DOS (and disable int32.c) - Move DOS bops to dem.c Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c branches/ntvdm/subsystems/ntvdm/dos/dem.c branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/bios.c branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -22,7 +22,7 @@ bop.c clock.c emulator.c - int32.c + callback.c io.c registers.c vddsup.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -11,6 +11,8 @@ #define NDEBUG #include "emulator.h" +#include "callback.h" + #include "bios32.h" #include "io.h" @@ -18,10 +20,9 @@ #include "hardware/pic.h" #include "hardware/timer.h" -#include "int32.h" - /* PRIVATE VARIABLES **********************************************************/ +CALLBACK16 BiosContext; PBIOS_DATA_AREA Bda; /* PRIVATE FUNCTIONS **********************************************************/ @@ -190,7 +191,7 @@ else vector = BIOS_PIC_SLAVE_INT + hwirq - 8; - RegisterInt32(vector, func); + RegisterBiosInt32(vector, func); } @@ -250,7 +251,8 @@ * because some programs may hook only BIOS_SYS_TIMER_INTERRUPT * for their purpose... */ - EmulatorInterrupt(BIOS_SYS_TIMER_INTERRUPT); + /** EmulatorInterrupt(BIOS_SYS_TIMER_INTERRUPT); **/ + Int32Call(&BiosContext, BIOS_SYS_TIMER_INTERRUPT); PicIRQComplete(Stack); } @@ -303,6 +305,48 @@ EnableHwIRQ(0, BiosTimerIrq); } +static VOID InitializeBiosInt32(VOID) +{ + USHORT i; + // USHORT Offset = 0; + + /* Initialize the callback context */ + InitializeContext(&BiosContext, BIOS_SEGMENT, 0x0000); + + /* Register the BIOS 32-bit Interrupts */ + for (i = 0x00; i <= 0xFF; i++) + { + // Offset += RegisterInt32(MAKELONG(Offset, BIOS_SEGMENT), i, NULL, NULL); + BiosContext.NextOffset += RegisterInt32(MAKELONG(BiosContext.NextOffset, + BiosContext.Segment), + i, NULL, NULL); + } + + /* Initialize the exception vector interrupts to a default Exception handler */ + for (i = 0; i < 8; i++) + RegisterBiosInt32(i, BiosException); + + /* Initialize HW vector interrupts to a default HW handler */ + for (i = BIOS_PIC_MASTER_INT; i < BIOS_PIC_MASTER_INT + 8; i++) + RegisterBiosInt32(i, BiosHandleMasterPicIRQ); + for (i = BIOS_PIC_SLAVE_INT ; i < BIOS_PIC_SLAVE_INT + 8; i++) + RegisterBiosInt32(i, BiosHandleSlavePicIRQ); + + /* Initialize software vector handlers */ + RegisterBiosInt32(BIOS_EQUIPMENT_INTERRUPT, BiosEquipmentService ); + RegisterBiosInt32(BIOS_MEMORY_SIZE , BiosGetMemorySize ); + RegisterBiosInt32(BIOS_MISC_INTERRUPT , BiosMiscService ); + RegisterBiosInt32(BIOS_TIME_INTERRUPT , BiosTimeService ); + RegisterBiosInt32(BIOS_SYS_TIMER_INTERRUPT, BiosSystemTimerInterrupt); + + /* Some interrupts are in fact addresses to tables */ + ((PULONG)BaseAddress)[0x1E] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x41] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x46] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x48] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x49] = (ULONG)NULL; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -312,7 +356,6 @@ IN HANDLE ConsoleOutput) { UCHAR Low, High; - UCHAR i; /* Initialize the BDA */ Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0); @@ -328,34 +371,8 @@ High = IOReadB(CMOS_DATA_PORT); Bda->MemorySize = MAKEWORD(Low, High); - /* Initialize the 32-bit Interrupt system */ - InitializeInt32(BIOS_SEGMENT); - /* Register the BIOS 32-bit Interrupts */ - - /* Initialize the exception vector interrupts to a default Exception handler */ - for (i = 0; i < 8; i++) - RegisterInt32(i, BiosException); - - /* Initialize HW vector interrupts to a default HW handler */ - for (i = BIOS_PIC_MASTER_INT; i < BIOS_PIC_MASTER_INT + 8; i++) - RegisterInt32(i, BiosHandleMasterPicIRQ); - for (i = BIOS_PIC_SLAVE_INT ; i < BIOS_PIC_SLAVE_INT + 8; i++) - RegisterInt32(i, BiosHandleSlavePicIRQ); - - /* Initialize software vector handlers */ - RegisterInt32(BIOS_EQUIPMENT_INTERRUPT, BiosEquipmentService ); - RegisterInt32(BIOS_MEMORY_SIZE , BiosGetMemorySize ); - RegisterInt32(BIOS_MISC_INTERRUPT , BiosMiscService ); - RegisterInt32(BIOS_TIME_INTERRUPT , BiosTimeService ); - RegisterInt32(BIOS_SYS_TIMER_INTERRUPT, BiosSystemTimerInterrupt); - - /* Some interrupts are in fact addresses to tables */ - ((PDWORD)BaseAddress)[0x1E] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x41] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x46] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x48] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x49] = (DWORD)NULL; + InitializeBiosInt32(); /* Initialize platform hardware (PIC/PIT chips, ...) */ BiosHwSetup(); Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -14,6 +14,8 @@ #include "ntvdm.h" #include "kbdbios32.h" #include "vidbios32.h" + +/**/ #include "callback.h" /**/ /* DEFINES ********************************************************************/ @@ -115,6 +117,14 @@ /* FUNCTIONS ******************************************************************/ +extern CALLBACK16 BiosContext; +#define RegisterBiosInt32(IntNumber, IntHandler) \ +do { \ + BiosContext.NextOffset += RegisterInt32(MAKELONG(BiosContext.NextOffset, \ + BiosContext.Segment), \ + (IntNumber), (IntHandler), NULL); \ +} while(0); + extern PBIOS_DATA_AREA Bda; /**HACK!!**/typedef VOID (WINAPI *EMULATOR_INT32_PROC)(LPWORD Stack);/**HACK!!**/ Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -11,13 +11,13 @@ #define NDEBUG #include "emulator.h" +#include "callback.h" + // #include "kbdbios32.h" #include "bios32.h" #include "io.h" #include "hardware/ps2.h" - -#include "int32.h" /* PRIVATE VARIABLES **********************************************************/ @@ -271,7 +271,7 @@ /* Register the BIOS 32-bit Interrupts */ /* Initialize software vector handlers */ - RegisterInt32(BIOS_KBD_INTERRUPT, BiosKeyboardService); + RegisterBiosInt32(BIOS_KBD_INTERRUPT, BiosKeyboardService); /* Set up the HW vector interrupts */ EnableHwIRQ(1, BiosKeyboardIrq); Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -11,13 +11,13 @@ #define NDEBUG #include "emulator.h" +#include "callback.h" + // #include "vidbios32.h" #include "bios32.h" #include "io.h" #include "hardware/vga.h" - -#include "int32.h" /* MACROS *********************************************************************/ @@ -1536,11 +1536,11 @@ BOOLEAN VidBios32Initialize(HANDLE ConsoleOutput) { /* Some interrupts are in fact addresses to tables */ - ((PDWORD)BaseAddress)[0x1D] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x1F] = (DWORD)NULL; - // ((PDWORD)BaseAddress)[0x42] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x43] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x44] = (DWORD)NULL; + ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x1F] = (ULONG)NULL; + // ((PULONG)BaseAddress)[0x42] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x43] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; /* Set the default video mode */ VidBiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); @@ -1562,7 +1562,7 @@ } /* Register the BIOS 32-bit Interrupts */ - RegisterInt32(BIOS_VIDEO_INTERRUPT, VidBiosVideoService); + RegisterBiosInt32(BIOS_VIDEO_INTERRUPT, VidBiosVideoService); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dem.… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dem.c [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -14,17 +14,130 @@ #define NDEBUG +#include "emulator.h" + #include "dem.h" +#include "bop.h" /* Extra PSDK/NDK Headers */ #include <ndk/obtypes.h> +/* PRIVATE VARIABLES **********************************************************/ + /**/extern BYTE CurrentDrive;/**/ +/* DEFINES ********************************************************************/ + +/* BOP Identifiers */ +#define BOP_DOS 0x50 // DOS System BOP (for NTIO.SYS and NTDOS.SYS) +#define BOP_CMD 0x54 // DOS Command Interpreter BOP (for COMMAND.COM) + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID WINAPI DosSystemBop(LPWORD Stack) +{ + /* Get the Function Number and skip it */ + BYTE FuncNum = *(PBYTE)SEG_OFF_TO_PTR(getCS(), getIP()); + setIP(getIP() + 1); + + DPRINT1("Unknown DOS System BOP Function: 0x%02X\n", FuncNum); +} + +static VOID WINAPI DosCmdInterpreterBop(LPWORD Stack) +{ + /* Get the Function Number and skip it */ + BYTE FuncNum = *(PBYTE)SEG_OFF_TO_PTR(getCS(), getIP()); + setIP(getIP() + 1); + + switch (FuncNum) + { + case 0x08: // Launch external command + { +#define CMDLINE_LENGTH 1024 + + BOOL Result; + DWORD dwExitCode; + + LPSTR Command = (LPSTR)SEG_OFF_TO_PTR(getDS(), getSI()); + LPSTR CmdPtr = Command; + CHAR CommandLine[CMDLINE_LENGTH] = ""; + STARTUPINFOA StartupInfo; + PROCESS_INFORMATION ProcessInformation; + + /* Remove return carriage character */ + while (*CmdPtr != '\r') CmdPtr++; + *CmdPtr = '\0'; + + DPRINT1("CMD Run Command '%s'\n", Command); + + /* Spawn a user-defined 32-bit command preprocessor */ + + /* Build the command line */ + // FIXME: Use COMSPEC env var!! + strcpy(CommandLine, "cmd.exe /c "); + strcat(CommandLine, Command); + + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); + + StartupInfo.cb = sizeof(StartupInfo); + + DosPrintCharacter('\n'); + + Result = CreateProcessA(NULL, + CommandLine, + NULL, + NULL, + TRUE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (Result) + { + DPRINT1("Command '%s' launched successfully\n", Command); + + /* Wait for process termination */ + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + + /* Get the exit code */ + GetExitCodeProcess(ProcessInformation.hProcess, &dwExitCode); + + /* Close handles */ + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); + } + else + { + DPRINT1("Failed when launched command '%s'\n"); + dwExitCode = GetLastError(); + } + + DosPrintCharacter('\n'); + + setAL((UCHAR)dwExitCode); + + break; + } + + default: + { + DPRINT1("Unknown DOS CMD Interpreter BOP Function: 0x%02X\n", FuncNum); + // setCF(1); // Disable, otherwise we enter an infinite loop + break; + } + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ BOOLEAN DosInitialize(IN LPCSTR DosKernelFileNames) { + /* Register the DOS BOPs */ + RegisterBop(BOP_DOS, DosSystemBop ); + RegisterBop(BOP_CMD, DosCmdInterpreterBop); + if (DosKernelFileNames) { DisplayMessage(L"NTVDM: Loading DOS kernel from external files is currently unsupported"); @@ -35,7 +148,7 @@ BOOLEAN Result; Result = DosBIOSInitialize(); - Result &= DosKRNLInitialize(); + // Result &= DosKRNLInitialize(); return Result; } Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -11,20 +11,16 @@ #define NDEBUG #include "emulator.h" +#include "callback.h" + #include "dos.h" #include "bios/bios.h" -#include "bop.h" -// #include "int32.h" /* PRIVATE VARIABLES **********************************************************/ // static BYTE CurrentDrive; // static CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; - -/* BOP Identifiers */ -#define BOP_DOS 0x50 // DOS System BOP (for NTIO.SYS and NTDOS.SYS) -#define BOP_CMD 0x54 // DOS Command Interpreter BOP (for COMMAND.COM) /* PRIVATE FUNCTIONS **********************************************************/ @@ -117,94 +113,6 @@ /* Use the file writing function */ DosWriteFile(DOS_OUTPUT_HANDLE, &Character, sizeof(CHAR), &BytesWritten); -} - -VOID WINAPI DosSystemBop(LPWORD Stack) -{ - /* Get the Function Number and skip it */ - BYTE FuncNum = *(PBYTE)SEG_OFF_TO_PTR(getCS(), getIP()); - setIP(getIP() + 1); - - DPRINT1("Unknown DOS System BOP Function: 0x%02X\n", FuncNum); -} - -VOID WINAPI DosCmdInterpreterBop(LPWORD Stack) -{ - /* Get the Function Number and skip it */ - BYTE FuncNum = *(PBYTE)SEG_OFF_TO_PTR(getCS(), getIP()); - setIP(getIP() + 1); - - switch (FuncNum) - { - case 0x08: // Launch external command - { -#define CMDLINE_LENGTH 1024 - - BOOL Result; - DWORD dwExitCode; - - LPSTR Command = (LPSTR)SEG_OFF_TO_PTR(getDS(), getSI()); - CHAR CommandLine[CMDLINE_LENGTH] = ""; - STARTUPINFOA StartupInfo; - PROCESS_INFORMATION ProcessInformation; - DPRINT1("CMD Run Command '%s'\n", Command); - - Command[strlen(Command)-1] = 0; - - strcpy(CommandLine, "cmd.exe /c "); - strcat(CommandLine, Command); - - ZeroMemory(&StartupInfo, sizeof(StartupInfo)); - ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); - - StartupInfo.cb = sizeof(StartupInfo); - - DosPrintCharacter('\n'); - - Result = CreateProcessA(NULL, - CommandLine, - NULL, - NULL, - TRUE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - if (Result) - { - DPRINT1("Command '%s' launched successfully\n"); - - /* Wait for process termination */ - WaitForSingleObject(ProcessInformation.hProcess, INFINITE); - - /* Get the exit code */ - GetExitCodeProcess(ProcessInformation.hProcess, &dwExitCode); - - /* Close handles */ - CloseHandle(ProcessInformation.hThread); - CloseHandle(ProcessInformation.hProcess); - } - else - { - DPRINT1("Failed when launched command '%s'\n"); - dwExitCode = GetLastError(); - } - - DosPrintCharacter('\n'); - - setAL((UCHAR)dwExitCode); - - break; - } - - default: - { - DPRINT1("Unknown DOS CMD Interpreter BOP Function: 0x%02X\n", FuncNum); - // setCF(1); // Disable, otherwise we enter an infinite loop - break; - } - } } BOOLEAN DosBIOSInitialize(VOID) @@ -345,16 +253,11 @@ #endif - /* Register the DOS BOPs */ - RegisterBop(BOP_DOS, DosSystemBop ); - RegisterBop(BOP_CMD, DosCmdInterpreterBop); - /* Register the DOS 32-bit Interrupts */ - // RegisterInt32(0x20, DosInt20h); - - /* TODO: Initialize the DOS kernel */ - - return TRUE; + // RegisterDosInt32(0x20, DosInt20h); + + /* Initialize the DOS kernel */ + return DosKRNLInitialize(); } /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -11,14 +11,17 @@ #define NDEBUG #include "emulator.h" +#include "callback.h" + #include "dos.h" #include "dos/dem.h" #include "bios/bios.h" -#include "int32.h" #include "registers.h" /* PRIVATE VARIABLES **********************************************************/ + +CALLBACK16 DosContext; static WORD CurrentPsp = SYSTEM_PSP; static WORD DosLastError = 0; @@ -1669,11 +1672,11 @@ /* Set Interrupt Vector */ case 0x25: { - DWORD FarPointer = MAKELONG(getDX(), getDS()); + ULONG FarPointer = MAKELONG(getDX(), getDS()); DPRINT1("Setting interrupt 0x%x ...\n", getAL()); /* Write the new far pointer to the IDT */ - ((PDWORD)BaseAddress)[getAL()] = FarPointer; + ((PULONG)BaseAddress)[getAL()] = FarPointer; break; } @@ -2480,6 +2483,7 @@ * for more information. */ +#if 0 if (Stack[STACK_COUNTER] == 0) { Stack[STACK_COUNTER]++; @@ -2504,6 +2508,20 @@ setAX(Stack[STACK_VAR_A]); setBX(Stack[STACK_VAR_B]); } +#else + /* Save AX and BX */ + USHORT AX = getAX(); + USHORT BX = getBX(); + + setBL(DOS_CHAR_ATTRIBUTE); + setBH(Bda->VideoPage); + setAH(0x0E); + Int32Call(&DosContext, 0x10); + + /* Restore AX and BX */ + setAX(AX); + setBX(BX); +#endif } VOID WINAPI DosInt2Fh(LPWORD Stack) @@ -2585,15 +2603,17 @@ #endif + /* Initialize the callback context */ + InitializeContext(&DosContext, 0x0070, 0x0000); /* Register the DOS 32-bit Interrupts */ - RegisterInt32(0x20, DosInt20h ); - RegisterInt32(0x21, DosInt21h ); -// RegisterInt32(0x22, DosInt22h ); // Termination - RegisterInt32(0x23, DosBreakInterrupt); // Ctrl-C / Ctrl-Break -// RegisterInt32(0x24, DosInt24h ); // Critical Error - RegisterInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output - RegisterInt32(0x2F, DosInt2Fh ); + RegisterDosInt32(0x20, DosInt20h ); + RegisterDosInt32(0x21, DosInt21h ); +// RegisterDosInt32(0x22, DosInt22h ); // Termination + RegisterDosInt32(0x23, DosBreakInterrupt); // Ctrl-C / Ctrl-Break +// RegisterDosInt32(0x24, DosInt24h ); // Critical Error + RegisterDosInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output + RegisterDosInt32(0x2F, DosInt2Fh ); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -12,6 +12,8 @@ /* INCLUDES *******************************************************************/ #include "ntvdm.h" + +/**/ #include "callback.h" /**/ /* DEFINES ********************************************************************/ @@ -138,6 +140,14 @@ /* FUNCTIONS ******************************************************************/ +extern CALLBACK16 DosContext; +#define RegisterDosInt32(IntNumber, IntHandler) \ +do { \ + DosContext.NextOffset += RegisterInt32(MAKELONG(DosContext.NextOffset, \ + DosContext.Segment), \ + (IntNumber), (IntHandler), NULL); \ +} while(0); + /* * DOS BIOS Functions * See bios.c Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Feb 23 16:09:35 2014 @@ -388,7 +388,8 @@ // if (!VgaInitialize(ConsoleOutput)) return FALSE; VgaInitialize(ConsoleOutput); - /* Register the emulator BOPs */ + /* Initialize the software callback system and register the emulator BOPs */ + InitializeCallbacks(); RegisterBop(BOP_DEBUGGER , EmulatorDebugBreakBop); RegisterBop(BOP_UNSIMULATE, EmulatorUnsimulateBop);

10 years, 10 months

[hbelusca] 62305: [NTVDM]: Limit the number of CPU recursion calls (not more than 32).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 23 15:54:20 2014 New Revision: 62305 URL: http://svn.reactos.org/svn/reactos?rev=62305&view=rev Log: [NTVDM]: Limit the number of CPU recursion calls (not more than 32). Modified: branches/ntvdm/subsystems/ntvdm/callback.c branches/ntvdm/subsystems/ntvdm/clock.c branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/subsystems/ntvdm/callback.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/callback… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/callback.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/callback.c [iso-8859-1] Sun Feb 23 15:54:20 2014 @@ -102,7 +102,7 @@ DPRINT("Call16(0x%04X, 0x%04X)\n", Segment, Offset); - /* Start simulation */ + /* Start CPU simulation */ EmulatorSimulate(); /* Restore CS:IP */ Modified: branches/ntvdm/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/clock.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/clock.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/clock.c [iso-8859-1] Sun Feb 23 15:54:20 2014 @@ -59,6 +59,7 @@ VOID ClockUpdate(VOID) { + extern BOOLEAN CpuSimulate; UINT i; #ifdef WORKING_TIMER @@ -127,7 +128,7 @@ VgaHorizontalRetrace(); /* Continue CPU emulation */ - for (i = 0; (i < STEPS_PER_CYCLE) && VdmRunning; i++) + for (i = 0; VdmRunning && CpuSimulate && (i < STEPS_PER_CYCLE); i++) { EmulatorStep(); #ifdef IPS_DISPLAY Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Feb 23 15:54:20 2014 @@ -30,6 +30,12 @@ /* PRIVATE VARIABLES **********************************************************/ FAST486_STATE EmulatorContext; +BOOLEAN CpuSimulate = FALSE; + +/* No more than 'MaxCpuCallLevel' recursive CPU calls are allowed */ +const static INT MaxCpuCallLevel = 32; +static INT CpuCallLevel = 0; + LPVOID BaseAddress = NULL; BOOLEAN VdmRunning = TRUE; @@ -177,18 +183,31 @@ VOID EmulatorSimulate(VOID) { - // FIXME: Do not mix VdmRunning (i.e. ntvdm running) and CpuSimulate!! - while (VdmRunning) ClockUpdate(); + if (CpuCallLevel > MaxCpuCallLevel) + { + DisplayMessage(L"Too many CPU levels of recursion (%d, expected maximum %d)", + CpuCallLevel, MaxCpuCallLevel); + + /* Stop the VDM */ + VdmRunning = FALSE; + return; + } + CpuCallLevel++; + + CpuSimulate = TRUE; + while (VdmRunning && CpuSimulate) ClockUpdate(); + + CpuCallLevel--; + if (CpuCallLevel < 0) CpuCallLevel = 0; /* This takes into account for reentrance */ - VdmRunning = TRUE; + CpuSimulate = TRUE; } VOID EmulatorUnsimulate(VOID) { /* Stop simulation */ - // FIXME: Do not mix VdmRunning (i.e. ntvdm running) and CpuSimulate!! - VdmRunning = FALSE; + CpuSimulate = FALSE; } VOID EmulatorInterrupt(BYTE Number)

10 years, 10 months

[tkreuzer] 62304: [NTOSKRNL] Fix logic in ObSetSecurityDescriptorInfo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 23 15:37:06 2014 New Revision: 62304 URL: http://svn.reactos.org/svn/reactos?rev=62304&view=rev Log: [NTOSKRNL] Fix logic in ObSetSecurityDescriptorInfo Modified: branches/kernel-fun/reactos/ntoskrnl/ob/obsecure.c Modified: branches/kernel-fun/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/ob/… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Sun Feb 23 15:37:06 2014 @@ -131,73 +131,70 @@ /* Get the object header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + + /* Reference the old descriptor */ + OldDescriptor = ObpReferenceSecurityDescriptor(ObjectHeader); + NewDescriptor = OldDescriptor; + + /* Set the SD information */ + Status = SeSetSecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + &NewDescriptor, + PoolType, + GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the old one */ + if (OldDescriptor) ObDereferenceSecurityDescriptor(OldDescriptor, 1); + return Status; + } + while (TRUE) { - /* Reference the old descriptor */ - OldDescriptor = ObpReferenceSecurityDescriptor(ObjectHeader); - NewDescriptor = OldDescriptor; - - /* Set the SD information */ - Status = SeSetSecurityDescriptorInfo(Object, - SecurityInformation, - SecurityDescriptor, - &NewDescriptor, - PoolType, - GenericMapping); - if (NT_SUCCESS(Status)) + /* Now add this to the cache */ + Status = ObLogSecurityDescriptor(NewDescriptor, + &CachedDescriptor, + MAX_FAST_REFS + 1); + + /* Let go of our uncached copy */ + ExFreePool(NewDescriptor); + + /* Check for success */ + if (!NT_SUCCESS(Status)) { - /* Now add this to the cache */ - Status = ObLogSecurityDescriptor(NewDescriptor, - &CachedDescriptor, - MAX_FAST_REFS + 1); - - /* Let go of our uncached copy */ - ExFreePool(NewDescriptor); - - /* Check for success */ - if (NT_SUCCESS(Status)) - { - /* Do the swap */ - FastRef = (PEX_FAST_REF)OutputSecurityDescriptor; - OldValue = ExCompareSwapFastReference(FastRef, - CachedDescriptor, - OldDescriptor); - - /* Get the security descriptor */ - SecurityDescriptor = ExGetObjectFastReference(OldValue); - Count = ExGetCountFastReference(OldValue); - - /* Make sure the swap worked */ - if (SecurityDescriptor == OldDescriptor) - { - /* Flush waiters */ - ObpAcquireObjectLock(ObjectHeader); - ObpReleaseObjectLock(ObjectHeader); - - /* And dereference the old one */ - ObDereferenceSecurityDescriptor(OldDescriptor, Count + 2); - break; - } - else - { - /* Someone changed it behind our back -- try again */ - ObDereferenceSecurityDescriptor(OldDescriptor, 1); - ObDereferenceSecurityDescriptor(CachedDescriptor, - MAX_FAST_REFS + 1); - } - } - else - { - /* We failed, dereference the old one */ - ObDereferenceSecurityDescriptor(OldDescriptor, 1); - break; - } + /* We failed, dereference the old one */ + ObDereferenceSecurityDescriptor(OldDescriptor, 1); + break; + } + + /* Do the swap */ + FastRef = (PEX_FAST_REF)OutputSecurityDescriptor; + OldValue = ExCompareSwapFastReference(FastRef, + CachedDescriptor, + OldDescriptor); + + /* Get the security descriptor */ + SecurityDescriptor = ExGetObjectFastReference(OldValue); + Count = ExGetCountFastReference(OldValue); + + /* Make sure the swap worked */ + if (SecurityDescriptor == OldDescriptor) + { + /* Flush waiters */ + ObpAcquireObjectLock(ObjectHeader); + ObpReleaseObjectLock(ObjectHeader); + + /* And dereference the old one */ + ObDereferenceSecurityDescriptor(OldDescriptor, Count + 2); + break; } else { - /* We failed, dereference the old one */ - if (OldDescriptor) ObDereferenceSecurityDescriptor(OldDescriptor, 1); - break; + /* Someone changed it behind our back -- try again */ + ObDereferenceSecurityDescriptor(OldDescriptor, 1); + ObDereferenceSecurityDescriptor(CachedDescriptor, + MAX_FAST_REFS + 1); } }

10 years, 10 months

[dquintana] 62303: [RSHELL] * CMenuBand: Send timer notifications for all items, so we can hide a previous submenu when the user hovers an item without submenu. * CMenuBand: Avoid a stack overflow ...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Feb 23 15:02:02 2014 New Revision: 62303 URL: http://svn.reactos.org/svn/reactos?rev=62303&view=rev Log: [RSHELL] * CMenuBand: Send timer notifications for all items, so we can hide a previous submenu when the user hovers an item without submenu. * CMenuBand: Avoid a stack overflow in some versions of windows by relying on the stored value instead of asking for it in the middle of a changed event. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Feb 23 15:02:02 2014 @@ -676,9 +676,14 @@ case WM_TIMER: if (wParam == TIMERID_HOTTRACK) { + KillTimer(hWnd, TIMERID_HOTTRACK); + m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL); - PopupItem(m_hotItem); - KillTimer(hWnd, TIMERID_HOTTRACK); + + if (HasSubMenu(m_hotItem) == S_OK) + { + PopupItem(m_hotItem); + } } } @@ -696,12 +701,9 @@ } else if (m_hotItem != hot->idNew) { - if (HasSubMenu(hot->idNew) == S_OK) - { - DWORD elapsed = 0; - SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); - SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL); - } + DWORD elapsed = 0; + SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); + SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL); m_hotItem = hot->idNew; m_menuBand->_OnHotItemChanged(this, m_hotItem); @@ -838,7 +840,7 @@ HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType) { - int prev = SendMessage(m_hwnd, TB_GETHOTITEM, 0, 0); + int prev = m_hotItem; int index = -1; if (dwSelectType != 0xFFFFFFFF) @@ -896,7 +898,7 @@ if (btn.dwData) { m_hotItem = btn.idCommand; - if (prev != index) + if (prev != m_hotItem) { SendMessage(m_hwnd, TB_SETHOTITEM, index, 0); return m_menuBand->_OnHotItemChanged(this, m_hotItem); @@ -916,7 +918,7 @@ } m_hotItem = -1; - if (prev != index) + if (prev != m_hotItem) { SendMessage(m_hwnd, TB_SETHOTITEM, -1, 0); m_menuBand->_OnHotItemChanged(NULL, -1);

10 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014