Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[hyperion] 33499: Case-sensitivity fix for Linux build hosts. Spotted by Tushar S. (GreyGhost)

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue May 13 12:32:19 2008 New Revision: 33499 URL: http://svn.reactos.org/svn/reactos?rev=33499&view=rev Log: Case-sensitivity fix for Linux build hosts. Spotted by Tushar S. (GreyGhost) Modified: trunk/rosapps/fraginator/Fraginator.h trunk/rosapps/fraginator/MainDialog.cpp trunk/rosapps/fraginator/ReportDialog.cpp Modified: trunk/rosapps/fraginator/Fraginator.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.h?re… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.h [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Fraginator.h [iso-8859-1] Tue May 13 12:32:19 2008 @@ -9,7 +9,7 @@ #define FRAGINATOR_H -#include "unfrag.h" +#include "Unfrag.h" #include <commctrl.h> Modified: trunk/rosapps/fraginator/MainDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/MainDialog.cpp?… ============================================================================== --- trunk/rosapps/fraginator/MainDialog.cpp [iso-8859-1] (original) +++ trunk/rosapps/fraginator/MainDialog.cpp [iso-8859-1] Tue May 13 12:32:19 2008 @@ -1,4 +1,4 @@ -#include "unfrag.h" +#include "Unfrag.h" #include "MainDialog.h" #include "resource.h" #include "Fraginator.h" Modified: trunk/rosapps/fraginator/ReportDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/ReportDialog.cp… ============================================================================== --- trunk/rosapps/fraginator/ReportDialog.cpp [iso-8859-1] (original) +++ trunk/rosapps/fraginator/ReportDialog.cpp [iso-8859-1] Tue May 13 12:32:19 2008 @@ -1,5 +1,5 @@ #include "ReportDialog.h" -#include "unfrag.h" +#include "Unfrag.h" #include "Fraginator.h" #include "DriveVolume.h" #include "Defragment.h"

16 years, 4 months

[cwittich] 33498: add some info for xen to txtmode.cfg fix a bug rosboot_test.cpp

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue May 13 12:30:29 2008 New Revision: 33498 URL: http://svn.reactos.org/svn/reactos?rev=33498&view=rev Log: add some info for xen to txtmode.cfg fix a bug rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Tue May 13 12:30:29 2008 @@ -678,6 +678,7 @@ m_Src = "xm console "; string xen_name = "reactos"; conf_parser.getStringValue(RosBootTest::XEN_CONFIG_NAME, xen_name); + m_Src += xen_name; m_DataSource = new PipeReader(); m_BootCmd = m_EmuPath + "/xm create " + m_XenConfig; Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg [iso-8859-1] Tue May 13 12:30:29 2008 @@ -8,7 +8,7 @@ ; ROS_EMU_PATH[LIN|WIN] ; -; This variable sets the path to the emulator +; This variable sets the path to the emulator (path to xm for xen [/usr/sbin]) ; ROS_EMU_PATH_WIN=E:\reactos\qemu\qemu.exe ROS_EMU_PATH_LIN=/usr/bin/qemu @@ -60,7 +60,7 @@ ; ; Note: set this value if you have problems with timeouts or cutoff debugging data ; -ROS_DELAY_READ=4 +ROS_DELAY_READ=1 ; ROS_CHECK_POINT ; @@ -107,4 +107,4 @@ ; XEN_CONFIG_NAME ; ; Set this variable to the name of xen station -; XEN_CONFIG_NAME= +; XEN_CONFIG_NAME=reactos

16 years, 4 months

[cwittich] 33497: don't display all debug data 4 times when using PipeReader class (spotted by janderwald)

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue May 13 12:17:31 2008 New Revision: 33497 URL: http://svn.reactos.org/svn/reactos?rev=33497&view=rev Log: don't display all debug data 4 times when using PipeReader class (spotted by janderwald) Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp [iso-8859-1] Tue May 13 12:17:31 2008 @@ -95,6 +95,7 @@ free(buf); return false; } + fflush(m_File); string line(buf); lines.push_back(line); return true;

16 years, 4 months

