Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 28642: fix linux build
by cwittich＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cwittich Date: Wed Aug 29 03:47:54 2007 New Revision: 28642 URL: http://svn.reactos.org/svn/reactos?rev=28642&view=rev Log: fix linux build Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/user_types.h 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 Wed Aug 29 03:47:54 2007 @@ -278,6 +278,7 @@ #ifdef __LINUX__ cerr << "Error: reading from pipes is not supported with linux hosts - use stdio" << endl; return false; + } #else pipe = pipe.substr(pos + 5, pipe.size() - pos - 5); pos = pipe.find(_T(" ")); @@ -816,7 +817,11 @@ if (!m_DataSource->readSource (vect)) { +#ifndef __LINUX__ cerr << "No data read" << GetLastError() << endl; +#else + cerr << "No data read" << endl; +#endif continue; } if (write_log) Modified: trunk/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?… ============================================================================== --- trunk/reactos/tools/sysreg/user_types.h (original) +++ trunk/reactos/tools/sysreg/user_types.h Wed Aug 29 03:47:54 2007 @@ -28,7 +28,7 @@ #define _tremove remove #define _ttoi atoi #define _T(x) x - #define _tfopen _open + #define _tfopen fopen #define _tcsstr strstr #define _fgetts fgets #define _tgetenv getenv

1 0

[janderwald] 28640: - always wait and then kill the emulator
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Wed Aug 29 02:48:40 2007 New Revision: 28640 URL: http://svn.reactos.org/svn/reactos?rev=28640&view=rev Log: - always wait and then kill the emulator 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 (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Aug 29 02:48:40 2007 @@ -526,17 +526,14 @@ //--------------------------------------------------------------------------------------- void RosBootTest::cleanup() { - m_DataSource->closeSource(); - if (m_KillEmulator == "yes") - { - OsSupport::sleep(3 * CLOCKS_PER_SEC); - if (m_Pid) - { - OsSupport::terminateProcess (m_Pid); - } - } + m_DataSource->closeSource(); + OsSupport::sleep(3 * CLOCKS_PER_SEC); + if (m_Pid) + { + OsSupport::terminateProcess (m_Pid); + } delete m_DataSource; - + m_DataSource = NULL; } //--------------------------------------------------------------------------------------- @@ -819,7 +816,7 @@ if (!m_DataSource->readSource (vect)) { - cerr << "No data read" << endl; + cerr << "No data read" << GetLastError() << endl; continue; } if (write_log) 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 (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Wed Aug 29 02:48:40 2007 @@ -10,17 +10,14 @@ ; ; This variable sets the path to the emulator ; -ROS_EMU_PATH=/usr/bin/qemu -;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe +ROS_EMU_PATH=E:\reactos\qemu\qemu.exe ; ROS_HDD_IMAGE ; ; The hdd image to use for running the emulator. If this variable is not -; set, SysReg will create a HDD with name "ros.hd" in the ROS_OUTPUT -; directory using the qemu-img tool. It will search +; set, SysReg will create a HDD with name "ros.img" using the qemu-img tool. It will search ; this tool in the directory of emulator and abort if the tool cannot be found -ROS_HDD_IMAGE=~/reactos/qemu/ReactOS.hd ;ROS_HDD_IMAGE=E:\reactos\qemu\ReactOS.hd ; ROS_CD_IMAGE @@ -29,8 +26,8 @@ ; an ReactOS unattended installation disk. If this variable is not set, SysReg lets the emulator boot ; from harddisk. ; -ROS_CD_IMAGE=~/reactos/qemu/bootcd.iso -;ROS_CD_IMAGE=E:\reactos\qemu\Reactos.iso + +;ROS_CD_IMAGE=E:\reactos\qemu\Reactos-Regtest.iso ;------------------------------------------------------------------------------------------- ; Additional Options

1 0

