Ros-diffs

ros-diffs@reactos.org

81390 discussions

[peterw] 31021: - Make 'chdefgcc' bail if no MinGW/GCC is found in the given path.
by peterw＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: peterw Date: Wed Dec 5 22:42:12 2007 New Revision: 31021 URL: http://svn.reactos.org/svn/reactos?rev=31021&view=rev Log: - Make 'chdefgcc' bail if no MinGW/GCC is found in the given path. Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Wed Dec 5 22:42:12 2007 @@ -25,6 +25,10 @@ echo ERROR: The path specified doesn't seem to exist. goto :EOC ) +if not exist "%_1%\bin\gcc.exe" ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOC +) set _ROSBE_MINGWPATH=%_1% echo Location: %_ROSBE_MINGWPATH% call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd"

1 0

[peterw] 31020: - Make 'chdefgcc' available in the MinGW prompt as well.
by peterw＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: peterw Date: Wed Dec 5 22:12:25 2007 New Revision: 31020 URL: http://svn.reactos.org/svn/reactos?rev=31020&view=rev Log: - Make 'chdefgcc' available in the MinGW prompt as well. Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Wed Dec 5 22:12:25 2007 @@ -38,6 +38,7 @@ :: for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +doskey CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $* doskey MAKE = "%_ROSBE_MINGWMAKE%" $* doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% $* Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Wed Dec 5 22:12:25 2007 @@ -8,7 +8,9 @@ :: @echo off -title Change the current MinGW/GCC directory... +if "%_ROSBE_MODE%" == "RosBE" ( + title Change the current MinGW/GCC directory... +) :: :: Parse the command line arguments. @@ -38,7 +40,9 @@ goto :EOF :EOC -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Wed Dec 5 22:12:25 2007 @@ -40,6 +40,12 @@ :: Display the current version of GCC, NASM, ld and make. :: gcc -v 2>&1 | find "gcc version" -nasm -v +if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( + nasm -v +) else ( + if "%_ROSBE_MODE%" == "RosBE" ( + echo ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC. + ) +) ld -v mingw32-make -v | find "GNU Make"

1 0

[fireball] 31019: - Fix a bug.
by fireball＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: fireball Date: Wed Dec 5 22:07:23 2007 New Revision: 31019 URL: http://svn.reactos.org/svn/reactos?rev=31019&view=rev Log: - Fix a bug. Modified: trunk/reactos/ntoskrnl/config/cmalloc.c Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmalloc.c (original) +++ trunk/reactos/ntoskrnl/config/cmalloc.c Wed Dec 5 22:07:23 2007 @@ -88,7 +88,7 @@ if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) { /* Loop all the entries */ - for (i = CM_KCBS_PER_PAGE; i; i--) + for (i = CM_KCBS_PER_PAGE - 1; i; i--) { /* Get the KCB */ Kcb = (PVOID)((ULONG_PTR)AllocPage +

1 0

[hpoussin] 31018: Add missing include file
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 21:21:11 2007 New Revision: 31018 URL: http://svn.reactos.org/svn/reactos?rev=31018&view=rev Log: Add missing include file Modified: trunk/reactos/include/ndk/cmfuncs.h trunk/reactos/include/ndk/readme.txt Modified: trunk/reactos/include/ndk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmfuncs.h (original) +++ trunk/reactos/include/ndk/cmfuncs.h Wed Dec 5 21:21:11 2007 @@ -23,6 +23,7 @@ // Dependencies // #include <umtypes.h> +#include <cmtypes.h> // // Native calls Modified: trunk/reactos/include/ndk/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/readme.txt?rev… ============================================================================== --- trunk/reactos/include/ndk/readme.txt (original) +++ trunk/reactos/include/ndk/readme.txt Wed Dec 5 21:21:11 2007 @@ -175,7 +175,7 @@ 3.3 CAVEATS * winternl.h: This header, part of the PSDK, was released by Microsoft as part of one of the governmen - lawsuits against it, and documents a certain (minimal) part of the Native API and/or types. Unforunately, + lawsuits against it, and documents a certain (minimal) part of the Native API and/or types. Unfortunately, Microsoft decided to hack the Native Types and to define them incorrectly, replacing real members by "reserved" ones. As such, you 'cannot include winternl.h in any project that uses the NDK. Note however, that the NDK fully replaces it and retains compatibility with any project that used it.

1 0

[hpoussin] 31017: Do not add twice a link to crt library
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 19:53:14 2007 New Revision: 31017 URL: http://svn.reactos.org/svn/reactos?rev=31017&view=rev Log: Do not add twice a link to crt library Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Dec 5 19:53:14 2007 @@ -2887,10 +2887,23 @@ { } +static bool +LinksToCrt( Module &module ) +{ + for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) + { + Library& library = *module.non_if_data.libraries[i]; + if ( library.name == "libcntpr" || library.name == "crt" ) + return true; + } + return false; +} + static void MingwAddImplicitLibraries( Module &module ) { Library* pLibrary; + bool links_to_crt; if ( module.type != Win32DLL && module.type != Win32OCX @@ -2902,20 +2915,21 @@ return; } - if ( module.name == "ntdll" ) - { - // no implicit libraries - return; - } + links_to_crt = LinksToCrt ( module ); if ( !module.isDefaultEntryPoint ) { if ( module.GetEntryPoint(false) == "0" ) { - pLibrary = new Library ( module, "mingw_common" ); - module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() , pLibrary ); - pLibrary = new Library ( module, "msvcrt" ); - module.non_if_data.libraries.push_back ( pLibrary ); + if ( !links_to_crt ) + { + pLibrary = new Library ( module, "mingw_common" ); + module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() , pLibrary ); + + pLibrary = new Library ( module, "msvcrt" ); + module.non_if_data.libraries.push_back ( pLibrary ); + links_to_crt = true; + } } return; } @@ -2934,7 +2948,7 @@ pLibrary = new Library ( module, "mingw_common" ); module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() + 1, pLibrary ); - if ( module.name != "msvcrt" ) + if ( !links_to_crt ) { // always link in msvcrt to get the basic routines pLibrary = new Library ( module, "msvcrt" );