[janderwald] 33496: - move hardcoded xen configuration name to config file

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue May 13 11:22:31 2008 New Revision: 33496 URL: http://svn.reactos.org/svn/reactos?rev=33496&view=rev Log: - move hardcoded xen configuration name to config file Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Tue May 13 11:22:31 2008 @@ -66,6 +66,7 @@ string RosBootTest::ROS_EMU_MEM = "ROS_EMU_MEM"; string RosBootTest::ROS_BOOT_CMD = "ROS_BOOT_CMD"; string RosBootTest::XEN_CONFIG_FILE = "XEN_CONFIG_FILE"; + string RosBootTest::XEN_CONFIG_NAME = "XEN_CONFIG_NAME"; #ifdef __LINUX__ string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_LIN"; @@ -662,7 +663,7 @@ } //--------------------------------------------------------------------------------------- - bool RosBootTest::configureXen() + bool RosBootTest::configureXen(ConfigParser &conf_parser) { if (!xenGetCaps()) { @@ -674,8 +675,9 @@ cerr << "Xen configuration file missing" << endl; return false; } - - m_Src = "xm console reactos"; + m_Src = "xm console "; + string xen_name = "reactos"; + conf_parser.getStringValue(RosBootTest::XEN_CONFIG_NAME, xen_name); m_DataSource = new PipeReader(); m_BootCmd = m_EmuPath + "/xm create " + m_XenConfig; @@ -740,14 +742,17 @@ return true; } //--------------------------------------------------------------------------------------- - void RosBootTest::cleanup() + void RosBootTest::cleanup(ConfigParser &conf_parser) { m_DataSource->closeSource(); OsSupport::delayExecution(3); if (m_EmuType == EMU_TYPE_XEN) { - system("xm destroy reactos"); + string xen_name = "reactos"; + conf_parser.getStringValue(RosBootTest::XEN_CONFIG_NAME, xen_name); + string cmd = "xm destroy " + xen_name; + system(cmd.c_str ()); } else { @@ -791,7 +796,7 @@ } else if (m_EmuType == EMU_TYPE_XEN) { - if (!configureXen()) + if (!configureXen(conf_parser)) { cerr << "Error: failed to configure xen" << endl; return false; @@ -815,7 +820,7 @@ if (!m_DataSource->openSource(m_Src)) { cerr << "Error: failed to open data source with " << m_Src << endl; - cleanup(); + cleanup(conf_parser); return false; } #ifdef __LINUX__ @@ -832,7 +837,7 @@ if (!file) { cerr << "Error: failed to launch emulator" << endl; - cleanup(); + cleanup(conf_parser); return false; } char buffer[128]; @@ -840,7 +845,7 @@ { cerr << "Error: pid file w/o pid!!! " << endl; fclose(file); - cleanup(); + cleanup(conf_parser); return false; } m_Pid = atoi(buffer); @@ -856,10 +861,10 @@ OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); #endif - bool ret = analyzeDebugData(); - cleanup(); - - return ret; + bool ret = analyzeDebugData(); + cleanup(conf_parser); + + return ret; } //--------------------------------------------------------------------------------------- void RosBootTest::dumpCheckpoints() Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] Tue May 13 11:22:31 2008 @@ -57,6 +57,7 @@ static string ROS_EMU_MEM; static string ROS_BOOT_CMD; static string XEN_CONFIG_FILE; + static string XEN_CONFIG_NAME; //--------------------------------------------------------------------------------------- /// @@ -109,10 +110,10 @@ bool readConfigurationValues(ConfigParser & conf_parser); bool configureQemu(); bool configureVmWare(); - bool configureXen(); + bool configureXen(ConfigParser &conf_parser); bool hasQemuNoRebootOption(); - void cleanup(); - bool xenGetCaps(); + void cleanup(ConfigParser &conf_parser); + bool xenGetCaps(); //--------------------------------------------------------------------------------------- /// /// dumpCheckpoints Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg [iso-8859-1] Tue May 13 11:22:31 2008 @@ -2,7 +2,7 @@ ; ; This variable defines which emulator should be used to emulate ReactOS ; -;ROS_EMU_TYPE=[qemu|vmware] +;ROS_EMU_TYPE=[qemu|vmware|xen] ROS_EMU_TYPE=qemu @@ -98,3 +98,13 @@ ; ROS_BOOT_CMD=/usr/bin/qemu -serial stdio -m 64 -hda ~/reactos/qemu/ReactOS.hd -boot d -cdrom ~/reactos/qemu/bootcd.iso ; -no-reboot +; XEN_CONFIG_FILE +; +; Set this variable to path of xen config file when ROS_EMU_TYPE=xen is used +; XEN_CONFIG_FILE= + + +; XEN_CONFIG_NAME +; +; Set this variable to the name of xen station +; XEN_CONFIG_NAME=

