Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 25757: 30 seconds screensaver timeout is just simply wrong. Developers should have test-settings inside *their* working copies, not trunk/release branches. Set it to 10 minutes (default value in WinXP, iirc).
by fireball＠svn.reactos.org 09 Feb '07

09 Feb '07

Author: fireball Date: Fri Feb 9 13:46:13 2007 New Revision: 25757 URL: http://svn.reactos.org/svn/reactos?rev=25757&view=rev Log: 30 seconds screensaver timeout is just simply wrong. Developers should have test-settings inside *their* working copies, not trunk/release branches. Set it to 10 minutes (default value in WinXP, iirc). Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/winsta.c Fri Feb 9 13:46:13 2007 @@ -485,9 +485,9 @@ /* * Initialize the new window station object */ - WindowStationObject->ScreenSaverRunning = FALSE; - WindowStationObject->ScreenSaverTimeOut = 30; - WindowStationObject->FlatMenu = FALSE; + WindowStationObject->ScreenSaverRunning = FALSE; + WindowStationObject->ScreenSaverTimeOut = 10 * 60; + WindowStationObject->FlatMenu = FALSE; if(!(CurInfo = ExAllocatePool(PagedPool, sizeof(SYSTEM_CURSORINFO)))) {

1 0

[fireball] 25756: 30 seconds screensaver timeout is just simply wrong. Developers should have test-settings inside *their* working copies, not trunk/release branches. Set it to 10 minutes (default value in WinXP, iirc).
by fireball＠svn.reactos.org 09 Feb '07

09 Feb '07

Author: fireball Date: Fri Feb 9 13:45:54 2007 New Revision: 25756 URL: http://svn.reactos.org/svn/reactos?rev=25756&view=rev Log: 30 seconds screensaver timeout is just simply wrong. Developers should have test-settings inside *their* working copies, not trunk/release branches. Set it to 10 minutes (default value in WinXP, iirc). Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Fri Feb 9 13:45:54 2007 @@ -485,9 +485,9 @@ /* * Initialize the new window station object */ - WindowStationObject->ScreenSaverRunning = FALSE; - WindowStationObject->ScreenSaverTimeOut = 30; - WindowStationObject->FlatMenu = FALSE; + WindowStationObject->ScreenSaverRunning = FALSE; + WindowStationObject->ScreenSaverTimeOut = 10 * 60; + WindowStationObject->FlatMenu = FALSE; if(!(CurInfo = ExAllocatePool(PagedPool, sizeof(SYSTEM_CURSORINFO)))) {

1 0

[tkreuzer] 25755: A gdi handle viewer. There's currently a hack, to make it work on ROS, OpenProcess() crashes ROS, so currently you will not see the processes names.
by tkreuzer＠svn.reactos.org 08 Feb '07

08 Feb '07

