Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 28842: - fix target
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 17:56:21 2007 New Revision: 28842 URL: http://svn.reactos.org/svn/reactos?rev=28842&view=rev Log: - fix target Modified: trunk/reactos/tools/dbgprint/dbgprint.mak Modified: trunk/reactos/tools/dbgprint/dbgprint.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/dbgprint/dbgprint.ma… ============================================================================== --- trunk/reactos/tools/dbgprint/dbgprint.mak (original) +++ trunk/reactos/tools/dbgprint/dbgprint.mak Tue Sep 4 17:56:21 2007 @@ -16,7 +16,7 @@ endif DBGPRINT_TARGET = \ - $(EXEPREFIX)$(DBGPRINT_OUT_)DBGPRINT$(EXEPOSTFIX) + $(EXEPREFIX)$(DBGPRINT_OUT_)dbgprint$(EXEPOSTFIX) DBGPRINT_SOURCES = $(addprefix $(DBGPRINT_BASE_), \ dbgprint.c \

1 0

[janderwald] 28841: - add disk param when booting from cdrom - hardcode vnc 0 option to linux build - make -no-reboot option available for windows hosts only
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 17:47:08 2007 New Revision: 28841 URL: http://svn.reactos.org/svn/reactos?rev=28841&view=rev Log: - add disk param when booting from cdrom - hardcode vnc 0 option to linux build - make -no-reboot option available for windows hosts only Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp 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 (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Sep 4 17:47:08 2007 @@ -266,6 +266,13 @@ { /* boot from cdrom */ m_BootCmd += _T(" -boot d -cdrom ") + m_CDImage; + + if (m_HDDImage.length ()) + { + /* add disk when specified */ + m_BootCmd += _T(" -hda ") + m_HDDImage; + } + } else if (m_HDDImage.length ()) { @@ -291,11 +298,14 @@ m_PidFile += _T("/pid.txt"); m_BootCmd += _T(" -pidfile "); m_BootCmd += m_PidFile; + m_BootCmd += _T(" -vnc 0"); +#else + + if (hasQemuNoRebootOption()) + { + m_BootCmd += _T(" -no-reboot "); + } #endif - if (hasQemuNoRebootOption()) - { - m_BootCmd += _T(" -no-reboot "); - } return true; } //----------------------------------------------------------------------------------------

1 0

[cwittich] 28840: -fix build
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Tue Sep 4 17:37:09 2007 New Revision: 28840 URL: http://svn.reactos.org/svn/reactos?rev=28840&view=rev Log: -fix build Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp 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 (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Sep 4 17:37:09 2007 @@ -170,7 +170,7 @@ options[0] = (TCHAR*)qemuimgdir.c_str(); options[2] = (TCHAR*)image.c_str(); - cerr << "Creating HDD Image ..." << output << endl; + cerr << "Creating HDD Image ..." << image << endl; if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 4, options, true)) { m_HDDImage = image;

1 0

[janderwald] 28839: - fix serious bug in createHDDImage - delay reading if requested
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 17:31:03 2007 New Revision: 28839 URL: http://svn.reactos.org/svn/reactos?rev=28839&view=rev Log: - fix serious bug in createHDDImage - delay reading if requested Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp 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 (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Sep 4 17:31:03 2007 @@ -139,10 +139,9 @@ { string qemuimgdir; - string output; - if (!getQemuDir(qemuimgdir)) { + cerr << "Error: failed to retrieve qemu directory path" << endl; return false; } @@ -174,7 +173,7 @@ cerr << "Creating HDD Image ..." << output << endl; if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 4, options, true)) { - m_HDDImage = output; + m_HDDImage = image; return true; } @@ -349,6 +348,7 @@ //---------------------------------------------------------------------------------------- bool RosBootTest::configureHDDImage() { + //cout << "configureHDDImage m_HDDImage " << m_HDDImage.length() << " m_CDImage " << m_CDImage.length() << " m_BootCmd: " << m_BootCmd.length() << endl; if (m_HDDImage.length()) { /* check if ROS_HDD_IMAGE points to hdd image */ @@ -660,9 +660,13 @@ cleanup(); return false; } + + if (m_DelayRead) + { + OsSupport::delayExecution(m_DelayRead); + } + #ifdef __LINUX__ - - OsSupport::delayExecution(3); /* * For linux systems we can only * check if the emulator runs by

