Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[tkreuzer] 56860: [FREELDR] Allocate the ARC_DISK_SIGNATURE structures from the heap instead of putting them into the initial loader block allocation, since the number of disks changes later. Fixes...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 8 22:06:23 2012 New Revision: 56860 URL: http://svn.reactos.org/svn/reactos?rev=56860&view=rev Log: [FREELDR] Allocate the ARC_DISK_SIGNATURE structures from the heap instead of putting them into the initial loader block allocation, since the number of disks changes later. Fixes memory corrruption and boot breakage when 3 hdds are connected. [NTOSKRNL] Remove a hack that disabled unloading drivers, which didn't work because of memory corruption from freeldr. This works now, too. See issue #7139 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Sun Jul 8 22:06:23 2012 @@ -71,7 +71,6 @@ CHAR NtBootPathName[MAX_PATH+1]; CHAR NtHalPathName[MAX_PATH+1]; ARC_DISK_INFORMATION ArcDiskInformation; - ARC_DISK_SIGNATURE_EX ArcDiskSignature[]; } LOADER_SYSTEM_BLOCK, *PLOADER_SYSTEM_BLOCK; extern PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sun Jul 8 22:06:23 2012 @@ -48,12 +48,9 @@ AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock) { PLOADER_PARAMETER_BLOCK LoaderBlock; - ULONG SystemBlockSize; /* Allocate and zero-init the LPB */ - SystemBlockSize = sizeof(LOADER_SYSTEM_BLOCK) + - reactos_disk_count * sizeof(ARC_DISK_SIGNATURE_EX); - WinLdrSystemBlock = MmAllocateMemoryWithType(SystemBlockSize, + WinLdrSystemBlock = MmAllocateMemoryWithType(sizeof(LOADER_SYSTEM_BLOCK), LoaderSystemBlock); if (WinLdrSystemBlock == NULL) { @@ -135,26 +132,27 @@ /* Convert ARC disk information from freeldr to a correct format */ for (i = 0; i < reactos_disk_count; i++) { - PARC_DISK_SIGNATURE ArcDiskSig; - - /* Get the ARC structure */ - ArcDiskSig = &WinLdrSystemBlock->ArcDiskSignature[i].DiskSignature; + PARC_DISK_SIGNATURE_EX ArcDiskSig; + + /* Allocate the ARC structure */ + ArcDiskSig = HeapAllocate(FrLdrDefaultHeap, + sizeof(ARC_DISK_SIGNATURE_EX), + 'giSD'); /* Copy the data over */ - ArcDiskSig->Signature = reactos_arc_disk_info[i].Signature; - ArcDiskSig->CheckSum = reactos_arc_disk_info[i].CheckSum; + ArcDiskSig->DiskSignature.Signature = reactos_arc_disk_info[i].Signature; + ArcDiskSig->DiskSignature.CheckSum = reactos_arc_disk_info[i].CheckSum; /* Copy the ARC Name */ - ArcDiskSig->ArcName = WinLdrSystemBlock->ArcDiskSignature[i].ArcName; strncpy(ArcDiskSig->ArcName, reactos_arc_disk_info[i].ArcName, MAX_PATH); - ArcDiskSig->ArcName = PaToVa(ArcDiskSig->ArcName); + ArcDiskSig->DiskSignature.ArcName = PaToVa(ArcDiskSig->ArcName); /* Mark partition table as valid */ - ArcDiskSig->ValidPartitionTable = TRUE; + ArcDiskSig->DiskSignature.ValidPartitionTable = TRUE; /* Insert into the list */ InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, - &ArcDiskSig->ListEntry); + &ArcDiskSig->DiskSignature.ListEntry); } /* Convert all list's to Virtual address */ @@ -639,7 +637,9 @@ WinLdrpDumpMemoryDescriptors(LoaderBlockVA); WinLdrpDumpBootDriver(LoaderBlockVA); +#ifndef _M_AMD64 WinLdrpDumpArcDisks(LoaderBlockVA); +#endif //FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below //while (1) {}; Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun Jul 8 22:06:23 2012 @@ -76,16 +76,12 @@ DriverExtension = NextDriverExtension; } -#if 0 /* Check if the driver image is still loaded */ if (DriverObject->DriverSection) { /* Unload it */ MmUnloadSystemImage(DriverObject->DriverSection); } -#else - DPRINT1("HACK: Not unloading the driver image due to critical bugs!\n"); -#endif /* Check if it has a name */ if (DriverObject->DriverName.Buffer) @@ -283,7 +279,7 @@ /* Free caller's string */ ExFreePoolWithTag(InputImagePath.Buffer, TAG_RTLREGISTRY); } - + DPRINT("Normalized image path is '%wZ' for service '%wZ'\n", ImagePath, ServiceName); return STATUS_SUCCESS; @@ -526,7 +522,7 @@ DPRINT("IopCreateDriver() failed (Status 0x%08lx)\n", Status); return Status; } - + MmFreeDriverInitialization((PLDR_DATA_TABLE_ENTRY)Driver->DriverSection); /* Set the driver as initialized */