16 years, 4 months

[dchapyshev] 33495: - Update Russian translation - Small fix mstsc icon

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue May 13 08:46:31 2008 New Revision: 33495 URL: http://svn.reactos.org/svn/reactos?rev=33495&view=rev Log: - Update Russian translation - Small fix mstsc icon Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/res/mstsc.ico Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Tue May 13 08:46:31 2008 @@ -240,7 +240,7 @@ LTEXT "Êàëüêóëÿòîð ReactOS",IDC_STATIC,120,12,132,8, SS_CENTERIMAGE LTEXT "Âåðñèÿ ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE - LTEXT "Íàïèñàíî Êàðëî Áðàìèíè",IDC_STATIC,120,32,132,8, + LTEXT "Àâòîð: Êàðëî Áðàìèíè",IDC_STATIC,120,32,132,8, SS_CENTERIMAGE GROUPBOX "",IDC_STATIC,112,0,148,52 GROUPBOX "",IDC_STATIC,4,56,256,88 Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc [iso-8859-1] Tue May 13 08:46:31 2008 @@ -7,8 +7,8 @@ STRINGTABLE BEGIN IDS_SECONDS, "ñåêóíä" - IDS_NOBODY, "Nobody" - IDS_ABOUT, "by Joshua Thielen and ReactOS developers" + IDS_NOBODY, "íåèçâåñòíûé" + IDS_ABOUT, "Joshua Thielen è ðàçðàáîò÷èêè ReactOS" END IDM_WINEMINE MENU DISCARDABLE @@ -50,7 +50,7 @@ LTEXT "", IDC_NAME2, 132, 30, 55, 8 LTEXT "", IDC_NAME3, 132, 40, 55, 8 DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 - PUSHBUTTON "&Ñáðîñèòü", IDRESET, 18, 57, 67, 15 + PUSHBUTTON "&Ñáðîñèòü", IDRESET, 18, 57, 67, 15 END IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] Tue May 13 08:46:31 2008 @@ -7,15 +7,15 @@ GROUPBOX "Íàñòðîéêè âõîäà",IDC_STATIC,7,7,228,89 GROUPBOX "Íàñòðîéêè ïîäêëþ÷åíèÿ",IDC_STATIC,7,103,228,65 ICON "", IDC_LOGONICON, 15,19,20,20 - LTEXT "Ââåäèòå àäðåñ ñåðâåðà",IDC_STATIC,47,24,81,8 - LTEXT "Ñåðâåð:",IDC_STATIC,47,41,25,8 - LTEXT "Èìÿ ïîëüçîâàòåëÿ:",IDC_STATIC,47,58,38,8 - COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ñîõðàíèòü",IDC_SAVE,67,139,50,14 - PUSHBUTTON "Ñîõðàíèòü êàê...",IDC_SAVEAS,123,139,50,14 + LTEXT "Ââåäèòå àäðåñ ñåðâåðà",IDC_STATIC,47,24,100,8 + LTEXT "Ñåðâåð:",IDC_STATIC,52,41,31,8 + LTEXT "Èìÿ ïîëüçîâàòåëÿ:",IDC_STATIC,15,58,67,8 + COMBOBOX IDC_SERVERCOMBO,86,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü",IDC_SAVE,49,139,50,14 + PUSHBUTTON "Ñîõðàíèòü êàê...",IDC_SAVEAS,103,139,70,14 PUSHBUTTON "Îòêðûòü...",IDC_OPEN,177,139,50,14 ICON "", IDC_CONNICON, 16,114,20,20 - LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòâóþùóþ êîíôèãóðàöèþ",IDC_STATIC,50,115,172,20 + LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòâóþùóþ êîíôèãóðàöèþ.",IDC_STATIC,50,115,172,20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 @@ -26,17 +26,17 @@ GROUPBOX "Öâåòà",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "Óñòàíîâèòü ðàçìåð ýêðàíà íà óäàëåííîì êîìïüþòåðå. Ïåðåòàùèòå ïîëçóíîê â êðàéíåå ïðàâîå ïîëîæåíèå äëÿ ïåðåõîäà â ïîëíîýêðàííûé ðåæèì.",IDC_STATIC,53,22,175,21 + LTEXT "Óñòàíîâèòü ðàçìåð ýêðàíà íà óäàëåííîì êîìïüþ-\nòåðå. Ïåðåòàùèòå ïîëçóíîê â êðàéíåå ïðàâîå ïîëîæåíèå äëÿ ïåðåõîäà â ïîëíîýêðàííûé ðåæèì.",IDC_STATIC,53,17,175,24 CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 LTEXT "Ïðèìå÷àíèå: Ýòè ïàðàìåòðû îïðåäåëÿþòñÿ íàñòðîéêàìè óäàëåííîãî êîìïüþòåðà.",IDC_STATIC,56,143,165,18 - LTEXT "Ìåíüøå",IDC_STATIC,35,52,15,8 - LTEXT "Áîëüøå",IDC_STATIC,189,51,17,8 + LTEXT "ìåíüøå",IDC_STATIC,20,52,30,8 + LTEXT "áîëüøå",IDC_STATIC,189,51,32,8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END -IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 275 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ïîäêëþ÷åíèå ê óäàëåííîìó ðàáî÷åìó ñòîëó" FONT 8, "MS Shell Dlg", 400, 0, 0x1 Modified: trunk/reactos/base/applications/mstsc/res/mstsc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== Binary files - no diff available.