Author: tkreuzer Date: Fri Feb 9 02:29:24 2007 New Revision: 25755 URL: http://svn.reactos.org/svn/reactos?rev=25755&view=rev Log: A gdi handle viewer. There's currently a hack, to make it work on ROS, OpenProcess() crashes ROS, so currently you will not see the processes names. Added: trunk/rosapps/devutils/gdihv/ trunk/rosapps/devutils/gdihv/gdi.h trunk/rosapps/devutils/gdihv/gdihv.c trunk/rosapps/devutils/gdihv/gdihv.cbp trunk/rosapps/devutils/gdihv/gdihv.h trunk/rosapps/devutils/gdihv/gdihv.rbuild trunk/rosapps/devutils/gdihv/gdihv.rc trunk/rosapps/devutils/gdihv/handlelist.c trunk/rosapps/devutils/gdihv/handlelist.h trunk/rosapps/devutils/gdihv/mainwnd.c trunk/rosapps/devutils/gdihv/mainwnd.h trunk/rosapps/devutils/gdihv/proclist.c trunk/rosapps/devutils/gdihv/proclist.h trunk/rosapps/devutils/gdihv/resource.h trunk/rosapps/devutils/gdihv/system.ico (with props) Added: trunk/rosapps/devutils/gdihv/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdi.h?rev=2… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdi.h (added) +++ trunk/rosapps/devutils/gdihv/gdi.h Fri Feb 9 02:29:24 2007 @@ -1,0 +1,64 @@ +typedef struct _GDI_TABLE_ENTRY +{ + PVOID KernelData; /* Points to the kernel mode structure */ + HANDLE ProcessId; /* process id that created the object, 0 for stock objects */ + LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ + PVOID UserData; /* Points to the user mode structure, usually NULL though */ +} GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; + +typedef PGDI_TABLE_ENTRY (CALLBACK * GDIQUERYPROC) (void); + +/* GDI handle table can hold 0x4000 handles */ +#define GDI_HANDLE_COUNT 0x4000 +#define GDI_GLOBAL_PROCESS (0x0) + +/* Handle Masks and shifts */ +#define GDI_HANDLE_INDEX_MASK (GDI_HANDLE_COUNT - 1) +#define GDI_HANDLE_TYPE_MASK 0x007f0000 +#define GDI_HANDLE_STOCK_MASK 0x00800000 +#define GDI_HANDLE_REUSE_MASK 0xff000000 +#define GDI_HANDLE_REUSECNT_SHIFT 24 +#define GDI_HANDLE_UPPER_MASK 0xffff0000 + +/* Handle macros */ +#define GDI_HANDLE_CREATE(i, t) \ + ((HANDLE)(((i) & GDI_HANDLE_INDEX_MASK) | ((t) & GDI_HANDLE_UPPER_MASK))) + +#define GDI_HANDLE_GET_INDEX(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) + +#define GDI_HANDLE_GET_TYPE(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK) + +#define GDI_HANDLE_IS_TYPE(h, t) \ + ((t) == (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK)) + +#define GDI_HANDLE_IS_STOCKOBJ(h) \ + (0 != (((ULONG_PTR)(h)) & GDI_HANDLE_STOCK_MASK)) + +#define GDI_HANDLE_SET_STOCKOBJ(h) \ + ((h) = (HANDLE)(((ULONG_PTR)(h)) | GDI_HANDLE_STOCK_MASK)) + +#define GDI_HANDLE_GET_UPPER(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_UPPER_MASK) + +#define GDI_OBJECT_TYPE_DC 0x00010000 +#define GDI_OBJECT_TYPE_REGION 0x00040000 +#define GDI_OBJECT_TYPE_BITMAP 0x00050000 +#define GDI_OBJECT_TYPE_PALETTE 0x00080000 +#define GDI_OBJECT_TYPE_FONT 0x000a0000 +#define GDI_OBJECT_TYPE_BRUSH 0x00100000 +#define GDI_OBJECT_TYPE_EMF 0x00210000 +#define GDI_OBJECT_TYPE_PEN 0x00300000 +#define GDI_OBJECT_TYPE_EXTPEN 0x00500000 +#define GDI_OBJECT_TYPE_COLORSPACE 0x00090000 +#define GDI_OBJECT_TYPE_METADC 0x00660000 +#define GDI_OBJECT_TYPE_METAFILE 0x00260000 +#define GDI_OBJECT_TYPE_ENHMETAFILE 0x00460000 +/* Following object types made up for ROS */ +#define GDI_OBJECT_TYPE_ENHMETADC 0x00740000 +#define GDI_OBJECT_TYPE_MEMDC 0x00750000 +#define GDI_OBJECT_TYPE_DCE 0x00770000 +#define GDI_OBJECT_TYPE_DONTCARE 0x007f0000 +/** Not really an object type. Forces GDI_FreeObj to be silent. */ +#define GDI_OBJECT_TYPE_SILENT 0x80000000 Added: trunk/rosapps/devutils/gdihv/gdihv.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.c?rev… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.c (added) +++ trunk/rosapps/devutils/gdihv/gdihv.c Fri Feb 9 02:29:24 2007 @@ -1,0 +1,50 @@ +/* + * Gdi handle viewer + * + * gdihv.c + * + * Copyright (C) 2007 Timo kreuzer <timo <dot> kreuzer <at> web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "gdihv.h" + +HINSTANCE g_hInstance; +GDIQUERYPROC GdiQueryHandleTable; +PGDI_TABLE_ENTRY GdiHandleTable = 0; + +int WINAPI WinMain (HINSTANCE hThisInstance, + HINSTANCE hPrevInstance, + LPSTR lpszArgument, + int nStyle) + +{ + g_hInstance = hThisInstance; + + InitCommonControls(); + + GdiQueryHandleTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandle(L"GDI32.DLL"), "GdiQueryTable"); + if(!GdiQueryHandleTable) + { + return -1; + } + GdiHandleTable = GdiQueryHandleTable(); + + DialogBoxParam(g_hInstance, MAKEINTRESOURCE(IDD_MAINWND), HWND_DESKTOP, MainWindow_WndProc, 0); + + /* The program return value is 0 */ + return 0; +} Added: trunk/rosapps/devutils/gdihv/gdihv.cbp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.cbp?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.cbp (added) +++ trunk/rosapps/devutils/gdihv/gdihv.cbp Fri Feb 9 02:29:24 2007 @@ -1,0 +1,120 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="5" /> + <Project> + <Option title="gdihv" /> + <Option pch_mode="2" /> + <Option default_target="" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug"> + <Option output="..\..\..\..\output-i386\modules\rosapps\devutils\gdihv\gdihv.exe" /> + <Option working_dir="..\..\..\..\output-i386\modules\rosapps\devutils\gdihv" /> + <Option object_output="..\..\..\..\obj-i386\modules\rosapps\devutils\gdihv" /> + <Option type="0" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-g" /> + <Add option="-D__USE_W32API" /> + <Add option="-D_WIN32_IE=0x0501" /> + <Add option="-D_WIN32_WINNT=0x0501" /> + <Add directory="..\..\..\..\include" /> + <Add directory="..\..\..\..\include\crt" /> + <Add directory="..\..\..\..\include\psdk" /> + <Add directory="..\..\..\..\include\ndk" /> + <Add directory="..\..\..\..\include\ddk" /> + </Compiler> + <Linker> + <Add library="user32" /> + <Add library="kernel32" /> + <Add library="comctl32" /> + <Add library="psapi" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="-Wall" /> + </Compiler> + <Linker> + <Add library="gdi32" /> + <Add library="user32" /> + <Add library="kernel32" /> + </Linker> + <Unit filename="gdi.h"> + <Option compilerVar="CPP" /> + <Option compile="0" /> + <Option link="0" /> + <Option virtualFolder="header\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="gdihv.c"> + <Option compilerVar="CC" /> + <Option virtualFolder="source\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="gdihv.h"> + <Option compilerVar="CPP" /> + <Option compile="0" /> + <Option link="0" /> + <Option virtualFolder="header\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="gdihv.rbuild"> + <Option compilerVar="CPP" /> + <Option compile="0" /> + <Option link="0" /> + <Option virtualFolder="header\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="gdihv.rc"> + <Option compilerVar="WINDRES" /> + <Option virtualFolder="resources\" /> + <Option objectName="gdihv.res" /> + <Option target="Debug" /> + </Unit> + <Unit filename="handlelist.c"> + <Option compilerVar="CC" /> + <Option virtualFolder="source\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="handlelist.h"> + <Option compilerVar="CPP" /> + <Option compile="0" /> + <Option link="0" /> + <Option virtualFolder="header\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="mainwnd.c"> + <Option compilerVar="CC" /> + <Option virtualFolder="source\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="mainwnd.h"> + <Option compilerVar="CPP" /> + <Option compile="0" /> + <Option link="0" /> + <Option virtualFolder="header\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="proclist.c"> + <Option compilerVar="CC" /> + <Option virtualFolder="source\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="proclist.h"> + <Option compilerVar="CPP" /> + <Option compile="0" /> + <Option link="0" /> + <Option virtualFolder="header\" /> + <Option target="Debug" /> + </Unit> + <Unit filename="resource.h"> + <Option compilerVar="CPP" /> + <Option compile="0" /> + <Option link="0" /> + <Option virtualFolder="header\" /> + <Option target="Debug" /> + </Unit> + <Extensions /> + </Project> +</CodeBlocks_project_file> Added: trunk/rosapps/devutils/gdihv/gdihv.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.h?rev… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.h (added) +++ trunk/rosapps/devutils/gdihv/gdihv.h Fri Feb 9 02:29:24 2007 @@ -1,0 +1,22 @@ +#ifndef _GDIHV_H +#define _GDIHV_H + +#define UNICODE + +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <ndk/ntndk.h> +#include <psapi.h> + +#include "gdi.h" +#include "mainwnd.h" +#include "proclist.h" +#include "handlelist.h" + +#include "resource.h" + +extern PGDI_TABLE_ENTRY GdiHandleTable; +extern HINSTANCE g_hInstance; + +#endif //_GDIHV_H Added: trunk/rosapps/devutils/gdihv/gdihv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.rbuil… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.rbuild (added) +++ trunk/rosapps/devutils/gdihv/gdihv.rbuild Fri Feb 9 02:29:24 2007 @@ -1,0 +1,15 @@ +<module name="gdihv" type="win32gui" installbase="system32" installname="gdihv.exe"> + <include base="gdihv">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>user32</library> + <library>kernel32</library> + <library>comctl32</library> + <library>psapi</library> + <file>gdihv.c</file> + <file>gdihv.rc</file> + <file>mainwnd.c</file> + <file>handlelist.c</file> + <file>proclist.c</file> +</module> Added: trunk/rosapps/devutils/gdihv/gdihv.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.rc?re… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.rc (added) +++ trunk/rosapps/devutils/gdihv/gdihv.rc Fri Feb 9 02:29:24 2007 @@ -1,0 +1,18 @@ +#include <windows.h> +#include "resource.h" + +IDI_MAIN ICON "system.ico" + +IDD_MAINWND DIALOGEX 0, 0, 260, 250 +STYLE WS_CAPTION | WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_THICKFRAME | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX +CAPTION "HandleView" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tasks", IDC_PROCESSLIST, "SysListView32", WS_BORDER | WS_TABSTOP | 0x00000001 | LVS_REPORT, 5, 5, 100, 200 + CONTROL "Tasks", IDC_HANDLELIST, "SysListView32", WS_BORDER | WS_TABSTOP | 0x00000001 | LVS_REPORT, 110, 5, 150, 200 + PUSHBUTTON "Refresh handles", IDC_REFRESHHANDLE, 200, 230, 80, 14, WS_CLIPSIBLINGS | WS_TABSTOP + PUSHBUTTON "Refresh processes", IDC_REFRESHPROCESS, 50, 230, 80, 14, WS_CLIPSIBLINGS | WS_TABSTOP + +END + + Added: trunk/rosapps/devutils/gdihv/handlelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/handlelist.… ============================================================================== --- trunk/rosapps/devutils/gdihv/handlelist.c (added) +++ trunk/rosapps/devutils/gdihv/handlelist.c Fri Feb 9 02:29:24 2007 @@ -1,0 +1,177 @@ +/* + * Gdi handle viewer + * + * handlelist.c + * + * Copyright (C) 2007 Timo kreuzer <timo <dot> kreuzer <at> web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "gdihv.h" + +VOID +HandleList_Create(HWND hListCtrl) +{ + LVCOLUMN column; + + column.mask = LVCF_TEXT|LVCF_FMT|LVCF_WIDTH; + column.fmt = LVCFMT_LEFT; + + column.pszText = L"Number"; + column.cx = 50; + ListView_InsertColumn(hListCtrl, 0, &column); + + column.pszText = L"Index"; + column.cx = 50; + ListView_InsertColumn(hListCtrl, 1, &column); + + column.pszText = L"Handle"; + column.cx = 90; + ListView_InsertColumn(hListCtrl, 2, &column); + + column.pszText = L"Type"; + column.cx = 90; + ListView_InsertColumn(hListCtrl, 3, &column); + + column.pszText = L"Process"; + column.cx = 90; + ListView_InsertColumn(hListCtrl, 4, &column); + + column.pszText = L"KernelData"; + column.cx = 90; + ListView_InsertColumn(hListCtrl, 5, &column); + + column.pszText = L"UserData"; + column.cx = 90; + ListView_InsertColumn(hListCtrl, 6, &column); + + HandleList_Update(hListCtrl, 0); +} + +VOID +HandleList_Update(HWND hHandleListCtrl, HANDLE ProcessId) +{ + INT i, index; + PGDI_TABLE_ENTRY pEntry; + LV_ITEM item; + TCHAR strText[80]; + TCHAR* str2; + + ListView_DeleteAllItems(hHandleListCtrl); + item.mask = LVIF_TEXT|LVIF_PARAM; + item.pszText = strText; + item.cchTextMax = 80; + for (i = 0; i<= GDI_HANDLE_COUNT; i++) + { + pEntry = &GdiHandleTable[i]; + if (pEntry->KernelData) + { + if (ProcessId == (HANDLE)-1 || ProcessId == pEntry->ProcessId) + { + index = ListView_GetItemCount(hHandleListCtrl); + item.iItem = index; + item.iSubItem = 0; + + wsprintf(strText, L"%d", index); + ListView_InsertItem(hHandleListCtrl, &item); + + wsprintf(strText, L"%d", i); + ListView_SetItemText(hHandleListCtrl, index, 1, strText); + + wsprintf(strText, L"%#08x", GDI_HANDLE_CREATE(i, pEntry->Type)); + ListView_SetItemText(hHandleListCtrl, index, 2, strText); + + str2 = GetTypeName(pEntry->Type & GDI_HANDLE_TYPE_MASK); + ListView_SetItemText(hHandleListCtrl, index, 3, str2); + + wsprintf(strText, L"%#08x", (UINT)pEntry->ProcessId); + ListView_SetItemText(hHandleListCtrl, index, 4, strText); + + wsprintf(strText, L"%#08x", (UINT)pEntry->KernelData); + ListView_SetItemText(hHandleListCtrl, index, 5, strText); + + wsprintf(strText, L"%#08x", (UINT)pEntry->UserData); + ListView_SetItemText(hHandleListCtrl, index, 6, strText); + } + } + } +} + +TCHAR* +GetTypeName(UINT Type) +{ + TCHAR* strText; + + switch (Type) + { + case GDI_OBJECT_TYPE_DC: + strText = L"DC"; + break; + case GDI_OBJECT_TYPE_REGION: + strText = L"Region"; + break; + case GDI_OBJECT_TYPE_BITMAP: + strText = L"Bitmap"; + break; + case GDI_OBJECT_TYPE_PALETTE: + strText = L"Palette"; + break; + case GDI_OBJECT_TYPE_FONT: + strText = L"Font"; + break; + case GDI_OBJECT_TYPE_BRUSH: + strText = L"Brush"; + break; + case GDI_OBJECT_TYPE_EMF: + strText = L"EMF"; + break; + case GDI_OBJECT_TYPE_PEN: + strText = L"Pen"; + break; + case GDI_OBJECT_TYPE_EXTPEN: + strText = L"ExtPen"; + break; + case GDI_OBJECT_TYPE_COLORSPACE: + strText = L"ColSpace"; + break; + case GDI_OBJECT_TYPE_METADC: + strText = L"MetaDC"; + break; + case GDI_OBJECT_TYPE_METAFILE: + strText = L"Metafile"; + break; + case GDI_OBJECT_TYPE_ENHMETAFILE: + strText = L"EMF"; + break; + case GDI_OBJECT_TYPE_ENHMETADC: + strText = L"EMDC"; + break; + case GDI_OBJECT_TYPE_MEMDC: + strText = L"MemDC"; + break; + case GDI_OBJECT_TYPE_DCE: + strText = L"DCE"; + break; + case GDI_OBJECT_TYPE_DONTCARE: + strText = L"anything"; + break; + case GDI_OBJECT_TYPE_SILENT: + default: + strText = L"unknown"; + break; + } + return strText; +} Added: trunk/rosapps/devutils/gdihv/handlelist.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/handlelist.… ============================================================================== --- trunk/rosapps/devutils/gdihv/handlelist.h (added) +++ trunk/rosapps/devutils/gdihv/handlelist.h Fri Feb 9 02:29:24 2007 @@ -1,0 +1,4 @@ + +VOID HandleList_Create(HWND hListCtrl); +VOID HandleList_Update(HWND hHandleListCtrl, HANDLE ProcessID); +TCHAR* GetTypeName(UINT Type); Added: trunk/rosapps/devutils/gdihv/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/mainwnd.c?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/mainwnd.c (added) +++ trunk/rosapps/devutils/gdihv/mainwnd.c Fri Feb 9 02:29:24 2007 @@ -1,0 +1,126 @@ +/* + * Gdi handle viewer + * + * mainwnd.c + * + * Copyright (C) 2007 Timo kreuzer <timo <dot> kreuzer <at> web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "gdihv.h" + +INT g_Separator; + +INT_PTR CALLBACK +MainWindow_WndProc(HWND hMainWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + { + RECT rect; + + SendMessage(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_MAIN))); + GetClientRect(hMainWnd, &rect); + g_Separator = (rect.right / 2); + HandleList_Create(GetDlgItem(hMainWnd, IDC_HANDLELIST)); + ProcessList_Create(GetDlgItem(hMainWnd, IDC_PROCESSLIST)); + MainWindow_OnSize(hMainWnd); + + break; + } + case WM_SIZE: + { + MainWindow_OnSize(hMainWnd); + break; + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + { + EndDialog(hMainWnd, IDOK); + break; + } + case IDC_REFRESHHANDLE: + { + LV_ITEM item; + HWND hProcessListCtrl = GetDlgItem(hMainWnd, IDC_PROCESSLIST); + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_PARAM; + item.iItem = ListView_GetSelectionMark(hProcessListCtrl); + ListView_GetItem(hProcessListCtrl, &item); + HandleList_Update(GetDlgItem(hMainWnd, IDC_HANDLELIST), (HANDLE)item.lParam); + break; + } + case IDC_REFRESHPROCESS: + { + ProcessList_Update(GetDlgItem(hMainWnd, IDC_PROCESSLIST)); + break; + } + default: + { + return FALSE; + } + } + break; + } + case WM_NOTIFY: + { + if (((LPNMLISTVIEW)lParam)->hdr.code == LVN_ITEMCHANGED + && (((LPNMLISTVIEW)lParam)->uNewState & LVIS_SELECTED) + && !(((LPNMLISTVIEW)lParam)->uOldState & LVIS_SELECTED)) + { + LV_ITEM item; + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_PARAM; + item.iItem = ((LPNMLISTVIEW)lParam)->iItem; + ListView_GetItem(GetDlgItem(hMainWnd, IDC_PROCESSLIST), &item); + HandleList_Update(GetDlgItem(hMainWnd, IDC_HANDLELIST), (HANDLE)item.lParam); + return TRUE; + break; + } + } + default: + { + return FALSE; + } + } + return TRUE; +} + +VOID +MainWindow_OnSize(HWND hMainWnd) +{ + HWND hProcessListctrl, hHandleListCtrl, hProcessRefresh, hHandleRefresh; + RECT rect; + + hProcessListctrl = GetDlgItem(hMainWnd, IDC_PROCESSLIST); + hHandleListCtrl = GetDlgItem(hMainWnd, IDC_HANDLELIST); + hProcessRefresh = GetDlgItem(hMainWnd, IDC_REFRESHPROCESS); + hHandleRefresh = GetDlgItem(hMainWnd, IDC_REFRESHHANDLE); + + GetClientRect(hMainWnd, &rect); + +//g_Separator = (rect.right / 2); + MoveWindow(hProcessListctrl, 5, 5, g_Separator - 5, rect.bottom - 40, TRUE); + MoveWindow(hHandleListCtrl, g_Separator + 5, 5, rect.right - g_Separator - 5, rect.bottom - 40, TRUE); + MoveWindow(hProcessRefresh, g_Separator - 90, rect.bottom - 30, 90, 25, TRUE); + MoveWindow(hHandleRefresh, rect.right - 90, rect.bottom - 30, 90, 25, TRUE); + return; +} Added: trunk/rosapps/devutils/gdihv/mainwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/mainwnd.h?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/mainwnd.h (added) +++ trunk/rosapps/devutils/gdihv/mainwnd.h Fri Feb 9 02:29:24 2007 @@ -1,0 +1,3 @@ + +INT_PTR CALLBACK MainWindow_WndProc(HWND, UINT, WPARAM, LPARAM); +VOID MainWindow_OnSize(HWND hMainWnd); Added: trunk/rosapps/devutils/gdihv/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/proclist.c?… ============================================================================== --- trunk/rosapps/devutils/gdihv/proclist.c (added) +++ trunk/rosapps/devutils/gdihv/proclist.c Fri Feb 9 02:29:24 2007 @@ -1,0 +1,94 @@ +/* + * Gdi handle viewer + * + * proclist.c + * + * Copyright (C) 2007 Timo kreuzer <timo <dot> kreuzer <at> web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "gdihv.h" + +VOID +ProcessList_Create(HWND hListCtrl) +{ + LVCOLUMN column; + + column.mask = LVCF_TEXT|LVCF_FMT|LVCF_WIDTH; + column.fmt = LVCFMT_LEFT; + + column.pszText = L"Process"; + column.cx = 90; + ListView_InsertColumn(hListCtrl, 0, &column); + + column.pszText = L"ProcessID"; + column.cx = 90; + ListView_InsertColumn(hListCtrl, 1, &column); + ProcessList_Update(hListCtrl); +} + +VOID +ProcessList_Update(HWND hListCtrl) +{ + LV_ITEM item; + DWORD ProcessIds[1024], BytesReturned, cProcesses; + HANDLE hProcess; + WCHAR strText[MAX_PATH] = L"<unknown>"; + INT i; + + ListView_DeleteAllItems(hListCtrl); + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT|LVIF_PARAM; + item.pszText = strText; + + /* Insert "kernel" */ + item.iItem = 0; + item.lParam = 0; + item.pszText = L"<Kernel>"; + ListView_InsertItem(hListCtrl, &item); + item.pszText = strText; + wsprintf(strText, L"%#08x", 0); + ListView_SetItemText(hListCtrl, 0, 1, strText); + + if (!EnumProcesses(ProcessIds, sizeof(ProcessIds), &BytesReturned )) + { + return; + } + cProcesses = BytesReturned / sizeof(DWORD); + if (cProcesses == 0) + { + return; + } + for (i = 0; i < cProcesses; i++) + { + wsprintf(strText, L"<unknown>"); + item.lParam = ProcessIds[i]; + item.iItem = ListView_GetItemCount(hListCtrl); + + hProcess = 0; + /* FIXME: HACK: ROS crashes when using OpenProcess with PROCESS_VM_READ */ +// hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessIds[i]); + if (hProcess) + { + GetModuleBaseName(hProcess, NULL, (LPWSTR)strText, MAX_PATH ); + CloseHandle(hProcess); + } + ListView_InsertItem(hListCtrl, &item); + + wsprintf(strText, L"%#08x", ProcessIds[i]); + ListView_SetItemText(hListCtrl, item.iItem, 1, strText); + } +} Added: trunk/rosapps/devutils/gdihv/proclist.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/proclist.h?… ============================================================================== --- trunk/rosapps/devutils/gdihv/proclist.h (added) +++ trunk/rosapps/devutils/gdihv/proclist.h Fri Feb 9 02:29:24 2007 @@ -1,0 +1,3 @@ + +VOID ProcessList_Create(HWND hListCtrl); +VOID ProcessList_Update(HWND hListCtrl); Added: trunk/rosapps/devutils/gdihv/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/resource.h?… ============================================================================== --- trunk/rosapps/devutils/gdihv/resource.h (added) +++ trunk/rosapps/devutils/gdihv/resource.h Fri Feb 9 02:29:24 2007 @@ -1,0 +1,8 @@ + +#define IDD_MAINWND 1000 +#define IDC_PROCESSLIST 1001 +#define IDC_HANDLELIST 1002 +#define IDC_REFRESHHANDLE 1010 +#define IDC_REFRESHPROCESS 1011 +#define IDI_MAIN 2000 +#define IDI_ARROW 2001 Added: trunk/rosapps/devutils/gdihv/system.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/system.ico?… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/devutils/gdihv/system.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[spetreolle] 25754: add msacm32.drv to bootcd
by spetreolle＠svn.reactos.org 08 Feb '07