12 years, 5 months

[tkreuzer] 56859: [CMAKE] Globally disable SSE when compiling with VS 11 or newer. See issue #7174 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 8 19:59:33 2012 New Revision: 56859 URL: http://svn.reactos.org/svn/reactos?rev=56859&view=rev Log: [CMAKE] Globally disable SSE when compiling with VS 11 or newer. See issue #7174 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Jul 8 19:59:33 2012 @@ -31,11 +31,6 @@ add_definitions(-D_ZOOM2_) endif() endif() - -# for VS 2012 we need to explicitly disable SSE -if (MSVC_VERSION GREATER 1699 AND ARCH MATCHES i386) - add_definitions(/arch:IA32) -endif () list(APPEND FREELDR_COMMON_SOURCE cmdline.c Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56859… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Jul 8 19:59:33 2012 @@ -20,6 +20,12 @@ add_definitions(/Dinline=__inline /D__STDC__=1) add_compile_flags("/X /GR- /GS- /Zl /W3") + +# HACK: for VS 11+ we need to explicitly disable SSE, which is off by +# default for older compilers. See bug #7174 +if (MSVC_VERSION GREATER 1699 AND ARCH MATCHES i386) + add_compile_flags("/arch:IA32") +endif () # C4700 is almost always likely to result in broken code, so mark it as an error add_compile_flags("/we4700")

12 years, 5 months

[fireball] 56858: [CMD] - Fix missing new line in the timer command results. Spotted by Mikael Lyngvig. See issue #7140 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jul 8 19:43:25 2012 New Revision: 56858 URL: http://svn.reactos.org/svn/reactos?rev=56858&view=rev Log: [CMD] - Fix missing new line in the timer command results. Spotted by Mikael Lyngvig. See issue #7140 for more details. Modified: trunk/reactos/base/shell/cmd/timer.c Modified: trunk/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/timer.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] Sun Jul 8 19:43:25 2012 @@ -163,7 +163,7 @@ if(cS) { ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - ConOutPuts(GetTimeString()); + ConOutPrintf(_T("%s\n"), GetTimeString()); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; @@ -183,7 +183,7 @@ { cS=FALSE; ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - ConOutPuts(GetTimeString()); + ConOutPrintf(_T("%s\n"), GetTimeString()); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; @@ -204,7 +204,7 @@ { cS=FALSE; ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - ConOutPuts(GetTimeString()); + ConOutPrintf(_T("%s\n"), GetTimeString()); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0;

12 years, 5 months

