Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[hpoussin] 30219: No need to create dependency files for zlib host library

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Nov 6 16:08:48 2007 New Revision: 30219 URL: http://svn.reactos.org/svn/reactos?rev=30219&view=rev Log: No need to create dependency files for zlib host library Modified: trunk/reactos/lib/3rdparty/zlib/zlib.mak Modified: trunk/reactos/lib/3rdparty/zlib/zlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zlib.mak… ============================================================================== --- trunk/reactos/lib/3rdparty/zlib/zlib.mak (original) +++ trunk/reactos/lib/3rdparty/zlib/zlib.mak Tue Nov 6 16:08:48 2007 @@ -32,8 +32,8 @@ ZLIB_HOST_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(ZLIB_HOST_SOURCES:.c=.host.o)) -ZLIB_HOST_CFLAGS = -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - -Wstrict-prototypes -Wmissing-prototypes $(TOOLS_CPPFLAGS) +ZLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + -Wstrict-prototypes -Wmissing-prototypes $(TOOLS_CPPFLAGS) $(ZLIB_HOST_TARGET): $(ZLIB_HOST_OBJECTS) | $(ZLIB_OUT) $(ECHO_AR)

16 years, 10 months

[hpoussin] 30218: Don't hardcode bootsector output name in livecd target Revert r30199

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Nov 6 15:36:16 2007 New Revision: 30218 URL: http://svn.reactos.org/svn/reactos?rev=30218&view=rev Log: Don't hardcode bootsector output name in livecd target Revert r30199 Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Nov 6 15:36:16 2007 @@ -497,7 +497,10 @@ DirectoryLocation destination_directory; string newExtension; string extension = GetExtension ( *sourceFile ); - if ( extension == ".rc" || extension == ".RC" ) + + if ( module.type == BootSector ) + return new FileLocation ( *module.output ); + else if ( extension == ".rc" || extension == ".RC" ) newExtension = "_" + module.name + ".coff"; else if ( extension == ".spec" || extension == ".SPEC" ) newExtension = ".stubs.o"; @@ -3655,21 +3658,17 @@ string livecdDirectory = module.name; FileLocation livecd ( OutputDirectory, livecdDirectory, "" ); - string bootloader; string IsoName; + const Module* bootModule; + bootModule = module.project.LocateModule ( module.name == "livecdregtest" + ? "isobtrt" + : "isoboot" ); + const FileLocation *isoboot = bootModule->output; if (module.name == "livecdregtest") - { - bootloader = "isobtrt_isobtrt.o"; IsoName = "ReactOS-LiveCD-RegTest.iso"; - } else - { - bootloader = "isoboot_isoboot.o"; IsoName = "ReactOS-LiveCD.iso"; - } - - FileLocation isoboot ( OutputDirectory, "boot" + sSep + "freeldr" + sSep + "bootsect", bootloader ); string reactosDirectory = "reactos"; string livecdReactosNoFixup = livecdDirectory + sSep + reactosDirectory; @@ -3683,7 +3682,7 @@ fprintf ( fMakefile, "%s: all %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n", module.name.c_str (), - backend->GetFullName ( isoboot) .c_str (), + backend->GetFullName ( *isoboot) .c_str (), backend->GetFullPath ( livecdReactos ).c_str () ); OutputModuleCopyCommands ( livecdDirectory, reactosDirectory ); @@ -3695,7 +3694,7 @@ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS %s\n", - backend->GetFullName( isoboot ).c_str (), + backend->GetFullName( *isoboot ).c_str (), backend->GetFullPath ( livecd ).c_str (), IsoName.c_str() ); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Nov 6 15:36:16 2007 @@ -991,7 +991,7 @@ case BootLoader: return ".sys"; case BootSector: - return "_" + this->name + ".o"; + return ".o"; case Iso: case LiveIso: case IsoRegTest:

16 years, 10 months

