Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 29967: Keep callproc handles valid as long as a window classes exists. Abiword should work again.
by weiden＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: weiden Date: Tue Oct 30 04:24:47 2007 New Revision: 29967 URL: http://svn.reactos.org/svn/reactos?rev=29967&view=rev Log: Keep callproc handles valid as long as a window classes exists. Abiword should work again. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Oct 30 04:24:47 2007 @@ -16,6 +16,7 @@ { struct _W32PROCESSINFO *pi; WNDPROC WndProc; + struct _CALLPROC *Next; UINT Unicode : 1; } CALLPROC, *PCALLPROC; @@ -36,6 +37,7 @@ PCALLPROC CallProc; }; PCALLPROC CallProc2; + PCALLPROC CallProcList; INT ClsExtra; INT WndExtra; HINSTANCE hInstance; @@ -51,8 +53,6 @@ UINT Unicode : 1; UINT System : 1; UINT Global : 1; - UINT GlobalCallProc : 1; - UINT GlobalCallProc2 : 1; UINT MenuNameIsString : 1; } WINDOWCLASS, *PWINDOWCLASS; Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h Tue Oct 30 04:24:47 2007 @@ -69,6 +69,15 @@ OUT PWINDOWCLASS *BaseClass OPTIONAL, OUT PWINDOWCLASS **Link OPTIONAL); +PCALLPROC +UserFindCallProc(IN PWINDOWCLASS Class, + IN WNDPROC WndProc, + IN BOOL bUnicode); + +VOID +UserAddCallProcToClass(IN OUT PWINDOWCLASS Class, + IN PCALLPROC CallProc); + BOOL IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, OUT RTL_ATOM *Atom); Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h Tue Oct 30 04:24:47 2007 @@ -37,9 +37,6 @@ /* Extra Wnd proc (windows of system classes) */ WNDPROC WndProcExtra; }; - /* Pointer to another call procedure handle (used for returning the previous - window proc in SetWindowLongPtr) */ - PCALLPROC CallProc2; /* Indicates whether the window is derived from a system class */ BOOL IsSystem; /* Pointer to the window class. */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c Tue Oct 30 04:24:47 2007 @@ -70,6 +70,7 @@ NewCallProc->pi = CallProc->pi; NewCallProc->WndProc = CallProc->WndProc; NewCallProc->Unicode = CallProc->Unicode; + NewCallProc->Next = NULL; } return NewCallProc; @@ -94,6 +95,7 @@ NewCallProc->pi = pi; NewCallProc->WndProc = WndProc; NewCallProc->Unicode = Unicode; + NewCallProc->Next = NULL; } return NewCallProc; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Tue Oct 30 04:24:47 2007 @@ -59,17 +59,19 @@ if (Class->Base == Class) { - /* destruct resources shared with clones */ - if (!Class->System && Class->CallProc != NULL) - { - DestroyCallProc(Class->GlobalCallProc ? NULL : Class->Desktop, + PCALLPROC CallProc, NextCallProc; + + /* Destroy allocated callproc handles */ + CallProc = Class->CallProcList; + while (CallProc != NULL) + { + NextCallProc = CallProc->Next; + + CallProc->Next = NULL; + DestroyCallProc(NULL, Class->CallProc); - } - - if (Class->CallProc2 != NULL) - { - DestroyCallProc(Class->GlobalCallProc2 ? NULL : Class->Desktop, - Class->CallProc2); + + CallProc = NextCallProc; } IntFreeClassMenuName(Class); @@ -180,6 +182,50 @@ Atom); } +PCALLPROC +UserFindCallProc(IN PWINDOWCLASS Class, + IN WNDPROC WndProc, + IN BOOL bUnicode) +{ + PCALLPROC CallProc; + + CallProc = Class->CallProcList; + while (CallProc != NULL) + { + if (CallProc->WndProc == WndProc && + CallProc->Unicode == (UINT)bUnicode) + { + return CallProc; + } + + CallProc = CallProc->Next; + } + + return NULL; +} + +VOID +UserAddCallProcToClass(IN OUT PWINDOWCLASS Class, + IN PCALLPROC CallProc) +{ + PWINDOWCLASS BaseClass; + + ASSERT(CallProc->Next == NULL); + + BaseClass = Class->Base; + ASSERT(CallProc->Next == NULL); + CallProc->Next = BaseClass->CallProcList; + BaseClass->CallProcList = CallProc; + + /* Update all clones */ + Class = Class->Clone; + while (Class != NULL) + { + Class->CallProcList = BaseClass->CallProcList; + Class = Class->Next; + } +} + static BOOL IntSetClassAtom(IN OUT PWINDOWCLASS Class, IN PUNICODE_STRING ClassName) @@ -214,8 +260,7 @@ static WNDPROC IntGetClassWndProc(IN PWINDOWCLASS Class, IN PW32PROCESSINFO pi, - IN BOOL Ansi, - IN BOOL UseCallProc2) + IN BOOL Ansi) { ASSERT(UserIsEnteredExclusive() == TRUE); @@ -231,7 +276,6 @@ } else { - PCALLPROC *CallProcPtr; PWINDOWCLASS BaseClass; /* make sure the call procedures are located on the desktop @@ -239,11 +283,9 @@ BaseClass = Class->Base; Class = BaseClass; - CallProcPtr = (UseCallProc2 ? &Class->CallProc2 : &Class->CallProc); - - if (*CallProcPtr != NULL) - { - return GetCallProcHandle(*CallProcPtr); + if (Class->CallProc != NULL) + { + return GetCallProcHandle(Class->CallProc); } else { @@ -252,40 +294,32 @@ if (pi == NULL) return NULL; - NewCallProc = CreateCallProc(Class->Desktop, - Class->WndProc, - Class->Unicode, - pi); + NewCallProc = UserFindCallProc(Class, + Class->WndProc, + Class->Unicode); if (NewCallProc == NULL) { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + NewCallProc = CreateCallProc(NULL, + Class->WndProc, + Class->Unicode, + pi); + if (NewCallProc == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + UserAddCallProcToClass(Class, + NewCallProc); } - *CallProcPtr = NewCallProc; - - if (Class->Desktop == NULL) - { - if (UseCallProc2) - Class->GlobalCallProc2 = TRUE; - else - Class->GlobalCallProc = TRUE; - } + Class->CallProc = NewCallProc; /* update the clones */ Class = Class->Clone; while (Class != NULL) { - if (UseCallProc2) - { - Class->CallProc2 = NewCallProc; - Class->GlobalCallProc2 = BaseClass->GlobalCallProc2; - } - else - { - Class->CallProc = NewCallProc; - Class->GlobalCallProc = BaseClass->GlobalCallProc; - } + Class->CallProc = NewCallProc; Class = Class->Next; } @@ -328,8 +362,7 @@ Ret = IntGetClassWndProc(Class, GetW32ProcessInfo(), - Ansi, - TRUE); + Ansi); if (Ret == NULL) { return NULL; @@ -338,11 +371,6 @@ /* update the class info */ Class->Unicode = !Ansi; Class->WndProc = WndProc; - if (Class->CallProc != NULL) - { - Class->CallProc->WndProc = WndProc; - Class->CallProc->Unicode = !Ansi; - } /* update the clones */ Class = Class->Clone; @@ -436,11 +464,6 @@ Class->Base = Class; Class->Next = BaseClass->Next; - if (!BaseClass->System && BaseClass->CallProc != NULL) - Class->GlobalCallProc = TRUE; - if (BaseClass->CallProc2 != NULL) - Class->GlobalCallProc2 = TRUE; - /* replace the base class */ (void)InterlockedExchangePointer(ClassLink, Class); @@ -495,7 +518,6 @@ IN OUT PWINDOWCLASS *CloneLink) { PWINDOWCLASS Clone, BaseClass; - PCALLPROC CallProc; ASSERT(Class->Base != Class); ASSERT(Class->Base->Clone != NULL); @@ -510,28 +532,6 @@ BaseClass = Class->Base; - if (!BaseClass->System && BaseClass->CallProc != NULL && - !BaseClass->GlobalCallProc) - { - /* we need to move the allocated call procedure */ - CallProc = BaseClass->CallProc; - Class->CallProc = CloneCallProc(Class->Desktop, - CallProc); - DestroyCallProc(BaseClass->Desktop, - CallProc); - } - - if (BaseClass->CallProc2 != NULL && - !BaseClass->GlobalCallProc2) - { - /* we need to move the allocated call procedure */ - CallProc = BaseClass->CallProc2; - Class->CallProc2 = CloneCallProc(Class->Desktop, - CallProc); - DestroyCallProc(BaseClass->Desktop, - CallProc); - } - /* update the class information to make it a base class */ Class->Base = Class; Class->Next = (*BaseClassLink)->Next; @@ -636,7 +636,6 @@ IN OUT PWINDOWCLASS **ClassLinkPtr) { PWINDOWCLASS NewClass; - PCALLPROC CallProc; SIZE_T ClassSize; ASSERT(Class->Base == Class); @@ -656,32 +655,6 @@ NewClass->Desktop = NULL; NewClass->Base = NewClass; - - if (!NewClass->System && NewClass->CallProc != NULL && - !NewClass->GlobalCallProc) - { - /* we need to move the allocated call procedure to the shared heap */ - CallProc = NewClass->CallProc; - NewClass->CallProc = CloneCallProc(NULL, - CallProc); - DestroyCallProc(Class->Desktop, - CallProc); - - NewClass->GlobalCallProc = TRUE; - } - - if (NewClass->CallProc2 != NULL && - !NewClass->GlobalCallProc2) - { - /* we need to move the allocated call procedure to the shared heap */ - CallProc = NewClass->CallProc2; - NewClass->CallProc2 = CloneCallProc(NULL, - CallProc); - DestroyCallProc(Class->Desktop, - CallProc); - - NewClass->GlobalCallProc2 = TRUE; - } /* replace the class in the list */ (void)InterlockedExchangePointer(*ClassLinkPtr, @@ -1473,8 +1446,7 @@ case GCLP_WNDPROC: Ret = (ULONG_PTR)IntGetClassWndProc(Class, GetW32ProcessInfo(), - Ansi, - FALSE); + Ansi); break; case GCW_ATOM: @@ -1798,8 +1770,7 @@ pi = GetW32ProcessInfo(); lpwcx->lpfnWndProc = IntGetClassWndProc(Class, pi, - Ansi, - FALSE); + Ansi); lpwcx->cbClsExtra = Class->ClsExtra; lpwcx->cbWndExtra = Class->WndExtra; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Tue Oct 30 04:24:47 2007 @@ -434,18 +434,6 @@ IntDestroyScrollBars(Window); - if (!Window->Class->System && Window->CallProc != NULL) - { - DestroyCallProc(Window->ti->Desktop, - Window->CallProc); - } - - if (Window->CallProc2 != NULL) - { - DestroyCallProc(Window->ti->Desktop, - Window->CallProc2); - } - /* dereference the class */ IntDereferenceClass(Window->Class, Window->ti->Desktop, @@ -497,6 +485,8 @@ IntGetWindowProc(IN PWINDOW_OBJECT Window, IN BOOL Ansi) { + ASSERT(UserIsEnteredExclusive() == TRUE); + if (Window->IsSystem) { return (Ansi ? Window->WndProcExtra : Window->WndProc); @@ -517,26 +507,27 @@ { PCALLPROC NewCallProc, CallProc; - /* NOTE: use the interlocked functions, as this operation may be done even - when only the shared lock is held! */ - NewCallProc = CreateCallProc(Window->ti->Desktop, - Window->WndProc, - Window->Unicode, - Window->ti->kpi); + NewCallProc = UserFindCallProc(Window->Class, + Window->WndProc, + Window->Unicode); if (NewCallProc == NULL) { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + NewCallProc = CreateCallProc(Window->ti->Desktop, + Window->WndProc, + Window->Unicode, + Window->ti->kpi); + if (NewCallProc == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + UserAddCallProcToClass(Window->Class, + NewCallProc); } - CallProc = InterlockedCompareExchangePointer(&Window->CallProc, - NewCallProc, - NULL); - if (CallProc != NULL) - { - DestroyCallProc(Window->ti->Desktop, - NewCallProc); - } + CallProc = Window->CallProc; + Window->CallProc = NewCallProc; return GetCallProcHandle((CallProc == NULL ? NewCallProc : CallProc)); } @@ -3533,6 +3524,7 @@ BOOL Ansi) { WNDPROC Ret; + PCALLPROC CallProc; /* resolve any callproc handle if possible */ if (IsCallProcHandle(NewWndProc)) @@ -3560,49 +3552,37 @@ } else { - /* allocate or update an existing call procedure handle to return - the old window proc */ - if (Window->CallProc2 != NULL) + CallProc = UserFindCallProc(Window->Class, + Window->WndProc, + Window->Unicode); + if (CallProc == NULL) { - Window->CallProc2->WndProc = Window->WndProc; - Window->CallProc2->Unicode = Window->Unicode; - } - else - { - Window->CallProc2 = CreateCallProc(Window->ti->Desktop, - Window->WndProc, - Window->Unicode, - Window->ti->kpi); - if (Window->CallProc2 == NULL) + CallProc = CreateCallProc(NULL, + Window->WndProc, + Window->Unicode, + Window->ti->kpi); + if (CallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } + + UserAddCallProcToClass(Window->Class, + CallProc); } - Ret = GetCallProcHandle(Window->CallProc2); + Window->CallProc = CallProc; + + Ret = GetCallProcHandle(Window->CallProc); } } if (Window->Class->System) { - BOOL SysWnd = Window->IsSystem; - /* check if the new procedure matches with the one in the window class. If so, we need to restore both procedures! */ Window->IsSystem = (NewWndProc == Window->Class->WndProc || NewWndProc == Window->Class->WndProcExtra); - - if (Window->IsSystem != SysWnd) - { - if (!Window->IsSystem && Window->CallProc != NULL) - { - /* destroy the callproc, we don't need it anymore */ - DestroyCallProc(Window->ti->Desktop, - Window->CallProc); - Window->CallProc = NULL; - } - } if (Window->IsSystem) { @@ -3617,11 +3597,6 @@ /* update the window procedure */ Window->WndProc = NewWndProc; - if (Window->CallProc != NULL) - { - Window->CallProc->WndProc = NewWndProc; - Window->CallProc->Unicode = !Ansi; - } Window->Unicode = !Ansi; return Ret;