[tkreuzer] 56857: [FREELDR] - Make sure freeldr is not compiled with SSE instructions (default for VS 11+) - Print trap number and instruction stream on bugcheck - Fix assembly code for ML

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 8 18:45:34 2012 New Revision: 56857 URL: http://svn.reactos.org/svn/reactos?rev=56857&view=rev Log: [FREELDR] - Make sure freeldr is not compiled with SSE instructions (default for VS 11+) - Print trap number and instruction stream on bugcheck - Fix assembly code for ML Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Jul 8 18:45:34 2012 @@ -31,6 +31,11 @@ add_definitions(-D_ZOOM2_) endif() endif() + +# for VS 2012 we need to explicitly disable SSE +if (MSVC_VERSION GREATER 1699 AND ARCH MATCHES i386) + add_definitions(/arch:IA32) +endif () list(APPEND FREELDR_COMMON_SOURCE cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] Sun Jul 8 18:45:34 2012 @@ -102,6 +102,8 @@ NTAPI i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGISTERS Special) { + PUCHAR InstructionPointer; + MachVideoClearScreen(SCREEN_ATTR); i386_ScreenPosX = 0; i386_ScreenPosY = 0; @@ -109,7 +111,7 @@ PrintText("An error occured in FreeLoader\n" VERSION"\n" "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" - "%s\n", i386ExceptionDescriptionText[TrapIndex]); + "0x%02lx: %s\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]); #ifdef _M_IX86 PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n", TrapFrame->Eax, TrapFrame->HardwareEsp, Special->Cr0, TrapFrame->Dr0); @@ -137,6 +139,7 @@ TrapFrame->HardwareSegSs, Special->Ldtr, Special->Idtr.Limit); i386PrintFrames(TrapFrame); // Display frames + InstructionPointer = (PUCHAR)TrapFrame->Eip; #else PrintText("RAX: %.8lx R8: %.8lx R12: %.8lx RSI: %.8lx\n", TrapFrame->Rax, TrapFrame->R8, 0, TrapFrame->Rsi); @@ -159,7 +162,13 @@ TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", TrapFrame->SegSs, Special->Ldtr, Special->Idtr.Limit); + InstructionPointer = (PUCHAR)TrapFrame->Rip; #endif + PrintText("\nInstructionstream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x \n", + InstructionPointer[0], InstructionPointer[1], + InstructionPointer[2], InstructionPointer[3], + InstructionPointer[4], InstructionPointer[5], + InstructionPointer[6], InstructionPointer[7]); } char *BugCodeStrings[] = Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] Sun Jul 8 18:45:34 2012 @@ -97,7 +97,7 @@ lea eax, [esp + (21 * 4)] // KTRAP_FRAME push esp // KSPECIAL_REGISTERS push eax - push i386ExceptionIndex + push dword ptr ds:[i386ExceptionIndex] call _i386PrintExceptionText@12 cli @@ -109,24 +109,16 @@ MACRO(TRAP_STUB, function, index) PUBLIC VAL(function) -#ifdef _USE_ML - function: -#else - \function: -#endif + &function: push 0 // Fake error code - mov dword ptr i386ExceptionIndex, VAL(index) + mov dword ptr ds:[i386ExceptionIndex], VAL(index) jmp i386CommonExceptionHandler ENDM MACRO(TRAP_STUB2, function, index) PUBLIC VAL(function) -#ifdef _USE_ML - function: -#else - \function: -#endif - mov dword ptr i386ExceptionIndex, VAL(index) + &function: + mov dword ptr ds:[i386ExceptionIndex], VAL(index) jmp i386CommonExceptionHandler ENDM

12 years, 5 months

[tkreuzer] 56856: [CMAKE] Fix MSVC+Ninja support, sync some stuff from the original cmake file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 8 18:40:24 2012 New Revision: 56856 URL: http://svn.reactos.org/svn/reactos?rev=56856&view=rev Log: [CMAKE] Fix MSVC+Ninja support, sync some stuff from the original cmake file Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] Sun Jul 8 18:40:24 2012 @@ -94,7 +94,7 @@ # that is automatically copied into try_compile directories # by the global generator. SET(MSVC_IDE 1) -IF(CMAKE_GENERATOR MATCHES "Makefiles") +IF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") SET(MSVC_IDE 0) IF(NOT CMAKE_VC_COMPILER_TESTS_RUN) SET(CMAKE_VC_COMPILER_TESTS 1) @@ -182,20 +182,20 @@ ENDIF(CMAKE_COMPILER_RETURN) MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3") ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN) -ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") +ENDIF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") IF(MSVC_C_ARCHITECTURE_ID MATCHES 64) SET(CMAKE_CL_64 1) ELSE(MSVC_C_ARCHITECTURE_ID MATCHES 64) SET(CMAKE_CL_64 0) ENDIF(MSVC_C_ARCHITECTURE_ID MATCHES 64) -IF(CMAKE_FORCE_WIN64) +IF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) SET(CMAKE_CL_64 1) -ENDIF(CMAKE_FORCE_WIN64) - -#IF("${MSVC_VERSION}" GREATER 1599) -# SET(MSVC_INCREMENTAL_DEFAULT ON) -#ENDIF() +ENDIF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) + +IF("${MSVC_VERSION}" GREATER 1599) + SET(MSVC_INCREMENTAL_DEFAULT ON) +ENDIF() # No support for old versions if(MSVC_VERSION LESS 1310) @@ -245,10 +245,10 @@ ENDIF() IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept") + SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") + SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) # for release and minsize release default to no incremental linking