08 Feb '07

Author: spetreolle Date: Thu Feb 8 20:06:48 2007 New Revision: 25754 URL: http://svn.reactos.org/svn/reactos?rev=25754&view=rev Log: add msacm32.drv to bootcd 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 Thu Feb 8 20:06:48 2007 @@ -231,6 +231,7 @@ dll\win32\vdmdbg\vdmdbg.dll 1 dll\win32\wininet\wininet.dll 1 dll\win32\winmm\winmm.dll 1 +dll\win32\winmm\wavemap\msacm32.drv 1 dll\win32\winspool\winspool.drv 1 dll\win32\wintrust\wintrust.dll 1 dll\win32\ws2_32\ws2_32.dll 1

1 0

[spetreolle] 25753: try to load actual names for midimap.dll and msacm32.drv
by spetreolle＠svn.reactos.org 08 Feb '07

08 Feb '07

Author: spetreolle Date: Thu Feb 8 20:05:15 2007 New Revision: 25753 URL: http://svn.reactos.org/svn/reactos?rev=25753&view=rev Log: try to load actual names for midimap.dll and msacm32.drv Modified: trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild trunk/reactos/dll/win32/winmm/winemm.h Modified: trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/wavemap/wa… ============================================================================== --- trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild (original) +++ trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild Thu Feb 8 20:05:15 2007 @@ -1,4 +1,4 @@ -<module name="wavemap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="wavemap.dll" allowwarnings="true"> +<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true"> <importlibrary definition="msacm.spec.def" /> <include base="wavemap">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/winmm/winemm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winemm.h?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/winemm.h (original) +++ trunk/reactos/dll/win32/winmm/winemm.h Thu Feb 8 20:05:15 2007 @@ -30,7 +30,7 @@ #define WINE_DEFAULT_WINMM_DRIVER "oss" #define WINE_DEFAULT_WINMM_MAPPER "msacm.drv" -#define WINE_DEFAULT_WINMM_MIDI "midimap.drv" +#define WINE_DEFAULT_WINMM_MIDI "midimap.dll" typedef DWORD (WINAPI *MessageProc16)(UINT16 wDevID, UINT16 wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); typedef DWORD (WINAPI *MessageProc32)(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);