16 years, 4 months

[mpiulachs] 33494: - [FORMATTING] replace tabs by spaces - Modified keyboard layout listbox location to give usetup a more consistent look

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue May 13 06:43:39 2008 New Revision: 33494 URL: http://svn.reactos.org/svn/reactos?rev=33494&view=rev Log: - [FORMATTING] replace tabs by spaces - Modified keyboard layout listbox location to give usetup a more consistent look Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Tue May 13 06:43:39 2008 @@ -288,45 +288,45 @@ DrawScrollBarGenericList(PGENERIC_LIST GenericList) { COORD coPos; - DWORD Written; + DWORD Written; coPos.X = GenericList->Right + 1; coPos.Y = GenericList->Top; - if (GenericList->FirstShown != GenericList->ListHead.Flink) - { + if (GenericList->FirstShown != GenericList->ListHead.Flink) + { FillConsoleOutputCharacterA (StdOutput, '\x18', 1, coPos, &Written); - } - else - { + } + else + { FillConsoleOutputCharacterA (StdOutput, ' ', 1, coPos, &Written); - } - - coPos.Y = GenericList->Bottom; - if (GenericList->LastShown != GenericList->ListHead.Blink) - { + } + + coPos.Y = GenericList->Bottom; + if (GenericList->LastShown != GenericList->ListHead.Blink) + { FillConsoleOutputCharacterA (StdOutput, '\x19', 1, coPos, &Written); - } - else - { + } + else + { FillConsoleOutputCharacterA (StdOutput, ' ', 1, coPos, &Written); - } + } } VOID @@ -348,7 +348,7 @@ return; DrawListEntries(List); - DrawScrollBarGenericList(List); + DrawScrollBarGenericList(List); } @@ -369,8 +369,9 @@ List->LastShown = List->LastShown->Flink; } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + DrawListEntries(List); - DrawScrollBarGenericList(List); + DrawScrollBarGenericList(List); } } @@ -392,8 +393,9 @@ List->LastShown = List->LastShown->Blink; } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + DrawListEntries(List); - DrawScrollBarGenericList(List); + DrawScrollBarGenericList(List); } } Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue May 13 06:43:39 2008 @@ -1249,7 +1249,7 @@ DrawGenericList(LayoutList, 2, - 15, + 18, xScreen - 3, yScreen - 3);

16 years, 4 months

[mpiulachs] 33493: - fixed and simplified scroll behavior

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue May 13 06:29:56 2008 New Revision: 33493 URL: http://svn.reactos.org/svn/reactos?rev=33493&view=rev Log: - fixed and simplified scroll behavior Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Tue May 13 06:29:56 2008 @@ -238,25 +238,7 @@ ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); if (coPos.Y == GenericList->Bottom) - { - coPos.X = GenericList->Right - 4; - coPos.Y = GenericList->Top; - WriteConsoleOutputCharacterA (StdOutput, - (LPCTSTR)"(\x18)", - 3, - coPos, - &Written); - - coPos.X = GenericList->Right - 4; - coPos.Y = GenericList->Bottom; - WriteConsoleOutputCharacterA (StdOutput, - (LPCTSTR)"(\x19)", - 3, - coPos, - &Written); break; - } - GenericList->LastShown = Entry; FillConsoleOutputAttribute (StdOutput, @@ -302,6 +284,50 @@ } } +static VOID +DrawScrollBarGenericList(PGENERIC_LIST GenericList) +{ + COORD coPos; + DWORD Written; + + coPos.X = GenericList->Right + 1; + coPos.Y = GenericList->Top; + + if (GenericList->FirstShown != GenericList->ListHead.Flink) + { + FillConsoleOutputCharacterA (StdOutput, + '\x18', + 1, + coPos, + &Written); + } + else + { + FillConsoleOutputCharacterA (StdOutput, + ' ', + 1, + coPos, + &Written); + } + + coPos.Y = GenericList->Bottom; + if (GenericList->LastShown != GenericList->ListHead.Blink) + { + FillConsoleOutputCharacterA (StdOutput, + '\x19', + 1, + coPos, + &Written); + } + else + { + FillConsoleOutputCharacterA (StdOutput, + ' ', + 1, + coPos, + &Written); + } +} VOID DrawGenericList(PGENERIC_LIST List, @@ -322,6 +348,7 @@ return; DrawListEntries(List); + DrawScrollBarGenericList(List); } @@ -329,26 +356,12 @@ ScrollDownGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; - COORD coPos; - DWORD Written; if (List->CurrentEntry == NULL) return; if (List->CurrentEntry->Entry.Flink != &List->ListHead) { - if (List->LastShown != &List->ListHead) - { - /* Draw lower edge */ - coPos.X = List->Left + 1; - coPos.Y = List->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - List->Right - List->Left - 1, - coPos, - &Written); - } - Entry = List->CurrentEntry->Entry.Flink; if (List->LastShown == &List->CurrentEntry->Entry) { @@ -357,6 +370,7 @@ } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); + DrawScrollBarGenericList(List); } } @@ -365,8 +379,6 @@ ScrollUpGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; - COORD coPos; - DWORD Written; if (List->CurrentEntry == NULL) return; @@ -381,17 +393,7 @@ } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); - } - else - { - /* Draw upper edge */ - coPos.X = List->Left + 1; - coPos.Y = List->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - List->Right - List->Left - 1, - coPos, - &Written); + DrawScrollBarGenericList(List); } } Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Tue May 13 06:29:56 2008 @@ -53,6 +53,9 @@ SHORT Bottom); VOID +DrawScrollBarGenericLis(PGENERIC_LIST List); + +VOID ScrollDownGenericList(PGENERIC_LIST List); VOID

16 years, 4 months

[cfinck] 33492: Use a Mutex, so that CPL applets cannot be launched multiple times. Fixes bug #781 partly, we still need a fix in "control.exe" (see my comment in the bug report)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue May 13 03:56:23 2008 New Revision: 33492 URL: http://svn.reactos.org/svn/reactos?rev=33492&view=rev Log: Use a Mutex, so that CPL applets cannot be launched multiple times. Fixes bug #781 partly, we still need a fix in "control.exe" (see my comment in the bug report) Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] Tue May 13 03:56:23 2008 @@ -353,7 +353,11 @@ LPWSTR extraPmts = NULL; int quoted = 0; BOOL spSet = FALSE; - + HANDLE hMutex; + + hMutex = CreateMutex(NULL, FALSE, (LPCTSTR) wszCmd); + if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) + return NULL; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -412,6 +416,7 @@ } Control_UnloadApplet(applet); } + ReleaseMutex(hMutex); HeapFree(GetProcessHeap(), 0, buffer); }

16 years, 4 months

[frik85] 33491: improve visual scroll behavior (arrow-up/-down hints) of the generic list (first step setup)

by frik85＠svn.reactos.org

Author: frik85 Date: Tue May 13 03:04:59 2008 New Revision: 33491 URL: http://svn.reactos.org/svn/reactos?rev=33491&view=rev Log: improve visual scroll behavior (arrow-up/-down hints) of the generic list (first step setup) Modified: trunk/reactos/base/setup/usetup/genlist.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Tue May 13 03:04:59 2008 @@ -238,7 +238,25 @@ ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); if (coPos.Y == GenericList->Bottom) + { + coPos.X = GenericList->Right - 4; + coPos.Y = GenericList->Top; + WriteConsoleOutputCharacterA (StdOutput, + (LPCTSTR)"(\x18)", + 3, + coPos, + &Written); + + coPos.X = GenericList->Right - 4; + coPos.Y = GenericList->Bottom; + WriteConsoleOutputCharacterA (StdOutput, + (LPCTSTR)"(\x19)", + 3, + coPos, + &Written); break; + } + GenericList->LastShown = Entry; FillConsoleOutputAttribute (StdOutput, @@ -311,12 +329,26 @@ ScrollDownGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; + COORD coPos; + DWORD Written; if (List->CurrentEntry == NULL) return; if (List->CurrentEntry->Entry.Flink != &List->ListHead) { + if (List->LastShown != &List->ListHead) + { + /* Draw lower edge */ + coPos.X = List->Left + 1; + coPos.Y = List->Bottom; + FillConsoleOutputCharacterA (StdOutput, + 0xC4, // '-', + List->Right - List->Left - 1, + coPos, + &Written); + } + Entry = List->CurrentEntry->Entry.Flink; if (List->LastShown == &List->CurrentEntry->Entry) { @@ -333,6 +365,8 @@ ScrollUpGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; + COORD coPos; + DWORD Written; if (List->CurrentEntry == NULL) return; @@ -348,6 +382,17 @@ List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); } + else + { + /* Draw upper edge */ + coPos.X = List->Left + 1; + coPos.Y = List->Top; + FillConsoleOutputCharacterA (StdOutput, + 0xC4, // '-', + List->Right - List->Left - 1, + coPos, + &Written); + } }

16 years, 4 months

[jimtabor] 33490: Added W32PF and Brush flags. Fixed IntGdiExtCreatePen and all related so to pass wine gdi32 pen tests. Fail 100 out of 664 no skips.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue May 13 00:13:25 2008 New Revision: 33490 URL: http://svn.reactos.org/svn/reactos?rev=33490&view=rev Log: Added W32PF and Brush flags. Fixed IntGdiExtCreatePen and all related so to pass wine gdi32 pen tests. Fail 100 out of 664 no skips. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Tue May 13 00:13:25 2008 @@ -1392,7 +1392,7 @@ return NtGdiSelectBrush(hDC, hGdiObj); case GDI_OBJECT_TYPE_PEN: -// case GDI_OBJECT_TYPE_EXTPEN: + case GDI_OBJECT_TYPE_EXTPEN: #if 0 // enable this when support is ready in win32k hOldObj = pDc_Attr->hpen; pDc_Attr->ulDirty_ |= DC_PEN_DIRTY; Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Tue May 13 00:13:25 2008 @@ -58,7 +58,7 @@ } GDIBRUSHINST, *PGDIBRUSHINST; /* GDI Brush Attributes */ - +#define GDIBRUSH_NEED_FG_CLR 0x0001 #define GDIBRUSH_NEED_BK_CLR 0x0002 /* Background color is needed */ #define GDIBRUSH_DITHER_OK 0x0004 /* Allow color dithering */ #define GDIBRUSH_IS_SOLID 0x0010 /* Solid brush */ @@ -69,7 +69,12 @@ #define GDIBRUSH_IS_GLOBAL 0x0200 /* Stock objects */ #define GDIBRUSH_IS_PEN 0x0400 /* Pen */ #define GDIBRUSH_IS_OLDSTYLEPEN 0x0800 /* Geometric pen */ +#define GDIBRUSH_IS_DIBPALCOLORS 0x1000 +#define GDIBRUSH_IS_DIBPALINDICE 0x2000 +#define GDIBRUSH_IS_DEFAULTSTYLE 0x4000 #define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transparent mask (?) */ +#define GDIBRUSH_IS_INSIDEFRAME 0x00010000 +#define GDIBRUSH_CACHED_ENGINE 0x00040000 #define GDIBRUSH_CACHED_IS_SOLID 0x80000000 #define BRUSHOBJ_AllocBrush() ((PGDIBRUSHOBJ) GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Tue May 13 00:13:25 2008 @@ -2,9 +2,34 @@ #define __WIN32K_MISC_H /* W32PROCESS flags */ -#define W32PF_NOWINDOWGHOSTING (0x0001) -#define W32PF_MANUALGUICHECK (0x0002) -#define W32PF_CREATEDWINORDC (0x0004) +#define W32PF_CONSOLEAPPLICATION 0x00000001 +#define W32PF_FORCEOFFFEEDBACK 0x00000002 +#define W32PF_STARTGLASS 0x00000004 +#define W32PF_WOW 0x00000008 +#define W32PF_READSCREENACCESSGRANTED 0x00000010 +#define W32PF_INITIALIZED 0x00000020 +#define W32PF_APPSTARTING 0x00000040 +#define W32PF_WOW64 0x00000080 +#define W32PF_ALLOWFOREGROUNDACTIVATE 0x00000100 +#define W32PF_OWNDCCLEANUP 0x00000200 +#define W32PF_SHOWSTARTGLASSCALLED 0x00000400 +#define W32PF_FORCEBACKGROUNDPRIORITY 0x00000800 +#define W32PF_TERMINATED 0x00001000 +#define W32PF_CLASSESREGISTERED 0x00002000 +#define W32PF_THREADCONNECTED 0x00004000 +#define W32PF_PROCESSCONNECTED 0x00008000 +#define W32PF_WAKEWOWEXEC 0x00010000 +#define W32PF_WAITFORINPUTIDLE 0x00020000 +#define W32PF_IOWINSTA 0x00040000 +#define W32PF_CONSOLEFOREGROUND 0x00080000 +#define W32PF_OLELOADED 0x00100000 +#define W32PF_SCREENSAVER 0x00200000 +#define W32PF_IDLESCREENSAVER 0x00400000 +// ReactOS +#define W32PF_NOWINDOWGHOSTING (0x01000000) +#define W32PF_MANUALGUICHECK (0x02000000) +#define W32PF_CREATEDWINORDC (0x04000000) + ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); DWORD STDCALL IntGetQueueStatus(BOOL ClearChanges); Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] Tue May 13 00:13:25 2008 @@ -8,16 +8,24 @@ #define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) #define PENOBJ_AllocPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT_TYPE_PEN) + +#define PENOBJ_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) #define PENOBJ_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN) -#define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) + +//#define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) + #define PENOBJ_AllocExtPen() ((PGDIBRUSHOBJ)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) #define PENOBJ_AllocExtPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_EXTPEN)) -#define PENOBJ_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT_TYPE_EXTPEN) + +#define PENOBJ_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) #define PENOBJ_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN) -#define PENOBJ_LockExtPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN)) + +//#define PENOBJ_LockExtPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN)) + #define PENOBJ_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr((POBJ)pPenObj) + +PGDIBRUSHOBJ FASTCALL PENOBJ_LockPen(HGDIOBJ); INT STDCALL PEN_GetObject(PGDIBRUSHOBJ hPen, INT Count, PLOGPEN Buffer); #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Tue May 13 00:13:25 2008 @@ -26,6 +26,16 @@ #include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ + +PGDIBRUSHOBJ +FASTCALL +PENOBJ_LockPen(HGDIOBJ hBMObj) +{ + if (GDI_HANDLE_GET_TYPE(hBMObj) == GDI_OBJECT_TYPE_EXTPEN) + return GDIOBJ_LockObj( hBMObj, GDI_OBJECT_TYPE_EXTPEN); + else + return GDIOBJ_LockObj( hBMObj, GDI_OBJECT_TYPE_PEN); +} HPEN STDCALL IntGdiExtCreatePen( @@ -37,7 +47,7 @@ IN ULONG_PTR ulHatch, DWORD dwStyleCount, PULONG pStyle, - IN ULONG cjDIB, + IN ULONG cjDIB, // FIXME! We are shipping this too! IN BOOL bOldStylePen, IN OPTIONAL HBRUSH hbrush) { @@ -49,6 +59,8 @@ static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0}; static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38}; + dwWidth = abs(dwWidth); + if (bOldStylePen) { PenObject = PENOBJ_AllocPenWithHandle(); @@ -65,6 +77,9 @@ return 0; } hPen = PenObject->BaseObject.hHmgr; + + // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. + if ((bOldStylePen) && (!dwWidth)) dwWidth = 1; PenObject->ptPenWidth.x = dwWidth; PenObject->ptPenWidth.y = 0; @@ -78,6 +93,10 @@ PenObject->flAttrs = bOldStylePen? GDIBRUSH_IS_OLDSTYLEPEN : GDIBRUSH_IS_PEN; + // If dwPenStyle is PS_COSMETIC, the width must be set to 1. + if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) + goto EEXIT; + switch (dwPenStyle & PS_STYLE_MASK) { case PS_NULL: @@ -89,6 +108,8 @@ break; case PS_ALTERNATE: + /* PS_ALTERNATE is applicable only for cosmetic pens */ + if ((dwPenStyle & PS_TYPE_MASK) == PS_GEOMETRIC) goto EEXIT; PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; @@ -115,10 +136,35 @@ case PS_INSIDEFRAME: /* FIXME: does it need some additional work? */ - PenObject->flAttrs |= GDIBRUSH_IS_SOLID; + /* PS_INSIDEFRAME is applicable only for geometric pens */ + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) goto EEXIT; + PenObject->flAttrs |= (GDIBRUSH_IS_SOLID|GDIBRUSH_IS_INSIDEFRAME); break; case PS_USERSTYLE: + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) + { + /* FIXME: PS_USERSTYLE workaround */ + DPRINT1("PS_COSMETIC | PS_USERSTYLE not handled\n"); + PenObject->flAttrs |= GDIBRUSH_IS_SOLID; + break; + } + else + { + UINT i; + BOOL has_neg = FALSE, all_zero = TRUE; + + for(i = 0; (i < dwStyleCount) && !has_neg; i++) + { + has_neg = has_neg || (((INT)(pStyle[i])) < 0); + all_zero = all_zero && (pStyle[i] == 0); + } + + if(all_zero || has_neg) + { + goto EEXIT; + } + } /* FIXME: what style here? */ PenObject->flAttrs |= 0; break; @@ -127,8 +173,16 @@ DPRINT1("IntGdiExtCreatePen unknown penstyle %x\n", dwPenStyle); } PENOBJ_UnlockPen(PenObject); - return hPen; + +EEXIT: + SetLastWin32Error(ERROR_INVALID_PARAMETER); + PENOBJ_UnlockPen(PenObject); + if (bOldStylePen) + PENOBJ_FreePenByHandle(hPen); + else + PENOBJ_FreeExtPenByHandle(hPen); + return NULL; } VOID FASTCALL @@ -201,9 +255,10 @@ COLORREF Color, IN HBRUSH hbr) { - if (PenStyle > PS_INSIDEFRAME) - { - PenStyle = PS_SOLID; + if ( PenStyle < PS_SOLID || PenStyle > PS_INSIDEFRAME ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; } return IntGdiExtCreatePen(PenStyle, @@ -237,8 +292,10 @@ DWORD* pSafeStyle = NULL; HPEN hPen; + if (dwStyleCount < 0) return 0; if (dwStyleCount > 16) { + SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; } @@ -281,12 +338,7 @@ cjDIB, bOldStylePen, hBrush); - - if ((!hPen) && (pSafeStyle)) - { - ExFreePool(pSafeStyle); - } - +// BRUSH_Cleanup takes care of pSafeStyle return hPen; }

16 years, 4 months

← Newer
1
...
27
28
29
30
31
32
33
...
59
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 May 2008