12 years, 5 months

[tkreuzer] 56855: [CMD] Fix typos

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 8 16:16:53 2012 New Revision: 56855 URL: http://svn.reactos.org/svn/reactos?rev=56855&view=rev Log: [CMD] Fix typos Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sun Jul 8 16:16:53 2012 @@ -584,7 +584,7 @@ MKDIR Erstellt ein Verzeichnis.\n\ MKLINK Erzeugt eine DateisystemverknÃ¼pfung.\n\ MOVE Verschiebt eine oder mehrere Dateien von einem Verzeichnis in\n\ - ein anderes.\n\" + ein anderes.\n" STRING_HELP2, "PATH Legt den Suchpfad fÃ¼r ausfÃ¼hrbare Dateien fest oder zeigt diesen an.\n\ PAUSE HÃ¤lt die AusfÃ¼hrung einer Batchdatei an und zeigt eine Meldung an.\n\ POPD Wechselt zu dem Verzeichnis, das durch PUSHD gespeichert wurde.\n\ Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun Jul 8 16:16:53 2012 @@ -635,7 +635,7 @@ MD CreazÄ un director.\n\ MKDIR CreazÄ un director.\n\ MKLINK CreazÄ un obiect-legÄturÄ Ã®n sistemul de fiÈiere.\n\ -MOVE MutÄ unul sau mai multe fiÈiere dintr-un director Ã®n altul.\n\" +MOVE MutÄ unul sau mai multe fiÈiere dintr-un director Ã®n altul.\n" STRING_HELP2, "PATH AfiÈeazÄ sau stabileÈte cÄile de cÄutare de fiÈierelor executabile.\n\ PAUSE SuspendÄ execuÈia unui fiÈier de comenzi Èi afiÈeazÄ un mesaj.\n\ POPD RestabileÈte valoarea precedentÄ a directorului curent, anterior\n\

12 years, 5 months