1 0

[hpoussin] 31016: Don't add implicit dependencies for ntdll
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 19:17:51 2007 New Revision: 31016 URL: http://svn.reactos.org/svn/reactos?rev=31016&view=rev Log: Don't add implicit dependencies for ntdll Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Dec 5 19:17:51 2007 @@ -2902,6 +2902,12 @@ return; } + if ( module.name == "ntdll" ) + { + // no implicit libraries + return; + } + if ( !module.isDefaultEntryPoint ) { if ( module.GetEntryPoint(false) == "0" )

1 0

[hpoussin] 31015: Send correct data to MiDereferenceImports()
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 19:04:47 2007 New Revision: 31015 URL: http://svn.reactos.org/svn/reactos?rev=31015&view=rev Log: Send correct data to MiDereferenceImports() Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Wed Dec 5 19:04:47 2007 @@ -177,15 +177,23 @@ NTAPI MiDereferenceImports(IN PLOAD_IMPORTS ImportList) { + SIZE_T i; + /* Check if there's no imports or if we're a boot driver */ - if ((ImportList == (PVOID)-1) || (ImportList == (PVOID)-2)) + if ((ImportList == (PVOID)-1) || + (ImportList == (PVOID)-2) || + (ImportList->Count == 0)) { /* Then there's nothing to do */ return STATUS_SUCCESS; } /* Otherwise, FIXME */ - DPRINT1("Imports not dereferenced!\n"); + DPRINT1("%u imports not dereferenced!\n", ImportList->Count); + for (i = 0; i < ImportList->Count; i++) + { + DPRINT1("%wZ <%wZ>\n", &ImportList->Entry[i]->FullDllName, &ImportList->Entry[i]->BaseDllName); + } return STATUS_UNSUCCESSFUL; } @@ -813,9 +821,8 @@ TAG_LDR_WSTR); if (LoadedImports) { - /* Zero it and set the count */ + /* Zero it */ RtlZeroMemory(LoadedImports, LoadedImportsSize); - LoadedImports->Count = ImportCount; } } else @@ -1006,8 +1013,8 @@ if (!(LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS)) { /* Add the entry */ - LoadedImports->Entry[ImportCount] = LdrEntry; - ImportCount++; + LoadedImports->Entry[LoadedImports->Count] = LdrEntry; + LoadedImports->Count++; } } @@ -1104,17 +1111,17 @@ if (NewImports) { /* Set count */ - NewImports->Count = ImportCount; + NewImports->Count = 0; /* Loop all the imports */ - for (i = 0, ImportCount = 0; i < LoadedImports->Count; i++) + for (i = 0; i < LoadedImports->Count; i++) { /* Make sure it's valid */ if (LoadedImports->Entry[i]) { /* Copy it */ - NewImports->Entry[i] = LoadedImports->Entry[i]; - ImportCount++; + NewImports->Entry[NewImports->Count] = LoadedImports->Entry[i]; + NewImports->Count++; } }

1 0

[hpoussin] 31014: Implement GetLargePageMinimum()
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 17:55:52 2007 New Revision: 31014 URL: http://svn.reactos.org/svn/reactos?rev=31014&view=rev Log: Implement GetLargePageMinimum() Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Wed Dec 5 17:55:52 2007 @@ -1364,11 +1364,3 @@ STUB; return FALSE; } -SIZE_T -WINAPI -GetLargePageMinimum(void) -{ - STUB; - return 0; -} - Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Wed Dec 5 17:55:52 2007 @@ -19,6 +19,16 @@ #define PV_NT351 0x00030033 + +/* + * @implemented + */ +SIZE_T +WINAPI +GetLargePageMinimum(VOID) +{ + return SharedUserData->LargePageMinimum; +} /* * @unimplemented

1 0

[cwittich] 31013: fix formatting
by cwittich＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: cwittich Date: Wed Dec 5 17:51:06 2007 New Revision: 31013 URL: http://svn.reactos.org/svn/reactos?rev=31013&view=rev Log: fix formatting Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Wed Dec 5 17:51:06 2007 @@ -1327,8 +1327,7 @@ BOOL STDCALL SetClientTimeZoneInformation( - CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation - ) + CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) { STUB; return 0; @@ -1369,7 +1368,7 @@ WINAPI GetLargePageMinimum(void) { - STUB; - return 0; -} - + STUB; + return 0; +} +

1 0

[cwittich] 31012: add stub for GetLargePageMinimum
by cwittich＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: cwittich Date: Wed Dec 5 17:48:19 2007 New Revision: 31012 URL: http://svn.reactos.org/svn/reactos?rev=31012&view=rev Log: add stub for GetLargePageMinimum Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Wed Dec 5 17:48:19 2007 @@ -412,6 +412,7 @@ GetGeoInfoW@20 GetHandleContext@4 GetHandleInformation@8 +GetLargePageMinimum@0 GetLargestConsoleWindowSize@4 GetLastError@0 ;GetLinguistLangSize Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Wed Dec 5 17:48:19 2007 @@ -1365,3 +1365,11 @@ STUB; return FALSE; } +SIZE_T +WINAPI +GetLargePageMinimum(void) +{ + STUB; + return 0; +} +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs