Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[fireball] 29971: - Proper fix for unicode/ansi compilation ability of 3dtext (at least to fix compiler warning preventing trunk to compile), however one problem remains: glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text GL_UNSIGNED_SHORT should be substituted by GL_UNSIGNED_BYTE if compiling as ANSI.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 11:29:31 2007 New Revision: 29971 URL: http://svn.reactos.org/svn/reactos?rev=29971&view=rev Log: - Proper fix for unicode/ansi compilation ability of 3dtext (at least to fix compiler warning preventing trunk to compile), however one problem remains: glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text GL_UNSIGNED_SHORT should be substituted by GL_UNSIGNED_BYTE if compiling as ANSI. Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c 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 11:29:31 2007 @@ -77,14 +77,14 @@ glDeleteLists(base, 256); // Delete All 256 Characters } -GLvoid glPrint(LPWSTR text) // Custom GL "Print" Routine +GLvoid glPrint(LPTSTR 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(wcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text + glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text glPopAttrib(); // Pops The Display List Bits } @@ -140,7 +140,7 @@ (1.0f*(cos(rot/20.0f))), (1.0f*(sin(rot/25.0f))), (1.0f-0.5f*(cos(rot/17.0f)))); - glPrint(m_Text); // Print GL Text To The Screen + glPrint(m_Text); // Print GL Text To The Screen glColor3f(0.0f,0.0f,1.0f); // Make The Text Blue rot+=0.1f; // Increase The Rotation Variable }

1 0

[jimtabor] 29970: Add Gdi batch flush command types.
by jimtabor＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: jimtabor Date: Tue Oct 30 07:39:34 2007 New Revision: 29970 URL: http://svn.reactos.org/svn/reactos?rev=29970&view=rev Log: Add Gdi batch flush command types. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Tue Oct 30 07:39:34 2007 @@ -76,6 +76,19 @@ GdiGetAspectRatioFilter, GdiGetDCOrg = 6, } GETDCPOINT, *PGETDCPOINT; + +typedef enum _GDIBATCHCMD +{ + GdiBCPatBlt, + GdiBCPolyPatBlt, + GdiBCTextOut, + GdiBCExtTextOut, + GdiBCSetBrushOrg, + GdiBCExtSelClipRgn, + GdiBCSelObj, + GdiBCDelObj, + GdiBCDelRgn, +} GDIBATCHCMD, *PGDIBATCHCMD; typedef enum _TRANSFORMTYPE {

1 0

[weiden] 29969: stock objects don't need to be deleted
by weiden＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: weiden Date: Tue Oct 30 04:51:23 2007 New Revision: 29969 URL: http://svn.reactos.org/svn/reactos?rev=29969&view=rev Log: stock objects don't need to be deleted Modified: trunk/reactos/base/applications/taskmgr/graph.c Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Tue Oct 30 04:51:23 2007 @@ -308,7 +308,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; - HFONT hFont, hOldFont; + HFONT hOldFont; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; int nBars; @@ -344,8 +344,7 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); - hFont = GetStockObject(DEFAULT_GUI_FONT); - hOldFont = SelectObject(hDC, hFont); + hOldFont = SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); @@ -406,7 +405,6 @@ } SelectObject(hDC, hOldFont); - DeleteObject(hFont); } void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd)

1 0

[weiden] 29968: Patch by Heis Spiter <heis_spiter@hotmail.com>: - Fix a handle leak See issue #2772 for more details.
by weiden＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: weiden Date: Tue Oct 30 04:46:00 2007 New Revision: 29968 URL: http://svn.reactos.org/svn/reactos?rev=29968&view=rev Log: Patch by Heis Spiter <heis_spiter(a)hotmail.com>: - Fix a handle leak See issue #2772 for more details. Modified: trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Tue Oct 30 04:46:00 2007 @@ -137,7 +137,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; - HFONT hFont, hOldFont; + HFONT hOldFont; ULONG CpuUsage; ULONG CpuKernelUsage; int nBars; @@ -174,8 +174,7 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); - hFont = GetStockObject(DEFAULT_GUI_FONT); - hOldFont = SelectObject(hDC, hFont); + hOldFont = SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); @@ -297,6 +296,8 @@ rcBarRight.bottom -=3; } + + SelectObject(hDC, hOldFont); } void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) @@ -403,6 +404,9 @@ rcBarRight.top += 3; rcBarRight.bottom += 3; } + + SelectObject(hDC, hOldFont); + DeleteObject(hFont); } void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd) Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Tue Oct 30 04:46:00 2007 @@ -74,6 +74,7 @@ /* Get the debug privilege for this process. */ AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0); + CloseHandle(hToken); } /* Load our settings from the registry */

1 0

[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

← Newer
1
...
4
5
6
7
8
9
10
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007