1 0

[ion] 25752: - Fix build. - Initialize some SharedUserData settings in MmInitSystem.
by ion＠svn.reactos.org 08 Feb '07

08 Feb '07

Author: ion Date: Thu Feb 8 04:22:04 2007 New Revision: 25752 URL: http://svn.reactos.org/svn/reactos?rev=25752&view=rev Log: - Fix build. - Initialize some SharedUserData settings in MmInitSystem. Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/inbv.h (original) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h Thu Feb 8 04:22:04 2007 @@ -45,6 +45,8 @@ VOID ); +extern BOOLEAN InbvBootDriverInstalled; + #endif /* NTOSKRNL_INBV_H */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 8 04:22:04 2007 @@ -468,6 +468,14 @@ SectionsReady = TRUE; MmInitPagingFile(); PagingReady = TRUE; + + /* Setup shared user data settings that NT does as well */ + ASSERT(SharedUserData->NumberOfPhysicalPages == 0); + SharedUserData->NumberOfPhysicalPages = MmStats.NrTotalPages; + SharedUserData->LargePageMinimum = 0; + + /* For now, we assume that we're always Workstation */ + SharedUserData->NtProductType = NtProductWinNt; } else if (Phase == 2) {

1 0

[ion] 25751: - Update boot graphics with new, RLE-compressed and palette-blacked versions from mf. - Re-enable FreeLDR's "prepare for ros video" routine, but change it to match the new BootVid, which uses Mode 0x12. This is roughly what HalDisplayReset does, which isn't yet implemented (except the latter needs to setup a BIOS call trampoline). - Fix up some bugs in bootvid and inbv. - Implement SOS case of DisplayBootBitmap, and implement FinalizeBootLogo. Now bootvid starts to show its colors,
by ion＠svn.reactos.org 08 Feb '07