1 0

[jimtabor] 28838: Fix processid mask, update gdi handle entry, shift mask and VM memory alloc.
by jimtabor＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: jimtabor Date: Tue Sep 4 15:30:49 2007 New Revision: 28838 URL: http://svn.reactos.org/svn/reactos?rev=28838&view=rev Log: Fix processid mask, update gdi handle entry, shift mask and VM memory alloc. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Tue Sep 4 15:30:49 2007 @@ -78,7 +78,7 @@ if (((ULONG_PTR)(hGdiObj)) & GDI_HANDLE_UPPER_MASK ) return hGdiObj; PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); return hGdiObj = (HGDIOBJ)(((LONG_PTR)(hGdiObj)) | - (Entry->Type << 16)); // Rebuild handle for Object + (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); // Rebuild handle for Object } /* Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Sep 4 15:30:49 2007 @@ -161,8 +161,9 @@ typedef struct _GDI_TABLE_ENTRY { PVOID KernelData; /* Points to the kernel mode structure */ - HANDLE ProcessId; /* process id that created the object, 0 for stock objects */ - LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ + SHORT ProcessId; /* process id that created the object, 0 for stock objects */ + SHORT nCount; /* usage count of object handles */ + LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Sep 4 15:30:49 2007 @@ -2374,7 +2374,7 @@ &NewMem, 0, &MemSize, - MEM_COMMIT, + MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE); KeEnterCriticalRegion(); { Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Tue Sep 4 15:30:49 2007 @@ -89,7 +89,7 @@ { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)dc->hSelf); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - HANDLE ProcessId = (HANDLE)(((ULONG_PTR)(Entry->ProcessId)) & 0x0000ffff); + HANDLE ProcessId = (HANDLE)(((ULONG_PTR)(Entry->ProcessId)) & ~1); DC_ATTR lDc_AttrData; if(Entry->UserData)

1 0

[cwittich] 28837: fix compilation on linux
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Tue Sep 4 15:10:17 2007 New Revision: 28837 URL: http://svn.reactos.org/svn/reactos?rev=28837&view=rev Log: fix compilation on linux Modified: trunk/reactos/tools/sysreg/os_support.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Tue Sep 4 15:10:17 2007 @@ -126,7 +126,7 @@ void OsSupport::delayExecution(long value) { - sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); + sleep( (clock_t)value * CLOCKS_PER_SEC ); }

1 0

[janderwald] 28836: - silence debug message - dont hardcode paths in regression testing code
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 15:03:16 2007 New Revision: 28836 URL: http://svn.reactos.org/svn/reactos?rev=28836&view=rev Log: - silence debug message - dont hardcode paths in regression testing code Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Tue Sep 4 15:03:16 2007 @@ -2158,7 +2158,7 @@ }while(SetupFindNextLine(&InfContext, &InfContext)); } - DPRINT1("BootCDRegtestActive %d\n", BootCDRegtestActive); + DPRINT("BootCDRegtestActive %d\n", BootCDRegtestActive); if (BootCDRegtestActive) { char szPath[MAX_PATH]; @@ -2188,12 +2188,21 @@ (const BYTE*)szPath, strlen(szPath) * sizeof(char)); - strcpy(szPath, "C:\\ReactOS\\bin\\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); - fwrite(szPath, 1, strlen(szPath) + 1, file); - strcpy(szPath, "C:\\ReactOS\\system32\\shutdown.exe -s"); - fwrite(szPath, 1, strlen(szPath) + 1, file); + if (GetSystemDirectoryA(szPath, MAX_PATH)) + { + UINT length = strlen(szPath); + + if (szPath[length-1] != '\\') + { + szPath[length] = '\\'; + length++; + } + strcpy(&szPath[length], "bin\\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); + fwrite(szPath, 1, strlen(szPath) + 1, file); + strcpy(&szPath[length], "system32\\shutdown.exe -s"); + fwrite(szPath, 1, strlen(szPath) + 1, file); + } fclose(file); - } RegCloseKey(hKey); return TRUE;

