Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[npwoods] 19472: Regedit enhancements
by npwoods＠svn.reactos.com 23 Nov '05

23 Nov '05

Regedit enhancements 1. Implemented the ability to select existing favorites 2. Created dialog resources for adding favorites, removing favorites, and the find dialog Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-11-22 22:19:18 UTC (rev 19471) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-11-23 00:09:17 UTC (rev 19472) @@ -370,16 +370,51 @@ EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 END -IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +IDD_ADDFAVORITES DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" +CAPTION "Add to Favorites" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "OK",IDOK,130,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,130,24,50,14 + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 + LTEXT "&Favorite Name:",IDC_STATIC,7,7,70,10 + EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL END +IDD_REMOVEFAVORITES DIALOG DISCARDABLE 0, 0, 164, 135 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Favorites" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,107,114,50,14 + PUSHBUTTON "Cancel",IDCANCEL,7,114,50,14 + CONTROL "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | + WS_BORDER | WS_TABSTOP,7,20,150,90 + LTEXT "Select Favorite(s):",IDC_STATIC,7,7,99,12 +END +IDD_FIND DIALOG DISCARDABLE 0, 0, 254, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Find" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "&Find Next",IDOK,197,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,197,24,50,14 + GROUPBOX "Look at",IDC_STATIC,7,25,63,51 + LTEXT "Fi&nd what:",IDC_STATIC,7,8,37,10 + EDITTEXT IDD_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + CONTROL "&Keys",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,36,35,8 + CONTROL "&Values",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,48,36,8 + CONTROL "&Data",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,60,42,8 + CONTROL "Match &whole string only",IDC_MATCHSTRING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 + CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,83,48,90,12 +END + /* * TEXTINCLUDE */ _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-22 22:19:18 UTC (rev 19471) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-23 00:09:17 UTC (rev 19472) @@ -37,6 +37,10 @@ * Global and Local Variables: */ +#define FAVORITES_MENU_POSITION 3 + +static TCHAR s_szFavoritesRegKey[] = _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit\\Favo rites"); + static BOOL bInMenuLoop = FALSE; /* Tells us if we are in the menu loop */ /*********************************************************************** ******** @@ -79,13 +83,12 @@ DWORD dwIndex, cbValueName, cbValueData, dwType; TCHAR szValueName[256]; BYTE abValueData[256]; - int nFavoriteMenuPos = 3; static int s_nFavoriteMenuSubPos = -1; HMENU hMenu; BOOL bDisplayedAny = FALSE; /* Find Favorites menu and clear it out */ - hMenu = GetSubMenu(GetMenu(hWnd), nFavoriteMenuPos); + hMenu = GetSubMenu(GetMenu(hWnd), FAVORITES_MENU_POSITION); if (!hMenu) goto done; if (s_nFavoriteMenuSubPos < 0) @@ -98,7 +101,7 @@ ; } - lResult = RegOpenKey(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit\\Favo rites"), &hKey); + lResult = RegOpenKey(HKEY_CURRENT_USER, s_szFavoritesRegKey, &hKey); if (lResult != ERROR_SUCCESS) goto done; @@ -115,7 +118,7 @@ AppendMenu(hMenu, MF_SEPARATOR, 0, NULL); bDisplayedAny = TRUE; } - AppendMenu(hMenu, MF_GRAYED, 0, szValueName); + AppendMenu(hMenu, 0, ID_FAVORITES_MIN + GetMenuItemCount(hMenu), szValueName); } dwIndex++; } @@ -524,6 +527,28 @@ return TRUE; } +static void ChooseFavorite(LPCTSTR pszFavorite) +{ + HKEY hKey = NULL; + TCHAR szFavoritePath[512]; + DWORD cbData, dwType; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, s_szFavoritesRegKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + goto done; + + cbData = (sizeof(szFavoritePath) / sizeof(szFavoritePath[0])) - 1; + memset(szFavoritePath, 0, sizeof(szFavoritePath)); + if (RegQueryValueEx(hKey, pszFavorite, NULL, &dwType, (LPBYTE) szFavoritePath, &cbData) != ERROR_SUCCESS) + goto done; + + if (dwType == REG_SZ) + SelectNode(g_pChildWnd->hTreeWnd, szFavoritePath); + +done: + if (hKey) + RegCloseKey(hKey); +} + BOOL CopyKeyName(HWND hWnd, HKEY hRootKey, LPCTSTR keyName) { BOOL bClipboardOpened = FALSE; @@ -962,7 +987,31 @@ CreateNewKey(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd)); break; default: - result = FALSE; + if ((LOWORD(wParam) >= ID_FAVORITES_MIN) && (LOWORD(wParam) <= ID_FAVORITES_MAX)) + { + HMENU hMenu; + MENUITEMINFO mii; + TCHAR szFavorite[512]; + + hMenu = GetSubMenu(GetMenu(hWnd), FAVORITES_MENU_POSITION); + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE; + mii.fType = MFT_STRING; + mii.dwTypeData = szFavorite; + mii.cch = sizeof(szFavorite) / sizeof(szFavorite[0]); + + if (GetMenuItemInfo(hMenu, LOWORD(wParam) - ID_FAVORITES_MIN, TRUE, &mii)) + { + ChooseFavorite(szFavorite); + } + } + else + { + result = FALSE; + } + break; } if(hKey) _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-11-22 22:19:18 UTC (rev 19471) +++ trunk/reactos/subsys/system/regedit/main.c 2005-11-23 00:09:17 UTC (rev 19472) @@ -76,7 +76,6 @@ BOOL AclUiAvailable; HMENU hEditMenu; TCHAR szBuffer[256]; - LPCTSTR s; WNDCLASSEX wcFrame = { sizeof(WNDCLASSEX), @@ -168,10 +167,7 @@ _T("LastKey"), szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS) { - s = szBuffer; - if (!_tcsncmp(s, _T("My Computer\\"), 12)) - s += 12; - SelectNode(g_pChildWnd->hTreeWnd, s); + SelectNode(g_pChildWnd->hTreeWnd, szBuffer); } ShowWindow(hFrameWnd, nCmdShow); _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-11-22 22:19:18 UTC (rev 19471) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-11-23 00:09:17 UTC (rev 19472) @@ -37,12 +37,14 @@ #define IDR_REGEDIT_MENU 130 #define IDD_EXPORTRANGE 131 #define IDI_OPEN_FILE 132 -#define IDD_DIALOG2 132 #define IDI_CLOSED_FILE 133 #define IDI_ROOT 134 #define IDI_STRING 135 #define IDI_BIN 136 #define IDR_POPUP_MENUS 137 +#define IDD_ADDFAVORITES 138 +#define IDD_REMOVEFAVORITES 139 +#define IDD_FIND 140 #define IDC_LICENSE_EDIT 1029 #define ID_REGISTRY_EXIT 32770 #define ID_FAVOURITES_ADDTOFAVOURITES 32772 @@ -188,4 +190,17 @@ #define IDC_EXPORT_BRANCH 2009 #define IDC_EXPORT_BRANCH_TEXT 2010 + +#define IDC_FAVORITENAME 2011 +#define IDC_FAVORITESLIST 2012 +#define IDD_FINDWHAT 2013 +#define IDC_LOOKAT_KEYS 2014 +#define IDC_LOOKAT_VALUES 2015 +#define IDC_LOOKAT_DATA 2016 +#define IDC_MATCHSTRING 2017 +#define IDC_MATCHCASE 2018 + +#define ID_FAVORITES_MIN 2100 +#define ID_FAVORITES_MAX 2999 + #define IDC_STATIC -1 _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-11-22 22:19:18 UTC (rev 19471) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-11-23 00:09:17 UTC (rev 19472) @@ -598,6 +598,10 @@ LPCTSTR s; TVITEM tvi; + /* Total no-good hack */ + if (!_tcsncmp(keyPath, _T("My Computer\\"), 12)) + keyPath += 12; + hRoot = TreeView_GetRoot(hwndTV); hItem = hRoot;

1 0

[gedmurphy] 19471: Support for adding Expandable string and multi string values
by gedmurphy＠svn.reactos.com 22 Nov '05

22 Nov '05

Support for adding Expandable string and multi string values Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/resource.h _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-11-22 22:16:14 UTC (rev 19470) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-11-22 22:19:18 UTC (rev 19471) @@ -38,13 +38,16 @@ IDR_REGEDIT_MENU MENU DISCARDABLE BEGIN - POPUP "&Registry" + POPUP "&File" BEGIN - MENUITEM "&Import Registry File...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Import ...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Export Registry File...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Export...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -67,6 +70,8 @@ MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Permissions...", ID_EDIT_PERMISSIONS _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-22 22:16:14 UTC (rev 19470) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-22 22:19:18 UTC (rev 19471) @@ -921,6 +921,13 @@ case ID_EDIT_NEW_DWORDVALUE: CreateNewValue(hKeyRoot, keyPath, REG_DWORD); break; + case ID_EDIT_NEW_MULTISTRINGVALUE: + CreateNewValue(hKeyRoot, keyPath, REG_MULTI_SZ); + break; + case ID_EDIT_NEW_EXPANDABLESTRINGVALUE: + CreateNewValue(hKeyRoot, keyPath, REG_EXPAND_SZ); + break; + } case ID_EDIT_COPYKEYNAME: CopyKeyName(hWnd, hKeyRoot, keyPath); _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-11-22 22:16:14 UTC (rev 19470) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-11-22 22:19:18 UTC (rev 19471) @@ -60,6 +60,7 @@ #define ID_EDIT_NEW_STRINGVALUE 32786 #define ID_EDIT_NEW_BINARYVALUE 32787 #define ID_EDIT_NEW_DWORDVALUE 32788 + #define ID_REGISTRY_IMPORTREGISTRYFILE 32789 #define ID_REGISTRY_EXPORTREGISTRYFILE 32790 #define ID_REGISTRY_CONNECTNETWORKREGISTRY 32791 @@ -126,6 +127,10 @@ #define IDS_ERR_DELETEVALUE 32855 #define IDS_ERR_RENVAL_CAPTION 32856 #define IDS_ERR_RENVAL_TOEMPTY 32857 + +#define ID_EDIT_NEW_MULTISTRINGVALUE 32860 +#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32861 + #define ID_SWITCH_PANELS 32871 #define ID_EDIT_PERMISSIONS 32872 #define ID_TREE_DELETE 32873

1 0

[chorns] 19470: * Name compilation unit
by chorns＠svn.reactos.com 22 Nov '05

22 Nov '05