1 0

[mpiulachs] 29966: - Compile screensavers as UNICODE applications + minor fixes (Part 2/2)
by mpiulachs＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: mpiulachs Date: Tue Oct 30 01:52:33 2007 New Revision: 29966 URL: http://svn.reactos.org/svn/reactos?rev=29966&view=rev Log: - Compile screensavers as UNICODE applications + minor fixes (Part 2/2) Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.c trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild trunk/rosapps/applications/screensavers/matrix/matrix.rbuild trunk/rosapps/applications/screensavers/matrix/screensave.c trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c (contents, props changed) trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild (contents, props changed) trunk/rosapps/applications/screensavers/starfield/screensaver.c (contents, props changed) trunk/rosapps/applications/screensavers/starfield/starfield.rbuild (contents, props changed) Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/cylfrac.c (original) +++ trunk/rosapps/applications/screensavers/cylfrac/cylfrac.c Tue Oct 30 01:52:33 2007 @@ -236,26 +236,25 @@ } } -void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) -{ - int ch; - - if (!strlen(szCmdLine)) - return; - - ch = *szCmdLine++; +// +// Look for any options Windows has passed to us: +// +// -a <hwnd> (set password) +// -s (screensave) +// -p <hwnd> (preview) +// -c <hwnd> (configure) +// +VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +{ + UCHAR ch = *szCmdLine++; if(ch == '-' || ch == '/') ch = *szCmdLine++; if(ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; + ch += 'a' - 'A'; //convert to lower case *chOption = ch; - - if (ch == 's' || ch == 'c') - return; - ch = *szCmdLine++; if(ch == ':') @@ -266,11 +265,11 @@ if(isdigit(ch)) { - unsigned int i = atoi(szCmdLine - 1); + unsigned int i = _wtoi(szCmdLine - 1); *hwndParent = (HWND)i; } else - *hwndParent = 0; + *hwndParent = NULL; } void Configure(void) @@ -294,13 +293,13 @@ MB_OK | MB_ICONWARNING); } -int WINAPI WinMain (HINSTANCE hInst, +int CALLBACK wWinMain (HINSTANCE hInst, HINSTANCE hPrev, - LPSTR lpCmdLine, + LPWSTR lpCmdLine, int iCmdShow) { HWND hwndParent = 0; - int chOption = 0; + UCHAR chOption; MSG Message; hInstance = hInst; Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild (original) +++ trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild Tue Oct 30 01:52:33 2007 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="cylfrac" type="win32scr" installbase="system32" installname="cylfrac.scr"> - <define name="UNICODE" /> - <define name="_UNICODE" /> - +<module name="cylfrac" type="win32scr" installbase="system32" installname="cylfrac.scr" unicode="true"> <library>kernel32</library> <library>user32</library> <library>gdi32</library> Modified: trunk/rosapps/applications/screensavers/matrix/matrix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/matrix.rbuild (original) +++ trunk/rosapps/applications/screensavers/matrix/matrix.rbuild Tue Oct 30 01:52:33 2007 @@ -1,13 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true"> +<module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true" unicode="true"> <include base="matrix">.</include> - <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <library>kernel32</library> <library>user32</library> <library>gdi32</library> Modified: trunk/rosapps/applications/screensavers/matrix/screensave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/screensave.c (original) +++ trunk/rosapps/applications/screensavers/matrix/screensave.c Tue Oct 30 01:52:33 2007 @@ -100,7 +100,7 @@ // -p <hwnd> (preview) // -c <hwnd> (configure) // -VOID ParseCommandLine(LPSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) { UCHAR ch = *szCmdLine++; @@ -121,7 +121,7 @@ if(isdigit(ch)) { - unsigned int i = atoi(szCmdLine - 1); + unsigned int i = _wtoi(szCmdLine - 1); *hwndParent = (HWND)i; } else @@ -131,7 +131,7 @@ // // Entrypoint for screen-saver: it's just a normal win32 app! // -int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int iCmdShow) +int CALLBACK wWinMain (HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpCmdLine, int iCmdShow) { HWND hwndParent; UCHAR chOption; Modified: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c (original) +++ trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c Tue Oct 30 01:52:33 2007 @@ -1,215 +1,215 @@ -/* - * Copyright 2003 J Brown - * Copyright 2006 Eric Kohl - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - -#include <windows.h> -#include <tchar.h> -#include "resource.h" - -#define APPNAME _T("Scrnsave") - - -HINSTANCE hInstance; - -BOOL fullscreen = FALSE; - - -LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - static POINT ptLast; - static POINT ptCursor; - static BOOL fFirstTime = TRUE; - - switch (msg) - { - case WM_DESTROY: - ShowCursor(TRUE); - PostQuitMessage(0); - break; - - // break out of screen-saver if any keyboard activity - case WM_NOTIFY: - case WM_SYSKEYDOWN: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; - - // break out of screen-saver if any mouse activity - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEMOVE: - // If we've got a parent then we must be a preview - if(GetParent(hwnd) != 0) - return 0; - - if(fFirstTime) - { - GetCursorPos(&ptLast); - fFirstTime = FALSE; - } - - GetCursorPos(&ptCursor); - - // if the mouse has moved more than 3 pixels then exit - if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) - PostMessage(hwnd, WM_CLOSE, 0, 0); - - ptLast = ptCursor; - - return 0; - } - - return DefWindowProc(hwnd, msg, wParam, lParam); -} - -void InitSaver(HWND hwndParent) -{ - WNDCLASS wc; - ZeroMemory(&wc, sizeof(wc)); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = WndProc; - wc.lpszClassName = APPNAME; - wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - RegisterClass(&wc); - - if (hwndParent != 0) - { - RECT rect; - GetClientRect(hwndParent, &rect); - CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_CHILD, - 0, 0, - rect.right, - rect.bottom, - hwndParent, 0, - hInstance, NULL); - fullscreen = FALSE; - } - else - { - HWND hwnd; - hwnd = CreateWindowEx(WS_EX_TOPMOST, - APPNAME, - APPNAME, - WS_VISIBLE | WS_POPUP, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - - SetWindowPos(hwnd, - 0, 0, 0, 0, 0, - SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); - - ShowCursor(FALSE); - fullscreen = TRUE; - } -} - -void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) -{ - int ch = *szCmdLine++; - - if(ch == '-' || ch == '/') - ch = *szCmdLine++; - - if(ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; - - *chOption = ch; - ch = *szCmdLine++; - - if(ch == ':') - ch = *szCmdLine++; - - while(ch == ' ' || ch == '\t') - ch = *szCmdLine++; - - if(isdigit(ch)) - { - unsigned int i = atoi(szCmdLine - 1); - *hwndParent = (HWND)i; - } - else - *hwndParent = 0; -} - -void Configure(void) -{ - TCHAR szTitle[256]; - TCHAR szText[256]; - - LoadString(hInstance, - IDS_TITLE, - szTitle, - 256); - - LoadString(hInstance, - IDS_TEXT, - szText, - 256); - - MessageBox(0, - szText, - szTitle, - MB_OK | MB_ICONWARNING); -} - - -int WINAPI WinMain (HINSTANCE hInst, - HINSTANCE hPrev, - LPSTR lpCmdLine, - int iCmdShow) -{ - HWND hwndParent; - UINT nPreviousState; - int chOption; - MSG Message; - - hInstance = hInst; - - ParseCommandLine(lpCmdLine, &chOption, &hwndParent); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); - - switch (chOption) - { - case 's': - InitSaver(0); - break; - - case 'p': - InitSaver(hwndParent); - break; - - case 'c': - default: - Configure(); - return 0; - } - - while (GetMessage(&Message, 0, 0, 0)) - DispatchMessage(&Message); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); - - return Message.wParam; -} +/* + * Copyright 2003 J Brown + * Copyright 2006 Eric Kohl + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <windows.h> +#include <tchar.h> +#include "resource.h" + +#define APPNAME _T("Scrnsave") + + +HINSTANCE hInstance; + +BOOL fullscreen = FALSE; + + +LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static POINT ptLast; + static POINT ptCursor; + static BOOL fFirstTime = TRUE; + + switch (msg) + { + case WM_DESTROY: + ShowCursor(TRUE); + PostQuitMessage(0); + break; + + // break out of screen-saver if any keyboard activity + case WM_NOTIFY: + case WM_SYSKEYDOWN: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + + // break out of screen-saver if any mouse activity + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEMOVE: + // If we've got a parent then we must be a preview + if(GetParent(hwnd) != 0) + return 0; + + if(fFirstTime) + { + GetCursorPos(&ptLast); + fFirstTime = FALSE; + } + + GetCursorPos(&ptCursor); + + // if the mouse has moved more than 3 pixels then exit + if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) + PostMessage(hwnd, WM_CLOSE, 0, 0); + + ptLast = ptCursor; + + return 0; + } + + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +void InitSaver(HWND hwndParent) +{ + WNDCLASS wc; + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.lpszClassName = APPNAME; + wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + RegisterClass(&wc); + + if (hwndParent != 0) + { + RECT rect; + GetClientRect(hwndParent, &rect); + CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_CHILD, + 0, 0, + rect.right, + rect.bottom, + hwndParent, 0, + hInstance, NULL); + fullscreen = FALSE; + } + else + { + HWND hwnd; + hwnd = CreateWindowEx(WS_EX_TOPMOST, + APPNAME, + APPNAME, + WS_VISIBLE | WS_POPUP, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + + SetWindowPos(hwnd, + 0, 0, 0, 0, 0, + SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); + + ShowCursor(FALSE); + fullscreen = TRUE; + } +} + +VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +{ + UCHAR ch = *szCmdLine++; + + if(ch == '-' || ch == '/') + ch = *szCmdLine++; + + if(ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; //convert to lower case + + *chOption = ch; + ch = *szCmdLine++; + + if(ch == ':') + ch = *szCmdLine++; + + while(ch == ' ' || ch == '\t') + ch = *szCmdLine++; + + if(isdigit(ch)) + { + unsigned int i = _wtoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + *hwndParent = NULL; +} + +void Configure(void) +{ + TCHAR szTitle[256]; + TCHAR szText[256]; + + LoadString(hInstance, + IDS_TITLE, + szTitle, + 256); + + LoadString(hInstance, + IDS_TEXT, + szText, + 256); + + MessageBox(0, + szText, + szTitle, + MB_OK | MB_ICONWARNING); +} + + +int CALLBACK wWinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPWSTR lpCmdLine, + int iCmdShow) +{ + HWND hwndParent; + UINT nPreviousState; + UCHAR chOption; + MSG Message; + + hInstance = hInst; + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + + switch (chOption) + { + case 's': + InitSaver(0); + break; + + case 'p': + InitSaver(hwndParent); + break; + + case 'c': + default: + Configure(); + return 0; + } + + while (GetMessage(&Message, 0, 0, 0)) + DispatchMessage(&Message); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + + return Message.wParam; +} Propchange: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild (original) +++ trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild Tue Oct 30 01:52:33 2007 @@ -1,16 +1,13 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr"> - <define name="UNICODE" /> - <define name="_UNICODE" /> - - <library>kernel32</library> - <library>user32</library> - <library>gdi32</library> - <library>opengl32</library> - <library>glu32</library> - <library>winmm</library> - - <file>scrnsave.c</file> - <file>scrnsave.rc</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr" unicode="true"> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>opengl32</library> + <library>glu32</library> + <library>winmm</library> + + <file>scrnsave.c</file> + <file>scrnsave.rc</file> +</module> Propchange: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/starfield/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/screensaver.c (original) +++ trunk/rosapps/applications/screensavers/starfield/screensaver.c Tue Oct 30 01:52:33 2007 @@ -1,377 +1,385 @@ -/* - * Copyright 2003 J Brown - * Copyright 2006 Eric Kohl - * Copyright 2007 Marc Piulachs (marc.piulachs(a)codexchange.net) - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - -#include <windows.h> -#include <tchar.h> -#include "resource.h" - -#define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) - -#define MAX_LOADSTRING 100 -#define MAX_STARS 1000 - -#define APPNAME _T("Starfield") -#define APP_TIMER 1 -#define APP_TIMER_INTERVAL 20 - -#define MAX_STARS 1000 - -// Details of each individual star -typedef struct star -{ - int m_nXPos, m_nYPos, m_nZPos; - int m_nOldX, m_nOldY; -} STAR; - -HINSTANCE hInstance; -BOOL fullscreen = FALSE; - -STAR *stars; - -int m_nTotStars; -int m_nCenterX, m_nCenterY; - -void DrawStarField (HDC pDC) -{ - int nX, nY; - int i; - for (i = 0; i < m_nTotStars; i++) - { - // Clear last position of this star - SetPixel ( - pDC, - stars[i].m_nOldX, - stars[i].m_nOldY, - RGB (0, 0, 0)); - - nX = (int)((((long)stars[i].m_nXPos << 7) / (long)stars[i].m_nZPos) + m_nCenterX); - nY = (int)((((long)stars[i].m_nYPos << 7) / (long)stars[i].m_nZPos) + m_nCenterY); - - // Draw star - SetPixel ( - pDC, - nX, - nY, - RGB (255, 255, 255)); - - // Remember current position for clearing later - stars[i].m_nOldX = nX; - stars[i].m_nOldY = nY; - } -} - -BOOL SetUpStars (int nNumStars) -{ - int i; - if (nNumStars > MAX_STARS) - { - MessageBox (0, - _T("Too many stars! Aborting!"), - _T("Error"), - MB_OK | MB_ICONWARNING); - return FALSE; - } - - if (stars) - free (stars); - - m_nTotStars = nNumStars; - - stars = (STAR*)malloc(nNumStars * sizeof(STAR)); - - if (!stars) - { - MessageBox (0, - _T("Unable to allocate memory! Aborting!"), - _T("Error"), - MB_OK | MB_ICONWARNING); - return FALSE; - } - - for (i = 0; i < m_nTotStars; i++) - { - do - { - stars[i].m_nXPos = RANDOM (-320, 320); - stars[i].m_nYPos = RANDOM (-200, 200); - stars[i].m_nZPos = i+1; - stars[i].m_nOldX = -1; - stars[i].m_nOldY = -1; - } while ((stars[i].m_nXPos == 0) || (stars[i].m_nYPos == 0)); - } - - return TRUE; -} - -void MoveStarField (int nXofs, int nYofs, int nZofs) -{ - int i; - for (i = 0; i < m_nTotStars; i++) - { - stars[i].m_nXPos += nXofs; - stars[i].m_nYPos += nYofs; - stars[i].m_nZPos += nZofs; - - if (stars[i].m_nZPos > m_nTotStars) - stars[i].m_nZPos -= m_nTotStars; - if (stars[i].m_nZPos < 1) - stars[i].m_nZPos += m_nTotStars; - } -} - -void SetDimensions (int nWidth, int nHeight) -{ - m_nCenterX = nWidth / 2; - m_nCenterY = nHeight / 2; -} - -LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - static POINT ptLast; - static POINT ptCursor; - static BOOL fFirstTime = TRUE; - static HDC pDC; - - switch (msg) - { - case WM_CREATE : - { - SetTimer ( - hwnd, - APP_TIMER, - APP_TIMER_INTERVAL, - NULL); - } - break; - case WM_PAINT : - { - PAINTSTRUCT PtStr; - HDC pDC = BeginPaint (hwnd, &PtStr); - DrawStarField (pDC); - EndPaint (hwnd, &PtStr); - return (0); - } - break; - case WM_TIMER : - { - if (wParam == APP_TIMER) - { - MoveStarField (0, 0, -3); - pDC = GetDC(hwnd); - DrawStarField (pDC); - ReleaseDC(hwnd, pDC); - } - } - break; - case WM_SIZE : - { - // Change the center point of the starfield - SetDimensions ( - LOWORD(lParam), - HIWORD(lParam)); - } - break; - case WM_DESTROY : - { - KillTimer (hwnd, APP_TIMER); - free(stars); - ShowCursor(TRUE); - PostQuitMessage (0); - return 0; - } - break; - // break out of screen-saver if any keyboard activity - case WM_NOTIFY: - case WM_SYSKEYDOWN: - { - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; - } - // break out of screen-saver if any mouse activity - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEMOVE: - { - // If we've got a parent then we must be a preview - if(GetParent(hwnd) != 0) - return 0; - - if(fFirstTime) - { - GetCursorPos(&ptLast); - fFirstTime = FALSE; - } - - GetCursorPos(&ptCursor); - - // if the mouse has moved more than 3 pixels then exit - if( (abs(ptCursor.x - ptLast.x) >= 3) || - (abs(ptCursor.y - ptLast.y) >= 3)) - { - PostMessage(hwnd, WM_CLOSE, 0, 0); - } - - ptLast = ptCursor; - return 0; - } - } - - return DefWindowProc(hwnd, msg, wParam, lParam); -} - - -void InitSaver(HWND hwndParent) -{ - WNDCLASS wc; - ZeroMemory(&wc, sizeof(wc)); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = WndProc; - wc.lpszClassName = APPNAME; - wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - RegisterClass(&wc); - - if (hwndParent != 0) - { - RECT rect; - GetClientRect(hwndParent, &rect); - CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_CHILD, - 0, 0, - rect.right, - rect.bottom, - hwndParent, 0, - hInstance, NULL); - fullscreen = FALSE; - } - else - { - HWND hwnd; - hwnd = CreateWindowEx(WS_EX_TOPMOST, - APPNAME, - APPNAME, - WS_VISIBLE | WS_POPUP, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - - SetWindowPos(hwnd, - 0, 0, 0, 0, 0, - SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); - - ShowCursor(FALSE); - fullscreen = TRUE; - } - - SetUpStars(250); -} - -void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) -{ - int ch = *szCmdLine++; - - if(ch == '-' || ch == '/') - ch = *szCmdLine++; - - if(ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; - - *chOption = ch; - ch = *szCmdLine++; - - if(ch == ':') - ch = *szCmdLine++; - - while(ch == ' ' || ch == '\t') - ch = *szCmdLine++; - - if(isdigit(ch)) - { - unsigned int i = atoi(szCmdLine - 1); - *hwndParent = (HWND)i; - } - else - *hwndParent = 0; -} - -void Configure(void) -{ - TCHAR szTitle[256]; - TCHAR szText[256]; - - LoadString(hInstance, - IDS_TITLE, - szTitle, - 256); - - LoadString(hInstance, - IDS_TEXT, - szText, - 256); - - MessageBox(0, - szText, - szTitle, - MB_OK | MB_ICONWARNING); -} - -int WINAPI WinMain (HINSTANCE hInst, - HINSTANCE hPrev, - LPSTR lpCmdLine, - int iCmdShow) -{ - HWND hwndParent; - UINT nPreviousState; - int chOption; - MSG Message; - - hInstance = hInst; - - ParseCommandLine(lpCmdLine, &chOption, &hwndParent); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); - - switch (chOption) - { - case 's': - InitSaver(0); - break; - - case 'p': - InitSaver(hwndParent); - break; - - case 'c': - default: - Configure(); - return 0; - } - - while (GetMessage(&Message, 0, 0, 0)) - DispatchMessage(&Message); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); - - return Message.wParam; -} +/* + * Copyright 2003 J Brown + * Copyright 2006 Eric Kohl + * Copyright 2007 Marc Piulachs (marc.piulachs(a)codexchange.net) + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <windows.h> +#include <tchar.h> +#include "resource.h" + +#define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) + +#define MAX_LOADSTRING 100 +#define MAX_STARS 1000 + +#define APPNAME _T("Starfield") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 20 + +#define MAX_STARS 1000 + +// Details of each individual star +typedef struct star +{ + int m_nXPos, m_nYPos, m_nZPos; + int m_nOldX, m_nOldY; +} STAR; + +HINSTANCE hInstance; +BOOL fullscreen = FALSE; + +STAR *stars; + +int m_nTotStars; +int m_nCenterX, m_nCenterY; + +void DrawStarField (HDC pDC) +{ + int nX, nY; + int i; + for (i = 0; i < m_nTotStars; i++) + { + // Clear last position of this star + SetPixel ( + pDC, + stars[i].m_nOldX, + stars[i].m_nOldY, + RGB (0, 0, 0)); + + nX = (int)((((long)stars[i].m_nXPos << 7) / (long)stars[i].m_nZPos) + m_nCenterX); + nY = (int)((((long)stars[i].m_nYPos << 7) / (long)stars[i].m_nZPos) + m_nCenterY); + + // Draw star + SetPixel ( + pDC, + nX, + nY, + RGB (255, 255, 255)); + + // Remember current position for clearing later + stars[i].m_nOldX = nX; + stars[i].m_nOldY = nY; + } +} + +BOOL SetUpStars (int nNumStars) +{ + int i; + if (nNumStars > MAX_STARS) + { + MessageBox (0, + _T("Too many stars! Aborting!"), + _T("Error"), + MB_OK | MB_ICONWARNING); + return FALSE; + } + + if (stars) + free (stars); + + m_nTotStars = nNumStars; + + stars = (STAR*)malloc(nNumStars * sizeof(STAR)); + + if (!stars) + { + MessageBox (0, + _T("Unable to allocate memory! Aborting!"), + _T("Error"), + MB_OK | MB_ICONWARNING); + return FALSE; + } + + for (i = 0; i < m_nTotStars; i++) + { + do + { + stars[i].m_nXPos = RANDOM (-320, 320); + stars[i].m_nYPos = RANDOM (-200, 200); + stars[i].m_nZPos = i+1; + stars[i].m_nOldX = -1; + stars[i].m_nOldY = -1; + } while ((stars[i].m_nXPos == 0) || (stars[i].m_nYPos == 0)); + } + + return TRUE; +} + +void MoveStarField (int nXofs, int nYofs, int nZofs) +{ + int i; + for (i = 0; i < m_nTotStars; i++) + { + stars[i].m_nXPos += nXofs; + stars[i].m_nYPos += nYofs; + stars[i].m_nZPos += nZofs; + + if (stars[i].m_nZPos > m_nTotStars) + stars[i].m_nZPos -= m_nTotStars; + if (stars[i].m_nZPos < 1) + stars[i].m_nZPos += m_nTotStars; + } +} + +void SetDimensions (int nWidth, int nHeight) +{ + m_nCenterX = nWidth / 2; + m_nCenterY = nHeight / 2; +} + +LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static POINT ptLast; + static POINT ptCursor; + static BOOL fFirstTime = TRUE; + static HDC pDC; + + switch (msg) + { + case WM_CREATE : + { + SetTimer ( + hwnd, + APP_TIMER, + APP_TIMER_INTERVAL, + NULL); + } + break; + case WM_PAINT : + { + PAINTSTRUCT PtStr; + HDC pDC = BeginPaint (hwnd, &PtStr); + DrawStarField (pDC); + EndPaint (hwnd, &PtStr); + return (0); + } + break; + case WM_TIMER : + { + if (wParam == APP_TIMER) + { + MoveStarField (0, 0, -3); + pDC = GetDC(hwnd); + DrawStarField (pDC); + ReleaseDC(hwnd, pDC); + } + } + break; + case WM_SIZE : + { + // Change the center point of the starfield + SetDimensions ( + LOWORD(lParam), + HIWORD(lParam)); + } + break; + case WM_DESTROY : + { + KillTimer (hwnd, APP_TIMER); + free(stars); + ShowCursor(TRUE); + PostQuitMessage (0); + return 0; + } + break; + // break out of screen-saver if any keyboard activity + case WM_NOTIFY: + case WM_SYSKEYDOWN: + { + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + } + // break out of screen-saver if any mouse activity + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEMOVE: + { + // If we've got a parent then we must be a preview + if(GetParent(hwnd) != 0) + return 0; + + if(fFirstTime) + { + GetCursorPos(&ptLast); + fFirstTime = FALSE; + } + + GetCursorPos(&ptCursor); + + // if the mouse has moved more than 3 pixels then exit + if( (abs(ptCursor.x - ptLast.x) >= 3) || + (abs(ptCursor.y - ptLast.y) >= 3)) + { + PostMessage(hwnd, WM_CLOSE, 0, 0); + } + + ptLast = ptCursor; + return 0; + } + } + + return DefWindowProc(hwnd, msg, wParam, lParam); +} + + +void InitSaver(HWND hwndParent) +{ + WNDCLASS wc; + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.lpszClassName = APPNAME; + wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + RegisterClass(&wc); + + if (hwndParent != 0) + { + RECT rect; + GetClientRect(hwndParent, &rect); + CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_CHILD, + 0, 0, + rect.right, + rect.bottom, + hwndParent, 0, + hInstance, NULL); + fullscreen = FALSE; + } + else + { + HWND hwnd; + hwnd = CreateWindowEx(WS_EX_TOPMOST, + APPNAME, + APPNAME, + WS_VISIBLE | WS_POPUP, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + + SetWindowPos(hwnd, + 0, 0, 0, 0, 0, + SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); + + ShowCursor(FALSE); + fullscreen = TRUE; + } + + SetUpStars(250); +} + +// +// Look for any options Windows has passed to us: +// +// -a <hwnd> (set password) +// -s (screensave) +// -p <hwnd> (preview) +// -c <hwnd> (configure) +// +VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +{ + UCHAR ch = *szCmdLine++; + + if(ch == '-' || ch == '/') + ch = *szCmdLine++; + + if(ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; //convert to lower case + + *chOption = ch; + ch = *szCmdLine++; + + if(ch == ':') + ch = *szCmdLine++; + + while(ch == ' ' || ch == '\t') + ch = *szCmdLine++; + + if(isdigit(ch)) + { + unsigned int i = _wtoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + *hwndParent = NULL; +} + +void Configure(void) +{ + TCHAR szTitle[256]; + TCHAR szText[256]; + + LoadString(hInstance, + IDS_TITLE, + szTitle, + 256); + + LoadString(hInstance, + IDS_TEXT, + szText, + 256); + + MessageBox(0, + szText, + szTitle, + MB_OK | MB_ICONWARNING); +} + +int CALLBACK wWinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPWSTR lpCmdLine, + int iCmdShow) +{ + HWND hwndParent; + UINT nPreviousState; + UCHAR chOption; + MSG Message; + + hInstance = hInst; + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + + switch (chOption) + { + case 's': + InitSaver(0); + break; + + case 'p': + InitSaver(hwndParent); + break; + + case 'c': + default: + Configure(); + return 0; + } + + while (GetMessage(&Message, 0, 0, 0)) + DispatchMessage(&Message); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + + return Message.wParam; +} Propchange: trunk/rosapps/applications/screensavers/starfield/screensaver.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/starfield/starfield.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/starfield.rbuild (original) +++ trunk/rosapps/applications/screensavers/starfield/starfield.rbuild Tue Oct 30 01:52:33 2007 @@ -1,15 +1,12 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="starfield" type="win32scr" installbase="system32" installname="starfield.scr"> - <define name="UNICODE" /> - <define name="_UNICODE" /> - - <library>kernel32</library> - <library>user32</library> - <library>gdi32</library> - - <metadata description = "Starfield simulation screensaver" /> - - <file>screensaver.c</file> - <file>starfield.rc</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="starfield" type="win32scr" installbase="system32" installname="starfield.scr" unicode="true"> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + + <metadata description = "Starfield simulation screensaver" /> + + <file>screensaver.c</file> + <file>starfield.rc</file> +</module> Propchange: trunk/rosapps/applications/screensavers/starfield/starfield.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 29965: - Compile screensavers as UNICODE applications + minor fixes (Part 1/2)
by mpiulachs＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: mpiulachs Date: Tue Oct 30 01:49:31 2007 New Revision: 29965 URL: http://svn.reactos.org/svn/reactos?rev=29965&view=rev Log: - Compile screensavers as UNICODE applications + minor fixes (Part 1/2) Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild trunk/reactos/base/applications/screensavers/3dtext/settings.c trunk/reactos/base/applications/screensavers/logon/logon.c (contents, props changed) trunk/reactos/base/applications/screensavers/logon/logon.rbuild (contents, props changed) Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Tue Oct 30 01:49:31 2007 @@ -53,12 +53,12 @@ FALSE, // Italic FALSE, // Underline FALSE, // Strikeout - ANSI_CHARSET, // Character Set Identifier + DEFAULT_CHARSET, // Character Set Identifier OUT_TT_PRECIS, // Output Precision CLIP_DEFAULT_PRECIS, // Clipping Precision ANTIALIASED_QUALITY, // Output Quality FF_DONTCARE|DEFAULT_PITCH, // Family And Pitch - "Tahoma"); // Font Name + _T("Tahoma")); // Font Name SelectObject(hDC, font); // Selects The Font We Created @@ -77,14 +77,14 @@ glDeleteLists(base, 256); // Delete All 256 Characters } -GLvoid glPrint(char *text) // Custom GL "Print" Routine +GLvoid glPrint(LPWSTR text) // Custom GL "Print" Routine { if (text == NULL) // If There's No Text return; // Do Nothing glPushAttrib(GL_LIST_BIT); // Pushes The Display List Bits glListBase(base); // Sets The Base Character to 32 - glCallLists(strlen(text), GL_UNSIGNED_BYTE, text); // Draws The Display List Text + glCallLists(wcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text glPopAttrib(); // Pops The Display List Bits } @@ -185,14 +185,14 @@ if (!PixelFormat) // No Matching Pixel Format? { - MessageBox(0,"Can't Find A Suitable PixelFormat.","Error",MB_OK|MB_ICONERROR); + MessageBox(0,_TEXT("Can't Find A Suitable PixelFormat."),_TEXT("Error"),MB_OK|MB_ICONERROR); PostQuitMessage(0); // This Sends A 'Message' Telling The Program To Quit break; // Prevents The Rest Of The Code From Running } if(!SetPixelFormat(hDC,PixelFormat,&pfd)) // Can We Set The Pixel Mode? { - MessageBox(0,"Can't Set The PixelFormat.","Error",MB_OK|MB_ICONERROR); + MessageBox(0,_TEXT("Can't Set The PixelFormat."),_TEXT("Error"),MB_OK|MB_ICONERROR); PostQuitMessage(0); // This Sends A 'Message' Telling The Program To Quit break; // Prevents The Rest Of The Code From Running } @@ -200,14 +200,14 @@ hRC = wglCreateContext(hDC); // Grab A Rendering Context if(!hRC) // Did We Get One? { - MessageBox(0,"Can't Create A GL Rendering Context.","Error",MB_OK|MB_ICONERROR); + MessageBox(0,_TEXT("Can't Create A GL Rendering Context."),_TEXT("Error"),MB_OK|MB_ICONERROR); PostQuitMessage(0); // This Sends A 'Message' Telling The Program To Quit break; // Prevents The Rest Of The Code From Running } if(!wglMakeCurrent(hDC, hRC)) // Can We Make The RC Active? { - MessageBox(0,"Can't Activate GLRC.","Error",MB_OK|MB_ICONERROR); + MessageBox(0,_TEXT("Can't Activate GLRC."),_TEXT("Error"),MB_OK|MB_ICONERROR); PostQuitMessage(0); // This Sends A 'Message' Telling The Program To Quit break; // Prevents The Rest Of The Code From Running } @@ -312,26 +312,25 @@ } } -void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) -{ - int ch; - - if (!strlen(szCmdLine)) - return; - - ch = *szCmdLine++; +// +// Look for any options Windows has passed to us: +// +// -a <hwnd> (set password) +// -s (screensave) +// -p <hwnd> (preview) +// -c <hwnd> (configure) +// +VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +{ + UCHAR ch = *szCmdLine++; if(ch == '-' || ch == '/') ch = *szCmdLine++; if(ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; + ch += 'a' - 'A'; //convert to lower case *chOption = ch; - - if (ch == 's' || ch == 'c') - return; - ch = *szCmdLine++; if(ch == ':') @@ -342,11 +341,11 @@ if(isdigit(ch)) { - unsigned int i = atoi(szCmdLine - 1); + unsigned int i = _wtoi(szCmdLine - 1); *hwndParent = (HWND)i; } else - *hwndParent = 0; + *hwndParent = NULL; } // @@ -387,13 +386,13 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc); } -int WINAPI WinMain (HINSTANCE hInst, +int CALLBACK wWinMain (HINSTANCE hInst, HINSTANCE hPrev, - LPSTR lpCmdLine, + LPWSTR lpCmdLine, int iCmdShow) { HWND hwndParent = 0; - int chOption = 0; + UCHAR chOption; MSG Message; hInstance = hInst; Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild Tue Oct 30 01:49:31 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr"> +<module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="true"> <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library> Modified: trunk/reactos/base/applications/screensavers/3dtext/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/settings.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/settings.c Tue Oct 30 01:49:31 2007 @@ -36,7 +36,7 @@ if(RegQueryValueEx(hkey, _T("DisplayString"), 0, 0, (LPBYTE)m_Text, &len) != ERROR_SUCCESS) { - strcpy(m_Text , "ReactOS Rocks!"); + _tcscpy(m_Text , _TEXT("ReactOS Rocks!")); } RegCloseKey(hkey); Modified: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.c (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.c Tue Oct 30 01:49:31 2007 @@ -1,332 +1,332 @@ -/* - * Copyright 2003 J Brown - * Copyright 2006 Eric Kohl - * Copyright 2007 Marc Piulachs (marc.piulachs(a)codexchange.net) - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - -#include <windows.h> -#include <tchar.h> -#include "resource.h" - -#define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) - -#define APPNAME _T("Logon") -#define APP_TIMER 1 -#define APP_TIMER_INTERVAL 2000 - -#define BITMAP_HEIGHT 240; -#define BITMAP_WIDTH 340 - -HINSTANCE hInstance; - -BOOL fullscreen = FALSE; - -void DrawScreen (HDC hdc, HDC hMemDC , RECT rect) -{ - int x; - int y; - int width = BITMAP_WIDTH; - int height = BITMAP_HEIGHT; - - if (!fullscreen) - { - width = width / 20; - height = height / 20; - } - - x = RANDOM (0, rect.right - width); - y = RANDOM (0, rect.bottom - height); - - BitBlt( - hdc, - x, - y, - width, - height, - hMemDC, - 0, - 0, - SRCCOPY); -} - -HBITMAP GetScreenSaverBitmap (void) -{ - OSVERSIONINFOEX osvi; - - ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx ((OSVERSIONINFO *) &osvi); - - switch(osvi.wProductType) - { - case VER_NT_WORKSTATION: - return LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_WORKSTATION)); - break; - default: - return LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_SERVER)); - break; - } -} - -LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - static POINT ptLast; - static POINT ptCursor; - static BOOL fFirstTime = TRUE; - - static PAINTSTRUCT ps; - static RECT rect; - static HDC hDC; - static HDC hMemDC; - static HBRUSH hBlkBrush; - static HBITMAP bitmap; - - switch (msg) - { - case WM_CREATE: - { - hDC = GetDC(hwnd); - hBlkBrush = (HBRUSH) GetStockObject(BLACK_BRUSH); - hMemDC = CreateCompatibleDC(hDC); - GetClientRect(hwnd, &rect); - - bitmap = GetScreenSaverBitmap (); - - if(bitmap == NULL) - { - MessageBox( - hwnd, - _T("Fatal Error: Could not load bitmap"), - _T("Error"), - MB_OK | MB_ICONEXCLAMATION); - } - - SetTimer ( - hwnd, - APP_TIMER, - APP_TIMER_INTERVAL, - NULL); - - break; - } - case WM_PAINT: - { - hDC = BeginPaint(hwnd, &ps); - SelectObject(hMemDC, bitmap); - DrawScreen (hDC , hMemDC , rect); - EndPaint(hwnd, &ps); - break; - } - case WM_TIMER : - { - if (wParam == APP_TIMER) - { - InvalidateRect(hwnd, NULL, 1); - } - } - case WM_ERASEBKGND: - { - SelectObject(hDC, hBlkBrush); - - PatBlt( - hDC, - 0, - 0, - rect.right, - rect.bottom, - PATCOPY); - break; - } - case WM_DESTROY: - { - KillTimer (hwnd, APP_TIMER); - DeleteObject(bitmap); - ShowCursor(TRUE); - PostQuitMessage(0); - break; - } - - // break out of screen-saver if any keyboard activity - case WM_NOTIFY: - case WM_SYSKEYDOWN: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; - - // break out of screen-saver if any mouse activity - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEMOVE: - // If we've got a parent then we must be a preview - if(GetParent(hwnd) != 0) - return 0; - - if(fFirstTime) - { - GetCursorPos(&ptLast); - fFirstTime = FALSE; - } - - GetCursorPos(&ptCursor); - - // if the mouse has moved more than 3 pixels then exit - if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) - PostMessage(hwnd, WM_CLOSE, 0, 0); - - ptLast = ptCursor; - - return 0; - } - - return DefWindowProc(hwnd, msg, wParam, lParam); -} - -void InitSaver(HWND hwndParent) -{ - WNDCLASS wc; - ZeroMemory(&wc, sizeof(wc)); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = WndProc; - wc.lpszClassName = APPNAME; - wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - RegisterClass(&wc); - - if (hwndParent != 0) - { - RECT rect; - GetClientRect(hwndParent, &rect); - CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_CHILD, - 0, 0, - rect.right, - rect.bottom, - hwndParent, 0, - hInstance, NULL); - fullscreen = FALSE; - } - else - { - HWND hwnd; - hwnd = CreateWindowEx(WS_EX_TOPMOST, - APPNAME, - APPNAME, - WS_VISIBLE | WS_POPUP, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - - SetWindowPos(hwnd, - 0, 0, 0, 0, 0, - SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); - - ShowCursor(FALSE); - fullscreen = TRUE; - } -} - -void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) -{ - int ch = *szCmdLine++; - - if(ch == '-' || ch == '/') - ch = *szCmdLine++; - - if(ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; - - *chOption = ch; - ch = *szCmdLine++; - - if(ch == ':') - ch = *szCmdLine++; - - while(ch == ' ' || ch == '\t') - ch = *szCmdLine++; - - if(isdigit(ch)) - { - unsigned int i = atoi(szCmdLine - 1); - *hwndParent = (HWND)i; - } - else - *hwndParent = 0; -} - -void Configure(void) -{ - TCHAR szTitle[256]; - TCHAR szText[256]; - - LoadString(hInstance, - IDS_TITLE, - szTitle, - 256); - - LoadString(hInstance, - IDS_TEXT, - szText, - 256); - - MessageBox(0, - szText, - szTitle, - MB_OK | MB_ICONWARNING); -} - -int WINAPI WinMain (HINSTANCE hInst, - HINSTANCE hPrev, - LPSTR lpCmdLine, - int iCmdShow) -{ - HWND hwndParent; - UINT nPreviousState; - int chOption; - MSG Message; - - hInstance = hInst; - - ParseCommandLine(lpCmdLine, &chOption, &hwndParent); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); - - switch (chOption) - { - case 's': - InitSaver(0); - break; - - case 'p': - InitSaver(hwndParent); - break; - - case 'c': - default: - Configure(); - return 0; - } - - while (GetMessage(&Message, 0, 0, 0)) - DispatchMessage(&Message); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); - - return Message.wParam; -} +/* + * Copyright 2003 J Brown + * Copyright 2006 Eric Kohl + * Copyright 2007 Marc Piulachs (marc.piulachs(a)codexchange.net) + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <windows.h> +#include <tchar.h> +#include "resource.h" + +#define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) + +#define APPNAME _T("Logon") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 2000 + +#define BITMAP_HEIGHT 240; +#define BITMAP_WIDTH 340 + +HINSTANCE hInstance; + +BOOL fullscreen = FALSE; + +void DrawScreen (HDC hdc, HDC hMemDC , RECT rect) +{ + int x; + int y; + int width = BITMAP_WIDTH; + int height = BITMAP_HEIGHT; + + if (!fullscreen) + { + width = width / 20; + height = height / 20; + } + + x = RANDOM (0, rect.right - width); + y = RANDOM (0, rect.bottom - height); + + BitBlt( + hdc, + x, + y, + width, + height, + hMemDC, + 0, + 0, + SRCCOPY); +} + +HBITMAP GetScreenSaverBitmap (void) +{ + OSVERSIONINFOEX osvi; + + ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + GetVersionEx ((OSVERSIONINFO *) &osvi); + + switch(osvi.wProductType) + { + case VER_NT_WORKSTATION: + return LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_WORKSTATION)); + break; + default: + return LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_SERVER)); + break; + } +} + +LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static POINT ptLast; + static POINT ptCursor; + static BOOL fFirstTime = TRUE; + + static PAINTSTRUCT ps; + static RECT rect; + static HDC hDC; + static HDC hMemDC; + static HBRUSH hBlkBrush; + static HBITMAP bitmap; + + switch (msg) + { + case WM_CREATE: + { + hDC = GetDC(hwnd); + hBlkBrush = (HBRUSH) GetStockObject(BLACK_BRUSH); + hMemDC = CreateCompatibleDC(hDC); + GetClientRect(hwnd, &rect); + + bitmap = GetScreenSaverBitmap (); + + if(bitmap == NULL) + { + MessageBox( + hwnd, + _T("Fatal Error: Could not load bitmap"), + _T("Error"), + MB_OK | MB_ICONEXCLAMATION); + } + + SetTimer ( + hwnd, + APP_TIMER, + APP_TIMER_INTERVAL, + NULL); + + break; + } + case WM_PAINT: + { + hDC = BeginPaint(hwnd, &ps); + SelectObject(hMemDC, bitmap); + DrawScreen (hDC , hMemDC , rect); + EndPaint(hwnd, &ps); + break; + } + case WM_TIMER : + { + if (wParam == APP_TIMER) + { + InvalidateRect(hwnd, NULL, 1); + } + } + case WM_ERASEBKGND: + { + SelectObject(hDC, hBlkBrush); + + PatBlt( + hDC, + 0, + 0, + rect.right, + rect.bottom, + PATCOPY); + break; + } + case WM_DESTROY: + { + KillTimer (hwnd, APP_TIMER); + DeleteObject(bitmap); + ShowCursor(TRUE); + PostQuitMessage(0); + break; + } + + // break out of screen-saver if any keyboard activity + case WM_NOTIFY: + case WM_SYSKEYDOWN: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + + // break out of screen-saver if any mouse activity + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEMOVE: + // If we've got a parent then we must be a preview + if(GetParent(hwnd) != 0) + return 0; + + if(fFirstTime) + { + GetCursorPos(&ptLast); + fFirstTime = FALSE; + } + + GetCursorPos(&ptCursor); + + // if the mouse has moved more than 3 pixels then exit + if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) + PostMessage(hwnd, WM_CLOSE, 0, 0); + + ptLast = ptCursor; + + return 0; + } + + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +void InitSaver(HWND hwndParent) +{ + WNDCLASS wc; + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.lpszClassName = APPNAME; + wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + RegisterClass(&wc); + + if (hwndParent != 0) + { + RECT rect; + GetClientRect(hwndParent, &rect); + CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_CHILD, + 0, 0, + rect.right, + rect.bottom, + hwndParent, 0, + hInstance, NULL); + fullscreen = FALSE; + } + else + { + HWND hwnd; + hwnd = CreateWindowEx(WS_EX_TOPMOST, + APPNAME, + APPNAME, + WS_VISIBLE | WS_POPUP, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + + SetWindowPos(hwnd, + 0, 0, 0, 0, 0, + SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); + + ShowCursor(FALSE); + fullscreen = TRUE; + } +} + +VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +{ + UCHAR ch = *szCmdLine++; + + if(ch == '-' || ch == '/') + ch = *szCmdLine++; + + if(ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; //convert to lower case + + *chOption = ch; + ch = *szCmdLine++; + + if(ch == ':') + ch = *szCmdLine++; + + while(ch == ' ' || ch == '\t') + ch = *szCmdLine++; + + if(isdigit(ch)) + { + unsigned int i = _wtoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + *hwndParent = NULL; +} + +void Configure(void) +{ + TCHAR szTitle[256]; + TCHAR szText[256]; + + LoadString(hInstance, + IDS_TITLE, + szTitle, + 256); + + LoadString(hInstance, + IDS_TEXT, + szText, + 256); + + MessageBox(0, + szText, + szTitle, + MB_OK | MB_ICONWARNING); +} + +int CALLBACK wWinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPWSTR lpCmdLine, + int iCmdShow) +{ + HWND hwndParent; + UINT nPreviousState; + UCHAR chOption; + MSG Message; + + hInstance = hInst; + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + + switch (chOption) + { + case 's': + InitSaver(0); + break; + + case 'p': + InitSaver(hwndParent); + break; + + case 'c': + default: + Configure(); + return 0; + } + + while (GetMessage(&Message, 0, 0, 0)) + DispatchMessage(&Message); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + + return Message.wParam; +} Propchange: trunk/reactos/base/applications/screensavers/logon/logon.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/logon/logon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rbuild (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rbuild Tue Oct 30 01:49:31 2007 @@ -1,16 +1,13 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="logon" type="win32scr" installbase="system32" installname="logon.scr"> - <include base="logon">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - - <library>kernel32</library> - <library>user32</library> - <library>gdi32</library> - - <metadata description = "Default ReactOS Logo screensaver" /> - - <file>logon.c</file> - <file>logon.rc</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="true"> + <include base="logon">.</include> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + + <metadata description = "Default ReactOS Logo screensaver" /> + + <file>logon.c</file> + <file>logon.rc</file> +</module> Propchange: trunk/reactos/base/applications/screensavers/logon/logon.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 29964: Revert hpoussin's commit in r29960 to unbreak build. Most of *our* stuff has separated host/target headers now, but the Wine-shared components still include headers from include/reactos/wine. And these headers (like "winnt.h" in that directory) include our headers from include/psdk themselves, which are meant to be used for target components, but not for host tools. This needs to be fixed first, before we can remove this hack.
by cfinck＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: cfinck Date: Tue Oct 30 00:42:29 2007 New Revision: 29964 URL: http://svn.reactos.org/svn/reactos?rev=29964&view=rev Log: Revert hpoussin's commit in r29960 to unbreak build. Most of *our* stuff has separated host/target headers now, but the Wine-shared components still include headers from include/reactos/wine. And these headers (like "winnt.h" in that directory) include our headers from include/psdk themselves, which are meant to be used for target components, but not for host tools. This needs to be fixed first, before we can remove this hack. Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=29964&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Tue Oct 30 00:42:29 2007 @@ -8,6 +8,10 @@ TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing $(HOST_CFLAGS) TOOLS_CPPFLAGS = -Wall -Wpointer-arith $(HOST_CPPFLAGS) TOOLS_LFLAGS = $(HOST_LFLAGS) + +# HACK: Remove those lines once host tools don't use target headers anymore +TOOLS_CFLAGS += -D__i386__ +TOOLS_CPPFLAGS += -D__i386__ $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)

