Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[pschweitzer] 35474: First implementation of FsRtlIsDbcsInExpression. It will probably need more work. Now, all the Dbcs functions are implemented.
by pschweitzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: pschweitzer Date: Wed Aug 20 05:06:06 2008 New Revision: 35474 URL: http://svn.reactos.org/svn/reactos?rev=35474&view=rev Log: First implementation of FsRtlIsDbcsInExpression. It will probably need more work. Now, all the Dbcs functions are implemented. Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Wed Aug 20 05:06:06 2008 @@ -138,17 +138,17 @@ /*++ * @name FsRtlIsDbcsInExpression - * @unimplemented - * - * FILLME + * @implemented + * + * Check if the Name string is in the Expression string. * * @param Expression - * FILLME + * The string in which we've to find Name. It can contains wildcards * * @param Name - * FILLME - * - * @return None + * The string to find. It cannot contain wildcards. + * + * @return TRUE if Name is found in Expression, FALSE otherwise * * @remarks None * @@ -158,7 +158,50 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - KEBUGCHECK(0); + ULONG ExpressionPosition, NamePosition, MatchingChars = 0; + + ASSERT(!FsRtlDoesDbcsContainWildCards(Name)); + + /* One can't be null, both can be */ + if (!Expression->Length || !Name->Length) + { + return !(Expression->Length ^ Name->Length); + } + + for (ExpressionPosition = 0; ExpressionPosition < Expression->Length / sizeof(CHAR); ExpressionPosition++) + { + if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[MatchingChars]) || + (Expression->Buffer[ExpressionPosition] == '?') || + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && + (Name->Buffer[MatchingChars] == '.' || Name->Buffer[MatchingChars] == '0'))) + { + MatchingChars++; + } + else if (Expression->Buffer[ExpressionPosition] == '*') + { + MatchingChars = Name->Length / sizeof(CHAR); + } + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) + { + for (NamePosition = MatchingChars; NamePosition < Name->Length / sizeof(CHAR); NamePosition++) + { + if (Name->Buffer[NamePosition] == '.') + { + MatchingChars = NamePosition; + } + } + } + else + { + MatchingChars = 0; + } + if (MatchingChars == Name->Length / sizeof(CHAR)) + { + return TRUE; + } + } + return FALSE; }

1 0

[dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible.
by dreimer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: dreimer Date: Wed Aug 20 04:10:07 2008 New Revision: 35473 URL: http://svn.reactos.org/svn/reactos?rev=35473&view=rev Log: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Aug 20 04:10:07 2008 @@ -103,11 +103,20 @@ ) :: +:: Get the number of CPUs in the system so we know how many jobs to execute. +:: To modify the number used alter the options used with cpucount: +:: No Option - Number of CPUs. +:: -x1 - Number of CPUs, plus 1. +:: -x2 - Number of CPUs, doubled. +:: -a - Determine the cpu count based on the inherited process affinity mask. +:: +for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +:: :: Check if we are using -j or not. :: -if "%1" == "multi" ( - if not "%2" == "" ( - title 'makex %2' parallel build started: %TIMERAW% +if %CPUCOUNT% GTR 2 ( + if not "%1" == "" ( + title 'makex %1' parallel build started: %TIMERAW% ) else ( title 'makex' parallel build started: %TIMERAW% ) @@ -139,27 +148,17 @@ goto :EOF :BUILDMULTI - :: - :: Get the number of CPUs in the system so we know how many jobs to execute. - :: To modify the number used alter the options used with cpucount: - :: No Option - Number of CPUs. - :: -x1 - Number of CPUs, plus 1. - :: -x2 - Number of CPUs, doubled. - :: -a - Determine the cpu count based on the inherited process affinity mask. - :: - for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i - if %_ROSBE_SHOWTIME% == 1 ( if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* ) ) else ( if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* ) ) goto :EOF Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Wed Aug 20 04:10:07 2008 @@ -7,7 +7,7 @@ ENV = set HELP = "%_ROSBE_BASEDIR%\Help.cmd" $* MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* -MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $* +MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" $* RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $* RENV = for /f "usebackq tokens=*" %i in (`set _ROSBE_`) do @echo %i SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $*

1 0

[cwittich] 35472: add a nostrip option to RosBE for easier usage of RosDbg
by cwittich＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cwittich Date: Wed Aug 20 02:36:33 2008 New Revision: 35472 URL: http://svn.reactos.org/svn/reactos?rev=35472&view=rev Log: add a nostrip option to RosBE for easier usage of RosDbg Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -36,6 +36,13 @@ :: :: Check if strip or ccache are being used and set the appropriate options. :: +if defined _ROSBE_NOSTRIP ( + if %_ROSBE_NOSTRIP% == 1 ( + set ROS_BUILDNOSTRIP=yes + ) else ( + set ROS_BUILDNOSTRIP=no + ) +) if defined _ROSBE_STRIP ( if %_ROSBE_STRIP% == 1 ( set ROS_LEAN_AND_MEAN=yes @@ -170,6 +177,7 @@ :: :: Unload all used Vars. :: +set ROS_BUILDNOSTRIP= set ROS_LEAN_AND_MEAN= set HOST_CC= set HOST_CPP= Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -5,24 +5,25 @@ CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12 + LTEXT "Schriftfarbe", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nBeispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Nostrip Dateien zum Debuggen erzeugen", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 LTEXT "Pfad zu MinGW/GCC", -1, 10, 107, 100, 15 - LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Schriftfarbe", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "\n\nBeispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 - CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 - CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 - CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 - CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED @@ -72,4 +73,5 @@ HLP_SAVEBUTTON, "Aktiv, wenn Parameter verändert wurden. Beendet die Anwendung und speichert die Einstellungen." HLP_QUITBUTTON, "Dieser Button lässt Sie das Programm, ohne die Konfiguration zu speichern, beenden." HLP_DEFAULTMSG, "Bewegen Sie sich über eine Fläche um Hilfe zu erhalten." + HLP_NOSTRIP, "Erzeugt Debuginformation für den ReactOS Debugger." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -5,24 +5,25 @@ CAPTION "ReactOS Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Background Color", -1, 10, 10, 75, 12 + LTEXT "Font Color", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nSample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 LTEXT "Path to MinGW/GCC", -1, 10, 107, 100, 15 - LTEXT "Background Color", -1, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Font Color", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "\n\nSample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 - CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 - CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED @@ -72,4 +73,5 @@ HLP_SAVEBUTTON, "Activated when a setting is changed, it quits and saves settings." HLP_QUITBUTTON, "This button lets you quit configuration without saving." HLP_DEFAULTMSG, "Hover over a control to get help." + HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -5,24 +5,25 @@ CAPTION "Paramètres de l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12 + LTEXT "Couleur de la police", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nTexte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 125, 50, 120, 36 + CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 110, 12 + CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 LTEXT "Chemin vers MinGW/GCC", -1, 10, 107, 110, 15 - LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Couleur de la police", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "\n\nTexte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 125, 58, 120, 36 - CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 - CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 - CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 - CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 150, 12 - CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 150, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 150, 12 EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 150, 12 EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED @@ -72,4 +73,5 @@ HLP_SAVEBUTTON, "Activé quand un paramètre est changé, permet de quitter en sauvant." HLP_QUITBUTTON, "Ce bouton vous permet de quitter la configuration sans sauvegarder." HLP_DEFAULTMSG, "Passez sur un contrôle pour avoir de l'aide." + HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -7,24 +7,25 @@ CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS" FONT 8,"MS Sans Serif",0,0 BEGIN + LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12 + LTEXT "Öâåò øðèôòà", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nÏðèìåð òåêñòà", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Îòîáðàæàòü âðåìÿ êîìïèëÿöèè", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 107, 100, 15 - LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Öâåò øðèôòà", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "\n\nÏðèìåð òåêñòà", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Îòîáðàæàòü âðåìÿ êîìïèëÿöèè", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 - CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 - CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 - CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 - CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED @@ -74,4 +75,5 @@ HLP_SAVEBUTTON, "Àêòèâíîå ñîñòîÿíèå êíîïêè óêàçûâàåò íà âîçìîæíîñòü ñîõðàíåíèÿ èçìåíåííûõ íàñòðîåê" HLP_QUITBUTTON, "Ýòî êëàâèøà ïîçâîëÿåò âûéòè áåç ñîõðàíåíèÿ èçìåíåíèé" HLP_DEFAULTMSG, "Ïîìîùü ïî èçíà÷àëüíûì ïàðàìåòðàì" + HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -13,24 +13,25 @@ CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12 + LTEXT "Êîë³ð øðèôòó", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nÇðàçîê òåêñòó", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Â³äîáðàæàòè ÷àñ êîìï³ëÿö³¿", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Âèêîðèñòîâóâàòè CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 LTEXT "Øëÿõ äî MinGW/GCC", -1, 10, 107, 100, 15 - LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Êîë³ð øðèôòó", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "\n\nÇðàçîê òåêñòó", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Â³äîáðàæàòè ÷àñ êîìï³ëÿö³¿", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 - CONTROL "Âèêîðèñòîâóâàòè CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 - CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 - CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 - CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED @@ -80,4 +81,5 @@ HLP_SAVEBUTTON, "Àêòèâíèé ñòàí êíîïêè âêàçóº íà ìîæëèâ³ñòü çáåðåæåííÿ çì³íåíèõ ïàðàìåòð³â." HLP_QUITBUTTON, "Öå êíîïêà äîçâîëÿº âèéòè ç êîíô³ãóðóâàííÿ áåç çáåðåæåííÿ çì³í." HLP_DEFAULTMSG, "Íàâåä³òü âêàç³âíèê ìèø³ íà åëåìåíò êåðóâàííÿ, ùîá îòðèìàòè äîâ³äêó." + HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -60,7 +60,7 @@ WriteSettings(POPTIONS_DLG infoPtr) { INT foreground, background; - BOOL showtime, writelog, useccache, strip, objstate, outstate; + BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; @@ -70,6 +70,7 @@ writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); objstate = (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); @@ -114,6 +115,7 @@ fwprintf(pFile, L"set _ROSBE_SHOWTIME=%d\n", showtime); fwprintf(pFile, L"set _ROSBE_USECCACHE=%d\n", useccache); fwprintf(pFile, L"set _ROSBE_STRIP=%d\n", strip); + fwprintf(pFile, L"set _ROSBE_NOSTRIP=%d\n", nostrip); fwprintf(pFile, L"set _ROSBE_WRITELOG=%d\n", writelog); if (logdir[0] != 0) fwprintf(pFile, L"set _ROSBE_LOGDIR=%s\n", logdir); if (mingwpath[0] != 0) fwprintf(pFile, L"set _ROSBE_MINGWPATH=%s\n", mingwpath); @@ -160,6 +162,8 @@ LoadedSettings->useccache = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) LoadedSettings->strip = wcstol(ptr2, NULL, 2); + else if (wcscmp(ptr, L"_ROSBE_NOSTRIP") == 0) + LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) LoadedSettings->writelog = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) @@ -198,6 +202,7 @@ } SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_SETCHECK, LoadedSettings->useccache, 0); SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_SETCHECK, LoadedSettings->strip, 0); + SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_SETCHECK, LoadedSettings->nostrip, 0); SetDlgItemText(infoPtr->hwndDlg, ID_MGWDIR, LoadedSettings->mingwpath); SetDlgItemText(infoPtr->hwndDlg, ID_LOGDIR, LoadedSettings->logdir); if (LoadedSettings->objdir[0] != 0) @@ -221,7 +226,7 @@ VOID SetSaveState(POPTIONS_DLG infoPtr) { INT foreground, background; - BOOL showtime, writelog, useccache, strip, objstate, outstate; + BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; @@ -230,6 +235,7 @@ writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); objstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); @@ -254,7 +260,7 @@ (useccache == DefaultSettings->useccache) && (strip == DefaultSettings->strip) && (objstate == DefaultSettings->objstate) && (outstate == DefaultSettings->outstate) && (StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0) && - (StateObj) && (StateOut)); + (StateObj) && (StateOut) && (nostrip == DefaultSettings->nostrip)); EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OK), State); } @@ -349,6 +355,7 @@ {ID_SHOWBUILDTIME, HLP_SBUILDTIME}, {ID_USECCACHE, HLP_CCACHEUSED}, {ID_STRIP, HLP_STRIPEDEXE}, + {ID_NOSTRIP, HLP_NOSTRIP}, {ID_MGWDIR, HLP_FINDMGWDIR}, {ID_BROWSEMGW, HLP_FINDMGWDIR}, {ID_LOGDIR, HLP_FINDLOGDIR}, Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -27,6 +27,7 @@ BOOL showtime; BOOL useccache; BOOL strip; + BOOL nostrip; BOOL writelog; BOOL objstate; BOOL outstate; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h [iso-8859-1] Wed Aug 20 02:36:33 2008 @@ -49,6 +49,7 @@ #define IDC_FONT 0x24 #define IDC_BACK 0x25 #define ID_STATUSBAR 0x26 +#define ID_NOSTRIP 0x27 /* Strings */ #define MSG_NOGCCFOUND 0x27 @@ -76,4 +77,5 @@ #define HLP_SAVEBUTTON 0x3b #define HLP_QUITBUTTON 0x3c #define HLP_DEFAULTMSG 0x3d +#define HLP_NOSTRIP 0x3e

1 0

[cwittich] 35471: update link to help
by cwittich＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cwittich Date: Wed Aug 20 01:11:57 2008 New Revision: 35471 URL: http://svn.reactos.org/svn/reactos?rev=35471&view=rev Log: update link to help Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Wed Aug 20 01:11:57 2008 @@ -317,7 +317,7 @@ private void helpToolStripMenuItem_Click(object sender, EventArgs e) { - ReactOSWeb Help = new ReactOSWeb("Help", "http://www.reactos.org/wiki/index.php/Debugging"); + ReactOSWeb Help = new ReactOSWeb("Help", "http://www.reactos.org/wiki/index.php/ReactOSDbg"); AddTab(Help); WorkTabs.SelectTab(WorkTabs.TabCount - 1); }

1 0

[cwittich] 35470: -add categories to settings dialog -allow to change the defaultPipeName -some small UI improvements
by cwittich＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cwittich Date: Wed Aug 20 00:49:00 2008 New Revision: 35470 URL: http://svn.reactos.org/svn/reactos?rev=35470&view=rev Log: -add categories to settings dialog -allow to change the defaultPipeName -some small UI improvements Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs trunk/tools/reactosdbg/RosDBG/SerialTargetSelect.Designer.cs trunk/tools/reactosdbg/RosDBG/Settings.cs trunk/tools/reactosdbg/RosDBG/TCPTargetSelect.Designer.cs Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Wed Aug 20 00:49:00 2008 @@ -313,7 +313,7 @@ { SelectTabFromPosition(mMousePosition); closeCurrentTabToolStripMenuItem_Click(this, null); - } + } private void helpToolStripMenuItem_Click(object sender, EventArgs e) { Modified: trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/PipeTarget… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs [iso-8859-1] Wed Aug 20 00:49:00 2008 @@ -33,11 +33,13 @@ this.PipeNameTextBox = new System.Windows.Forms.TextBox(); this.DefaultRadioBtn = new System.Windows.Forms.RadioButton(); this.CustomRadioBtn = new System.Windows.Forms.RadioButton(); + this.DefaultNameLabel = new System.Windows.Forms.Label(); this.SuspendLayout(); // // bOK // this.bOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.bOK.DialogResult = System.Windows.Forms.DialogResult.OK; this.bOK.Location = new System.Drawing.Point(69, 86); this.bOK.Name = "bOK"; this.bOK.Size = new System.Drawing.Size(75, 23); @@ -49,6 +51,7 @@ // bCancel // this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.bCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.bCancel.Location = new System.Drawing.Point(150, 86); this.bCancel.Name = "bCancel"; this.bCancel.Size = new System.Drawing.Size(75, 23); @@ -88,11 +91,22 @@ this.CustomRadioBtn.UseVisualStyleBackColor = true; this.CustomRadioBtn.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); // + // DefaultNameLabel + // + this.DefaultNameLabel.AutoSize = true; + this.DefaultNameLabel.Location = new System.Drawing.Point(118, 14); + this.DefaultNameLabel.Name = "DefaultNameLabel"; + this.DefaultNameLabel.Size = new System.Drawing.Size(0, 13); + this.DefaultNameLabel.TabIndex = 11; + // // PipeTargetSelect // + this.AcceptButton = this.bOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.bCancel; this.ClientSize = new System.Drawing.Size(237, 121); + this.Controls.Add(this.DefaultNameLabel); this.Controls.Add(this.CustomRadioBtn); this.Controls.Add(this.DefaultRadioBtn); this.Controls.Add(this.PipeNameTextBox); @@ -102,6 +116,7 @@ this.Name = "PipeTargetSelect"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Named Pipe"; + this.Load += new System.EventHandler(this.PipeTargetSelect_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -114,5 +129,6 @@ private System.Windows.Forms.TextBox PipeNameTextBox; private System.Windows.Forms.RadioButton DefaultRadioBtn; private System.Windows.Forms.RadioButton CustomRadioBtn; + private System.Windows.Forms.Label DefaultNameLabel; } } Modified: trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/PipeTarget… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs [iso-8859-1] Wed Aug 20 00:49:00 2008 @@ -5,7 +5,7 @@ { public partial class PipeTargetSelect : Form { - private const string defaultPipeName = @"\\.\Pipe\RosDbg"; + private string defaultPipeName = Settings.Pipe; private string pipeName; public string PipeName @@ -50,5 +50,10 @@ PipeNameTextBox.Enabled = rb.Checked; } + + private void PipeTargetSelect_Load(object sender, EventArgs e) + { + DefaultNameLabel.Text = "[" + defaultPipeName + "]"; + } } } Modified: trunk/tools/reactosdbg/RosDBG/SerialTargetSelect.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/SerialTarg… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/SerialTargetSelect.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/SerialTargetSelect.Designer.cs [iso-8859-1] Wed Aug 20 00:49:00 2008 @@ -39,7 +39,7 @@ // cPort // this.cPort.FormattingEnabled = true; - this.cPort.Location = new System.Drawing.Point(50, 9); + this.cPort.Location = new System.Drawing.Point(77, 9); this.cPort.Name = "cPort"; this.cPort.Size = new System.Drawing.Size(121, 21); this.cPort.TabIndex = 0; @@ -53,7 +53,7 @@ "38400", "57600", "115200"}); - this.cBaud.Location = new System.Drawing.Point(50, 48); + this.cBaud.Location = new System.Drawing.Point(77, 48); this.cBaud.Name = "cBaud"; this.cBaud.Size = new System.Drawing.Size(121, 21); this.cBaud.TabIndex = 1; @@ -61,7 +61,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 12); + this.label1.Location = new System.Drawing.Point(39, 12); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(26, 13); this.label1.TabIndex = 5; @@ -70,7 +70,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 51); + this.label2.Location = new System.Drawing.Point(39, 51); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(32, 13); this.label2.TabIndex = 6; @@ -79,6 +79,7 @@ // bCancel // this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.bCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.bCancel.Location = new System.Drawing.Point(150, 90); this.bCancel.Name = "bCancel"; this.bCancel.Size = new System.Drawing.Size(75, 23); @@ -90,6 +91,7 @@ // bOK // this.bOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.bOK.DialogResult = System.Windows.Forms.DialogResult.OK; this.bOK.Location = new System.Drawing.Point(69, 90); this.bOK.Name = "bOK"; this.bOK.Size = new System.Drawing.Size(75, 23); @@ -100,8 +102,10 @@ // // SerialTargetSelect // + this.AcceptButton = this.bOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.bCancel; this.ClientSize = new System.Drawing.Size(237, 125); this.Controls.Add(this.bOK); this.Controls.Add(this.bCancel); @@ -112,7 +116,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "SerialTargetSelect"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "SerialTargetSelect"; + this.Text = "Serial"; this.ResumeLayout(false); this.PerformLayout(); Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Wed Aug 20 00:49:00 2008 @@ -15,6 +15,7 @@ { public class SettingsPropertyValues : ApplicationSettingsBase { + [CategoryAttribute("Directories"), DescriptionAttribute("Directory settings")] [UserScopedSetting, DefaultSettingValue("."), Editor(typeof(DirectoryEditor), typeof(UITypeEditor))] public string SourceDirectory { @@ -22,11 +23,20 @@ set { this["SourceDirectory"] = value; } } + [CategoryAttribute("Directories"), DescriptionAttribute("Directory settings")] [UserScopedSetting,DefaultSettingValue(".\\output-i386"),Editor(typeof(DirectoryEditor), typeof(UITypeEditor))] public string OutputDirectory { get { return this["OutputDirectory"].ToString(); } set { this["OutputDirectory"] = value; } + } + + [CategoryAttribute("Connection"), DescriptionAttribute("Connection settings")] + [UserScopedSetting, DefaultSettingValue(@"\\.\Pipe\RosDbg")] + public string Pipe + { + get { return this["Pipe"].ToString(); } + set { this["Pipe"] = value; } } public SettingsPropertyValues() @@ -39,6 +49,7 @@ public static string SourceDirectory { get { return mProperties.SourceDirectory; } } public static string OutputDirectory { get { return mProperties.OutputDirectory; } } + public static string Pipe { get { return mProperties.Pipe; } } Settings() { Modified: trunk/tools/reactosdbg/RosDBG/TCPTargetSelect.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/TCPTargetS… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/TCPTargetSelect.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/TCPTargetSelect.Designer.cs [iso-8859-1] Wed Aug 20 00:49:00 2008 @@ -42,7 +42,7 @@ this.HostChoice.FormattingEnabled = true; this.HostChoice.Location = new System.Drawing.Point(47, 9); this.HostChoice.Name = "HostChoice"; - this.HostChoice.Size = new System.Drawing.Size(121, 21); + this.HostChoice.Size = new System.Drawing.Size(164, 21); this.HostChoice.TabIndex = 0; this.HostChoice.Text = "localhost"; // @@ -78,7 +78,7 @@ 0, 0}); this.PortNumber.Name = "PortNumber"; - this.PortNumber.Size = new System.Drawing.Size(120, 20); + this.PortNumber.Size = new System.Drawing.Size(80, 20); this.PortNumber.TabIndex = 3; this.PortNumber.Value = new decimal(new int[] { 1235, @@ -100,6 +100,7 @@ // OKBtn // this.OKBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.OKBtn.DialogResult = System.Windows.Forms.DialogResult.OK; this.OKBtn.Location = new System.Drawing.Point(69, 90); this.OKBtn.Name = "OKBtn"; this.OKBtn.Size = new System.Drawing.Size(75, 23); @@ -110,8 +111,10 @@ // // TCPTargetSelect // + this.AcceptButton = this.OKBtn; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.CancelBtn; this.ClientSize = new System.Drawing.Size(237, 125); this.Controls.Add(this.OKBtn); this.Controls.Add(this.CancelBtn); @@ -122,7 +125,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "TCPTargetSelect"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "TCPTargetSelect"; + this.Text = "TCP/IP"; ((System.ComponentModel.ISupportInitialize)(this.PortNumber)).EndInit(); this.ResumeLayout(false); this.PerformLayout();

1 0

[cgutman] 35469: - Move LockBuffers - Remove a duplicate debug print
by cgutman＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cgutman Date: Tue Aug 19 20:42:12 2008 New Revision: 35469 URL: http://svn.reactos.org/svn/reactos?rev=35469&view=rev Log: - Move LockBuffers - Remove a duplicate debug print Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 19 20:42:12 2008 @@ -264,30 +264,28 @@ return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied, NULL ); + SendReq->BufferArray = LockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + NULL, NULL, + FALSE, FALSE ); + + if( !SendReq->BufferArray ) { + return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, + Irp, 0, NULL ); + } + AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State)); if( FCB->State != SOCKET_STATE_CONNECTED ) { if( SendReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL ); } else { AFD_DbgPrint(MID_TRACE,("Queuing request\n")); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); } - } - - AFD_DbgPrint(MID_TRACE,("We already have %d bytes waiting.\n", - FCB->Send.BytesUsed)); - - SendReq->BufferArray = LockBuffers( SendReq->BufferArray, - SendReq->BufferCount, - NULL, NULL, - FALSE, FALSE ); - - if( !SendReq->BufferArray ) { - return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, - Irp, 0, NULL ); } AFD_DbgPrint(MID_TRACE,("FCB->Send.BytesUsed = %d\n",

1 0

[cgutman] 35468: - Use FCB->Connection.Object instead of FCB->AddressFile.Object - Spotted by Arty
by cgutman＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cgutman Date: Tue Aug 19 20:10:13 2008 New Revision: 35468 URL: http://svn.reactos.org/svn/reactos?rev=35468&view=rev Log: - Use FCB->Connection.Object instead of FCB->AddressFile.Object - Spotted by Arty Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Tue Aug 19 20:10:13 2008 @@ -135,7 +135,7 @@ if( NT_SUCCESS(Status) ) { Status = TdiQueryInformation - ( FCB->AddressFile.Object, + ( FCB->Connection.Object, TDI_QUERY_CONNECTION_INFO, SysMdl ); }

1 0

[cgutman] 35467: - Fix a bug that resulted in the status getting changed if TdiQueryInformation failed
by cgutman＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: cgutman Date: Tue Aug 19 18:50:41 2008 New Revision: 35467 URL: http://svn.reactos.org/svn/reactos?rev=35467&view=rev Log: - Fix a bug that resulted in the status getting changed if TdiQueryInformation failed Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Tue Aug 19 18:50:41 2008 @@ -143,13 +143,13 @@ if( NT_SUCCESS(Status) ) { TransAddr = (PTRANSPORT_ADDRESS)MmGetSystemAddressForMdlSafe( Mdl, NormalPagePriority ); - } - if( TransAddr ) - RtlCopyMemory( TransAddr, ConnInfo->RemoteAddress, - TaLengthOfTransportAddress - ( ConnInfo->RemoteAddress ) ); - else Status = STATUS_INSUFFICIENT_RESOURCES; + if( TransAddr ) + RtlCopyMemory( TransAddr, ConnInfo->RemoteAddress, + TaLengthOfTransportAddress + ( ConnInfo->RemoteAddress ) ); + else Status = STATUS_INSUFFICIENT_RESOURCES; + } if( ConnInfo ) ExFreePool( ConnInfo ); if( SysMdl ) IoFreeMdl( SysMdl );

1 0

[cgutman] 35466: - Use MmGetSystemAddressForMdlSafe instead of MmMapLockedPages - Noticed by Alex
by cgutman＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: cgutman Date: Tue Aug 19 18:44:11 2008 New Revision: 35466 URL: http://svn.reactos.org/svn/reactos?rev=35466&view=rev Log: - Use MmGetSystemAddressForMdlSafe instead of MmMapLockedPages - Noticed by Alex Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Tue Aug 19 18:44:11 2008 @@ -142,8 +142,7 @@ if( NT_SUCCESS(Status) ) { TransAddr = - (PTRANSPORT_ADDRESS)MmMapLockedPages - ( Mdl, Irp->RequestorMode ); + (PTRANSPORT_ADDRESS)MmGetSystemAddressForMdlSafe( Mdl, NormalPagePriority ); } if( TransAddr )

1 0

[janderwald] 35465: * The CLSID of a PropertySheet handler can either be present as subkey or as a default value. * Fixes WinRar file property sheet handler and etc...
by janderwald＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: janderwald Date: Tue Aug 19 17:40:05 2008 New Revision: 35465 URL: http://svn.reactos.org/svn/reactos?rev=35465&view=rev Log: * The CLSID of a PropertySheet handler can either be present as subkey or as a default value. * Fixes WinRar file property sheet handler and etc... Modified: trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Aug 19 17:40:05 2008 @@ -1662,6 +1662,7 @@ IShellPropSheetExt *pspsx; HKEY hkBase, hkPropSheetHandlers; PPSXA psxa = NULL; + HRESULT hr; TRACE("(%p,%s,%u)\n", hKey, debugstr_w(pszSubKey), max_iface); @@ -1699,38 +1700,41 @@ lRet = ERROR_SUCCESS; break; } - - dwClsidSize = sizeof(szClsidHandler); - if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) + szHandler[(sizeof(szHandler) / sizeof(szHandler[0])) - 1] = 0; + hr = SHCLSIDFromStringW(szHandler, &clsid); + if (FAILED(hr)) { - /* Force a NULL-termination and convert the string */ - szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; - if (SUCCEEDED(SHCLSIDFromStringW(szClsidHandler, &clsid))) + dwClsidSize = sizeof(szClsidHandler); + if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) { - /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. - Only if both interfaces are supported it's a real shell extension. - Then call IShellExtInit's Initialize method. */ - if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; + hr = SHCLSIDFromStringW(szClsidHandler, &clsid); + } + } + if (SUCCEEDED(hr)) + { + /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. + Only if both interfaces are supported it's a real shell extension. + Then call IShellExtInit's Initialize method. */ + if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + { + if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) - { - /* Add the IShellPropSheetExt instance to the array */ - psxa->pspsx[psxa->uiCount++] = pspsx; - } - else - { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); - } + /* Add the IShellPropSheetExt instance to the array */ + psxa->pspsx[psxa->uiCount++] = pspsx; } else + { + psxi->lpVtbl->Release(psxi); pspsx->lpVtbl->Release(pspsx); + } } + else + pspsx->lpVtbl->Release(pspsx); } } - } while (psxa->uiCount != psxa->uiAllocated); } else

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
86
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 August 2008