Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[fireball] 28968: - Fix build by adding Wine-specific language definitions to WRC - Revert 28965 and 28966 as unnecessary
by fireball＠svn.reactos.org 09 Sep '07

09 Sep '07

Author: fireball Date: Sun Sep 9 14:11:04 2007 New Revision: 28968 URL: http://svn.reactos.org/svn/reactos?rev=28968&view=rev Log: - Fix build by adding Wine-specific language definitions to WRC - Revert 28965 and 28966 as unnecessary Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comdlg32/rsrc.rc trunk/reactos/tools/wrc/wrcrostypes.h Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc Sun Sep 9 14:11:04 2007 @@ -1197,7 +1197,7 @@ #include "comctl_Cs.rc" #include "comctl_De.rc" #include "comctl_En.rc" -// #include "comctl_Eo.rc" +#include "comctl_Eo.rc" #include "comctl_Es.rc" #include "comctl_Fr.rc" #include "comctl_Hu.rc" Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/rsrc.rc (original) +++ trunk/reactos/dll/win32/comdlg32/rsrc.rc Sun Sep 9 14:11:04 2007 @@ -48,7 +48,7 @@ #include "cdlg_Da.rc" #include "cdlg_De.rc" #include "cdlg_En.rc" -// #include "cdlg_Eo.rc" +#include "cdlg_Eo.rc" #include "cdlg_Es.rc" #include "cdlg_Fi.rc" #include "cdlg_Fr.rc" @@ -66,6 +66,6 @@ #include "cdlg_Th.rc" #include "cdlg_Tr.rc" #include "cdlg_Uk.rc" -// #include "cdlg_Wa.rc" +#include "cdlg_Wa.rc" #include "cdlg_Ja.rc" #include "cdlg_Zh.rc" Modified: trunk/reactos/tools/wrc/wrcrostypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrcrostypes.h?re… ============================================================================== --- trunk/reactos/tools/wrc/wrcrostypes.h (original) +++ trunk/reactos/tools/wrc/wrcrostypes.h Sun Sep 9 14:11:04 2007 @@ -129,6 +129,29 @@ #define LANG_URDU 0x20 #define LANG_UZBEK 0x43 #define LANG_VIETNAMESE 0x2a + +/* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ESPERANTO 0x8f +#define LANG_WALON 0x90 +#define LANG_CORNISH 0x91 +#define LANG_WELSH 0x92 +#define LANG_BRETON 0x93 + +/* FIXME: these are not in the Windows header */ +#define LANG_GAELIC 0x94 +#define LANG_MALTESE 0x3a +#define LANG_RHAETO_ROMANCE 0x17 +#define LANG_SAAMI 0x3b +#define LANG_SORBIAN 0x2e +#define LANG_LOWER_SORBIAN 0x2e +#define LANG_UPPER_SORBIAN 0x2e +#define LANG_SUTU 0x30 +#define LANG_TSONGA 0x31 +#define LANG_TSWANA 0x32 +#define LANG_VENDA 0x33 +#define LANG_XHOSA 0x34 +#define LANG_ZULU 0x35 + #define SUBLANG_AZERI_CYRILLIC 0x02 #define SUBLANG_CHINESE_SINGAPORE 0x04 #define SUBLANG_CHINESE_SIMPLIFIED 0x02

1 0

[arty] 28967: Correct size of KAPC_STATE to fit in the [23] window of PKTHREAD. This is neccessary, otherwise the APC booleans interfere with FreezeCount.
by arty＠svn.reactos.org 09 Sep '07

09 Sep '07

Author: arty Date: Sun Sep 9 13:49:35 2007 New Revision: 28967 URL: http://svn.reactos.org/svn/reactos?rev=28967&view=rev Log: Correct size of KAPC_STATE to fit in the [23] window of PKTHREAD. This is neccessary, otherwise the APC booleans interfere with FreezeCount. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/ifssupp.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=28… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Sun Sep 9 13:49:35 2007 @@ -635,6 +635,7 @@ LARGE_INTEGER CreationTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; +#include <pshpack1.h> typedef struct _KAPC_STATE { LIST_ENTRY ApcListHead[2]; PKPROCESS Process; @@ -642,6 +643,7 @@ BOOLEAN KernelApcPending; BOOLEAN UserApcPending; } KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; +#include <poppack.h> typedef struct _BITMAP_RANGE { LIST_ENTRY Links; Modified: trunk/reactos/include/ndk/ifssupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ifssupp.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ifssupp.h (original) +++ trunk/reactos/include/ndk/ifssupp.h Sun Sep 9 13:49:35 2007 @@ -103,6 +103,7 @@ LPC_PVOID ViewBase; } REMOTE_PORT_VIEW, *PREMOTE_PORT_VIEW; +#include <pshpack1.h> typedef struct _KAPC_STATE { LIST_ENTRY ApcListHead[2]; @@ -111,6 +112,7 @@ BOOLEAN KernelApcPending; BOOLEAN UserApcPending; } KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; +#include <poppack.h> typedef struct _KQUEUE {

1 0

[greatlrd] 28966: comment out ESPERANTO and WALON languishes file, for it is not supported in windows
by greatlrd＠svn.reactos.org 09 Sep '07

09 Sep '07

Author: greatlrd Date: Sun Sep 9 13:44:43 2007 New Revision: 28966 URL: http://svn.reactos.org/svn/reactos?rev=28966&view=rev Log: comment out ESPERANTO and WALON languishes file, for it is not supported in windows Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/rsrc.rc (original) +++ trunk/reactos/dll/win32/comdlg32/rsrc.rc Sun Sep 9 13:44:43 2007 @@ -48,7 +48,7 @@ #include "cdlg_Da.rc" #include "cdlg_De.rc" #include "cdlg_En.rc" -#include "cdlg_Eo.rc" +// #include "cdlg_Eo.rc" #include "cdlg_Es.rc" #include "cdlg_Fi.rc" #include "cdlg_Fr.rc" @@ -66,6 +66,6 @@ #include "cdlg_Th.rc" #include "cdlg_Tr.rc" #include "cdlg_Uk.rc" -#include "cdlg_Wa.rc" +// #include "cdlg_Wa.rc" #include "cdlg_Ja.rc" #include "cdlg_Zh.rc"

1 0

[greatlrd] 28965: comment out ESPERANTO languishes file, for it is not supported in windows
by greatlrd＠svn.reactos.org 09 Sep '07

09 Sep '07

Author: greatlrd Date: Sun Sep 9 13:38:55 2007 New Revision: 28965 URL: http://svn.reactos.org/svn/reactos?rev=28965&view=rev Log: comment out ESPERANTO languishes file, for it is not supported in windows Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc Sun Sep 9 13:38:55 2007 @@ -1197,7 +1197,7 @@ #include "comctl_Cs.rc" #include "comctl_De.rc" #include "comctl_En.rc" -#include "comctl_Eo.rc" +// #include "comctl_Eo.rc" #include "comctl_Es.rc" #include "comctl_Fr.rc" #include "comctl_Hu.rc"

1 0

[hpoussin] 28964: Continue rbuild cleanup (Module class)
by hpoussin＠svn.reactos.org 09 Sep '07

09 Sep '07

Author: hpoussin Date: Sun Sep 9 11:53:40 2007 New Revision: 28964 URL: http://svn.reactos.org/svn/reactos?rev=28964&view=rev Log: Continue rbuild cleanup (Module class) Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/include.cpp trunk/reactos/tools/rbuild/linkerscript.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/syssetupgenerator.cpp trunk/reactos/tools/rbuild/testsupportcode.cpp trunk/reactos/tools/rbuild/wineresource.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Sun Sep 9 11:53:40 2007 @@ -198,7 +198,7 @@ CBBackend::CbpFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.GetPath(), + "_auto.cbp" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.cbp" ) ); } @@ -206,7 +206,7 @@ CBBackend::LayoutFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.GetPath(), + "_auto.layout" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.layout" ) ); } @@ -214,14 +214,14 @@ CBBackend::DependFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.GetPath(), + "_auto.depend" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.depend" ) ); } void CBBackend::_get_object_files ( const Module& module, vector<string>& out) const { - string basepath = module.GetBasePath (); + string basepath = module.output->relative_path; size_t i; string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\"; string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\"; @@ -273,12 +273,12 @@ { Module& module = *ProjectNode.modules[i]; vector<string> out; - printf("Cleaning project %s %s\n", module.name.c_str (), module.GetBasePath ().c_str () ); + printf("Cleaning project %s %s\n", module.name.c_str (), module.output->relative_path.c_str () ); - string basepath = module.GetBasePath (); - remove ( CbpFileName ( module ).c_str () ); - remove ( DependFileName ( module ).c_str () ); - remove ( LayoutFileName ( module ).c_str () ); + string basepath = module.output->relative_path; + remove ( CbpFileName ( module ).c_str () ); + remove ( DependFileName ( module ).c_str () ); + remove ( LayoutFileName ( module ).c_str () ); _get_object_files ( module, out ); for ( size_t j = 0; j < out.size (); j++) @@ -321,7 +321,7 @@ ifs_list.pop_back(); const vector<Library*>& libs = data.libraries; for ( size_t j = 0; j < libs.size(); j++ ) - fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); + fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->output->relative_path.c_str(), libs[j]->name.c_str() ); } fprintf ( OUT, "\t\t</Project>\r\n" ); } @@ -342,8 +342,8 @@ string path_basedir = module.GetPathToBaseDir (); string intenv = Environment::GetIntermediatePath (); string outenv = Environment::GetOutputPath (); - string module_type = GetExtension(module.GetTargetName()); - string cbproj_path = module.GetBasePath(); + string module_type = GetExtension(module.output->name); + string cbproj_path = module.output->relative_path; string CompilerVar; string baseaddr; string windres_defines; @@ -383,7 +383,7 @@ { string pch_path = Path::RelativeFromDirectory ( module.pch->file.name, - module.GetBasePath() ); + module.output->relative_path ); header_files.push_back ( pch_path ); } @@ -430,7 +430,7 @@ { string path = Path::RelativeFromDirectory ( incs[i]->directory, - module.GetBasePath() ); + module.output->relative_path ); includes.push_back ( path ); widl_options += "-I" + path + " "; @@ -438,7 +438,7 @@ const vector<Library*>& libs = data.libraries; for ( i = 0; i < libs.size(); i++ ) { - string libpath = intdir + "\\" + libs[i]->importedModule->GetBasePath(); + string libpath = intdir + "\\" + libs[i]->importedModule->output->relative_path; libraries.push_back ( libs[i]->name ); libpaths.push_back ( libpath ); } @@ -507,25 +507,25 @@ if ( configuration.UseConfigurationInPath ) { if ( module.type == StaticLibrary ||module.type == ObjectLibrary ) - fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), module.GetBasePath ().c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str()); + fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), module.output->relative_path.c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str()); else - fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), module.GetBasePath ().c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str()); - fprintf ( OUT, "\t\t\t\t<Option object_output=\"%s\\%s%s\" />\r\n", intdir.c_str(), module.GetBasePath ().c_str (), cfg.name.c_str() ); + fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), module.output->relative_path.c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str()); + fprintf ( OUT, "\t\t\t\t<Option object_output=\"%s\\%s%s\" />\r\n", intdir.c_str(), module.output->relative_path.c_str (), cfg.name.c_str() ); } else { if ( module.type == StaticLibrary || module.type == ObjectLibrary ) - fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), module.GetBasePath ().c_str (), module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), module.output->relative_path.c_str (), module.name.c_str(), module_type.c_str() ); else - fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), module.GetBasePath ().c_str (), module.name.c_str(), module_type.c_str() ); - fprintf ( OUT, "\t\t\t\t<Option object_output=\"%s\\%s\" />\r\n", intdir.c_str(), module.GetBasePath ().c_str () ); + fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), module.output->relative_path.c_str (), module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\t<Option object_output=\"%s\\%s\" />\r\n", intdir.c_str(), module.output->relative_path.c_str () ); } if ( lib ) { fprintf ( OUT, "\t\t\t\t<Option type=\"2\" />\r\n" ); } - else if ( dll ) + else if ( dll ) fprintf ( OUT, "\t\t\t\t<Option type=\"3\" />\r\n" ); else if ( sys ) fprintf ( OUT, "\t\t\t\t<Option type=\"5\" />\r\n" ); Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp (original) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Sun Sep 9 11:53:40 2007 @@ -166,10 +166,10 @@ fprintf ( m_DepMapFile, "\t<component>\r\n" ); fprintf ( m_DepMapFile, "\t\t<name>%s</name>\r\n", module.name.c_str () ); - fprintf ( m_DepMapFile, "\t\t<base>%s</base>\r\n", module.GetBasePath ().c_str () ); + fprintf ( m_DepMapFile, "\t\t<base>%s</base>\r\n", module.output->relative_path.c_str () ); fprintf ( m_DepMapFile, "\t\t<ref_count>%u</ref_count>\r\n", (unsigned int)data->references.size () ); fprintf ( m_DepMapFile, "\t\t<lib_count>%u</lib_count>\r\n", (unsigned int)data->libraries.size () ); -#if 0 +#if 0 if ( data->references.size () ) { fprintf ( m_DepMapFile, "\t<references>\r\n" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sun Sep 9 11:53:40 2007 @@ -587,7 +587,7 @@ { if ( dependencies.length () > 0 ) dependencies += " "; - dependencies += module.GetDependencyPath (); + dependencies += strFile ( module.dependency ); } } return dependencies; @@ -1165,12 +1165,8 @@ const Module& module = *ProjectNode.modules[i]; if ( !module.enabled ) continue; - if ( module.installName.length () > 0 ) - { - out.push_back ( FileLocation ( InstallDirectory, - module.installBase, - module.installName ) ); - } + if ( module.install ) + out.push_back ( *module.install ); } } @@ -1230,13 +1226,10 @@ const Module& module = *ProjectNode.modules[i]; if ( !module.enabled ) continue; - if ( module.installName.length () > 0 ) + if ( module.install ) { const Module& aliasedModule = GetAliasedModuleOrModule ( module ); - - FileLocation source ( OutputDirectory, aliasedModule.GetBasePath (), aliasedModule.GetTargetName () ); - FileLocation target ( InstallDirectory, module.installBase, module.installName ); - OutputInstallTarget ( source, target ); + OutputInstallTarget ( *aliasedModule.output, *module.install ); } } } 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 Sun Sep 9 11:53:40 2007 @@ -124,21 +124,12 @@ return file; } -/*static*/ DirectoryLocation -MingwModuleHandler::GetTargetDirectoryTree ( - const Module& module ) -{ - if ( module.type == StaticLibrary ) - return IntermediateDirectory; - return OutputDirectory; -} - /*static*/ const FileLocation* MingwModuleHandler::GetTargetFilename ( const Module& module, string_list* pclean_files ) { - FileLocation *target = new FileLocation ( GetTargetDirectoryTree ( module ), module.GetBasePath (), module.GetTargetName () ); + FileLocation *target = new FileLocation ( *module.output ); if ( pclean_files ) { string_list& clean_files = *pclean_files; @@ -152,7 +143,7 @@ const Module& module, string_list* pclean_files ) { - FileLocation *target = new FileLocation ( IntermediateDirectory, module.GetBasePath (), module.GetDependencyTargetName () ); + FileLocation *target = new FileLocation ( *module.dependency ); if ( pclean_files ) { string_list& clean_files = *pclean_files; @@ -354,7 +345,7 @@ if ( module.type == StaticLibrary ) return new FileLocation ( *GetTargetFilename ( module, NULL ) ); return new FileLocation ( IntermediateDirectory, - module.GetBasePath (), + module.output->relative_path, ReplaceExtension ( module.name, ".temp.a" ) ); } @@ -581,16 +572,13 @@ void MingwModuleHandler::GenerateInstallTarget () const { - if ( module.installName.length () == 0 ) + if ( !module.install ) return; fprintf ( fMakefile, ".PHONY: %s_install\n", module.name.c_str() ); - string normalizedTargetFilename = - NormalizeFilename ( module.installBase + sSep + module.installName ); - fprintf ( fMakefile, - "%s_install: $(INSTALL)%c%s\n", + fprintf ( fMakefile, + "%s_install: %s\n", module.name.c_str (), - cSep, - normalizedTargetFilename.c_str() ); + strFile ( module.install ).c_str () ); } void @@ -1473,8 +1461,8 @@ "ifeq ($(ROS_BUILDMAP),full)\n" ); FileLocation mapFilename ( OutputDirectory, - module.GetBasePath (), - GetBasename ( module.GetTargetName () ) + ".map" ); + module.output->relative_path, + GetBasename ( module.output->name ) + ".map" ); CLEAN_FILE ( &mapFilename ); fprintf ( fMakefile, @@ -1509,16 +1497,13 @@ fprintf ( fMakefile, "ifeq ($(ROS_BUILDNOSTRIP),yes)\n" ); - string filename = module.GetTargetName (); - FileLocation outputFilename ( OutputDirectory, - module.GetBasePath (), - filename ); + string filename = module.output->name; FileLocation nostripFilename ( OutputDirectory, - module.GetBasePath (), + module.output->relative_path, GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ) ); CLEAN_FILE ( &nostripFilename ); - OutputCopyCommand ( outputFilename, nostripFilename ); + OutputCopyCommand ( *module.output, nostripFilename ); fprintf ( fMakefile, "endif\n" ); @@ -1626,7 +1611,7 @@ dependencies.c_str (), target_folder.c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); - string targetName ( module.GetTargetName () ); + string targetName ( module.output->name ); if ( !module.IsDLL () ) { @@ -1682,7 +1667,7 @@ * one has been provided... */ /* See bug 1244 */ //printf ( "%s will have all its functions exported\n", - // module.GetTargetName ().c_str () ); + // module.target->name.c_str () ); fprintf ( fMakefile, "\t%s %s %s -o %s %s %s %s\n", linker.c_str (), @@ -2011,7 +1996,7 @@ fMakefile, "%s += $(PROJECT_WIDLFLAGS) -I%s\n", widlflagsMacro.c_str (), - module.GetBasePath ().c_str () ); + module.output->relative_path.c_str () ); fprintf ( fMakefile, @@ -2076,7 +2061,7 @@ if ( module.name != "zlib" ) /* Avoid make warning */ { FileLocation proxyMakefile ( OutputDirectory, - module.GetBasePath (), + module.output->relative_path, "makefile" ); CLEAN_FILE ( &proxyMakefile ); } @@ -2172,11 +2157,11 @@ invoke_targets[i].c_str () ); fprintf ( fMakefile, ": %s\n", - NormalizeFilename ( invoke.invokeModule->GetPath () ).c_str () ); + NormalizeFilename ( strFile ( invoke.invokeModule->output ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_INVOKE)\n" ); fprintf ( fMakefile, "\t%s %s\n\n", - NormalizeFilename ( invoke.invokeModule->GetPath () ).c_str (), + NormalizeFilename ( strFile ( invoke.invokeModule->output ) ).c_str (), invoke.GetParameters ().c_str () ); } } @@ -2296,7 +2281,7 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s %s %s\n\n", - module.GetTargetName ().c_str (), + module.output->name.c_str (), strFile ( defFilename ).c_str (), strFile ( library_target ).c_str (), module.mangledSymbols ? "" : "--kill-at", @@ -2457,7 +2442,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,-T,%s%cntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", - module.GetBasePath ().c_str (), + module.output->relative_path.c_str (), cSep, module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); @@ -3037,7 +3022,7 @@ void MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget () { - string targetName ( module.GetTargetName () ); + string targetName ( module.output->name ); string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory (); FileLocation junk_tmp ( TemporaryDirectory, @@ -3118,7 +3103,7 @@ void MingwBootProgramModuleHandler::GenerateBootProgramModuleTarget () { - string targetName ( module.GetTargetName () ); + string targetName ( module.output->name ); string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory (); FileLocation junk_tmp ( TemporaryDirectory, @@ -3151,7 +3136,7 @@ fprintf ( fMakefile, "\t$(%s_PREPARE) $(OUTPUT)$(SEP)%s %s\n", module.buildtype.c_str (), - NormalizeFilename( payload->GetPath() ).c_str (), + NormalizeFilename( strFile ( payload->output ) ).c_str (), strFile ( &junk_cpy ).c_str () ); fprintf ( fMakefile, "\t${objcopy} $(%s_FLATFORMAT) %s %s\n", @@ -3168,7 +3153,7 @@ fprintf ( fMakefile, "\t${objcopy} $(%s_COPYFORMAT) %s $(INTERMEDIATE)$(SEP)%s\n", module.buildtype.c_str (), strFile ( &junk_elf ).c_str (), - module.GetPath().c_str () ); + strFile ( module.output ) .c_str () ); fprintf ( fMakefile, "\t-@${rm} %s %s %s 2>$(NUL)\n", @@ -3200,13 +3185,10 @@ continue; if ( m.bootstrap != NULL ) { - FileLocation sourceFile ( OutputDirectory, - m.GetBasePath (), - m.GetTargetName () ); FileLocation targetFile ( OutputDirectory, bootcdDirectory + sSep + m.bootstrap->base, m.bootstrap->nameoncd ); - OutputCopyCommand ( sourceFile, targetFile ); + OutputCopyCommand ( *m.output, targetFile ); } } } @@ -3281,10 +3263,7 @@ continue; if ( m.bootstrap != NULL ) { - FileLocation file ( OutputDirectory, - m.GetBasePath (), - m.GetTargetName () ); - out.push_back ( file ); + out.push_back ( *m.output ); } } } @@ -3434,18 +3413,15 @@ const Module& m = *module.project.modules[i]; if ( !m.enabled ) continue; - if ( m.installName.length () > 0 ) + if ( m.install ) { const Module& aliasedModule = backend->GetAliasedModuleOrModule ( m ); - FileLocation source ( OutputDirectory, - aliasedModule.GetBasePath (), - aliasedModule.GetTargetName () ); FileLocation destination ( OutputDirectory, - m.installBase.length () > 0 - ? livecdDirectory + sSep + reactosDirectory + sSep + m.installBase + m.install->relative_path.length () > 0 + ? livecdDirectory + sSep + reactosDirectory + sSep + m.install->relative_path : livecdDirectory + sSep + reactosDirectory, - m.installName ); - OutputCopyCommand ( source, + m.install->name ); + OutputCopyCommand ( *aliasedModule.output, destination); } } @@ -3584,7 +3560,7 @@ void MingwTestModuleHandler::GetModuleSpecificCompilationUnits ( vector<CompilationUnit*>& compilationUnits ) { - string basePath = "$(INTERMEDIATE)" + sSep + module.GetBasePath (); + string basePath = "$(INTERMEDIATE)" + sSep + module.output->relative_path; compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_hooks.c", false, "", false ) ) ); compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_stubs.S", false, "", false ) ) ); compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_startup.c", false, "", false ) ) ); @@ -3693,7 +3669,7 @@ void MingwElfExecutableModuleHandler::Process () { - string targetName ( module.GetTargetName () ); + string targetName ( module.output->name ); string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory (); string objectsMacro = GetObjectsMacro ( module ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Sun Sep 9 11:53:40 2007 @@ -42,9 +42,6 @@ void EnablePreCompiledHeaderSupport (); static const FileLocation* PassThruCacheDirectory (const FileLocation* fileLocation ); - - static DirectoryLocation GetTargetDirectoryTree ( - const Module& module ); static const FileLocation* GetTargetFilename ( const Module& module, Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp Sun Sep 9 11:53:40 2007 @@ -35,7 +35,7 @@ bool ProxyMakefile::GenerateProxyMakefile ( Module& module ) { - return module.GenerateInOutputTree (); + return module.output->directory == OutputDirectory; } void @@ -72,7 +72,7 @@ ProxyMakefile::GetPathToTopDirectory ( Module& module ) { int numberOfDirectories = 1; - string basePath = NormalizeFilename ( module.GetBasePath () ); + string basePath = module.output->relative_path; for ( size_t i = 0; i < basePath.length (); i++ ) { if ( basePath[i] == cSep ) @@ -99,12 +99,12 @@ string pathToTopDirectory; if ( outputTree.length () > 0 ) { - base = outputTree + sSep + module.GetBasePath (); + base = outputTree + sSep + module.output->relative_path; pathToTopDirectory = working_directory; } else { - base = module.GetBasePath (); + base = module.output->relative_path; pathToTopDirectory = GetPathToTopDirectory ( module ); } string proxyMakefile = NormalizeFilename ( base + sSep + "GNUmakefile" ); Modified: trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msbui… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp Sun Sep 9 11:53:40 2007 @@ -72,7 +72,7 @@ void MsBuildBackend::_generate_makefile ( const Module& module ) { - string makefile = module.GetBasePath() + "\\makefile"; + string makefile = module.output->relative_path + "\\makefile"; FILE* OUT = fopen ( makefile.c_str(), "wb" ); fprintf ( OUT, "!INCLUDE $(NTMAKEENV)\\makefile.def\r\n" ); fclose ( OUT ); @@ -83,12 +83,12 @@ { size_t i; - string module_type = GetExtension(module.GetTargetName()); + string module_type = GetExtension(module.output->name); vector<string> source_files, resource_files, includes, libraries; vector<string> header_files, common_defines, compiler_flags; vector<string> vars, values; - string sourcesfile = module.GetBasePath() + "\\sources"; - string proj_path = module.GetBasePath(); + string sourcesfile = module.output->relative_path + "\\sources"; + string proj_path = module.output->relative_path; FILE* OUT = fopen ( sourcesfile.c_str(), "wb" ); fprintf ( OUT, "TARGETNAME=%s\r\n", module.name.c_str() ); @@ -121,7 +121,7 @@ { string path = Path::RelativeFromDirectory ( incs[i]->directory, - module.GetBasePath() ); + module.output->relative_path ); includes.push_back ( path ); } @@ -220,14 +220,14 @@ for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { Module& module = *ProjectNode.modules[i]; - printf("Cleaning project %s %s\n", module.name.c_str (), module.GetBasePath ().c_str () ); + printf("Cleaning project %s %s\n", module.name.c_str (), module.output->relative_path.c_str () ); - string makefile = module.GetBasePath() + "\\makefile"; - string sourcesfile = module.GetBasePath() + "\\sources"; - - string basepath = module.GetBasePath (); - remove ( makefile.c_str() ); - remove ( sourcesfile.c_str() ); + string makefile = module.output->relative_path + "\\makefile"; + string sourcesfile = module.output->relative_path + "\\sources"; + + string basepath = module.output->relative_path; + remove ( makefile.c_str() ); + remove ( sourcesfile.c_str() ); } } Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Sun Sep 9 11:53:40 2007 @@ -225,7 +225,7 @@ MSVCBackend::OptFileName ( const Module& module ) const { return FixSeparatorForSystemCommand( - ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.opt" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_" + _get_vc_dir() + "_auto.opt" ) ); } @@ -233,7 +233,7 @@ MSVCBackend::SuoFileName ( const Module& module ) const { return FixSeparatorForSystemCommand( - ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.suo" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_" + _get_vc_dir() + "_auto.suo" ) ); } @@ -241,7 +241,7 @@ MSVCBackend::DswFileName ( const Module& module ) const { return FixSeparatorForSystemCommand( - ReplaceExtension ( module.GetPath(), "_auto.dsw" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.dsw" ) ); } @@ -249,7 +249,7 @@ MSVCBackend::SlnFileName ( const Module& module ) const { return FixSeparatorForSystemCommand( - ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.sln" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_" + _get_vc_dir() + "_auto.sln" ) ); } @@ -257,7 +257,7 @@ MSVCBackend::NcbFileName ( const Module& module ) const { return FixSeparatorForSystemCommand( - ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.ncb" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_" + _get_vc_dir() + "_auto.ncb" ) ); } @@ -265,7 +265,7 @@ MSVCBackend::DspFileName ( const Module& module ) const { return FixSeparatorForSystemCommand( - ReplaceExtension ( module.GetPath(), "_auto.dsp" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.dsp" ) ); } @@ -273,7 +273,7 @@ MSVCBackend::VcprojFileName ( const Module& module ) const { return FixSeparatorForSystemCommand( - ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.vcproj" ) + ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_" + _get_vc_dir() + "_auto.vcproj" ) ); } @@ -296,7 +296,7 @@ void MSVCBackend::_get_object_files ( const Module& module, vector<string>& out) const { - string basepath = module.GetBasePath (); + string basepath = module.output->relative_path; string vcdir = _get_vc_dir (); size_t i; string intenv = Environment::GetIntermediatePath () + DEF_SSEP + basepath + DEF_SSEP; @@ -361,7 +361,7 @@ //files in the output dir for ( i = cfgs.size () / 2; i < cfgs.size (); i++ ) { - out.push_back ( cfgs[i] + module.GetTargetName () ); + out.push_back ( cfgs[i] + module.output->name ); out.push_back ( cfgs[i] + module.name + ".pdb" ); out.push_back ( cfgs[i] + module.name + ".lib" ); out.push_back ( cfgs[i] + module.name + ".exp" ); @@ -395,9 +395,9 @@ { Module& module = *ProjectNode.modules[i]; vector<string> out; - printf("Cleaning project %s %s %s\n", module.name.c_str (), module.GetBasePath ().c_str (), NcbFileName ( module ).c_str () ); + printf("Cleaning project %s %s %s\n", module.name.c_str (), module.output->relative_path.c_str (), NcbFileName ( module ).c_str () ); - string basepath = module.GetBasePath (); + string basepath = module.output->relative_path; remove ( NcbFileName ( module ).c_str () ); remove ( DspFileName ( module ).c_str () ); remove ( DswFileName ( module ).c_str () ); @@ -461,11 +461,11 @@ for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { Module& module = *ProjectNode.modules[i]; - if ( module.installBase == "" || module.installName == "" ) + if ( !module.install ) continue; - string inputname = Environment::GetOutputPath () + DEF_SSEP + module.GetBasePath () + DEF_SSEP + vcdir + DEF_SSEP + config + DEF_SSEP + module.GetTargetName (); - string installdir = Environment::GetInstallPath () + DEF_SSEP + module.installBase + DEF_SSEP + module.installName; + string inputname = Environment::GetOutputPath () + DEF_SSEP + module.output->relative_path + DEF_SSEP + vcdir + DEF_SSEP + config + DEF_SSEP + module.output->name; + string installdir = Environment::GetInstallPath () + DEF_SSEP + module.install->relative_path + DEF_SSEP + module.install->name; if ( _copy_file( inputname, installdir ) ) printf ("Installed File :'%s'\n",installdir.c_str () ); } Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Sun Sep 9 11:53:40 2007 @@ -56,7 +56,7 @@ imports.push_back ( module.non_if_data.libraries[i]->name ); } - string module_type = GetExtension(module.GetTargetName()); + string module_type = GetExtension(module.output->name); bool lib = (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe") || (module_type == ".scr"); @@ -82,7 +82,7 @@ //$output->progress("$dsp_file (file $progress_current of $progress_max)"); // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? - string dsp_path = module.GetBasePath(); + string dsp_path = module.output->relative_path; vector<string> c_srcs, source_files, header_files, resource_files, includes, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; @@ -127,7 +127,7 @@ string path = Path::RelativeFromDirectory ( incs[i]->directory, - module.GetBasePath() ); + module.output->relative_path ); includes.push_back ( path ); } const vector<Library*>& libs = data.libraries; Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Sep 9 11:53:40 2007 @@ -98,7 +98,7 @@ FILE* OUT = fopen ( vcproj_file.c_str(), "wb" ); vector<string> imports; - string module_type = GetExtension(module.GetTargetName()); + string module_type = GetExtension(module.output->name); bool lib = (module.type == ObjectLibrary) || (module.type == RpcClient) ||(module.type == RpcServer) || (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe") || (module_type == ".scr"); @@ -131,7 +131,7 @@ bool console = exe && (module.type == Win32CUI); bool include_idl = false; - string vcproj_path = module.GetBasePath(); + string vcproj_path = module.output->relative_path; vector<string> source_files, resource_files, header_files, includes, includes_ros, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; @@ -172,7 +172,7 @@ { string path = Path::RelativeFromDirectory ( incs[i]->directory, - module.GetBasePath() ); + module.output->relative_path ); if ( module.type != RpcServer && module.type != RpcClient ) { if ( path.find ("/include/reactos/idl") != string::npos) @@ -199,7 +199,7 @@ const vector<Library*>& libs = data.libraries; for ( i = 0; i < libs.size(); i++ ) { - string libpath = outdir + "\\" + libs[i]->importedModule->GetBasePath() + "\\" + _get_vc_dir() + "\\---\\" + libs[i]->name + ".lib"; + string libpath = outdir + "\\" + libs[i]->importedModule->output->relative_path + "\\" + _get_vc_dir() + "\\---\\" + libs[i]->name + ".lib"; libraries.push_back ( libpath ); } const vector<Define*>& defs = data.defines; @@ -267,13 +267,13 @@ if ( configuration.UseConfigurationInPath ) { - fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\\%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), vcdir.c_str (), cfg.name.c_str() ); - fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\\%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), vcdir.c_str (), cfg.name.c_str() ); + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\\%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str (), cfg.name.c_str() ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\\%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str (), cfg.name.c_str() ); } else { - fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), vcdir.c_str () ); - fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), vcdir.c_str () ); + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str () ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str () ); } fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 ); @@ -375,7 +375,7 @@ fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"2\"\r\n" ); string pch_path = Path::RelativeFromDirectory ( module.pch->file.name, - module.GetBasePath() ); + module.output->relative_path ); string::size_type pos = pch_path.find_last_of ("/"); if ( pos != string::npos ) pch_path.erase(0, pos+1); Modified: trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/versi… ============================================================================== --- trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp (original) +++ trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp Sun Sep 9 11:53:40 2007 @@ -108,7 +108,7 @@ { fprintf ( m_VReportFile, "\t<component>\r\n" ); fprintf ( m_VReportFile, "\t\t<name>%s</name>\r\n", module.name.c_str () ); - fprintf ( m_VReportFile, "\t\t<base>%s</base>\r\n", module.GetBasePath().c_str () ); + fprintf ( m_VReportFile, "\t\t<base>%s</base>\r\n", module.output->relative_path.c_str () ); fprintf ( m_VReportFile, "\t\t<version>%s</version>\r\n", module.metadata->version.c_str () ); fprintf ( m_VReportFile, "\t\t<date>%s</date>\r\n", module.metadata->date.c_str () ); fprintf ( m_VReportFile, "\t\t<owner>%s</owner>\r\n", module.metadata->owner.c_str () ); Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Sun Sep 9 11:53:40 2007 @@ -107,7 +107,7 @@ if ( att != NULL ) nameoncd = att->value; else - nameoncd = module->GetTargetName (); + nameoncd = module->output->name; } void Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp Sun Sep 9 11:53:40 2007 @@ -34,8 +34,8 @@ } CompilationUnit::CompilationUnit ( const Project* project, - const Module* module, - const XMLElement* node ) + const Module* module, + const XMLElement* node ) : project(project), module(module), node(node) @@ -43,7 +43,7 @@ const XMLAttribute* att = node->GetAttribute ( "name", true ); assert(att); local_name = att->value; - name = module->GetBasePath () + cSep + att->value; + name = module->output->relative_path + cSep + att->value; } CompilationUnit::~CompilationUnit () @@ -101,7 +101,7 @@ if ( files.size () == 0 || files.size () > 1 ) { return new FileLocation ( IntermediateDirectory, - module ? module->GetBasePath () : "", + module ? module->output->relative_path : "", local_name ); } Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp (original) +++ trunk/reactos/tools/rbuild/include.cpp Sun Sep 9 11:53:40 2007 @@ -87,7 +87,7 @@ if ( base != NULL ) { baseModule = base; - basePath = base->GetBasePath (); + basePath = base->output->relative_path; referenceResolved = true; } } Modified: trunk/reactos/tools/rbuild/linkerscript.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/linkerscript.… ============================================================================== --- trunk/reactos/tools/rbuild/linkerscript.cpp (original) +++ trunk/reactos/tools/rbuild/linkerscript.cpp Sun Sep 9 11:53:40 2007 @@ -57,7 +57,7 @@ if ( base != NULL ) { baseModule = base; - basePath = base->GetBasePath (); + basePath = base->output->relative_path; referenceResolved = true; } } Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Sun Sep 9 11:53:40 2007 @@ -265,8 +265,6 @@ xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () ); - path = FixSeparator ( modulePath ); - enabled = true; const XMLAttribute* att = moduleNode.GetAttribute ( "if", false ); @@ -430,17 +428,16 @@ if ( att != NULL ) prefix = att->value; - att = moduleNode.GetAttribute ( "installbase", false ); - if ( att != NULL ) - installBase = att->value; - else - installBase = ""; - att = moduleNode.GetAttribute ( "installname", false ); if ( att != NULL ) - installName = att->value; - else - installName = ""; + { + const XMLAttribute* installbase = moduleNode.GetAttribute ( "installbase", false ); + install = new FileLocation ( InstallDirectory, + installbase ? installbase->value : "", + att->value ); + } + else + install = NULL; att = moduleNode.GetAttribute ( "usewrc", false ); if ( att != NULL ) @@ -487,6 +484,11 @@ buildtype = "BOOTPROG"; } } + + output = new FileLocation ( GetTargetDirectoryTree (), + modulePath, + name + extension ); + SetImportLibrary ( NULL ); } Module::~Module () @@ -535,7 +537,7 @@ for ( i = 0; i < node.subElements.size(); i++ ) { ParseContext parseContext; - ProcessXMLSubElement ( *node.subElements[i], path, "", parseContext ); + ProcessXMLSubElement ( *node.subElements[i], output->relative_path, "", parseContext ); } for ( i = 0; i < invocations.size(); i++ ) invocations[i]->ProcessXML (); @@ -719,7 +721,7 @@ e.location, "Only one <importlibrary> is valid per module" ); } - importLibrary = new ImportLibrary ( project, e, *this ); + SetImportLibrary ( new ImportLibrary ( project, e, *this ) ); subs_invalid = true; } else if ( e.name == "if" ) @@ -910,6 +912,45 @@ attribute.value ); } +DirectoryLocation +Module::GetTargetDirectoryTree () const +{ + switch ( type ) + { + case Kernel: + case KernelModeDLL: + case NativeDLL: + case Win32DLL: + case Win32OCX: + case KernelModeDriver: + case NativeCUI: + case Win32CUI: + case Test: + case Win32SCR: + case Win32GUI: + case BuildTool: + case BootLoader: + case BootSector: + case BootProgram: + case Iso: + case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: + case EmbeddedTypeLib: + case ElfExecutable: + return OutputDirectory; + case StaticLibrary: + case ObjectLibrary: + case RpcServer: + case RpcClient: + case Alias: + case IdlHeader: + return IntermediateDirectory; + } + throw InvalidOperationException ( __FILE__, + __LINE__ ); +} + string Module::GetDefaultModuleExtension () const { @@ -1103,94 +1144,16 @@ __LINE__ ); } -bool -Module::GenerateInOutputTree () const -{ - switch ( type ) - { - case Kernel: - case KernelModeDLL: - case NativeDLL: - case Win32DLL: - case Win32OCX: - case KernelModeDriver: - case NativeCUI: - case Win32CUI: - case Test: - case Win32SCR: - case Win32GUI: - case BuildTool: - case BootLoader: - case BootSector: - case BootProgram: - case Iso: - case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: - case EmbeddedTypeLib: - case ElfExecutable: - return true; - case StaticLibrary: - case ObjectLibrary: - case RpcServer: - case RpcClient: - case Alias: - case IdlHeader: - return false; - } - throw InvalidOperationException ( __FILE__, - __LINE__ ); -} - -string -Module::GetTargetName () const -{ - return name + extension; -} - -string -Module::GetDependencyPath () const -{ - if ( HasImportLibrary () ) - return ReplaceExtension ( GetPathWithPrefix ( "lib" ), ".a" ); - else - return GetPath(); -} - -string -Module::GetDependencyTargetName () const -{ - if ( HasImportLibrary () ) - return "lib" + name + ".a"; - else - return GetTargetName(); -} - -string -Module::GetBasePath () const -{ - return path; -} - -string -Module::GetPath () const -{ - if ( path.length() > 0 ) - return path + cSep + GetTargetName (); - else - return GetTargetName (); -} - string Module::GetPathWithPrefix ( const string& prefix ) const { - return path + cSep + prefix + GetTargetName (); + return output->relative_path + cSep + prefix + output->name; } string Module::GetPathToBaseDir () const { - string temp_path = path; + string temp_path = output->relative_path; string result = "..\\"; while(temp_path.find ('\\') != string::npos) { @@ -1247,13 +1210,23 @@ for ( size_t i = 0; i < invocations.size (); i++ ) { Invoke& invoke = *invocations[i]; - string command = FixSeparatorForSystemCommand(invoke.invokeModule->GetPath ()) + " " + invoke.GetParameters (); + string command = FixSeparatorForSystemCommand(invoke.invokeModule->output->relative_path + "/" + invoke.invokeModule->output->name ) + " " + invoke.GetParameters (); printf ( "Executing '%s'\n\n", command.c_str () ); int exitcode = system ( command.c_str () ); if ( exitcode != 0 ) throw InvocationFailedException ( command, exitcode ); } +} + + +void +Module::SetImportLibrary ( ImportLibrary* importLibrary ) +{ + this->importLibrary = importLibrary; + dependency = new FileLocation ( IntermediateDirectory, + output->relative_path, + HasImportLibrary () ? "lib" + name + ".a" : output->name ); } @@ -1406,7 +1379,7 @@ if ( e.name == "inputfile" && e.value.size () > 0 ) { input.push_back ( new InvokeFile ( - e, FixSeparator ( module.path + cSep + e.value ) ) ); + e, FixSeparator ( module.output->relative_path + cSep + e.value ) ) ); subs_invalid = true; } if ( subs_invalid && e.subElements.size() > 0 ) @@ -1425,7 +1398,7 @@ if ( e.name == "outputfile" && e.value.size () > 0 ) { output.push_back ( new InvokeFile ( - e, FixSeparator ( module.path + cSep + e.value ) ) ); + e, FixSeparator ( module.output->relative_path + cSep + e.value ) ) ); subs_invalid = true; } if ( subs_invalid && e.subElements.size() > 0 ) @@ -1603,7 +1576,7 @@ if ( index == string::npos ) { source = new FileLocation ( directory, - module.GetBasePath (), + module.output->relative_path, definition->value ); } else @@ -1611,7 +1584,7 @@ string dir = definition->value.substr ( 0, index ); string name = definition->value.substr ( index + 1); source = new FileLocation ( directory, - NormalizeFilename ( module.GetBasePath () + sSep + dir ), + NormalizeFilename ( module.output->relative_path + sSep + dir ), name ); } } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sun Sep 9 11:53:40 2007 @@ -302,6 +302,15 @@ HostTrue }; +enum DirectoryLocation +{ + SourceDirectory, + IntermediateDirectory, + OutputDirectory, + InstallDirectory, + TemporaryDirectory, +}; + class Module { public: @@ -314,7 +323,6 @@ std::string baseaddress; std::string payload; std::string buildtype; - std::string path; ModuleType type; ImportLibrary* importLibrary; Metadata* metadata; @@ -335,14 +343,15 @@ bool cplusplus; std::string prefix; HostType host; - std::string installBase; - std::string installName; std::string aliasedModuleName; bool useWRC; bool allowWarnings; bool enabled; bool useHostStdlib; bool isStartupLib; + FileLocation *output; // "path/foo.exe" + FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a" + FileLocation *install; Module ( const Project& project, const XMLElement& moduleNode, @@ -352,12 +361,6 @@ const XMLAttribute& attribute ); bool HasImportLibrary () const; bool IsDLL () const; - bool GenerateInOutputTree () const; - std::string GetTargetName () const; // "foo.exe" - std::string GetDependencyPath () const; // "path/foo.exe" or "path/libfoo.a" - std::string GetDependencyTargetName () const; // "foo.exe" or "libfoo.a" - std::string GetBasePath () const; // "path" - std::string GetPath () const; // "path/foo.exe" std::string GetPathWithPrefix ( const std::string& prefix ) const; // "path/prefixfoo.exe" std::string GetPathToBaseDir() const; // "../" offset to rootdirectory std::string GetEntryPoint(bool leadingUnderscore) const; @@ -366,9 +369,9 @@ bool HasFileWithExtension ( const IfableData&, const std::string& extension ) const; void InvokeModule () const; void ProcessXML (); - void GetSourceFilenames ( string_list& list, - bool includeGeneratedFiles ) const; -private: +private: + void SetImportLibrary ( ImportLibrary* importLibrary ); + DirectoryLocation GetTargetDirectoryTree () const; std::string GetDefaultModuleExtension () const; std::string GetDefaultModuleEntrypoint () const; std::string GetDefaultModuleBaseaddress () const; @@ -828,16 +831,6 @@ }; -enum DirectoryLocation -{ - SourceDirectory, - IntermediateDirectory, - OutputDirectory, - InstallDirectory, - TemporaryDirectory, -}; - - class FileLocation { public: Modified: trunk/reactos/tools/rbuild/syssetupgenerator.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/syssetupgener… ============================================================================== --- trunk/reactos/tools/rbuild/syssetupgenerator.cpp (original) +++ trunk/reactos/tools/rbuild/syssetupgenerator.cpp Sun Sep 9 11:53:40 2007 @@ -65,7 +65,7 @@ string SysSetupGenerator::GetDirectoryId ( const Module& module ) { - if ( ToLower ( module.installBase ) == "system32" ) + if ( module.install && ToLower ( module.install->relative_path ) == "system32" ) return DIRECTORYID_SYSTEM32; throw InvalidOperationException ( __FILE__, __LINE__ ); @@ -104,7 +104,7 @@ if ( 0 != InfHostAddLine ( context, NULL ) || 0 != InfHostAddField ( context, GetDirectoryId ( module ).c_str () ) || 0 != InfHostAddField ( context, "" ) || - 0 != InfHostAddField ( context, module.installName.c_str () ) || + ( module.install && 0 != InfHostAddField ( context, module.install->name.c_str () ) ) || 0 != InfHostAddField ( context, GetFlags ( module ).c_str () ) ) { InfHostFreeContext ( context ); Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/testsupportco… ============================================================================== --- trunk/reactos/tools/rbuild/testsupportcode.cpp (original) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp Sun Sep 9 11:53:40 2007 @@ -69,13 +69,13 @@ string TestSupportCode::GetHooksFilename ( Module& module ) { - return NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.GetBasePath () + sSep + "_hooks.c" ); + return NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.output->relative_path + sSep + "_hooks.c" ); } char* TestSupportCode::WriteStubbedSymbolToHooksFile ( char* buffer, const StubbedComponent& component, - const StubbedSymbol& symbol ) + const StubbedSymbol& symbol ) { buffer = buffer + sprintf ( buffer, " {\"%s\", \"%s\", NULL, NULL, NULL},\n", @@ -135,7 +135,7 @@ string TestSupportCode::GetStubsFilename ( Module& module ) { - return NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.GetBasePath () + sSep + "_stubs.S" ); + return NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.output->relative_path + sSep + "_stubs.S" ); } string @@ -249,7 +249,7 @@ string TestSupportCode::GetStartupFilename ( Module& module ) { - return NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.GetBasePath () + sSep + "_startup.c" ); + return NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.output->relative_path + sSep + "_startup.c" ); } bool Modified: trunk/reactos/tools/rbuild/wineresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.… ============================================================================== --- trunk/reactos/tools/rbuild/wineresource.cpp (original) +++ trunk/reactos/tools/rbuild/wineresource.cpp Sun Sep 9 11:53:40 2007 @@ -103,8 +103,8 @@ module.name.c_str () ); } - string relativeDirectory = module.GetBasePath (); - string outputDirectory = Environment::GetIntermediatePath() + sSep + module.GetBasePath (); + string relativeDirectory = module.output->relative_path; + string outputDirectory = Environment::GetIntermediatePath() + sSep + module.output->relative_path; string parameters = ssprintf ( "-b %s -O %s -f -x %s", NormalizeFilename ( relativeDirectory ).c_str (), NormalizeFilename ( outputDirectory ).c_str (), @@ -120,6 +120,6 @@ exitcode ); } module.non_if_data.includes.push_back( new Include ( module.project, - module.GetBasePath (), + module.output->relative_path, "$(INTERMEDIATE)" ) ); }

1 0

[arty] 28963: Fix inverted logic in suspending process. Now this is symmetric with the corresponding thaw.
by arty＠svn.reactos.org 09 Sep '07

09 Sep '07

Author: arty Date: Sun Sep 9 11:39:45 2007 New Revision: 28963 URL: http://svn.reactos.org/svn/reactos?rev=28963&view=rev Log: Fix inverted logic in suspending process. Now this is symmetric with the corresponding thaw. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Sun Sep 9 11:39:45 2007 @@ -61,7 +61,7 @@ PAGED_CODE(); /* Make sure this isn't a deleted process */ - if (PsGetCurrentProcess()->ProcessDelete) + if (!PsGetCurrentProcess()->ProcessDelete) { /* Freeze all the threads */ KeFreezeAllThreads();

1 0

[arty] 28962: Add 2-byte packing for the DWORD size that follows the 'BM' signature.
by arty＠svn.reactos.org 09 Sep '07

09 Sep '07

Author: arty Date: Sun Sep 9 09:04:32 2007 New Revision: 28962 URL: http://svn.reactos.org/svn/reactos?rev=28962&view=rev Log: Add 2-byte packing for the DWORD size that follows the 'BM' signature. Modified: trunk/reactos/tools/wrc/wrcrostypes.h Modified: trunk/reactos/tools/wrc/wrcrostypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrcrostypes.h?re… ============================================================================== --- trunk/reactos/tools/wrc/wrcrostypes.h (original) +++ trunk/reactos/tools/wrc/wrcrostypes.h Sun Sep 9 09:04:32 2007 @@ -136,6 +136,7 @@ #define SUBLANG_SERBIAN_CYRILLIC 0x03 #define SUBLANG_UZBEK_CYRILLIC 0x02 +#include <pshpack2.h> typedef struct tagBITMAPFILEHEADER { WORD bfType; DWORD bfSize; @@ -143,6 +144,7 @@ WORD bfReserved2; DWORD bfOffBits; } BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER; +#include <poppack.h> typedef int FXPT2DOT30; typedef struct tagCIEXYZ {