1 0

[dreimer] 29963: My try to make RosBE Configurator using Default LogDir on a Empty TextBox and the Path in the Box if not empty. DANGER: N00b Code. Plz Check!
by dreimer＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: dreimer Date: Tue Oct 30 00:33:50 2007 New Revision: 29963 URL: http://svn.reactos.org/svn/reactos?rev=29963&view=rev Log: My try to make RosBE Configurator using Default LogDir on a Empty TextBox and the Path in the Box if not empty. DANGER: N00b Code. Plz Check! Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Tue Oct 30 00:33:50 2007 @@ -75,7 +75,12 @@ } else { - if (!CreateDirectory(logdir, NULL)) + wcscpy(checklog, logdir); + if (wcslen(checklog) < 1) + { + SetCurrentDirectory(checklog); + } + else if (!CreateDirectory(logdir, NULL)) { LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); MessageBox(NULL, msgerror, NULL, MB_ICONERROR);

1 0

[cfinck] 29962: Delete the powerpc branch, the work will be done in trunk now
by cfinck＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: cfinck Date: Tue Oct 30 00:33:32 2007 New Revision: 29962 URL: http://svn.reactos.org/svn/reactos?rev=29962&view=rev Log: Delete the powerpc branch, the work will be done in trunk now Removed: branches/powerpc/