[janderwald] 28639: - fix compilation
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Wed Aug 29 02:47:16 2007 New Revision: 28639 URL: http://svn.reactos.org/svn/reactos?rev=28639&view=rev Log: - fix compilation 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 Wed Aug 29 02:47:16 2007 @@ -25,7 +25,7 @@ DBGPRINT_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(DBGPRINT_SOURCES:.c=.o)) -DBGPRINT_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk +DBGPRINT_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$(INTERMEDIATE_)$(SEP)include$(SEP)psdk DBGPRINT_HOST_LFLAGS = $(TOOLS_LFLAGS) -lntdll

1 0

[janderwald] 28638: - remove hack
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Wed Aug 29 02:36:21 2007 New Revision: 28638 URL: http://svn.reactos.org/svn/reactos?rev=28638&view=rev Log: - remove hack Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Aug 29 02:36:21 2007 @@ -417,8 +417,6 @@ media\inf\usb.inf 6 media\inf\usbstor.inf 6 media\inf\xboxdisp.inf 6 -boot\bootdata\unattend.inf 6 optional - ; Subsystems subsystems\win32\csrss\csrss.exe 1

1 0

[janderwald] 28637: - remove hack
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Wed Aug 29 02:28:56 2007 New Revision: 28637 URL: http://svn.reactos.org/svn/reactos?rev=28637&view=rev Log: - remove hack Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28637&r1=2863… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Aug 29 02:28:56 2007 @@ -444,26 +444,9 @@ world sysregtest: - -mkdir $(OUTPUT_)cd$(SEP)reactos - $(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample boot$(SEP)bootdata$(SEP)unattend.inf - $(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf - $(cp) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat.sample boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat - $(MAKE) dbgprint - $(MAKE) bootcdregtest - $(MAKE) sysreg - $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg rosboot - $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)secstage.cfg rosboot - $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)runonce.cfg rosboot - -sysregtest_clean: - $(rm) boot$(SEP)bootdata$(SEP)unattend.inf - $(rm) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat - $(rm) $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf - -regtest: - $(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf - $(MAKE) bootcdregtest - $(rm) $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf + $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg + $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg + $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg .PHONY: cb cb: $(RBUILD_TARGET)

1 0

[jimtabor] 28636: - Removed NtGdiPoly/Polygon from source, w32ksvc.db and updated ntgdibad.h. - Renamed the Nt function to GdiCreatePolyPolygonRgn, it is not safe so it will not be named to IntGdiXxX.
by jimtabor＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: jimtabor Date: Wed Aug 29 02:11:55 2007 New Revision: 28636 URL: http://svn.reactos.org/svn/reactos?rev=28636&view=rev Log: - Removed NtGdiPoly/Polygon from source, w32ksvc.db and updated ntgdibad.h. - Renamed the Nt function to GdiCreatePolyPolygonRgn, it is not safe so it will not be named to IntGdiXxX. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Aug 29 02:11:55 2007 @@ -161,14 +161,6 @@ INT Count, INT PolyFillMode); -/* Use NtGdiPolyPolyDraw with PolyPolyRgn. */ -HRGN -STDCALL -NtGdiCreatePolyPolygonRgn(CONST PPOINT pt, - CONST PINT PolyCounts, - INT Count, - INT PolyFillMode); - /* Meta are user-mode. */ BOOL STDCALL @@ -505,21 +497,6 @@ STDCALL NtGdiPolyTextOut(HDC hDC, CONST LPPOLYTEXTW txt, - int Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyPolygon. */ -BOOL -STDCALL -NtGdiPolygon(HDC hDC, - CONST PPOINT Points, - int Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyPolygon. */ -BOOL -STDCALL -NtGdiPolyPolygon(HDC hDC, - CONST LPPOINT Points, - CONST LPINT PolyCounts, int Count); /* Call UserRealizePalette. */ Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h Wed Aug 29 02:11:55 2007 @@ -18,6 +18,7 @@ BOOL INTERNAL_CALL RGNDATA_Cleanup(PVOID ObjectBody); BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); +HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Wed Aug 29 02:11:55 2007 @@ -805,183 +805,6 @@ #endif -BOOL -STDCALL -NtGdiPolygon(HDC hDC, - CONST PPOINT UnsafePoints, - int Count) -{ - DC *dc; - LPPOINT Safept; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret = FALSE; - - if ( Count < 2 ) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - _SEH_TRY - { - ProbeForRead(UnsafePoints, - Count * sizeof(POINT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - dc = DC_LockDc(hDC); - if(!dc) - SetLastWin32Error(ERROR_INVALID_HANDLE); - else - { - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_SHAPE); - if(!Safept) - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - else - { - _SEH_TRY - { - /* pointer was already probed! */ - RtlCopyMemory(Safept, - UnsafePoints, - Count * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - SetLastNtError(Status); - else - Ret = IntGdiPolygon(dc, Safept, Count); - - ExFreePool(Safept); - } - DC_UnlockDc(dc); - } - - return Ret; -} - - -BOOL -STDCALL -NtGdiPolyPolygon(HDC hDC, - CONST LPPOINT Points, - CONST LPINT PolyCounts, - int Count) -{ - DC *dc; - LPPOINT Safept; - LPINT SafePolyPoints; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - dc = DC_LockDc(hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if(Count > 0) - { - _SEH_TRY - { - ProbeForRead(Points, - Count * sizeof(POINT), - 1); - ProbeForRead(PolyCounts, - Count * sizeof(INT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - - Safept = ExAllocatePoolWithTag(PagedPool, (sizeof(POINT) + sizeof(INT)) * Count, TAG_SHAPE); - if(!Safept) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - SafePolyPoints = (LPINT)&Safept[Count]; - - _SEH_TRY - { - /* pointers already probed! */ - RtlCopyMemory(Safept, - Points, - Count * sizeof(POINT)); - RtlCopyMemory(SafePolyPoints, - PolyCounts, - Count * sizeof(INT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePool(Safept); - SetLastNtError(Status); - return FALSE; - } - } - else - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Ret = IntGdiPolyPolygon(dc, Safept, SafePolyPoints, Count); - - ExFreePool(Safept); - DC_UnlockDc(dc); - - return Ret; -} - ULONG_PTR STDCALL @@ -999,11 +822,11 @@ INT nPoints, nEmpty, nInvalid, i; if (iFunc == GdiPolyPolyRgn) - { // Rename me to FASTCALL GdiCreatePolyPolygonRgn - return (ULONG_PTR) NtGdiCreatePolyPolygonRgn((CONST PPOINT) Points, - (CONST PINT) PolyCounts, - Count, - (INT) hDC); + { + return (ULONG_PTR) GdiCreatePolyPolygonRgn((CONST PPOINT) Points, + (CONST PINT) PolyCounts, + Count, + (INT) hDC); } dc = DC_LockDc(hDC); if(!dc) Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Wed Aug 29 02:11:55 2007 @@ -3423,8 +3423,8 @@ HRGN -STDCALL -NtGdiCreatePolyPolygonRgn(CONST PPOINT pt, +FASTCALL +GdiCreatePolyPolygonRgn(CONST PPOINT pt, CONST PINT PolyCounts, INT Count, INT PolyFillMode) Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 29 02:11:55 2007 @@ -804,8 +804,6 @@ NtGdiPolylineTo 3 NtGdiPolyPolyline 4 NtGdiPolyTextOut 3 -NtGdiPolygon 3 -NtGdiPolyPolygon 4 NtGdiRealizePalette 1 NtGdiRemoveFontResource 1 #

1 0

[janderwald] 28635: - if'd ROS_EMU_TYPE - check for cdrom images + hdd images - check provided image and qemu paths - search for default cdrom image + hdd image
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Wed Aug 29 02:07:54 2007 New Revision: 28635 URL: http://svn.reactos.org/svn/reactos?rev=28635&view=rev Log: - if'd ROS_EMU_TYPE - check for cdrom images + hdd images - check provided image and qemu paths - search for default cdrom image + hdd image Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h 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 Wed Aug 29 02:07:54 2007 @@ -97,27 +97,107 @@ OsSupport::sleep(m_DelayRead); } } - +//--------------------------------------------------------------------------------------- + void RosBootTest::getDefaultHDDImage(string & img) + { + img = "output-i386"; + + EnvironmentVariable::getValue(_T("ROS_OUTPUT"), img); + img += _T("\\ros.hd"); + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::isFileExisting(string output) + { + FILE * file; + + file = _tfopen(output.c_str(), _T("r")); + + if (file) + { + /* the file exists */ + fclose(file); + return true; + } + return false; + } + +//--------------------------------------------------------------------------------------- + bool RosBootTest::isDefaultHDDImageExisting() + { + string img; + + getDefaultHDDImage(img); + return isFileExisting(img); + } + +//--------------------------------------------------------------------------------------- + bool RosBootTest::createDefaultHDDImage() + { + + string qemuimgdir; + string output; + + if (!getQemuDir(qemuimgdir)) + { + return false; + } + +#ifdef __LINUX___ + qemuimgdir += _T("\\qemu-img"); +#else + qemuimgdir += _T("\\qemu-img.exe"); +#endif + + TCHAR * options[] = { + _T("create"), + NULL, + _T("100M"), + NULL + }; + + getDefaultHDDImage(output); + options[1] = (TCHAR*)output.c_str(); + + cerr << "Creating HDD Image ..." << output << endl; + if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 3, options, true)) + { + m_HDDImage = output; + return true; + } + + return false; + } //---------------------------------------------------------------------------------------- - bool RosBootTest::configureQemu() + bool RosBootTest::isQemuPathValid() { string qemupath; + + if (m_BootCmd.length()) + { + /* the boot cmd is already provided + * check if path to qemu is valid + */ + string::size_type pos = m_BootCmd.find_first_of(_T(" ")); + if (pos == string::npos) + { + /* the bootcmd is certainly not valid */ + return false; + } + qemupath = m_BootCmd.substr(0, pos); + } + else + { + /* the qemu path is provided ROS_EMU_PATH variable */ + qemupath = m_EmuPath; + } + + + return isFileExisting(qemupath); + } +//---------------------------------------------------------------------------------------- + bool RosBootTest::getQemuDir(string & qemupath) + { string::size_type pos; - - bool bootfromcd = false; - bool bootcmdprovided = false; - if (m_CDImage != _T("") ) - { - bootfromcd = true; - } - - if (m_BootCmd != _T("") ) - { - /// - /// boot cmd is provided already - /// - bootcmdprovided = true; - } #ifdef __LINUX__ pos = m_EmuPath.find_last_of(_T("/")); @@ -130,56 +210,19 @@ return false; } qemupath = m_EmuPath.substr(0, pos); - - - if (m_HDDImage == _T("")) - { - if(!bootfromcd) - { - cerr << "Error: ROS_CD_IMAGE and ROS_HDD_IMAGE is not set!!!" << endl; - return false; - } - string qemuimgdir = qemupath; - m_HDDImage = _T("ros.img"); -#ifdef __LINUX___ - qemuimgdir += _T("\\qemu-img"); -#else - qemuimgdir += _T("\\qemu-img.exe"); -#endif - /// - /// FIXME - /// call qemu-img to create the tool - /// - TCHAR * options[] = { - _T("create"), - NULL, - _T("100M"), - NULL - }; - string output = "output-i386"; - EnvironmentVariable::getValue(_T("ROS_OUTPUT"), output); - output += _T("\\ros.hd"); - options[1] = (TCHAR*)output.c_str(); - - cerr << "Creating HDD Image ..." << output << endl; - if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 3, options, true)) - { - m_HDDImage = output; - } - else - { - return false; - } - } - - if (!bootcmdprovided) - { - if (m_MaxMem == "") - { - // default to 64M - m_MaxMem = "64"; - } - string pipe; + return true; + } +//---------------------------------------------------------------------------------------- + bool RosBootTest::createBootCmd() + { + string pipe; + + if (m_MaxMem.length() == 0) + { + /* set default memory size to 64M */ + m_MaxMem = "64"; + } + #ifdef __LINUX__ pipe = _T("stdio"); m_Src = _T(""); @@ -187,75 +230,244 @@ pipe = _T("pipe:qemu"); m_Src = _T("\\\\.\\pipe\\qemu"); #endif + string qemudir; + if (!getQemuDir(qemudir)) + { + return false; + } - - if (bootfromcd) - { - m_BootCmd = m_EmuPath + _T(" -serial ") + pipe + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -boot d -cdrom ") + m_CDImage + _T(" -L ") + qemupath; - } - else - { - m_BootCmd = m_EmuPath + _T(" -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -boot c -serial ") + pipe + _T(" -hda ") + m_HDDImage; - } - - if (m_KillEmulator == _T("yes")) - { + m_BootCmd = m_EmuPath + _T(" -L ") + qemudir + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -serial ") + pipe; + + if (m_CDImage.length()) + { + /* boot from cdrom */ + m_BootCmd += _T(" -boot d -cdrom ") + m_CDImage; + } + else + { + /* boot from hdd */ + m_BootCmd += _T(" -boot c "); + } + #ifdef __LINUX__ - m_BootCmd += _T(" -pidfile pid.txt"); + /* on linux we need get pid in order to be able + * to terminate the emulator in case of errors + * on windows we can get pid as return of CreateProcess + */ + m_BootCmd += _T(" -pidfile pid.txt"); #endif - } - else - { - m_BootCmd += _T(" -no-reboot "); - } - } - else - { + + m_BootCmd += _T(" -no-reboot "); + + return true; + } +//---------------------------------------------------------------------------------------- + bool RosBootTest::extractPipeFromBootCmd() + { string::size_type pos = m_BootCmd.find(_T("-serial")); - if (pos != string::npos) - { - string pipe = m_BootCmd.substr(pos + 7, m_BootCmd.size() - pos -7); - pos = pipe.find(_T("pipe:")); - if (pos == 0) - { + if (pos == string::npos) + { + /* no debug options provided */ + return false; + } + + string pipe = m_BootCmd.substr(pos + 7, m_BootCmd.size() - pos -7); + pos = pipe.find(_T("pipe:")); + if (pos == 0) + { #ifdef __LINUX__ - cerr << "Error: popen doesnot support reading from pipe" << endl; - return false; + cerr << "Error: reading from pipes is not supported with linux hosts - use stdio" << endl; + return false; #else - pipe = pipe.substr(pos + 5, pipe.size() - pos - 5); - pos = pipe.find(_T(" ")); - if (pos != string::npos) - { - m_Src = _T("\\\\.\\pipe\\") + pipe.substr(0, pos); - } - else - { - m_Src = _T("\\\\.\\pipe\\") + pipe; - } + pipe = pipe.substr(pos + 5, pipe.size() - pos - 5); + pos = pipe.find(_T(" ")); + if (pos != string::npos) + { + m_Src = _T("\\\\.\\pipe\\") + pipe.substr(0, pos); + } + else + { + m_Src = _T("\\\\.\\pipe\\") + pipe; + } + return true; + } +#endif + pos = pipe.find(_T("stdio")); + if (pos == 0) + { +#ifdef __LINUX__ + m_Src = m_BootCmd; + return true; +#else + cerr << "Error: reading from stdio is not supported for windows hosts - use pipes" << endl; + return false; #endif - } - else - { - pos = pipe.find(_T("stdio")); - if (pos == 0) - { -#ifdef __LINUX__ - m_Src = m_BootCmd; -#else - cerr << "Error: sysreg does not support reading stdio" << endl; - return false; -#endif - - } - - - } - - } - - - } - + } + + cerr << "Error: no valid debug port specified - use stdio / pipes" << endl; + return false; + } +//---------------------------------------------------------------------------------------- + bool RosBootTest::configureHDDImage() + { + if (m_HDDImage.length()) + { + /* check if ROS_HDD_IMAGE points to hdd image */ + return isFileExisting(m_HDDImage); + } + + if (isDefaultHDDImageExisting()) + { + /* ROS_HDD_IMAGE is not set but theres + * a default existing image + * to use */ + getDefaultHDDImage(m_HDDImage); + return true; + } + + if (m_CDImage.length()) + { + /* ROS_CD_IMAGE is set but no ROS_HDD_IMAGE is set + * so create hdd image */ + if (!createDefaultHDDImage()) + { + /* failed to create hdd image */ + cerr << "Error: failed to create hdd image " << endl; + return false; + } + getDefaultHDDImage(m_HDDImage); + return true; + } + /// + /// FIXME + /// scan m_BootCmd if theres -hda param provided + /// and check if it exists + + return true; + } +//---------------------------------------------------------------------------------------- + bool RosBootTest::configureCDImage() + { + if (m_CDImage.length()) + { + /* we have a cd image lets check if its valid */ + if (!isFileExisting(m_CDImage)) + { + cerr << "Error: ROS_CD_IMAGE is not valid" << endl; + return false; + } + return true; + } + + /* ROS_CD_IMAGE is not set + * lets check if m_BootCmd provides it + */ + + if (!m_BootCmd.length()) + { + /* ROS_BOOT_CMD not set + * check if theres a default image + */ + + if (isFileExisting(_T("ReactOS-RegTest.iso"))) + { + m_CDImage = _T("ReactOS-RegTest.iso"); + } + return true; + } + + string::size_type pos = m_BootCmd.find(_T("-boot ")); + if (pos == string::npos) + { + /* ROS_BOOT_CMD must provide a boot parameter*/ + cerr << "Error: ROS_BOOT_CMD misses boot parameter" << endl; + return false; + } + + string rest = m_BootCmd.substr(pos + 6, m_BootCmd.length() - pos - 6); + if (rest.length() < 1) + { + /* boot parameter misses option where to boot from */ + cerr << "Error: ROS_BOOT_CMD misses boot parameter" << endl; + return false; + } + if (rest[0] != _T('c') && rest[0] != _T('d')) + { + cerr << "Error: ROS_BOOT_CMD has invalid boot parameter" << endl; + return false; + } + + if (rest[0] == _T('c')) + { + /* ROS_BOOT_CMD boots from hdd */ + return true; + } + + pos = m_BootCmd.find(_T("-cdrom ")); + if (pos == string::npos) + { + cerr << "Error: ROS_BOOT_CMD misses cdrom parameter" << endl; + return false; + } + rest = m_BootCmd.substr(pos + 7, m_BootCmd.length() - pos - 7); + if (!rest.length()) + { + cerr << "Error: ROS_BOOT_CMD misses cdrom parameter" << endl; + return false; + } + pos = rest.find(_T(" ")); + if (pos != string::npos) + { + rest = rest.substr(0, pos); + } + + if (!isFileExisting(rest)) + { + cerr << "Error: cdrom image " << rest << " does not exist" << endl; + return false; + } + else + { + m_CDImage = rest; + return true; + } + } +//---------------------------------------------------------------------------------------- + bool RosBootTest::configureQemu() + { + if (!isQemuPathValid()) + { + cerr << "Error: the path to qemu is not valid" << endl; + return false; + } + + if (!configureCDImage()) + { + cerr << "Error: failed to set a valid cdrom configuration" << endl; + return false; + } + + if (!configureHDDImage()) + { + cerr << "Error: failed to set a valid hdd configuration" << endl; + return false; + } + + if (m_BootCmd.length()) + { + if (!extractPipeFromBootCmd()) + { + return false; + } + } + else + { + if (!createBootCmd()) + { + return false; + } + } + cerr << "Opening Data Source:" << m_BootCmd << endl; @@ -283,11 +495,13 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::readConfigurationValues(ConfigParser &conf_parser) { +#if 0 if (!conf_parser.getStringValue(RosBootTest::ROS_EMU_TYPE, m_EmuType)) { cerr << "Error: ROS_EMU_TYPE is not set" << endl; return false; } +#endif if (!conf_parser.getStringValue(RosBootTest::ROS_EMU_PATH, m_EmuPath)) { @@ -332,7 +546,7 @@ { return false; } - +#if 0 if (m_EmuType == EMU_TYPE_QEMU) { if (!configureQemu()) @@ -357,6 +571,13 @@ cerr << "Error: ROS_EMU_TYPE value is not supported:" << m_EmuType << "=" << EMU_TYPE_QEMU << endl; return false; } +#else + if (!configureQemu()) + { + cerr << "Error: failed to configure qemu" << endl; + return false; + } +#endif #ifndef __LINUX__ OsSupport::sleep(500); #endif 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 (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Wed Aug 29 02:07:54 2007 @@ -83,6 +83,16 @@ protected: + void getDefaultHDDImage(string & img); + bool isFileExisting(string filename); + bool isDefaultHDDImageExisting(); + bool createDefaultHDDImage(); + bool isQemuPathValid(); + bool getQemuDir(string &); + bool createBootCmd(); + bool extractPipeFromBootCmd(); + bool configureCDImage(); + bool configureHDDImage(); void getPidFromFile(); bool executeBootCmd(); void delayRead();

