Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[chorns] 14733: Generate temporary files at the root of the directory
by chorns＠svn.reactos.com 21 Apr '05

21 Apr '05

Generate temporary files at the root of the directory Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-21 14:49:17 UTC (rev 14732) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-21 16:18:29 UTC (rev 14733) @@ -863,10 +863,8 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string objectFilename = GetObjectFilename ( sourceFilename, &clean_files ); - string rciFilename = ros_temp + - ReplaceExtension ( sourceFilename, ".rci" ); - string resFilename = ros_temp + - ReplaceExtension ( sourceFilename, ".res" ); + string rciFilename = ros_temp + module.name + ".rci.tmp"; + string resFilename = ros_temp + module.name + ".res.tmp"; if ( module.useWRC ) { fprintf ( fMakefile,

1 0

[fireball] 14732: EnumSystemLocalesW() implementation. Certainly not full (doesn't support INSTALLED/SUPPORTED/etc flags) - but at least it does what is needed - enumerate locales.
by fireball＠svn.reactos.com 21 Apr '05

21 Apr '05

EnumSystemLocalesW() implementation. Certainly not full (doesn't support INSTALLED/SUPPORTED/etc flags) - but at least it does what is needed - enumerate locales. Other stuff is coming soon so intl.cpl could work. Modified: trunk/reactos/lib/kernel32/misc/lang.c _____ Modified: trunk/reactos/lib/kernel32/misc/lang.c --- trunk/reactos/lib/kernel32/misc/lang.c 2005-04-21 13:05:54 UTC (rev 14731) +++ trunk/reactos/lib/kernel32/misc/lang.c 2005-04-21 14:49:17 UTC (rev 14732) @@ -23,7 +23,9 @@ //static LCID SystemLocale = MAKELCID(LANG_ENGLISH, SORT_DEFAULT); +//static RTL_CRITICAL_SECTION LocalesListLock; + /*********************************************************************** ******* * @implemented * RIPPED FROM WINE's dlls\kernel\locale.c rev 1.42 @@ -281,7 +283,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -290,8 +292,91 @@ DWORD dwFlags ) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS result; + HANDLE langKey; + UNICODE_STRING langKeyName; + OBJECT_ATTRIBUTES objectAttributes; + ULONG index, length; + unsigned char fullInfo[sizeof(KEY_VALUE_FULL_INFORMATION)+255*2]; //FIXME: MAX_PATH*2 + PKEY_VALUE_FULL_INFORMATION pFullInfo; + + //TODO: Combine with EnumSystemLocalesA - maybe by having one common part, driven by some + // unicode/non-unicode flag. + + //FIXME: dwFlags is really not used, sorry + + // Check if enum proc is a real one + if (lpLocaleEnumProc == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Open language registry key + //FIXME: Should we use critical section here? + + RtlRosInitUnicodeStringFromLiteral(&langKeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Locale") ; + + InitializeObjectAttributes(&objectAttributes, + &langKeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + result = NtOpenKey(&langKey, + KEY_READ, + &objectAttributes); + + if (!NT_SUCCESS(result)) + return result; + + DPRINT1("Registry key succesfully opened\n"); + + length = sizeof(KEY_VALUE_FULL_INFORMATION) + 255*2;//MAX_PATH*sizeof(WCHAR); + pFullInfo = (PKEY_VALUE_FULL_INFORMATION)&fullInfo; + RtlZeroMemory(pFullInfo, length); + + index = 0; + + result = NtEnumerateValueKey(langKey, + index, + KeyValueFullInformation, + pFullInfo, + length, + &length); + + DPRINT1("First enumerate call result=%x\n", result); + while (result != STATUS_NO_MORE_ENTRIES) + { + int i; + TCHAR lpLocale[9]; + + // TODO: Here we should check, in case dwFlags & LCID_INSTALLED is specified, + // if this locale is really installed + // but for now we skip it + + for (i=0; i<8; i++) + lpLocale[i] = pFullInfo->Name[i]; + + lpLocale[8]=0; + + DPRINT1("Locale=%s\n", lpLocale); + + // Call Enum func + if (!lpLocaleEnumProc((LPWSTR)lpLocale)) + break; + + // Zero previous values + RtlZeroMemory(pFullInfo, length); + + index++; + result = NtEnumerateValueKey(langKey, index,KeyValueFullInformation, pFullInfo, length, &length); + } + + NtClose(langKey); + + return STATUS_SUCCESS; }

1 0

[chorns] 14731: Use ROS_INTERMEDIATE and ROS_OUTPUT environment variables
by chorns＠svn.reactos.com 21 Apr '05

21 Apr '05

Use ROS_INTERMEDIATE and ROS_OUTPUT environment variables Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-21 12:58:20 UTC (rev 14730) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-21 13:05:54 UTC (rev 14731) @@ -145,13 +145,15 @@ string Directory::GetIntermediatePath () { - return "obj-i386"; + return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", + "obj-i386" ); } string Directory::GetOutputPath () { - return "output-i386"; + return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", + "output-i386" ); } string

1 0

[fireball] 14730: Added xbox video driver information (by GvG), I hope it doesn't interfere anyone, and there will be no need to patch registry everytime to boot under xbox.
by fireball＠svn.reactos.com 21 Apr '05

21 Apr '05

Added xbox video driver information (by GvG), I hope it doesn't interfere anyone, and there will be no need to patch registry everytime to boot under xbox. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-04-21 12:54:15 UTC (rev 14729) +++ trunk/reactos/bootdata/hivesys.inf 2005-04-21 12:58:20 UTC (rev 14730) @@ -799,6 +799,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Start",0x00010001,0x000 00000 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Type",0x00010001,0x0000 0002 +; Xbox Nvidia driver +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ErrorControl",0x00010 001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Group",0x00000000,"Vi deo" +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ImagePath",0x00020000 ,"system32\drivers\xboxvmp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Start",0x00010001,0x0 0000001 +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Type",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisp layDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10DE&DEV_02A0&SUBSYS_000000 00&REV_A1\0000","Service",0x00000000,"XboxVmp" + ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0 x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save SVGA"

1 0

[chorns] 14729: Clean-as-you-go mode to remove generated files as soon as possible to minimize disk space requirements
by chorns＠svn.reactos.com 21 Apr '05

21 Apr '05

Clean-as-you-go mode to remove generated files as soon as possible to minimize disk space requirements Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-04-21 12:54:15 UTC (rev 14729) @@ -34,7 +34,8 @@ /*static*/ Backend* Backend::Factory::Create ( const string& name, Project& project, - bool verbose ) + bool verbose, + bool cleanAsYouGo ) { string sname ( name ); strlwr ( &sname[0] ); @@ -48,11 +49,14 @@ throw UnknownBackendException ( sname ); return NULL; } - return (*f) ( project, verbose ); + return (*f) ( project, verbose, cleanAsYouGo ); } -Backend::Backend ( Project& project, bool verbose ) +Backend::Backend ( Project& project, + bool verbose, + bool cleanAsYouGo ) : ProjectNode ( project ), - verbose ( verbose ) + verbose ( verbose ), + cleanAsYouGo ( cleanAsYouGo ) { } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h 2005-04-21 12:54:15 UTC (rev 14729) @@ -21,23 +21,27 @@ Factory ( const std::string& name_ ); virtual ~Factory(); - virtual Backend* operator() ( Project&, bool verbose ) = 0; + virtual Backend* operator() ( Project&, + bool verbose, + bool cleanAsYouGo ) = 0; public: static Backend* Create ( const std::string& name, Project& project, - bool verbose ); + bool verbose, + bool cleanAsYouGo ); }; protected: - Backend ( Project& project, bool verbose ); + Backend ( Project& project, + bool verbose, + bool cleanAsYouGo ); public: virtual void Process () = 0; - -protected: Project& ProjectNode; bool verbose; + bool cleanAsYouGo; }; #endif /* __BACKEND_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-04-21 12:54:15 UTC (rev 14729) @@ -34,15 +34,19 @@ public: DevCppFactory() : Factory("devcpp") {} - Backend *operator() (Project &project, bool verbose) + Backend *operator() (Project &project, + bool verbose, + bool cleanAsYouGo) { - return new DevCppBackend(project, verbose); + return new DevCppBackend(project, verbose, cleanAsYouGo); } } factory; -DevCppBackend::DevCppBackend(Project &project, bool verbose) : Backend(project, verbose) +DevCppBackend::DevCppBackend(Project &project, + bool verbose, + bool cleanAsYouGo) : Backend(project, verbose, cleanAsYouGo) { m_unitCount = 0; } @@ -107,7 +111,10 @@ cout << "Creating Makefile: " << ProjectNode.makefile << endl; - Backend *backend = Backend::Factory::Create("mingw", ProjectNode, verbose ); + Backend *backend = Backend::Factory::Create("mingw", + ProjectNode, + verbose, + cleanAsYouGo ); backend->Process(); delete backend; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h 2005-04-21 12:54:15 UTC (rev 14729) @@ -19,7 +19,9 @@ { public: - DevCppBackend(Project &project, bool verbose); + DevCppBackend(Project &project, + bool verbose, + bool cleanAsYouGo); virtual ~DevCppBackend() {} virtual void Process(); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-21 12:54:15 UTC (rev 14729) @@ -202,15 +202,21 @@ { public: MingwFactory() : Factory ( "mingw" ) {} - Backend* operator() ( Project& project, bool verbose ) + Backend* operator() ( Project& project, + bool verbose, + bool cleanAsYouGo ) { - return new MingwBackend ( project, verbose ); + return new MingwBackend ( project, + verbose, + cleanAsYouGo ); } } factory; -MingwBackend::MingwBackend ( Project& project, bool verbose ) - : Backend ( project, verbose ), +MingwBackend::MingwBackend ( Project& project, + bool verbose, + bool cleanAsYouGo ) + : Backend ( project, verbose, cleanAsYouGo ), intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ), outputDirectory ( new Directory ( "$(OUTPUT)" ) ), installDirectory ( new Directory ( "$(INSTALL)" ) ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-21 12:54:15 UTC (rev 14729) @@ -54,7 +54,9 @@ class MingwBackend : public Backend { public: - MingwBackend ( Project& project, bool verbose ); + MingwBackend ( Project& project, + bool verbose, + bool cleanAsYouGo ); virtual ~MingwBackend (); virtual void Process (); std::string AddDirectoryTarget ( const std::string& directory, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-21 12:54:15 UTC (rev 14729) @@ -8,7 +8,7 @@ using std::string; using std::vector; -#define CLEAN_FILE(f) clean_files.push_back ( f ); /*if ( module.name == "crt" ) printf ( "%s(%i): clean: %s\n", __FILE__, __LINE__, f.c_str() )*/ +#define CLEAN_FILE(f) clean_files.push_back ( f ); static string ros_temp = "$(TEMPORARY)"; MingwBackend* @@ -1149,6 +1149,17 @@ } void +MingwModuleHandler::GenerateCleanObjectsAsYouGoCode ( const string& files ) +{ + if ( backend->cleanAsYouGo ) + { + fprintf ( fMakefile, + "\t-@${rm} %s 2>$(NUL)\n", + files.c_str () ); + } +} + +void MingwModuleHandler::GenerateLinkerCommand ( const string& dependencies, const string& linker, @@ -1216,6 +1227,8 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", temp_exp.c_str () ); + + GenerateCleanObjectsAsYouGoCode ( objectsMacro ); } else { @@ -1227,6 +1240,8 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); + + GenerateCleanObjectsAsYouGoCode ( objectsMacro ); } GenerateBuildMapCode (); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-21 12:54:15 UTC (rev 14729) @@ -77,6 +77,7 @@ std::string GetLinkingDependenciesMacro () const; std::string GetLibsMacro () const; std::string GetLinkerMacro () const; + void GenerateCleanObjectsAsYouGoCode ( const std::string& files ); void GenerateLinkerCommand ( const std::string& dependencies, const std::string& linker, const std::string& linkerParameters, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-04-21 09:52:11 UTC (rev 14728) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-04-21 12:54:15 UTC (rev 14729) @@ -19,6 +19,7 @@ static string BuildSystem; static string RootXmlFile = "ReactOS.xml"; static bool Verbose = false; +static bool CleanAsYouGo = false; bool ParseSwitch ( int argc, char** argv, int index ) @@ -29,6 +30,9 @@ case 'v': Verbose = true; break; + case 'c': + CleanAsYouGo = true; + break; case 'r': RootXmlFile = string(&argv[index][2]); break; @@ -69,6 +73,7 @@ printf ( " rbuild [-v] [-rfile.xml] buildsystem\n\n" ); printf ( "Switches:\n" ); printf ( " -v Be verbose\n" ); + printf ( " -c Clean as you go. Delete generated files as soon as they are not needed anymore\n" ); printf ( " -rfile.xml Name of the root xml file. Default is ReactOS.xml\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); @@ -86,7 +91,8 @@ project.ExecuteInvocations (); Backend* backend = Backend::Factory::Create ( BuildSystem, project, - Verbose ); + Verbose, + CleanAsYouGo ); backend->Process (); delete backend;

1 0

[chorns] 14728: Document ROS_PREFIX environment variable
by chorns＠svn.reactos.com 21 Apr '05

21 Apr '05

Document ROS_PREFIX environment variable Modified: branches/xmlbuildsystem/reactos/Makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-21 09:38:45 UTC (rev 14727) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-21 09:52:11 UTC (rev 14728) @@ -1,5 +1,11 @@ # Accepted environment variables: # +# ROS_PREFIX +# This variable specifies the prefix of the MinGW installation. On Windows +# a prefix is usually not needed, but on linux it is usually "mingw32-". If +# not present and no executable named "gcc" can be found, then the prefix is +# assumed to be "mingw32-". +# # ROS_INTERMEDIATE # This variable controls where to put intermediate files. Intermediate # files are generated files that are needed to generate the final

1 0

[chorns] 14727: Autodetect compiler
by chorns＠svn.reactos.com 21 Apr '05

21 Apr '05

Autodetect compiler Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-21 09:33:23 UTC (rev 14726) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-21 09:38:45 UTC (rev 14727) @@ -41,6 +41,18 @@ } +/* static */ string +Environment::GetVariable ( const string& name ) +{ + char* value = getenv ( name.c_str () ); + if ( value != NULL && strlen ( value ) > 0 ) + return ssprintf ( "%s", + value ); + else + return ""; +} + + Directory::Directory ( const string& name_ ) : name(name_) { @@ -120,21 +132,10 @@ } string -Directory::GetEnvironmentVariable ( const string& name ) -{ - char* value = getenv ( name.c_str () ); - if ( value != NULL && strlen ( value ) > 0 ) - return ssprintf ( "%s", - value ); - else - return ""; -} - -string Directory::GetEnvironmentVariablePathOrDefault ( const string& name, const string& defaultValue ) { - const string& environmentVariableValue = GetEnvironmentVariable ( name ); + const string& environmentVariableValue = Environment::GetVariable ( name ); if ( environmentVariableValue.length () > 0 ) return NormalizeFilename ( environmentVariableValue ); else @@ -283,6 +284,7 @@ void MingwBackend::Process () { + DetectCompiler (); DetectPipeSupport (); DetectPCHSupport (); CreateMakefile (); @@ -556,7 +558,46 @@ printf ( "done\n" ); } +bool +MingwBackend::TryToDetectThisCompiler ( const string& compiler ) +{ + string command = ssprintf ( + "%s -v 2>%s", + compiler.c_str (), + NUL ); + int exitcode = system ( command.c_str () ); + return (exitcode == 0); +} + void +MingwBackend::DetectCompiler () +{ + printf ( "Detecting compiler..." ); + + bool detectedCompiler = false; + const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" ); + if ( ROS_PREFIXValue.length () > 0 ) + { + compilerCommand = ROS_PREFIXValue + "-gcc"; + detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); + } + if ( !detectedCompiler ) + { + compilerCommand = "gcc"; + detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); + } + if ( !detectedCompiler ) + { + compilerCommand = "mingw32-gcc"; + detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); + } + if ( detectedCompiler ) + printf ( "detected (%s)\n", compilerCommand.c_str () ); + else + printf ( "not detected\n" ); +} + +void MingwBackend::DetectPipeSupport () { printf ( "Detecting compiler -pipe support..." ); @@ -565,7 +606,8 @@ string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection, ".o" ); string command = ssprintf ( - "gcc -pipe -c %s -o %s 2>%s", + "%s -pipe -c %s -o %s 2>%s", + compilerCommand.c_str (), pipe_detection.c_str (), pipe_detectionObjectFilename.c_str (), NUL ); @@ -593,7 +635,8 @@ string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h"; string cmd = ssprintf ( - "gcc -c %s 2>%s", + "%s -c %s 2>%s", + compilerCommand.c_str (), path.c_str (), NUL ); system ( cmd.c_str () ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-21 09:33:23 UTC (rev 14726) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-21 09:38:45 UTC (rev 14727) @@ -17,6 +17,14 @@ typedef std::map<std::string,Directory*> directory_map; + +class Environment +{ +public: + static std::string GetVariable ( const std::string& name ); +}; + + class Directory { public: @@ -51,6 +59,7 @@ virtual void Process (); std::string AddDirectoryTarget ( const std::string& directory, Directory* directoryTree ); + std::string compilerCommand; bool usePipe; Directory* intermediateDirectory; Directory* outputDirectory; @@ -73,6 +82,8 @@ void GenerateXmlBuildFilesMacro() const; void CheckAutomaticDependencies (); bool IncludeDirectoryTarget ( const std::string& directory ) const; + bool TryToDetectThisCompiler ( const std::string& compiler ); + void DetectCompiler (); void DetectPipeSupport (); void DetectPCHSupport (); void ProcessModules ();

1 0

[gvg] 14726: Merge 14698:14725 from trunk
by gvg＠svn.reactos.com 21 Apr '05

21 Apr '05

Merge 14698:14725 from trunk Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: branches/xen/reactos/boot/freeldr/freeldr/freeldr.c Modified: branches/xen/reactos/boot/freeldr/freeldr/include/machine.h Property changes on: branches/xen/reactos/boot/freeldr/freeldr ___________________________________________________________________ Name: lastmerge - 14698 + 14725 _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-04-21 09:33:23 UTC (rev 14726) @@ -275,9 +275,11 @@ * other boot loaders like Grub */ +#define MB_INFO_SIZE 90 #define MB_INFO_FLAGS_OFFSET 0 #define MB_INFO_BOOT_DEVICE_OFFSET 12 #define MB_INFO_COMMAND_LINE_OFFSET 16 +#define CMDLINE_SIZE 256 /* * We want to execute at 0x8000 (to be compatible with bootsector @@ -285,7 +287,6 @@ * above 1MB. So we let Grub load us there and then relocate * ourself to 0x8000 */ -#define CMDLINE_BASE 0x7000 #define FREELDR_BASE 0x8000 #define INITIAL_BASE 0x200000 @@ -330,6 +331,31 @@ movw %dx,%ds movw %dx,%es + /* Check for valid multiboot signature */ + cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax + jne mbfail + + /* Store multiboot info in a safe place */ + movl %ebx,%esi + movl $(mb_info + INITIAL_BASE - FREELDR_BASE),%edi + movl $MB_INFO_SIZE,%ecx + rep movsb + + /* Save commandline */ + movl MB_INFO_FLAGS_OFFSET(%ebx),%edx + testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) + jz mb3 + movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi + movl $(cmdline + INITIAL_BASE - FREELDR_BASE),%edi + movl $CMDLINE_SIZE,%ecx +mb2: lodsb + stosb + testb %al,%al + jz mb3 + dec %ecx + jnz mb2 +mb3: + /* Copy to low mem */ movl $INITIAL_BASE,%esi movl $FREELDR_BASE,%edi @@ -346,8 +372,8 @@ /* Clear prefetch queue & correct CS, * jump to low mem */ - ljmp $PMODE_CS, $mb2 -mb2: + ljmp $PMODE_CS, $mb4 +mb4: /* Reload segment selectors */ movw $PMODE_DS,%dx movw %dx,%ds @@ -357,39 +383,28 @@ movw %dx,%ss movl $STACK32ADDR,%esp - /* Check for valid multiboot signature */ - cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax - jne mbfail - + movl $mb_info,%ebx /* See if the boot device was passed in */ movl MB_INFO_FLAGS_OFFSET(%ebx),%edx testl $MB_INFO_FLAG_BOOT_DEVICE,%edx - jz mb3 + jz mb5 /* Retrieve boot device info */ movl MB_INFO_BOOT_DEVICE_OFFSET(%ebx),%eax shrl $16,%eax incb %al movb %al,i386BootPartition movb %ah,i386BootDrive - jmp mb4 -mb3: /* No boot device known, assume first partition of first harddisk */ + jmp mb6 +mb5: /* No boot device known, assume first partition of first harddisk */ movb $0x80,i386BootDrive movb $1,i386BootPartition -mb4: - - /* Check for a command line */ +mb6: + /* Check for command line */ + mov $cmdline,%eax + testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) + jnz mb7 xorl %eax,%eax - testl $MB_INFO_FLAG_COMMAND_LINE,%edx - jz mb6 - /* Copy command line to low mem*/ - movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi - movl $CMDLINE_BASE,%edi -mb5: lodsb - stosb - testb %al,%al - jnz mb5 - movl $CMDLINE_BASE,%eax -mb6: +mb7: /* GO! */ pushl %eax @@ -471,3 +486,10 @@ EXTERN(i386BootPartition) .long 0 + +.bss +mb_info: + .fill MB_INFO_SIZE, 1, 0 + +cmdline: + .fill CMDLINE_SIZE, 1, 0 _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-04-21 09:33:23 UTC (rev 14726) @@ -28,7 +28,7 @@ #include "rtl.h" VOID -MachInit(VOID) +MachInit(char *CmdLine) { ULONG PciId; @@ -37,7 +37,7 @@ /* First check if we were launched by Xen */ if (XenActive) { - XenMachInit(); + XenMachInit(CmdLine); } else { @@ -47,11 +47,11 @@ PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { - XboxMachInit(); + XboxMachInit(CmdLine); } else { - PcMachInit(); + PcMachInit(CmdLine); } } _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-04-21 09:33:23 UTC (rev 14726) @@ -25,7 +25,7 @@ #include "i386.h" VOID -PcMachInit(VOID) +PcMachInit(char *CmdLine) { EnableA20(); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-04-21 09:33:23 UTC (rev 14726) @@ -26,7 +26,7 @@ #include "mm.h" #endif -VOID PcMachInit(VOID); +VOID PcMachInit(char *CmdLine); VOID PcConsPutChar(int Ch); BOOL PcConsKbHit(); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-04-21 09:33:23 UTC (rev 14726) @@ -23,7 +23,7 @@ #include "i386.h" VOID -XboxMachInit(VOID) +XboxMachInit(char *CmdLine) { /* Initialize our stuff */ XboxMemInit(); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-04-21 09:33:23 UTC (rev 14726) @@ -26,7 +26,7 @@ UCHAR XboxFont8x16[256 * 16]; -VOID XboxMachInit(VOID); +VOID XboxMachInit(char *CmdLine); VOID XboxConsPutChar(int Ch); BOOL XboxConsKbHit(); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-04-21 09:33:23 UTC (rev 14726) @@ -90,7 +90,7 @@ } VOID -XenMachInit(VOID) +XenMachInit(char *CmdLine) { /* Setup vtbl */ MachVtbl.ConsPutChar = XenConsPutChar; @@ -185,7 +185,7 @@ /* Start freeldr */ XenActive = TRUE; i386BootDrive = 0x80; - i386BootPartition = 0xff; +// i386BootPartition = 0xff; BootMain(XenStartInfo->cmd_line); /* Shouldn't get here */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-04-21 09:33:23 UTC (rev 14726) @@ -34,7 +34,7 @@ extern start_info_t *XenStartInfo; extern shared_info_t *XenSharedInfo; -VOID XenMachInit(VOID); +VOID XenMachInit(char *CmdLine); VOID XenCtrlIfInit(); BOOL XenCtrlIfSendMessageNoblock(ctrl_msg_t *Msg); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-04-21 09:33:23 UTC (rev 14726) @@ -279,7 +279,7 @@ BootMain("freeldr-ppc"); } -void MachInit() { +void MachInit(char *CmdLine) { int len; printf( "Determining boot device:\n" ); len = ofw_getprop(chosen_package, "bootpath", _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/freeldr.c --- branches/xen/reactos/boot/freeldr/freeldr/freeldr.c 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/freeldr.c 2005-04-21 09:33:23 UTC (rev 14726) @@ -31,7 +31,7 @@ { CmdLineParse(CmdLine); - MachInit(); + MachInit(CmdLine); DebugInit(); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/include/machine.h --- branches/xen/reactos/boot/freeldr/freeldr/include/machine.h 2005-04-21 09:29:02 UTC (rev 14725) +++ branches/xen/reactos/boot/freeldr/freeldr/include/machine.h 2005-04-21 09:33:23 UTC (rev 14726) @@ -73,7 +73,7 @@ VOID (*Die)(VOID); } MACHVTBL, *PMACHVTBL; -VOID MachInit(VOID); +VOID MachInit(char *CmdLine); extern MACHVTBL MachVtbl;

1 0

[gvg] 14725: - Protect multiboot info from being overwritten
by gvg＠svn.reactos.com 21 Apr '05

21 Apr '05

- Protect multiboot info from being overwritten - Pass command line to MachInit() funcs Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-04-21 09:29:02 UTC (rev 14725) @@ -275,9 +275,11 @@ * other boot loaders like Grub */ +#define MB_INFO_SIZE 90 #define MB_INFO_FLAGS_OFFSET 0 #define MB_INFO_BOOT_DEVICE_OFFSET 12 #define MB_INFO_COMMAND_LINE_OFFSET 16 +#define CMDLINE_SIZE 256 /* * We want to execute at 0x8000 (to be compatible with bootsector @@ -285,7 +287,6 @@ * above 1MB. So we let Grub load us there and then relocate * ourself to 0x8000 */ -#define CMDLINE_BASE 0x7000 #define FREELDR_BASE 0x8000 #define INITIAL_BASE 0x200000 @@ -328,6 +329,31 @@ movw %dx,%ds movw %dx,%es + /* Check for valid multiboot signature */ + cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax + jne mbfail + + /* Store multiboot info in a safe place */ + movl %ebx,%esi + movl $(mb_info + INITIAL_BASE - FREELDR_BASE),%edi + movl $MB_INFO_SIZE,%ecx + rep movsb + + /* Save commandline */ + movl MB_INFO_FLAGS_OFFSET(%ebx),%edx + testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) + jz mb3 + movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi + movl $(cmdline + INITIAL_BASE - FREELDR_BASE),%edi + movl $CMDLINE_SIZE,%ecx +mb2: lodsb + stosb + testb %al,%al + jz mb3 + dec %ecx + jnz mb2 +mb3: + /* Copy to low mem */ movl $INITIAL_BASE,%esi movl $FREELDR_BASE,%edi @@ -342,8 +368,8 @@ /* Clear prefetch queue & correct CS, * jump to low mem */ - ljmp $PMODE_CS, $mb2 -mb2: + ljmp $PMODE_CS, $mb4 +mb4: /* Reload segment selectors */ movw $PMODE_DS,%dx movw %dx,%ds @@ -353,39 +379,28 @@ movw %dx,%ss movl $STACK32ADDR,%esp - /* Check for valid multiboot signature */ - cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax - jne mbfail - + movl $mb_info,%ebx /* See if the boot device was passed in */ movl MB_INFO_FLAGS_OFFSET(%ebx),%edx testl $MB_INFO_FLAG_BOOT_DEVICE,%edx - jz mb3 + jz mb5 /* Retrieve boot device info */ movl MB_INFO_BOOT_DEVICE_OFFSET(%ebx),%eax shrl $16,%eax incb %al movb %al,_i386BootPartition movb %ah,_i386BootDrive - jmp mb4 -mb3: /* No boot device known, assume first partition of first harddisk */ + jmp mb6 +mb5: /* No boot device known, assume first partition of first harddisk */ movb $0x80,_i386BootDrive movb $1,_i386BootPartition -mb4: - - /* Check for a command line */ +mb6: + /* Check for command line */ + mov $cmdline,%eax + testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) + jnz mb7 xorl %eax,%eax - testl $MB_INFO_FLAG_COMMAND_LINE,%edx - jz mb6 - /* Copy command line to low mem*/ - movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi - movl $CMDLINE_BASE,%edi -mb5: lodsb - stosb - testb %al,%al - jnz mb5 - movl $CMDLINE_BASE,%eax -mb6: +mb7: /* GO! */ pushl %eax @@ -467,3 +482,10 @@ EXTERN(_i386BootPartition) .long 0 + +.bss +mb_info: + .fill MB_INFO_SIZE, 1, 0 + +cmdline: + .fill CMDLINE_SIZE, 1, 0 _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-04-21 09:29:02 UTC (rev 14725) @@ -27,7 +27,7 @@ #include "rtl.h" VOID -MachInit(VOID) +MachInit(char *CmdLine) { ULONG PciId; @@ -39,11 +39,11 @@ PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { - XboxMachInit(); + XboxMachInit(CmdLine); } else { - PcMachInit(); + PcMachInit(CmdLine); } HalpCalibrateStallExecution(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-04-21 09:29:02 UTC (rev 14725) @@ -26,7 +26,7 @@ #include "i386.h" VOID -PcMachInit(VOID) +PcMachInit(char *CmdLine) { EnableA20(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-04-21 09:29:02 UTC (rev 14725) @@ -26,7 +26,7 @@ #include "mm.h" #endif -VOID PcMachInit(VOID); +VOID PcMachInit(char *CmdLine); VOID PcConsPutChar(int Ch); BOOL PcConsKbHit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-04-21 09:29:02 UTC (rev 14725) @@ -24,7 +24,7 @@ #include "i386.h" VOID -XboxMachInit(VOID) +XboxMachInit(char *CmdLine) { /* Initialize our stuff */ XboxMemInit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-04-21 09:29:02 UTC (rev 14725) @@ -26,7 +26,7 @@ UCHAR XboxFont8x16[256 * 16]; -VOID XboxMachInit(VOID); +VOID XboxMachInit(char *CmdLine); VOID XboxConsPutChar(int Ch); BOOL XboxConsKbHit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-04-21 09:29:02 UTC (rev 14725) @@ -279,7 +279,7 @@ BootMain("freeldr-ppc"); } -void MachInit() { +void MachInit(char *CmdLine) { int len; printf( "Determining boot device:\n" ); len = ofw_getprop(chosen_package, "bootpath", _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c --- trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-04-21 09:29:02 UTC (rev 14725) @@ -31,7 +31,7 @@ { CmdLineParse(CmdLine); - MachInit(); + MachInit(CmdLine); DebugInit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h --- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-04-20 22:05:23 UTC (rev 14724) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-04-21 09:29:02 UTC (rev 14725) @@ -71,7 +71,7 @@ VOID (*HwDetect)(VOID); } MACHVTBL, *PMACHVTBL; -VOID MachInit(VOID); +VOID MachInit(char *CmdLine); extern MACHVTBL MachVtbl;

1 0

[gvg] 14724: Sync to Wine-20050419:
by gvg＠svn.reactos.com 20 Apr '05

20 Apr '05

Sync to Wine-20050419: Peter Berg Larsen <pebl(a)math.ku.dk> - Eliminate a strncpy and remove unused variable. Modified: trunk/reactos/lib/cabinet/cabextract.c _____ Modified: trunk/reactos/lib/cabinet/cabextract.c --- trunk/reactos/lib/cabinet/cabextract.c 2005-04-20 20:58:16 UTC (rev 14723) +++ trunk/reactos/lib/cabinet/cabextract.c 2005-04-20 22:05:23 UTC (rev 14724) @@ -2068,7 +2068,7 @@ */ void find_cabinet_file(char **cabname, LPCSTR origcab) { - char *tail, *cab, *name, *nextpart, nametmp[MAX_PATH], *filepart; + char *tail, *cab, *name, *nextpart, nametmp[MAX_PATH]; int found = 0; TRACE("(*cabname == ^%p, origcab == %s)\n", cabname ? *cabname : NULL, debugstr_a(origcab)); @@ -2107,11 +2107,11 @@ nextpart = strchr(name, '\\'); if (nextpart) *nextpart = '\0'; - found = SearchPathA(cab, name, NULL, MAX_PATH, nametmp, &filepart); + found = SearchPathA(cab, name, NULL, MAX_PATH, nametmp, NULL); /* if the component was not found, look for it in the current dir */ if (!found) { - found = SearchPathA(".", name, NULL, MAX_PATH, nametmp, &filepart); + found = SearchPathA(".", name, NULL, MAX_PATH, nametmp, NULL); } if (found) @@ -2135,7 +2135,7 @@ if (found) { free((void *) *cabname); *cabname = cab; - strncpy(cab, nametmp, found+1); + memcpy(cab, nametmp, found+1); TRACE("result: %s\n", debugstr_a(cab)); } else { free((void *) cab);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005