1 0

[cfinck] 29961: Move cylfrac, matrix, scrmsave and starfield to rosapps as proposed on the mailing list. New screensavers should only go there now. I created an "applications/screensavers" directory for that, eventually rosapps should get a similar directory structure to reactos. Also changed the appropriate parts in reactos.dff.
by cfinck＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: cfinck Date: Tue Oct 30 00:30:02 2007 New Revision: 29961 URL: http://svn.reactos.org/svn/reactos?rev=29961&view=rev Log: Move cylfrac, matrix, scrmsave and starfield to rosapps as proposed on the mailing list. New screensavers should only go there now. I created an "applications/screensavers" directory for that, eventually rosapps should get a similar directory structure to reactos. Also changed the appropriate parts in reactos.dff. Added: trunk/rosapps/applications/ (with props) trunk/rosapps/applications/applications.rbuild (with props) trunk/rosapps/applications/screensavers/ (with props) trunk/rosapps/applications/screensavers/cylfrac/ - copied from r29957, trunk/reactos/base/applications/screensavers/cylfrac/ trunk/rosapps/applications/screensavers/matrix/ - copied from r29957, trunk/reactos/base/applications/screensavers/matrix/ trunk/rosapps/applications/screensavers/screensavers.rbuild (with props) trunk/rosapps/applications/screensavers/scrnsave/ - copied from r29957, trunk/reactos/base/applications/screensavers/scrnsave/ trunk/rosapps/applications/screensavers/starfield/ - copied from r29957, trunk/reactos/base/applications/screensavers/starfield/ Removed: trunk/reactos/base/applications/screensavers/cylfrac/ trunk/reactos/base/applications/screensavers/matrix/ trunk/reactos/base/applications/screensavers/scrnsave/ trunk/reactos/base/applications/screensavers/starfield/ Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/rosapps/directory.rbuild Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/screensavers.rbuild (original) +++ trunk/reactos/base/applications/screensavers/screensavers.rbuild Tue Oct 30 00:30:02 2007 @@ -4,19 +4,7 @@ <directory name="3dtext"> <xi:include href="3dtext/3dtext.rbuild" /> </directory> - <directory name="cylfrac"> - <xi:include href="cylfrac/cylfrac.rbuild" /> - </directory> <directory name="logon"> <xi:include href="logon/logon.rbuild" /> </directory> - <directory name="matrix"> - <xi:include href="matrix/matrix.rbuild" /> - </directory> - <directory name="scrnsave"> - <xi:include href="scrnsave/scrnsave.rbuild" /> - </directory> - <directory name="starfield"> - <xi:include href="starfield/starfield.rbuild" /> - </directory> -</group> +</group> 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 Tue Oct 30 00:30:02 2007 @@ -60,11 +60,8 @@ base\applications\regedit\regedit.exe 4 base\applications\regedit\clb\clb.dll 1 base\applications\sc\sc.exe 1 -base\applications\screensavers\cylfrac\cylfrac.scr 1 +base\applications\screensavers\3dtext\3dtext.scr 1 base\applications\screensavers\logon\logon.scr 1 -base\applications\screensavers\matrix\matrix.scr 1 -base\applications\screensavers\scrnsave\scrnsave.scr 1 -base\applications\screensavers\starfield\starfield.scr 1 base\applications\mscutils\servman\servman.exe 1 base\applications\shutdown\shutdown.exe 1 base\applications\sndvol32\sndvol32.exe 1 @@ -445,96 +442,100 @@ tools\dbgprint\dbgprint.exe 7 optional ; Modules -modules\os2\server\os2srv.dll 1 optional -modules\os2\dll\win32\doscalls\doscalls.dll 1 optional -modules\posix\server\psxsrv.dll 1 optional -modules\posix\dll\win32\psxdll\psxdll.dll 1 optional -modules\rosky\dll\win32\libsky\libsky.dll 1 optional -modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional -modules\vms\server\vmssrv.dll 1 optional -modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional -modules\rosapps\avtest\avtest.sys 1 optional -modules\rosapps\cmdutils\comp\comp.exe 1 optional -modules\rosapps\cmdutils\mode\mode.exe 1 optional -modules\rosapps\cmdutils\sort\sort.exe 1 optional -modules\rosapps\cmdutils\tee\tee.exe 1 optional -modules\rosapps\cmdutils\touch\touch.exe 1 optional -modules\rosapps\cmdutils\uptime\uptime.exe 1 optional -modules\rosapps\cmdutils\y\y.exe 1 optional -modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional -modules\rosapps\demos\maze\maze.exe 1 optional -modules\rosapps\devutils\cputointel\cputointel.exe 1 optional -modules\rosapps\devutils\gdb2\gdb2.exe 1 optional -modules\rosapps\devutils\gdihv\gdihv.exe 1 optional -modules\rosapps\devutils\genguid\genguid.exe 1 optional -modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional -modules\rosapps\devutils\zoomin\zoomin.exe 1 optional -modules\rosapps\dflat32\edit.exe 1 optional -modules\rosapps\downloader\downloader.exe 1 optional -modules\rosapps\downloader\downloader.xml 1 optional -modules\rosapps\gettype\gettype.exe 1 optional -modules\rosapps\green\green.sys 1 optional -modules\rosapps\imagesoft\imagesoft.exe 1 optional -modules\rosapps\lib\dflat32\dflat32.dll 1 optional -modules\rosapps\mc\mc.exe 1 optional -modules\rosapps\net\ncftp\ncftp.exe 1 optional -modules\rosapps\net\netreg\netreg.exe 1 optional -modules\rosapps\net\niclist\niclist.exe 1 optional -modules\rosapps\notevil\notevil.exe 1 optional -modules\rosapps\magnify\magnify.exe 1 optional -modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional -modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\lib\package.dll 1 optional -modules\rosapps\ramdrv\ramdrv.sys 1 optional -modules\rosapps\roshttpd\roshttpd.exe 1 optional -modules\rosapps\screenshot\screenshot.exe 1 optional -modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional -modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional -modules\rosapps\sysutils\chklib\chklib.exe 1 optional -modules\rosapps\sysutils\ctm\ctm.exe 1 optional -modules\rosapps\sysutils\kill\kill.exe 1 optional -modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional -modules\rosapps\sysutils\man\man.exe 1 optional -modules\rosapps\sysutils\pedump\pedump.exe 1 optional -modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\sysutils\tlist\tlist.exe 1 optional -modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional -modules\rosapps\sysutils\utils\cat\cat.exe 1 optional -modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional -modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional -modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional -modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional -modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional -modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional -modules\rosapps\sysutils\utils\ps\ps.exe 1 optional -modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional -modules\rosapps\sysutils\utils\stats\stats.exe 1 optional -modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional -modules\rosapps\templates\dialog.exe 1 optional -modules\rosapps\templates\mdi.exe 1 optional -modules\rosapps\winefile\winefile.exe 1 optional -modules\rosapps\winver\winver.exe 1 optional -modules\rosapps\write\write.exe 1 optional -modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional -modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional -modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional -modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional -modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional -modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional -modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional -modules\rostests\winetests\msi\msi_winetest.exe 7 optional -modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional -modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional -modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional -modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional -modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional -modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional -modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional -modules\rostests\winetests\user32\user32_winetest.exe 7 optional -modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional -modules\rostests\winetests\version\version_winetest.exe 7 optional -modules\wallpaper\lake.bmp 4 optional +modules\os2\server\os2srv.dll 1 optional +modules\os2\dll\win32\doscalls\doscalls.dll 1 optional +modules\posix\server\psxsrv.dll 1 optional +modules\posix\dll\win32\psxdll\psxdll.dll 1 optional +modules\rosky\dll\win32\libsky\libsky.dll 1 optional +modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional +modules\vms\server\vmssrv.dll 1 optional +modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional +modules\rosapps\avtest\avtest.sys 1 optional +modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional +modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional +modules\rosapps\applications\screensavers\scrnsave\scrnsave.scr 1 optional +modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional +modules\rosapps\cmdutils\comp\comp.exe 1 optional +modules\rosapps\cmdutils\mode\mode.exe 1 optional +modules\rosapps\cmdutils\sort\sort.exe 1 optional +modules\rosapps\cmdutils\tee\tee.exe 1 optional +modules\rosapps\cmdutils\touch\touch.exe 1 optional +modules\rosapps\cmdutils\uptime\uptime.exe 1 optional +modules\rosapps\cmdutils\y\y.exe 1 optional +modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional +modules\rosapps\demos\maze\maze.exe 1 optional +modules\rosapps\devutils\cputointel\cputointel.exe 1 optional +modules\rosapps\devutils\gdb2\gdb2.exe 1 optional +modules\rosapps\devutils\gdihv\gdihv.exe 1 optional +modules\rosapps\devutils\genguid\genguid.exe 1 optional +modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional +modules\rosapps\devutils\zoomin\zoomin.exe 1 optional +modules\rosapps\dflat32\edit.exe 1 optional +modules\rosapps\downloader\downloader.exe 1 optional +modules\rosapps\downloader\downloader.xml 1 optional +modules\rosapps\gettype\gettype.exe 1 optional +modules\rosapps\green\green.sys 1 optional +modules\rosapps\imagesoft\imagesoft.exe 1 optional +modules\rosapps\lib\dflat32\dflat32.dll 1 optional +modules\rosapps\mc\mc.exe 1 optional +modules\rosapps\net\ncftp\ncftp.exe 1 optional +modules\rosapps\net\netreg\netreg.exe 1 optional +modules\rosapps\net\niclist\niclist.exe 1 optional +modules\rosapps\notevil\notevil.exe 1 optional +modules\rosapps\magnify\magnify.exe 1 optional +modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional +modules\rosapps\packmgr\gui\packmgr.exe 1 optional +modules\rosapps\packmgr\lib\package.dll 1 optional +modules\rosapps\ramdrv\ramdrv.sys 1 optional +modules\rosapps\roshttpd\roshttpd.exe 1 optional +modules\rosapps\screenshot\screenshot.exe 1 optional +modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional +modules\rosapps\sysutils\chklib\chklib.exe 1 optional +modules\rosapps\sysutils\ctm\ctm.exe 1 optional +modules\rosapps\sysutils\kill\kill.exe 1 optional +modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional +modules\rosapps\sysutils\man\man.exe 1 optional +modules\rosapps\sysutils\pedump\pedump.exe 1 optional +modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional +modules\rosapps\sysutils\tcat\tcat.exe 1 optional +modules\rosapps\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional +modules\rosapps\sysutils\utils\cat\cat.exe 1 optional +modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional +modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional +modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional +modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional +modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional +modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional +modules\rosapps\sysutils\utils\ps\ps.exe 1 optional +modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional +modules\rosapps\sysutils\utils\stats\stats.exe 1 optional +modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional +modules\rosapps\templates\dialog.exe 1 optional +modules\rosapps\templates\mdi.exe 1 optional +modules\rosapps\winefile\winefile.exe 1 optional +modules\rosapps\winver\winver.exe 1 optional +modules\rosapps\write\write.exe 1 optional +modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional +modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional +modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional +modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional +modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional +modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional +modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional +modules\rostests\winetests\msi\msi_winetest.exe 7 optional +modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional +modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional +modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional +modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional +modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional +modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional +modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional +modules\rostests\winetests\user32\user32_winetest.exe 7 optional +modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional +modules\rostests\winetests\version\version_winetest.exe 7 optional +modules\wallpaper\lake.bmp 4 optional ; Native libraries -modules\windows\mfc42.dll 1 optional +modules\windows\mfc42.dll 1 optional Propchange: trunk/rosapps/applications/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Oct 30 00:30:02 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… ============================================================================== --- trunk/rosapps/applications/applications.rbuild (added) +++ trunk/rosapps/applications/applications.rbuild Tue Oct 30 00:30:02 2007 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="screensavers"> + <xi:include href="screensavers/screensavers.rbuild" /> + </directory> +</group> Propchange: trunk/rosapps/applications/applications.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/screensavers/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Oct 30 00:30:02 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rosapps/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/screensavers.rbuild (added) +++ trunk/rosapps/applications/screensavers/screensavers.rbuild Tue Oct 30 00:30:02 2007 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="cylfrac"> + <xi:include href="cylfrac/cylfrac.rbuild" /> + </directory> + <directory name="matrix"> + <xi:include href="matrix/matrix.rbuild" /> + </directory> + <directory name="scrnsave"> + <xi:include href="scrnsave/scrnsave.rbuild" /> + </directory> + <directory name="starfield"> + <xi:include href="starfield/starfield.rbuild" /> + </directory> +</group> Propchange: trunk/rosapps/applications/screensavers/screensavers.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29961… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Tue Oct 30 00:30:02 2007 @@ -7,6 +7,10 @@ </directory> --> + <directory name="applications"> + <xi:include href="applications/applications.rbuild" /> + </directory> + <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" /> </directory> @@ -120,4 +124,4 @@ <directory name="write"> <xi:include href="write/write.rbuild" /> </directory> -</group> +</group>