1 0

[jimtabor] 28634: Plugin PolyPolygon, Polygon uses the same code and tested good.
by jimtabor＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: jimtabor Date: Wed Aug 29 01:29:03 2007 New Revision: 28634 URL: http://svn.reactos.org/svn/reactos?rev=28634&view=rev Log: Plugin PolyPolygon, Polygon uses the same code and tested good. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Wed Aug 29 01:29:03 2007 @@ -495,11 +495,11 @@ PolyBezier@12=NtGdiPolyBezier@12 PolyBezierTo@12=NtGdiPolyBezierTo@12 PolyDraw@16=NtGdiPolyDraw@16 -PolyPolygon@16=NtGdiPolyPolygon@16 +PolyPolygon@16 PolyPolyline@16=NtGdiPolyPolyline@16 PolyTextOutA@12 PolyTextOutW@12 -Polygon@12 ;=NtGdiPolygon@12 +Polygon@12 Polyline@12=NtGdiPolyline@12 PolylineTo@12=NtGdiPolylineTo@12 PtInRegion@12=NtGdiPtInRegion@12

1 0

[gedmurphy] 28633: missed a return type
by gedmurphy＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: gedmurphy Date: Wed Aug 29 00:13:42 2007 New Revision: 28633 URL: http://svn.reactos.org/svn/reactos?rev=28633&view=rev Log: missed a return type Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Wed Aug 29 00:13:42 2007 @@ -200,7 +200,7 @@ } } - +VOID SaveDlgInfo(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) {

1 0

[gedmurphy] 28632: fix IsUserAnAdmin
by gedmurphy＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: gedmurphy Date: Wed Aug 29 00:13:09 2007 New Revision: 28632 URL: http://svn.reactos.org/svn/reactos?rev=28632&view=rev Log: fix IsUserAnAdmin Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec Wed Aug 29 00:13:09 2007 @@ -244,7 +244,7 @@ 654 stdcall @(long long) shell32_654 # ReadCabinetState@8 660 stdcall -noname FileIconInit(long) - 680 stdcall -noname IsUserAdmin() + 680 stdcall -noname IsUserAnAdmin() 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW 730 stdcall -noname RestartDialogEx(long wstr long long) 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 (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Wed Aug 29 00:13:09 2007 @@ -1225,10 +1225,10 @@ return 0; } /************************************************************************* - * IsUserAdmin [SHELL32.680] NT 4.0 - * - */ -HRESULT WINAPI IsUserAdmin(void) + * IsUserAnAdmin [SHELL32.680] NT 4.0 + * + */ +BOOL WINAPI IsUserAnAdmin(VOID) { FIXME("stub\n"); return TRUE; }

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