[tkreuzer] 56854: [CMD] Fix build with VS 2012

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 8 16:06:24 2012 New Revision: 56854 URL: http://svn.reactos.org/svn/reactos?rev=56854&view=rev Log: [CMD] Fix build with VS 2012 Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sun Jul 8 16:06:24 2012 @@ -584,8 +584,8 @@ MKDIR Erstellt ein Verzeichnis.\n\ MKLINK Erzeugt eine DateisystemverknÃ¼pfung.\n\ MOVE Verschiebt eine oder mehrere Dateien von einem Verzeichnis in\n\ - ein anderes.\n\ -PATH Legt den Suchpfad fÃ¼r ausfÃ¼hrbare Dateien fest oder zeigt diesen an.\n\ + ein anderes.\n\" +STRING_HELP2, "PATH Legt den Suchpfad fÃ¼r ausfÃ¼hrbare Dateien fest oder zeigt diesen an.\n\ PAUSE HÃ¤lt die AusfÃ¼hrung einer Batchdatei an und zeigt eine Meldung an.\n\ POPD Wechselt zu dem Verzeichnis, das durch PUSHD gespeichert wurde.\n\ PROMPT Ãndert die Eingabeaufforderung.\n\ @@ -599,8 +599,8 @@ RMDIR LÃ¶scht ein Verzeichnis.\n\ SCREEN Bewegt den Cursor und optional die Ausgabe.\n\ SET Setzt oder lÃ¶scht die Umgebungsvariablen bzw. zeigt sie an.\n\ -SHIFT VerÃ¤ndert die Position ersetzbarer Parameter in Batchdateien.\n" -STRING_HELP2, "START Startet ein eigenes Fenster, um ein bestimmtes Programm oder einen\n\ +SHIFT VerÃ¤ndert die Position ersetzbarer Parameter in Batchdateien.\n\ +START Startet ein eigenes Fenster, um ein bestimmtes Programm oder einen\n\ Befehl auszufÃ¼hren.\n\ TIME Zeigt die Systemzeit an bzw. legt sie fest.\n\ TIMER Erlaubt die Benutzung von bis zu 10 Stoppuhren\n\ Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun Jul 8 16:06:24 2012 @@ -635,8 +635,8 @@ MD CreazÄ un director.\n\ MKDIR CreazÄ un director.\n\ MKLINK CreazÄ un obiect-legÄturÄ Ã®n sistemul de fiÈiere.\n\ -MOVE MutÄ unul sau mai multe fiÈiere dintr-un director Ã®n altul.\n\ -PATH AfiÈeazÄ sau stabileÈte cÄile de cÄutare de fiÈierelor executabile.\n\ +MOVE MutÄ unul sau mai multe fiÈiere dintr-un director Ã®n altul.\n\" +STRING_HELP2, "PATH AfiÈeazÄ sau stabileÈte cÄile de cÄutare de fiÈierelor executabile.\n\ PAUSE SuspendÄ execuÈia unui fiÈier de comenzi Èi afiÈeazÄ un mesaj.\n\ POPD RestabileÈte valoarea precedentÄ a directorului curent, anterior\n\ stocatÄ cu PUSHD.\n\ @@ -646,8 +646,8 @@ REM DesemneazÄ un rÃ¢nd de comentarii Ã®ntr-un fiÈier de comenzi.\n\ REN RedenumeÈte un fiÈier/director sau un grup (de fiÈiere/directoare).\n\ RENAME RedenumeÈte un fiÈier/director sau un grup (de fiÈiere/directoare).\n\ -REPLACE ÃnlocuieÈte fiÈiere.\n" -STRING_HELP2, "RMDIR EliminÄ un director.\n\ +REPLACE ÃnlocuieÈte fiÈiere.\n\ +RMDIR EliminÄ un director.\n\ SCREEN MutÄ cursorul Èi (opÈional) afiÈeazÄ un text.\n\ SET AfiÈeazÄ, stabileÈte sau eliminÄ variabile de mediu ReactOS.\n\ SHIFT SchimbÄ poziÈia argumentelor Ã®nlocuibile Ã®ntr-un fiÈier de comenzi.\n\

12 years, 5 months

[tfaber] 56853: [SMSS] - Fix an NTSTATUS vs boolean issue - Fix an MSVC warning

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 8 16:04:39 2012 New Revision: 56853 URL: http://svn.reactos.org/svn/reactos?rev=56853&view=rev Log: [SMSS] - Fix an NTSTATUS vs boolean issue - Fix an MSVC warning Modified: trunk/reactos/base/system/smss2/smss.c Modified: trunk/reactos/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Sun Jul 8 16:04:39 2012 @@ -160,8 +160,8 @@ IN PUNICODE_STRING Arguments, IN ULONG Flags) { - ANSI_STRING DestinationString; - CHAR SourceString[256]; + ANSI_STRING MessageString; + CHAR MessageBuffer[256]; UNICODE_STRING Destination; WCHAR Buffer[1024]; BOOLEAN BootState, BootOkay, ShutdownOkay; @@ -173,13 +173,13 @@ if (Flags & SMP_INVALID_PATH) { /* It wasn't, so create an error message to print on the screen */ - sprintf_nt(SourceString, + sprintf_nt(MessageBuffer, "%wZ program not found - skipping AUTOCHECK\n", FileName); - RtlInitAnsiString(&DestinationString, SourceString); - if (RtlAnsiStringToUnicodeString(&Destination, - &DestinationString, - TRUE)) + RtlInitAnsiString(&MessageString, MessageBuffer); + if (NT_SUCCESS(RtlAnsiStringToUnicodeString(&Destination, + &MessageString, + TRUE))) { /* And show it */ NtDisplayString(&Destination); @@ -469,7 +469,7 @@ ASSERT(NT_SUCCESS(Status)); /* Save the debug flag if it was passed */ - if (DebugFlag) SmpDebug = DebugFlag; + if (DebugFlag) SmpDebug = DebugFlag != 0; /* Build the hard error parameters */ Parameters[0] = (ULONG_PTR)&DbgString;