[hpoussin] 30217: Don't hardcode multiple times the mechanisms to get object file from source file Revert r30188 and r30189

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Nov 6 15:18:36 2007 New Revision: 30217 URL: http://svn.reactos.org/svn/reactos?rev=30217&view=rev Log: Don't hardcode multiple times the mechanisms to get object file from source file Revert r30188 and r30189 Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Nov 6 15:18:36 2007 @@ -270,33 +270,24 @@ string extension = GetExtension ( *file ); if ( extension == ".spec" || extension == ".SPEC" ) { - string basename = GetBasename ( filename ); - return new FileLocation ( - IntermediateDirectory, - file->relative_path, - basename + ".stubs.c" ); - } - else if ( extension == ".idl" || extension == ".IDL" ) - { - string basename = GetBasename ( filename ); - if ( module.type == RpcServer ) - { - return new FileLocation ( - IntermediateDirectory, - file->relative_path, - basename + "_s.c" ); - } - else if ( module.type == RpcClient ) - { - return new FileLocation ( - IntermediateDirectory, - file->relative_path, - basename + "_c.c" ); - } - else - { - return new FileLocation ( *file ); - } + const FileLocation *objectFile = GetObjectFilename ( file, module, NULL ); + FileLocation *sourceFile = new FileLocation ( + objectFile->directory, + objectFile->relative_path, + ReplaceExtension ( objectFile->name, ".c" ) ); + delete objectFile; + return sourceFile; + } + else if ( ( extension == ".idl" || extension == ".IDL" ) && + ( module.type == RpcServer || module.type == RpcClient ) ) + { + const FileLocation *objectFile = GetObjectFilename ( file, module, NULL ); + FileLocation *sourceFile = new FileLocation ( + objectFile->directory, + objectFile->relative_path, + ReplaceExtension ( objectFile->name, ".c" ) ); + delete objectFile; + return sourceFile; } else return new FileLocation ( *file ); @@ -509,13 +500,13 @@ if ( extension == ".rc" || extension == ".RC" ) newExtension = "_" + module.name + ".coff"; else if ( extension == ".spec" || extension == ".SPEC" ) - newExtension = ".stubs_" + module.name + ".o"; + newExtension = ".stubs.o"; else if ( extension == ".idl" || extension == ".IDL" ) { if ( module.type == RpcServer ) - newExtension = "_s_" + module.name + ".o"; + newExtension = "_s.o"; else if ( module.type == RpcClient ) - newExtension = "_c_" + module.name + ".o"; + newExtension = "_c.o"; else newExtension = ".h"; } @@ -1119,10 +1110,9 @@ const FileLocation* MingwModuleHandler::GetPrecompiledHeaderFilename () const { - const string& basePchFilename = module.pch->file.name + "_" + module.name + ".gch"; return new FileLocation ( IntermediateDirectory, module.pch->file.relative_path, - basePchFilename ); + ReplaceExtension ( module.pch->file.name, "_" + module.name + ".gch" ) ); } void @@ -1132,7 +1122,8 @@ const string& cc, const string& cflagsMacro ) { - string dependencies = backend->GetFullName ( *sourceFile ); + const FileLocation *generatedSourceFileName = GetActualSourceFilename ( sourceFile ); + string dependencies = backend->GetFullName ( *generatedSourceFileName ); if ( extraDependencies != "" ) dependencies += " " + extraDependencies; if ( module.pch && use_pch ) @@ -1261,9 +1252,7 @@ basename + ".spec.def" ); CLEAN_FILE ( def_file ); - FileLocation stub_file ( IntermediateDirectory, - sourceFile->relative_path, - basename + ".stubs.c" ); + FileLocation stub_file ( *GetActualSourceFilename ( sourceFile ) ); CLEAN_FILE ( stub_file ); fprintf ( fMakefile, @@ -1472,7 +1461,7 @@ widlflagsMacro ); else if ( module.type == EmbeddedTypeLib ) GenerateWidlCommandsEmbeddedTypeLib ( compilationUnit, - widlflagsMacro ); + widlflagsMacro ); else // applies also for other module.types which include idl files GenerateWidlCommandsIdlHeader ( compilationUnit, widlflagsMacro ); @@ -1531,7 +1520,7 @@ else if ( extension == ".spec" || extension == ".SPEC" ) { GenerateWinebuildCommands ( sourceFile ); - GenerateGccCommand ( GetActualSourceFilename ( sourceFile ), + GenerateGccCommand ( sourceFile, extraDependencies, cc, cflagsMacro ); @@ -1543,7 +1532,7 @@ widlflagsMacro ); if ( (module.type == RpcServer) || (module.type == RpcClient) ) { - GenerateGccCommand ( GetActualSourceFilename ( sourceFile ), + GenerateGccCommand ( sourceFile, GetExtraDependencies ( sourceFile ), cc, cflagsMacro ); @@ -3481,12 +3470,12 @@ vSourceFiles.push_back ( srcunattend ); // bootsector - FileLocation isoboot ( OutputDirectory, - "boot" + sSep + "freeldr" + sSep + "bootsect", - module.type == IsoRegTest - ? "isobtrt_isobtrt.o" - : "isoboot_isoboot.o" ); - vSourceFiles.push_back ( isoboot ); + const Module* bootModule; + bootModule = module.project.LocateModule ( module.type == IsoRegTest + ? "isobtrt" + : "isoboot" ); + const FileLocation *isoboot = bootModule->output; + vSourceFiles.push_back ( *isoboot ); // prepare reactos.dff and reactos.inf FileLocation reactosDff ( SourceDirectory, @@ -3518,7 +3507,7 @@ fprintf ( fMakefile, "%s: all %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET) %s\n", module.name.c_str (), - backend->GetFullName ( isoboot ).c_str (), + backend->GetFullName ( *isoboot ).c_str (), sourceFiles.c_str (), cdFiles.c_str (), cdDirectories.c_str () ); @@ -3544,7 +3533,7 @@ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n", - backend->GetFullName ( isoboot ).c_str (), + backend->GetFullName ( *isoboot ).c_str (), backend->GetFullPath ( bootcd ).c_str (), IsoName.c_str() ); fprintf ( fMakefile,

16 years, 10 months

[pschweitzer] 30216: Partially revert rev 30214 for two reasons : - French texts need a space before a ! (cf : previous commits) - Colors were good according to those docs : http://support.microsoft.com/kb/86371/en-us and http://www.computerhope.com/color.htm

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Nov 6 14:13:01 2007 New Revision: 30216 URL: http://svn.reactos.org/svn/reactos?rev=30216&view=rev Log: Partially revert rev 30214 for two reasons : - French texts need a space before a ! (cf : previous commits) - Colors were good according to those docs : http://support.microsoft.com/kb/86371/en-us and http://www.computerhope.com/color.htm Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Tue Nov 6 14:13:01 2007 @@ -34,20 +34,20 @@ BEGIN CLR0, "Black" CLR1, "Blue" - CLR2, "Dark Green" - CLR3, "Turquoise" - CLR4, "Dark Red" + CLR2, "Green" + CLR3, "Aqua" + CLR4, "Red" CLR5, "Purple" - CLR6, "Ochar Yellow" - CLR7, "Light Gray" - CLR8, "Dark Gray" + CLR6, "Yellow" + CLR7, "White" + CLR8, "Gray" CLR9, "Light Blue" - CLR10, "Green" - CLR11, "Cyan Blue" - CLR12, "Red" - CLR13, "Magenta" - CLR14, "Yellow" - CLR15, "White" + CLR10, "Light Green" + CLR11, "Light Aqua" + CLR12, "Light Red" + CLR13, "Light Purple" + CLR14, "Light Yellow" + CLR15, "Bright White" MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." MSG_FILEFAILED, "Failed to create rosbe-options.cmd!" MSG_DIREFAILED, "Failed to create log directory!" Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Tue Nov 6 14:13:01 2007 @@ -27,7 +27,7 @@ PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP - CONTROL "Bienvenue!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 + CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Tue Nov 6 14:13:01 2007 @@ -36,20 +36,20 @@ BEGIN CLR0, "Black" CLR1, "Blue" - CLR2, "Dark Green" - CLR3, "Turquoise" - CLR4, "Dark Red" + CLR2, "Green" + CLR3, "Aqua" + CLR4, "Red" CLR5, "Purple" - CLR6, "Ochar Yellow" - CLR7, "Light Gray" - CLR8, "Dark Gray" + CLR6, "Yellow" + CLR7, "White" + CLR8, "Gray" CLR9, "Light Blue" - CLR10, "Green" - CLR11, "Cyan Blue" - CLR12, "Red" - CLR13, "Magenta" - CLR14, "Yellow" - CLR15, "White" + CLR10, "Light Green" + CLR11, "Light Aqua" + CLR12, "Light Red" + CLR13, "Light Purple" + CLR14, "Light Yellow" + CLR15, "Bright White" MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íåíàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè." MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd" MSG_DIREFAILED, "Íåâîçìîæíî ñîçäàòü ïàïêó äëÿ ëîãîâ!"

16 years, 10 months

[gedmurphy] 30215: add primitive geo selector code

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Nov 6 12:38:33 2007 New Revision: 30215 URL: http://svn.reactos.org/svn/reactos?rev=30215&view=rev Log: add primitive geo selector code Modified: trunk/reactos/base/applications/mstsc/connectdialog.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Tue Nov 6 12:38:33 2007 @@ -151,7 +151,7 @@ IDC_SERVERCOMBO, CB_ADDSTRING, 0, - lpAddress); + (LPARAM)lpAddress); } HeapFree(GetProcessHeap(), @@ -170,11 +170,13 @@ Name, sizeof(Name) / sizeof(TCHAR))) { - SendDlgItemMessage(pInfo->hGeneralPage, IDC_SERVERCOMBO, CB_ADDSTRING, 0, Name); - } -} - - + SendDlgItemMessage(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + CB_ADDSTRING, + 0, + (LPARAM)Name); + } +} static VOID @@ -266,7 +268,6 @@ PSETTINGS_ENTRY Current; DWORD bpp, xres, yres, checkbpp; DWORD curDispFreq; - /* Get current settings */ *CurrentSettings = NULL; @@ -463,10 +464,39 @@ } static VOID -UpdateDisplay(IN HWND hwndDlg, PINFO pGlobalData, IN BOOL bUpdateThumb) -{ - - +OnResolutionChanged(PINFO pInfo, DWORD position) +{ + TCHAR Buffer[64]; + + if (position == 4) + { + LoadString(hInst, + IDS_FULLSCREEN, + Buffer, + sizeof(Buffer) / sizeof(TCHAR)); + } + else + { + TCHAR Pixel[64]; + + if (LoadString(hInst, + IDS_PIXEL, + Pixel, + sizeof(Pixel) / sizeof(TCHAR))) + { + _stprintf(Buffer, + Pixel, + pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth, + pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight, + Pixel); + } + } + + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_SETTINGS_RESOLUTION_TEXT, + WM_SETTEXT, + 0, + (LPARAM)Buffer); } @@ -553,21 +583,37 @@ TRUE, MAKELONG(0, pInfo->DisplayDeviceList->ResolutionsCount)); //extra 1 for full screen - LoadString(hInst, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); - _stprintf(Buffer, Pixel, pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); - SendDlgItemMessage(pInfo->hDisplayPage, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); - + if (LoadString(hInst, + IDS_PIXEL, + Pixel, + sizeof(Pixel) / sizeof(TCHAR))) + { + _stprintf(Buffer, + Pixel, + pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, + pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, + Pixel); + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_SETTINGS_RESOLUTION_TEXT, + WM_SETTEXT, + 0, + (LPARAM)Buffer); + } + + /* FIXME: read from file */ for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++) { if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsWidth && pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsHeight) { - SendDlgItemMessage(pInfo->hDisplayPage, IDC_GEOSLIDER, TBM_SETPOS, TRUE, index); + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_SETPOS, + TRUE, + index); break; } } - - //UpdateDisplay(pInfo->hDisplayPage, pInfo, TRUE); } @@ -703,14 +749,12 @@ case TB_ENDTRACK: { DWORD newPosition = (DWORD)SendDlgItemMessage(hDlg, IDC_GEOSLIDER, TBM_GETPOS, 0, 0); - //OnResolutionChanged(hwndDlg, pGlobalData, newPosition, TRUE); - UpdateDisplay(hDlg, pInfo, TRUE); + OnResolutionChanged(pInfo, newPosition); break; } case TB_THUMBTRACK: - //OnResolutionChanged(hDlg, pInfo, HIWORD(wParam), FALSE); - UpdateDisplay(hDlg, pInfo, TRUE); + OnResolutionChanged(pInfo, HIWORD(wParam)); break; } break;

16 years, 10 months

[dreimer] 30214: Fix some things in the RC Files, like the Color Names and some typos. Translate German stuff.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Nov 6 11:02:37 2007 New Revision: 30214 URL: http://svn.reactos.org/svn/reactos?rev=30214&view=rev Log: Fix some things in the RC Files, like the Color Names and some typos. Translate German stuff. Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Tue Nov 6 11:02:37 2007 @@ -27,33 +27,33 @@ PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP - CONTROL "Welcome !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 + CONTROL "Willkommen!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE BEGIN - CLR0, "Black" - CLR1, "Blue" - CLR2, "Green" - CLR3, "Aqua" - CLR4, "Red" - CLR5, "Purple" - CLR6, "Yellow" - CLR7, "White" - CLR8, "Gray" - CLR9, "Light Blue" - CLR10, "Light Green" - CLR11, "Light Aqua" - CLR12, "Light Red" - CLR13, "Light Purple" - CLR14, "Light Yellow" - CLR15, "Bright White" + CLR0, "Schwarz" + CLR1, "Blau" + CLR2, "Dunkelgrün" + CLR3, "Türkis" + CLR4, "Dunkelrot" + CLR5, "Lila" + CLR6, "Ockergelb" + CLR7, "Grau" + CLR8, "Dunkelgrau" + CLR9, "Hellblau" + CLR10, "Grün" + CLR11, "Cyanblau" + CLR12, "Rot" + CLR13, "Magenta" + CLR14, "Gelb" + CLR15, "Weiß" MSG_NOGCCFOUND, "Kein GCC Compiler gefunden ! Bitte überprüfen sie ihren Pfad." MSG_FILEFAILED, "rosbe-options.cmd konnte nicht erstellt werden!" MSG_DIREFAILED, "Log directory konnte nicht erstellt werden!" - MSG_SETLOADSUC, "Previous settings loaded successfully" - MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:" - MSG_FINDMGWDIR, "Please choose the directory where MingW is located:" - MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:" - MSG_FINDOUTDIR, "Please choose the directory where you want to save OBJ Files to:" + MSG_SETLOADSUC, "Vorherige Einstellungen erfolgreich geladen" + MSG_FINDLOGDIR, "Bitte wählen Sie einen Ordner, in dem die Logs gespeichert werden sollen:" + MSG_FINDMGWDIR, "Bitte wählen Sie den Ordner, in dem MinGW liegt:" + MSG_FINDOBJDIR, "Bitte wählen Sie den Ordner, in den Sie die OBJ Daten speichern wollen:" + MSG_FINDOUTDIR, "Bitte wählen Sie den Ordner, in den Sie die OUT Daten speichern wollen:" END Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Tue Nov 6 11:02:37 2007 @@ -27,27 +27,27 @@ PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Cancel", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP - CONTROL "Welcome !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 + CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE BEGIN CLR0, "Black" CLR1, "Blue" - CLR2, "Green" - CLR3, "Aqua" - CLR4, "Red" + CLR2, "Dark Green" + CLR3, "Turquoise" + CLR4, "Dark Red" CLR5, "Purple" - CLR6, "Yellow" - CLR7, "White" - CLR8, "Gray" + CLR6, "Ochar Yellow" + CLR7, "Light Gray" + CLR8, "Dark Gray" CLR9, "Light Blue" - CLR10, "Light Green" - CLR11, "Light Aqua" - CLR12, "Light Red" - CLR13, "Light Purple" - CLR14, "Light Yellow" - CLR15, "Bright White" + CLR10, "Green" + CLR11, "Cyan Blue" + CLR12, "Red" + CLR13, "Magenta" + CLR14, "Yellow" + CLR15, "White" MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." MSG_FILEFAILED, "Failed to create rosbe-options.cmd!" MSG_DIREFAILED, "Failed to create log directory!" @@ -55,5 +55,5 @@ MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:" MSG_FINDMGWDIR, "Please choose the directory where MingW is located:" MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:" - MSG_FINDOUTDIR, "Please choose the directory where you want to save OBJ Files to:" + MSG_FINDOUTDIR, "Please choose the directory where you want to save OUT Files to:" END Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Tue Nov 6 11:02:37 2007 @@ -27,7 +27,7 @@ PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP - CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 + CONTROL "Bienvenue!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Tue Nov 6 11:02:37 2007 @@ -29,27 +29,27 @@ PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP - CONTROL "Welcome !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 + CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE BEGIN CLR0, "Black" CLR1, "Blue" - CLR2, "Green" - CLR3, "Aqua" - CLR4, "Red" + CLR2, "Dark Green" + CLR3, "Turquoise" + CLR4, "Dark Red" CLR5, "Purple" - CLR6, "Yellow" - CLR7, "White" - CLR8, "Gray" + CLR6, "Ochar Yellow" + CLR7, "Light Gray" + CLR8, "Dark Gray" CLR9, "Light Blue" - CLR10, "Light Green" - CLR11, "Light Aqua" - CLR12, "Light Red" - CLR13, "Light Purple" - CLR14, "Light Yellow" - CLR15, "Bright White" + CLR10, "Green" + CLR11, "Cyan Blue" + CLR12, "Red" + CLR13, "Magenta" + CLR14, "Yellow" + CLR15, "White" MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íåíàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè." MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd" MSG_DIREFAILED, "Íåâîçìîæíî ñîçäàòü ïàïêó äëÿ ëîãîâ!" @@ -57,5 +57,5 @@ MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:" MSG_FINDMGWDIR, "Please choose the directory where MingW is located:" MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:" - MSG_FINDOUTDIR, "Please choose the directory where you want to save OBJ Files to:" + MSG_FINDOUTDIR, "Please choose the directory where you want to save OUT Files to:" END

16 years, 10 months

[jimtabor] 30213: Implement GetCharABCWidthsI in gdi.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 6 10:27:55 2007 New Revision: 30213 URL: http://svn.reactos.org/svn/reactos?rev=30213&view=rev Log: Implement GetCharABCWidthsI in gdi. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Tue Nov 6 10:27:55 2007 @@ -1545,23 +1545,6 @@ DWORD STDCALL GetBrushAttributes(HBRUSH hbr) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GetCharABCWidthsI(HDC hdc, - UINT giFirst, - UINT cgi, - LPWORD pgi, - LPABC lpabc -) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Tue Nov 6 10:27:55 2007 @@ -639,6 +639,21 @@ /* * @implemented */ +BOOL +STDCALL +GetCharABCWidthsI(HDC hdc, + UINT giFirst, + UINT cgi, + LPWORD pgi, + LPABC lpabc +) +{ + return NtGdiGetCharABCWidthsW( hdc, giFirst, (ULONG) cgi, (PWCHAR) pgi, 3, (PVOID)lpabc); +} + +/* + * @implemented + */ DWORD STDCALL GetGlyphIndicesA(

16 years, 10 months

[jimtabor] 30212: - Implement GetGlyphIndicesA/W with update changes ported from Wine. - Tested with Abiword 2.4.1. I think the text file did not load the first time, now it does load.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 6 10:12:45 2007 New Revision: 30212 URL: http://svn.reactos.org/svn/reactos?rev=30212&view=rev Log: - Implement GetGlyphIndicesA/W with update changes ported from Wine. - Tested with Abiword 2.4.1. I think the text file did not load the first time, now it does load. Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Tue Nov 6 10:12:45 2007 @@ -233,24 +233,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; -} - -/* - * @unimplemented - */ -DWORD -STDCALL -GetGlyphIndicesA( - HDC hdc, - LPCSTR lpstr, - int c, - LPWORD pgi, - DWORD fl -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; } /* Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Tue Nov 6 10:12:45 2007 @@ -298,24 +298,6 @@ } /* - * @unimplemented - */ -DWORD -STDCALL -GetGlyphIndicesW( - HDC hdc, - LPCWSTR lpstr, - int c, - LPWORD pgi, - DWORD fl -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* * @implemented */ UINT Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Tue Nov 6 10:12:45 2007 @@ -90,15 +90,18 @@ /*********************************************************************** * FONT_mbtowc * - * Returns a Unicode translation of str. If count is -1 then str is - * assumed to be '\0' terminated, otherwise it contains the number of - * bytes to convert. If plenW is non-NULL, on return it will point to - * the number of WCHARs that have been written. The caller should free - * the returned LPWSTR from the process heap itself. - */ -static LPWSTR FONT_mbtowc(LPCSTR str, INT count, INT *plenW) -{ - UINT cp = CP_ACP; + * Returns a Unicode translation of str using the charset of the + * currently selected font in hdc. If count is -1 then str is assumed + * to be '\0' terminated, otherwise it contains the number of bytes to + * convert. If plenW is non-NULL, on return it will point to the + * number of WCHARs that have been written. If pCP is non-NULL, on + * return it will point to the codepage used in the conversion. The + * caller should free the returned LPWSTR from the process heap + * itself. + */ +static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) +{ + UINT cp = CP_ACP; // GdiGetCodePage( hdc ); INT lenW; LPWSTR strW; @@ -108,6 +111,7 @@ MultiByteToWideChar(cp, 0, str, count, strW, lenW); DPRINT1("mapped %s -> %s \n", str, strW); if(plenW) *plenW = lenW; + if(pCP) *pCP = cp; return strW; } @@ -458,7 +462,7 @@ for(i = 0; i < count; i++) str[i] = (BYTE)(iFirstChar + i); - wstr = FONT_mbtowc(str, count, &wlen); + wstr = FONT_mbtowc(NULL, str, count, &wlen, NULL); for(i = 0; i < wlen; i++) { @@ -570,7 +574,7 @@ } /*if(lpResults->lpGlyphs) - GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0);*/ + NtGdiGetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0);*/ if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) ret = MAKELONG(size.cx, size.cy); @@ -632,6 +636,28 @@ return NtGdiGetCharABCWidthsFloat ( hdc, iFirstChar, iLastChar, lpABCF ); } +/* + * @implemented + */ +DWORD +STDCALL +GetGlyphIndicesA( + HDC hdc, + LPCSTR lpstr, + INT count, + LPWORD pgi, + DWORD flags + ) +{ + DWORD Ret; + WCHAR *lpstrW; + INT countW; + + lpstrW = FONT_mbtowc(hdc, lpstr, count, &countW, NULL); + Ret = NtGdiGetGlyphIndicesW(hdc, lpstrW, countW, pgi, flags); + HeapFree(GetProcessHeap(), 0, lpstrW); + return Ret; +} /* * @implemented @@ -664,7 +690,7 @@ len = 1; mbchs[0] = (uChar & 0xff); } - p = FONT_mbtowc(mbchs, len, NULL); + p = FONT_mbtowc(NULL, mbchs, len, NULL, NULL); c = p[0]; } else c = uChar; Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Nov 6 10:12:45 2007 @@ -2389,6 +2389,121 @@ { UNIMPLEMENTED; return 0; +} + + /* + * @implemented + */ +DWORD +STDCALL +NtGdiGetGlyphIndicesW( + IN HDC hdc, + IN OPTIONAL LPWSTR UnSafepwc, + IN INT cwc, + OUT OPTIONAL LPWORD UnSafepgi, + IN DWORD iMode) +{ + PDC dc; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + HFONT hFont = 0; + NTSTATUS Status = STATUS_SUCCESS; + OUTLINETEXTMETRICW *potm; + INT i; + FT_Face face; + WCHAR DefChar = 0, tmDefaultChar; + PWSTR Buffer = NULL; + ULONG Size; + + if ((!UnSafepwc) && (!UnSafepgi)) return cwc; + + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + hFont = dc->Dc_Attr.hlfntNew; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc(dc); + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + + FontGDI = ObjToGDI(TextObj->Font, FONT); + TEXTOBJ_UnlockText(TextObj); + + Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), TAG_GDITEXT); + if (!Buffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return GDI_ERROR; + } + + Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); + potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (!potm) + { + Status = ERROR_NOT_ENOUGH_MEMORY; + goto ErrorRet; + } + IntGetOutlineTextMetrics(FontGDI, Size, potm); + tmDefaultChar = potm->otmTextMetrics.tmDefaultChar; // May need this. + ExFreePool(potm); + + if (iMode & GGI_MARK_NONEXISTING_GLYPHS) DefChar = 0x001f; /* Indicate non existence */ + + _SEH_TRY + { + ProbeForRead(UnSafepwc, + sizeof(PWSTR), + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) goto ErrorRet; + + IntLockFreeType; + face = FontGDI->face; + + for (i = 0; i < cwc; i++) + { + Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); + if (Buffer[i] == 0) + { + if (!DefChar) DefChar = tmDefaultChar; + Buffer[i] = DefChar; + } + } + + IntUnLockFreeType; + + _SEH_TRY + { + ProbeForWrite(UnSafepgi, + sizeof(WORD), + 1); + RtlCopyMemory(UnSafepgi, + Buffer, + cwc*sizeof(WORD)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + +ErrorRet: + ExFreePool(Buffer); + if (NT_SUCCESS(Status)) return cwc; + SetLastWin32Error(Status); + return GDI_ERROR; } static Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Tue Nov 6 10:12:45 2007 @@ -2658,23 +2658,6 @@ return 0; } - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiGetGlyphIndicesW( - IN HDC hdc, - IN OPTIONAL LPWSTR pwc, - IN INT cwc, - OUT OPTIONAL LPWORD pgi, - IN DWORD iMode) -{ - UNIMPLEMENTED; - return 0; -} - /* * @unimplemented */

16 years, 10 months

[jimtabor] 30211: Sorry guys! Would have anyone know that Abiword calls GdiFlush every second.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 6 05:33:38 2007 New Revision: 30211 URL: http://svn.reactos.org/svn/reactos?rev=30211&view=rev Log: Sorry guys! Would have anyone know that Abiword calls GdiFlush every second. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Tue Nov 6 05:33:38 2007 @@ -65,8 +65,6 @@ APIENTRY NtGdiFlush(VOID) { - // Hack! FIXME! - NtYieldExecution(); // Force thread to sunset and run the flush. UNIMPLEMENTED; } @@ -83,15 +81,15 @@ { PTEB pTeb = NtCurrentTeb(); ULONG GdiBatchCount = pTeb->GdiBatchCount; - - if( (GdiBatchCount > 0) && (GdiBatchCount <= GDIBATCHBUFSIZE)) + + if( (GdiBatchCount > 0) && (GdiBatchCount <= (GDIBATCHBUFSIZE/4))) { HDC hDC = (HDC) pTeb->GdiTebBatch.HDC; // // If hDC is zero and the buffer fills up with delete objects we need to run // anyway. So, hard code to the system batch limit. // - if ((hDC) || (GdiBatchCount >= GDI_BATCH_LIMIT)) + if ((hDC) || ((!hDC) && (GdiBatchCount >= GDI_BATCH_LIMIT))) { PULONG pHdr = &pTeb->GdiTebBatch.Buffer[0]; // No need to init anything, just go!