1 0

[cfinck] 28961: Temporary "fix" to get explorer to build again. Someone please look why wrc fails for this particular file (logov.bmp). I'm out of ideas.
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sun Sep 9 02:32:24 2007 New Revision: 28961 URL: http://svn.reactos.org/svn/reactos?rev=28961&view=rev Log: Temporary "fix" to get explorer to build again. Someone please look why wrc fails for this particular file (logov.bmp). I'm out of ideas. Modified: trunk/reactos/base/shell/explorer/explorer.rbuild Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild Sun Sep 9 02:32:24 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" stdlib="host"> + <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" stdlib="host" usewrc="false"> <linkerflag>-fexceptions</linkerflag> <include base="explorer">.</include> <define name="__USE_W32API" />

1 0

[ekohl] 28960: - Add sorting page and show it if a language that supports multiple sorting methods has been selected.
by ekohl＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: ekohl Date: Sun Sep 9 02:27:41 2007 New Revision: 28960 URL: http://svn.reactos.org/svn/reactos?rev=28960&view=rev Log: - Add sorting page and show it if a language that supports multiple sorting methods has been selected. Added: trunk/reactos/dll/cpl/intl/sort.c (with props) Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/misc.c trunk/reactos/dll/cpl/intl/resource.h Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Sun Sep 9 02:27:41 2007 @@ -367,7 +367,26 @@ break; case IDC_SETUP_BUTTON: - SetupApplet(hwndDlg, uMsg, wParam, lParam); + { + LCID NewLcid; + INT iCurSel; + + iCurSel = SendMessage(hList, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendMessage(hList, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + SetupApplet(NewLcid); + } break; } break; Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c (original) +++ trunk/reactos/dll/cpl/intl/intl.c Sun Sep 9 02:27:41 2007 @@ -52,7 +52,7 @@ }; -VOID +static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Sun Sep 9 02:27:41 2007 @@ -19,8 +19,6 @@ extern DWORD UnattendLCID; /* intl.c */ -VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); /* languages.c */ INT_PTR CALLBACK @@ -78,8 +76,15 @@ WPARAM wParam, LPARAM lParam); +/* sort.c */ +BOOL +IsSortPageNeeded(LCID lcid); -void SetNewLocale(LCID lcid); +INT_PTR CALLBACK +SortPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); /* misc.c */ LPTSTR @@ -90,7 +95,7 @@ LONG APIENTRY -SetupApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +SetupApplet(LCID lcid); #endif /* __CPL_INTL_H */ Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild Sun Sep 9 02:27:41 2007 @@ -23,5 +23,6 @@ <file>misc.c</file> <file>languages.c</file> <file>advanced.c</file> + <file>sort.c</file> <file>intl.rc</file> </module> Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Sun Sep 9 02:27:41 2007 @@ -173,6 +173,19 @@ COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sortierung" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sortierung", -1, 7, 7, 230, 74 + LTEXT "Sorting methods define the sorting order of characters, words, files and folders.", -1, 14, 17, 220, 25 + LTEXT "Select a sorting method for your language:", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + STRINGTABLE BEGIN IDS_CUSTOMIZE_TITLE "Regionale Einstellungen bearbeiten" Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc Sun Sep 9 02:27:41 2007 @@ -176,6 +176,19 @@ COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sorting" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sorting", -1, 7, 7, 230, 74 + LTEXT "Sorting methods define the sorting order of characters, words, files and folders.", -1, 14, 17, 220, 25 + LTEXT "Select a sorting method for your language:", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + STRINGTABLE BEGIN IDS_CUSTOMIZE_TITLE "Customize Regional Options" Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc Sun Sep 9 02:27:41 2007 @@ -177,6 +177,19 @@ COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sorting" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sorting", -1, 7, 7, 230, 74 + LTEXT "Sorting methods define the sorting order of characters, words, files and folders.", -1, 14, 17, 220, 25 + LTEXT "Select a sorting method for your language:", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + STRINGTABLE BEGIN IDS_CUSTOMIZE_TITLE "Opzioni internazionali e della lingua" Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Sun Sep 9 02:27:41 2007 @@ -176,6 +176,19 @@ COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sorting" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sorting", -1, 7, 7, 230, 74 + LTEXT "Sorting methods define the sorting order of characters, words, files and folders.", -1, 14, 17, 220, 25 + LTEXT "Select a sorting method for your language:", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + STRINGTABLE BEGIN IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåãèîíàëüíûõ ïàðàìåòðîâ" Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Sun Sep 9 02:27:41 2007 @@ -182,6 +182,19 @@ COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sorting" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sorting", -1, 7, 7, 230, 74 + LTEXT "Sorting methods define the sorting order of characters, words, files and folders.", -1, 14, 17, 220, 25 + LTEXT "Select a sorting method for your language:", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + STRINGTABLE BEGIN IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåã³îíàëüíèõ ïàðàìåòð³â" Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c (original) +++ trunk/reactos/dll/cpl/intl/misc.c Sun Sep 9 02:27:41 2007 @@ -173,19 +173,28 @@ return szDestStr; } + +static VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LCID lcid) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; + psp->lParam = (LPARAM)lcid; +} + + /* Create applets */ LONG APIENTRY -SetupApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) -{ - PROPSHEETPAGE PsPage[NUM_SHEETS]; +SetupApplet(LCID lcid) +{ + PROPSHEETPAGE PsPage[NUM_SHEETS + 1]; PROPSHEETHEADER psh; TCHAR Caption[MAX_STR_SIZE]; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); - UNREFERENCED_PARAMETER(hwnd); LoadString(hApplet, IDS_CUSTOMIZE_TITLE, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -196,14 +205,20 @@ psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); psh.pszCaption = Caption; - psh.nPages = sizeof(PsPage) / sizeof(PROPSHEETPAGE); + psh.nPages = (sizeof(PsPage) / sizeof(PROPSHEETPAGE)) - 1; psh.nStartPage = 0; psh.ppsp = PsPage; - InitPropSheetPage(&PsPage[0], IDD_NUMBERSPAGE, NumbersPageProc); - InitPropSheetPage(&PsPage[1], IDD_CURRENCYPAGE, CurrencyPageProc); - InitPropSheetPage(&PsPage[2], IDD_TIMEPAGE, TimePageProc); - InitPropSheetPage(&PsPage[3], IDD_DATEPAGE, DatePageProc); + InitPropSheetPage(&PsPage[0], IDD_NUMBERSPAGE, NumbersPageProc, lcid); + InitPropSheetPage(&PsPage[1], IDD_CURRENCYPAGE, CurrencyPageProc, lcid); + InitPropSheetPage(&PsPage[2], IDD_TIMEPAGE, TimePageProc, lcid); + InitPropSheetPage(&PsPage[3], IDD_DATEPAGE, DatePageProc, lcid); + + if (IsSortPageNeeded(lcid)) + { + psh.nPages++; + InitPropSheetPage(&PsPage[4], IDD_SORTPAGE, SortPageProc, lcid); + } return (LONG)(PropertySheet(&psh) != -1); } Modified: trunk/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/resource.h (original) +++ trunk/reactos/dll/cpl/intl/resource.h Sun Sep 9 02:27:41 2007 @@ -71,6 +71,9 @@ #define IDC_APPLY_CUR_USER_DEF_PROFILE 366 #define IDC_CONV_TABLES 367 +#define IDD_SORTPAGE 400 +#define IDC_SORTLIST_COMBO 401 + #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 #define IDS_CUSTOMIZE_TITLE 1002 Added: trunk/reactos/dll/cpl/intl/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sort.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/sort.c (added) +++ trunk/reactos/dll/cpl/intl/sort.c Sun Sep 9 02:27:41 2007 @@ -1,0 +1,217 @@ +/* $Id$ + * + * PROJECT: ReactOS International Control Panel + * FILE: dll/cpl/intl/sort.c + * PURPOSE: Sorting property page + * PROGRAMMER: Eric Kohl + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include <tchar.h> + +#include "intl.h" +#include "resource.h" + +static BOOL bSortPage = FALSE; +static LCID userLcid; + +static HWND hWndSortList = NULL; + + +static BOOL CALLBACK +SortTestEnumProc(LPTSTR lpLocale) +{ + LCID lcid; + + lcid = _tcstoul(lpLocale, NULL, 16); + + if ((LANGIDFROMLCID(lcid) == LANGIDFROMLCID(userLcid)) && + (SORTIDFROMLCID(lcid) != SORTIDFROMLCID(userLcid))) + bSortPage = TRUE; + + return TRUE; +} + + +BOOL +IsSortPageNeeded(LCID lcid) +{ + /* Handle special case for Spanish (Spain) */ + if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || + lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) + return TRUE; + + userLcid = lcid; + bSortPage = FALSE; + + EnumSystemLocales(SortTestEnumProc, LCID_ALTERNATE_SORTS); + + return bSortPage; +} + + +static BOOL CALLBACK +SortEnumProc(LPTSTR lpLocale) +{ + LCID lcid; + TCHAR lang[255]; + INT index; + + lcid = _tcstoul(lpLocale, NULL, 16); + + if ((LANGIDFROMLCID(lcid) == LANGIDFROMLCID(userLcid)) && + (SORTIDFROMLCID(lcid) != SORTIDFROMLCID(userLcid))) + { + GetLocaleInfo(lcid, LOCALE_SSORTNAME, lang, sizeof(lang)); + + index = SendMessage(hWndSortList, + CB_ADDSTRING, + 0, + (LPARAM)lang); + + SendMessage(hWndSortList, + CB_SETITEMDATA, + index, + (LPARAM)lcid); + } + + return TRUE; +} + +static VOID +CreateSortList(HWND hwnd, LCID lcid) +{ + TCHAR lang[255]; + INT index; + + hWndSortList = hwnd; + + /* Handle special case for Spainish (Spain) */ + if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || + lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) + { + /* Add traditional sorting */ + GetLocaleInfo(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), + LOCALE_SSORTNAME, lang, sizeof(lang)); + + index = SendMessage(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)lang); + + SendMessage(hwnd, + CB_SETITEMDATA, + index, + (LPARAM)MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH)); + + /* Add modern sorting */ + GetLocaleInfo(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), + LOCALE_SSORTNAME, lang, sizeof(lang)); + + index = SendMessage(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)lang); + + SendMessage(hwnd, + CB_SETITEMDATA, + index, + (LPARAM)MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN)); + } + else + { + userLcid = lcid; + + GetLocaleInfo(lcid & 0xFFFF, LOCALE_SSORTNAME, lang, sizeof(lang)); + + index = SendMessage(hWndSortList, + CB_ADDSTRING, + 0, + (LPARAM)lang); + + SendMessage(hWndSortList, + CB_SETITEMDATA, + index, + (LPARAM)lcid & 0xFFFF); + + EnumSystemLocales(SortEnumProc, LCID_ALTERNATE_SORTS); + } + + /* Select current locale */ + /* or should it be System and not user? */ + GetLocaleInfo(lcid, LOCALE_SSORTNAME, lang, sizeof(lang)); + + SendMessage(hwnd, + CB_SELECTSTRING, + -1, + (LPARAM)lang); +} + +/* Property page dialog callback */ +INT_PTR CALLBACK +SortPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + LCID lcid = (LCID)((LPPROPSHEETPAGE)lParam)->lParam; + + CreateSortList(GetDlgItem(hwndDlg, IDC_SORTLIST_COMBO), lcid); + } + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SORTLIST_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + if (lpnm->code == (UINT)PSN_APPLY) + { + + LCID NewLcid; + INT iCurSel; + + iCurSel = SendDlgItemMessage(hwndDlg, + IDC_SORTLIST_COMBO, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendDlgItemMessage(hwndDlg, + IDC_SORTLIST_COMBO, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; +#if 0 + /* FIXME: Set locale ID */ +#endif + } + } + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/intl/sort.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/intl/sort.c ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[cfinck] 28959: - Revert my previous attempts to fix the "wmc" and "wrc" builds - Use "typedefs_host.h" in both components now - wrc needs *MANY* definitions from the Windows headers, therefore I created a new file "wrcrostypes.h", which contains all these definitions.
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sun Sep 9 01:40:36 2007 New Revision: 28959 URL: http://svn.reactos.org/svn/reactos?rev=28959&view=rev Log: - Revert my previous attempts to fix the "wmc" and "wrc" builds - Use "typedefs_host.h" in both components now - wrc needs *MANY* definitions from the Windows headers, therefore I created a new file "wrcrostypes.h", which contains all these definitions. Added: trunk/reactos/tools/wrc/wrcrostypes.h Modified: trunk/reactos/include/reactos/typedefs_host.h trunk/reactos/tools/wmc/wmctypes.h trunk/reactos/tools/wrc/dumpres.c trunk/reactos/tools/wrc/genres.c trunk/reactos/tools/wrc/lex.yy.c trunk/reactos/tools/wrc/newstruc.c trunk/reactos/tools/wrc/parser.l trunk/reactos/tools/wrc/parser.tab.c trunk/reactos/tools/wrc/parser.y trunk/reactos/tools/wrc/port/mkstemps.c trunk/reactos/tools/wrc/readres.c trunk/reactos/tools/wrc/translation.c trunk/reactos/tools/wrc/utils.c trunk/reactos/tools/wrc/wrc.c trunk/reactos/tools/wrc/wrc.mak trunk/reactos/tools/wrc/wrctypes.h trunk/reactos/tools/wrc/writeres.c Modified: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h Sun Sep 9 01:40:36 2007 @@ -58,14 +58,15 @@ typedef const char *PCSTR, *LPCSTR; typedef short SHORT; typedef unsigned short USHORT; -typedef int LONG, *PLONG; +typedef unsigned short WORD, *PWORD, *LPWORD; +typedef int LONG, *PLONG, *LPLONG; typedef unsigned int ULONG, *PULONG, DWORD, *LPDWORD; typedef long long LONGLONG; typedef unsigned long long ULONGLONG; typedef UCHAR BOOLEAN, *PBOOLEAN; typedef int BOOL; typedef long int W64 LONG_PTR, *PLONG_PTR; -typedef long unsigned int W64 ULONG_PTR, *PULONG_PTR; +typedef long unsigned int W64 ULONG_PTR, DWORD_PTR, *PULONG_PTR; typedef ULONG_PTR SIZE_T, *PSIZE_T; typedef unsigned short WCHAR, *PWCHAR, *PWSTR, *LPWSTR; typedef const unsigned short *PCWSTR, *LPCWSTR; Modified: trunk/reactos/tools/wmc/wmctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=2… ============================================================================== --- trunk/reactos/tools/wmc/wmctypes.h (original) +++ trunk/reactos/tools/wmc/wmctypes.h Sun Sep 9 01:40:36 2007 @@ -22,9 +22,7 @@ #define __WMC_WMCTYPES_H #include <stdarg.h> -#include <typedefs64.h> -#include "windef.h" -#include "winbase.h" +#include <typedefs_host.h> /* Byteordering defines */ #define WMC_BO_NATIVE 0x00 Modified: trunk/reactos/tools/wrc/dumpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/dumpres.c?rev=28… ============================================================================== --- trunk/reactos/tools/wrc/dumpres.c (original) +++ trunk/reactos/tools/wrc/dumpres.c Sun Sep 9 01:40:36 2007 @@ -18,11 +18,11 @@ #include "config.h" -#include "wrc.h" #include <assert.h> #include <stdio.h> #include <ctype.h> +#include "wrc.h" #include "dumpres.h" /* Modified: trunk/reactos/tools/wrc/genres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/genres.c?rev=289… ============================================================================== --- trunk/reactos/tools/wrc/genres.c (original) +++ trunk/reactos/tools/wrc/genres.c Sun Sep 9 01:40:36 2007 @@ -27,7 +27,6 @@ #include "config.h" -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -35,12 +34,9 @@ #include <assert.h> #include <ctype.h> +#include "wrc.h" #include "genres.h" #include "utils.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "wine/unicode.h" /* Fix 64-bit host, re: put_dword */ Modified: trunk/reactos/tools/wrc/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/lex.yy.c?rev=289… ============================================================================== --- trunk/reactos/tools/wrc/lex.yy.c (original) +++ trunk/reactos/tools/wrc/lex.yy.c Sun Sep 9 01:40:36 2007 @@ -720,7 +720,6 @@ /*#define LEX_DEBUG*/ -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -728,6 +727,7 @@ #include <assert.h> #include "wine/unicode.h" +#include "wrc.h" #include "utils.h" #include "parser.h" #include "newstruc.h" Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=2… ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c (original) +++ trunk/reactos/tools/wrc/newstruc.c Sun Sep 9 01:40:36 2007 @@ -21,18 +21,16 @@ #include "config.h" -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <assert.h> #include <ctype.h> +#include "wrc.h" #include "newstruc.h" #include "utils.h" #include "parser.h" - -#include "wingdi.h" /* for BITMAPINFOHEADER */ #include <pshpack2.h> typedef struct Modified: trunk/reactos/tools/wrc/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.l?rev=289… ============================================================================== --- trunk/reactos/tools/wrc/parser.l (original) +++ trunk/reactos/tools/wrc/parser.l Sun Sep 9 01:40:36 2007 @@ -98,7 +98,6 @@ /*#define LEX_DEBUG*/ -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -106,6 +105,7 @@ #include <assert.h> #include "wine/unicode.h" +#include "wrc.h" #include "utils.h" #include "parser.h" #include "newstruc.h" Modified: trunk/reactos/tools/wrc/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.c?rev… ============================================================================== --- trunk/reactos/tools/wrc/parser.tab.c (original) +++ trunk/reactos/tools/wrc/parser.tab.c Sun Sep 9 01:40:36 2007 @@ -352,7 +352,6 @@ #include "config.h" #include "wine/port.h" -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -363,16 +362,13 @@ #include <alloca.h> #endif +#include "wrc.h" #include "utils.h" #include "newstruc.h" #include "dumpres.h" #include "wine/wpp.h" #include "wine/unicode.h" #include "parser.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #if defined(YYBYACC) /* Berkeley yacc (byacc) doesn't seem to know about these */ Modified: trunk/reactos/tools/wrc/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.y?rev=289… ============================================================================== --- trunk/reactos/tools/wrc/parser.y (original) +++ trunk/reactos/tools/wrc/parser.y Sun Sep 9 01:40:36 2007 @@ -123,7 +123,6 @@ #include "config.h" #include "wine/port.h" -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -134,16 +133,13 @@ #include <alloca.h> #endif +#include "wrc.h" #include "utils.h" #include "newstruc.h" #include "dumpres.h" #include "wine/wpp.h" #include "wine/unicode.h" #include "parser.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #if defined(YYBYACC) /* Berkeley yacc (byacc) doesn't seem to know about these */ Modified: trunk/reactos/tools/wrc/port/mkstemps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/port/mkstemps.c?… ============================================================================== --- trunk/reactos/tools/wrc/port/mkstemps.c (original) +++ trunk/reactos/tools/wrc/port/mkstemps.c Sun Sep 9 01:40:36 2007 @@ -19,7 +19,6 @@ #include "config.h" #include <sys/types.h> -#include "windef.h" #include <stdlib.h> #include <string.h> #include <errno.h> Modified: trunk/reactos/tools/wrc/readres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/readres.c?rev=28… ============================================================================== --- trunk/reactos/tools/wrc/readres.c (original) +++ trunk/reactos/tools/wrc/readres.c Sun Sep 9 01:40:36 2007 @@ -20,12 +20,12 @@ #include "config.h" -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <assert.h> +#include "wrc.h" #include "readres.h" #include "newstruc.h" #include "utils.h" Modified: trunk/reactos/tools/wrc/translation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/translation.c?re… ============================================================================== --- trunk/reactos/tools/wrc/translation.c (original) +++ trunk/reactos/tools/wrc/translation.c Sun Sep 9 01:40:36 2007 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include "dumpres.h" +#include "wrc.h" #define MASTER_LANGUAGE LANG_ENGLISH #define NB_LANG 0x94 Modified: trunk/reactos/tools/wrc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.c?rev=2895… ============================================================================== --- trunk/reactos/tools/wrc/utils.c (original) +++ trunk/reactos/tools/wrc/utils.c Sun Sep 9 01:40:36 2007 @@ -20,7 +20,6 @@ #include "config.h" -#include "wrc.h" #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -30,6 +29,7 @@ #include <ctype.h> #include "wine/unicode.h" +#include "wrc.h" #include "utils.h" #include "parser.h" Modified: trunk/reactos/tools/wrc/wrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.c?rev=28959&… ============================================================================== --- trunk/reactos/tools/wrc/wrc.c (original) +++ trunk/reactos/tools/wrc/wrc.c Sun Sep 9 01:40:36 2007 @@ -21,7 +21,6 @@ #include "config.h" -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -35,6 +34,7 @@ # include <getopt.h> #endif +#include "wrc.h" #include "utils.h" #include "readres.h" #include "dumpres.h" Modified: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=2895… ============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Sun Sep 9 01:40:36 2007 @@ -56,7 +56,6 @@ WRC_HOST_CFLAGS = -I$(WRC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= \ - -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ -I$(UNICODE_BASE) -I$(WPP_BASE) \ -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ -I$(INTERMEDIATE_)include Added: trunk/reactos/tools/wrc/wrcrostypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrcrostypes.h?re… ============================================================================== --- trunk/reactos/tools/wrc/wrcrostypes.h (added) +++ trunk/reactos/tools/wrc/wrcrostypes.h Sun Sep 9 01:40:36 2007 @@ -1,0 +1,197 @@ +/* + PROJECT: ReactOS + LICENSE: GPL v2 or any later version + FILE: tools/wrc/wrcrostypes.h + PURPOSE: Definitions and macros from Windows headers, which are needed for wrc + COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> +*/ + +#ifndef _WRC_ROSTYPES_H +#define _WRC_ROSTYPES_H + +#include <typedefs_host.h> +#include <string.h> + +// Definitions copied from various <win....h> files +// We only want to include host headers, so we define them manually +#define LOBYTE(w) ((BYTE)(w)) +#define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) +#define LOWORD(l) ((WORD)((DWORD_PTR)(l))) +#define HIWORD(l) ((WORD)(((DWORD_PTR)(l)>>16)&0xFFFF)) +#define MAKELANGID(p,s) ((((WORD)(s))<<10)|(WORD)(p)) +#define VS_FFI_SIGNATURE 0xFEEF04BD +#define VS_FFI_STRUCVERSION 0x10000 +#define PRIMARYLANGID(l) ((WORD)(l)&0x3ff) +#define SUBLANGID(l) ((WORD)(l)>>10) + +#define BS_3STATE 5 +#define BS_AUTO3STATE 6 +#define BS_AUTOCHECKBOX 3 +#define BS_AUTORADIOBUTTON 9 +#define BS_CHECKBOX 2 +#define CBS_DROPDOWN 2 +#define CBS_DROPDOWNLIST 3 +#define CBS_SIMPLE 1 +#define BS_DEFPUSHBUTTON 1 +#define BS_GROUPBOX 7 +#define BS_PUSHBUTTON 0 +#define BS_RADIOBUTTON 4 +#define DS_SETFONT 64 +#define ES_LEFT 0 +#define LBS_NOTIFY 1 +#define MF_CHECKED 8 +#define MF_GRAYED 1 +#define MF_DISABLED 2 +#define MF_HELP 0x4000 +#define MF_MENUBARBREAK 32 +#define MF_MENUBREAK 64 +#define MF_POPUP 16 +#define MF_END 128 +#define SBS_HORZ 0 +#define SS_CENTER 1 +#define SS_ICON 3 +#define SS_LEFT 0 +#define SS_RIGHT 2 +#define WS_BORDER 0x800000 +#define WS_CAPTION 0xc00000 +#define WS_CHILD 0x40000000 +#define WS_GROUP 0x20000 +#define WS_POPUP 0x80000000 +#define WS_POPUPWINDOW 0x80880000 +#define WS_TABSTOP 0x10000 +#define WS_VISIBLE 0x10000000 + +#define LANG_AFRIKAANS 0x36 +#define LANG_ALBANIAN 0x1c +#define LANG_ARABIC 0x01 +#define LANG_ARMENIAN 0x2b +#define LANG_AZERI 0x2c +#define LANG_BASQUE 0x2d +#define LANG_BELARUSIAN 0x23 +#define LANG_BULGARIAN 0x02 +#define LANG_CATALAN 0x03 +#define LANG_CHINESE 0x04 +#define LANG_CROATIAN 0x1a +#define LANG_CZECH 0x05 +#define LANG_DANISH 0x06 +#define LANG_DIVEHI 0x65 +#define LANG_DUTCH 0x13 +#define LANG_ENGLISH 0x09 +#define LANG_ESTONIAN 0x25 +#define LANG_FAEROESE 0x38 +#define LANG_FARSI 0x29 +#define LANG_FINNISH 0x0b +#define LANG_FRENCH 0x0c +#define LANG_GALICIAN 0x56 +#define LANG_GEORGIAN 0x37 +#define LANG_GERMAN 0x07 +#define LANG_GREEK 0x08 +#define LANG_GUJARATI 0x47 +#define LANG_HEBREW 0x0d +#define LANG_HINDI 0x39 +#define LANG_HUNGARIAN 0x0e +#define LANG_ICELANDIC 0x0f +#define LANG_INDONESIAN 0x21 +#define LANG_ITALIAN 0x10 +#define LANG_JAPANESE 0x11 +#define LANG_KANNADA 0x4b +#define LANG_KAZAK 0x3f +#define LANG_KONKANI 0x57 +#define LANG_KOREAN 0x12 +#define LANG_KYRGYZ 0x40 +#define LANG_LATVIAN 0x26 +#define LANG_LITHUANIAN 0x27 +#define LANG_MACEDONIAN 0x2f +#define LANG_MALAY 0x3e +#define LANG_MARATHI 0x4e +#define LANG_MONGOLIAN 0x50 +#define LANG_NEUTRAL 0x00 +#define LANG_NORWEGIAN 0x14 +#define LANG_POLISH 0x15 +#define LANG_PORTUGUESE 0x16 +#define LANG_PUNJABI 0x46 +#define LANG_ROMANIAN 0x18 +#define LANG_RUSSIAN 0x19 +#define LANG_SANSKRIT 0x4f +#define LANG_SERBIAN 0x1a +#define LANG_SLOVAK 0x1b +#define LANG_SLOVENIAN 0x24 +#define LANG_SPANISH 0x0a +#define LANG_SWAHILI 0x41 +#define LANG_SWEDISH 0x1d +#define LANG_SYRIAC 0x5a +#define LANG_TAMIL 0x49 +#define LANG_TATAR 0x44 +#define LANG_TELUGU 0x4a +#define LANG_THAI 0x1e +#define LANG_TURKISH 0x1f +#define LANG_UKRAINIAN 0x22 +#define LANG_URDU 0x20 +#define LANG_UZBEK 0x43 +#define LANG_VIETNAMESE 0x2a +#define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_CHINESE_SINGAPORE 0x04 +#define SUBLANG_CHINESE_SIMPLIFIED 0x02 +#define SUBLANG_NEUTRAL 0x00 +#define SUBLANG_SERBIAN_CYRILLIC 0x03 +#define SUBLANG_UZBEK_CYRILLIC 0x02 + +typedef struct tagBITMAPFILEHEADER { + WORD bfType; + DWORD bfSize; + WORD bfReserved1; + WORD bfReserved2; + DWORD bfOffBits; +} BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER; + +typedef int FXPT2DOT30; +typedef struct tagCIEXYZ { + FXPT2DOT30 ciexyzX; + FXPT2DOT30 ciexyzY; + FXPT2DOT30 ciexyzZ; +} CIEXYZ,*LPCIEXYZ; + +typedef struct tagCIEXYZTRIPLE { + CIEXYZ ciexyzRed; + CIEXYZ ciexyzGreen; + CIEXYZ ciexyzBlue; +} CIEXYZTRIPLE,*LPCIEXYZTRIPLE; + +typedef struct tagBITMAPINFOHEADER{ + DWORD biSize; + LONG biWidth; + LONG biHeight; + WORD biPlanes; + WORD biBitCount; + DWORD biCompression; + DWORD biSizeImage; + LONG biXPelsPerMeter; + LONG biYPelsPerMeter; + DWORD biClrUsed; + DWORD biClrImportant; +} BITMAPINFOHEADER,*LPBITMAPINFOHEADER,*PBITMAPINFOHEADER; + +typedef struct { + DWORD bV4Size; + LONG bV4Width; + LONG bV4Height; + WORD bV4Planes; + WORD bV4BitCount; + DWORD bV4V4Compression; + DWORD bV4SizeImage; + LONG bV4XPelsPerMeter; + LONG bV4YPelsPerMeter; + DWORD bV4ClrUsed; + DWORD bV4ClrImportant; + DWORD bV4RedMask; + DWORD bV4GreenMask; + DWORD bV4BlueMask; + DWORD bV4AlphaMask; + DWORD bV4CSType; + CIEXYZTRIPLE bV4Endpoints; + DWORD bV4GammaRed; + DWORD bV4GammaGreen; + DWORD bV4GammaBlue; +} BITMAPV4HEADER,*LPBITMAPV4HEADER,*PBITMAPV4HEADER; + +#endif Modified: trunk/reactos/tools/wrc/wrctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrctypes.h?rev=2… ============================================================================== --- trunk/reactos/tools/wrc/wrctypes.h (original) +++ trunk/reactos/tools/wrc/wrctypes.h Sun Sep 9 01:40:36 2007 @@ -22,17 +22,7 @@ #define __WRC_WRCTYPES_H #include <stdarg.h> -#include <typedefs64.h> -#include "windef.h" -#include "winbase.h" - -#ifndef MAKELANGID -#include "winnls.h" -#endif - -#ifndef VS_FFI_SIGNATURE -#include "winver.h" -#endif +#include "wrcrostypes.h" /* Memory/load flags */ #define WRC_MO_MOVEABLE 0x0010 Modified: trunk/reactos/tools/wrc/writeres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/writeres.c?rev=2… ============================================================================== --- trunk/reactos/tools/wrc/writeres.c (original) +++ trunk/reactos/tools/wrc/writeres.c Sun Sep 9 01:40:36 2007 @@ -20,13 +20,13 @@ #include "config.h" -#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <assert.h> #include "wine/unicode.h" +#include "wrc.h" #include "genres.h" #include "newstruc.h" #include "utils.h"

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
59
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 September 2007