1 0

[hpoussin] 29960: Remove unneeded hack because host tools don't use target headers anymore
by hpoussin＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: hpoussin Date: Mon Oct 29 23:47:47 2007 New Revision: 29960 URL: http://svn.reactos.org/svn/reactos?rev=29960&view=rev Log: Remove unneeded hack because host tools don't use target headers anymore Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=29960&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Mon Oct 29 23:47:47 2007 @@ -8,10 +8,6 @@ TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing $(HOST_CFLAGS) TOOLS_CPPFLAGS = -Wall -Wpointer-arith $(HOST_CPPFLAGS) TOOLS_LFLAGS = $(HOST_LFLAGS) - -# HACK: Remove those lines once host tools don't use target headers anymore -TOOLS_CFLAGS += -D__i386__ -TOOLS_CPPFLAGS += -D__i386__ $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)

1 0

[dreimer] 29959: Update the Changelog once more. Remove Trailing Spaces. Version 1.0 Soon at your local nerd's house.
by dreimer＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: dreimer Date: Mon Oct 29 23:30:28 2007 New Revision: 29959 URL: http://svn.reactos.org/svn/reactos?rev=29959&view=rev Log: Update the Changelog once more. Remove Trailing Spaces. Version 1.0 Soon at your local nerd's house. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Tools/chknewer.c Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Oct 29 23:30:28 2007 @@ -1,50 +1,76 @@ *** XXX XXth, 200X - RosBE 1.0 Released -- Updated RosBE Configuration Tool. (Pierre Schweitzer) - - Added French translation. - - Added the possibility to choose MingW directory. - - Added check to see if MingW dir is right (look up gcc) - - Added support for WinXP style. - - Added the support of C99. - - Fixed warnings. - - Small Modification by Daniel Reimer: added -s and went from -O3 to -O2 in Makefile. - - Correct Button States and Whitespace changes. - - Save button is disabled until a parameter is changed - - Definitively fixed resources IDs - - Added check to test if log dir exists and if it doesn't, it's created - - Added check to avoid writing in a non-existant file - - Updated todo list - - Reorganized resources - - Added a basic font preview - - Continue dralnix code cleanup. - - Added checks to avoid buffers overflow. +- Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, TODO: name of tamlin) +- Updated: Binutils 2.18.50 Build 20071015. (Peter Ward) +- Updated: NASM to 0.99.05 (Daniel Reimer) -- Added a very simple makefile for the RosBE tools. (Peter Ward) -- Updated: GCC 4.1.3 Build 20071015 with recent patches - to get makex run under Vista. (Peter Ward, TODO: name of tamlin) -- Updated: Binutils 2.18.50 Build 20071015. +- Updated RosBE Configuration Tool. (Pierre Schweitzer, Peter Ward, Daniel Reimer) + - Added French translation. (Pierre Schweitzer) + - Added the possibility to choose MingW directory. (Pierre Schweitzer) + - Added check to see if MingW dir is right. (Pierre Schweitzer) + - Added support for WinXP style. (Pierre Schweitzer) + - Added the support of C99. (Pierre Schweitzer) + - Fixed warnings. (Pierre Schweitzer) + - Added -s and went from -O3 to -O2 in Makefile. (Daniel Reimer) + - Correct Button States and Whitespace changes. (Pierre Schweitzer) + - Save button is disabled until a parameter is changed. (Pierre Schweitzer) + - Definitively fixed resources IDs. (Pierre Schweitzer) + - Added check to test if log dir exists and if it doesn't, it's created. (Pierre Schweitzer) + - Added check to avoid writing in a non-existant file. (Pierre Schweitzer) + - Updated todo list. (Pierre Schweitzer) + - Reorganized resources. (Pierre Schweitzer) + - Added a basic font preview. (Pierre Schweitzer) + - Continue dralnix code cleanup. (Pierre Schweitzer) + - Added checks to avoid buffers overflow. (Pierre Schweitzer) + - Fixed a small regression with save button state introduced in rev 29850. (Pierre Schweitzer) + - Moved UINT i to loop as it was done previously. (Pierre Schweitzer) + - Fixed German RC File of Options.exe. (Daniel Reimer) + - Modify options.exe to enable and disable stripping and ccache. This gives back the possibility to give more than one command to make. (Daniel Reimer) + - Fixed Russian RC File of options.exe (towerr) + - Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) + - Improve the GUI to be easier to understand and add two more settings. (Daniel Reimer) + - Make options.exe only write path variables if there is something to write. (Peter Ward) + +- Added a small utility (chknewer) to check if one file is newer than another. This removes the dependency on test from Config.cmd and Build.cmd. (Peter Ward) +- Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. +- Added the command 'chdefgcc' to allow easy switching of the current toolset. (Peter Ward) +- Added a minimal replacement for tee. (Peter Ward) +- Added ccache 2.4 to RosBE. (Daniel Reimer) +- Added the command "oldmode" to still use the HOST headers, not the target ones in SVN Tree. (Daniel Reimer) +- Readd chdefdir due to popular Demand. (Daniel Reimer) +- Downgraded sed to prevent a EOL style destruction. (Daniel Reimer) + +- Added a makefile for the RosBE tools. (Peter Ward) - Fix a warning in echoh.c. (Peter Ward) - Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward) -- Merge the three build.cmd files into one. (Peter Ward) -- Heaviliy cleaning up the .cmd files. (Peter Ward) -- Remove typos. (Peter Ward) -- Make variable names more consistent. (Peter Ward) - Merged the NSIS files back together. (Peter Ward) -- Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) -- Completely rewrote scut to work without *nix tools - and added a edit function (Parter Ward, Daniel Reimer) -- Updated to NASM 0.99.05 (Daniel Reimer) -- Downgraded sed to prevent a EOL style destruction. (Daniel Reimer) -- Make helpfile entries dependant on the installed optional files. (Daniel Reimer) -- Readd chdefdir due to popular Demand. (Daniel Reimer) -- Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) -- Added ccache 2.4 to RosBE. (Daniel Reimer) -- Remove trailing Spaces. (Daniel Reimer) -- Modify options.exe to enable and disable stripping and ccache. This gives back the possibility to give more - than one command to make (Daniel Reimer) -- Fixed German RC File of Options.exe (Daniel Reimer) -- Added the command "oldmode" to still use the HOST headers, not the target ones in SVN Tree. (Daniel Reimer) -- Fixed Russian RC File of options.exe (towerr) + +- Heaviliy cleaning up the .cmd files. (Peter Ward, Daniel Reimer) + - Remove typos. (Peter Ward, Daniel Reimer) + - Make variable names more consistent. (Peter Ward) + - Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) + - Merge the three build.cmd files into one. (Peter Ward) + - Remove the sed dependency from RosBE.cmd. (Peter Ward) + - Make some error messages a bit more consistent. (Peter Ward) + - Remove the need for cutz.cmd and delete it. (Peter Ward, Daniel Reimer) + - Remove the doskey macro for a component if it is not actually present. (Peter Ward) + - Remove the dependency on cut from sSVN.cmd. (Peter Ward) + - Completely rewrote scut to work without *nix tools and added a edit function (Parter Ward, Daniel Reimer) + - Fix one bug in ssvn. Now it does checkout in %CD% not %CD%/reactos (Daniel Reimer) + - Added more Error Messages to prevent confusion and stupid mistakes. (Daniel Reimer) + - Remove trailing Spaces. (Daniel Reimer) + - Make helpfile entries dependant on the installed optional files. (Daniel Reimer) + - Added echo Messages which tell a sucessful process. (Daniel Reimer) + - Sorted and fixed parts of the help. (Daniel Reimer, Peter Ward) + - Modify many "if" to "if /I" to ignore lower and upper case. (Daniel Reimer) + - Modify ERROR messages in scut to abort the process when Name and Path are specified by Shell Commands, too. (Daniel Reimer) + - Updated echo Messages a bit. (Daniel Reimer) + - Get rid of svnversion.exe and its need in ssvn.cmd. (Daniel Reimer) + - Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (Peter Ward) + - Add a Shortcut Listing Feature to scut.cmd. (Daniel Reimer) + +- Started to Update the Documentation. (Daniel Reimer) + *** Sep 24th, 2007 - RosBE 0.3.8.1 Released Modified: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Mon Oct 29 23:30:28 2007 @@ -53,7 +53,7 @@ fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); return -1; } - file1time = getfmodtime(argv[1]); + file1time = getfmodtime(argv[1]); if (!file1time) { fprintf(stderr, "%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); @@ -74,7 +74,7 @@ fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[2]); return -1; } - file2time = getfmodtime(argv[2]); + file2time = getfmodtime(argv[2]); if (!file2time) { fprintf(stderr, "%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]);