* Name compilation unit * Generate compilation unit support code Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/compilationunit.cpp Added: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-11-22 22:16:14 UTC (rev 19470) @@ -129,11 +129,11 @@ { Module &module = *ProjectNode.modules[i]; - for(size_t k = 0; k < module.non_if_data.compilationUnits.size(); k++) + for(size_t k = 0; k < module.non_if_data.files.size(); k++) { - CompilationUnit &compilationUnit = *module.non_if_data.compilationUnits[k]; - string filename = compilationUnit.GetFilename(); - ProcessFile(filename); + File &file = *module.non_if_data.files[k]; + + ProcessFile(file.name); } } } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-22 22:16:14 UTC (rev 19470) @@ -193,6 +193,7 @@ GenerateDirectories (); UnpackWineResources (); GenerateTestSupportCode (); + GenerateCompilationUnitSupportCode (); GenerateProxyMakefiles (); CheckAutomaticDependencies (); CloseMakefile (); @@ -523,6 +524,15 @@ printf ( "done\n" ); } +void +MingwBackend::GenerateCompilationUnitSupportCode () +{ + printf ( "Generating compilation unit support code..." ); + CompilationUnitSupportCode compilationUnitSupportCode ( ProjectNode ); + compilationUnitSupportCode.Generate ( configuration.Verbose ); + printf ( "done\n" ); +} + string MingwBackend::GetProxyMakefileTree () const { _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-11-22 22:16:14 UTC (rev 19470) @@ -77,6 +77,7 @@ std::string GetBin2ResExecutable (); void UnpackWineResources (); void GenerateTestSupportCode (); + void GenerateCompilationUnitSupportCode (); std::string GetProxyMakefileTree () const; void GenerateProxyMakefiles (); void CheckAutomaticDependencies (); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-22 22:16:14 UTC (rev 19470) @@ -121,6 +121,8 @@ Directory* directoryTree ) { string directory ( GetDirectory ( RemoveVariables ( file ) ) ); + if ( directoryTree == NULL ) + return file; string generatedFilesDirectory = backend->AddDirectoryTarget ( directory, directoryTree ); if ( directory.find ( generatedFilesDirectory ) != string::npos ) @@ -134,6 +136,13 @@ } } +/*static*/ string +MingwModuleHandler::PassThruCacheDirectory (const FileLocation* fileLocation ) +{ + return PassThruCacheDirectory ( fileLocation->filename, + fileLocation->directory ); +} + /*static*/ Directory* MingwModuleHandler::GetTargetDirectoryTree ( const Module& module ) @@ -264,16 +273,18 @@ return ""; } -string +FileLocation* MingwModuleHandler::GetActualSourceFilename ( - const string& filename ) const + const FileLocation* fileLocation ) const { + string filename = fileLocation->filename; string extension = GetExtension ( filename ); if ( extension == ".spec" || extension == ".SPEC" ) { string basename = GetBasename ( filename ); - return PassThruCacheDirectory ( NormalizeFilename ( basename + ".stubs.c" ), - backend->intermediateDirectory ); + PassThruCacheDirectory ( NormalizeFilename ( basename + ".stubs.c" ), + backend->intermediateDirectory ); + return new FileLocation ( backend->intermediateDirectory, NormalizeFilename ( basename + ".stubs.c" ) ); } else if ( extension == ".idl" || extension == ".IDL" ) { @@ -283,11 +294,12 @@ newname = basename + "_s.c"; else newname = basename + "_c.c"; - return PassThruCacheDirectory ( NormalizeFilename ( newname ), - backend->intermediateDirectory ); + PassThruCacheDirectory ( NormalizeFilename ( newname ), + backend->intermediateDirectory ); + return new FileLocation ( backend->intermediateDirectory, NormalizeFilename ( newname ) ); } else - return filename; + return new FileLocation ( fileLocation->directory, filename ); } string @@ -305,6 +317,21 @@ } string +MingwModuleHandler::GetCompilationUnitDependencies ( + const CompilationUnit& compilationUnit ) const +{ + if ( compilationUnit.files.size () <= 1 ) + return ""; + vector<string> sourceFiles; + for ( size_t i = 0; i < compilationUnit.files.size (); i++ ) + { + File& file = *compilationUnit.files[i]; + sourceFiles.push_back ( NormalizeFilename ( file.name ) ); + } + return v2s ( sourceFiles, 10 ); +} + +string MingwModuleHandler::GetModuleArchiveFilename () const { if ( module.type == StaticLibrary ) @@ -393,7 +420,10 @@ { if ( includeGeneratedFiles || !compilationUnits[i]->IsGeneratedFile () ) { - list.push_back ( GetActualSourceFilename ( compilationUnits[i]->GetFilename () ) ); + FileLocation* sourceFileLocation = GetActualSourceFilename ( + compilationUnits[i]->GetFilename ( backend->intermediateDirectory ) ); + list.push_back ( PassThruCacheDirectory ( sourceFileLocation->filename, + sourceFileLocation->directory ) ); } } // intentionally make a copy so that we can append more work in @@ -412,7 +442,12 @@ { CompilationUnit& compilationUnit = *compilationUnits[j]; if ( includeGeneratedFiles || !compilationUnit.IsGeneratedFile () ) - list.push_back ( GetActualSourceFilename ( compilationUnit.GetFilename () ) ); + { + FileLocation* sourceFileLocation = GetActualSourceFilename ( + compilationUnit.GetFilename ( backend->intermediateDirectory ) ); + list.push_back ( PassThruCacheDirectory ( sourceFileLocation->filename, + sourceFileLocation->directory ) ); + } } } } @@ -426,11 +461,11 @@ string MingwModuleHandler::GetObjectFilename ( - const string& sourceFilename, + const FileLocation* sourceFileLocation, string_list* pclean_files ) const { + string sourceFilename = sourceFileLocation->filename; Directory* directoryTree; - string newExtension; string extension = GetExtension ( sourceFilename ); if ( extension == ".rc" || extension == ".RC" ) @@ -550,7 +585,7 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += GetObjectFilename ( compilationUnits[i]->GetFilename (), NULL ); + objectFilenames += GetObjectFilename ( compilationUnits[i]->GetFilename ( backend->intermediateDirectory ), NULL ); } return objectFilenames; } @@ -851,7 +886,7 @@ fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), - GetObjectFilename ( compilationUnit.GetFilename (), NULL ).c_str (), + GetObjectFilename ( compilationUnit.GetFilename ( backend->intermediateDirectory ), NULL ).c_str (), objectsMacro.c_str() ); } } @@ -869,7 +904,7 @@ fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), - GetObjectFilename ( compilationUnit.GetFilename (), NULL ).c_str () ); + GetObjectFilename ( compilationUnit.GetFilename ( backend->intermediateDirectory ), NULL ).c_str () ); } } fprintf ( fMakefile, "\n" ); @@ -910,7 +945,7 @@ fMakefile, "%s += %s\n", objectsMacro.c_str(), - GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), NULL ).c_str () ); + GetObjectFilename ( sourceCompilationUnits[i]->GetFilename ( backend->intermediateDirectory ), NULL ).c_str () ); } CleanupCompilationUnitVector ( sourceCompilationUnits ); } @@ -925,11 +960,12 @@ void MingwModuleHandler::GenerateGccCommand ( - const string& sourceFilename, + const FileLocation* sourceFileLocation, const string& extraDependencies, const string& cc, const string& cflagsMacro ) { + string sourceFilename = PassThruCacheDirectory ( sourceFileLocation ); string dependencies = sourceFilename; if ( extraDependencies != "" ) dependencies += " " + extraDependencies; @@ -943,7 +979,7 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string objectFilename = GetObjectFilename ( - sourceFilename, &clean_files ); + sourceFileLocation, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", objectFilename.c_str (), @@ -958,14 +994,15 @@ void MingwModuleHandler::GenerateGccAssemblerCommand ( - const string& sourceFilename, + const FileLocation* sourceFileLocation, const string& cc, const string& cflagsMacro ) { + string sourceFilename = PassThruCacheDirectory ( sourceFileLocation ); string dependencies = sourceFilename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string objectFilename = GetObjectFilename ( - sourceFilename, &clean_files ); + sourceFileLocation, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", objectFilename.c_str (), @@ -980,13 +1017,14 @@ void MingwModuleHandler::GenerateNasmCommand ( - const string& sourceFilename, + const FileLocation* sourceFileLocation, const string& nasmflagsMacro ) { + string sourceFilename = PassThruCacheDirectory ( sourceFileLocation ); string dependencies = sourceFilename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string objectFilename = GetObjectFilename ( - sourceFilename, &clean_files ); + sourceFileLocation, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", objectFilename.c_str (), @@ -1001,13 +1039,13 @@ void MingwModuleHandler::GenerateWindresCommand ( - const string& sourceFilename, + const FileLocation* sourceFileLocation, const string& windresflagsMacro ) { + string sourceFilename = PassThruCacheDirectory ( sourceFileLocation ); string dependencies = sourceFilename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string objectFilename = - GetObjectFilename ( sourceFilename, &clean_files ); + string objectFilename = GetObjectFilename ( sourceFileLocation, &clean_files ); string sourceFilenamePart = ReplaceExtension ( GetFilename ( sourceFilename ), "" ); string rciFilename = ros_temp + module.name + "." + sourceFilenamePart + ".rci.tmp"; string resFilename = ros_temp + module.name + "." + sourceFilenamePart + ".res.tmp"; @@ -1056,8 +1094,9 @@ void MingwModuleHandler::GenerateWinebuildCommands ( - const string& sourceFilename ) + const FileLocation* sourceFileLocation ) { + string sourceFilename = PassThruCacheDirectory ( sourceFileLocation ); string dependencies = sourceFilename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); @@ -1113,7 +1152,8 @@ const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - string filename = compilationUnit.GetFilename (); + FileLocation* sourceFileLocation = compilationUnit.GetFilename ( backend->intermediateDirectory ); + string filename = sourceFileLocation->filename; string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); @@ -1156,7 +1196,8 @@ const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - string filename = compilationUnit.GetFilename (); + FileLocation* sourceFileLocation = compilationUnit.GetFilename ( backend->intermediateDirectory ); + string filename = sourceFileLocation->filename; string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); @@ -1210,12 +1251,13 @@ const string& windresflagsMacro, const string& widlflagsMacro ) { - string filename = compilationUnit.GetFilename (); + FileLocation* sourceFileLocation = compilationUnit.GetFilename ( backend->intermediateDirectory ); + string filename = sourceFileLocation->filename; string extension = GetExtension ( filename ); if ( extension == ".c" || extension == ".C" ) { - GenerateGccCommand ( filename, - "", + GenerateGccCommand ( sourceFileLocation, + GetCompilationUnitDependencies ( compilationUnit ), cc, cflagsMacro ); return; @@ -1224,35 +1266,35 @@ extension == ".cpp" || extension == ".CPP" || extension == ".cxx" || extension == ".CXX" ) { - GenerateGccCommand ( filename, - "", + GenerateGccCommand ( sourceFileLocation, + GetCompilationUnitDependencies ( compilationUnit ), cppc, cflagsMacro ); return; } else if ( extension == ".s" || extension == ".S" ) { - GenerateGccAssemblerCommand ( filename, + GenerateGccAssemblerCommand ( sourceFileLocation, cc, cflagsMacro ); return; } else if ( extension == ".asm" || extension == ".ASM" ) { - GenerateNasmCommand ( filename, + GenerateNasmCommand ( sourceFileLocation, nasmflagsMacro ); return; } else if ( extension == ".rc" || extension == ".RC" ) { - GenerateWindresCommand ( filename, + GenerateWindresCommand ( sourceFileLocation, windresflagsMacro ); return; } else if ( extension == ".spec" || extension == ".SPEC" ) { - GenerateWinebuildCommands ( filename ); - GenerateGccCommand ( GetActualSourceFilename ( filename ), + GenerateWinebuildCommands ( sourceFileLocation ); + GenerateGccCommand ( GetActualSourceFilename ( sourceFileLocation ), "", cc, cflagsMacro ); @@ -1262,7 +1304,7 @@ { GenerateWidlCommands ( compilationUnit, widlflagsMacro ); - GenerateGccCommand ( GetActualSourceFilename ( filename ), + GenerateGccCommand ( GetActualSourceFilename ( sourceFileLocation ), GetExtraDependencies ( filename ), cc, cflagsMacro ); @@ -1369,7 +1411,7 @@ for ( size_t i = 0; i < data.compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *data.compilationUnits[i]; - objectFiles.push_back ( GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ); + objectFiles.push_back ( GetObjectFilename ( compilationUnit.GetFilename ( backend->intermediateDirectory ), NULL ) ); } } @@ -1701,11 +1743,11 @@ for ( size_t j = 0; j < library.importedModule->non_if_data.compilationUnits.size (); j++ ) { CompilationUnit& compilationUnit = *library.importedModule->non_if_data.compilationUnits[j]; - string filename = compilationUnit.GetFilename (); - string extension = GetExtension ( filename ); + FileLocation* sourceFileLocation = compilationUnit.GetFilename ( backend->intermediateDirectory ); + string extension = GetExtension ( sourceFileLocation->filename ); if ( extension == ".idl" || extension == ".IDL" ) { - string basename = GetBasename ( filename ); + string basename = GetBasename ( sourceFileLocation->filename ); if ( library.importedModule->type == RpcServer ) dependencies.push_back ( GetRpcServerHeaderFilename ( basename ) ); if ( library.importedModule->type == RpcClient ) @@ -1739,10 +1781,10 @@ for ( size_t i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - string filename = compilationUnit.GetFilename (); - string extension = GetExtension ( filename ); + FileLocation* sourceFileLocation = compilationUnit.GetFilename ( backend->intermediateDirectory ); + string extension = GetExtension ( sourceFileLocation->filename ); if ( extension == ".spec" || extension == ".SPEC" ) - GetSpecObjectDependencies ( s, filename ); + GetSpecObjectDependencies ( s, sourceFileLocation->filename ); } } if ( s.size () > 0 ) @@ -2094,12 +2136,12 @@ for ( size_t i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - string filename = compilationUnit.GetFilename (); - string extension = GetExtension ( filename ); + FileLocation* sourceFileLocation = compilationUnit.GetFilename ( backend->intermediateDirectory ); + string extension = GetExtension ( sourceFileLocation->filename ); if ( extension == ".spec" || extension == ".SPEC" ) - GetSpecObjectDependencies ( dependencies, filename ); + GetSpecObjectDependencies ( dependencies, sourceFileLocation->filename ); if ( extension == ".idl" || extension == ".IDL" ) - GetWidlObjectDependencies ( dependencies, filename ); + GetWidlObjectDependencies ( dependencies, sourceFileLocation->filename ); } } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-22 22:16:14 UTC (rev 19470) @@ -45,6 +45,8 @@ const std::string &f, Directory* directoryTree ); + static std::string PassThruCacheDirectory (const FileLocation* fileLocation ); + static Directory* GetTargetDirectoryTree ( const Module& module ); @@ -84,8 +86,9 @@ virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); std::string GetWorkingDirectory () const; std::string GetBasename ( const std::string& filename ) const; - std::string GetActualSourceFilename ( const std::string& filename ) const; + FileLocation* GetActualSourceFilename ( const FileLocation* fileLocation ) const; std::string GetExtraDependencies ( const std::string& filename ) const; + std::string MingwModuleHandler::GetCompilationUnitDependencies ( const CompilationUnit& compilationUnit ) const; std::string GetModuleArchiveFilename () const; bool IsGeneratedFile ( const File& file ) const; std::string GetImportLibraryDependency ( const Module& importedModule ); @@ -96,7 +99,7 @@ void GetSourceFilenames ( string_list& list, bool includeGeneratedFiles ) const; void GetSourceFilenamesWithoutGeneratedFiles ( string_list& list ) const; - std::string GetObjectFilename ( const std::string& sourceFilename, + std::string GetObjectFilename ( const FileLocation* sourceFileLocation, string_list* pclean_files ) const; std::string GetObjectFilenames (); @@ -144,18 +147,18 @@ std::string GenerateGccParameters () const; std::string GenerateNasmParameters () const; std::string MingwModuleHandler::GetPrecompiledHeaderFilename () const; - void GenerateGccCommand ( const std::string& sourceFilename, + void GenerateGccCommand ( const FileLocation* sourceFileLocation, const std::string& extraDependencies, const std::string& cc, const std::string& cflagsMacro ); - void GenerateGccAssemblerCommand ( const std::string& sourceFilename, + void GenerateGccAssemblerCommand ( const FileLocation* sourceFileLocation, const std::string& cc, const std::string& cflagsMacro ); - void GenerateNasmCommand ( const std::string& sourceFilename, + void GenerateNasmCommand ( const FileLocation* sourceFileLocation, const std::string& nasmflagsMacro ); - void GenerateWindresCommand ( const std::string& sourceFilename, + void GenerateWindresCommand ( const FileLocation* sourceFileLocation, const std::string& windresflagsMacro ); - void GenerateWinebuildCommands ( const std::string& sourceFilename ); + void GenerateWinebuildCommands ( const FileLocation* sourceFileLocation ); std::string GetWidlFlags ( const CompilationUnit& compilationUnit ); void GenerateWidlCommandsServer ( const CompilationUnit& compilationUnit, _____ Modified: trunk/reactos/tools/rbuild/compilationunit.cpp --- trunk/reactos/tools/rbuild/compilationunit.cpp 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/compilationunit.cpp 2005-11-22 22:16:14 UTC (rev 19470) @@ -28,6 +28,7 @@ module(NULL), node(NULL) { + name = file->name; files.push_back ( file ); } @@ -38,6 +39,9 @@ module(module), node(node) { + const XMLAttribute* att = node->GetAttribute ( "name", true ); + assert(att); + name = module->GetBasePath () + cSep + att->value; } CompilationUnit::~CompilationUnit () @@ -83,28 +87,25 @@ CompilationUnit::IsFirstFile () const { if ( files.size () == 0 || files.size () > 1 ) -{ -printf("fs:'%d'\n", files.size ()); - throw InvalidOperationException ( __FILE__, __LINE__ ); -} + return false; File* file = files[0]; return file->first; } -std::string -CompilationUnit::GetFilename () const +FileLocation* +CompilationUnit::GetFilename ( Directory* intermediateDirectory ) const { if ( files.size () == 0 || files.size () > 1 ) - throw InvalidOperationException ( __FILE__, __LINE__ ); + return new FileLocation ( intermediateDirectory, name ); File* file = files[0]; - return file->name; + return new FileLocation ( NULL, file->name ); } std::string CompilationUnit::GetSwitches () const { if ( files.size () == 0 || files.size () > 1 ) - throw InvalidOperationException ( __FILE__, __LINE__ ); + return ""; File* file = files[0]; return file->switches; } _____ Added: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp --- trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-22 22:16:14 UTC (rev 19470) @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +using std::string; +using std::vector; + +CompilationUnitSupportCode::CompilationUnitSupportCode ( const Project& project ) + : project ( project ) +{ +} + +CompilationUnitSupportCode::~CompilationUnitSupportCode () +{ +} + +void +CompilationUnitSupportCode::Generate ( bool verbose ) +{ + for ( size_t i = 0; i < project.modules.size (); i++ ) + { + GenerateForModule ( *project.modules[i], + verbose ); + } +} + +void +CompilationUnitSupportCode::GenerateForModule ( Module& module, + bool verbose ) +{ + if ( verbose ) + { + printf ( "\nGenerating compilation unit support code for %s", + module.name.c_str () ); + } + + for ( size_t i = 0; i < module.non_if_data.compilationUnits.size () ; i++ ) + { + CompilationUnit& compilationUnit = *module.non_if_data.compilationUnits[i]; + if ( compilationUnit.files.size () <= 1 ) + continue; + WriteCompilationUnitFile ( module, compilationUnit ); + } +} + +string +CompilationUnitSupportCode::GetCompilationUnitFilename ( Module& module, + CompilationUnit& compilationUnit ) +{ + return NormalizeFilename ( Environment::GetIntermediatePath () + sSep + compilationUnit.name ); +} + +void +CompilationUnitSupportCode::WriteCompilationUnitFile ( Module& module, + CompilationUnit& compilationUnit ) +{ + char* buf; + char* s; + + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); + s = s + sprintf ( s, "#define ONE_COMPILATION_UNIT\n" ); + if ( module.pch ) + s = s + sprintf ( s, "#include <%s>\n", NormalizeFilename ( module.pch->file.name ).c_str () ); + + for ( size_t i = 0; i < compilationUnit.files.size () ; i++ ) + { + File& file = *compilationUnit.files[i]; + s = s + sprintf ( s, "#include \"%s\"\n", file.name.c_str () ); + } + + s = s + sprintf ( s, "\n" ); + + FileSupportCode::WriteIfChanged ( buf, GetCompilationUnitFilename ( module, compilationUnit ) ); + + free ( buf ); +} Property changes on: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt --- trunk/reactos/tools/rbuild/doc/rbuild.txt 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/doc/rbuild.txt 2005-11-22 22:16:14 UTC (rev 19470) @@ -195,12 +195,12 @@ A compilationunit element specifies that one or more source code files are to be compiled as a single compilation unit. Syntax: - <compilationunit> + <compilationunit name="kernel32.c"> ... </compilationunit> Attributes: - None. + name - Name of generated source code file. Value: None. _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-22 22:16:14 UTC (rev 19470) @@ -72,6 +72,15 @@ { } + +FileLocation::FileLocation ( Directory* directory, + std::string filename ) + : directory (directory), + filename (filename) +{ +} + + Project::Project ( const string& filename ) : xmlfile (filename), node (NULL), _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 22:16:14 UTC (rev 19470) @@ -93,6 +93,7 @@ class StubbedComponent; class StubbedSymbol; class CompilationUnit; +class FileLocation; class SourceFileTest; @@ -817,6 +818,7 @@ const Project* project; const Module* module; const XMLElement* node; + std::string name; std::vector<File*> files; CompilationUnit ( File* file ); @@ -828,11 +830,39 @@ bool IsGeneratedFile () const; bool HasFileWithExtension ( const std::string& extension ) const; bool IsFirstFile () const; - std::string GetFilename () const; + FileLocation* GetFilename ( Directory* intermediateDirectory ) const; std::string GetSwitches () const; }; +class CompilationUnitSupportCode +{ +public: + const Project& project; + + CompilationUnitSupportCode ( const Project& project ); + ~CompilationUnitSupportCode (); + void Generate ( bool verbose ); +private: + void GenerateForModule ( Module& module, + bool verbose ); + std::string GetCompilationUnitFilename ( Module& module, + CompilationUnit& compilationUnit ); + void WriteCompilationUnitFile ( Module& module, + CompilationUnit& compilationUnit ); +}; + + +class FileLocation +{ +public: + Directory* directory; + std::string filename; + FileLocation ( Directory* directory, + std::string filename ); +}; + + extern void InitializeEnvironment (); _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-11-22 22:16:14 UTC (rev 19470) @@ -157,6 +157,7 @@ bootstrap.cpp \ cdfile.cpp \ compilationunit.cpp \ + compilationunitsupportcode.cpp \ compilerflag.cpp \ configuration.cpp \ define.cpp \ @@ -280,6 +281,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)compilationunitsupportcode.o: $(RBUILD_BASE_)compilationunitsupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ _____ Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp --- trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-11-22 21:58:50 UTC (rev 19469) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-11-22 22:16:14 UTC (rev 19470) @@ -297,7 +297,8 @@ const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; for ( i = 0; i < compilationUnits.size (); i++ ) { - string filename = compilationUnits[i]->GetFilename(); + FileLocation* sourceFileLocation = compilationUnits[i]->GetFilename ( NULL ); + string filename = sourceFileLocation->filename; if ( !compilationUnits[i]->IsGeneratedFile () && IsTestFile ( filename ) ) list.push_back ( filename ); } @@ -316,7 +317,8 @@ for ( j = 0; j < compilationUnits.size (); j++ ) { CompilationUnit& compilationUnit = *compilationUnits[j]; - string filename = compilationUnits[j]->GetFilename(); + FileLocation* sourceFileLocation = compilationUnits[j]->GetFilename ( NULL ); + string filename = sourceFileLocation->filename; if ( !compilationUnit.IsGeneratedFile () && IsTestFile ( filename ) ) list.push_back ( filename ); }

1 0

[chorns] 19469: Move Directory class to its own file
by chorns＠svn.reactos.com 22 Nov '05

22 Nov '05

Move Directory class to its own file Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Added: trunk/reactos/tools/rbuild/directory.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.mak _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-22 21:32:11 UTC (rev 19468) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-22 21:58:50 UTC (rev 19469) @@ -19,20 +19,8 @@ #include "mingw.h" #include <assert.h> -#ifdef _MSC_VER -#define popen _popen -#define pclose _pclose -#else -#include <dirent.h> -#endif//_MSC_VER #include "modulehandler.h" -#ifdef WIN32 -#define MKDIR(s) mkdir(s) -#else -#define MKDIR(s) mkdir(s, 0755) -#endif - using std::string; using std::vector; using std::set; @@ -62,180 +50,6 @@ } -Directory::Directory ( const string& name_ ) - : name(name_) -{ -} - -void -Directory::Add ( const char* subdir ) -{ - size_t i; - string s1 = string ( subdir ); - if ( ( i = s1.find ( '$' ) ) != string::npos ) - { - throw InvalidOperationException ( __FILE__, - __LINE__, - "No environment variables can be used here. Path was %s", - subdir ); - } - - const char* p = strpbrk ( subdir, "/\\" ); - if ( !p ) - p = subdir + strlen(subdir); - string s ( subdir, p-subdir ); - if ( subdirs.find(s) == subdirs.end() ) - subdirs[s] = new Directory(s); - if ( *p && *++p ) - subdirs[s]->Add ( p ); -} - -bool -Directory::mkdir_p ( const char* path ) -{ -#ifndef _MSC_VER - DIR *directory; - directory = opendir ( path ); - if ( directory != NULL ) - { - closedir ( directory ); - return false; - } -#endif//_MSC_VER - - if ( MKDIR ( path ) != 0 ) - { -#ifdef _MSC_VER - if ( errno == EEXIST ) - return false; -#endif//_MSC_VER - throw AccessDeniedException ( string ( path ) ); - } - return true; -} - -bool -Directory::CreateDirectory ( string path ) -{ - size_t index = 0; - size_t nextIndex; - if ( isalpha ( path[0] ) && path[1] == ':' && path[2] == cSep ) - { - nextIndex = path.find ( cSep, 3); - } - else - nextIndex = path.find ( cSep ); - - bool directoryWasCreated = false; - while ( nextIndex != string::npos ) - { - nextIndex = path.find ( cSep, index + 1 ); - directoryWasCreated = mkdir_p ( path.substr ( 0, nextIndex ).c_str () ); - index = nextIndex; - } - return directoryWasCreated; -} - -string -Directory::ReplaceVariable ( string name, - string value, - string path ) -{ - size_t i = path.find ( name ); - if ( i != string::npos ) - return path.replace ( i, name.length (), value ); - else - return path; -} - -void -Directory::ResolveVariablesInPath ( char* buf, - string path ) -{ - string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); - s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); - s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); - strcpy ( buf, s.c_str () ); -} - -void -Directory::GenerateTree ( const string& parent, - bool verbose ) -{ - string path; - - if ( parent.size () > 0 ) - { - char buf[256]; - - path = parent + sSep + name; - ResolveVariablesInPath ( buf, path ); - if ( CreateDirectory ( buf ) && verbose ) - printf ( "Created %s\n", buf ); - } - else - path = name; - - for ( directory_map::iterator i = subdirs.begin (); - i != subdirs.end (); - ++i ) - { - i->second->GenerateTree ( path, verbose ); - } -} - -string -Directory::EscapeSpaces ( string path ) -{ - string newpath; - char* p = &path[0]; - while ( *p != 0 ) - { - if ( *p == ' ' ) - newpath = newpath + "\\ "; - else - newpath = newpath + *p; - *p++; - } - return newpath; -} - -void -Directory::CreateRule ( FILE* f, - const string& parent ) -{ - string path; - - if ( parent.size() > 0 ) - { - string escapedParent = EscapeSpaces ( parent ); - fprintf ( f, - "%s%c%s: | %s\n", - escapedParent.c_str (), - cSep, - EscapeSpaces ( name ).c_str (), - escapedParent.c_str () ); - - fprintf ( f, - "\t$(ECHO_MKDIR)\n" ); - - fprintf ( f, - "\t${mkdir} $@\n" ); - - path = parent + sSep + name; - } - else - path = name; - - for ( directory_map::iterator i = subdirs.begin(); - i != subdirs.end(); - ++i ) - { - i->second->CreateRule ( f, path ); - } -} - - static class MingwFactory : public Backend::Factory { public: _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-11-22 21:32:11 UTC (rev 19468) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-11-22 21:58:50 UTC (rev 19469) @@ -32,33 +32,7 @@ extern std::string v2s ( const string_list& v, int wrap_at ); -typedef std::map<std::string,Directory*> directory_map; - -class Directory -{ -public: - std::string name; - directory_map subdirs; - Directory ( const std::string& name ); - void Add ( const char* subdir ); - void GenerateTree ( const std::string& parent, - bool verbose ); - std::string EscapeSpaces ( std::string path ); - void CreateRule ( FILE* f, - const std::string& parent ); -private: - bool mkdir_p ( const char* path ); - std::string ReplaceVariable ( std::string name, - std::string value, - std::string path ); - std::string GetEnvironmentVariable ( const std::string& name ); - void ResolveVariablesInPath ( char* buf, - std::string path ); - bool CreateDirectory ( std::string path ); -}; - - class MingwBackend : public Backend { public: _____ Added: trunk/reactos/tools/rbuild/directory.cpp --- trunk/reactos/tools/rbuild/directory.cpp 2005-11-22 21:32:11 UTC (rev 19468) +++ trunk/reactos/tools/rbuild/directory.cpp 2005-11-22 21:58:50 UTC (rev 19469) @@ -0,0 +1,209 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" +#ifdef _MSC_VER +#define popen _popen +#define pclose _pclose +#else +#include <dirent.h> +#endif//_MSC_VER + +#ifdef WIN32 +#define MKDIR(s) mkdir(s) +#else +#define MKDIR(s) mkdir(s, 0755) +#endif + +using std::string; +using std::vector; + +Directory::Directory ( const string& name_ ) + : name(name_) +{ +} + +void +Directory::Add ( const char* subdir ) +{ + size_t i; + string s1 = string ( subdir ); + if ( ( i = s1.find ( '$' ) ) != string::npos ) + { + throw InvalidOperationException ( __FILE__, + __LINE__, + "No environment variables can be used here. Path was %s", + subdir ); + } + + const char* p = strpbrk ( subdir, "/\\" ); + if ( !p ) + p = subdir + strlen(subdir); + string s ( subdir, p-subdir ); + if ( subdirs.find(s) == subdirs.end() ) + subdirs[s] = new Directory(s); + if ( *p && *++p ) + subdirs[s]->Add ( p ); +} + +bool +Directory::mkdir_p ( const char* path ) +{ +#ifndef _MSC_VER + DIR *directory; + directory = opendir ( path ); + if ( directory != NULL ) + { + closedir ( directory ); + return false; + } +#endif//_MSC_VER + + if ( MKDIR ( path ) != 0 ) + { +#ifdef _MSC_VER + if ( errno == EEXIST ) + return false; +#endif//_MSC_VER + throw AccessDeniedException ( string ( path ) ); + } + return true; +} + +bool +Directory::CreateDirectory ( string path ) +{ + size_t index = 0; + size_t nextIndex; + if ( isalpha ( path[0] ) && path[1] == ':' && path[2] == cSep ) + { + nextIndex = path.find ( cSep, 3); + } + else + nextIndex = path.find ( cSep ); + + bool directoryWasCreated = false; + while ( nextIndex != string::npos ) + { + nextIndex = path.find ( cSep, index + 1 ); + directoryWasCreated = mkdir_p ( path.substr ( 0, nextIndex ).c_str () ); + index = nextIndex; + } + return directoryWasCreated; +} + +string +Directory::ReplaceVariable ( string name, + string value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + +void +Directory::ResolveVariablesInPath ( char* buf, + string path ) +{ + string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); + s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); + s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); + strcpy ( buf, s.c_str () ); +} + +void +Directory::GenerateTree ( const string& parent, + bool verbose ) +{ + string path; + + if ( parent.size () > 0 ) + { + char buf[256]; + + path = parent + sSep + name; + ResolveVariablesInPath ( buf, path ); + if ( CreateDirectory ( buf ) && verbose ) + printf ( "Created %s\n", buf ); + } + else + path = name; + + for ( directory_map::iterator i = subdirs.begin (); + i != subdirs.end (); + ++i ) + { + i->second->GenerateTree ( path, verbose ); + } +} + +string +Directory::EscapeSpaces ( string path ) +{ + string newpath; + char* p = &path[0]; + while ( *p != 0 ) + { + if ( *p == ' ' ) + newpath = newpath + "\\ "; + else + newpath = newpath + *p; + *p++; + } + return newpath; +} + +void +Directory::CreateRule ( FILE* f, + const string& parent ) +{ + string path; + + if ( parent.size() > 0 ) + { + string escapedParent = EscapeSpaces ( parent ); + fprintf ( f, + "%s%c%s: | %s\n", + escapedParent.c_str (), + cSep, + EscapeSpaces ( name ).c_str (), + escapedParent.c_str () ); + + fprintf ( f, + "\t$(ECHO_MKDIR)\n" ); + + fprintf ( f, + "\t${mkdir} $@\n" ); + + path = parent + sSep + name; + } + else + path = name; + + for ( directory_map::iterator i = subdirs.begin(); + i != subdirs.end(); + ++i ) + { + i->second->CreateRule ( f, path ); + } +} Property changes on: trunk/reactos/tools/rbuild/directory.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 21:32:11 UTC (rev 19468) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 21:58:50 UTC (rev 19469) @@ -66,6 +66,7 @@ #define MS_VS_DEF_VERSION "7.10" +class Directory; class Project; class IfableData; class Module; @@ -96,6 +97,32 @@ class SourceFileTest; +typedef std::map<std::string,Directory*> directory_map; + +class Directory +{ +public: + std::string name; + directory_map subdirs; + Directory ( const std::string& name ); + void Add ( const char* subdir ); + void GenerateTree ( const std::string& parent, + bool verbose ); + std::string EscapeSpaces ( std::string path ); + void CreateRule ( FILE* f, + const std::string& parent ); +private: + bool mkdir_p ( const char* path ); + std::string ReplaceVariable ( std::string name, + std::string value, + std::string path ); + std::string GetEnvironmentVariable ( const std::string& name ); + void ResolveVariablesInPath ( char* buf, + std::string path ); + bool CreateDirectory ( std::string path ); +}; + + class Configuration { public: _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-11-22 21:32:11 UTC (rev 19468) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-11-22 21:58:50 UTC (rev 19469) @@ -160,6 +160,7 @@ compilerflag.cpp \ configuration.cpp \ define.cpp \ + directory.cpp \ exception.cpp \ filesupportcode.cpp \ include.cpp \ @@ -291,6 +292,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)directory.o: $(RBUILD_BASE_)directory.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

1 0

[mbosma] 19468: Florian (papierkorb[at]gmx-topmail[dot]de): A few corrections.
by mbosma＠svn.reactos.com 22 Nov '05

22 Nov '05

Florian (papierkorb[at]gmx-topmail[dot]de): A few corrections. Modified: trunk/reactos/subsys/system/regedit/De.rc _____ Modified: trunk/reactos/subsys/system/regedit/De.rc --- trunk/reactos/subsys/system/regedit/De.rc 2005-11-22 18:01:02 UTC (rev 19467) +++ trunk/reactos/subsys/system/regedit/De.rc 2005-11-22 21:32:11 UTC (rev 19468) @@ -30,7 +30,7 @@ BEGIN MENUITEM "&Beenden", ID_REGISTRY_EXIT END - POPUP "&Help" + POPUP "&Hilfe" BEGIN MENUITEM "&?ber ...", ID_HELP_ABOUT END @@ -89,9 +89,9 @@ END POPUP "&Favoriten" BEGIN - MENUITEM "Zu den Favoriten &hinzug³gen", ID_FAVOURITES_ADDTOFAVOURITES + MENUITEM "Zu den Favoriten &hinzuf³gen", ID_FAVOURITES_ADDTOFAVOURITES , GRAYED - MENUITEM "Von den Favoriten &l÷schen", ID_FAVOURITES_REMOVEFAVOURITE + MENUITEM "Aus den Favoriten &l÷schen", ID_FAVOURITES_REMOVEFAVOURITE , GRAYED END POPUP "&Hilfe"

1 0

[hbirr] 19467: - Fixed the parameter check of the echo command.
by hbirr＠svn.reactos.com 22 Nov '05

22 Nov '05

- Fixed the parameter check of the echo command. - Remove the first space after the echo command. - Do never check for parameters if the delimiter is a point. Modified: trunk/reactos/subsys/system/cmd/echo.c _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-11-22 14:23:17 UTC (rev 19466) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-11-22 18:01:02 UTC (rev 19467) @@ -33,44 +33,70 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - UINT i = 0; + LPTSTR p1, p2; #ifdef _DEBUG DebugPrintf (_T("CommandEcho '%s' : '%s'\n"), cmd, param); #endif - if (!_tcsncmp (param, _T("/?"), 2)) + if (_tcsicmp (cmd, _T("echo.")) == 0) { - ConOutResPaging(TRUE,STRING_ECHO_HELP4); - return 0; - } - - if (_tcsicmp (cmd, _T("echo.")) == 0) - { if (param[0] == 0) ConOutChar (_T('\n')); else ConOutPuts (param); } - else - { - if (_tcsicmp (param, D_OFF) == 0) - bEcho = FALSE; - else if (_tcsicmp (param, D_ON) == 0) - bEcho = TRUE; - else if (*param) + else + { + /* skip the first delimiter */ + if (_istspace(*param)) + param++; + + /* skip all spaces for the check of '/?', 'ON' and 'OFF' */ + p1 = param; + while(_istspace(*p1)) + p1++; + + if (!_tcsncmp (p1, _T("/?"), 2)) + { + ConOutResPaging(TRUE,STRING_ECHO_HELP4); + return 0; + } + + if (_tcsnicmp (p1, D_OFF, sizeof(D_OFF)/sizeof(TCHAR) - 1) == 0) + { + p2 = p1 + sizeof(D_OFF)/sizeof(TCHAR) - 1; + while (_istspace(*p2)) + p2++; + if (*p2 == _T('\0')) + { + bEcho = FALSE; + return 0; + } + } + else if (_tcsnicmp (p1, D_ON, sizeof(D_ON)/sizeof(TCHAR) - 1) == 0) + { + p2 = p1 + sizeof(D_ON)/sizeof(TCHAR) - 1; + while (_istspace(*p2)) + p2++; + if (*p2 == _T('\0')) + { + bEcho = TRUE; + return 0; + } + } + if (*p1 != _T('\0')) { - while(i < _tcslen(param)) - { - if(param[i] == _T('^')) - { - memmove(&param[i],&param[i + 1], _tcslen(&param[i]) * sizeof(TCHAR)); - //skip past the char being escaped - i++; - } - else - i++; - } + p1 = param; + while (NULL != (p1 = _tcschr(p1, _T('^')))) + { + memmove(p1, p1 + 1, (_tcslen(p1 + 1) + 1) * sizeof(TCHAR)); + if (*p1) + { + //skip past the char being escaped + p1++; + } + } ConOutPuts (param); } else

1 0

[chorns] 19466: Replace File by CompilationUnit
by chorns＠svn.reactos.com 22 Nov '05

22 Nov '05

Replace File by CompilationUnit Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/compilationunit.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -129,11 +129,11 @@ { Module &module = *ProjectNode.modules[i]; - for(size_t k = 0; k < module.non_if_data.files.size(); k++) + for(size_t k = 0; k < module.non_if_data.compilationUnits.size(); k++) { - File &file = *module.non_if_data.files[k]; - - ProcessFile(file.name); + CompilationUnit &compilationUnit = *module.non_if_data.compilationUnits[k]; + string filename = compilationUnit.GetFilename(); + ProcessFile(filename); } } } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -388,13 +388,12 @@ { size_t i; - const vector<File*>& files = module.non_if_data.files; - for ( i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + for ( i = 0; i < compilationUnits.size (); i++ ) { - if ( includeGeneratedFiles || !files[i]->IsGeneratedFile () ) + if ( includeGeneratedFiles || !compilationUnits[i]->IsGeneratedFile () ) { - list.push_back ( - GetActualSourceFilename ( files[i]->name ) ); + list.push_back ( GetActualSourceFilename ( compilationUnits[i]->GetFilename () ) ); } } // intentionally make a copy so that we can append more work in @@ -408,15 +407,12 @@ const vector<If*>& ifs = rIf.data.ifs; for ( j = 0; j < ifs.size (); j++ ) v.push_back ( ifs[j] ); - const vector<File*>& files = rIf.data.files; - for ( j = 0; j < files.size (); j++ ) + const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; + for ( j = 0; j < compilationUnits.size (); j++ ) { - File& file = *files[j]; - if ( includeGeneratedFiles || !file.IsGeneratedFile () ) - { - list.push_back ( - GetActualSourceFilename ( file.name ) ); - } + CompilationUnit& compilationUnit = *compilationUnits[j]; + if ( includeGeneratedFiles || !compilationUnit.IsGeneratedFile () ) + list.push_back ( GetActualSourceFilename ( compilationUnit.GetFilename () ) ); } } } @@ -545,17 +541,16 @@ string MingwModuleHandler::GetObjectFilenames () { - const vector<File*>& files = module.non_if_data.files; - if ( files.size () == 0 ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + if ( compilationUnits.size () == 0 ) return ""; string objectFilenames ( "" ); - for ( size_t i = 0; i < files.size (); i++ ) + for ( size_t i = 0; i < compilationUnits.size (); i++ ) { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += - GetObjectFilename ( files[i]->name, NULL ); + objectFilenames += GetObjectFilename ( compilationUnits[i]->GetFilename (), NULL ); } return objectFilenames; } @@ -804,7 +799,7 @@ if ( rIf.data.defines.size() || rIf.data.includes.size() || rIf.data.libraries.size() - || rIf.data.files.size() + || rIf.data.compilationUnits.size() || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { @@ -826,14 +821,14 @@ } void -MingwModuleHandler::CleanupFileVector ( vector<File*>& sourceFiles ) +MingwModuleHandler::CleanupCompilationUnitVector ( vector<CompilationUnit*>& compilationUnits ) { - for (size_t i = 0; i < sourceFiles.size (); i++) - delete sourceFiles[i]; + for (size_t i = 0; i < compilationUnits.size (); i++) + delete compilationUnits[i]; } void -MingwModuleHandler::GetModuleSpecificSourceFiles ( vector<File*>& sourceFiles ) +MingwModuleHandler::GetModuleSpecificCompilationUnits ( vector<CompilationUnit*>& compilationUnits ) { } @@ -845,19 +840,18 @@ { size_t i; - const vector<File*>& files = data.files; - if ( files.size () > 0 ) + const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; + if ( compilationUnits.size () > 0 ) { - for ( i = 0; i < files.size (); i++ ) + for ( i = 0; i < compilationUnits.size (); i++ ) { - File& file = *files[i]; - if ( file.first ) + CompilationUnit& compilationUnit = *compilationUnits[i]; + if ( compilationUnit.IsFirstFile () ) { fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), - GetObjectFilename ( - file.name, NULL ).c_str (), + GetObjectFilename ( compilationUnit.GetFilename (), NULL ).c_str (), objectsMacro.c_str() ); } } @@ -866,17 +860,16 @@ "%s %s", objectsMacro.c_str (), assignmentOperation ); - for ( i = 0; i < files.size(); i++ ) + for ( i = 0; i < compilationUnits.size(); i++ ) { - File& file = *files[i]; - if ( !file.first ) + CompilationUnit& compilationUnit = *compilationUnits[i]; + if ( !compilationUnit.IsFirstFile () ) { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), - GetObjectFilename ( - file.name, NULL ).c_str () ); + GetObjectFilename ( compilationUnit.GetFilename (), NULL ).c_str () ); } } fprintf ( fMakefile, "\n" ); @@ -889,7 +882,7 @@ if ( rIf.data.defines.size() || rIf.data.includes.size() || rIf.data.libraries.size() - || rIf.data.files.size() + || rIf.data.compilationUnits.size() || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { @@ -909,18 +902,17 @@ } } - vector<File*> sourceFiles; - GetModuleSpecificSourceFiles ( sourceFiles ); - for ( i = 0; i < sourceFiles.size (); i++ ) + vector<CompilationUnit*> sourceCompilationUnits; + GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); + for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { fprintf ( fMakefile, "%s += %s\n", objectsMacro.c_str(), - GetObjectFilename ( - sourceFiles[i]->name, NULL ).c_str () ); + GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), NULL ).c_str () ); } - CleanupFileVector ( sourceFiles ); + CleanupCompilationUnitVector ( sourceCompilationUnits ); } string @@ -1104,9 +1096,9 @@ } string -MingwModuleHandler::GetWidlFlags ( const File& file ) +MingwModuleHandler::GetWidlFlags ( const CompilationUnit& compilationUnit ) { - return file.switches; + return compilationUnit.GetSwitches (); } string @@ -1118,13 +1110,14 @@ void MingwModuleHandler::GenerateWidlCommandsServer ( - const File& file, + const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - string dependencies = file.name; + string filename = compilationUnit.GetFilename (); + string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string basename = GetBasename ( file.name ); + string basename = GetBasename ( filename ); string generatedHeaderFilename = GetRpcServerHeaderFilename ( basename ); CLEAN_FILE(generatedHeaderFilename); @@ -1144,11 +1137,11 @@ fprintf ( fMakefile, "\t%s %s %s -h -H %s -s -S %s %s\n", "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( file ).c_str (), + GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), generatedHeaderFilename.c_str (), generatedServerFilename.c_str (), - file.name.c_str () ); + filename.c_str () ); } string @@ -1160,13 +1153,14 @@ void MingwModuleHandler::GenerateWidlCommandsClient ( - const File& file, + const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - string dependencies = file.name; + string filename = compilationUnit.GetFilename (); + string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string basename = GetBasename ( file.name ); + string basename = GetBasename ( filename ); string generatedHeaderFilename = GetRpcClientHeaderFilename ( basename ); CLEAN_FILE(generatedHeaderFilename); @@ -1186,29 +1180,29 @@ fprintf ( fMakefile, "\t%s %s %s -h -H %s -c -C %s %s\n", "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( file ).c_str (), + GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), generatedHeaderFilename.c_str (), generatedClientFilename.c_str (), - file.name.c_str () ); + filename.c_str () ); } void MingwModuleHandler::GenerateWidlCommands ( - const File& file, + const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { if ( module.type == RpcServer ) - GenerateWidlCommandsServer ( file, + GenerateWidlCommandsServer ( compilationUnit, widlflagsMacro ); else - GenerateWidlCommandsClient ( file, + GenerateWidlCommandsClient ( compilationUnit, widlflagsMacro ); } void MingwModuleHandler::GenerateCommands ( - const File& file, + const CompilationUnit& compilationUnit, const string& cc, const string& cppc, const string& cflagsMacro, @@ -1216,10 +1210,11 @@ const string& windresflagsMacro, const string& widlflagsMacro ) { - string extension = GetExtension ( file.name ); + string filename = compilationUnit.GetFilename (); + string extension = GetExtension ( filename ); if ( extension == ".c" || extension == ".C" ) { - GenerateGccCommand ( file.name, + GenerateGccCommand ( filename, "", cc, cflagsMacro ); @@ -1229,7 +1224,7 @@ extension == ".cpp" || extension == ".CPP" || extension == ".cxx" || extension == ".CXX" ) { - GenerateGccCommand ( file.name, + GenerateGccCommand ( filename, "", cppc, cflagsMacro ); @@ -1237,27 +1232,27 @@ } else if ( extension == ".s" || extension == ".S" ) { - GenerateGccAssemblerCommand ( file.name, + GenerateGccAssemblerCommand ( filename, cc, cflagsMacro ); return; } else if ( extension == ".asm" || extension == ".ASM" ) { - GenerateNasmCommand ( file.name, + GenerateNasmCommand ( filename, nasmflagsMacro ); return; } else if ( extension == ".rc" || extension == ".RC" ) { - GenerateWindresCommand ( file.name, + GenerateWindresCommand ( filename, windresflagsMacro ); return; } else if ( extension == ".spec" || extension == ".SPEC" ) { - GenerateWinebuildCommands ( file.name ); - GenerateGccCommand ( GetActualSourceFilename ( file.name ), + GenerateWinebuildCommands ( filename ); + GenerateGccCommand ( GetActualSourceFilename ( filename ), "", cc, cflagsMacro ); @@ -1265,10 +1260,10 @@ } else if ( extension == ".idl" || extension == ".IDL" ) { - GenerateWidlCommands ( file, + GenerateWidlCommands ( compilationUnit, widlflagsMacro ); - GenerateGccCommand ( GetActualSourceFilename ( file.name ), - GetExtraDependencies ( file.name ), + GenerateGccCommand ( GetActualSourceFilename ( filename ), + GetExtraDependencies ( filename ), cc, cflagsMacro ); return; @@ -1278,7 +1273,7 @@ __LINE__, "Unsupported filename extension '%s' in file '%s'", extension.c_str (), - file.name.c_str () ); + filename.c_str () ); } void @@ -1371,10 +1366,10 @@ MingwModuleHandler::GetObjectsVector ( const IfableData& data, vector<string>& objectFiles ) const { - for ( size_t i = 0; i < data.files.size (); i++ ) + for ( size_t i = 0; i < data.compilationUnits.size (); i++ ) { - File& file = *data.files[i]; - objectFiles.push_back ( GetObjectFilename ( file.name, NULL ) ); + CompilationUnit& compilationUnit = *data.compilationUnits[i]; + objectFiles.push_back ( GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ); } } @@ -1519,10 +1514,10 @@ { size_t i; - const vector<File*>& files = data.files; - for ( i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; + for ( i = 0; i < compilationUnits.size (); i++ ) { - GenerateCommands ( *files[i], + GenerateCommands ( *compilationUnits[i], cc, cppc, cflagsMacro, @@ -1545,11 +1540,11 @@ widlflagsMacro ); } - vector<File*> sourceFiles; - GetModuleSpecificSourceFiles ( sourceFiles ); - for ( i = 0; i < sourceFiles.size (); i++ ) + vector<CompilationUnit*> sourceCompilationUnits; + GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); + for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { - GenerateCommands ( *sourceFiles[i], + GenerateCommands ( *sourceCompilationUnits[i], cc, cppc, cflagsMacro, @@ -1557,7 +1552,7 @@ windresflagsMacro, widlflagsMacro ); } - CleanupFileVector ( sourceFiles ); + CleanupCompilationUnitVector ( sourceCompilationUnits ); } void @@ -1703,13 +1698,14 @@ if ( library.importedModule->type == RpcServer || library.importedModule->type == RpcClient ) { - for ( size_t j = 0; j < library.importedModule->non_if_data.files.size (); j++ ) + for ( size_t j = 0; j < library.importedModule->non_if_data.compilationUnits.size (); j++ ) { - File& file = *library.importedModule->non_if_data.files[j]; - string extension = GetExtension ( file.name ); + CompilationUnit& compilationUnit = *library.importedModule->non_if_data.compilationUnits[j]; + string filename = compilationUnit.GetFilename (); + string extension = GetExtension ( filename ); if ( extension == ".idl" || extension == ".IDL" ) { - string basename = GetBasename ( file.name ); + string basename = GetBasename ( filename ); if ( library.importedModule->type == RpcServer ) dependencies.push_back ( GetRpcServerHeaderFilename ( basename ) ); if ( library.importedModule->type == RpcClient ) @@ -1739,13 +1735,14 @@ vector<string> s; if ( module.importLibrary ) { - const vector<File*>& files = module.non_if_data.files; - for ( size_t i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + for ( size_t i = 0; i < compilationUnits.size (); i++ ) { - File& file = *files[i]; - string extension = GetExtension ( file.name ); + CompilationUnit& compilationUnit = *compilationUnits[i]; + string filename = compilationUnit.GetFilename (); + string extension = GetExtension ( filename ); if ( extension == ".spec" || extension == ".SPEC" ) - GetSpecObjectDependencies ( s, file.name ); + GetSpecObjectDependencies ( s, filename ); } } if ( s.size () > 0 ) @@ -2093,19 +2090,16 @@ string_list& dependencies ) const { string dkNkmLibNoFixup = "dk/nkm/lib"; - const vector<File*>& files = module.non_if_data.files; - for ( size_t i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + for ( size_t i = 0; i < compilationUnits.size (); i++ ) { - File& file = *files[i]; - string extension = GetExtension ( file.name ); + CompilationUnit& compilationUnit = *compilationUnits[i]; + string filename = compilationUnit.GetFilename (); + string extension = GetExtension ( filename ); if ( extension == ".spec" || extension == ".SPEC" ) - { - GetSpecObjectDependencies ( dependencies, file.name ); - } + GetSpecObjectDependencies ( dependencies, filename ); if ( extension == ".idl" || extension == ".IDL" ) - { - GetWidlObjectDependencies ( dependencies, file.name ); - } + GetWidlObjectDependencies ( dependencies, filename ); } } @@ -2176,7 +2170,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2265,7 +2259,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2313,7 +2307,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2360,7 +2354,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2407,7 +2401,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2454,7 +2448,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2507,7 +2501,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2560,7 +2554,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -3043,12 +3037,12 @@ } void -MingwTestModuleHandler::GetModuleSpecificSourceFiles ( vector<File*>& sourceFiles ) +MingwTestModuleHandler::GetModuleSpecificCompilationUnits ( vector<CompilationUnit*>& compilationUnits ) { string basePath = "$(INTERMEDIATE)" + sSep + module.GetBasePath (); - sourceFiles.push_back ( new File ( basePath + sSep + "_hooks.c", false, "", false ) ); - sourceFiles.push_back ( new File ( basePath + sSep + "_stubs.S", false, "", false ) ); - sourceFiles.push_back ( new File ( basePath + sSep + "_startup.c", false, "", false ) ); + 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 ) ) ); } void @@ -3062,7 +3056,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-22 14:23:17 UTC (rev 19466) @@ -81,7 +81,7 @@ void GenerateDependsTarget () const; static bool ReferenceObjects ( const Module& module ); protected: - virtual void GetModuleSpecificSourceFiles ( std::vector<File*>& sourceFiles ); + virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); std::string GetWorkingDirectory () const; std::string GetBasename ( const std::string& filename ) const; std::string GetActualSourceFilename ( const std::string& filename ) const; @@ -156,16 +156,16 @@ void GenerateWindresCommand ( const std::string& sourceFilename, const std::string& windresflagsMacro ); void GenerateWinebuildCommands ( const std::string& sourceFilename ); - std::string GetWidlFlags ( const File& file ); + std::string GetWidlFlags ( const CompilationUnit& compilationUnit ); void GenerateWidlCommandsServer ( - const File& file, + const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommandsClient ( - const File& file, + const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); - void GenerateWidlCommands ( const File& file, + void GenerateWidlCommands ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); - void GenerateCommands ( const File& file, + void GenerateCommands ( const CompilationUnit& compilationUnit, const std::string& cc, const std::string& cppc, const std::string& cflagsMacro, @@ -198,7 +198,7 @@ static std::string RemoveVariables ( std::string path); void GenerateBuildMapCode (); void GenerateBuildNonSymbolStrippedCode (); - void CleanupFileVector ( std::vector<File*>& sourceFiles ); + void CleanupCompilationUnitVector ( std::vector<CompilationUnit*>& compilationUnits ); void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const; std::string GetRpcServerHeaderFilename ( std::string basename ) const; std::string GetRpcClientHeaderFilename ( std::string basename ) const; @@ -420,7 +420,7 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); protected: - virtual void GetModuleSpecificSourceFiles ( std::vector<File*>& sourceFiles ); + virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); private: void GenerateTestModuleTarget (); }; _____ Modified: trunk/reactos/tools/rbuild/compilationunit.cpp --- trunk/reactos/tools/rbuild/compilationunit.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/compilationunit.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -23,9 +23,17 @@ using std::string; using std::vector; -CompilationUnit::CompilationUnit ( const Project& project, +CompilationUnit::CompilationUnit ( File* file ) + : project(NULL), + module(NULL), + node(NULL) +{ + files.push_back ( file ); +} + +CompilationUnit::CompilationUnit ( const Project* project, const Module* module, - const XMLElement& node ) + const XMLElement* node ) : project(project), module(module), node(node) @@ -34,9 +42,69 @@ CompilationUnit::~CompilationUnit () { + size_t i; + for ( i = 0; i < files.size (); i++ ) + delete files[i]; } void CompilationUnit::ProcessXML () { + size_t i; + for ( i = 0; i < files.size (); i++ ) + files[i]->ProcessXML (); } + +bool +CompilationUnit::IsGeneratedFile () const +{ + if ( files.size () != 1 ) + return false; + File* file = files[0]; + string extension = GetExtension ( file->name ); + return ( extension == ".spec" || extension == ".SPEC" ); +} + +bool +CompilationUnit::HasFileWithExtension ( const std::string& extension ) const +{ + size_t i; + for ( i = 0; i < files.size (); i++ ) + { + File& file = *files[i]; + string fileExtension = GetExtension ( file.name ); + if ( !stricmp ( fileExtension.c_str (), extension.c_str () ) ) + return true; + } + return false; +} + +bool +CompilationUnit::IsFirstFile () const +{ + if ( files.size () == 0 || files.size () > 1 ) +{ +printf("fs:'%d'\n", files.size ()); + throw InvalidOperationException ( __FILE__, __LINE__ ); +} + File* file = files[0]; + return file->first; +} + +std::string +CompilationUnit::GetFilename () const +{ + if ( files.size () == 0 || files.size () > 1 ) + throw InvalidOperationException ( __FILE__, __LINE__ ); + File* file = files[0]; + return file->name; +} + +std::string +CompilationUnit::GetSwitches () const +{ + if ( files.size () == 0 || files.size () > 1 ) + throw InvalidOperationException ( __FILE__, __LINE__ ); + File* file = files[0]; + return file->switches; +} _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -182,8 +182,6 @@ IfableData::~IfableData() { size_t i; - for ( i = 0; i < files.size (); i++ ) - delete files[i]; for ( i = 0; i < includes.size (); i++ ) delete includes[i]; for ( i = 0; i < defines.size (); i++ ) @@ -203,8 +201,6 @@ void IfableData::ProcessXML () { size_t i; - for ( i = 0; i < files.size (); i++ ) - files[i]->ProcessXML (); for ( i = 0; i < includes.size (); i++ ) includes[i]->ProcessXML (); for ( i = 0; i < defines.size (); i++ ) @@ -478,12 +474,20 @@ first, switches, false ); + if ( parseContext.compilationUnit ) + parseContext.compilationUnit->files.push_back ( pFile ); + else + { + CompilationUnit* pCompilationUnit = new CompilationUnit ( pFile ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); + else + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + } if ( parseContext.ifData ) parseContext.ifData->data.files.push_back ( pFile ); else non_if_data.files.push_back ( pFile ); - if ( parseContext.compilationUnit ) - parseContext.compilationUnit->files.push_back ( pFile ); subs_invalid = true; } else if ( e.name == "library" && e.value.size () ) @@ -623,7 +627,7 @@ } else if ( e.name == "compilationunit" ) { - CompilationUnit* pCompilationUnit = new CompilationUnit ( project, this, e ); + CompilationUnit* pCompilationUnit = new CompilationUnit ( &project, this, &e ); if ( parseContext.ifData ) parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); else @@ -925,11 +929,10 @@ const std::string& extension ) const { size_t i; - for ( i = 0; i < data.files.size (); i++ ) + for ( i = 0; i < data.compilationUnits.size (); i++ ) { - File& file = *data.files[i]; - string file_ext = GetExtension ( file.name ); - if ( !stricmp ( file_ext.c_str (), extension.c_str () ) ) + CompilationUnit* compilationUnit = data.compilationUnits[i]; + if ( compilationUnit->HasFileWithExtension ( extension ) ) return true; } for ( i = 0; i < data.ifs.size (); i++ ) @@ -971,14 +974,7 @@ { } -bool -File::IsGeneratedFile () const -{ - string extension = GetExtension ( name ); - return ( extension == ".spec" || extension == ".SPEC" ); -} - Library::Library ( const XMLElement& _node, const Module& _module, const string& _name ) _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 14:23:17 UTC (rev 19466) @@ -353,7 +353,6 @@ bool _isPreCompiledHeader ); void ProcessXML(); - bool IsGeneratedFile () const; }; @@ -788,16 +787,22 @@ class CompilationUnit { public: - const Project& project; + const Project* project; const Module* module; - const XMLElement& node; + const XMLElement* node; std::vector<File*> files; - CompilationUnit ( const Project& project, + CompilationUnit ( File* file ); + CompilationUnit ( const Project* project, const Module* module, - const XMLElement& node ); + const XMLElement* node ); ~CompilationUnit (); void ProcessXML(); + bool IsGeneratedFile () const; + bool HasFileWithExtension ( const std::string& extension ) const; + bool IsFirstFile () const; + std::string GetFilename () const; + std::string GetSwitches () const; }; _____ Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp --- trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -29,8 +29,14 @@ IS_TRUE ( module1.type == BuildTool ); ARE_EQUAL ( 2, module1.non_if_data.files.size()); + ARE_EQUAL ( "dir1" SSEP "file1.c", module1.non_if_data.files[0]->name ); + ARE_EQUAL ( "dir1" SSEP "file2.c", module1.non_if_data.files[1]->name ); + ARE_EQUAL ( 1, module1.non_if_data.compilationUnits.size () ); CompilationUnit& compilationUnit1 = *module1.non_if_data.compilationUnits[0]; ARE_EQUAL ( 2, compilationUnit1.files.size () ); + + ARE_EQUAL ( "dir1" SSEP "file1.c", compilationUnit1.files[0]->name ); + ARE_EQUAL ( "dir1" SSEP "file2.c", compilationUnit1.files[1]->name ); } _____ Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp --- trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -294,11 +294,12 @@ { size_t i; - const vector<File*>& files = module.non_if_data.files; - for ( i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + for ( i = 0; i < compilationUnits.size (); i++ ) { - if ( !files[i]->IsGeneratedFile () && IsTestFile ( files[i]->name ) ) - list.push_back ( files[i]->name ); + string filename = compilationUnits[i]->GetFilename(); + if ( !compilationUnits[i]->IsGeneratedFile () && IsTestFile ( filename ) ) + list.push_back ( filename ); } // intentionally make a copy so that we can append more work in // the middle of processing without having to go recursive @@ -311,14 +312,13 @@ const vector<If*>& ifs = rIf.data.ifs; for ( j = 0; j < ifs.size (); j++ ) v.push_back ( ifs[j] ); - const vector<File*>& files = rIf.data.files; - for ( j = 0; j < files.size (); j++ ) + const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; + for ( j = 0; j < compilationUnits.size (); j++ ) { - File& file = *files[j]; - if ( !file.IsGeneratedFile () && IsTestFile ( file.name ) ) - { - list.push_back ( file.name ); - } + CompilationUnit& compilationUnit = *compilationUnits[j]; + string filename = compilationUnits[j]->GetFilename(); + if ( !compilationUnit.IsGeneratedFile () && IsTestFile ( filename ) ) + list.push_back ( filename ); } } }

1 0

[npwoods] 19465: Regedit: Favorites now appear in the favorites menu (though they are currently grayed out)
by npwoods＠svn.reactos.com 22 Nov '05

22 Nov '05

Regedit: Favorites now appear in the favorites menu (though they are currently grayed out) Modified: trunk/reactos/subsys/system/regedit/framewnd.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-22 11:20:01 UTC (rev 19464) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-22 14:07:34 UTC (rev 19465) @@ -72,6 +72,60 @@ /*********************************************************************** *********/ +static void OnInitMenu(HWND hWnd) +{ + LONG lResult; + HKEY hKey = NULL; + DWORD dwIndex, cbValueName, cbValueData, dwType; + TCHAR szValueName[256]; + BYTE abValueData[256]; + int nFavoriteMenuPos = 3; + static int s_nFavoriteMenuSubPos = -1; + HMENU hMenu; + BOOL bDisplayedAny = FALSE; + + /* Find Favorites menu and clear it out */ + hMenu = GetSubMenu(GetMenu(hWnd), nFavoriteMenuPos); + if (!hMenu) + goto done; + if (s_nFavoriteMenuSubPos < 0) + { + s_nFavoriteMenuSubPos = GetMenuItemCount(hMenu); + } + else + { + while(RemoveMenu(hMenu, s_nFavoriteMenuSubPos, MF_BYPOSITION)) + ; + } + + lResult = RegOpenKey(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit\\Favo rites"), &hKey); + if (lResult != ERROR_SUCCESS) + goto done; + + dwIndex = 0; + do + { + cbValueName = sizeof(szValueName) / sizeof(szValueName[0]); + cbValueData = sizeof(abValueData); + lResult = RegEnumValue(hKey, dwIndex, szValueName, &cbValueName, NULL, &dwType, abValueData, &cbValueData); + if ((lResult == ERROR_SUCCESS) && (dwType == REG_SZ)) + { + if (!bDisplayedAny) + { + AppendMenu(hMenu, MF_SEPARATOR, 0, NULL); + bDisplayedAny = TRUE; + } + AppendMenu(hMenu, MF_GRAYED, 0, szValueName); + } + dwIndex++; + } + while(lResult == ERROR_SUCCESS); + +done: + if (hKey) + RegCloseKey(hKey); +} + static void OnEnterMenuLoop(HWND hWnd) { int nParts; @@ -941,6 +995,9 @@ break; case WM_TIMER: break; + case WM_INITMENU: + OnInitMenu(hWnd); + break; case WM_ENTERMENULOOP: OnEnterMenuLoop(hWnd); break;

1 0

[weiden] 19464: Fixed a bunch of uninitialized variable warnings. Dereferencing random pointers can't be a good idea, testing would've been great. The changes may not be correct, please review!
by weiden＠svn.reactos.com 22 Nov '05

22 Nov '05

Fixed a bunch of uninitialized variable warnings. Dereferencing random pointers can't be a good idea, testing would've been great. The changes may not be correct, please review! Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-22 10:24:14 UTC (rev 19463) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-22 11:20:01 UTC (rev 19464) @@ -79,8 +79,8 @@ static DWORD waveThread(LPVOID lpParameter) { - PWAVEALLOC pClient; - BOOL Terminate; + PWAVEALLOC pClient = (PWAVEALLOC)lpParameter; + BOOL Terminate = FALSE; SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL); SetEvent(pClient->AuxEvent2); @@ -305,7 +305,7 @@ static MMRESULT waveReadWrite(PWAVEALLOC pClient) { DWORD dwSize; - BOOL Result; + BOOL Result = FALSE; while (pClient->NextBuffer) @@ -549,7 +549,7 @@ BOOL Result; DWORD BytesReturned; LPWAVEFORMATEX pFormats; - PWAVEALLOC *pUserHandle; + PWAVEALLOC *pUserHandle = &pClient; HANDLE hDevice; pFormats = (LPWAVEFORMATEX)((LPWAVEOPENDESC)dwParam1)->lpFormat;

1 0

[hpoussin] 19463: Fix sublanguage IDs in .rc files:
by hpoussin＠svn.reactos.com 22 Nov '05

22 Nov '05

Fix sublanguage IDs in .rc files: - LANG_ENGLISH -> SUBLANG_ENGLISH_US - LANG_JAPANESE -> SUBLANG_DEFAULT - others -> SUBLANG_NEUTRAL I didn't change .rc files in files synched with Wine Modified: trunk/reactos/boot/freeldr/fdebug/En.rc Modified: trunk/reactos/boot/freeldr/fdebug/Ja.rc Modified: trunk/reactos/boot/freeldr/fdebug/Pl.rc Modified: trunk/reactos/lib/aclui/aclui_De.rc Modified: trunk/reactos/lib/aclui/aclui_En.rc Modified: trunk/reactos/lib/aclui/aclui_Ja.rc Modified: trunk/reactos/lib/aclui/aclui_Nl.rc Modified: trunk/reactos/lib/aclui/aclui_Pl.rc Modified: trunk/reactos/lib/aclui/aclui_Sv.rc Modified: trunk/reactos/lib/avifil32/avifile_Cs.rc Modified: trunk/reactos/lib/avifil32/avifile_En.rc Modified: trunk/reactos/lib/avifil32/avifile_It.rc Modified: trunk/reactos/lib/avifil32/avifile_Nl.rc Modified: trunk/reactos/lib/avifil32/avifile_Pl.rc Modified: trunk/reactos/lib/avifil32/avifile_Pt.rc Modified: trunk/reactos/lib/avifil32/avifile_Ru.rc Modified: trunk/reactos/lib/avifil32/avifile_Si.rc Modified: trunk/reactos/lib/cpl/access/En.rc Modified: trunk/reactos/lib/cpl/access/Nl.rc Modified: trunk/reactos/lib/cpl/appwiz/Cz.rc Modified: trunk/reactos/lib/cpl/appwiz/De.rc Modified: trunk/reactos/lib/cpl/appwiz/Dk.rc Modified: trunk/reactos/lib/cpl/appwiz/Nl.rc Modified: trunk/reactos/lib/cpl/appwiz/Ru.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Modified: trunk/reactos/lib/cpl/control/Cz.rc Modified: trunk/reactos/lib/cpl/control/De.rc Modified: trunk/reactos/lib/cpl/control/Dk.rc Modified: trunk/reactos/lib/cpl/control/Nl.rc Modified: trunk/reactos/lib/cpl/control/Pl.rc Modified: trunk/reactos/lib/cpl/control/Ru.rc Modified: trunk/reactos/lib/cpl/control/Sv.rc Modified: trunk/reactos/lib/cpl/cplsample/cplsample.rc Modified: trunk/reactos/lib/cpl/desk/cz.rc Modified: trunk/reactos/lib/cpl/desk/nl.rc Modified: trunk/reactos/lib/cpl/desk/pl.rc Modified: trunk/reactos/lib/cpl/desk/sv.rc Modified: trunk/reactos/lib/cpl/intl/cz.rc Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc Modified: trunk/reactos/lib/cpl/intl/nl.rc Modified: trunk/reactos/lib/cpl/intl/sv.rc Modified: trunk/reactos/lib/cpl/liccpa/En.rc Modified: trunk/reactos/lib/cpl/main/De.rc Modified: trunk/reactos/lib/cpl/main/En.rc Modified: trunk/reactos/lib/cpl/main/Nl.rc Modified: trunk/reactos/lib/cpl/ncpa/cz.rc Modified: trunk/reactos/lib/cpl/ncpa/de.rc Modified: trunk/reactos/lib/cpl/ncpa/dk.rc Modified: trunk/reactos/lib/cpl/ncpa/en.rc Modified: trunk/reactos/lib/cpl/ncpa/nl.rc Modified: trunk/reactos/lib/cpl/ncpa/sv.rc Modified: trunk/reactos/lib/cpl/sysdm/cz.rc Modified: trunk/reactos/lib/cpl/sysdm/dk.rc Modified: trunk/reactos/lib/cpl/sysdm/en.rc Modified: trunk/reactos/lib/cpl/sysdm/fr.rc Modified: trunk/reactos/lib/cpl/sysdm/nl.rc Modified: trunk/reactos/lib/cpl/sysdm/sv.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc Modified: trunk/reactos/lib/cpl/timedate/Cz.rc Modified: trunk/reactos/lib/cpl/timedate/Dk.rc Modified: trunk/reactos/lib/cpl/timedate/En.rc Modified: trunk/reactos/lib/cpl/timedate/Fr.rc Modified: trunk/reactos/lib/cpl/timedate/Nl.rc Modified: trunk/reactos/lib/cpl/timedate/Pl.rc Modified: trunk/reactos/lib/cpl/timedate/Ru.rc Modified: trunk/reactos/lib/cpl/timedate/Sv.rc Modified: trunk/reactos/lib/devenum/devenum.rc Modified: trunk/reactos/lib/kernel32/locale_rc.rc Modified: trunk/reactos/lib/msacm/msacm_En.rc Modified: trunk/reactos/lib/msacm/msacm_Es.rc Modified: trunk/reactos/lib/msacm/msacm_It.rc Modified: trunk/reactos/lib/msacm/msacm_Ja.rc Modified: trunk/reactos/lib/msacm/msacm_Nl.rc Modified: trunk/reactos/lib/msacm/msacm_Pt.rc Modified: trunk/reactos/lib/msacm/msacm_Ru.rc Modified: trunk/reactos/lib/msacm/msacm_Sv.rc Modified: trunk/reactos/lib/msgina/msgina.rc Modified: trunk/reactos/lib/newdev/De.rc Modified: trunk/reactos/lib/setupapi/Bg.rc Modified: trunk/reactos/lib/setupapi/Cs.rc Modified: trunk/reactos/lib/setupapi/Da.rc Modified: trunk/reactos/lib/setupapi/De.rc Modified: trunk/reactos/lib/setupapi/Fi.rc Modified: trunk/reactos/lib/setupapi/It.rc Modified: trunk/reactos/lib/setupapi/Ja.rc Modified: trunk/reactos/lib/setupapi/Ko.rc Modified: trunk/reactos/lib/setupapi/Nl.rc Modified: trunk/reactos/lib/setupapi/Pl.rc Modified: trunk/reactos/lib/setupapi/Ru.rc Modified: trunk/reactos/lib/setupapi/Sv.rc Modified: trunk/reactos/lib/shellext/slayer/De.rc Modified: trunk/reactos/lib/shellext/slayer/En.rc Modified: trunk/reactos/lib/shellext/slayer/Nl.rc Modified: trunk/reactos/lib/shellext/slayer/Pl.rc Modified: trunk/reactos/lib/shellext/slayer/Ru.rc Modified: trunk/reactos/lib/shellext/slayer/Sv.rc Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc Modified: trunk/reactos/lib/syssetup/syssetup_De.rc Modified: trunk/reactos/lib/syssetup/syssetup_En.rc [truncated at 100 lines; 133 more skipped] _____ Modified: trunk/reactos/boot/freeldr/fdebug/En.rc --- trunk/reactos/boot/freeldr/fdebug/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/boot/freeldr/fdebug/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -3,7 +3,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 _____ Modified: trunk/reactos/boot/freeldr/fdebug/Ja.rc --- trunk/reactos/boot/freeldr/fdebug/Ja.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/boot/freeldr/fdebug/Ja.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -3,7 +3,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) #ifdef _WIN32 -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT #pragma code_page(932) #endif //_WIN32 _____ Modified: trunk/reactos/boot/freeldr/fdebug/Pl.rc --- trunk/reactos/boot/freeldr/fdebug/Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/boot/freeldr/fdebug/Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -3,7 +3,7 @@ // 2005 Emil Kaczmarek #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL #pragma code_page(1250) #endif //_WIN32 _____ Modified: trunk/reactos/lib/aclui/aclui_De.rc --- trunk/reactos/lib/aclui/aclui_De.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_De.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_En.rc --- trunk/reactos/lib/aclui/aclui_En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_Ja.rc --- trunk/reactos/lib/aclui/aclui_Ja.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_Ja.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_Nl.rc --- trunk/reactos/lib/aclui/aclui_Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_Pl.rc --- trunk/reactos/lib/aclui/aclui_Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/avifil32/avifile_Cs.rc --- trunk/reactos/lib/avifil32/avifile_Cs.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Cs.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_En.rc --- trunk/reactos/lib/avifil32/avifile_En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_It.rc --- trunk/reactos/lib/avifil32/avifile_It.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_It.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Nl.rc --- trunk/reactos/lib/avifil32/avifile_Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Pl.rc --- trunk/reactos/lib/avifil32/avifile_Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Pt.rc --- trunk/reactos/lib/avifil32/avifile_Pt.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Pt.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Ru.rc --- trunk/reactos/lib/avifil32/avifile_Ru.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Ru.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Si.rc --- trunk/reactos/lib/avifil32/avifile_Si.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Si.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +LANGUAGE LANG_SLOVENIAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/cpl/access/En.rc --- trunk/reactos/lib/cpl/access/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/access/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDI_CPLACCESS ICON "resources/applet.ico" _____ Modified: trunk/reactos/lib/cpl/access/Nl.rc --- trunk/reactos/lib/cpl/access/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/access/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDI_CPLACCESS ICON "resources/applet.ico" _____ Modified: trunk/reactos/lib/cpl/appwiz/Cz.rc --- trunk/reactos/lib/cpl/appwiz/Cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/Cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/De.rc --- trunk/reactos/lib/cpl/appwiz/De.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/De.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/Dk.rc --- trunk/reactos/lib/cpl/appwiz/Dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/Dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/Nl.rc --- trunk/reactos/lib/cpl/appwiz/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/Ru.rc --- trunk/reactos/lib/cpl/appwiz/Ru.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/Ru.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -11,7 +11,7 @@ #include <reactos/version.rc> #endif -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDI_CPLSYSTEM ICON "resources/applet.ico" _____ Modified: trunk/reactos/lib/cpl/control/Cz.rc --- trunk/reactos/lib/cpl/control/Cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Czech language resource file (potapnik, 2005-04-30) -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/De.rc --- trunk/reactos/lib/cpl/control/De.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/De.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // German language resource file (frik85, 2005-03-08) -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Dk.rc --- trunk/reactos/lib/cpl/control/Dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Danish language resource file (Thomas Larsen, 2005-03-11) -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Nl.rc --- trunk/reactos/lib/cpl/control/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Dutch language resource file (frik85, 2005-03-08) -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/lib/cpl/control/Pl.rc --- trunk/reactos/lib/cpl/control/Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Polish language resource file (Sebastian Gasiorek, 2005-07-06) -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Ru.rc --- trunk/reactos/lib/cpl/control/Ru.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Ru.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Russian language resource file (unC0Rr, 2005-03-11) -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Sv.rc --- trunk/reactos/lib/cpl/control/Sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Swedish resources by Andreas Bjerkeholt 2005-04-28 -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/cplsample/cplsample.rc --- trunk/reactos/lib/cpl/cplsample/cplsample.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/cplsample/cplsample.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -9,7 +9,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "cplsample.cpl\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDC_CPLICON_1 ICON "resources/cpl_icon1.ico" _____ Modified: trunk/reactos/lib/cpl/desk/cz.rc --- trunk/reactos/lib/cpl/desk/cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/desk/cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/desk/nl.rc --- trunk/reactos/lib/cpl/desk/nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/desk/nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/desk/pl.rc --- trunk/reactos/lib/cpl/desk/pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/desk/pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,5 +1,5 @@ // Polish language resource file (Sebastian Gasiorek, 2005-07-07) -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/desk/sv.rc --- trunk/reactos/lib/cpl/desk/sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/desk/sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,7 +1,7 @@ /* Swedish resources by David Nordenberg Updated 2005-07-09 by Andreas Bjerkeholt */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/cz.rc --- trunk/reactos/lib/cpl/intl/cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/nl.rc --- trunk/reactos/lib/cpl/intl/nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* $Id$ */ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/sv.rc --- trunk/reactos/lib/cpl/intl/sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,7 +1,7 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ /* Swedish resources by Andreas Bjerkeholt (harteex(a)gmail.com) */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/liccpa/En.rc --- trunk/reactos/lib/cpl/liccpa/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/liccpa/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU _____ Modified: trunk/reactos/lib/cpl/main/De.rc --- trunk/reactos/lib/cpl/main/De.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/main/De.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/main/En.rc --- trunk/reactos/lib/cpl/main/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/main/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/main/Nl.rc --- trunk/reactos/lib/cpl/main/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/main/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/cz.rc --- trunk/reactos/lib/cpl/ncpa/cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/de.rc --- trunk/reactos/lib/cpl/ncpa/de.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/de.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/dk.rc --- trunk/reactos/lib/cpl/ncpa/dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/en.rc --- trunk/reactos/lib/cpl/ncpa/en.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/en.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/nl.rc --- trunk/reactos/lib/cpl/ncpa/nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/sv.rc --- trunk/reactos/lib/cpl/ncpa/sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* Swedish resources by Kris "Wacko" Engeman */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/sysdm/cz.rc --- trunk/reactos/lib/cpl/sysdm/cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/dk.rc --- trunk/reactos/lib/cpl/sysdm/dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/sysdm/en.rc --- trunk/reactos/lib/cpl/sysdm/en.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/en.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/fr.rc --- trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_DEVMGR ICON "resources/devmgr.ico" _____ Modified: trunk/reactos/lib/cpl/sysdm/nl.rc --- trunk/reactos/lib/cpl/sysdm/nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/sv.rc --- trunk/reactos/lib/cpl/sysdm/sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ //Swedish resources by Kris Engeman 2005-04-28 -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -5,7 +5,7 @@ #include <commctrl.h> #include "resource.h" -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Applet\0" _____ Modified: trunk/reactos/lib/cpl/timedate/Cz.rc --- trunk/reactos/lib/cpl/timedate/Cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Dk.rc --- trunk/reactos/lib/cpl/timedate/Dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 149 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/En.rc --- trunk/reactos/lib/cpl/timedate/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Fr.rc --- trunk/reactos/lib/cpl/timedate/Fr.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Fr.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Nl.rc --- trunk/reactos/lib/cpl/timedate/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Pl.rc --- trunk/reactos/lib/cpl/timedate/Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Polish translation by Sebastian Gasiorek -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Ru.rc --- trunk/reactos/lib/cpl/timedate/Ru.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Ru.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Sv.rc --- trunk/reactos/lib/cpl/timedate/Sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -3,7 +3,7 @@ * */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/devenum/devenum.rc --- trunk/reactos/lib/devenum/devenum.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/devenum/devenum.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -34,7 +34,7 @@ #include "wine/wine_common_ver.rc" STRINGTABLE DISCARDABLE -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US { 7 "Default DirectSound" 8 "DirectSound: %s" @@ -43,7 +43,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { 7 "Standard DirectSound" 8 "DirectSound: %s" @@ -52,7 +52,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL { 7 "DirectSound di Default" 8 "DirectSound: %s" @@ -61,7 +61,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL { 7 "DirectSound padrÒo" 8 "DirectSound: %s" @@ -70,7 +70,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { 7 "DirectSound por defecto" 8 "DirectSound: %s" _____ Modified: trunk/reactos/lib/kernel32/locale_rc.rc --- trunk/reactos/lib/kernel32/locale_rc.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/kernel32/locale_rc.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -46,9 +46,9 @@ #include "nls/arq.nls" /* 0x4001 LANG_ARABIC, SUBLANG_ARABIC_QATAR */ #endif -#include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_DEFAULT */ +#include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_NEUTRAL */ -#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_DEFAULT */ +#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_NEUTRAL */ #include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ #include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */ @@ -56,9 +56,9 @@ #include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */ //#include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ -#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */ +#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_NEUTRAL */ -#include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_DEFAULT */ +#include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_NEUTRAL */ #include "nls/deu.nls" /* 0x0407 LANG_GERMAN, SUBLANG_GERMAN */ #include "nls/des.nls" /* 0x0807 LANG_GERMAN, SUBLANG_GERMAN_SWISS */ @@ -66,7 +66,7 @@ #include "nls/del.nls" /* 0x1007 LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG */ #include "nls/dec.nls" /* 0x1407 LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN */ -#include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_DEFAULT */ +#include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_NEUTRAL */ #include "nls/enu.nls" /* 0x0409 LANG_ENGLISH, SUBLANG_ENGLISH_US */ #include "nls/eng.nls" /* 0x0809 LANG_ENGLISH, SUBLANG_ENGLISH_UK */ @@ -103,7 +103,7 @@ #include "nls/esi.nls" /* 0x4c0a LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA */ #include "nls/esu.nls" /* 0x500a LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO */ -#include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_DEFAULT */ +#include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_NEUTRAL */ #include "nls/fra.nls" /* 0x040c LANG_FRENCH, SUBLANG_FRENCH */ #include "nls/frb.nls" /* 0x080c LANG_FRENCH, SUBLANG_FRENCH_BELGIAN */ @@ -112,16 +112,16 @@ #include "nls/frl.nls" /* 0x140c LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG */ #include "nls/frm.nls" /* 0x180c LANG_FRENCH, SUBLANG_FRENCH_MONACO */ -#include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_DEFAULT */ +#include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_NEUTRAL */ -#include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_DEFAULT */ +#include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_NEUTRAL */ -#include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_DEFAULT */ +#include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_NEUTRAL */ #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ +//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_NEUTRAL */ //#include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ @@ -131,104 +131,104 @@ #include "nls/nor.nls" /* 0x0414 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL */ #include "nls/non.nls" /* 0x0814 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK */ -#include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_DEFAULT */ +#include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_NEUTRAL */ #include "nls/ptb.nls" /* 0x0416 LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN */ #include "nls/ptg.nls" /* 0x0816 LANG_PORTUGUESE, SUBLANG_PORTUGUESE */ -#include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_DEFAULT */ +#include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_NEUTRAL */ -#include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_DEFAULT */ +#include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_NEUTRAL */ -#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ +#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_NEUTRAL */ #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ -#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ +#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_NEUTRAL */ -#include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_DEFAULT */ +#include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_NEUTRAL */ #include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_SWEDISH */ #include "nls/svf.nls" /* 0x081d LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND */ -#include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_DEFAULT */ +#include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_NEUTRAL */ -#include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_DEFAULT */ +#include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_NEUTRAL */ //#include "nls/urd.nls" /* 0x0420 LANG_URDU, SUBLANG_URDU_PAKISTAN */ -#include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_DEFAULT */ +#include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_NEUTRAL */ -#include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_DEFAULT */ +#include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_NEUTRAL */ -#include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_DEFAULT */ +#include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_NEUTRAL */ -#include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_DEFAULT */ +#include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_NEUTRAL */ -#include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_DEFAULT */ +#include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_NEUTRAL */ -#include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_DEFAULT */ +#include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_NEUTRAL */ //#include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ -//#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_DEFAULT */ +//#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_NEUTRAL */ -//#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_DEFAULT */ +//#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_NEUTRAL */ -//#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_DEFAULT */ +//#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_NEUTRAL */ //#include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ //#include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ -#include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_DEFAULT */ +#include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_NEUTRAL */ -#include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_DEFAULT */ +#include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_NEUTRAL */ -#include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_DEFAULT */ +#include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_NEUTRAL */ -//#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_DEFAULT */ +//#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_NEUTRAL */ -#include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_DEFAULT */ +#include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_NEUTRAL */ -//#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */ +//#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_NEUTRAL */ #include "nls/msl.nls" /* 0x043e LANG_MALAY, SUBLANG_MALAY_MALAYSIA */ #include "nls/msb.nls" /* 0x083e LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */ -//#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_DEFAULT */ +//#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_NEUTRAL */ -//#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_DEFAULT */ +//#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_NEUTRAL */ -#include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_DEFAULT */ +#include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_NEUTRAL */ //#include "nls/uzl.nls" /* 0x0443 LANG_UZBEK, SUBLANG_UZBEK_LATIN */ #include "nls/uzb.nls" /* 0x0843 LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC */ -//#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ +//#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_NEUTRAL */ -//#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ +//#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_NEUTRAL */ -//#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ +//#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_NEUTRAL */ -//#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_DEFAULT */ +//#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_NEUTRAL */ -//#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_DEFAULT */ +//#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_NEUTRAL */ -//#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_DEFAULT */ +//#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_NEUTRAL */ -//#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_DEFAULT */ +//#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_NEUTRAL */ -//#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_DEFAULT */ +//#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_NEUTRAL */ -//#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_DEFAULT */ +//#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_NEUTRAL */ -#include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_DEFAULT */ [truncated at 1000 lines; 2099 more skipped]

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
88
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 November 2005