16 years, 10 months

[mpiulachs] 30210: create a new specialized property type "baseadress" and convert baseaddress.rbuild content to true metadata (see http://www.codexchange.net/rosdoc/baseaddresses.htm)

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue Nov 6 04:43:43 2007 New Revision: 30210 URL: http://svn.reactos.org/svn/reactos?rev=30210&view=rev Log: create a new specialized property type "baseadress" and convert baseaddress.rbuild content to true metadata (see http://www.codexchange.net/rosdoc/baseaddresses.htm) Modified: branches/rbuild/reactos/baseaddress.rbuild branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/baseaddress.rbui… ============================================================================== --- branches/rbuild/reactos/baseaddress.rbuild (original) +++ branches/rbuild/reactos/baseaddress.rbuild Tue Nov 6 04:43:43 2007 @@ -1,151 +1,151 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> - <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> - <property name="BASEADDRESS_COMCAT" value="0x20A50000" /> - <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> - <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> - <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> - <property name="BASEADDRESS_JOY" value="0x589b0000" /> - <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> - <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> - <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> - <property name="BASEADDRESS_TAPIUI" value="0x5b770000" /> - <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> - <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> - <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> - <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> - <property name="BASEADDRESS_INPUT" value ="0x5e400000" /> - <property name="BASEADDRESS_DINPUT" value="0x5f580000" /> - <property name="BASEADDRESS_NETID" value="0x5f660000" /> - <property name="BASEADDRESS_MAPI32" value="0x62250000" /> - <property name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> - <property name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> - <property name="BASEADDRESS_SYSDM" value="0x64dd0000" /> - <property name="BASEADDRESS_NCPL" value="0x64ea0000" /> - <property name="BASEADDRESS_MAIN" value="0x64f40000" /> - <property name="BASEADDRESS_INTL" value="0x64fb0000" /> - <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> - <property name="BASEADDRESS_DESK" value="0x65080000" /> - <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> - <property name="BASEADDRESS_MLANG" value="0x65140000" /> - <property name="BASEADDRESS_ACCESS" value="0x65180000" /> - <property name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> - <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> - <property name="BASEADDRESS_HID" value="0x688f0000" /> - <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> - <property name="BASEADDRESS_PSAPI" value="0x68f70000" /> - <property name="BASEADDRESS_OLEACC" value="0x69640000" /> - <property name="BASEADDRESS_WINMM" value="0x697d0000" /> - <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> - <property name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> - <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> - <property name="BASEADDRESS_SHELL32" value="0x6a360000" /> - <property name="BASEADDRESS_UNICODE" value="0x6b200000" /> - <property name="BASEADDRESS_ADVPACK" value="0x6b300000" /> - <property name="BASEADDRESS_CONTROL" value="0x6b310000" /> - <property name="BASEADDRESS_NCPA" value="0x6b320000" /> - <property name="BASEADDRESS_DBGHELP" value="0x6b330000" /> - <property name="BASEADDRESS_DINPUT8" value="0x6b340000" /> - <property name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> - <property name="BASEADDRESS_DSOUND" value="0x6b360000" /> - <property name="BASEADDRESS_GLU32" value="0x6b370000" /> - <property name="BASEADDRESS_MESA32" value="0x6b380000" /> - <property name="BASEADDRESS_OPENGL32" value="0x6b390000" /> - <property name="BASEADDRESS_SECUR32" value="0x6b3a0000" /> - <property name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> - <property name="BASEADDRESS_URLMON" value="0x6b3c0000" /> - <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> - <property name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> - <property name="BASEADDRESS_DESKMON" value="0x6d400000" /> - <property name="BASEADDRESS_DESKADP" value="0x6d410000" /> - <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> - <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> - <property name="BASEADDRESS_CARDS" value="0x701a0000" /> - <property name="BASEADDRESS_WININET" value="0x70200000" /> - <property name="BASEADDRESS_ACLUI" value="0x71550000" /> - <property name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> - <property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> - <property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> - <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> - <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> - <property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> - <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> - <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> - <property name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> - <property name="BASEADDRESS_WINFAX" value="0x722C0000" /> - <property name="BASEADDRESS_WINSCARD" value="0x723d0000" /> - <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> - <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> - <property name="BASEADDRESS_LZ32" value="0x73d80000" /> - <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> - <property name="BASEADDRESS_ICMP" value="0x741f0000" /> - <property name="BASEADDRESS_UFAT" value="0x741f0000" /> - <property name="BASEADDRESS_USERENV" value="0x74850000" /> - <property name="BASEADDRESS_WS2_32" value="0x74aa0000" /> - <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> - <property name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> - <property name="BASEADDRESS_MMDRV" value="0x74c30000" /> - <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> - <property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> - <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> - <property name="BASEADDRESS_CABINET" value="0x75120000" /> - <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> - <property name="BASEADDRESS_MSGINA" value="0x75970000" /> - <property name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> - <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> - <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> - <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> - <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> - <property name="BASEADDRESS_OLEAUT32" value="0x76290000" /> - <property name="BASEADDRESS_RICHED32" value="0x76340000" /> - <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> - <property name="BASEADDRESS_RICHED20" value="0x76360000" /> - <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> - <property name="BASEADDRESS_IMM32" value="0x76390000" /> - <property name="BASEADDRESS_LSASRV" value="0x76540000" /> - <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> - <property name="BASEADDRESS_ODBC32" value="0x76660000" /> - <property name="BASEADDRESS_ODBCCP32" value="0x76380000" /> - <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> - <property name="BASEADDRESS_MPR" value="0x76620000" /> - <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> - <property name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> - <property name="BASEADDRESS_SHFOLDER" value="0x76780000" /> - <property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> - <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> - <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> - <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> - <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> - <property name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> - <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> - <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> - <property name="BASEADDRESS_MSVFW32" value="0x77400000" /> - <property name="BASEADDRESS_MSACM32" value="0x77400000" /> - <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> - <property name="BASEADDRESS_AUTHZ" value="0x77690000" /> - <property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> - <property name="BASEADDRESS_SENSAPI" value="0x77700000" /> - <property name="BASEADDRESS_PACKET" value="0x77780000" /> - <property name="BASEADDRESS_MSAFD" value="0x77780000" /> - <property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> - <property name="BASEADDRESS_MSI" value="0x77790000" /> - <property name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> - <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> - <property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> - <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> - <property name="BASEADDRESS_VERSION" value="0x77a40000" /> - <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> - <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> - <property name="BASEADDRESS_USER32" value="0x77e30000" /> - <property name="BASEADDRESS_GDI32" value="0x77f70000" /> - <property name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> - <property name="BASEADDRESS_MSVCRT" value="0x78000000" /> - <property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> - <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> - <property name="BASEADDRESS_NTDLL" value="0x7c900000" /> - <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> - <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> + <baseadress name="BASEADDRESS_REGTESTS" value="0x07000000" /> + <baseadress name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <baseadress name="BASEADDRESS_COMCAT" value="0x20A50000" /> + <baseadress name="BASEADDRESS_DEVENUM" value="0x35680000" /> + <baseadress name="BASEADDRESS_PWRCFG" value="0x587e0000" /> + <baseadress name="BASEADDRESS_MMSYS" value="0x588a0000" /> + <baseadress name="BASEADDRESS_JOY" value="0x589b0000" /> + <baseadress name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> + <baseadress name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> + <baseadress name="BASEADDRESS_OBJSEL" value="0x5b400000" /> + <baseadress name="BASEADDRESS_TAPIUI" value="0x5b770000" /> + <baseadress name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> + <baseadress name="BASEADDRESS_USRMGR" value="0x5c900000" /> + <baseadress name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> + <baseadress name="BASEADDRESS_DPLAYX" value="0x5e080000" /> + <baseadress name="BASEADDRESS_INPUT" value ="0x5e400000" /> + <baseadress name="BASEADDRESS_DINPUT" value="0x5f580000" /> + <baseadress name="BASEADDRESS_NETID" value="0x5f660000" /> + <baseadress name="BASEADDRESS_MAPI32" value="0x62250000" /> + <baseadress name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> + <baseadress name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> + <baseadress name="BASEADDRESS_SYSDM" value="0x64dd0000" /> + <baseadress name="BASEADDRESS_NCPL" value="0x64ea0000" /> + <baseadress name="BASEADDRESS_MAIN" value="0x64f40000" /> + <baseadress name="BASEADDRESS_INTL" value="0x64fb0000" /> + <baseadress name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> + <baseadress name="BASEADDRESS_DESK" value="0x65080000" /> + <baseadress name="BASEADDRESS_APPWIZ" value="0x65100000" /> + <baseadress name="BASEADDRESS_MLANG" value="0x65140000" /> + <baseadress name="BASEADDRESS_ACCESS" value="0x65180000" /> + <baseadress name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> + <baseadress name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> + <baseadress name="BASEADDRESS_HID" value="0x688f0000" /> + <baseadress name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> + <baseadress name="BASEADDRESS_PSAPI" value="0x68f70000" /> + <baseadress name="BASEADDRESS_OLEACC" value="0x69640000" /> + <baseadress name="BASEADDRESS_WINMM" value="0x697d0000" /> + <baseadress name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> + <baseadress name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> + <baseadress name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> + <baseadress name="BASEADDRESS_SHELL32" value="0x6a360000" /> + <baseadress name="BASEADDRESS_UNICODE" value="0x6b200000" /> + <baseadress name="BASEADDRESS_ADVPACK" value="0x6b300000" /> + <baseadress name="BASEADDRESS_CONTROL" value="0x6b310000" /> + <baseadress name="BASEADDRESS_NCPA" value="0x6b320000" /> + <baseadress name="BASEADDRESS_DBGHELP" value="0x6b330000" /> + <baseadress name="BASEADDRESS_DINPUT8" value="0x6b340000" /> + <baseadress name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> + <baseadress name="BASEADDRESS_DSOUND" value="0x6b360000" /> + <baseadress name="BASEADDRESS_GLU32" value="0x6b370000" /> + <baseadress name="BASEADDRESS_MESA32" value="0x6b380000" /> + <baseadress name="BASEADDRESS_OPENGL32" value="0x6b390000" /> + <baseadress name="BASEADDRESS_SECUR32" value="0x6b3a0000" /> + <baseadress name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> + <baseadress name="BASEADDRESS_URLMON" value="0x6b3c0000" /> + <baseadress name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> + <baseadress name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> + <baseadress name="BASEADDRESS_DESKMON" value="0x6d400000" /> + <baseadress name="BASEADDRESS_DESKADP" value="0x6d410000" /> + <baseadress name="BASEADDRESS_WLDAP32" value="0x6e130000" /> + <baseadress name="BASEADDRESS_CLB" value="0x6f2b0000" /> + <baseadress name="BASEADDRESS_CARDS" value="0x701a0000" /> + <baseadress name="BASEADDRESS_WININET" value="0x70200000" /> + <baseadress name="BASEADDRESS_ACLUI" value="0x71550000" /> + <baseadress name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> + <baseadress name="BASEADDRESS_SHDOCVW" value="0x71700000" /> + <baseadress name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> + <baseadress name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> + <baseadress name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> + <baseadress name="BASEADDRESS_NETAPI32" value="0x71c00000" /> + <baseadress name="BASEADDRESS_DPLAY" value="0x71e80000" /> + <baseadress name="BASEADDRESS_SECURITY" value="0x71f10000" /> + <baseadress name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> + <baseadress name="BASEADDRESS_WINFAX" value="0x722C0000" /> + <baseadress name="BASEADDRESS_WINSCARD" value="0x723d0000" /> + <baseadress name="BASEADDRESS_DEVMGR" value="0x72a90000" /> + <baseadress name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> + <baseadress name="BASEADDRESS_LZ32" value="0x73d80000" /> + <baseadress name="BASEADDRESS_COREDLL" value="0x73d80000" /> + <baseadress name="BASEADDRESS_ICMP" value="0x741f0000" /> + <baseadress name="BASEADDRESS_UFAT" value="0x741f0000" /> + <baseadress name="BASEADDRESS_USERENV" value="0x74850000" /> + <baseadress name="BASEADDRESS_WS2_32" value="0x74aa0000" /> + <baseadress name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> + <baseadress name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> + <baseadress name="BASEADDRESS_MMDRV" value="0x74c30000" /> + <baseadress name="BASEADDRESS_OLEDLG" value="0x74d00000" /> + <baseadress name="BASEADDRESS_SAMSRV" value="0x74f30000" /> + <baseadress name="BASEADDRESS_SAMLIB" value="0x750C0000" /> + <baseadress name="BASEADDRESS_CABINET" value="0x75120000" /> + <baseadress name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> + <baseadress name="BASEADDRESS_MSGINA" value="0x75970000" /> + <baseadress name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> + <baseadress name="BASEADDRESS_RPCRT4" value="0x76000000" /> + <baseadress name="BASEADDRESS_SHLWAPI" value="0x76120000" /> + <baseadress name="BASEADDRESS_COMCTL32" value="0x76160000" /> + <baseadress name="BASEADDRESS_COMDLG32" value="0x76210000" /> + <baseadress name="BASEADDRESS_OLEAUT32" value="0x76290000" /> + <baseadress name="BASEADDRESS_RICHED32" value="0x76340000" /> + <baseadress name="BASEADDRESS_D3D8THK" value="0x76340000" /> + <baseadress name="BASEADDRESS_RICHED20" value="0x76360000" /> + <baseadress name="BASEADDRESS_TWAIN_32" value="0x76380000" /> + <baseadress name="BASEADDRESS_IMM32" value="0x76390000" /> + <baseadress name="BASEADDRESS_LSASRV" value="0x76540000" /> + <baseadress name="BASEADDRESS_MIDIMAP" value="0x76600000" /> + <baseadress name="BASEADDRESS_ODBC32" value="0x76660000" /> + <baseadress name="BASEADDRESS_ODBCCP32" value="0x76380000" /> + <baseadress name="BASEADDRESS_WAVEMAP" value="0x76610000" /> + <baseadress name="BASEADDRESS_MPR" value="0x76620000" /> + <baseadress name="BASEADDRESS_SETUPAPI" value="0x76660000" /> + <baseadress name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> + <baseadress name="BASEADDRESS_SHFOLDER" value="0x76780000" /> + <baseadress name="BASEADDRESS_NTMARTA" value="0x768A0000" /> + <baseadress name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> + <baseadress name="BASEADDRESS_WINTRUST" value="0x76c30000" /> + <baseadress name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> + <baseadress name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> + <baseadress name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> + <baseadress name="BASEADDRESS_FMIFS" value="0x76df0000" /> + <baseadress name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> + <baseadress name="BASEADDRESS_MSVFW32" value="0x77400000" /> + <baseadress name="BASEADDRESS_MSACM32" value="0x77400000" /> + <baseadress name="BASEADDRESS_CRTDLL" value="0x77630000" /> + <baseadress name="BASEADDRESS_AUTHZ" value="0x77690000" /> + <baseadress name="BASEADDRESS_CFGMGR32" value="0x77700000" /> + <baseadress name="BASEADDRESS_SENSAPI" value="0x77700000" /> + <baseadress name="BASEADDRESS_PACKET" value="0x77780000" /> + <baseadress name="BASEADDRESS_MSAFD" value="0x77780000" /> + <baseadress name="BASEADDRESS_WINSPOOL" value="0x77800000" /> + <baseadress name="BASEADDRESS_MSI" value="0x77790000" /> + <baseadress name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> + <baseadress name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> + <baseadress name="BASEADDRESS_WS2HELP" value="0x777e0000" /> + <baseadress name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> + <baseadress name="BASEADDRESS_VERSION" value="0x77a40000" /> + <baseadress name="BASEADDRESS_OLE32" value="0x77a50000" /> + <baseadress name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> + <baseadress name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> + <baseadress name="BASEADDRESS_USER32" value="0x77e30000" /> + <baseadress name="BASEADDRESS_GDI32" value="0x77f70000" /> + <baseadress name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> + <baseadress name="BASEADDRESS_MSVCRT" value="0x78000000" /> + <baseadress name="BASEADDRESS_MSVCRT20" value="0x78500000" /> + <baseadress name="BASEADDRESS_KERNEL32" value="0x7c800000" /> + <baseadress name="BASEADDRESS_NTDLL" value="0x7c900000" /> + <baseadress name="BASEADDRESS_HHCTRL" value="0x7e410000" /> + <baseadress name="BASEADDRESS_FREETYPE" value="0x7f000000" /> </group> Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Tue Nov 6 04:43:43 2007 @@ -1895,15 +1895,13 @@ Property::Property ( const XMLElement& node_, const Project& project_, const Module* module_ ) - : project(project_), module(module_) -{ - const XMLAttribute* att; - - att = node_.GetAttribute ( "name", true ); + : node (&node_) , project(project_), module(module_) +{ + const XMLAttribute* att = node->GetAttribute ( "name", true ); assert(att); name = project.ResolveProperties ( att->value ); - att = node_.GetAttribute ( "value", true ); + att = node->GetAttribute ( "value", true ); assert(att); value = att->value; } @@ -1921,6 +1919,13 @@ { } +BaseAdress::BaseAdress ( const XMLElement& node_, + const Project& project_, + const Module* module_ ) + : Property( node_ , project_, module_) +{ + //TODO: Add code to validate baseadress +} PchFile::PchFile ( const XMLElement& node_, Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Tue Nov 6 04:43:43 2007 @@ -582,6 +582,14 @@ else non_if_data.properties.push_back ( property ); } + else if ( e.name == "baseadress" ) + { + BaseAdress* baseadress = new BaseAdress ( e, *this, NULL ); + if ( parseContext.ifData ) + parseContext.ifData->data.properties.push_back ( baseadress ); + else + non_if_data.properties.push_back ( baseadress ); + } if ( subs_invalid && e.subElements.size() ) { throw XMLInvalidBuildFileException ( Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Tue Nov 6 04:43:43 2007 @@ -119,6 +119,7 @@ class AutoResource; class InstallComponent; class InstallFolder; +class BaseAdress; typedef std::map<std::string,Directory*> directory_map; @@ -808,6 +809,7 @@ class Property { public: + const XMLElement* node; const Project& project; const Module* module; std::string name, value; @@ -824,6 +826,13 @@ void ProcessXML(); }; +class BaseAdress : public Property +{ +public: + BaseAdress ( const XMLElement& node_, + const Project& project_, + const Module* module_ ); +}; class TestSupportCode {

16 years, 10 months

← Newer
1
...
68
69
70
71
72
73
74
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007