12 years, 5 months

[ekohl] 56852: [SERVICES] Implement LoadUserProfileA and DeleteProfileA. Patch by Hermes Belusca. See issue #7163 for more details.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 8 15:39:14 2012 New Revision: 56852 URL: http://svn.reactos.org/svn/reactos?rev=56852&view=rev Log: [SERVICES] Implement LoadUserProfileA and DeleteProfileA. Patch by Hermes Belusca. See issue #7163 for more details. Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sun Jul 8 15:39:14 2012 @@ -902,11 +902,111 @@ BOOL WINAPI -LoadUserProfileA(HANDLE hToken, - LPPROFILEINFOA lpProfileInfo) -{ - DPRINT ("LoadUserProfileA() not implemented\n"); - return FALSE; +LoadUserProfileA(IN HANDLE hToken, + IN OUT LPPROFILEINFOA lpProfileInfo) +{ + BOOL bResult = FALSE; + PROFILEINFOW ProfileInfoW = {0}; + int len; + + DPRINT("LoadUserProfileA() called\n"); + + /* Check profile info */ + if (!lpProfileInfo || (lpProfileInfo->dwSize != sizeof(PROFILEINFOA)) || + (lpProfileInfo->lpUserName == NULL) || (lpProfileInfo->lpUserName[0] == 0)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Convert the structure to UNICODE... */ + ProfileInfoW.dwSize = sizeof(PROFILEINFOW); + ProfileInfoW.dwFlags = lpProfileInfo->dwFlags; + + if (lpProfileInfo->lpUserName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpUserName, -1, NULL, 0); + ProfileInfoW.lpUserName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!ProfileInfoW.lpUserName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpUserName, -1, ProfileInfoW.lpUserName, len); + } + + if (lpProfileInfo->lpProfilePath) + { + len = MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpProfilePath, -1, NULL, 0); + ProfileInfoW.lpProfilePath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!ProfileInfoW.lpProfilePath) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpProfilePath, -1, ProfileInfoW.lpProfilePath, len); + } + + if (lpProfileInfo->lpDefaultPath) + { + len = MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpDefaultPath, -1, NULL, 0); + ProfileInfoW.lpDefaultPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!ProfileInfoW.lpDefaultPath) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpDefaultPath, -1, ProfileInfoW.lpDefaultPath, len); + } + + if (lpProfileInfo->lpServerName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpServerName, -1, NULL, 0); + ProfileInfoW.lpServerName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!ProfileInfoW.lpServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpServerName, -1, ProfileInfoW.lpServerName, len); + } + + if ((ProfileInfoW.dwFlags & PI_APPLYPOLICY) != 0 && lpProfileInfo->lpPolicyPath) + { + len = MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpPolicyPath, -1, NULL, 0); + ProfileInfoW.lpPolicyPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!ProfileInfoW.lpPolicyPath) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpProfileInfo->lpPolicyPath, -1, ProfileInfoW.lpPolicyPath, len); + } + + /* ... and call the UNICODE function */ + bResult = LoadUserProfileW(hToken, &ProfileInfoW); + + /* Save the returned value */ + lpProfileInfo->hProfile = ProfileInfoW.hProfile; + +cleanup: + /* Memory cleanup */ + if (ProfileInfoW.lpUserName) + HeapFree(GetProcessHeap(), 0, ProfileInfoW.lpUserName); + + if (ProfileInfoW.lpProfilePath) + HeapFree(GetProcessHeap(), 0, ProfileInfoW.lpProfilePath); + + if (ProfileInfoW.lpDefaultPath) + HeapFree(GetProcessHeap(), 0, ProfileInfoW.lpDefaultPath); + + if (ProfileInfoW.lpServerName) + HeapFree(GetProcessHeap(), 0, ProfileInfoW.lpServerName); + + if ((ProfileInfoW.dwFlags & PI_APPLYPOLICY) != 0 && ProfileInfoW.lpPolicyPath) + HeapFree(GetProcessHeap(), 0, ProfileInfoW.lpPolicyPath); + + return bResult; } @@ -932,7 +1032,7 @@ (lpProfileInfo->lpUserName == NULL) || (lpProfileInfo->lpUserName[0] == 0)) { SetLastError(ERROR_INVALID_PARAMETER); - return TRUE; + return FALSE; } /* Don't load a profile twice */ @@ -1105,7 +1205,7 @@ if (hProfile == NULL) { - DPRINT1("Invalide profile handle\n"); + DPRINT1("Invalid profile handle\n"); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1151,15 +1251,17 @@ return TRUE; } + BOOL WINAPI DeleteProfileW(LPCWSTR lpSidString, LPCWSTR lpProfilePath, LPCWSTR lpComputerName) { - DPRINT1("DeleteProfileW() not implemented!\n"); - return FALSE; -} + DPRINT1("DeleteProfileW() not implemented!\n"); + return FALSE; +} + BOOL WINAPI @@ -1167,8 +1269,40 @@ LPCSTR lpProfilePath, LPCSTR lpComputerName) { - DPRINT1("DeleteProfileA() not implemented!\n"); - return FALSE; + BOOL bResult; + UNICODE_STRING SidString, ProfilePath, ComputerName; + + DPRINT("DeleteProfileA() called\n"); + + /* Conversion to UNICODE */ + if (lpSidString) + RtlCreateUnicodeStringFromAsciiz(&SidString, + (LPSTR)lpSidString); + + if (lpProfilePath) + RtlCreateUnicodeStringFromAsciiz(&ProfilePath, + (LPSTR)lpProfilePath); + + if (lpComputerName) + RtlCreateUnicodeStringFromAsciiz(&ComputerName, + (LPSTR)lpComputerName); + + /* Call the UNICODE function */ + bResult = DeleteProfileW(SidString.Buffer, + ProfilePath.Buffer, + ComputerName.Buffer); + + /* Memory cleanup */ + if (lpSidString) + RtlFreeUnicodeString(&SidString); + + if (lpProfilePath) + RtlFreeUnicodeString(&ProfilePath); + + if (lpComputerName) + RtlFreeUnicodeString(&ComputerName); + + return bResult; } /* EOF */