1 0

[janderwald] 28835: - include unattend.inf per default in the bootcd - unattend setup is disabled by the key UnattendSetupEnabled - to enable set key to "yes" without quotes
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 14:36:22 2007 New Revision: 28835 URL: http://svn.reactos.org/svn/reactos?rev=28835&view=rev Log: - include unattend.inf per default in the bootcd - unattend setup is disabled by the key UnattendSetupEnabled - to enable set key to "yes" without quotes Removed: trunk/reactos/boot/bootdata/unattend.inf.sample Modified: trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/boot/bootdata/unattend.inf Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild Tue Sep 4 14:36:22 2007 @@ -7,7 +7,7 @@ <cdfile base="$(CDOUTPUT)">hivesft.inf</cdfile> <cdfile base="$(CDOUTPUT)">hivesys.inf</cdfile> <cdfile base="$(CDOUTPUT)">txtsetup.sif</cdfile> - +<cdfile base="$(CDOUTPUT)">unattend.inf</cdfile> <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> Modified: trunk/reactos/boot/bootdata/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf (original) +++ trunk/reactos/boot/bootdata/unattend.inf Tue Sep 4 14:36:22 2007 @@ -7,7 +7,7 @@ ; yes - unattend setup enabled ; no - unattend setup disabled -UnattendSetupEnabled = yes +UnattendSetupEnabled = no ; Install to \Device\Harddisk0\Partition1\ReactOS DestinationDiskNumber = 0 Removed: trunk/reactos/boot/bootdata/unattend.inf.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf.sample (original) +++ trunk/reactos/boot/bootdata/unattend.inf.sample (removed) @@ -1,60 +1,0 @@ -; In order to get unattended setup working: -; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed -; 2. Uncomment the line in bootdata.rbuild to include it into bootcd - -[Unattend] -Signature = "$ReactOS$" - -; yes - unattend setup enabled -; no - unattend setup disabled -UnattendSetupEnabled = yes - -; Install to \Device\Harddisk0\Partition1\ReactOS -DestinationDiskNumber = 0 -DestinationPartitionNumber = 1 -InstallationDirectory=ReactOS - -; MBRInstallType=0 skips MBR installation -; MBRInstallType=1 install MBR on floppy -; MBRInstallType=2 install MBR on hdd -MBRInstallType=2 - -FullName="MyName" -;OrgName="MyOrg" -ComputerName="MYCOMPUTERNAME"; -AdminPassword="MyPassword" - -; TimeZone is set GMT as default -TimeZoneIndex=85 - -; enable this setting to disable daylight saving changes -; DisableAutoDaylightTimeSet = 1 - -; enable this setting to format the selected partition -; 1 - format enabled -; 0 - format disabled -FormatPartition=1 - -; enable this setting to automatically create a partition -; during installation -; 1 - enabled -; 0 - disabled -AutoPartition = 1 - -; enable this setting to disable vmware driver install -; yes - disabled -; no - enabled -DisableVmwInst = yes - -; set this option to automatically -; specify language in 2nd mode setup -; see hivesys.inf for available languages -; LocaleID = 407 - - -; enable this section to automatically launch programs -; after 3rd boot -; -; [GuiRunOnce] -; %SystemRoot%\system32\cmd.exe -

1 0