08 Feb '07

Author: ion Date: Thu Feb 8 03:50:23 2007 New Revision: 25751 URL: http://svn.reactos.org/svn/reactos?rev=25751&view=rev Log: - Update boot graphics with new, RLE-compressed and palette-blacked versions from mf. - Re-enable FreeLDR's "prepare for ros video" routine, but change it to match the new BootVid, which uses Mode 0x12. This is roughly what HalDisplayReset does, which isn't yet implemented (except the latter needs to setup a BIOS call trampoline). - Fix up some bugs in bootvid and inbv. - Implement SOS case of DisplayBootBitmap, and implement FinalizeBootLogo. Now bootvid starts to show its colors, but one .bmp is still buggy. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/drivers/base/bootvid/vga.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/power.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/inbv/logo/1.bmp trunk/reactos/ntoskrnl/inbv/logo/13.bmp trunk/reactos/ntoskrnl/inbv/logo/14.bmp trunk/reactos/ntoskrnl/inbv/logo/15.bmp trunk/reactos/ntoskrnl/inbv/logo/16.bmp trunk/reactos/ntoskrnl/inbv/logo/17.bmp trunk/reactos/ntoskrnl/inbv/logo/2.bmp trunk/reactos/ntoskrnl/inbv/logo/3.bmp trunk/reactos/ntoskrnl/inbv/logo/4.bmp trunk/reactos/ntoskrnl/inbv/logo/5.bmp trunk/reactos/ntoskrnl/inbv/logo/6.bmp trunk/reactos/ntoskrnl/inbv/logo/7.bmp trunk/reactos/ntoskrnl/inbv/logo/8.bmp trunk/reactos/ntoskrnl/include/internal/inbv.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Thu Feb 8 03:50:23 2007 @@ -310,7 +310,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT /SOS"); + L"/DEBUGPORT=SCREEN /SOS"); /* Create "DOS" section */ IniSection = IniCacheAppendSection(IniCache, Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Thu Feb 8 03:50:23 2007 @@ -596,7 +596,7 @@ { if (VIDEOCARD_VGA == PcVideoDetectVideoCard()) { - PcVideoSetBiosMode(0x03); + PcVideoSetBiosMode(0x12); PcVideoSetFont8x8(); PcVideoSelectAlternatePrintScreen(); PcVideoDisableCursorEmulation(); @@ -1108,8 +1108,8 @@ VOID PcVideoPrepareForReactOS(VOID) { - PcVideoSetMode80x50_80x43(); - PcVideoHideShowTextCursor(FALSE); + PcVideoSetBiosMode(0x12); + PcVideoHideShowTextCursor(FALSE); } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Thu Feb 8 03:50:23 2007 @@ -932,7 +932,7 @@ * Now boot the kernel */ DiskStopFloppyMotor(); - //MachVideoPrepareForReactOS(); + MachVideoPrepareForReactOS(); FrLdrStartup(0x2badb002); } Modified: trunk/reactos/drivers/base/bootvid/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vga.c… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vga.c (original) +++ trunk/reactos/drivers/base/bootvid/vga.c Thu Feb 8 03:50:23 2007 @@ -847,7 +847,7 @@ { /* Assert alignment */ ASSERT((x1 & 0x7) == 0); - ASSERT((x2 & 0x7) == 0); + ASSERT((x2 & 0x7) == 7); /* Set Scroll Region */ ScrollRegion[0] = x1; Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=257… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Feb 8 03:50:23 2007 @@ -1028,7 +1028,7 @@ { /* It is, display the boot logo and enable printing strings */ InbvEnableDisplayString(SosEnabled); - //DisplayBootBitmap(SosEnabled); + DisplayBootBitmap(SosEnabled); } else { @@ -1204,7 +1204,7 @@ /* Wait 5 seconds for it to initialize */ Timeout.QuadPart = Int32x32To64(5, -10000000); Status = ZwWaitForSingleObject(ProcessInfo->ProcessHandle, FALSE, &Timeout); - //if (InbvBootDriverInstalled) FinalizeBootLogo(); + if (InbvBootDriverInstalled) FinalizeBootLogo(); if (Status == STATUS_SUCCESS) { Modified: trunk/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/power.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ex/power.c (original) +++ trunk/reactos/ntoskrnl/ex/power.c Thu Feb 8 03:50:23 2007 @@ -150,7 +150,7 @@ InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - //InbvSetScrollRegion(0, 0, 639, 479); + InbvSetScrollRegion(0, 0, 639, 479); } if (Action == ShutdownNoReboot) Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Thu Feb 8 03:50:23 2007 @@ -19,6 +19,9 @@ INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; ULONG ResourceCount; PUCHAR ResourceList[64]; +BOOLEAN SysThreadCreated; +ROT_BAR_TYPE RotBarSelection; +ULONG PltRotBarStatus; /* FUNCTIONS *****************************************************************/ @@ -528,3 +531,94 @@ /* Return success */ return STATUS_SUCCESS; } + +VOID +NTAPI +DisplayBootBitmap(IN BOOLEAN SosMode) +{ + PVOID Bitmap, Header; + ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; + + /* Check if the system thread has already been created */ + if (SysThreadCreated) + { + /* Reset the progress bar */ + InbvAcquireLock(); + RotBarSelection = 0; + InbvReleaseLock(); + } + + /* Check if this is SOS mode */ + ShowProgressBar = FALSE; + if (SosMode) + { + /* Check if this is a server OS */ + if (SharedUserData->NtProductType == NtProductWinNt) + { + /* It's not, set workstation settings */ + InbvSetTextColor(15); + InbvSolidColorFill(0, 0, 639, 479, 7); + InbvSolidColorFill(0, 421, 639, 479, 1); + + /* Get resources */ + Bitmap = InbvGetResourceAddress(6); + Header = InbvGetResourceAddress(7); + } + else + { + /* Set server settings */ + InbvSetTextColor(14); + InbvSolidColorFill(0, 0, 639, 479, 6); + InbvSolidColorFill(0, 421, 639, 479, 1); + + /* Get resources */ + Bitmap = InbvGetResourceAddress(14); + Header = InbvGetResourceAddress(15); + } + + /* Set the scrolling region */ + InbvSetScrollRegion(32, 80, 631, 400); + + /* Make sure we have resources */ + if ((Bitmap) && (Header)) + { + /* BitBlt them on the screen */ + InbvBitBlt(Header, 0, 419); + InbvBitBlt(Bitmap, 0, 0); + } + } + else + { + /* Is the boot driver installed? */ + if (!InbvBootDriverInstalled) return; + + /* FIXME: TODO, display full-screen bitmap */ + } + + /* Do we have a system thread? */ + if (SysThreadCreated) + { + /* We do, set the progress bar location */ + InbvAcquireLock(); + RotBarSelection = TempRotBarSelection; + //InbvRotBarInit(); + InbvReleaseLock(); + } +} + +VOID +NTAPI +FinalizeBootLogo(VOID) +{ + /* Acquire lock and check the display state */ + InbvAcquireLock(); + if (InbvGetDisplayState() == INBV_DISPLAY_STATE_OWNED) + { + /* Clear the screen */ + VidSolidColorFill(0, 0, 639, 479, 0); + } + + /* Reset progress bar and lock */ + PltRotBarStatus = 3; + InbvReleaseLock(); +} Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/13.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/13.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/14.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/14.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/15.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/15.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/16.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/16.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/17.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/17.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/2.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/3.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/4.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/5.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/6.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/7.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/8.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/inbv.h (original) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h Thu Feb 8 03:50:23 2007 @@ -7,6 +7,12 @@ ULONG Ceiling; ULONG Bias; } INBV_PROGRESS_STATE; + +typedef enum _ROT_BAR_TYPE +{ + RB_UNSPECIFIED, + RB_SQUARE_CELLS +} ROT_BAR_TYPE; VOID NTAPI @@ -27,6 +33,18 @@ IN BOOLEAN Enable ); +VOID +NTAPI +DisplayBootBitmap( + IN BOOLEAN SosMode +); + +VOID +NTAPI +FinalizeBootLogo( + VOID +); + #endif /* NTOSKRNL_INBV_H */