12 years, 5 months

[tkreuzer] 56851: [FREELDR] Add code to dump amd64 cpu state. Add a bugcheck function.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 8 15:33:53 2012 New Revision: 56851 URL: http://svn.reactos.org/svn/reactos?rev=56851&view=rev Log: [FREELDR] Add code to dump amd64 cpu state. Add a bugcheck function. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] Sun Jul 8 15:33:53 2012 @@ -51,7 +51,7 @@ while (1) { chr = *pszText++; - + if (chr == 0) break; if (chr == '\n') { @@ -59,7 +59,7 @@ i386_ScreenPosX = 0; continue; } - + MachVideoPutChar(chr, SCREEN_ATTR, i386_ScreenPosX, i386_ScreenPosY); i386_ScreenPosX++; } @@ -70,7 +70,7 @@ { va_list argptr; char buffer[256]; - + va_start(argptr, format); _vsnprintf(buffer, sizeof(buffer), format, argptr); buffer[sizeof(buffer) - 1] = 0; @@ -84,10 +84,15 @@ FRAME *Frame; PrintText("Frames:\n"); - +#ifdef _M_IX86 for (Frame = (FRAME*)TrapFrame->Ebp; Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR; Frame = Frame->Next) +#else + for (Frame = (FRAME*)TrapFrame->TrapFrame; + Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR; + Frame = Frame->Next) +#endif { PrintText("%p ", Frame->Address); } @@ -105,31 +110,96 @@ VERSION"\n" "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" "%s\n", i386ExceptionDescriptionText[TrapIndex]); - - PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n", +#ifdef _M_IX86 + PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n", TrapFrame->Eax, TrapFrame->HardwareEsp, Special->Cr0, TrapFrame->Dr0); - PrintText("EBX: %.8lx EBP: %.8lx CR1: ???????? DR1: %.8lx\n", + PrintText("EBX: %.8lx EBP: %.8lx CR1: ???????? DR1: %.8lx\n", TrapFrame->Ebx, TrapFrame->Ebp, TrapFrame->Dr1); - PrintText("ECX: %.8lx ESI: %.8lx CR2: %.8lx DR2: %.8lx\n", + PrintText("ECX: %.8lx ESI: %.8lx CR2: %.8lx DR2: %.8lx\n", TrapFrame->Ecx, TrapFrame->Esi, Special->Cr2, TrapFrame->Dr2); - PrintText("EDX: %.8lx EDI: %.8lx CR3: %.8lx DR3: %.8lx\n", + PrintText("EDX: %.8lx EDI: %.8lx CR3: %.8lx DR3: %.8lx\n", TrapFrame->Edx, TrapFrame->Edi, Special->Cr3, TrapFrame->Dr3); - PrintText(" DR6: %.8lx\n", + PrintText(" DR6: %.8lx\n", TrapFrame->Dr6); - PrintText(" DR7: %.8lx\n\n", + PrintText(" DR7: %.8lx\n\n", TrapFrame->Dr7); - PrintText("CS: %.4lx EIP: %.8lx\n", + PrintText("CS: %.4lx EIP: %.8lx\n", TrapFrame->SegCs, TrapFrame->Eip); - PrintText("DS: %.4lx ERROR CODE: %.8lx\n", - TrapFrame->SegDs, TrapFrame->Eip); - PrintText("ES: %.4lx EFLAGS: %.8lx\n", + PrintText("DS: %.4lx ERROR CODE: %.8lx\n", + TrapFrame->SegDs, TrapFrame->ErrCode); + PrintText("ES: %.4lx EFLAGS: %.8lx\n", TrapFrame->SegEs, TrapFrame->EFlags); - PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); - PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); - PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", + PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", TrapFrame->HardwareSegSs, Special->Ldtr, Special->Idtr.Limit); i386PrintFrames(TrapFrame); // Display frames -} +#else + PrintText("RAX: %.8lx R8: %.8lx R12: %.8lx RSI: %.8lx\n", + TrapFrame->Rax, TrapFrame->R8, 0, TrapFrame->Rsi); + PrintText("RBX: %.8lx R9: %.8lx R13: %.8lx RDI: %.8lx\n", + TrapFrame->Rbx, TrapFrame->R9, 0, TrapFrame->Rdi); + PrintText("RCX: %.8lx R10: %.8lx R14: %.8lx RBP: %.8lx\n", + TrapFrame->Rcx, TrapFrame->R10, 0, TrapFrame->Rbp); + PrintText("RDX: %.8lx R11: %.8lx R15: %.8lx RSP: %.8lx\n", + TrapFrame->Rdx, TrapFrame->R11, 0, TrapFrame->Rsp); + + PrintText("CS: %.4lx RIP: %.8lx\n", + TrapFrame->SegCs, TrapFrame->Rip); + PrintText("DS: %.4lx ERROR CODE: %.8lx\n", + TrapFrame->SegDs, TrapFrame->ErrorCode); + PrintText("ES: %.4lx EFLAGS: %.8lx\n", + TrapFrame->SegEs, TrapFrame->EFlags); + PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); + PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); + PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", + TrapFrame->SegSs, Special->Ldtr, Special->Idtr.Limit); +#endif +} + +char *BugCodeStrings[] = +{ + "TEST_BUGCHECK", + "MISSING_HARDWARE_REQUIREMENTS", +}; + +ULONG_PTR BugCheckInfo[5]; + +void +NTAPI +FrLdrBugCheckEx( + ULONG BugCode, + PCHAR File, + ULONG Line) +{ + MachVideoClearScreen(SCREEN_ATTR); + i386_ScreenPosX = 0; + i386_ScreenPosY = 0; + + PrintText("A problem has been detected and FreeLoader boot has been aborted.\n\n"); + + PrintText("%ld: %s\n\n", BugCode, BugCodeStrings[BugCode]); + + if (File) + { + PrintText("Location: %s:%ld\n\n", File, Line); + } + + PrintText("Bug Information:\n %p\n %p\n %p\n %p\n %p\n\n", + BugCheckInfo[0], BugCheckInfo[1], BugCheckInfo[2], BugCheckInfo[3], BugCheckInfo[4]); + + for (;;); +} + +void +NTAPI +FrLdrBugCheck(ULONG BugCode) +{ + FrLdrBugCheckEx(BugCode, 0, 0); +} +

12 years, 5 months

← Newer
1
...
13
14
15
16
17
18
19
20
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 July 2012