Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[fireball] 27737: - Apply 25963 hack (reverting vmwinst to an earlier version). Now it's possible to set resolution in vmwinst for VMWare video driver (including VMWare 6 version too).
by fireball＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: fireball Date: Thu Jul 19 22:53:33 2007 New Revision: 27737 URL: http://svn.reactos.org/svn/reactos?rev=27737&view=rev Log: - Apply 25963 hack (reverting vmwinst to an earlier version). Now it's possible to set resolution in vmwinst for VMWare video driver (including VMWare 6 version too). Added: branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/Cz.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Cz.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/De.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/De.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/Dk.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Dk.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/En.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/En.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/Es.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Es.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/Hu.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Hu.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/Ja.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ja.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/Ru.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ru.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/Uk.rc - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Uk.rc branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmware.inf - copied unchanged from r25963, branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmware.inf Removed: branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/lang/ branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/rsrc.rc Modified: branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.c branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.h branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.rbuild branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.rc Removed: branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/rsrc.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/rsrc.rc (removed) @@ -1,31 +1,0 @@ -#include <windows.h> -#include "vmwinst.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" - -/* Bitmaps */ -IDB_WATERMARK BITMAP "resources/watermark.bmp" -IDB_HEADER BITMAP "resources/header.bmp" - -/* - * Everything specific to any language goes in one of the specific - * files. Note that you can and may override resources which also have - * a neutral version. This is to get localized bitmaps for example. - */ -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/lt-LT.rc" -#include "lang/nb-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" Modified: branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.c (original) +++ branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.c Thu Jul 19 22:53:33 2007 @@ -18,7 +18,8 @@ * * VMware is a registered trademark of VMware, Inc. */ -/* +/* $Id$ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VMware(r) driver installation utility * FILE: subsys/system/vmwinst/vmwinst.c @@ -27,11 +28,9 @@ */ #include <windows.h> #include <commctrl.h> -#include <newdev.h> #include <stdio.h> #include <string.h> #include "vmwinst.h" -#include <debug.h> extern VOID CALLBACK InstallHinfSectionW(HWND hwnd, HINSTANCE ModuleHandle, PCWSTR CmdLineBuffer, INT nCmdShow); @@ -98,8 +97,27 @@ return FALSE; } +BOOL +ProcessMessage(void) +{ + MSG msg; + if(PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + return TRUE; + } + return FALSE; +} + +void +ProcessMessages(void) +{ + while(ProcessMessage()); +} + /* try to open the file */ -static BOOL +BOOL FileExists(WCHAR *Path, WCHAR *File) { WCHAR FileName[MAX_PATH + 1]; @@ -151,8 +169,54 @@ } +/* Copy file */ +BOOL +InstallFile(WCHAR *Destination, WCHAR *File) +{ + static char Buffer[1024]; + WCHAR SourceFileName[MAX_PATH + 1]; + WCHAR DestFileName[MAX_PATH + 1]; + HANDLE SourceFileHandle, DestFileHandle; + DWORD DataRead, DataWritten; + + SourceFileName[0] = L'\0'; + DestFileName[0] = L'\0'; + wcscat(SourceFileName, SrcPath); + wcscat(SourceFileName, File); + wcscat(DestFileName, Destination); + wcscat(DestFileName, File); + + SourceFileHandle = CreateFile(SourceFileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(SourceFileHandle == INVALID_HANDLE_VALUE) + { + return FALSE; + } + DestFileHandle = CreateFile(DestFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(DestFileHandle == INVALID_HANDLE_VALUE) + { + CloseHandle(SourceFileHandle); + return FALSE; + } + + while(ReadFile(SourceFileHandle, Buffer, sizeof(Buffer), &DataRead, NULL) && DataRead > 0) + { + if(!WriteFile(DestFileHandle, Buffer, DataRead, &DataWritten, NULL) || + DataRead != DataWritten) + { + CloseHandle(SourceFileHandle); + CloseHandle(DestFileHandle); + DeleteFile(DestFileName); + return FALSE; + } + } + + CloseHandle(SourceFileHandle); + CloseHandle(DestFileHandle); + return TRUE; +} + /* Find the drive with the inserted VMware cd-rom */ -static BOOL +BOOL IsVMwareCDInDrive(WCHAR *Drv) { static WCHAR Drive[4] = L"X:\\"; @@ -199,14 +263,14 @@ return FALSE; } -static BOOL +BOOL LoadResolutionSettings(DWORD *ResX, DWORD *ResY, DWORD *ColDepth) { HKEY hReg; DWORD Type, Size; if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", + L"SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\vmx_svga\\Device0", 0, KEY_QUERY_VALUE, &hReg) != ERROR_SUCCESS) { return FALSE; @@ -214,26 +278,29 @@ if(RegQueryValueEx(hReg, L"DefaultSettings.BitsPerPel", 0, &Type, (BYTE*)ColDepth, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ColDepth = 8; + RegCloseKey(hReg); + return FALSE; } if(RegQueryValueEx(hReg, L"DefaultSettings.XResolution", 0, &Type, (BYTE*)ResX, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ResX = 640; + RegCloseKey(hReg); + return FALSE; } if(RegQueryValueEx(hReg, L"DefaultSettings.YResolution", 0, &Type, (BYTE*)ResY, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ResY = 480; + RegCloseKey(hReg); + return FALSE; } RegCloseKey(hReg); return TRUE; } -static BOOL +BOOL IsVmwSVGAEnabled(VOID) { HKEY hReg; @@ -258,13 +325,13 @@ -static BOOL +BOOL SaveResolutionSettings(DWORD ResX, DWORD ResY, DWORD ColDepth) { HKEY hReg; if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", + L"SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\vmx_svga\\Device0", 0, KEY_SET_VALUE, &hReg) != ERROR_SUCCESS) { return FALSE; @@ -291,7 +358,7 @@ return TRUE; } -static BOOL +BOOL EnableDriver(WCHAR *Key, BOOL Enable) { DWORD Value; @@ -314,7 +381,7 @@ } /* Activate the vmware driver and deactivate the others */ -static BOOL +BOOL EnableVmwareDriver(BOOL VBE, BOOL VGA, BOOL VMX) { if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\VBE", VBE)) @@ -333,11 +400,94 @@ return TRUE; } +/* Make sure the required registry entries are present */ +BOOL +AddVmwareRegistryEntries() +{ + HRSRC VmwareInfResource; + HGLOBAL VmwareInfMem; + PVOID VmwareInfLocked; + DWORD Size; + WCHAR TempPath[MAX_PATH]; + WCHAR BufferSize; + WCHAR TempFileName[MAX_PATH]; + HANDLE TempFile; + DWORD Written; + WCHAR CmdLine[19 + MAX_PATH]; + + VmwareInfResource = FindResourceW(hAppInstance, + MAKEINTRESOURCE(IDR_VMWARE_INF), + L"RT_INF"); + if (NULL == VmwareInfResource) + { + return FALSE; + } + Size = SizeofResource(hAppInstance, VmwareInfResource); + if (0 == Size) + { + return FALSE; + } + VmwareInfMem = LoadResource(hAppInstance, VmwareInfResource); + if (NULL == VmwareInfMem) + { + return FALSE; + } + VmwareInfLocked = LockResource(VmwareInfMem); + if (NULL == VmwareInfLocked) + { + return FALSE; + } + + BufferSize = GetTempPathW(sizeof(TempPath) / sizeof(TempPath[0]), TempPath); + if (0 == BufferSize || sizeof(TempPath) / sizeof(TempPath[0]) < BufferSize) + { + return FALSE; + } + if (0 == GetTempFileNameW(TempPath, L"vmx", 0, TempFileName)) + { + return FALSE; + } + + TempFile = CreateFileW(TempFileName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + if (INVALID_HANDLE_VALUE == TempFile) + { + DeleteFile(TempFileName); + return FALSE; + } + if (! WriteFile(TempFile, VmwareInfLocked, Size, &Written, NULL) || + Written != Size) + { + CloseHandle(TempFile); + DeleteFile(TempFileName); + return FALSE; + } + CloseHandle(TempFile); + + wcscpy(CmdLine, L"DefaultInstall 128 "); + wcscat(CmdLine, TempFileName); + InstallHinfSectionW(NULL, NULL, CmdLine, 0); + + DeleteFile(TempFileName); + + return TRUE; +} + /* GUI */ +void +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DWORD Flags, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT | Flags; + psp->hInstance = hAppInstance; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageWelcomeProc( HWND hwndDlg, UINT uMsg, @@ -367,6 +517,23 @@ { if(DriverFilesFound) { + if(!AddVmwareRegistryEntries()) + { + WCHAR Msg[1024]; + LoadString(hAppInstance, IDS_FAILEDTOADDREGENTRIES, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + return TRUE; + } + if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) + { + + WCHAR Msg[1024]; + LoadString(hAppInstance, IDS_FAILEDTOACTIVATEDRIVER, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + return TRUE; + } SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CONFIG); return TRUE; } @@ -380,7 +547,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInsertDiscProc( HWND hwndDlg, UINT uMsg, @@ -408,7 +575,7 @@ return FALSE; } -static VOID +VOID InstTerminateInstaller(BOOL Wait) { if(hInstallationThread != NULL) @@ -425,11 +592,10 @@ } } -static DWORD STDCALL +DWORD STDCALL InstInstallationThread(LPVOID lpParameter) { HANDLE hThread; - WCHAR InfFileName[1024]; BOOL DriveAvailable; int DrivesTested = 0; @@ -452,22 +618,47 @@ if(AbortInstall != 0) goto done; PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_COPYINGFILES, 0); - wcscpy(InfFileName, SrcPath); - wcscat(InfFileName, L"vmx_svga.inf"); - DPRINT1("Calling UpdateDriverForPlugAndPlayDevices()\n"); - if (!UpdateDriverForPlugAndPlayDevices( - hInstallationNotifyWnd, - L"PCI\\VEN_15AD&DEV_0405&SUBSYS_040515AD&REV_00", - InfFileName, - 0, - NULL)) - { - AbortInstall = 1; - } - else - { - AbortInstall = 0; - } + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationPath, vmx_fb)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationPath, vmx_mode)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationDriversPath, vmx_svga)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0); + if(!AddVmwareRegistryEntries()) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOADDREGENTRIES, 0); + goto cleanup; + } + if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0); + goto cleanup; + } + + Sleep(500); done: switch(AbortInstall) @@ -489,7 +680,7 @@ return 0; } -static BOOL +BOOL InstStartInstallationThread(HWND hwndNotify) { if(hInstallationThread == NULL) @@ -516,7 +707,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInstallingProc( HWND hwndDlg, UINT uMsg, @@ -585,7 +776,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInstallFailedProc( HWND hwndDlg, UINT uMsg, @@ -610,7 +801,7 @@ return FALSE; } -static void +void FillComboBox(HWND Dlg, int idComboBox, int From, int To) { int i; @@ -633,7 +824,7 @@ } MAPCTLRES; /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageConfigProc( HWND hwndDlg, UINT uMsg, @@ -752,7 +943,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageChooseActionProc( HWND hwndDlg, UINT uMsg, @@ -804,7 +995,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageSelectDriverProc( HWND hwndDlg, UINT uMsg, @@ -866,7 +1057,7 @@ return FALSE; } -static VOID +VOID ShowUninstNotice(HWND Owner) { WCHAR Msg[1024]; @@ -874,7 +1065,7 @@ MessageBox(Owner, Msg, NULL, MB_ICONINFORMATION); } -static INT_PTR CALLBACK +INT_PTR CALLBACK PageDoUninstallProc( HWND hwndDlg, UINT uMsg, Modified: branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.h (original) +++ branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.h Thu Jul 19 22:53:33 2007 @@ -68,4 +68,6 @@ #define IDD_DOUNINSTALLTITLE 361 #define IDD_DOUNINSTALLSUBTITLE 362 +#define IDR_VMWARE_INF 400 + #endif /* __VMWINST_H */ Modified: branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.rbuild (original) +++ branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.rbuild Thu Jul 19 22:53:33 2007 @@ -8,11 +8,9 @@ <library>advapi32</library> <library>comctl32</library> <library>comdlg32</library> - <library>newdev</library> <library>user32</library> <library>setupapi</library> <library>shell32</library> - <library>ntdll</library> <file>vmwinst.c</file> <file>vmwinst.rc</file> </module> Modified: branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/setup/vmwinst/vmwinst.rc Thu Jul 19 22:53:33 2007 @@ -1,3 +1,5 @@ +/* $Id$ */ + #include <windows.h> #include "vmwinst.h" @@ -6,4 +8,29 @@ #define REACTOS_STR_ORIGINAL_FILENAME "vmwinst.exe\0" #include <reactos/version.rc> -#include "rsrc.rc" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +1 24 DISCARDABLE "manifest.xml" + +/* Bitmaps */ +IDB_WATERMARK BITMAP "resources/watermark.bmp" +IDB_HEADER BITMAP "resources/header.bmp" + +/* The vmware.inf file */ +IDR_VMWARE_INF RT_INF "vmware.inf" + + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ +#include "Cz.rc" +#include "En.rc" +#include "De.rc" +#include "Dk.rc" +#include "Es.rc" +#include "Ja.rc" +#include "Hu.rc" +#include "Ru.rc" +#include "Uk.rc"

1 0

[cfinck] 27735: Hardcoding "lake.bmp" as the standard wallpaper for 0.3.3 This is the same way as we did for the 0.3.1 release
by cfinck＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: cfinck Date: Thu Jul 19 21:17:16 2007 New Revision: 27735 URL: http://svn.reactos.org/svn/reactos?rev=27735&view=rev Log: Hardcoding "lake.bmp" as the standard wallpaper for 0.3.3 This is the same way as we did for the 0.3.1 release Modified: branches/ros-branch-0_3_3/reactos/boot/bootdata/hivedef.inf Modified: branches/ros-branch-0_3_3/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_3/reactos/boot/bootdata/hivedef.inf (original) +++ branches/ros-branch-0_3_3/reactos/boot/bootdata/hivedef.inf Thu Jul 19 21:17:16 2007 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"C:\ReactOS\lake.bmp" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409"

1 0

[gedmurphy] 27734: Don't use CopyImage to copy toolbar bitmaps into the imagelist, this fixes the task bar icon
by gedmurphy＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: gedmurphy Date: Thu Jul 19 20:09:31 2007 New Revision: 27734 URL: http://svn.reactos.org/svn/reactos?rev=27734&view=rev Log: Don't use CopyImage to copy toolbar bitmaps into the imagelist, this fixes the task bar icon Modified: branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/toolbar.c Modified: branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/toolbar.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/toolbar.c Thu Jul 19 20:09:31 2007 @@ -2668,7 +2668,33 @@ TRACE("adding hInst=%p nID=%d nButtons=%d\n", bitmap->hInst, bitmap->nID, bitmap->nButtons); /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ - hbmLoad = (HBITMAP)CopyImage((HBITMAP)bitmap->nID, IMAGE_BITMAP, 0, 0, 0); + { + BITMAP bmp; + HBITMAP hOldBitmapBitmap, hOldBitmapLoad; + HDC hdcImage, hdcBitmap; + + /* copy the bitmap before adding it so that the user's bitmap + * doesn't get modified. + */ + GetObjectW ((HBITMAP)bitmap->nID, sizeof(BITMAP), (LPVOID)&bmp); + + hdcImage = CreateCompatibleDC(0); + hdcBitmap = CreateCompatibleDC(0); + + /* create new bitmap */ + hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL); + hOldBitmapBitmap = SelectObject(hdcBitmap, (HBITMAP)bitmap->nID); + hOldBitmapLoad = SelectObject(hdcImage, hbmLoad); + + /* Copy the user's image */ + BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, + hdcBitmap, 0, 0, SRCCOPY); + + SelectObject (hdcImage, hOldBitmapLoad); + SelectObject (hdcBitmap, hOldBitmapBitmap); + DeleteDC (hdcImage); + DeleteDC (hdcBitmap); + } else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);

1 0

[fireball] 27733: - Give 0.3.3 a proper version and type.
by fireball＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: fireball Date: Thu Jul 19 19:14:14 2007 New Revision: 27733 URL: http://svn.reactos.org/svn/reactos?rev=27733&view=rev Log: - Give 0.3.3 a proper version and type. Modified: branches/ros-branch-0_3_3/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_3/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_3/reactos/include/reactos/version.h (original) +++ branches/ros-branch-0_3_3/reactos/include/reactos/version.h Thu Jul 19 19:14:14 2007 @@ -18,11 +18,11 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 3 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"RC1" #endif

1 0

[fireball] 27732: - Branch ReactOS 0.3.3 release.
by fireball＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: fireball Date: Thu Jul 19 19:12:31 2007 New Revision: 27732 URL: http://svn.reactos.org/svn/reactos?rev=27732&view=rev Log: - Branch ReactOS 0.3.3 release. Added: branches/ros-branch-0_3_3/ - copied from r27731, trunk/

1 0

[dreimer] 27731: Renamed it to FAQ. It fits better than HowTos Added the first bunch of Q/A s.
by dreimer＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: dreimer Date: Thu Jul 19 18:50:26 2007 New Revision: 27731 URL: http://svn.reactos.org/svn/reactos?rev=27731&view=rev Log: Renamed it to FAQ. It fits better than HowTos Added the first bunch of Q/A s. Modified: trunk/tools/RosBE-Windows/Documentation/files/howto.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/files/menu.html Modified: trunk/tools/RosBE-Windows/Documentation/files/howto.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/howto.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/howto.html Thu Jul 19 18:50:26 2007 @@ -1,0 +1,36 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>RosBE HowTos</title> + <meta content="Daniel Reimer" name="author"> + <meta content="Shows all HowTos to the User" name="description"> +</head> +<body> +Q: How do I build ReactOS Source? +A: Start RosBE and type "make bootcd" or "make livecd" to generate +ReactOS ISO Files from the Source. + +Q: I have a Multi Core CPU. Can I speed up the build process anyhow? +A: Yes, you can. Just use makex instead of make Command. makex checks +for the Number of Cores and optimizes the Processes to that number. + +Q: How/Where can I get the Source Code? +A: You could load it via any SVN Client from: +svn://svn.reactos.org/reactos/trunk/reactos RosBE itself has SVN +Command Line Client and a lite Variant for newbies called "ssvn" +(SimpleSVN) included. If you want to get the Source Tree, type "ssvn +create" and it copies all Code to the Default Source Folder you did set +while the Setup. + +Q: How can I update the Source Code? +A: Just type "ssvn update". + +Q: Can I see somewhere if my Source Tree is up to date? +A: Yes, just type "ssvn status". + +Q: My Source Tree is fucked up / Updating was aborted etc. etc. and now +I cannot update it anymore... What to do? +A: You need to cleanup it. Type "ssvn cleanup" and wait. After that +type "ssvn update" and it runs again. +</body> +</html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/howto.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Documentation/files/menu.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/menu.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/menu.html Thu Jul 19 18:50:26 2007 @@ -14,7 +14,7 @@ <a href="features.html">2. Features</a> <a href="basic.html">3. Basic Functions</a> <a href="adv.html">4. Advanced Functions</a> - <a href="howto.html">5. HowTos</a> + <a href="howto.html">5. FAQ</a> <a href="credits.html">6. Credits</a>

1 0

[dreimer] 27730: set eol-style native (I am sick of using LINUX2DOS Tool) add a blank howto page. Will be filled later.
by dreimer＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: dreimer Date: Thu Jul 19 18:25:59 2007 New Revision: 27730 URL: http://svn.reactos.org/svn/reactos?rev=27730&view=rev Log: set eol-style native (I am sick of using LINUX2DOS Tool) add a blank howto page. Will be filled later. Added: trunk/tools/RosBE-Windows/Documentation/files/howto.html Modified: trunk/tools/RosBE-Windows/Documentation/files/adv.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/files/basic.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/files/credits.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/files/features.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/files/int.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/files/intro.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/files/main.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/files/menu.html (contents, props changed) trunk/tools/RosBE-Windows/Documentation/index.html (contents, props changed) Modified: trunk/tools/RosBE-Windows/Documentation/files/adv.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/adv.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/adv.html Thu Jul 19 18:25:59 2007 @@ -1,12 +1,12 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Advanced Features</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Lists the Advanced Features of RosBE"> -</head> -<body> - SVN 1.4.4 is included in RosBE. Manual can be found here: -</body> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Advanced Features</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Lists the Advanced Features of RosBE"> +</head> +<body> + SVN 1.4.4 is included in RosBE. Manual can be found here: +</body> </html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/adv.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Documentation/files/basic.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/basic.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/basic.html Thu Jul 19 18:25:59 2007 @@ -1,92 +1,92 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Basic Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Basic Features of RosBE" name="description"> -</head> -<body> -"make" -Usage: make [OPTIONS1] [OPTIONS2] -The command to build the ReactOS Source Tree in the Default directory. -Without options it does a standard build of ReactOS. OPTIONS1 are the -standard ReactOS build options ie. "bootcd", "livecd", etc. -"strip" as optional second parameter sets stripping to enabled and thus -reduces File Size by ~30% and Minimum needed RAM to use ReactOS to ~24 -MB. ISOs built with this command are NOT usable to file bugs in any way! - -"makex" -Usage: makex [OPTIONS1] [OPTIONS2] -Same as 'make' but automatically determines the number of CPU Cores in -your system and uses "make -j x" with the appropriate number to -threaden the build process for a massive speedup on Multi Core Systems. -NOTE: The number makex uses can be modified by editing Build-Multi.cmd -located in the RosBE directory, instructions for doing so are contained -within the file. This Command is incompatible to Windows Vista right -now due to a bug in GCC 4.X.X. - -"clean" -Usage: clean [logs] -Fully cleans the ReactOS source directory and does a better job than -"make clean" does. -It deletes files, which are being generated into the Source Tree while -compiling. After using this Command the tree is completely cleaned up -and 1:1 like a fresh loaded one. -   logs - Removes all build logs in the RosBE-Logs directory. - -"help" -Usage: help [COMMAND] -Shows help for the specified command or lists all available commands. - -"ssvn" -Usage: ssvn [OPTIONS] -This is the simple to use sSVN, written for newbies. It only Creates, -Updates or cleans up your ReactOS Source Tree or shows the Revision -Number of the Offline Tree and Online HEAD Revision to see if its up to -date. No need for any additional parameters, just "ssvn update" and -your Tree is fully updated. -   update  - Updates to HEAD Revision or to a specific -one when second parameter specifies one. -   create  - Creates a new ReactOS Source Tree and got -some Security Features. It -checks if the folder is empty, contains a Source Tree or any other -files and Cancels if continuing is unsecure. -   cleanup - Cleans up and fixes errors in the Source Tree. -It is mainly needed if the "ssvn update" or "ssvn create" command got -aborted in any way or show problems like error messages etc. -   status  - Shows Actual offline Revision Number and -online HEAD Revision Number to see if its up to date. - -"chdefdir" -Usage: chdefdir [OPTIONS] -Reconfigures the Default Source Folder for one Session. This is useful -for switching between branches or different ReactOS Source Trees. -Exiting RosBE sets back to the Default. -   default - Sets back to the Default Source Folder without a -restart of RosBE. - -"config" -Usage: config [OPTIONS] -This Command creates a Configuration File, which tells RosBE how to -build the Tree. There are many things you can modify in the build -process and this tool can edit all for you. ISOs made with a non -default are NOT usable to file bugs in any way! -   delete - Deletes the created configuration File and so -sets back to default settings. - -"raddr2line" -Usage: raddr2line [OPTIONS] -This Command translates program addresses of BSODs into file names and -line numbers of the Code it was built of to assist Developers to find -specific Bugs in ReactOS. This Tool is mainly a Dev Tool. Newbies -normally only need it if a devs wants them to try out something. -USAGE: The first parameter has to be the Executable to be analyzed. The -second one has to be the address to be translated. If you don't set the -needed Parameters, you will be asked for them. - -"basedir" -Usage: basedir -Switches back to the ReactOS source directory. -</body> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Basic Features</title> + <meta content="Daniel Reimer" name="author"> + <meta content="Lists the Basic Features of RosBE" name="description"> +</head> +<body> +"make" +Usage: make [OPTIONS1] [OPTIONS2] +The command to build the ReactOS Source Tree in the Default directory. +Without options it does a standard build of ReactOS. OPTIONS1 are the +standard ReactOS build options ie. "bootcd", "livecd", etc. +"strip" as optional second parameter sets stripping to enabled and thus +reduces File Size by ~30% and Minimum needed RAM to use ReactOS to ~24 +MB. ISOs built with this command are NOT usable to file bugs in any way! + +"makex" +Usage: makex [OPTIONS1] [OPTIONS2] +Same as 'make' but automatically determines the number of CPU Cores in +your system and uses "make -j x" with the appropriate number to +threaden the build process for a massive speedup on Multi Core Systems. +NOTE: The number makex uses can be modified by editing Build-Multi.cmd +located in the RosBE directory, instructions for doing so are contained +within the file. This Command is incompatible to Windows Vista right +now due to a bug in GCC 4.X.X. + +"clean" +Usage: clean [logs] +Fully cleans the ReactOS source directory and does a better job than +"make clean" does. +It deletes files, which are being generated into the Source Tree while +compiling. After using this Command the tree is completely cleaned up +and 1:1 like a fresh loaded one. +   logs - Removes all build logs in the RosBE-Logs directory. + +"help" +Usage: help [COMMAND] +Shows help for the specified command or lists all available commands. + +"ssvn" +Usage: ssvn [OPTIONS] +This is the simple to use sSVN, written for newbies. It only Creates, +Updates or cleans up your ReactOS Source Tree or shows the Revision +Number of the Offline Tree and Online HEAD Revision to see if its up to +date. No need for any additional parameters, just "ssvn update" and +your Tree is fully updated. +   update  - Updates to HEAD Revision or to a specific +one when second parameter specifies one. +   create  - Creates a new ReactOS Source Tree and got +some Security Features. It +checks if the folder is empty, contains a Source Tree or any other +files and Cancels if continuing is unsecure. +   cleanup - Cleans up and fixes errors in the Source Tree. +It is mainly needed if the "ssvn update" or "ssvn create" command got +aborted in any way or show problems like error messages etc. +   status  - Shows Actual offline Revision Number and +online HEAD Revision Number to see if its up to date. + +"chdefdir" +Usage: chdefdir [OPTIONS] +Reconfigures the Default Source Folder for one Session. This is useful +for switching between branches or different ReactOS Source Trees. +Exiting RosBE sets back to the Default. +   default - Sets back to the Default Source Folder without a +restart of RosBE. + +"config" +Usage: config [OPTIONS] +This Command creates a Configuration File, which tells RosBE how to +build the Tree. There are many things you can modify in the build +process and this tool can edit all for you. ISOs made with a non +default are NOT usable to file bugs in any way! +   delete - Deletes the created configuration File and so +sets back to default settings. + +"raddr2line" +Usage: raddr2line [OPTIONS] +This Command translates program addresses of BSODs into file names and +line numbers of the Code it was built of to assist Developers to find +specific Bugs in ReactOS. This Tool is mainly a Dev Tool. Newbies +normally only need it if a devs wants them to try out something. +USAGE: The first parameter has to be the Executable to be analyzed. The +second one has to be the address to be translated. If you don't set the +needed Parameters, you will be asked for them. + +"basedir" +Usage: basedir +Switches back to the ReactOS source directory. +</body> </html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/basic.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Documentation/files/credits.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/credits.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/credits.html Thu Jul 19 18:25:59 2007 @@ -1,26 +1,26 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Credits</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Lists the Credits of the RosBE Staff"> -</head> -<body> -This Build Environment is inspired by blight's ReactOS Build -Environment v0.2-3.4.5 -and Dazzle from TinyKRNL (<a href="http://www.tinykrnl.org/">http://www.tinykrnl.org/</a>) - -Originally Coded by Peter "dralnix" Ward (<a - href="mailto:dralnix@gmail.com">dralnix(a)gmail.com</a>) until Version -0.3.5B2 -Work continued by -Daniel "EmuandCo" Reimer (<a href="mailto:reimer.daniel@freenet.de">reimer.daniel(a)freenet.de</a>) -up to now. -*nix Version made and Maintained by Colin Finck (<a - href="mailto:mail@colinfinck.de">mail(a)colinfinck.de</a>) -up to now. - -Icon made by ROSFan. -</body> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Credits</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Lists the Credits of the RosBE Staff"> +</head> +<body> +This Build Environment is inspired by blight's ReactOS Build +Environment v0.2-3.4.5 +and Dazzle from TinyKRNL (<a href="http://www.tinykrnl.org/">http://www.tinykrnl.org/</a>) + +Originally Coded by Peter "dralnix" Ward (<a + href="mailto:dralnix@gmail.com">dralnix(a)gmail.com</a>) until Version +0.3.5B2 +Work continued by +Daniel "EmuandCo" Reimer (<a href="mailto:reimer.daniel@freenet.de">reimer.daniel(a)freenet.de</a>) +up to now. +*nix Version made and Maintained by Colin Finck (<a + href="mailto:mail@colinfinck.de">mail(a)colinfinck.de</a>) +up to now. + +Icon made by ROSFan. +</body> </html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/credits.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Documentation/files/features.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/features.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/features.html Thu Jul 19 18:25:59 2007 @@ -1,21 +1,21 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Features of RosBE" name="description"> -</head> -<body> - <ul> - <li>Creating, Cleaning and Updating the Tree with included SVN and sSVN.</li> - <li>Building the Source (Multi Core Optimized)*</li> - <li>Maintain Several Trees at once.</li> - <li>Configure the Tree Settings with an easy to use editor.</li> - <li>Help for Debugging, thanks to included GDB and raddr2line.</li> - <li>Support for non Admin Rights Account.*</li> - </ul> - - * = This Feature is not supported under Windows Vista! -</body> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Features</title> + <meta content="Daniel Reimer" name="author"> + <meta content="Lists the Features of RosBE" name="description"> +</head> +<body> + <ul> + <li>Creating, Cleaning and Updating the Tree with included SVN and sSVN.</li> + <li>Building the Source (Multi Core Optimized)*</li> + <li>Maintain Several Trees at once.</li> + <li>Configure the Tree Settings with an easy to use editor.</li> + <li>Help for Debugging, thanks to included GDB and raddr2line.</li> + <li>Support for non Admin Rights Account.*</li> + </ul> + + * = This Feature is not supported under Windows Vista! +</body> </html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/features.html ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Documentation/files/howto.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== (empty) Modified: trunk/tools/RosBE-Windows/Documentation/files/int.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/int.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/int.html Thu Jul 19 18:25:59 2007 @@ -1,33 +1,33 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Introduction</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Shows the Introduction to RosBE"> -</head> -<body> -First of all, lets answer the main question: What is RosBE? -Its a -Environment for building ReactOS on your own, its based on GCC 4.1.3 -Compiler and aims to be the one and only Build Environment for absolute -Beginners up to skilled devs. - -Realizing this wide spectrum in one BE is quite difficult of course. -How, as an example, do you tell a newbie how -to use SVN or maintain/update a Source tree? -Easy. This package has the -typical, well known SVN for all advanced devs and a slim Version -specially made for newbies, called sSVN (Simple SVN), which only does -the main stuff and has no difficult to understand or even dangerous, if -wrong used, functions. Additionally it checks the working folder, if -its empty or not. If its no empty folder, it does not even allow the -User to continue. - -And this is just the beginning of a big list of -features. -Devs will be happy with the included GDB and raddr2line. -Multi Core PC Users will love "makex" which automatically detects the -number of CPU Cores and optimizes the Build process to that Number. -</body> -</html> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Introduction</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the Introduction to RosBE"> +</head> +<body> +First of all, lets answer the main question: What is RosBE? +Its a +Environment for building ReactOS on your own, its based on GCC 4.1.3 +Compiler and aims to be the one and only Build Environment for absolute +Beginners up to skilled devs. + +Realizing this wide spectrum in one BE is quite difficult of course. +How, as an example, do you tell a newbie how +to use SVN or maintain/update a Source tree? +Easy. This package has the +typical, well known SVN for all advanced devs and a slim Version +specially made for newbies, called sSVN (Simple SVN), which only does +the main stuff and has no difficult to understand or even dangerous, if +wrong used, functions. Additionally it checks the working folder, if +its empty or not. If its no empty folder, it does not even allow the +User to continue. + +And this is just the beginning of a big list of +features. +Devs will be happy with the included GDB and raddr2line. +Multi Core PC Users will love "makex" which automatically detects the +number of CPU Cores and optimizes the Build process to that Number. +</body> +</html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/int.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Documentation/files/intro.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/intro.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/intro.html Thu Jul 19 18:25:59 2007 @@ -1,19 +1,19 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>RosBE Logo and Title</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Shows the official RosBE Logo and Title"> -</head> -<body> - <table width="100%"> - <tr> - <td><img src="RosBE.jpg" alt="RosBE Logo"></td> - <td style="text-align: center; font-weight: bold; font-style: italic; font-size: 24pt;"> - Documentation for RosBE for Microsoft® Windows NT®-based Operating Systems - </td> - </tr> - </table> -</body> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>RosBE Logo and Title</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the official RosBE Logo and Title"> +</head> +<body> + <table width="100%"> + <tr> + <td><img src="RosBE.jpg" alt="RosBE Logo"></td> + <td style="text-align: center; font-weight: bold; font-style: italic; font-size: 24pt;"> + Documentation for RosBE for Microsoft® Windows NT®-based Operating Systems + </td> + </tr> + </table> +</body> </html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/intro.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Documentation/files/main.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/main.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/main.html Thu Jul 19 18:25:59 2007 @@ -1,14 +1,14 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>RosBE Documentation Welcome Page</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Shows the RosBE Documentation Welcome Page"> -</head> -<body> -Welcome to ReactOS Build Environment for Windows. This Documentation -was made to assist you -in building and maintaining the Source Code of ReactOS. -</body> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>RosBE Documentation Welcome Page</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the RosBE Documentation Welcome Page"> +</head> +<body> +Welcome to ReactOS Build Environment for Windows. This Documentation +was made to assist you +in building and maintaining the Source Code of ReactOS. +</body> </html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/main.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Documentation/files/menu.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/menu.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/menu.html Thu Jul 19 18:25:59 2007 @@ -1,25 +1,27 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>RosBE Documentation Menu</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Shows the entries of the RosBE Documentation Menu"> - <base target="main"> -</head> -<body> - Index: - - <a href="int.html">1. Introduction</a> - <a href="features.html">2. Features</a> - <a href="basic.html">3. Basic Functions</a> - <a href="adv.html">4. Advanced Functions</a> - <a href="credits.html">5. Credits</a> - - <a href="http://validator-test.w3.org/check?uri=referer"><img - src="http://www.w3.org/Icons/valid-html401-blue" - alt="Valid HTML 4.01 Transitional" height="31" width="88"></a> - - -</body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>RosBE Documentation Menu</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the entries of the RosBE Documentation Menu"> + <base target="main"> +</head> +<body> + Index: + + <a href="int.html">1. Introduction</a> + <a href="features.html">2. Features</a> + <a href="basic.html">3. Basic Functions</a> + <a href="adv.html">4. Advanced Functions</a> + <a href="howto.html">5. HowTos</a> + <a href="credits.html">6. Credits</a> + + + <a href="http://validator-test.w3.org/check?uri=referer"><img + src="http://www.w3.org/Icons/valid-html401-blue" + alt="Valid HTML 4.01 Transitional" height="31" width="88"></a> + + +</body> +</html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/menu.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Documentation/index.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/index.html (original) +++ trunk/tools/RosBE-Windows/Documentation/index.html Thu Jul 19 18:25:59 2007 @@ -1,17 +1,17 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>ReactOS Build Environment Documentation</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Index Frame Site of RosBE Documentation"> -</head> -<frameset cols="180,*"> - <frame name="menu" src="files/menu.html" noresize> - - <frameset rows="160,*"> - <frame name="intro" src="files/intro.html" noresize frameborder="0" scrolling="no"> - <frame name="main" src="files/main.html" noresize frameborder="0"> - </frameset> -</frameset> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>ReactOS Build Environment Documentation</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Index Frame Site of RosBE Documentation"> +</head> +<frameset cols="180,*"> + <frame name="menu" src="files/menu.html" noresize> + + <frameset rows="160,*"> + <frame name="intro" src="files/intro.html" noresize frameborder="0" scrolling="no"> + <frame name="main" src="files/main.html" noresize frameborder="0"> + </frameset> +</frameset> </html> Propchange: trunk/tools/RosBE-Windows/Documentation/index.html ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 27729: My HTML Code was not W3 Compatible. Now it is :-) Added W3 Compatible Logo
by dreimer＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: dreimer Date: Thu Jul 19 17:58:03 2007 New Revision: 27729 URL: http://svn.reactos.org/svn/reactos?rev=27729&view=rev Log: My HTML Code was not W3 Compatible. Now it is :-) Added W3 Compatible Logo Modified: trunk/tools/RosBE-Windows/Documentation/files/menu.html trunk/tools/RosBE-Windows/Documentation/index.html Modified: trunk/tools/RosBE-Windows/Documentation/files/menu.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/menu.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/menu.html Thu Jul 19 17:58:03 2007 @@ -14,6 +14,12 @@ <a href="features.html">2. Features</a> <a href="basic.html">3. Basic Functions</a> <a href="adv.html">4. Advanced Functions</a> - <a href="credits.html">5. Credits</a> + <a href="credits.html">5. Credits</a> + + <a href="http://validator-test.w3.org/check?uri=referer"><img + src="http://www.w3.org/Icons/valid-html401-blue" + alt="Valid HTML 4.01 Transitional" height="31" width="88"></a> + + </body> </html> Modified: trunk/tools/RosBE-Windows/Documentation/index.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/index.html (original) +++ trunk/tools/RosBE-Windows/Documentation/index.html Thu Jul 19 17:58:03 2007 @@ -10,8 +10,8 @@ <frame name="menu" src="files/menu.html" noresize> <frameset rows="160,*"> - <frame name="intro" src="files/intro.html" noresize frameborder="no" scrolling="no"> - <frame name="main" src="files/main.html" noresize frameborder="no"> + <frame name="intro" src="files/intro.html" noresize frameborder="0" scrolling="no"> + <frame name="main" src="files/main.html" noresize frameborder="0"> </frameset> </frameset> </html>

1 0

[janderwald] 27728: - fix warning - simplify sysreg configuration options (implementation is coming next)
by janderwald＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: janderwald Date: Thu Jul 19 17:43:49 2007 New Revision: 27728 URL: http://svn.reactos.org/svn/reactos?rev=27728&view=rev Log: - fix warning - simplify sysreg configuration options (implementation is coming next) Removed: trunk/reactos/tools/sysreg/runonce.cfg trunk/reactos/tools/sysreg/sample.cfg trunk/reactos/tools/sysreg/secstage.cfg Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/txtmode.cfg 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 Thu Jul 19 17:43:49 2007 @@ -59,7 +59,7 @@ } void OsSupport::sleep(long value) { - _sleep(value); + Sleep(value); } #else /********************************************************************************************************************/ Removed: trunk/reactos/tools/sysreg/runonce.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/runonce.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/runonce.cfg (original) +++ trunk/reactos/tools/sysreg/runonce.cfg (removed) @@ -1,109 +1,0 @@ - ; ROS_OUTPUT -; -; This variable sets the location where to search symbol files for modules -; This is required when tracing usermode exceptions, bsod etc... -; -; If this value is not defined, sysreg looks for the environment variable -; ROS_OUTPUT. If this is also not set, it uses the default output-i386 - -ROS_OUTPUT=D:\reactos\output-i386 - -; ROS_ADDR2LINE -; -; This value is used by the symbol resolver to convert an module address into -; an source file + line number; -; -; Note: The symbol resolver appends the modulename and the module address seperated by an space - -ROS_ADDR2LINE=addr2line.exe --exe= - -;----------------------------------------------------------------------------------------- -; RosBoot specific settings -; - -; -; ROSBOOT_CMD -; -; This value is the command which is executed to gain debugging data -; this value is mandatory - -ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -pidfile pid.txt - -; -; ROSBOOT_DEBUG_PORT -; -; This variable controls on where to look for debugging data. If the -; value is set to file, then sysreg will execute ROSBOOT_CMD and also -; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file -; -; If the value is set to pipe, then sysreg will read from pipe created by the -; ROSBOOT_CMD -; -;ROSBOOT_DEBUG_PORT=file -ROSBOOT_DEBUG_PORT=pipe - -; -; ROSBOOT_DEBUG_FILE -; -; This value specifies the debug file. This variable must be set when using -; ROSBOOT_DEBUG_PORT=file -; -; Note: when ROSBOOT_DEBUG_PORT is set to pipe, then sysreg will write all received -; debug data to the specified debug file -; - -ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\runonce.log - - -; ROSBOOT_DELAY_READ; -; -; When the emulator is started, it spends a little time loading and running through its -; BIOS. This time delays reading from the pipe/file untill the specified value -; -; the value is in seconds -; -; Note: if the value is not provided, then reading debug info is started immediately - -ROSBOOT_DELAY_READ=4 - - - -; ROSBOOT_TIME_OUT -; -; This variable is the maximum runtime of the ROSBOOT_CMD. If the command -; runs longer than this value, sysreg exits with success mode; -; -; Note: if you set the variable ROSBOOT_CHECK_POINT and the checkpoint is not reached -; within this time, sysreg exits with failure mode -; -; If the variable is not set, the default timeout is 1 minute -; -ROSBOOT_TIME_OUT=180.0 - -; ROSBOOT_CHECK_POINT -; -; RosBoot will stop executing when it finds a string in the form -; SYSREG_CHECKPOINT:CP_NAME -; -; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable - -ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE - -; ROSBOOT_CRITICAL_APP -; -; If an user-mode exception occurs in an critical application, i.e. setup.exe / explorer.exe, sysreg will report -; that the test has failed and quit debugging immediately -; -; if an user-mode exception occurs in any other application, sysreg will report the exception but the exception -; has no effect on the test result -; -; Note: if the value is set to IGNORE, sysreg will ignore all user-mode exceptions -; -; Note: if the variable is not set, then sysreg will stop on the first user-mode exception -; -; seperate each application with an space - - -ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe -;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe - Removed: trunk/reactos/tools/sysreg/sample.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sample.cfg?re… ============================================================================== --- trunk/reactos/tools/sysreg/sample.cfg (original) +++ trunk/reactos/tools/sysreg/sample.cfg (removed) @@ -1,111 +1,0 @@ -; ROS_OUTPUT -; -; This variable sets the location where to search symbol files for modules -; This is required when tracing usermode exceptions, bsod etc... -; -; If this value is not defined, sysreg looks for the environment variable -; ROS_OUTPUT. If this is also not set, it uses the default output-i386 - -ROS_OUTPUT=D:\reactos\output-i386 - -; ROS_ADDR2LINE -; -; This value is used by the symbol resolver to convert an module address into -; an source file + line number; -; -; Note: The symbol resolver appends the modulename and the module address seperated by an space - -ROS_ADDR2LINE=addr2line.exe --exe= - -;----------------------------------------------------------------------------------------- -; RosBoot specific settings -; - -; -; ROSBOOT_CMD -; -; This value is the command which is executed to gain debugging data -; this value is mandatory - -ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso - - -; -; ROSBOOT_DEBUG_PORT -; -; This variable controls on where to look for debugging data. If the -; value is set to file, then sysreg will execute ROSBOOT_CMD and also -; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file -; -; If the value is set to pipe, then sysreg will read from pipe created by the -; ROSBOOT_CMD -; -;ROSBOOT_DEBUG_PORT=file -ROSBOOT_DEBUG_PORT=pipe - -; -; ROSBOOT_DEBUG_FILE -; -; This value specifies the debug file. This variable must be set when using -; ROSBOOT_DEBUG_PORT=file - -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log -ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log - -; ROSBOOT_DELAY_READ; -; -; When the emulator is started, it spends a little time loading and running through its -; BIOS. This time delays reading from the pipe/file untill the specified value -; -; the value is in seconds -; -; Note: if the value is not provided, then reading debug info is started immediately - -ROSBOOT_DELAY_READ=4 - - - -; ROSBOOT_TIME_OUT -; -; This variable is the maximum runtime of the ROSBOOT_CMD. If the command -; runs longer than this value, sysreg exits with success mode; -; -; Note: if you set the variable ROSBOOT_CHECK_POINT and the checkpoint is not reached -; within this time, sysreg exits with failure mode -; -; If the variable is not set, the default timeout is 1 minute -; -ROSBOOT_TIME_OUT=30.0 - -; ROSBOOT_CHECK_POINT -; -; RosBoot will stop executing when it finds a string in the form -; SYSREG_CHECKPOINT:CP_NAME -; -; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable - -ROSBOOT_CHECK_POINT=USETUP_COMPLETE - -; ROSBOOT_CRITICAL_APP -; -; If an user-mode exception occurs in an critical application, i.e. setup.exe / explorer.exe, sysreg will report -; that the test has failed and quit debugging immediately -; -; if an user-mode exception occurs in any other application, sysreg will report the exception but the exception -; has no effect on the test result -; -; Note: if the value is set to IGNORE, sysreg will ignore all user-mode exceptions -; -; Note: if the variable is not set, then sysreg will stop on the first user-mode exception -; -; seperate each application with an space - - -ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe -;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe - -;ROSBOOT_TERMINATE_EMULATOR -; -; Terminate the emulator when sysreg exits, default no -; -;ROSBOOT_TERMINATE_EMULATOR=no -ROSBOOT_TERMINATE_EMULATOR=yes Removed: trunk/reactos/tools/sysreg/secstage.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/secstage.cfg?… ============================================================================== --- trunk/reactos/tools/sysreg/secstage.cfg (original) +++ trunk/reactos/tools/sysreg/secstage.cfg (removed) @@ -1,110 +1,0 @@ - ; ROS_OUTPUT -; -; This variable sets the location where to search symbol files for modules -; This is required when tracing usermode exceptions, bsod etc... -; -; If this value is not defined, sysreg looks for the environment variable -; ROS_OUTPUT. If this is also not set, it uses the default output-i386 - -ROS_OUTPUT=D:\reactos\output-i386 - -; ROS_ADDR2LINE -; -; This value is used by the symbol resolver to convert an module address into -; an source file + line number; -; -; Note: The symbol resolver appends the modulename and the module address seperated by an space - -ROS_ADDR2LINE=addr2line.exe --exe= - -;----------------------------------------------------------------------------------------- -; RosBoot specific settings -; - -; -; ROSBOOT_CMD -; -; This value is the command which is executed to gain debugging data -; this value is mandatory - -ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -pidfile pid.txt - -; -; ROSBOOT_DEBUG_PORT -; -; This variable controls on where to look for debugging data. If the -; value is set to file, then sysreg will execute ROSBOOT_CMD and also -; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file -; -; If the value is set to pipe, then sysreg will read from pipe created by the -; ROSBOOT_CMD -; -;ROSBOOT_DEBUG_PORT=file -ROSBOOT_DEBUG_PORT=pipe - -; -; ROSBOOT_DEBUG_FILE -; -; This value specifies the debug file. This variable must be set when using -; ROSBOOT_DEBUG_PORT=file -; -; Note: when ROSBOOT_DEBUG_PORT is set to pipe, then sysreg will write all received -; debug data to the specified debug file -; - -ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\secstage.log - - -; ROSBOOT_DELAY_READ; -; -; When the emulator is started, it spends a little time loading and running through its -; BIOS. This time delays reading from the pipe/file untill the specified value -; -; the value is in seconds -; -; Note: if the value is not provided, then reading debug info is started immediately - -ROSBOOT_DELAY_READ=4 - - - -; ROSBOOT_TIME_OUT -; -; This variable is the maximum runtime of the ROSBOOT_CMD. If the command -; runs longer than this value, sysreg exits with success mode; -; -; Note: if you set the variable ROSBOOT_CHECK_POINT and the checkpoint is not reached -; within this time, sysreg exits with failure mode -; -; If the variable is not set, the default timeout is 1 minute -; -ROSBOOT_TIME_OUT=180.0 - -; ROSBOOT_CHECK_POINT -; -; RosBoot will stop executing when it finds a string in the form -; SYSREG_CHECKPOINT:CP_NAME -; -; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable - -ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE - - -; ROSBOOT_CRITICAL_APP -; -; If an user-mode exception occurs in an critical application, i.e. setup.exe / explorer.exe, sysreg will report -; that the test has failed and quit debugging immediately -; -; if an user-mode exception occurs in any other application, sysreg will report the exception but the exception -; has no effect on the test result -; -; Note: if the value is set to IGNORE, sysreg will ignore all user-mode exceptions -; -; Note: if the variable is not set, then sysreg will stop on the first user-mode exception -; -; seperate each application with an space - - -ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe -;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe - 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 Thu Jul 19 17:43:49 2007 @@ -1,112 +1,79 @@ - ; ROS_OUTPUT +; ROS_EMULATOR_TYPE ; -; This variable sets the location where to search symbol files for modules -; This is required when tracing usermode exceptions, bsod etc... +; This variable defines which emulator should be used to emulate ReactOS ; -; If this value is not defined, sysreg looks for the environment variable -; ROS_OUTPUT. If this is also not set, it uses the default output-i386 +;ROS_EMU_TYPE=[qemu|vmware] -ROS_OUTPUT=D:\reactos\output-i386 +ROS_EMU_TYPE=qemu -; ROS_ADDR2LINE +; ROS_EMU_PATH ; -; This value is used by the symbol resolver to convert an module address into -; an source file + line number; +; This variable sets the path to the emulator ; -; Note: The symbol resolver appends the modulename and the module address seperated by an space +;ROS_EMU_PATH=/usr/bin/qemu +ROS_EMU_PATH=E:\reactos\qemu\qemu.exe -ROS_ADDR2LINE=addr2line.exe --exe= -;----------------------------------------------------------------------------------------- -; RosBoot specific settings +; ROS_HD_IMAGE +; +; The hdd image to use for running the emulator. If this variable is not +; 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_HD_IMAGE=E:\reactos\qemu\RosVMDK.img + +; ROS_CD_IMAGE +; +; Set this variable if you want sysreg to perform a full ReactOS installation using +; an ReactOS unattended installation disk. If this variable is not set, SysReg lets the emulator boot +; from harddisk. ; -; -; ROSBOOT_CMD -; -; This value is the command which is executed to gain debugging data -; this value is mandatory +ROS_CD_IMAGE=E:\reactos\qemu\Reactos-RegTest.iso -;ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -cdrom ; D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt - -ROSBOOT_CMD=/usr/bin/qemu -serial file:/home/freenet/reactos/tools/sysreg/txtmode.log -boot d -m 64 -L /home/freenet/reactos/qemu /home/freenet/reactos/qemu/c.img -cdrom /home/freenet/reactos/ReactOS.iso - -; -; ROSBOOT_DEBUG_PORT -; -; This variable controls on where to look for debugging data. If the -; value is set to file, then sysreg will execute ROSBOOT_CMD and also -; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file -; -; If the value is set to pipe, then sysreg will read from pipe created by the -; ROSBOOT_CMD -; -ROSBOOT_DEBUG_PORT=file -;ROSBOOT_DEBUG_PORT=pipe - -; -; ROSBOOT_DEBUG_FILE -; -; This value specifies the debug file. This variable must be set when using -; ROSBOOT_DEBUG_PORT=file -; -; Note: when ROSBOOT_DEBUG_PORT is set to pipe, then sysreg will write all received -; debug data to the specified debug file +;------------------------------------------------------------------------------------------- +; Additional Options ; -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log -ROSBOOT_DEBUG_FILE=/home/freenet/reactos/tools/sysreg/txtmode.log +; ROS_MAX_TIME +; +; +; Set this variable to value which is the maximum time the emulator lets ReactOS run +; If not set, the emulator runs as long as no exception occurs in the emulator. +; ROS_MAX_TIME=180.0 -; ROSBOOT_DELAY_READ; +; ROS_LOG_FILE +; +; filename of log which receives all debugging data gained from the Emulator +; ROS_LOG_FILE=debug.log + +; ROS_SYM_DIR +; +; This directory sets the location where to search symbol files for modules +; In case of an BSOD, usermode exception, Sysreg will attempt to create a backtrace +; from the debugging data +; +; ROS_SYM_DIR=E:\reactos\output-i386 + +; ROS_DELAY_READ; ; ; When the emulator is started, it spends a little time loading and running through its -; BIOS. This time delays reading from the pipe/file untill the specified value +; BIOS. This time delays reading from the pipe/file untill the specified value. ; -; the value is in seconds +; Note: set this value if you have problems with timeouts or cutoff debugging data ; -; Note: if the value is not provided, then reading debug info is started immediately +; ROS_DELAY_READ=4 -ROSBOOT_DELAY_READ=4 - - - -; ROSBOOT_TIME_OUT -; -; This variable is the maximum runtime of the ROSBOOT_CMD. If the command -; runs longer than this value, sysreg exits with success mode; -; -; Note: if you set the variable ROSBOOT_CHECK_POINT and the checkpoint is not reached -; within this time, sysreg exits with failure mode -; -; If the variable is not set, the default timeout is 1 minute -; -ROSBOOT_TIME_OUT=180.0 - -; ROSBOOT_CHECK_POINT +; ROS_CHECK_POINT ; ; RosBoot will stop executing when it finds a string in the form -; SYSREG_CHECKPOINT:CP_NAME +; SYSREG_CHECKPOINT:YOUR_CHECKPOINT_NAME ; -; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable +;ROS_CHECK_POINT=YOUR_CHECKPOINT_NAME -;ROSBOOT_CHECK_POINT=USETUP_COMPLETE -ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE -ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE - -; ROSBOOT_CRITICAL_APP +;ROS_CRITICAL_IMAGE ; -; If an user-mode exception occurs in an critical application, i.e. setup.exe / explorer.exe, sysreg will report +; If an user-mode exception occurs in an critical application, dll etc, i.e. setup.exe / explorer.exe, sysreg will report ; that the test has failed and quit debugging immediately ; -; if an user-mode exception occurs in any other application, sysreg will report the exception but the exception -; has no effect on the test result -; -; Note: if the value is set to IGNORE, sysreg will ignore all user-mode exceptions -; -; Note: if the variable is not set, then sysreg will stop on the first user-mode exception -; -; seperate each application with an space - - -ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe -;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe +;ROS_CRITICAL_IMAGE=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe

1 0

[fireball] 27727: - Remove compilation units support from win32k, because it often leads to problems and untested code. ReactOS kernel is compiled w/o cunits, and so should win32k be done. - Fix TAB/spaces mess in win32k. Can't you, developers, finally understand that .rbuild uses TAB-only indentation? Is it too hard?
by fireball＠svn.reactos.org 19 Jul '07

19 Jul '07

Author: fireball Date: Thu Jul 19 16:55:58 2007 New Revision: 27727 URL: http://svn.reactos.org/svn/reactos?rev=27727&view=rev Log: - Remove compilation units support from win32k, because it often leads to problems and untested code. ReactOS kernel is compiled w/o cunits, and so should win32k be done. - Fix TAB/spaces mess in win32k. Can't you, developers, finally understand that .rbuild uses TAB-only indentation? Is it too hard? Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Thu Jul 19 16:55:58 2007 @@ -24,51 +24,43 @@ <file>dib32gen.c</file> <file>dib.c</file> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>dib24bpp_hline.s</file> - <file>dib32bpp_hline.s</file> - <file>dib32bpp_colorfill.s</file> - </directory> - </if> - - <ifnot property="ARCH" value="i386"> - <file>dib24bppc.c</file> - <file>dib32bppc.c</file> - </ifnot> - + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>dib24bpp_hline.s</file> + <file>dib32bpp_hline.s</file> + <file>dib32bpp_colorfill.s</file> + </directory> + </if> + <ifnot property="ARCH" value="i386"> + <file>dib24bppc.c</file> + <file>dib32bppc.c</file> + </ifnot> </directory> - - - - <directory name="eng"> - <compilationunit name="eng.c"> - <file>bitblt.c</file> - <file>engbrush.c</file> - <file>clip.c</file> - <file>copybits.c</file> - <file>debug.c</file> - <file>device.c</file> - <file>driverobj.c</file> - <file>error.c</file> - <file>event.c</file> - <file>float.c</file> - <file>gradient.c</file> - <file>lineto.c</file> - <file>mem.c</file> - <file>engmisc.c</file> - <file>mouse.c</file> - <file>paint.c</file> - <file>palette.c</file> - <file>perfcnt.c</file> - <file>semaphor.c</file> - <file>sort.c</file> - <file>surface.c</file> - <file>transblt.c</file> - <file>engwindow.c</file> - <file>xlate.c</file> - </compilationunit> + <file>bitblt.c</file> + <file>engbrush.c</file> + <file>clip.c</file> + <file>copybits.c</file> + <file>debug.c</file> + <file>device.c</file> + <file>driverobj.c</file> + <file>error.c</file> + <file>event.c</file> + <file>float.c</file> + <file>gradient.c</file> + <file>lineto.c</file> + <file>mem.c</file> + <file>engmisc.c</file> + <file>mouse.c</file> + <file>paint.c</file> + <file>palette.c</file> + <file>perfcnt.c</file> + <file>semaphor.c</file> + <file>sort.c</file> + <file>surface.c</file> + <file>transblt.c</file> + <file>engwindow.c</file> + <file>xlate.c</file> </directory> <directory name="ldr"> <file>loader.c</file> @@ -77,105 +69,95 @@ <file>dllmain.c</file> </directory> <directory name="misc"> - <compilationunit name="misc.c"> - <file>driver.c</file> - <file>err.c</file> - <file>math.c</file> - <file>copy.c</file> - <file>usrheap.c</file> - </compilationunit> - <if property="ARCH" value="i386"> + <file>driver.c</file> + <file>err.c</file> + <file>math.c</file> + <file>copy.c</file> + <file>usrheap.c</file> + <if property="ARCH" value="i386"> <directory name="i386"> - <file>cos_asm.s</file> - <file>sin_asm.s</file> - <file>atan2_asm.s</file> - <file>floor_asm.s</file> - <file>ceil_asm.s</file> - </directory> - </if> + <file>cos_asm.s</file> + <file>sin_asm.s</file> + <file>atan2_asm.s</file> + <file>floor_asm.s</file> + <file>ceil_asm.s</file> + </directory> + </if> </directory> <directory name="ntddraw"> - <compilationunit name="ntddraw.c"> - <file>ddraw.c</file> - <file>dd.c</file> - <file>ddsurf.c</file> - <file>stubs.c</file> - </compilationunit> + <file>ddraw.c</file> + <file>dd.c</file> + <file>ddsurf.c</file> + <file>stubs.c</file> </directory> <directory name="ntuser"> - <compilationunit name="ntuser.c"> - <file>accelerator.c</file> - <file>callback.c</file> - <file>callproc.c</file> - <file>caret.c</file> - <file>class.c</file> - <file>clipboard.c</file> - <file>csr.c</file> - <file>cursoricon.c</file> - <file>desktop.c</file> - <file>focus.c</file> - <file>guicheck.c</file> - <file>hook.c</file> - <file>hotkey.c</file> - <file>input.c</file> - <file>keyboard.c</file> - <file>kbdlayout.c</file> - <file>menu.c</file> - <file>message.c</file> - <file>metric.c</file> - <file>misc.c</file> - <file>monitor.c</file> - <file>msgqueue.c</file> - <file>ntuser.c</file> - <file>painting.c</file> - <file>prop.c</file> - <file>scrollbar.c</file> - <file>session.c</file> - <file>ntstubs.c</file> - <file>timer.c</file> - <file>useratom.c</file> - <file>vis.c</file> - <file>windc.c</file> - <file>window.c</file> - <file>winpos.c</file> - <file>winsta.c</file> - <file>object.c</file> - </compilationunit> + <file>accelerator.c</file> + <file>callback.c</file> + <file>callproc.c</file> + <file>caret.c</file> + <file>class.c</file> + <file>clipboard.c</file> + <file>csr.c</file> + <file>cursoricon.c</file> + <file>desktop.c</file> + <file>focus.c</file> + <file>guicheck.c</file> + <file>hook.c</file> + <file>hotkey.c</file> + <file>input.c</file> + <file>keyboard.c</file> + <file>kbdlayout.c</file> + <file>menu.c</file> + <file>message.c</file> + <file>metric.c</file> + <file>misc.c</file> + <file>monitor.c</file> + <file>msgqueue.c</file> + <file>ntuser.c</file> + <file>painting.c</file> + <file>prop.c</file> + <file>scrollbar.c</file> + <file>session.c</file> + <file>ntstubs.c</file> + <file>timer.c</file> + <file>useratom.c</file> + <file>vis.c</file> + <file>windc.c</file> + <file>window.c</file> + <file>winpos.c</file> + <file>winsta.c</file> + <file>object.c</file> </directory> <directory name="objects"> - <compilationunit name="objects.c"> - <file>arc.c</file> - <file>bezier.c</file> - <file>bitmaps.c</file> - <file>brush.c</file> - <file>cliprgn.c</file> - <file>color.c</file> - <file>coord.c</file> - <file>dc.c</file> - <file>dibobj.c</file> - <file>fillshap.c</file> - <file>gdiobj.c</file> - <file>icm.c</file> - <file>line.c</file> - <file>metafile.c</file> - <file>paintobj.c</file> - <file>palobj.c</file> - <file>path.c</file> - <file>pen.c</file> - <file>polyfill.c</file> - <file>print.c</file> - <file>rect.c</file> - <file>region.c</file> - <file>stockobj.c</file> - <file>text.c</file> - <file>wingl.c</file> - </compilationunit> + <file>arc.c</file> + <file>bezier.c</file> + <file>bitmaps.c</file> + <file>brush.c</file> + <file>cliprgn.c</file> + <file>color.c</file> + <file>coord.c</file> + <file>dc.c</file> + <file>dibobj.c</file> + <file>fillshap.c</file> + <file>gdiobj.c</file> + <file>icm.c</file> + <file>line.c</file> + <file>metafile.c</file> + <file>paintobj.c</file> + <file>palobj.c</file> + <file>path.c</file> + <file>pen.c</file> + <file>polyfill.c</file> + <file>print.c</file> + <file>rect.c</file> + <file>region.c</file> + <file>stockobj.c</file> + <file>text.c</file> + <file>wingl.c</file> </directory> <directory name="stubs"> - <compilationunit name="stubs.c"> - <file>stubs.c</file> - <file>xpstubs.c</file> - </compilationunit> + <file>stubs.c</file> + <file>xpstubs.c</file> </directory> </module> <module name="win32k" type="exportdriver" installbase="system32" installname="win32k.sys" allowwarnings="true"> @@ -183,7 +165,7 @@ <library>win32k_base</library> <library>pseh</library> <library>ntoskrnl</library> - <library>ntdll</library> + <library>ntdll</library> <library>hal</library> <library>freetype</library> <file>win32k.rc</file>

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
71
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 July 2007