1 0

[ion] 25750: - Add bootvid-compatible bitmaps for ReactOS, made by mf.
by ion＠svn.reactos.org 07 Feb '07

07 Feb '07

Author: ion Date: Thu Feb 8 01:08:13 2007 New Revision: 25750 URL: http://svn.reactos.org/svn/reactos?rev=25750&view=rev Log: - Add bootvid-compatible bitmaps for ReactOS, made by mf. Added: trunk/reactos/ntoskrnl/inbv/logo/ trunk/reactos/ntoskrnl/inbv/logo/1.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/13.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/14.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/15.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/16.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/17.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/2.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/3.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/4.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/5.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/6.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/7.bmp (with props) trunk/reactos/ntoskrnl/inbv/logo/8.bmp (with props) Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc Added: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/13.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/13.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/13.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/14.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/14.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/14.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/15.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/15.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/15.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/16.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/16.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/16.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/17.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/17.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/17.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/2.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/3.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/4.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/5.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/6.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/7.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/ntoskrnl/inbv/logo/8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/8.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/ntoskrnl/inbv/logo/8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rc?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rc (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rc Thu Feb 8 01:08:13 2007 @@ -6,3 +6,17 @@ #include <reactos/version.rc> #include "bugcodes.rc" + +1 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" +2 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" +3 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" +4 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" +5 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" +6 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" +7 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" +8 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" +13 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/13.bmp" +14 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" +15 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp" +16 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/16.bmp" +17 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/17.bmp"

1 0

[hpoussin] 25749: Specify which winuser.h we want to include, instead of relying on some magic to find the right one
by hpoussin＠svn.reactos.org 07 Feb '07

07 Feb '07

Author: hpoussin Date: Thu Feb 8 00:40:46 2007 New Revision: 25749 URL: http://svn.reactos.org/svn/reactos?rev=25749&view=rev Log: Specify which winuser.h we want to include, instead of relying on some magic to find the right one Modified: trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h (original) +++ trunk/reactos/include/reactos/wine/winuser.h Thu Feb 8 00:40:46 2007 @@ -8,7 +8,7 @@ #include <wingdi.h> #if !defined(_MSC_VER) -#include_next <winuser.h> +#include "../../psdk/winuser.h" #endif #define WS_EX_TRAYWINDOW 0x80000000L

1 0

[fireball] 25748: Merge fixes for LiveCD (25746, 25747 plus corresponding changes in ex/init.c). LiveCD now works.
by fireball＠svn.reactos.org 07 Feb '07

07 Feb '07

Author: fireball Date: Wed Feb 7 23:56:12 2007 New Revision: 25748 URL: http://svn.reactos.org/svn/reactos?rev=25748&view=rev Log: Merge fixes for LiveCD (25746, 25747 plus corresponding changes in ex/init.c). LiveCD now works. Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/power.c branches/ros-branch-0_3_1/reactos/ntoskrnl/io/iomgr/arcname.c branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c Wed Feb 7 23:56:12 2007 @@ -33,6 +33,7 @@ BOOLEAN ExpInTextModeSetup; BOOLEAN IoRemoteBootClient; ULONG InitSafeBootMode; +BOOLEAN InitIsWinPEMode, InitWinPEModeType; BOOLEAN NoGuiBoot = FALSE; @@ -820,6 +821,7 @@ ExPhase2Init(PVOID Context) { LARGE_INTEGER Timeout; + PCHAR CommandLine; HANDLE ProcessHandle; HANDLE ThreadHandle; NTSTATUS Status; @@ -835,8 +837,11 @@ /* Do Phase 1 HAL Initialization */ HalInitSystem(1, KeLoaderBlock); + /* Get the command line and upcase it */ + CommandLine = _strupr(KeLoaderBlock->LoadOptions); + /* Check if GUI Boot is enabled */ - if (strstr(KeLoaderBlock->LoadOptions, "NOGUIBOOT")) NoGuiBoot = TRUE; + if (strstr(CommandLine, "NOGUIBOOT")) NoGuiBoot = TRUE; /* Display the boot screen image if not disabled */ if (!ExpInTextModeSetup) InbvDisplayInitialize2(NoGuiBoot); @@ -845,6 +850,14 @@ /* Clear the screen to blue and display the boot notice and debug status */ if (NoGuiBoot) ExpDisplayNotice(); KdInitSystem(2, KeLoaderBlock); + + /* Check if this is LiveCD (WinPE) mode */ + if (strstr(CommandLine, "MININT")) + { + /* Setup WinPE Settings */ + InitIsWinPEMode = TRUE; + InitWinPEModeType |= (strstr(CommandLine, "INRAM")) ? 0x80000000 : 1; + } /* Initialize Power Subsystem in Phase 0 */ PoInit(0, AcpiTableDetected); Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/power.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/power.c Wed Feb 7 23:56:12 2007 @@ -150,7 +150,7 @@ InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); + //InbvSetScrollRegion(0, 0, 639, 479); } if (Action == ShutdownNoReboot) Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/io/iomgr/arcname.c Wed Feb 7 23:56:12 2007 @@ -33,6 +33,8 @@ FILE_BASIC_INFORMATION FileInfo; NTSTATUS Status; PCHAR p, q; + PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); + extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; /* Only ARC Name left - Build full ARC Name */ p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); @@ -86,26 +88,32 @@ RtlFreeUnicodeString(&DeviceName); } - /* Build the name */ - sprintf(p, "cdrom(%lu)", DeviceNumber); - - /* Adjust original command line */ - q = strchr(p, ')'); - if (q) + if (!InitIsWinPEMode) { - q++; - strcpy(Buffer, q); + /* Build the name */ sprintf(p, "cdrom(%lu)", DeviceNumber); - strcat(p, Buffer); + + /* Adjust original command line */ + q = strchr(p, ')'); + if (q) + { + q++; + strcpy(Buffer, q); + sprintf(p, "cdrom(%lu)", DeviceNumber); + strcat(p, Buffer); + } } } + + /* OK, how many disks are there? */ + DeviceNumber += ConfigInfo->DiskCount; /* Return whether this is the CD or not */ - if (DeviceNumber != 1) + if ((InitIsWinPEMode) || (ExpInTextModeSetup)) { /* Hack until IoAssignDriveLetters is fixed */ - swprintf(SharedUserData->NtSystemRoot, L"D:\\reactos"); - return TRUE; + swprintf(SharedUserData->NtSystemRoot, L"%c:\\reactos", 'C' + DeviceNumber); + return TRUE; } /* Failed */ Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/mminit.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/mminit.c Wed Feb 7 23:56:12 2007 @@ -482,7 +482,7 @@ /* * Initialise the modified page writer. */ - MmInitMpwThread(); + if (!strstr(KeLoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); /* FIXME: Read parameters from memory */ }

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