1 0

[fireball] 29958: - Actually create KCB where needed.
by fireball＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: fireball Date: Mon Oct 29 21:05:54 2007 New Revision: 29958 URL: http://svn.reactos.org/svn/reactos?rev=29958&view=rev Log: - Actually create KCB where needed. Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Mon Oct 29 21:05:54 2007 @@ -365,6 +365,7 @@ UNICODE_STRING TargetPath; UNICODE_STRING KeyName; PWSTR *Path = &RemainingName->Buffer; + PCM_KEY_CONTROL_BLOCK ParentKcb = NULL, Kcb; ParsedKey = ParsedObject; @@ -415,22 +416,25 @@ RtlFreeUnicodeString(&KeyName); return Status; } + + ParentKcb = ParsedKey->KeyControlBlock; + if (FoundObject == NULL) { - Status = CmiScanForSubKey(ParsedKey->RegistryHive, - ParsedKey->KeyCell, - &SubKeyCell, - &BlockOffset, - &KeyName, - 0, - Attributes); - if (!NT_SUCCESS(Status)) + /* Search for the subkey */ + BlockOffset = CmpFindSubKeyByName(&ParsedKey->RegistryHive->Hive, + ParsedKey->KeyCell, + &KeyName); + if (BlockOffset == HCELL_NIL) { ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return(STATUS_UNSUCCESSFUL); } + + /* Get the node */ + SubKeyCell = (PCM_KEY_NODE)HvGetCell(&ParsedKey->RegistryHive->Hive, BlockOffset); if ((SubKeyCell->Flags & KEY_SYM_LINK) && !((Attributes & OBJ_OPENLINK) && (EndPtr == NULL))) @@ -514,7 +518,23 @@ /* Add the keep-alive reference */ ObReferenceObject(FoundObject); - + + /* Create the KCB */ + Kcb = CmpCreateKeyControlBlock(&ParsedKey->RegistryHive->Hive, + BlockOffset, + SubKeyCell, + ParentKcb, + 0, + &KeyName); + if (!Kcb) + { + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + RtlFreeUnicodeString(&KeyName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + FoundObject->KeyControlBlock = Kcb; FoundObject->Flags = 0; FoundObject->KeyCell = SubKeyCell; FoundObject->KeyCellOffset = BlockOffset; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Mon Oct 29 21:05:54 2007 @@ -520,6 +520,7 @@ ULONG TimeStamp; LIST_ENTRY HiveList; CACHED_CHILD_LIST ValueCache; + PCM_KEY_CONTROL_BLOCK KeyControlBlock; } KEY_OBJECT, *PKEY_OBJECT; extern PCMHIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList; Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Mon Oct 29 21:05:54 2007 @@ -96,6 +96,7 @@ ULONG StorageType; LARGE_INTEGER SystemTime; BOOLEAN Hack = FALSE; + PCM_KEY_CONTROL_BLOCK Kcb; /* ReactOS Hack */ if (Name->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) @@ -208,8 +209,27 @@ KeyNode->MaxClassLen = 0; KeyNode->NameLength = CmpCopyName(Hive, KeyNode->Name, Name); if (KeyNode->NameLength < Name->Length) KeyNode->Flags |= KEY_COMP_NAME; + + /* Create the KCB */ + Kcb = CmpCreateKeyControlBlock(Hive, + *KeyCell, + KeyNode, + Parent->KeyControlBlock, + 0, + Name); + if (!Kcb) + { + /* Fail */ + ObDereferenceObjectDeferDelete(*Object); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Sanity check */ + ASSERT(Kcb->RefCount == 1); /* Now fill out the Cm object */ + KeyBody->KeyControlBlock = Kcb; KeyBody->KeyCell = KeyNode; KeyBody->KeyCellOffset = *KeyCell; KeyBody->Flags = 0; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Mon Oct 29 21:05:54 2007 @@ -669,7 +669,6 @@ if (!CmpCreateRootNode(&CmiVolatileHive->Hive, L"REGISTRY", &RootIndex)) { /* We failed */ - DPRINT1("Fail\n"); return FALSE; } @@ -716,6 +715,7 @@ RootKey->ProcessID = PsGetCurrentProcessId(); #else RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); + RootKey->KeyControlBlock = Kcb; RootKey->RegistryHive = CmiVolatileHive; RootKey->KeyCellOffset = RootIndex; RootKey->KeyCell = KeyCell;

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