[janderwald] 28834: Copied remotely
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 14:33:32 2007 New Revision: 28834 URL: http://svn.reactos.org/svn/reactos?rev=28834&view=rev Log: Copied remotely Added: trunk/reactos/boot/bootdata/unattend.inf - copied unchanged from r28833, trunk/reactos/boot/bootdata/unattend.inf.sample

1 0

[dreimer] 28833: Luckily I forgot these files. So I can add a missing line in the commit message :-P Bug 2534: Few translations (temarez@yandex.ru)
by dreimer＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: dreimer Date: Tue Sep 4 14:24:41 2007 New Revision: 28833 URL: http://svn.reactos.org/svn/reactos?rev=28833&view=rev Log: Luckily I forgot these files. So I can add a missing line in the commit message :-P Bug 2534: Few translations (temarez(a)yandex.ru) Added: trunk/rosapps/sysutils/ctm/Uk.rc Modified: trunk/rosapps/sysutils/ctm/ctm.rc Added: trunk/rosapps/sysutils/ctm/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/Uk.rc?rev=288… ============================================================================== --- trunk/rosapps/sysutils/ctm/Uk.rc (added) +++ trunk/rosapps/sysutils/ctm/Uk.rc Tue Sep 4 14:24:41 2007 @@ -1,0 +1,38 @@ +/* + * PROJECT: ReactOS Console Task Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/sysutils/ctm/Uk.rc + * PURPOSE: Ukraianian Language File for Console Task Manager + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Êîíñîëüíèé Äèñïåò÷åð çàâäàíü v0.1 â³ä Aleksey Bragin <aleksey(a)studiocerebral.com>" + + IDS_COLUMN_NUMBER "# " + IDS_COLUMN_IMAGENAME "²ì'ÿ îáðàçó " + IDS_COLUMN_PID "PID " + IDS_COLUMN_CPU "CPU" + IDS_COLUMN_MEM "Âèêîðèñòàííÿ ïàì'ÿò³" + IDS_COLUMN_MEM_UNIT "KB" + IDS_COLUMN_PF "Ïîìèëîê ñòîð³íêè" + + IDS_IDLE_PROCESS "Íåä³ÿííÿ ñèñòåìè" + IDS_YES "Y" + IDS_NO "N" + + IDS_MENU "Íàòèñí³òü: q - âèéòè, k - çàâåðøèòè ïðîöåñ" + IDS_MENU_QUIT "Q" + IDS_MENU_KILL_PROCESS "K" + + IDS_KILL_PROCESS "Âè âïåâíåí³, ùî õî÷åòå çàâåðøèòè öåé ïðîöåñ? (y/n)" + IDS_KILL_PROCESS_ERR1 "Íåìîæëèâî çàâåðøèòè öåé ïðîöåñ..." + IDS_KILL_PROCESS_ERR2 "Íåìîæëèâî çàâåðøèòè ïðîöåñ %d (íåìîæëèâî âèêîíàòè OpenProcess)" + + IDS_CTM_GENERAL_ERR1 "ctm: íåìîæëèâî âèêîðèñòîâóâàòè êîíñîëü." + IDS_CTM_GENERAL_ERR2 "ctm: íåìîæëèâî âèêîíàòè GetConsoleMode() äëÿ ââåäåííÿ â êîíñîë³." + IDS_CTM_GENERAL_ERR3 "ctm: íåìîæëèâî âèêîíàòè GetConsoleMode() äëÿ âèâåäåííÿ â êîíñîë³." +END Modified: trunk/rosapps/sysutils/ctm/ctm.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/ctm.rc?rev=28… ============================================================================== --- trunk/rosapps/sysutils/ctm/ctm.rc (original) +++ trunk/rosapps/sysutils/ctm/ctm.rc Tue Sep 4 14:24:41 2007 @@ -13,4 +13,5 @@ #include "Fr.rc" #include "De.rc" #include "Gr.rc" +#include "Uk.rc" #include "Ru.rc"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs