Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 30467: - Fix desktop heaps handling and various bugs - Begin superseding the WINDOW_OBJECT structure by WINDOW which is located on the desktop heap - Implement GetClientRect() and GetWindowRect() to read the information from the desktop heap
by weiden＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: weiden Date: Thu Nov 15 22:42:41 2007 New Revision: 30467 URL: http://svn.reactos.org/svn/reactos?rev=30467&view=rev Log: - Fix desktop heaps handling and various bugs - Begin superseding the WINDOW_OBJECT structure by WINDOW which is located on the desktop heap - Implement GetClientRect() and GetWindowRect() to read the information from the desktop heap Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/arc.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h (original) +++ trunk/reactos/dll/win32/user32/include/user32.h Thu Nov 15 22:42:41 2007 @@ -62,8 +62,18 @@ PW32THREADINFO ti = GetW32ThreadInfo(); ASSERT(Ptr != NULL); ASSERT(ti != NULL); - ASSERT(ti->DesktopHeapDelta != 0); - return (PVOID)((ULONG_PTR)Ptr - ti->DesktopHeapDelta); + if ((ULONG_PTR)Ptr >= (ULONG_PTR)ti->DesktopHeapBase && + (ULONG_PTR)Ptr < (ULONG_PTR)ti->DesktopHeapBase + ti->DesktopHeapLimit) + { + return (PVOID)((ULONG_PTR)Ptr - ti->DesktopHeapDelta); + } + else + { + /* NOTE: This is slow as it requires a call to win32k. This should only be + neccessary if a thread wants to access an object on a different + desktop */ + return NtUserGetDesktopMapping(Ptr); + } } static __inline PVOID @@ -76,3 +86,4 @@ } PCALLPROC FASTCALL ValidateCallProc(HANDLE hCallProc); +PWINDOW FASTCALL ValidateHwnd(HWND hwnd); Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h Thu Nov 15 22:42:41 2007 @@ -120,6 +120,9 @@ #define NtUserShowCursor(bShow) \ NtUserCallOneParam((DWORD)bShow, ONEPARAM_ROUTINE_SHOWCURSOR) +#define NtUserGetDesktopMapping(Ptr) \ + (PVOID)NtUserCallOneParam((DWORD)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING) + #define ShowCaret(hwnd) \ NtUserShowCaret(hwnd) Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Thu Nov 15 22:42:41 2007 @@ -339,7 +339,7 @@ static const BOOL g_ObjectHeapTypeShared[VALIDATE_TYPE_MONITOR + 1] = { FALSE, /* VALIDATE_TYPE_FREE (not used) */ - FALSE, /* VALIDATE_TYPE_WIN */ + TRUE, /* VALIDATE_TYPE_WIN */ /* FIXME: FALSE once WINDOW_OBJECT is deleted! */ TRUE, /* VALIDATE_TYPE_MENU */ TRUE, /* VALIDATE_TYPE_CURSOR */ TRUE, /* VALIDATE_TYPE_MWPOS */ @@ -362,16 +362,8 @@ { PVOID ret; PUSER_HANDLE_ENTRY pEntry; - PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); ASSERT(uType <= VALIDATE_TYPE_MONITOR); - ASSERT(ClientInfo != NULL); - - /* See if we have the handle cached still */ - if (uType == VALIDATE_TYPE_WIN) - { - if (handle == ClientInfo->hWND) return ClientInfo->pvWND; - } pEntry = GetUser32Handle(handle); @@ -413,22 +405,11 @@ else ret = DesktopPtrToUser(pEntry->ptr); - /* Update the cache */ -#if 0 - /* FIXME: To enable this win32k needs to check this information when destroying - the window handle and clear it out of the ClientInfo structure! */ - if (uType == VALIDATE_TYPE_WIN) - { - ClientInfo->hWND = handle; - ClientInfo->pvWND = ret; - } -#endif - return ret; } // -// Validate callproc handle and return the pointer to the object. +// Validate a callproc handle and return the pointer to the object. // PCALLPROC FASTCALL @@ -440,3 +421,41 @@ return NULL; } + +// +// Validate a window handle and return the pointer to the object. +// +PWINDOW +FASTCALL +ValidateHwnd(HWND hwnd) +{ + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + ASSERT(ClientInfo != NULL); + + /* See if the window is cached */ + if (hwnd == ClientInfo->hWND) + return ClientInfo->pvWND; + + PWINDOW Wnd = ValidateHandle((HANDLE)hwnd, VALIDATE_TYPE_WIN); + if (Wnd != NULL) + { + /* FIXME: Check if handle table entry is marked as deleting and + return NULL in this case! */ + +#if 0 + return Wnd; +#else + /* HACK HACK HACK! This needs to be done until WINDOW_OBJECT is completely + superseded by the WINDOW structure. We *ASSUME* a pointer to the WINDOW + structure to be at the beginning of the WINDOW_OBJECT structure!!! + + !!! REMOVE AS SOON AS WINDOW_OBJECT NO LONGER EXISTS !!! + */ + + if (*((PVOID*)Wnd) != NULL) + return DesktopPtrToUser(*((PVOID*)Wnd)); +#endif + } + + return NULL; +} Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Thu Nov 15 22:42:41 2007 @@ -860,7 +860,17 @@ BOOL STDCALL GetClientRect(HWND hWnd, LPRECT lpRect) { - return(NtUserGetClientRect(hWnd, lpRect)); + PWINDOW Wnd = ValidateHwnd(hWnd); + + if (Wnd != NULL) + { + lpRect->left = lpRect->top = 0; + lpRect->right = Wnd->ClientRect.right - Wnd->ClientRect.left; + lpRect->bottom = Wnd->ClientRect.bottom - Wnd->ClientRect.top; + return TRUE; + } + + return FALSE; } @@ -1007,7 +1017,15 @@ GetWindowRect(HWND hWnd, LPRECT lpRect) { - return(NtUserGetWindowRect(hWnd, lpRect)); + PWINDOW Wnd = ValidateHwnd(hWnd); + + if (Wnd != NULL) + { + *lpRect = Wnd->WindowRect; + return TRUE; + } + + return FALSE; } 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 Thu Nov 15 22:42:41 2007 @@ -7,6 +7,7 @@ typedef struct _DESKTOP { HANDLE hKernelHeap; + ULONG_PTR HeapLimit; WCHAR szDesktopName[1]; HWND hTaskManWindow; HWND hProgmanWindow; @@ -55,6 +56,18 @@ UINT MenuNameIsString : 1; } WINDOWCLASS, *PWINDOWCLASS; +typedef struct _WINDOW +{ + /* NOTE: This structure is located in the desktop heap and will + eventually replace WINDOW_OBJECT. Right now WINDOW_OBJECT + keeps a reference to this structure until all the information + is moved to this structure */ + struct _W32PROCESSINFO *pi; /* FIXME: Move to object header some day */ + struct _W32THREADINFO *ti; + RECT WindowRect; + RECT ClientRect; +} WINDOW, *PWINDOW; + typedef struct _W32PROCESSINFO { PVOID UserHandleTable; @@ -71,6 +84,8 @@ PW32PROCESSINFO pi; /* [USER] */ PW32PROCESSINFO kpi; /* [KERNEL] */ PDESKTOP Desktop; + PVOID DesktopHeapBase; + ULONG_PTR DesktopHeapLimit; ULONG_PTR DesktopHeapDelta; } W32THREADINFO, *PW32THREADINFO; @@ -496,6 +511,7 @@ #define ONEPARAM_ROUTINE_GETCURSORPOSITION 0x0b #define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0x0c #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x0d +#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0x0e #define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0x10 #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27 #define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28 Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c Thu Nov 15 22:42:41 2007 @@ -85,7 +85,7 @@ hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); if (hVisRgn != NULL) { - NtGdiOffsetRgn(hVisRgn, Window->ClientRect.left, Window->ClientRect.top); + NtGdiOffsetRgn(hVisRgn, Window->Wnd->ClientRect.left, Window->Wnd->ClientRect.top); visRgn = RGNDATA_LockRgn(hVisRgn); if (visRgn != NULL) { @@ -122,8 +122,8 @@ if (ClipObj == NULL) { /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, (PRECTL)&Window->ClientRect, - (PRECTL)&Window->ClientRect); + ClipObj = IntEngCreateClipRegion(1, (PRECTL)&Window->Wnd->ClientRect, + (PRECTL)&Window->Wnd->ClientRect); } if (ClipObj == NULL) @@ -133,7 +133,7 @@ } RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); - RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->ClientRect, sizeof (RECT)); + RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->Wnd->ClientRect, sizeof (RECT)); OldClipObj = InterlockedExchangePointer(&WndObjInt->ClientClipObj, ClipObj); if (OldClipObj != NULL) IntEngDeleteClipRegion(OldClipObj); Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h Thu Nov 15 22:42:41 2007 @@ -205,7 +205,7 @@ Mapping = PsGetCurrentProcessWin32Process()->HeapMappings.Next; while (Mapping != NULL) { - if (Mapping->UserMapping == (PVOID)hDesktopHeap) + if (Mapping->KernelMapping == (PVOID)hDesktopHeap) { Delta = (ULONG_PTR)Mapping->KernelMapping - (ULONG_PTR)Mapping->UserMapping; break; @@ -218,17 +218,17 @@ } static __inline PVOID -DesktopHeapAddressToUser(IN PDESKTOP Desktop, - PVOID lpMem) +DesktopHeapAddressToUser(PVOID lpMem) { PW32HEAP_USER_MAPPING Mapping; Mapping = PsGetCurrentProcessWin32Process()->HeapMappings.Next; while (Mapping != NULL) { - if (Mapping->KernelMapping == (PVOID)Desktop->hKernelHeap) + if ((ULONG_PTR)lpMem >= (ULONG_PTR)Mapping->KernelMapping && + (ULONG_PTR)lpMem < (ULONG_PTR)Mapping->KernelMapping + Mapping->Limit) { - return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)Desktop->hKernelHeap) + + return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)Mapping->KernelMapping) + (ULONG_PTR)Mapping->UserMapping); } Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h Thu Nov 15 22:42:41 2007 @@ -25,6 +25,7 @@ struct _W32HEAP_USER_MAPPING *Next; PVOID KernelMapping; PVOID UserMapping; + ULONG_PTR Limit; ULONG Count; } W32HEAP_USER_MAPPING, *PW32HEAP_USER_MAPPING; 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 Thu Nov 15 22:42:41 2007 @@ -26,6 +26,12 @@ typedef struct _WINDOW_OBJECT { + /* NOTE: Do *NOT* Move this pointer anywhere in this structure! This + is a pointer to the WINDOW structure that eventually replaces + the WINDOW_OBJECT structure! USER32 expects this pointer to + be here until WINDOW_OBJECT has completely been superseded! */ + PWINDOW Wnd; + /* Pointer to the thread information */ PW32THREADINFO ti; /* Pointer to the desktop */ @@ -59,10 +65,6 @@ PCHAR ExtraData; /* Size of the extra data associated with the window. */ ULONG ExtraDataSize; - /* Position of the window. */ - RECT WindowRect; - /* Position of the window's client area. */ - RECT ClientRect; /* Handle for the window. */ HWND hSelf; /* Window flags. */ Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winpos.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winpos.h Thu Nov 15 22:42:41 2007 @@ -6,13 +6,13 @@ #define SWP_NOCLIENTSIZE 0x1000 #define IntPtInWindow(WndObject,x,y) \ - ((x) >= (WndObject)->WindowRect.left && \ - (x) < (WndObject)->WindowRect.right && \ - (y) >= (WndObject)->WindowRect.top && \ - (y) < (WndObject)->WindowRect.bottom && \ + ((x) >= (WndObject)->Wnd->WindowRect.left && \ + (x) < (WndObject)->Wnd->WindowRect.right && \ + (y) >= (WndObject)->Wnd->WindowRect.top && \ + (y) < (WndObject)->Wnd->WindowRect.bottom && \ (!(WndObject)->WindowRegion || ((WndObject)->Style & WS_MINIMIZE) || \ - NtGdiPtInRegion((WndObject)->WindowRegion, (INT)((x) - (WndObject)->WindowRect.left), \ - (INT)((y) - (WndObject)->WindowRect.top)))) + NtGdiPtInRegion((WndObject)->WindowRegion, (INT)((x) - (WndObject)->Wnd->WindowRect.left), \ + (INT)((y) - (WndObject)->Wnd->WindowRect.top)))) UINT FASTCALL co_WinPosArrangeIconicWindows(PWINDOW_OBJECT parent); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Thu Nov 15 22:42:41 2007 @@ -122,7 +122,7 @@ *pWnd = ClientInfo->pvWND; ClientInfo->hWND = hWndS; - ClientInfo->pvWND = (PVOID) Window; + ClientInfo->pvWND = DesktopHeapAddressToUser(Window->Wnd); } static VOID Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Thu Nov 15 22:42:41 2007 @@ -878,10 +878,10 @@ MOUSEINPUT mi; CurInfo->CursorClipInfo.IsClipped = TRUE; - CurInfo->CursorClipInfo.Left = max(Rect.left, DesktopWindow->WindowRect.left); - CurInfo->CursorClipInfo.Top = max(Rect.top, DesktopWindow->WindowRect.top); - CurInfo->CursorClipInfo.Right = min(Rect.right - 1, DesktopWindow->WindowRect.right - 1); - CurInfo->CursorClipInfo.Bottom = min(Rect.bottom - 1, DesktopWindow->WindowRect.bottom - 1); + CurInfo->CursorClipInfo.Left = max(Rect.left, DesktopWindow->Wnd->WindowRect.left); + CurInfo->CursorClipInfo.Top = max(Rect.top, DesktopWindow->Wnd->WindowRect.top); + CurInfo->CursorClipInfo.Right = min(Rect.right - 1, DesktopWindow->Wnd->WindowRect.right - 1); + CurInfo->CursorClipInfo.Bottom = min(Rect.bottom - 1, DesktopWindow->Wnd->WindowRect.bottom - 1); mi.dx = MousePos.x; mi.dy = MousePos.y; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Thu Nov 15 22:42:41 2007 @@ -870,6 +870,7 @@ SIZE_T DesktopInfoSize; UNICODE_STRING SafeDesktopName; ULONG DummyContext; + ULONG_PTR HeapLimit = 4 * 1024 * 1024; /* FIXME */ DECLARE_RETURN(HDESK); @@ -955,7 +956,7 @@ DesktopObject->DesktopHeapSection = NULL; DesktopObject->hDesktopHeap = UserCreateHeap(&DesktopObject->DesktopHeapSection, &DesktopHeapSystemBase, - 4 * 1024 * 1024); /* FIXME */ + HeapLimit); if (DesktopObject->hDesktopHeap == NULL) { ObDereferenceObject(DesktopObject); @@ -981,6 +982,7 @@ DesktopInfoSize); DesktopObject->DesktopInfo->hKernelHeap = DesktopObject->hDesktopHeap; + DesktopObject->DesktopInfo->HeapLimit = HeapLimit; RtlCopyMemory(DesktopObject->DesktopInfo->szDesktopName, lpszDesktopName->Buffer, lpszDesktopName->Length); @@ -1372,8 +1374,8 @@ int x, y; HDC hWallpaperDC; - sz.cx = DeskWin->WindowRect.right - DeskWin->WindowRect.left; - sz.cy = DeskWin->WindowRect.bottom - DeskWin->WindowRect.top; + sz.cx = DeskWin->Wnd->WindowRect.right - DeskWin->Wnd->WindowRect.left; + sz.cy = DeskWin->Wnd->WindowRect.bottom - DeskWin->Wnd->WindowRect.top; if (WinSta->WallpaperMode == wmStretch || WinSta->WallpaperMode == wmTile) @@ -1736,6 +1738,8 @@ if (ti->Desktop == DesktopObject->DesktopInfo) { ti->Desktop = NULL; + ti->DesktopHeapBase = NULL; + ti->DesktopHeapLimit = 0; ti->DesktopHeapDelta = 0; } } @@ -1799,6 +1803,7 @@ HeapMapping->Next = NULL; HeapMapping->KernelMapping = (PVOID)DesktopObject->hDesktopHeap; HeapMapping->UserMapping = UserBase; + HeapMapping->Limit = ViewSize; HeapMapping->Count = 1; *PrevLink = HeapMapping; @@ -1811,6 +1816,8 @@ if (ti->Desktop == NULL) { ti->Desktop = DesktopObject->DesktopInfo; + ti->DesktopHeapBase = DesktopObject->hDesktopHeap; + ti->DesktopHeapLimit = ViewSize; ti->DesktopHeapDelta = DesktopHeapGetUserDelta(); } } @@ -1854,6 +1861,16 @@ } } + if (W32Thread->Desktop == NULL) + { + PW32THREADINFO ti = GetW32ThreadInfo(); + if (ti != NULL) + { + ti->Desktop = NULL; + ti->DesktopHeapDelta = 0; + } + } + if (OldDesktop != NULL && !IntCheckProcessDesktopClasses(OldDesktop->DesktopInfo, FreeOnFailure)) @@ -1881,22 +1898,6 @@ } ObDereferenceObject(OldDesktop); - - /* update the thread info */ - if (W32Thread != NULL && W32Thread->ThreadInfo != NULL && - W32Thread->ThreadInfo->Desktop != (DesktopObject != NULL ? DesktopObject->DesktopInfo : NULL)) - { - if (DesktopObject != NULL) - { - W32Thread->ThreadInfo->Desktop = DesktopObject->DesktopInfo; - W32Thread->ThreadInfo->DesktopHeapDelta = DesktopHeapGetUserDelta(); - } - else - { - W32Thread->ThreadInfo->Desktop = NULL; - W32Thread->ThreadInfo->DesktopHeapDelta = 0; - } - } } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Thu Nov 15 22:42:41 2007 @@ -1054,10 +1054,10 @@ if (DesktopWindow) { - if(MousePos.x >= DesktopWindow->ClientRect.right) - MousePos.x = DesktopWindow->ClientRect.right - 1; - if(MousePos.y >= DesktopWindow->ClientRect.bottom) - MousePos.y = DesktopWindow->ClientRect.bottom - 1; + if(MousePos.x >= DesktopWindow->Wnd->ClientRect.right) + MousePos.x = DesktopWindow->Wnd->ClientRect.right - 1; + if(MousePos.y >= DesktopWindow->Wnd->ClientRect.bottom) + MousePos.y = DesktopWindow->Wnd->ClientRect.bottom - 1; ObmDereferenceObject(DesktopWindow); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Thu Nov 15 22:42:41 2007 @@ -2154,8 +2154,8 @@ RETURN( -1); } - X -= Window->WindowRect.left; - Y -= Window->WindowRect.top; + X -= Window->Wnd->WindowRect.left; + Y -= Window->Wnd->WindowRect.top; mi = Menu->MenuItemList; for (i = 0; NULL != mi; i++) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Thu Nov 15 22:42:41 2007 @@ -633,8 +633,8 @@ { /* NOTE: Msg->pt should remain in screen coordinates. -- FiN */ Msg->lParam = MAKELONG( - Msg->pt.x - (WORD)Window->ClientRect.left, - Msg->pt.y - (WORD)Window->ClientRect.top); + Msg->pt.x - (WORD)Window->Wnd->ClientRect.left, + Msg->pt.y - (WORD)Window->Wnd->ClientRect.top); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Thu Nov 15 22:42:41 2007 @@ -242,6 +242,22 @@ switch(Routine) { + case ONEPARAM_ROUTINE_GETDESKTOPMAPPING: + { + PW32THREADINFO ti; + ti = GetW32ThreadInfo(); + if (ti != NULL) + { + /* Try convert the pointer to a user mode pointer if the desktop is + mapped into the process */ + RETURN((DWORD)DesktopHeapAddressToUser((PVOID)Param)); + } + else + { + RETURN(0); + } + } + case ONEPARAM_ROUTINE_GETMENU: { PWINDOW_OBJECT Window; @@ -2542,11 +2558,15 @@ if (W32Thread->Desktop != NULL) { ti->Desktop = W32Thread->Desktop->DesktopInfo; + ti->DesktopHeapBase = W32Thread->Desktop->DesktopInfo->hKernelHeap; + ti->DesktopHeapLimit = W32Thread->Desktop->DesktopInfo->HeapLimit; ti->DesktopHeapDelta = DesktopHeapGetUserDelta(); } else { ti->Desktop = NULL; + ti->DesktopHeapBase = NULL; + ti->DesktopHeapLimit = 0; ti->DesktopHeapDelta = 0; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Thu Nov 15 22:42:41 2007 @@ -879,8 +879,8 @@ RETURN(NULL); } - Rect.left = Rect.right = Window->WindowRect.left; - Rect.top = Rect.bottom = Window->WindowRect.bottom; + Rect.left = Rect.right = Window->Wnd->WindowRect.left; + Rect.top = Rect.bottom = Window->Wnd->WindowRect.bottom; IntGetMonitorsFromRect(&Rect, &hMonitor, NULL, 1, dwFlags); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Thu Nov 15 22:42:41 2007 @@ -68,7 +68,7 @@ return FALSE; } - if (!IntGdiIntersectRect(WindowRect, WindowRect, &ParentWindow->ClientRect)) + if (!IntGdiIntersectRect(WindowRect, WindowRect, &ParentWindow->Wnd->ClientRect)) { return FALSE; } @@ -119,19 +119,19 @@ UINT RgnType; if (Client) - hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); + hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->ClientRect); else - hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); if (Window->WindowRegion != NULL && !(Window->Style & WS_MINIMIZE)) { NtGdiOffsetRgn(hRgnWindow, - -Window->WindowRect.left, - -Window->WindowRect.top); + -Window->Wnd->WindowRect.left, + -Window->Wnd->WindowRect.top); RgnType = NtGdiCombineRgn(hRgnWindow, hRgnWindow, Window->WindowRegion, RGN_AND); NtGdiOffsetRgn(hRgnWindow, - Window->WindowRect.left, - Window->WindowRect.top); + Window->Wnd->WindowRect.left, + Window->Wnd->WindowRect.top); } return hRgnWindow; @@ -340,7 +340,7 @@ { HRGN hRgnClient; - hRgnClient = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); + hRgnClient = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->ClientRect); RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnClient, RGN_AND); NtGdiDeleteObject(hRgnClient); } @@ -353,19 +353,19 @@ { HRGN hRgnWindow; - hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnWindow, RGN_AND); NtGdiDeleteObject(hRgnWindow); } else { NtGdiOffsetRgn(hRgn, - -Window->WindowRect.left, - -Window->WindowRect.top); + -Window->Wnd->WindowRect.left, + -Window->Wnd->WindowRect.top); RgnType = NtGdiCombineRgn(hRgn, hRgn, Window->WindowRegion, RGN_AND); NtGdiOffsetRgn(hRgn, - Window->WindowRect.left, - Window->WindowRect.top); + Window->Wnd->WindowRect.left, + Window->Wnd->WindowRect.top); } /* @@ -553,26 +553,26 @@ hRgn = NULL; } else - NtGdiOffsetRgn(hRgn, Window->ClientRect.left, Window->ClientRect.top); + NtGdiOffsetRgn(hRgn, Window->Wnd->ClientRect.left, Window->Wnd->ClientRect.top); } else if (UpdateRect != NULL) { if (!IntGdiIsEmptyRect(UpdateRect)) { hRgn = UnsafeIntCreateRectRgnIndirect((RECT *)UpdateRect); - NtGdiOffsetRgn(hRgn, Window->ClientRect.left, Window->ClientRect.top); + NtGdiOffsetRgn(hRgn, Window->Wnd->ClientRect.left, Window->Wnd->ClientRect.top); } } else if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) || (Flags & (RDW_VALIDATE | RDW_NOFRAME)) == (RDW_VALIDATE | RDW_NOFRAME)) { - if (!IntGdiIsEmptyRect(&Window->WindowRect)) - hRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + if (!IntGdiIsEmptyRect(&Window->Wnd->WindowRect)) + hRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); } else { - if (!IntGdiIsEmptyRect(&Window->ClientRect)) - hRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); + if (!IntGdiIsEmptyRect(&Window->Wnd->ClientRect)) + hRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->ClientRect); } } @@ -797,12 +797,12 @@ { UnsafeIntGetRgnBox(Rgn, &Ps.rcPaint); RGNDATA_UnlockRgn(Rgn); - IntGdiIntersectRect(&Ps.rcPaint, &Ps.rcPaint, &Window->ClientRect); + IntGdiIntersectRect(&Ps.rcPaint, &Ps.rcPaint, &Window->Wnd->ClientRect); if (! IntGdiIsEmptyRect(&Ps.rcPaint)) { IntGdiOffsetRect(&Ps.rcPaint, - -Window->ClientRect.left, - -Window->ClientRect.top); + -Window->Wnd->ClientRect.left, + -Window->Wnd->ClientRect.top); } } else @@ -930,11 +930,11 @@ } else { - Rect = Window->ClientRect; + Rect = Window->Wnd->ClientRect; IntIntersectWithParents(Window, &Rect); NtGdiSetRectRgn(hRgn, Rect.left, Rect.top, Rect.right, Rect.bottom); RegionType = NtGdiCombineRgn(hRgn, hRgn, Window->UpdateRegion, RGN_AND); - NtGdiOffsetRgn(hRgn, -Window->ClientRect.left, -Window->ClientRect.top); + NtGdiOffsetRgn(hRgn, -Window->Wnd->ClientRect.left, -Window->Wnd->ClientRect.top); } if (bErase && RegionType != NULLREGION && RegionType != ERROR) @@ -1014,7 +1014,7 @@ /* Get the update region bounding box. */ if (Window->UpdateRegion == (HRGN)1) { - Rect = Window->ClientRect; + Rect = Window->Wnd->ClientRect; } else { @@ -1024,14 +1024,14 @@ RGNDATA_UnlockRgn(RgnData); if (RegionType != ERROR && RegionType != NULLREGION) - IntGdiIntersectRect(&Rect, &Rect, &Window->ClientRect); + IntGdiIntersectRect(&Rect, &Rect, &Window->Wnd->ClientRect); } if (IntIntersectWithParents(Window, &Rect)) { IntGdiOffsetRect(&Rect, - -Window->ClientRect.left, - -Window->ClientRect.top); + -Window->Wnd->ClientRect.left, + -Window->Wnd->ClientRect.top); } else { Rect.left = Rect.top = Rect.right = Rect.bottom = 0; @@ -1420,7 +1420,7 @@ IntGetClientOrigin(Window, &ClientOrigin); for (Child = Window->FirstChild; Child; Child = Child->NextSibling) { - rcChild = Child->WindowRect; + rcChild = Child->Wnd->WindowRect; rcChild.left -= ClientOrigin.x; rcChild.top -= ClientOrigin.y; rcChild.right -= ClientOrigin.x; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c Thu Nov 15 22:42:41 2007 @@ -60,8 +60,8 @@ IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, PRECT lprect) { BOOL vertical; - RECT ClientRect = Window->ClientRect; - RECT WindowRect = Window->WindowRect; + RECT ClientRect = Window->Wnd->ClientRect; + RECT WindowRect = Window->Wnd->WindowRect; switch (nBar) { @@ -394,10 +394,10 @@ if (bRedraw) { RECT UpdateRect = psbi->rcScrollBar; - UpdateRect.left -= Window->ClientRect.left - Window->WindowRect.left; - UpdateRect.right -= Window->ClientRect.left - Window->WindowRect.left; - UpdateRect.top -= Window->ClientRect.top - Window->WindowRect.top; - UpdateRect.bottom -= Window->ClientRect.top - Window->WindowRect.top; + UpdateRect.left -= Window->Wnd->ClientRect.left - Window->Wnd->WindowRect.left; + UpdateRect.right -= Window->Wnd->ClientRect.left - Window->Wnd->WindowRect.left; + UpdateRect.top -= Window->Wnd->ClientRect.top - Window->Wnd->WindowRect.top; + UpdateRect.bottom -= Window->Wnd->ClientRect.top - Window->Wnd->WindowRect.top; co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); } @@ -467,8 +467,8 @@ RtlZeroMemory(Window->Scroll, Size); Result = co_WinPosGetNonClientSize(Window, - &Window->WindowRect, - &Window->ClientRect); + &Window->Wnd->WindowRect, + &Window->Wnd->ClientRect); for(s = SB_HORZ; s <= SB_VERT; s++) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c Thu Nov 15 22:42:41 2007 @@ -47,11 +47,11 @@ if (ClientArea) { - VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); + VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->ClientRect); } else { - VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); } /* @@ -70,7 +70,7 @@ return NULL; } - ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentWindow->ClientRect); + ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentWindow->Wnd->ClientRect); NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_AND); NtGdiDeleteObject(ClipRgn); @@ -83,13 +83,13 @@ if ((CurrentSibling->Style & WS_VISIBLE) && !(CurrentSibling->ExStyle & WS_EX_TRANSPARENT)) { - ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentSibling->WindowRect); + ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentSibling->Wnd->WindowRect); /* Combine it with the window region if available */ if (CurrentSibling->WindowRegion && !(CurrentSibling->Style & WS_MINIMIZE)) { - NtGdiOffsetRgn(ClipRgn, -CurrentSibling->WindowRect.left, -CurrentSibling->WindowRect.top); + NtGdiOffsetRgn(ClipRgn, -CurrentSibling->Wnd->WindowRect.left, -CurrentSibling->Wnd->WindowRect.top); NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentSibling->WindowRegion, RGN_AND); - NtGdiOffsetRgn(ClipRgn, CurrentSibling->WindowRect.left, CurrentSibling->WindowRect.top); + NtGdiOffsetRgn(ClipRgn, CurrentSibling->Wnd->WindowRect.left, CurrentSibling->Wnd->WindowRect.top); } NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); NtGdiDeleteObject(ClipRgn); @@ -110,13 +110,13 @@ if ((CurrentWindow->Style & WS_VISIBLE) && !(CurrentWindow->ExStyle & WS_EX_TRANSPARENT)) { - ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentWindow->WindowRect); + ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentWindow->Wnd->WindowRect); /* Combine it with the window region if available */ if (CurrentWindow->WindowRegion && !(CurrentWindow->Style & WS_MINIMIZE)) { - NtGdiOffsetRgn(ClipRgn, -CurrentWindow->WindowRect.left, -CurrentWindow->WindowRect.top); + NtGdiOffsetRgn(ClipRgn, -CurrentWindow->Wnd->WindowRect.left, -CurrentWindow->Wnd->WindowRect.top); NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentWindow->WindowRegion, RGN_AND); - NtGdiOffsetRgn(ClipRgn, CurrentWindow->WindowRect.left, CurrentWindow->WindowRect.top); + NtGdiOffsetRgn(ClipRgn, CurrentWindow->Wnd->WindowRect.left, CurrentWindow->Wnd->WindowRect.top); } NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); NtGdiDeleteObject(ClipRgn); @@ -127,9 +127,9 @@ if (Window->WindowRegion && !(Window->Style & WS_MINIMIZE)) { - NtGdiOffsetRgn(VisRgn, -Window->WindowRect.left, -Window->WindowRect.top); + NtGdiOffsetRgn(VisRgn, -Window->Wnd->WindowRect.left, -Window->Wnd->WindowRect.top); NtGdiCombineRgn(VisRgn, VisRgn, Window->WindowRegion, RGN_AND); - NtGdiOffsetRgn(VisRgn, Window->WindowRect.left, Window->WindowRect.top); + NtGdiOffsetRgn(VisRgn, Window->Wnd->WindowRect.left, Window->Wnd->WindowRect.top); } return VisRgn; @@ -153,8 +153,8 @@ if(Parent) { NtGdiOffsetRgn(Temp, - Window->WindowRect.left - Parent->ClientRect.left, - Window->WindowRect.top - Parent->ClientRect.top); + Window->Wnd->WindowRect.left - Parent->Wnd->ClientRect.left, + Window->Wnd->WindowRect.top - Parent->Wnd->ClientRect.top); UserRefObjectCo(Parent, &Ref); co_UserRedrawWindow(Parent, NULL, Temp, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Nov 15 22:42:41 2007 @@ -199,13 +199,13 @@ { if (Flags & DCX_WINDOW) { - dc->w.DCOrgX = Window->WindowRect.left; - dc->w.DCOrgY = Window->WindowRect.top; + dc->w.DCOrgX = Window->Wnd->WindowRect.left; + dc->w.DCOrgY = Window->Wnd->WindowRect.top; } else { - dc->w.DCOrgX = Window->ClientRect.left; - dc->w.DCOrgY = Window->ClientRect.top; + dc->w.DCOrgX = Window->Wnd->ClientRect.left; + dc->w.DCOrgY = Window->Wnd->ClientRect.top; } } DC_UnlockDc(dc); @@ -311,7 +311,7 @@ DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); if (NULL != DesktopWindow) { - hRgnVisible = UnsafeIntCreateRectRgnIndirect(&DesktopWindow->WindowRect); + hRgnVisible = UnsafeIntCreateRectRgnIndirect(&DesktopWindow->Wnd->WindowRect); } else { @@ -530,11 +530,11 @@ { if (!(Flags & DCX_WINDOW)) { - Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); + Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->ClientRect); } else { - Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); } } else if (ClipRegion != NULL) @@ -819,17 +819,17 @@ { if (pDCE->DCXFlags & DCX_WINDOW) { - DeltaX = CurrentWindow->WindowRect.left - dc->w.DCOrgX; - DeltaY = CurrentWindow->WindowRect.top - dc->w.DCOrgY; - dc->w.DCOrgX = CurrentWindow->WindowRect.left; - dc->w.DCOrgY = CurrentWindow->WindowRect.top; + DeltaX = CurrentWindow->Wnd->WindowRect.left - dc->w.DCOrgX; + DeltaY = CurrentWindow->Wnd->WindowRect.top - dc->w.DCOrgY; + dc->w.DCOrgX = CurrentWindow->Wnd->WindowRect.left; + dc->w.DCOrgY = CurrentWindow->Wnd->WindowRect.top; } else { - DeltaX = CurrentWindow->ClientRect.left - dc->w.DCOrgX; - DeltaY = CurrentWindow->ClientRect.top - dc->w.DCOrgY; - dc->w.DCOrgX = CurrentWindow->ClientRect.left; - dc->w.DCOrgY = CurrentWindow->ClientRect.top; + DeltaX = CurrentWindow->Wnd->ClientRect.left - dc->w.DCOrgX; + DeltaY = CurrentWindow->Wnd->ClientRect.top - dc->w.DCOrgY; + dc->w.DCOrgX = CurrentWindow->Wnd->ClientRect.left; + dc->w.DCOrgY = CurrentWindow->Wnd->ClientRect.top; } if (NULL != dc->w.hClipRgn) { 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 Thu Nov 15 22:42:41 2007 @@ -290,6 +290,21 @@ DPRINT("destroyed itself while in WM_DESTROY!\n"); } #endif +} + +static VOID +UserFreeWindowInfo(PW32THREADINFO ti, PWINDOW_OBJECT WindowObject) +{ + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + + if (ClientInfo->pvWND == DesktopHeapAddressToUser(WindowObject->Wnd)) + { + ClientInfo->hWND = NULL; + ClientInfo->pvWND = NULL; + } + + DesktopHeapFree(ti->Desktop, WindowObject->Wnd); + WindowObject->Wnd = NULL; } /*********************************************************************** @@ -446,6 +461,9 @@ } RtlFreeUnicodeString(&Window->WindowName); + + ASSERT(Window->Wnd != NULL); + UserFreeWindowInfo(Window->ti, Window); UserDerefObject(Window); @@ -539,8 +557,8 @@ IntGetWindowInfo(PWINDOW_OBJECT Window, PWINDOWINFO pwi) { pwi->cbSize = sizeof(WINDOWINFO); - pwi->rcWindow = Window->WindowRect; - pwi->rcClient = Window->ClientRect; + pwi->rcWindow = Window->Wnd->WindowRect; + pwi->rcClient = Window->Wnd->ClientRect; pwi->dwStyle = Window->Style; pwi->dwExStyle = Window->ExStyle; pwi->dwWindowStatus = (UserGetForegroundWindow() == Window->hSelf); /* WS_ACTIVECAPTION */ @@ -673,8 +691,8 @@ ASSERT( Rect ); Rect->left = Rect->top = 0; - Rect->right = Window->ClientRect.right - Window->ClientRect.left; - Rect->bottom = Window->ClientRect.bottom - Window->ClientRect.top; + Rect->right = Window->Wnd->ClientRect.right - Window->Wnd->ClientRect.left; + Rect->bottom = Window->Wnd->ClientRect.bottom - Window->Wnd->ClientRect.top; } @@ -1301,8 +1319,8 @@ if(Parent->hSelf != IntGetDesktopWindow()) { - Pt.x += Parent->ClientRect.left; - Pt.y += Parent->ClientRect.top; + Pt.x += Parent->Wnd->ClientRect.left; + Pt.y += Parent->Wnd->ClientRect.top; } if(!IntPtInWindow(Parent, Pt.x, Pt.y)) @@ -1355,7 +1373,7 @@ if(Parent != NULL) { - IntGdiIntersectRect(rc, rc, &Parent->ClientRect); + IntGdiIntersectRect(rc, rc, &Parent->Wnd->ClientRect); if(IncPos) { @@ -1528,10 +1546,21 @@ ObmCreateObject(gHandleTable, (PHANDLE)&hWnd, otWindow, sizeof(WINDOW_OBJECT) + Class->WndExtra ); + if (Window) + { + Window->Wnd = DesktopHeapAlloc(ti->Desktop, + sizeof(WINDOW)); + if (!Window->Wnd) + goto AllocErr; + + Window->Wnd->ti = ti; + Window->Wnd->pi = ti->kpi; + } DPRINT("Created object with handle %X\n", hWnd); if (!Window) { +AllocErr: ObDereferenceObject(WinSta); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); RETURN( (HWND)0); @@ -1814,16 +1843,16 @@ } /* Initialize the window dimensions. */ - Window->WindowRect.left = Pos.x; - Window->WindowRect.top = Pos.y; - Window->WindowRect.right = Pos.x + Size.cx; - Window->WindowRect.bottom = Pos.y + Size.cy; + Window->Wnd->WindowRect.left = Pos.x; + Window->Wnd->WindowRect.top = Pos.y; + Window->Wnd->WindowRect.right = Pos.x + Size.cx; + Window->Wnd->WindowRect.bottom = Pos.y + Size.cy; if (0 != (Window->Style & WS_CHILD) && ParentWindow) { - IntGdiOffsetRect(&(Window->WindowRect), ParentWindow->ClientRect.left, - ParentWindow->ClientRect.top); - } - Window->ClientRect = Window->WindowRect; + IntGdiOffsetRect(&(Window->Wnd->WindowRect), ParentWindow->Wnd->ClientRect.left, + ParentWindow->Wnd->ClientRect.top); + } + Window->Wnd->ClientRect = Window->Wnd->WindowRect; /* * Get the size and position of the window. @@ -1849,16 +1878,16 @@ Size.cy = 0; } - Window->WindowRect.left = Pos.x; - Window->WindowRect.top = Pos.y; - Window->WindowRect.right = Pos.x + Size.cx; - Window->WindowRect.bottom = Pos.y + Size.cy; + Window->Wnd->WindowRect.left = Pos.x; + Window->Wnd->WindowRect.top = Pos.y; + Window->Wnd->WindowRect.right = Pos.x + Size.cx; + Window->Wnd->WindowRect.bottom = Pos.y + Size.cy; if (0 != (Window->Style & WS_CHILD) && ParentWindow) { - IntGdiOffsetRect(&(Window->WindowRect), ParentWindow->ClientRect.left, - ParentWindow->ClientRect.top); - } - Window->ClientRect = Window->WindowRect; + IntGdiOffsetRect(&(Window->Wnd->WindowRect), ParentWindow->Wnd->ClientRect.left, + ParentWindow->Wnd->ClientRect.top); + } + Window->Wnd->ClientRect = Window->Wnd->WindowRect; /* FIXME: Initialize the window menu. */ @@ -1880,19 +1909,19 @@ } /* Calculate the non-client size. */ - MaxPos.x = Window->WindowRect.left; - MaxPos.y = Window->WindowRect.top; + MaxPos.x = Window->Wnd->WindowRect.left; + MaxPos.y = Window->Wnd->WindowRect.top; DPRINT("IntCreateWindowEx(): About to get non-client size.\n"); /* WinPosGetNonClientSize SENDS THE WM_NCCALCSIZE message */ Result = co_WinPosGetNonClientSize(Window, - &Window->WindowRect, - &Window->ClientRect); - - IntGdiOffsetRect(&Window->WindowRect, - MaxPos.x - Window->WindowRect.left, - MaxPos.y - Window->WindowRect.top); + &Window->Wnd->WindowRect, + &Window->Wnd->ClientRect); + + IntGdiOffsetRect(&Window->Wnd->WindowRect, + MaxPos.x - Window->Wnd->WindowRect.left, + MaxPos.y - Window->Wnd->WindowRect.top); if (NULL != ParentWindow) @@ -1951,17 +1980,17 @@ DPRINT("IntCreateWindow(): About to send WM_SIZE\n"); - if ((Window->ClientRect.right - Window->ClientRect.left) < 0 || - (Window->ClientRect.bottom - Window->ClientRect.top) < 0) + if ((Window->Wnd->ClientRect.right - Window->Wnd->ClientRect.left) < 0 || + (Window->Wnd->ClientRect.bottom - Window->Wnd->ClientRect.top) < 0) { DPRINT("Sending bogus WM_SIZE\n"); } - lParam = MAKE_LONG(Window->ClientRect.right - - Window->ClientRect.left, - Window->ClientRect.bottom - - Window->ClientRect.top); + lParam = MAKE_LONG(Window->Wnd->ClientRect.right - + Window->Wnd->ClientRect.left, + Window->Wnd->ClientRect.bottom - + Window->Wnd->ClientRect.top); co_IntSendMessage(Window->hSelf, WM_SIZE, SIZE_RESTORED, lParam); @@ -1970,13 +1999,13 @@ if (0 != (Window->Style & WS_CHILD) && ParentWindow) { - lParam = MAKE_LONG(Window->ClientRect.left - ParentWindow->ClientRect.left, - Window->ClientRect.top - ParentWindow->ClientRect.top); + lParam = MAKE_LONG(Window->Wnd->ClientRect.left - ParentWindow->Wnd->ClientRect.left, + Window->Wnd->ClientRect.top - ParentWindow->Wnd->ClientRect.top); } else { - lParam = MAKE_LONG(Window->ClientRect.left, - Window->ClientRect.top); + lParam = MAKE_LONG(Window->Wnd->ClientRect.left, + Window->Wnd->ClientRect.top); } @@ -2050,6 +2079,8 @@ RETURN(hWnd); CLEANUP: + if (!_ret_ && Window && Window->Wnd && ti) + UserFreeWindowInfo(ti, Window); if (Window) UserDerefObjectCo(Window); if (ParentWindow) UserDerefObjectCo(ParentWindow); if (!_ret_ && ti != NULL) @@ -3844,10 +3875,10 @@ Safepl.showCmd = SW_SHOWNORMAL; } - Size.x = Window->WindowRect.left; - Size.y = Window->WindowRect.top; + Size.x = Window->Wnd->WindowRect.left; + Size.y = Window->Wnd->WindowRect.top; InternalPos = WinPosInitInternalPos(Window, &Size, - &Window->WindowRect); + &Window->Wnd->WindowRect); if (InternalPos) { Safepl.rcNormalPosition = InternalPos->NormalRect; @@ -3897,7 +3928,7 @@ { RETURN(FALSE); } - Status = MmCopyToCaller(Rect, &Wnd->WindowRect, sizeof(RECT)); + Status = MmCopyToCaller(Rect, &Wnd->Wnd->WindowRect, sizeof(RECT)); if (!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -4319,8 +4350,8 @@ } /* Create a new window region using the window rectangle */ - VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); - NtGdiOffsetRgn(VisRgn, -Window->WindowRect.left, -Window->WindowRect.top); + VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); + NtGdiOffsetRgn(VisRgn, -Window->Wnd->WindowRect.left, -Window->Wnd->WindowRect.top); /* if there's a region assigned to the window, combine them both */ if(Window->WindowRegion && !(Window->Style & WS_MINIMIZE)) NtGdiCombineRgn(VisRgn, VisRgn, Window->WindowRegion, RGN_AND); @@ -4357,8 +4388,8 @@ } /* Create a new window region using the window rectangle */ - VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); - NtGdiOffsetRgn(VisRgn, -Window->WindowRect.left, -Window->WindowRect.top); + VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); + NtGdiOffsetRgn(VisRgn, -Window->Wnd->WindowRect.left, -Window->Wnd->WindowRect.top); /* if there's a region assigned to the window, combine them both */ if(Window->WindowRegion && !(Window->Style & WS_MINIMIZE)) NtGdiCombineRgn(VisRgn, VisRgn, Window->WindowRegion, RGN_AND); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Thu Nov 15 22:42:41 2007 @@ -64,8 +64,8 @@ Point->x = Point->y = 0; return FALSE; } - Point->x = Window->ClientRect.left; - Point->y = Window->ClientRect.top; + Point->x = Window->Wnd->ClientRect.left; + Point->y = Window->Wnd->ClientRect.top; return TRUE; } @@ -278,7 +278,7 @@ if(IntIsDesktopWindow(Parent)) IntGetDesktopWorkArea(Desktop, &WorkArea); else - WorkArea = Parent->ClientRect; + WorkArea = Parent->Wnd->ClientRect; } else IntGetDesktopWorkArea(Desktop, &WorkArea); @@ -289,7 +289,7 @@ DPRINT1("Failed to allocate INTERNALPOS structure for window 0x%x\n", Window->hSelf); return NULL; } - Window->InternalPos->NormalRect = Window->WindowRect; + Window->InternalPos->NormalRect = Window->Wnd->WindowRect; IntGetWindowBorderMeasures(Window, &XInc, &YInc); Window->InternalPos->MaxPos.x = WorkArea.left - XInc; Window->InternalPos->MaxPos.y = WorkArea.top - YInc; @@ -320,9 +320,9 @@ ASSERT_REFS_CO(Window); - Size.x = Window->WindowRect.left; - Size.y = Window->WindowRect.top; - InternalPos = WinPosInitInternalPos(Window, &Size, &Window->WindowRect); + Size.x = Window->Wnd->WindowRect.left; + Size.y = Window->Wnd->WindowRect.top; + InternalPos = WinPosInitInternalPos(Window, &Size, &Window->Wnd->WindowRect); if (InternalPos) { @@ -533,17 +533,17 @@ WINDOWPOS winposCopy; params.rgrc[0] = *WindowRect; - params.rgrc[1] = Window->WindowRect; - params.rgrc[2] = Window->ClientRect; + params.rgrc[1] = Window->Wnd->WindowRect; + params.rgrc[2] = Window->Wnd->ClientRect; Parent = Window->Parent; if (0 != (Window->Style & WS_CHILD) && Parent) { - IntGdiOffsetRect(&(params.rgrc[0]), - Parent->ClientRect.left, - - Parent->ClientRect.top); - IntGdiOffsetRect(&(params.rgrc[1]), - Parent->ClientRect.left, - - Parent->ClientRect.top); - IntGdiOffsetRect(&(params.rgrc[2]), - Parent->ClientRect.left, - - Parent->ClientRect.top); + IntGdiOffsetRect(&(params.rgrc[0]), - Parent->Wnd->ClientRect.left, + - Parent->Wnd->ClientRect.top); + IntGdiOffsetRect(&(params.rgrc[1]), - Parent->Wnd->ClientRect.left, + - Parent->Wnd->ClientRect.top); + IntGdiOffsetRect(&(params.rgrc[2]), - Parent->Wnd->ClientRect.left, + - Parent->Wnd->ClientRect.top); } params.lppos = &winposCopy; winposCopy = *WinPos; @@ -557,24 +557,24 @@ *ClientRect = params.rgrc[0]; if ((Window->Style & WS_CHILD) && Parent) { - IntGdiOffsetRect(ClientRect, Parent->ClientRect.left, - Parent->ClientRect.top); + IntGdiOffsetRect(ClientRect, Parent->Wnd->ClientRect.left, + Parent->Wnd->ClientRect.top); } FixClientRect(ClientRect, WindowRect); } /* FIXME: WVR_ALIGNxxx */ - if (ClientRect->left != Window->ClientRect.left || - ClientRect->top != Window->ClientRect.top) + if (ClientRect->left != Window->Wnd->ClientRect.left || + ClientRect->top != Window->Wnd->ClientRect.top) { WinPos->flags &= ~SWP_NOCLIENTMOVE; } if ((ClientRect->right - ClientRect->left != - Window->ClientRect.right - Window->ClientRect.left) || + Window->Wnd->ClientRect.right - Window->Wnd->ClientRect.left) || (ClientRect->bottom - ClientRect->top != - Window->ClientRect.bottom - Window->ClientRect.top)) + Window->Wnd->ClientRect.bottom - Window->Wnd->ClientRect.top)) { WinPos->flags &= ~SWP_NOCLIENTSIZE; } @@ -582,8 +582,8 @@ else { if (! (WinPos->flags & SWP_NOMOVE) - && (ClientRect->left != Window->ClientRect.left || - ClientRect->top != Window->ClientRect.top)) + && (ClientRect->left != Window->Wnd->ClientRect.left || + ClientRect->top != Window->Wnd->ClientRect.top)) { WinPos->flags &= ~SWP_NOCLIENTMOVE; } @@ -608,8 +608,8 @@ co_IntPostOrSendMessage(Window->hSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); } - *WindowRect = Window->WindowRect; - *ClientRect = Window->ClientRect; + *WindowRect = Window->Wnd->WindowRect; + *ClientRect = Window->Wnd->ClientRect; if (!(WinPos->flags & SWP_NOSIZE)) { @@ -625,17 +625,17 @@ Parent = Window->Parent; if ((0 != (Window->Style & WS_CHILD)) && Parent) { - X += Parent->ClientRect.left; - Y += Parent->ClientRect.top; + X += Parent->Wnd->ClientRect.left; + Y += Parent->Wnd->ClientRect.top; } WindowRect->left = X; WindowRect->top = Y; - WindowRect->right += X - Window->WindowRect.left; - WindowRect->bottom += Y - Window->WindowRect.top; + WindowRect->right += X - Window->Wnd->WindowRect.left; + WindowRect->bottom += Y - Window->Wnd->WindowRect.top; IntGdiOffsetRect(ClientRect, - X - Window->WindowRect.left, - Y - Window->WindowRect.top); + X - Window->Wnd->WindowRect.left, + Y - Window->Wnd->WindowRect.top); } WinPos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; @@ -747,15 +747,15 @@ { PWINDOW_OBJECT Child; - Window->WindowRect.left += MoveX; - Window->WindowRect.right += MoveX; - Window->WindowRect.top += MoveY; - Window->WindowRect.bottom += MoveY; - - Window->ClientRect.left += MoveX; - Window->ClientRect.right += MoveX; - Window->ClientRect.top += MoveY; - Window->ClientRect.bottom += MoveY; + Window->Wnd->WindowRect.left += MoveX; + Window->Wnd->WindowRect.right += MoveX; + Window->Wnd->WindowRect.top += MoveY; + Window->Wnd->WindowRect.bottom += MoveY; + + Window->Wnd->ClientRect.left += MoveX; + Window->Wnd->ClientRect.right += MoveX; + Window->Wnd->ClientRect.top += MoveY; + Window->Wnd->ClientRect.bottom += MoveY; for(Child = Window->FirstChild; Child; Child = Child->NextSibling) { @@ -787,15 +787,15 @@ WinPos->cy = max(WinPos->cy, 0); /* Check for right size */ - if (Window->WindowRect.right - Window->WindowRect.left == WinPos->cx && - Window->WindowRect.bottom - Window->WindowRect.top == WinPos->cy) + if (Window->Wnd->WindowRect.right - Window->Wnd->WindowRect.left == WinPos->cx && + Window->Wnd->WindowRect.bottom - Window->Wnd->WindowRect.top == WinPos->cy) { WinPos->flags |= SWP_NOSIZE; } /* Check for right position */ - if (Window->WindowRect.left == WinPos->x && - Window->WindowRect.top == WinPos->y) + if (Window->Wnd->WindowRect.left == WinPos->x && + Window->Wnd->WindowRect.top == WinPos->y) { WinPos->flags |= SWP_NOMOVE; } @@ -969,7 +969,7 @@ else if(VisRgn) { RGNDATA_UnlockRgn(VisRgn); - NtGdiOffsetRgn(VisBefore, -Window->WindowRect.left, -Window->WindowRect.top); + NtGdiOffsetRgn(VisBefore, -Window->Wnd->WindowRect.left, -Window->Wnd->WindowRect.top); } } } @@ -1044,8 +1044,8 @@ } } - OldWindowRect = Window->WindowRect; - OldClientRect = Window->ClientRect; + OldWindowRect = Window->Wnd->WindowRect; + OldClientRect = Window->Wnd->ClientRect; if (OldClientRect.bottom - OldClientRect.top == NewClientRect.bottom - NewClientRect.top) @@ -1069,8 +1069,8 @@ NewClientRect.top - OldClientRect.top); } - Window->WindowRect = NewWindowRect; - Window->ClientRect = NewClientRect; + Window->Wnd->WindowRect = NewWindowRect; + Window->Wnd->ClientRect = NewClientRect; if (!(WinPos.flags & SWP_SHOWWINDOW) && (WinPos.flags & SWP_HIDEWINDOW)) { @@ -1119,7 +1119,7 @@ else if(VisRgn) { RGNDATA_UnlockRgn(VisRgn); - NtGdiOffsetRgn(VisAfter, -Window->WindowRect.left, -Window->WindowRect.top); + NtGdiOffsetRgn(VisAfter, -Window->Wnd->WindowRect.left, -Window->Wnd->WindowRect.top); } /* @@ -1241,8 +1241,8 @@ PWINDOW_OBJECT Parent = Window->Parent; NtGdiOffsetRgn(DirtyRgn, - Window->WindowRect.left, - Window->WindowRect.top); + Window->Wnd->WindowRect.left, + Window->Wnd->WindowRect.top); if ((Window->Style & WS_CHILD) && (Parent) && !(Parent->Style & WS_CLIPCHILDREN)) @@ -1490,13 +1490,13 @@ } co_IntSendMessage(Window->hSelf, WM_SIZE, wParam, - MAKELONG(Window->ClientRect.right - - Window->ClientRect.left, - Window->ClientRect.bottom - - Window->ClientRect.top)); + MAKELONG(Window->Wnd->ClientRect.right - + Window->Wnd->ClientRect.left, + Window->Wnd->ClientRect.bottom - + Window->Wnd->ClientRect.top)); co_IntSendMessage(Window->hSelf, WM_MOVE, 0, - MAKELONG(Window->ClientRect.left, - Window->ClientRect.top)); + MAKELONG(Window->Wnd->ClientRect.left, + Window->Wnd->ClientRect.top)); IntEngWindowChanged(Window, WOC_RGN_CLIENT); } @@ -1612,10 +1612,10 @@ else *HitTest = HTCLIENT; - if (Point->x >= Current->ClientRect.left && - Point->x < Current->ClientRect.right && - Point->y >= Current->ClientRect.top && - Point->y < Current->ClientRect.bottom) + if (Point->x >= Current->Wnd->ClientRect.left && + Point->x < Current->Wnd->ClientRect.right && + Point->y >= Current->Wnd->ClientRect.top && + Point->y < Current->Wnd->ClientRect.bottom) { co_WinPosSearchChildren(Current, OnlyHitTests, Point, Window, HitTest); } @@ -1658,8 +1658,8 @@ if((DesktopWindowHandle != ScopeWin->hSelf) && (DesktopWindow = UserGetWindowObject(DesktopWindowHandle))) { - Point.x += ScopeWin->ClientRect.left - DesktopWindow->ClientRect.left; - Point.y += ScopeWin->ClientRect.top - DesktopWindow->ClientRect.top; + Point.x += ScopeWin->Wnd->ClientRect.left - DesktopWindow->Wnd->ClientRect.left; + Point.y += ScopeWin->Wnd->ClientRect.top - DesktopWindow->Wnd->ClientRect.top; } HitTest = HTNOWHERE; @@ -1694,10 +1694,10 @@ UserRefObjectCo(Window, &Ref); - Size.x = Window->WindowRect.left; - Size.y = Window->WindowRect.top; + Size.x = Window->Wnd->WindowRect.left; + Size.y = Window->Wnd->WindowRect.top; InternalPos = WinPosInitInternalPos(Window, &Size, - &Window->WindowRect); + &Window->Wnd->WindowRect); if(InternalPos) { if(SendMessage) Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c Thu Nov 15 22:42:41 2007 @@ -47,15 +47,15 @@ Window = UserGetWindowObject(hWnd); if(!Window) return FALSE; - rc.left += Window->ClientRect.left; - rc.top += Window->ClientRect.top; - rc.right += Window->ClientRect.left; - rc.bottom += Window->ClientRect.top; + rc.left += Window->Wnd->ClientRect.left; + rc.top += Window->Wnd->ClientRect.top; + rc.right += Window->Wnd->ClientRect.left; + rc.bottom += Window->Wnd->ClientRect.top; - rc1.left += Window->ClientRect.left; - rc1.top += Window->ClientRect.top; - rc1.right += Window->ClientRect.left; - rc1.bottom += Window->ClientRect.top; + rc1.left += Window->Wnd->ClientRect.left; + rc1.top += Window->Wnd->ClientRect.top; + rc1.right += Window->Wnd->ClientRect.left; + rc1.bottom += Window->Wnd->ClientRect.top; } rx = (rc.right - rc.left)/2 - 1;

1 0

[hpoussin] 30466: Add a script to create a .rbuild file using files in the current directory 1) Copy this script to the root dir of the module 2) Run "createrbuild.cmd >module.rbuild" 3) Update 2nd line (path to project.dtd) 4) Update 3rd line (module parameters) 5) Delete "createrbuild.cmd" ; )
by hpoussin＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: hpoussin Date: Thu Nov 15 21:09:00 2007 New Revision: 30466 URL: http://svn.reactos.org/svn/reactos?rev=30466&view=rev Log: Add a script to create a .rbuild file using files in the current directory 1) Copy this script to the root dir of the module 2) Run "createrbuild.cmd >module.rbuild" 3) Update 2nd line (path to project.dtd) 4) Update 3rd line (module parameters) 5) Delete "createrbuild.cmd" ;) Added: trunk/tools/createrbuild.cmd (with props) Added: trunk/tools/createrbuild.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/createrbuild.cmd?rev=30466&v… ============================================================================== --- trunk/tools/createrbuild.cmd (added) +++ trunk/tools/createrbuild.cmd Thu Nov 15 21:09:00 2007 @@ -1,0 +1,49 @@ +@ECHO OFF +REM Creates a .rbuild file using files in the current directory +REM Copyright 2007 H. Poussineau +REM Usage: +REM 1) Copy this script to the root dir of the module +REM 2) Run "createrbuild.cmd >module.rbuild" +REM 3) Update 2nd line (path to project.dtd) +REM 4) Update 3rd line (module parameters) +REM 5) Delete "createrbuild.cmd" ;) + +SETLOCAL ENABLEDELAYEDEXPANSION +IF "%1" == "" ( + ECHO ^<?xml version="1.0"?^> + ECHO ^<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"^> + ECHO ^<module name="" type="" installbase="" installname=""^> + SET LEVEL=1 +) ELSE ( + SET LEVEL=%1 +) +FOR /F %%F IN ('DIR /B /AD') DO ( + SET INDENT= + FOR /L %%i IN (1, 1, %LEVEL%) DO ( + SET INDENT=!INDENT! + ) + ECHO !INDENT!^<directory name="%%F"^> + SET /A NEWLEVEL=%LEVEL%+1 + PUSHD %%F + CALL ..\%0 !NEWLEVEL! + POPD + SET INDENT= + FOR /L %%i IN (1, 1, %LEVEL%) DO ( + SET INDENT=!INDENT! + ) + ECHO !INDENT!^</directory^> +) +FOR /F %%F IN ('DIR /B /A-D 2^>NUL') DO ( + SET INDENT= + FOR /L %%i IN (1, 1, %LEVEL%) DO ( + SET INDENT=!INDENT! + ) + IF NOT %LEVEL% == 1 ( + ECHO !INDENT!^<file^>%%F^</file^> + ) ELSE IF NOT "%%F" == "%0" ( + ECHO !INDENT!^<file^>%%F^</file^> + ) +) +IF "%1" == "" ( + ECHO ^</module^> +) Propchange: trunk/tools/createrbuild.cmd ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 30465: Move ReplaceVariable funtion to the Environment class inset of using 3 copy-pasted versions of this function
by mpiulachs＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: mpiulachs Date: Thu Nov 15 21:03:30 2007 New Revision: 30465 URL: http://svn.reactos.org/svn/reactos?rev=30465&view=rev Log: Move ReplaceVariable funtion to the Environment class inset of using 3 copy-pasted versions of this function Modified: branches/rbuild/reactos/tools/rbuild/bootstrap.cpp branches/rbuild/reactos/tools/rbuild/cdfile.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/boo… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/bootstrap.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/bootstrap.cpp Thu Nov 15 21:03:30 2007 @@ -75,17 +75,17 @@ __LINE__ ); } -string -Bootstrap::ReplaceVariable ( const string& name, - const string& value, - string path ) -{ - size_t i = path.find ( name ); - if ( i != string::npos ) - return path.replace ( i, name.length (), value ); - else - return path; -} +//string +//Bootstrap::ReplaceVariable ( const string& name, +// const string& value, +// string path ) +//{ +// size_t i = path.find ( name ); +// if ( i != string::npos ) +// return path.replace ( i, name.length (), value ); +// else +// return path; +//} void Bootstrap::Initialize () @@ -99,7 +99,7 @@ const XMLAttribute* att = node.GetAttribute ( "installbase", false ); if ( att != NULL ) - base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); + base = Environment::ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else base = ""; Modified: branches/rbuild/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cdf… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/cdfile.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/cdfile.cpp Thu Nov 15 21:03:30 2007 @@ -22,29 +22,29 @@ using std::string; -string -CDFile::ReplaceVariable ( const string& name, - const string& value, - string path ) -{ - size_t i = path.find ( name ); - if ( i != string::npos ) - return path.replace ( i, name.length (), value ); - else - return path; -} - -string -BootstrapFile::ReplaceVariable ( const string& name, - const string& value, - string path ) -{ - size_t i = path.find ( name ); - if ( i != string::npos ) - return path.replace ( i, name.length (), value ); - else - return path; -} +//string +//CDFile::ReplaceVariable ( const string& name, +// const string& value, +// string path ) +//{ +// size_t i = path.find ( name ); +// if ( i != string::npos ) +// return path.replace ( i, name.length (), value ); +// else +// return path; +//} +// +//string +//BootstrapFile::ReplaceVariable ( const string& name, +// const string& value, +// string path ) +//{ +// size_t i = path.find ( name ); +// if ( i != string::npos ) +// return path.replace ( i, name.length (), value ); +// else +// return path; +//} CDFile::CDFile ( const Project& project, const XMLElement& cdfileNode, @@ -54,7 +54,7 @@ const XMLAttribute* att = cdfileNode.GetAttribute ( "installbase", false ); string target_relative_directory; if ( att != NULL ) - target_relative_directory = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); + target_relative_directory = Environment::ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else target_relative_directory = ""; @@ -78,7 +78,7 @@ const XMLAttribute* att = cdfileNode.GetAttribute ( "installbase", false ); string target_relative_directory; if ( att != NULL ) - target_relative_directory = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); + target_relative_directory = Environment::ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else target_relative_directory = ""; Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Thu Nov 15 21:03:30 2007 @@ -61,6 +61,18 @@ defaultIntermediate ); } +string +Environment::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + /* static */ string Environment::GetOutputPath () { Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Thu Nov 15 21:03:30 2007 @@ -207,6 +207,9 @@ static std::string GetAutomakeFile ( const std::string& defaultFile ); static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, const std::string& defaultValue ); + static std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); }; @@ -988,9 +991,9 @@ private: bool IsSupportedModuleType ( ModuleType type ); void Initialize(); - static std::string ReplaceVariable ( const std::string& name, - const std::string& value, - std::string path ); + //static std::string ReplaceVariable ( const std::string& name, + // const std::string& value, + // std::string path ); }; @@ -1003,10 +1006,10 @@ CDFile ( const Project& project, const XMLElement& bootstrapNode, const std::string& path ); -private: - static std::string ReplaceVariable ( const std::string& name, - const std::string& value, - std::string path ); +//private: +// static std::string ReplaceVariable ( const std::string& name, +// const std::string& value, +// std::string path ); }; class BootstrapFile : public XmlNode @@ -1018,10 +1021,10 @@ BootstrapFile ( const Project& project, const XMLElement& bootstrapNode, const std::string& path ); -private: - static std::string ReplaceVariable ( const std::string& name, - const std::string& value, - std::string path ); +//private: +// static std::string ReplaceVariable ( const std::string& name, +// const std::string& value, +// std::string path ); }; class InstallFile : public XmlNode

1 0

[fireball] 30464: Dmitry Chapyshev <lentind@yandex.ru> - Update ras headers, up to Win2003 version. These headers are not syncable with Wine, since ours are more complete now.
by fireball＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: fireball Date: Thu Nov 15 20:17:57 2007 New Revision: 30464 URL: http://svn.reactos.org/svn/reactos?rev=30464&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Update ras headers, up to Win2003 version. These headers are not syncable with Wine, since ours are more complete now. Modified: trunk/reactos/include/psdk/ras.h trunk/reactos/include/psdk/rasdlg.h trunk/reactos/include/psdk/raserror.h Modified: trunk/reactos/include/psdk/ras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ras.h?rev=304… ============================================================================== --- trunk/reactos/include/psdk/ras.h (original) +++ trunk/reactos/include/psdk/ras.h Thu Nov 15 20:17:57 2007 @@ -35,6 +35,7 @@ #define RAS_MaxFacilities 200 #define RAS_MaxUserData 200 #define RAS_MaxReplyMessage 1024 +#define RAS_MaxDnsSuffix 256 #define RDEOPT_UsePrefixSuffix 0x00000001 #define RDEOPT_PausedStates 0x00000002 #define RDEOPT_IgnoreModemSpeaker 0x00000004 @@ -78,23 +79,30 @@ #define RASFP_Ppp 0x00000001 #define RASFP_Slip 0x00000002 #define RASFP_Ras 0x00000004 +#define RASDT_Direct TEXT("direct") #define RASDT_Modem TEXT("modem") #define RASDT_Isdn TEXT("isdn") #define RASDT_X25 TEXT("x25") #define RASDT_Vpn TEXT("vpn") #define RASDT_Pad TEXT("pad") #define RASDT_Generic TEXT("GENERIC") -#define RASDT_Serial TEXT("SERIAL") +#define RASDT_Serial TEXT("SERIAL") #define RASDT_FrameRelay TEXT("FRAMERELAY") #define RASDT_Atm TEXT("ATM") #define RASDT_Sonet TEXT("SONET") #define RASDT_SW56 TEXT("SW56") #define RASDT_Irda TEXT("IRDA") #define RASDT_Parallel TEXT("PARALLEL") +#if (WINVER >= 0x501) +#define RASDT_PPPoE TEXT("PPPoE") +#endif #define RASET_Phone 1 #define RASET_Vpn 2 #define RASET_Direct 3 #define RASET_Internet 4 +#if (WINVER >= 0x501) +#define RASET_Broadband 5 +#endif #if (WINVER >= 0x401) #define RASEO_SecureLocalFiles 0x00010000 #define RASCN_Connection 0x00000001 @@ -117,6 +125,13 @@ #endif /* (WINVER >= 0x401) */ #if (WINVER >= 0x500) #define RDEOPT_CustomDial 0x00001000 +#if (WINVER >= 0x501) +#define RDEOPT_UseCustomScripting 0x00002000 +#define RASCM_DefaultCreds 0x00000008 +#define RASCM_PreSharedKey 0x00000010 +#define RASCM_ServerPreSharedKey 0x00000020 +#define RASCM_DDMPreSharedKey 0x00000040 +#endif /*(WINVER >= 0x501)*/ #define RASLCPAP_PAP 0xC023 #define RASLCPAP_SPAP 0xC027 #define RASLCPAP_CHAP 0xC223 @@ -164,6 +179,18 @@ #define ET_RequireMax 2 #define ET_Optional 3 #endif /* (WINVER >= 0x500) */ +#if (WINVER >= 0x501) +#define RASEO2_SecureFileAndPrint 0x00000001 +#define RASEO2_SecureClientForMSNet 0x00000002 +#define RASEO2_DontNegotiateMultilink 0x00000004 +#define RASEO2_DontUseRasCredentials 0x00000008 +#define RASEO2_UsePreSharedKey 0x00000010 +#define RASEO2_Internet 0x00000020 +#define RASEO2_DisableNbtOverIP 0x00000040 +#define RASEO2_UseGlobalDeviceSettings 0x00000080 +#define RASEO2_ReconnectIfDropped 0x00000100 +#define RASEO2_SharePhoneNumbers 0x00000200 +#endif /*(WINVER >= 0x501)*/ #define RASCS_PAUSED 0x1000 #define RASCS_DONE 0x2000 @@ -546,6 +573,16 @@ WCHAR szCustomDialDll[MAX_PATH]; DWORD dwVpnStrategy; #endif +#if (WINVER >= 0x501) + DWORD dwfOptions2; + DWORD dwfOptions3; + WCHAR szDnsSuffix[RAS_MaxDnsSuffix]; + DWORD dwTcpWindowSize; + WCHAR szPrerequisitePbk[MAX_PATH]; + WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; + DWORD dwRedialCount; + DWORD dwRedialPause; +#endif /*(WINVER >= 0x501)*/ } RASENTRYW, *LPRASENTRYW; typedef struct tagRASENTRYA { @@ -593,6 +630,16 @@ CHAR szCustomDialDll[MAX_PATH]; DWORD dwVpnStrategy; #endif +#if (WINVER >= 0x501) + DWORD dwfOptions2; + DWORD dwfOptions3; + CHAR szDnsSuffix[RAS_MaxDnsSuffix]; + DWORD dwTcpWindowSize; + CHAR szPrerequisitePbk[MAX_PATH]; + CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; + DWORD dwRedialCount; + DWORD dwRedialPause; +#endif /*(WINVER >= 0x501)*/ } RASENTRYA, *LPRASENTRYA; @@ -719,7 +766,30 @@ #if (WINVER >= 0x500) typedef RASEAPUSERIDENTITYW RASEAPUSERIDENTITY, *LPRASEAPUSERIDENTITY; +typedef DWORD (WINAPI *PFNRASGETBUFFER) (PBYTE *ppBuffer, PDWORD pdwSize); +typedef DWORD (WINAPI *PFNRASFREEBUFFER) (PBYTE pBufer); +typedef DWORD (WINAPI *PFNRASSENDBUFFER) (HANDLE hPort, PBYTE pBuffer, DWORD dwSize); +typedef DWORD (WINAPI *PFNRASRECEIVEBUFFER) (HANDLE hPort, PBYTE pBuffer, PDWORD pdwSize, DWORD dwTimeOut, HANDLE hEvent); +typedef DWORD (WINAPI *PFNRASRETRIEVEBUFFER) (HANDLE hPort, PBYTE pBuffer, PDWORD pdwSize); +typedef DWORD (WINAPI *RasCustomScriptExecuteFn) (HANDLE hPort, LPCWSTR lpszPhonebook, LPCWSTR lpszEntryName, PFNRASGETBUFFER pfnRasGetBuffer, PFNRASFREEBUFFER pfnRasFreeBuffer, PFNRASSENDBUFFER pfnRasSendBuffer, PFNRASRECEIVEBUFFER pfnRasReceiveBuffer, PFNRASRETRIEVEBUFFER pfnRasRetrieveBuffer, HWND hWnd, RASDIALPARAMS *pRasDialParams, PVOID pvReserved); #endif /* (WINVER >= 0x500) */ + +#if (WINVER >= 0x501) +typedef struct tagRASCOMMSETTINGS +{ + DWORD dwSize; + BYTE bParity; + BYTE bStop; + BYTE bByteSize; + BYTE bAlign; +} RASCOMMSETTINGS; +typedef DWORD (WINAPI *PFNRASSETCOMMSETTINGS) (HANDLE hPort,RASCOMMSETTINGS *pRasCommSettings,PVOID pvReserved); +typedef struct tagRASCUSTOMSCRIPTEXTENSIONS +{ + DWORD dwSize; + PFNRASSETCOMMSETTINGS pfnRasSetCommSettings; +} RASCUSTOMSCRIPTEXTENSIONS; +#endif /*(WINVER >= 0x501)*/ #else /* ! defined UNICODE */ typedef RASCONNA RASCONN, *LPRASCONN; @@ -865,6 +935,10 @@ VOID APIENTRY RasFreeEapUserIdentityW (LPRASEAPUSERIDENTITYW); VOID APIENTRY RasFreeEapUserIdentityA (LPRASEAPUSERIDENTITYA); #endif /* (WINVER >= 0x500) */ +#if (WINVER >=0x501) +DWORD APIENTRY RasDeleteSubEntryA(LPCSTR pszPhonebook, LPCSTR pszEntry, DWORD dwSubentryId); +DWORD APIENTRY RasDeleteSubEntryW(LPCWSTR pszPhonebook, LPCWSTR pszEntry, DWORD dwSubEntryId); +#endif (WINVER >=0x501) /* UNICODE defines for functions */ @@ -911,6 +985,9 @@ #define RasGetEapUserIdentity RasGetEapUserIdentityW #define RasFreeEapUserIdentity RasFreeEapUserIdentityW #endif /* (WINVER >= 0x500) */ +#if (WINVER >= 0x501) +#define RasDeleteSubEntry RasDeleteSubEntryW +#endif /*(WINVER >= 0x501)*/ #else /* ! defined UNICODE */ #define RasDial RasDialA @@ -957,6 +1034,9 @@ #define RasGetEapUserIdentity RasGetEapUserIdentityA #define RasFreeEapUserIdentity RasFreeEapUserIdentityA #endif /* (WINVER >= 0x500) */ +#if (WINVER >= 0x501) +#define RasDeleteSubEntry RasDeleteSubEntryA +#endif /*(WINVER >= 0x501)*/ #endif /* ! UNICODE */ #ifdef __cplusplus Modified: trunk/reactos/include/psdk/rasdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rasdlg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rasdlg.h (original) +++ trunk/reactos/include/psdk/rasdlg.h Thu Nov 15 20:17:57 2007 @@ -96,6 +96,19 @@ ULONG_PTR reserved2; } RASPBDLGW, *LPRASPBDLGW; +typedef struct tagRASMONITORDLG +{ + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + DWORD dwStartPage; + LONG xDlg; + LONG yDlg; + OUT DWORD dwError; + ULONG_PTR reserved; + ULONG_PTR reserved2; +} RASMONITORDLG, *LPRASMONITORDLG; + typedef struct tagRASNOUSERA { DWORD dwSize; @@ -123,6 +136,10 @@ BOOL APIENTRY RasEntryDlgW(LPWSTR,LPWSTR,LPRASENTRYDLGW); BOOL APIENTRY RasPhonebookDlgA(LPSTR,LPSTR,LPRASPBDLGA); BOOL APIENTRY RasPhonebookDlgW(LPWSTR,LPWSTR,LPRASPBDLGW); +#if (WINVER <= 0x500) +BOOL APIENTRY RasMonitorDlgA(LPSTR, LPRASMONITORDLG); +BOOL APIENTRY RasMonitorDlgW(LPWSTR, LPRASMONITORDLG); +#endif /*(WINVER <= 0x500)*/ #ifdef UNICODE typedef RASENTRYDLGW RASENTRYDLG, *LPRASENTRYDLG; @@ -130,6 +147,9 @@ typedef RASNOUSERW RASNOUSER, *LPRASNOUSER; #define RasDialDlg RasDialDlgW #define RasEntryDlg RasEntryDlgW +#if (WINVER <= 0x500) +#define RasMonitorDlg RasMonitorDlgW +#endif /*(WINVER <= 0x500)*/ #define RasPhonebookDlg RasPhonebookDlgW #else typedef RASENTRYDLGA RASENTRYDLG, *LPRASENTRYDLG; @@ -137,6 +157,9 @@ typedef RASNOUSERA RASNOUSER, *LPRASNOUSER; #define RasDialDlg RasDialDlgA #define RasEntryDlg RasEntryDlgA +#if (WINVER <= 0x500) +#define RasMonitorDlg RasMonitorDlgA +#endif /*(WINVER <= 0x500)*/ #define RasPhonebookDlg RasPhonebookDlgA #endif /* UNICODE */ Modified: trunk/reactos/include/psdk/raserror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/raserror.h?re… ============================================================================== --- trunk/reactos/include/psdk/raserror.h (original) +++ trunk/reactos/include/psdk/raserror.h Thu Nov 15 20:17:57 2007 @@ -206,5 +206,12 @@ #define ERROR_UNKNOWN_SERVICE_TYPE (RASBASE+196) #define ERROR_CONNECTING_DEVICE_NOT_FOUND (RASBASE+197) #define ERROR_NO_EAPTLS_CERTIFICATE (RASBASE+198) -#define RASBASEEND (RASBASE+198) +#define ERROR_SHARING_HOST_ADDRESS_CONFLICT (RASBASE+199) +#define ERROR_AUTOMATIC_VPN_FAILED (RASBASE+200) +#define ERROR_VALIDATING_SERVER_CERT (RASBASE+201) +#define ERROR_READING_SCARD (RASBASE+202) +#define ERROR_INVALID_PEAP_COOKIE_CONFIG (RASBASE+203) +#define ERROR_INVALID_PEAP_COOKIE_USER (RASBASE+204) +#define ERROR_INVALID_MSCHAPV2_CONFIG (RASBASE+205) +#define RASBASEEND (RASBASE+205) #endif /* _RASERROR_H */

1 0

[mpiulachs] 30463: update maze screensaver path
by mpiulachs＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: mpiulachs Date: Thu Nov 15 20:00:46 2007 New Revision: 30463 URL: http://svn.reactos.org/svn/reactos?rev=30463&view=rev Log: update maze screensaver path Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Nov 15 20:00:46 2007 @@ -461,6 +461,7 @@ 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\applications\screensavers\mazescr\mazescr.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

1 0

[mpiulachs] 30462: Forgot to commit it
by mpiulachs＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: mpiulachs Date: Thu Nov 15 19:59:12 2007 New Revision: 30462 URL: http://svn.reactos.org/svn/reactos?rev=30462&view=rev Log: Forgot to commit it Added: trunk/rosapps/applications/screensavers/mazescr/ trunk/rosapps/applications/screensavers/mazescr/maze.c (with props) trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild (with props) trunk/rosapps/applications/screensavers/mazescr/resource.h (with props) trunk/rosapps/applications/screensavers/mazescr/scrnsave.c (with props) trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (with props) Added: trunk/rosapps/applications/screensavers/mazescr/maze.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.c (added) +++ trunk/rosapps/applications/screensavers/mazescr/maze.c Thu Nov 15 19:59:12 2007 @@ -1,0 +1,867 @@ +/****************************************************************************** + * [ maze ] ... + * + * modified: [ 03-08-15 ] Ge van Geldorp <ge(a)gse.nl> + * ported to Reactos + * modified: [ 94-10-8 ] Ge van Geldorp <Ge.vanGeldorp(a)lr.tudelft.nl> + * ported to MS Windows + * modified: [ 3-7-93 ] Jamie Zawinski <jwz(a)lucid.com> + * added the XRoger logo, cleaned up resources, made + * grid size a parameter. + * modified: [ 3-3-93 ] Jim Randell <jmr(a)mddjmr.fc.hp.com> + * Added the colour stuff and integrated it with jwz's + * screenhack stuff. There's still some work that could + * be done on this, particularly allowing a resource to + * specify how big the squares are. + * modified: [ 10-4-88 ] Richard Hess ...!uunet!cimshop!rhess + * [ Revised primary execution loop within main()... + * [ Extended X event handler, check_events()... + * modified: [ 1-29-88 ] Dave Lemke lemke(a)sun.com + * [ Hacked for X11... + * [ Note the word "hacked" -- this is extremely ugly, but at + * [ least it does the job. NOT a good programming example + * [ for X. + * original: [ 6/21/85 ] Martin Weiss Sun Microsystems [ SunView ] + * + ****************************************************************************** + Copyright 1988 by Sun Microsystems, Inc. Mountain View, CA. + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the names of Sun or MIT not be + used in advertising or publicity pertaining to distribution of the + software without specific prior written permission. Sun and M.I.T. + make no representations about the suitability of this software for + any purpose. It is provided "as is" without any express or implied warranty. + + SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. IN NO EVENT SHALL SUN BE LIABLE FOR ANY SPECIAL, INDIRECT + OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE + OR PERFORMANCE OF THIS SOFTWARE. + *****************************************************************************/ + +#define STRICT + +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <windows.h> /* required for all Windows applications */ + +#if !defined (APIENTRY) /* Windows NT defines APIENTRY, but 3.x doesn't */ +#define APIENTRY far pascal +#endif + +#if !defined(WIN32) /* Windows 3.x uses a FARPROC for dialogs */ +#define DLGPROC FARPROC +#endif + +static BOOL InitInstance(HINSTANCE hInstance, HWND hParent); +LRESULT CALLBACK MazeWndProc(HWND hWnd, UINT message, WPARAM uParam, + LPARAM lParam); + +HINSTANCE hInst; /* current instance */ +HWND hWnd; /* Main window handle.*/ +HBRUSH hBrushDead; +HBRUSH hBrushLiving; +HPEN hPenWall; +HDC hDC; +static BOOL waiting; + + +WCHAR szAppName[] = L"Maze"; /* The name of this application */ +WCHAR szTitle[] = L"Maze"; /* The title bar text */ + +static int solve_delay, pre_solve_delay, post_solve_delay; + +#define MAX_MAZE_SIZE_X ((unsigned long) 250) +#define MAX_MAZE_SIZE_Y ((unsigned long) 250) + +#define MOVE_LIST_SIZE (MAX_MAZE_SIZE_X * MAX_MAZE_SIZE_Y) + +#define WALL_TOP 0x8000 +#define WALL_RIGHT 0x4000 +#define WALL_BOTTOM 0x2000 +#define WALL_LEFT 0x1000 + +#define DOOR_IN_TOP 0x800 +#define DOOR_IN_RIGHT 0x400 +#define DOOR_IN_BOTTOM 0x200 +#define DOOR_IN_LEFT 0x100 +#define DOOR_IN_ANY 0xF00 + +#define DOOR_OUT_TOP 0x80 +#define DOOR_OUT_RIGHT 0x40 +#define DOOR_OUT_BOTTOM 0x20 +#define DOOR_OUT_LEFT 0x10 + +#define START_SQUARE 0x2 +#define END_SQUARE 0x1 + +#define border_x (0) +#define border_y (0) + +#define get_random(x) (rand() % (x)) + +static unsigned short maze[MAX_MAZE_SIZE_X][MAX_MAZE_SIZE_Y]; + +static struct { + unsigned char x; + unsigned char y; + unsigned char dir; + unsigned char dummy; +} move_list[MOVE_LIST_SIZE], save_path[MOVE_LIST_SIZE], path[MOVE_LIST_SIZE]; + +static int maze_size_x, maze_size_y; +static long sqnum, path_length; +static int cur_sq_x, cur_sq_y; +static int start_x, start_y, start_dir, end_x, end_y, end_dir; +static int grid_width, grid_height; + +static int state = 1, pathi = 0; + +static void +set_maze_sizes (width, height) + int width, height; +{ + maze_size_x = width / grid_width; + maze_size_y = height / grid_height; +} + + +static void +initialize_maze() /* draw the surrounding wall and start/end squares */ +{ + register int i, j, wall; + + /* initialize all squares */ + for ( i=0; i<maze_size_x; i++) { + for ( j=0; j<maze_size_y; j++) { + maze[i][j] = 0; + } + } + + /* top wall */ + for ( i=0; i<maze_size_x; i++ ) { + maze[i][0] |= WALL_TOP; + } + + /* right wall */ + for ( j=0; j<maze_size_y; j++ ) { + maze[maze_size_x-1][j] |= WALL_RIGHT; + } + + /* bottom wall */ + for ( i=0; i<maze_size_x; i++ ) { + maze[i][maze_size_y-1] |= WALL_BOTTOM; + } + + /* left wall */ + for ( j=0; j<maze_size_y; j++ ) { + maze[0][j] |= WALL_LEFT; + } + + /* set start square */ + wall = get_random(4); + switch (wall) { + case 0: + i = get_random(maze_size_x); + j = 0; + break; + case 1: + i = maze_size_x - 1; + j = get_random(maze_size_y); + break; + case 2: + i = get_random(maze_size_x); + j = maze_size_y - 1; + break; + case 3: + i = 0; + j = get_random(maze_size_y); + break; + } + maze[i][j] |= START_SQUARE; + maze[i][j] |= ( DOOR_IN_TOP >> wall ); + maze[i][j] &= ~( WALL_TOP >> wall ); + cur_sq_x = i; + cur_sq_y = j; + start_x = i; + start_y = j; + start_dir = wall; + sqnum = 0; + + /* set end square */ + wall = (wall + 2)%4; + switch (wall) { + case 0: + i = get_random(maze_size_x); + j = 0; + break; + case 1: + i = maze_size_x - 1; + j = get_random(maze_size_y); + break; + case 2: + i = get_random(maze_size_x); + j = maze_size_y - 1; + break; + case 3: + i = 0; + j = get_random(maze_size_y); + break; + } + maze[i][j] |= END_SQUARE; + maze[i][j] |= ( DOOR_OUT_TOP >> wall ); + maze[i][j] &= ~( WALL_TOP >> wall ); + end_x = i; + end_y = j; + end_dir = wall; +} + +static int choose_door (); +static long backup (); +static void draw_wall (); +static void draw_solid_square(int, int, int, HDC, HBRUSH); +static void enter_square(int, HDC, HBRUSH); + +static void +create_maze() /* create a maze layout given the intiialized maze */ +{ + register int i, newdoor = 0; + HDC hDC; + + hDC = GetDC(hWnd); + do { + move_list[sqnum].x = cur_sq_x; + move_list[sqnum].y = cur_sq_y; + move_list[sqnum].dir = newdoor; + while ( ( newdoor = choose_door(hDC) ) == -1 ) { /* pick a door */ + if ( backup() == -1 ) { /* no more doors ... backup */ + ReleaseDC(hWnd, hDC); + return; /* done ... return */ + } + } + + /* mark the out door */ + maze[cur_sq_x][cur_sq_y] |= ( DOOR_OUT_TOP >> newdoor ); + + switch (newdoor) { + case 0: cur_sq_y--; + break; + case 1: cur_sq_x++; + break; + case 2: cur_sq_y++; + break; + case 3: cur_sq_x--; + break; + } + sqnum++; + + /* mark the in door */ + maze[cur_sq_x][cur_sq_y] |= ( DOOR_IN_TOP >> ((newdoor+2)%4) ); + + /* if end square set path length and save path */ + if ( maze[cur_sq_x][cur_sq_y] & END_SQUARE ) { + path_length = sqnum; + for ( i=0; i<path_length; i++) { + save_path[i].x = move_list[i].x; + save_path[i].y = move_list[i].y; + save_path[i].dir = move_list[i].dir; + } + } + + } while (1); + +} + + +static int +choose_door(HDC hDC) /* pick a new path */ +{ + int candidates[3]; + register int num_candidates; + + num_candidates = 0; + + /* top wall */ + if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_TOP ) + goto rightwall; + if ( maze[cur_sq_x][cur_sq_y] & DOOR_OUT_TOP ) + goto rightwall; + if ( maze[cur_sq_x][cur_sq_y] & WALL_TOP ) + goto rightwall; + if ( maze[cur_sq_x][cur_sq_y - 1] & DOOR_IN_ANY ) { + maze[cur_sq_x][cur_sq_y] |= WALL_TOP; + maze[cur_sq_x][cur_sq_y - 1] |= WALL_BOTTOM; + draw_wall(cur_sq_x, cur_sq_y, 0, hDC); + goto rightwall; + } + candidates[num_candidates++] = 0; + + rightwall: + /* right wall */ + if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_RIGHT ) + goto bottomwall; + if ( maze[cur_sq_x][cur_sq_y] & DOOR_OUT_RIGHT ) + goto bottomwall; + if ( maze[cur_sq_x][cur_sq_y] & WALL_RIGHT ) + goto bottomwall; + if ( maze[cur_sq_x + 1][cur_sq_y] & DOOR_IN_ANY ) { + maze[cur_sq_x][cur_sq_y] |= WALL_RIGHT; + maze[cur_sq_x + 1][cur_sq_y] |= WALL_LEFT; + draw_wall(cur_sq_x, cur_sq_y, 1, hDC); + goto bottomwall; + } + candidates[num_candidates++] = 1; + + bottomwall: + /* bottom wall */ + if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_BOTTOM ) + goto leftwall; + if ( maze[cur_sq_x][cur_sq_y] & DOOR_OUT_BOTTOM ) + goto leftwall; + if ( maze[cur_sq_x][cur_sq_y] & WALL_BOTTOM ) + goto leftwall; + if ( maze[cur_sq_x][cur_sq_y + 1] & DOOR_IN_ANY ) { + maze[cur_sq_x][cur_sq_y] |= WALL_BOTTOM; + maze[cur_sq_x][cur_sq_y + 1] |= WALL_TOP; + draw_wall(cur_sq_x, cur_sq_y, 2, hDC); + goto leftwall; + } + candidates[num_candidates++] = 2; + + leftwall: + /* left wall */ + if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_LEFT ) + goto donewall; + if ( maze[cur_sq_x][cur_sq_y] & DOOR_OUT_LEFT ) + goto donewall; + if ( maze[cur_sq_x][cur_sq_y] & WALL_LEFT ) + goto donewall; + if ( maze[cur_sq_x - 1][cur_sq_y] & DOOR_IN_ANY ) { + maze[cur_sq_x][cur_sq_y] |= WALL_LEFT; + maze[cur_sq_x - 1][cur_sq_y] |= WALL_RIGHT; + draw_wall(cur_sq_x, cur_sq_y, 3, hDC); + goto donewall; + } + candidates[num_candidates++] = 3; + + donewall: + if (num_candidates == 0) + return ( -1 ); + if (num_candidates == 1) + return ( candidates[0] ); + return ( candidates[ get_random(num_candidates) ] ); + +} + + +static long +backup() /* back up a move */ +{ + sqnum--; + if (0 <= sqnum) { + cur_sq_x = move_list[sqnum].x; + cur_sq_y = move_list[sqnum].y; + } + return ( sqnum ); +} + +int bw; + +static void +draw_solid_square(i, j, dir, hDC, hBrush) /* draw a solid square in a square */ + register int i, j, dir; + HDC hDC; + HBRUSH hBrush; +{ + RECT rc; + + switch (dir) { + case 0: + rc.left = border_x + bw + grid_width * i; + rc.right = rc.left + grid_width - (bw + bw); + rc.top = border_y - bw + grid_height * j; + rc.bottom = rc.top + grid_height; + break; + case 1: + rc.left = border_x + bw + grid_width * i; + rc.right = rc.left + grid_width; + rc.top = border_y + bw + grid_height * j; + rc.bottom = rc.top + grid_height - (bw + bw); + break; + case 2: + rc.left = border_x + bw + grid_width * i; + rc.right = rc.left + grid_width - (bw + bw); + rc.top = border_y + bw + grid_height * j; + rc.bottom = rc.top + grid_height; + break; + case 3: + rc.left = border_x - bw + grid_width * i; + rc.right = rc.left + grid_width; + rc.top = border_y + bw + grid_height * j; + rc.bottom = rc.top + grid_height - (bw + bw); + break; + } + (void) FillRect(hDC, &rc, hBrush); +} + +static void +draw_maze_border(HWND hWnd, HDC hDC) /* draw the maze outline */ +{ + register int i, j; + HBRUSH hBrush; + + SelectObject(hDC, hPenWall); + + for ( i=0; i<maze_size_x; i++) { + if ( maze[i][0] & WALL_TOP ) { + MoveToEx(hDC, border_x + grid_width * i, border_y, NULL); + (void) LineTo(hDC, border_x + grid_width * (i + 1) - 1, border_y); + } + if ((maze[i][maze_size_y - 1] & WALL_BOTTOM)) { + MoveToEx(hDC, border_x + grid_width * i, + border_y + grid_height * (maze_size_y) - 1, NULL); + (void) LineTo(hDC, border_x + grid_width * (i+1) - 1, + border_y + grid_height * (maze_size_y) - 1); + } + } + for ( j=0; j<maze_size_y; j++) { + if ( maze[maze_size_x - 1][j] & WALL_RIGHT ) { + MoveToEx(hDC, border_x + grid_width * maze_size_x - 1, + border_y + grid_height * j, NULL); + (void) LineTo(hDC, border_x + grid_width * maze_size_x - 1, + border_y + grid_height * (j+1) - 1); + } + if ( maze[0][j] & WALL_LEFT ) { + MoveToEx(hDC, border_x, border_y + grid_height * j, NULL); + (void) LineTo(hDC, border_x, border_y + grid_height * (j+1) - 1); + } + } + + hBrush = GetStockObject(WHITE_BRUSH); // FIXME: do not hardcode + draw_solid_square (start_x, start_y, start_dir, hDC, hBrush); + draw_solid_square (end_x, end_y, end_dir, hDC, hBrush); +} + + +static void +draw_wall(i, j, dir, hDC) /* draw a single wall */ + int i, j, dir; + HDC hDC; +{ + SelectObject(hDC, hPenWall); + + switch (dir) { + case 0: + MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * j, NULL); + (void) LineTo(hDC, border_x + grid_width * (i+1), + border_y + grid_height * j); + break; + case 1: + MoveToEx(hDC, border_x + grid_width * (i+1), border_y + grid_height * j, + NULL); + (void) LineTo(hDC, border_x + grid_width * (i+1), + border_y + grid_height * (j+1)); + break; + case 2: + MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * (j+1), + NULL); + (void) LineTo(hDC, border_x + grid_width * (i+1), + border_y + grid_height * (j+1)); + break; + case 3: + MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * j, + NULL); + (void) LineTo(hDC, border_x + grid_width * i, + border_y + grid_height * (j+1)); + break; + } +} + +static void +begin_solve_maze() /* solve it with graphical feedback */ +{ + static long grayPattern[] = { + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa + }; + static RGBQUAD argbq[] = { + { 0, 0, 255, 0 }, + { 255, 255, 255, 0 } + }; + BITMAPINFO *pbmi; + + hDC = GetDC(hWnd); + pbmi = malloc(sizeof(BITMAPINFOHEADER) + sizeof(argbq) + sizeof(grayPattern)); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 8; + pbmi->bmiHeader.biHeight = 8; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 1; + pbmi->bmiHeader.biCompression = BI_RGB; + (void) memcpy(pbmi->bmiColors, argbq, sizeof(argbq)); + (void) memcpy(pbmi->bmiColors + 2, grayPattern, sizeof(grayPattern)); +#if 0 + /* FIXME Pattern brushes not yet implemented in ReactOS */ + hBrushDead = CreateDIBPatternBrushPt(pbmi, DIB_RGB_COLORS); +#else + hBrushDead = CreateSolidBrush(RGB(255, 0, 0)); +#endif +// hBrushDead = CreateHatchBrush(HS_DIAGCROSS, RGB(255, 0, 0)); + free(pbmi); + hBrushLiving = CreateSolidBrush(RGB(0, 255, 0)); + + /* plug up the surrounding wall */ + maze[start_x][start_y] |= (WALL_TOP >> start_dir); + maze[end_x][end_y] |= (WALL_TOP >> end_dir); + + /* initialize search path */ + pathi = 0; + path[pathi].x = end_x; + path[pathi].y = end_y; + path[pathi].dir = -1; +} + +static int +solve_maze() /* solve it with graphical feedback */ +{ + int ret; + int action_done; + + do { + action_done = 1; + if ( ++path[pathi].dir >= 4 ) { + pathi--; + draw_solid_square( (int)(path[pathi].x), (int)(path[pathi].y), + (int)(path[pathi].dir), hDC, hBrushDead); + ret = 0; + } + else if ( ! (maze[path[pathi].x][path[pathi].y] & + (WALL_TOP >> path[pathi].dir)) && + ( (pathi == 0) || ( (path[pathi].dir != + (int)(path[pathi-1].dir+2)%4) ) ) ) { + enter_square(pathi, hDC, hBrushLiving); + pathi++; + if ( maze[path[pathi].x][path[pathi].y] & START_SQUARE ) { + DeleteObject(hBrushLiving); + DeleteObject(hBrushDead); + ReleaseDC(hWnd, hDC); + ret = 1; + } else { + ret = 0; + } + } else { + action_done = 0; + } + } while (! action_done); + + return ret; +} + + +static void +enter_square(int n, HDC hDC, HBRUSH hBrush) /* move into a neighboring square */ +{ + draw_solid_square( (int)path[n].x, (int)path[n].y, + (int)path[n].dir, hDC, hBrush); + + path[n+1].dir = -1; + switch (path[n].dir) { + case 0: path[n+1].x = path[n].x; + path[n+1].y = path[n].y - 1; + break; + case 1: path[n+1].x = path[n].x + 1; + path[n+1].y = path[n].y; + break; + case 2: path[n+1].x = path[n].x; + path[n+1].y = path[n].y + 1; + break; + case 3: path[n+1].x = path[n].x - 1; + path[n+1].y = path[n].y; + break; + } +} + +static void +start_timer(HWND hWnd, int iTimeout) +{ + waiting = TRUE; + SetTimer(hWnd, 1, iTimeout, NULL); +} + +/**************************************************************************** + + FUNCTION: WinMain(HINSTANCE, HINSTANCE, LPSTR, int) + + PURPOSE: calls initialization function, processes message loop + + COMMENTS: + + Windows recognizes this function by name as the initial entry point + for the program. This function calls the application initialization + routine, if no other instance of the program is running, and always + calls the instance initialization routine. It then executes a message + retrieval and dispatch loop that is the top-level control structure + for the remainder of execution. The loop is terminated when a WM_QUIT + message is received, at which time this function exits the application + instance by returning the value passed by PostQuitMessage(). + + If this function must abort before entering the message loop, it + returns the conventional value NULL. + +****************************************************************************/ + +int APIENTRY MazeMain( + HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + HWND hParent) +{ + MSG msg; + HDC hDC; + + /* Perform initializations that apply to a specific instance */ + + if (!InitInstance(hInstance, hParent)) { + return (FALSE); + } + + waiting = FALSE; + state = 1; + + /* Acquire and dispatch messages until a WM_QUIT message is received. */ + + while (0 != state) { + if (waiting) { + (void) WaitMessage(); + } + while (0 != state && PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + if (WM_QUIT == msg.message) { + state = 0; + } else { + DispatchMessage(&msg); /* Dispatches message to window */ + } + } + switch (state) { + case 1: + initialize_maze(); + state = 2; + break; + case 2: + hDC = GetDC(hWnd); + SendMessage(hWnd, WM_ERASEBKGND, (WPARAM) hDC, (LPARAM) 0); + draw_maze_border(hWnd, hDC); + ReleaseDC(hWnd, hDC); + state = 3; + break; + case 3: + create_maze(); + state = 4; + break; + case 4: + start_timer(hWnd, pre_solve_delay); + state = 5; + break; + case 5: + if (! waiting) { + state = 6; + } + break; + case 6: + begin_solve_maze(); + if (0 != solve_delay) { + start_timer(hWnd, solve_delay); + state = 7; + } else { + state = 8; + } + break; + case 7: + if (! waiting) { + state = 8; + } + break; + case 8: + if (! solve_maze()) { + if (0 != solve_delay) { + start_timer(hWnd, solve_delay); + state = 7; + } + } else { + state = 9; + } + break; + case 9: + start_timer(hWnd, post_solve_delay); + state = 10; + break; + case 10: + if (! waiting) { + state = 11; + } + break; + case 11: + state = 1; + break; + } + } + + return (msg.wParam); /* Returns the value from PostQuitMessage */ +} + + +/**************************************************************************** + + FUNCTION: InitInstance(HINSTANCE, int) + + PURPOSE: Saves instance handle and creates main window + + COMMENTS: + + This function is called at initialization time for every instance of + this application. This function performs initialization tasks that + cannot be shared by multiple instances. + + In this case, we save the instance handle in a static variable and + create and display the main program window. + +****************************************************************************/ + +static BOOL InitInstance( + HINSTANCE hInstance, + HWND hParent) +{ + RECT rect; + + /* Save the instance handle in static variable, which will be used in + many subsequence calls from this application to Windows. */ + + hInst = hInstance; /* Store instance handle in our global variable */ + + GetClientRect(hParent, &rect); +#if 0 + /* Create a main window for this application instance. */ + hWnd = CreateWindow( + szAppName, /* See RegisterClass() call. */ + szTitle, /* Text for window title bar. */ + WS_CHILD,/* Window style. */ + 0, 0, rect.right/2, rect.bottom/2, /* Use default positioning */ + hParent, /* We use a Parent. */ + NULL, /* Use the window class menu. */ + hInstance, /* This instance owns this window. */ + NULL /* We don't use any data in our WM_CREATE */ + ); +#endif +hWnd = hParent; + // If window could not be created, return "failure" + if (!hWnd) { + return (FALSE); + } + + // Make the window visible; update its client area; and return "success" + ShowWindow(hWnd, SW_SHOW); // Show the window + UpdateWindow(hWnd); // Sends WM_PAINT message + + hPenWall = CreatePen(PS_SOLID, 3, RGB(150,150,150)); + + return (TRUE); // We succeeded... + +} + +static BOOL +OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct) +{ + RECT rc; + int size; + + srand((unsigned) time(NULL)); + +#if 0 + /* FIXME GetPrivateProfileInt not yet implemented in ReactOS */ + size = GetPrivateProfileInt("maze", "gridsize", 0, "maze.ini"); + pre_solve_delay = GetPrivateProfileInt("maze", "predelay", 5000, + "maze.ini"); + post_solve_delay = GetPrivateProfileInt("maze", "postdelay", 5000, + "maze.ini"); + solve_delay = GetPrivateProfileInt("maze", "solvedelay", 10, + "maze.ini"); +#else + size = 10; + pre_solve_delay = 5000; + post_solve_delay = 5000; + solve_delay = 1; +#endif + + if (size < 2) { + size = 7 + (rand() % 30); + } + grid_width = grid_height = size; + bw = (size > 6 ? 3 : (size-1)/2); + + GetClientRect(hWnd, &rc); + set_maze_sizes(rc.right - rc.left, rc.bottom - rc.top); + + return TRUE; +} + +void OnTimer(HWND hwnd, UINT id) +{ + waiting = FALSE; +} + +/**************************************************************************** + + FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) + + PURPOSE: Processes messages + + MESSAGES: + + WM_DESTROY - destroy window + + COMMENTS: + +****************************************************************************/ + +LRESULT CALLBACK MazeWndProc( + HWND hWnd, // window handle + UINT message, // type of message + WPARAM wParam, // additional information + LPARAM lParam) // additional information +{ + PAINTSTRUCT ps; + + switch (message) { + case WM_CREATE: + OnCreate(hWnd, (LPCREATESTRUCT) lParam); + break; + case WM_PAINT: + BeginPaint(hWnd, &ps); + state = 1; + EndPaint(hWnd, &ps); + case WM_TIMER: + OnTimer(hWnd, wParam); + break; + case WM_DESTROY: // message: window being destroyed + PostQuitMessage(0); + break; + + default: // Passes it on if unproccessed + return (DefWindowProc(hWnd, message, wParam, lParam)); + } + return (0); +} Propchange: trunk/rosapps/applications/screensavers/mazescr/maze.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild (added) +++ trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild Thu Nov 15 19:59:12 2007 @@ -1,0 +1,15 @@ +<module name="mazescr" type="win32scr" installbase="system32" installname="maze.scr"> + <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> + + <file>scrnsave.c</file> + <file>maze.c</file> + <file>scrnsave.rc</file> +</module> Propchange: trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/mazescr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/resource.h (added) +++ trunk/rosapps/applications/screensavers/mazescr/resource.h Thu Nov 15 19:59:12 2007 @@ -1,0 +1,4 @@ + +#define IDS_DESCRIPTION 1 +#define IDS_TITLE 2 +#define IDS_TEXT 3 Propchange: trunk/rosapps/applications/screensavers/mazescr/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/mazescr/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.c (added) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.c Thu Nov 15 19:59:12 2007 @@ -1,0 +1,199 @@ +/* + * 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> + +#define APPNAME _T("Scrnsave") + +LRESULT CALLBACK MazeWndProc( + HWND hWnd, // window handle + UINT message, // type of message + WPARAM wParam, // additional information + LPARAM lParam); // additional information + +int APIENTRY MazeMain( + HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + HWND hParent); + +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: + 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 MazeWndProc(hwnd, msg, wParam, lParam); +} + +HWND InitSaver(HWND hwndParent) +{ + WNDCLASS wc; + HWND hwnd; + 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); + hwnd = CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_CHILD, + 0, 0, + rect.right, + rect.bottom, + hwndParent, 0, + hInstance, NULL); + fullscreen = FALSE; + } + else + { + hwnd = CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ShowCursor(FALSE); + fullscreen = TRUE; + } + return hwnd; +} + +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; +} + +int WINAPI WinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPSTR lpCmdLine, + int iCmdShow) +{ + HWND hwndParent; + HWND hwndChild; + UINT nPreviousState; + int chOption; + + hInstance = hInst; + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + + switch (chOption) + { + case 's': + hwndChild = InitSaver(0); + break; + + case 'p': + hwndChild = InitSaver(hwndParent); + break; + + case 'c': + default: + MessageBox(0, + _T("No options need to be set."), + _T("About"), + MB_OK | MB_ICONWARNING); + return 0; + } + + MazeMain(hInst, hPrev, lpCmdLine, hwndChild); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + + return 0; +} Propchange: trunk/rosapps/applications/screensavers/mazescr/scrnsave.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Thu Nov 15 19:59:12 2007 @@ -1,0 +1,19 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Maze ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "maze\0" +#define REACTOS_STR_ORIGINAL_FILENAME "maze.scr\0" + +#include <reactos/version.rc> + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Maze ScreenSaver" +END Propchange: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 30461: Fix maze screensaver and move it to a more adecuate location
by mpiulachs＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: mpiulachs Date: Thu Nov 15 19:56:54 2007 New Revision: 30461 URL: http://svn.reactos.org/svn/reactos?rev=30461&view=rev Log: Fix maze screensaver and move it to a more adecuate location Removed: trunk/rosapps/demos/mazescr/ Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild trunk/rosapps/demos/directory.rbuild Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/screensavers.rbuild (original) +++ trunk/rosapps/applications/screensavers/screensavers.rbuild Thu Nov 15 19:56:54 2007 @@ -13,4 +13,7 @@ <directory name="starfield"> <xi:include href="starfield/starfield.rbuild" /> </directory> + <directory name="mazescr"> + <xi:include href="mazescr/mazescr.rbuild" /> + </directory> </group> Modified: trunk/rosapps/demos/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/directory.rbuild?rev… ============================================================================== --- trunk/rosapps/demos/directory.rbuild (original) +++ trunk/rosapps/demos/directory.rbuild Thu Nov 15 19:56:54 2007 @@ -4,10 +4,6 @@ <xi:include href="maze/maze.rbuild" /> </directory> - <directory name="mazescr"> - <xi:include href="mazescr/mazescr.rbuild" /> - </directory> - <directory name="ddraw"> <xi:include href="ddraw/ddraw.rbuild" /> </directory>

1 0

[cwittich] 30460: sync CryptAcquireContext to wine (this fixes some Unicode issues)
by cwittich＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: cwittich Date: Thu Nov 15 17:08:18 2007 New Revision: 30460 URL: http://svn.reactos.org/svn/reactos?rev=30460&view=rev Log: sync CryptAcquireContext to wine (this fixes some Unicode issues) Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/crypt/crypt.h Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c Thu Nov 15 17:08:18 2007 @@ -55,45 +55,56 @@ #define CRYPT_Alloc(size) ((LPVOID)LocalAlloc(LMEM_ZEROINIT, size)) #define CRYPT_Free(buffer) (LocalFree((HLOCAL)buffer)) -static inline PSTR CRYPT_GetProvKeyName(PCSTR pProvName) -{ - PCSTR KEYSTR = "Software\\Microsoft\\Cryptography\\Defaults\\Provider\\"; - PSTR keyname; - - keyname = CRYPT_Alloc(strlen(KEYSTR) + strlen(pProvName) +1); +static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName) +{ + static const WCHAR KEYSTR[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'C','r','y','p','t','o','g','r','a','p','h','y','\\', + 'D','e','f','a','u','l','t','s','\\', + 'P','r','o','v','i','d','e','r','\\',0 + }; + PWSTR keyname; + + keyname = CRYPT_Alloc((wcslen(KEYSTR) + wcslen(pProvName) +1)*sizeof(WCHAR)); if (keyname) { - strcpy(keyname, KEYSTR); - strcpy(keyname + strlen(KEYSTR), pProvName); - } - else - { + wcscpy(keyname, KEYSTR); + wcscpy(keyname + wcslen(KEYSTR), pProvName); + } else SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } - return keyname; } -static inline PSTR CRYPT_GetTypeKeyName(DWORD dwType, BOOL user) -{ - PCSTR MACHINESTR = "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types\\Type XXX"; - PCSTR USERSTR = "Software\\Microsoft\\Cryptography\\Provider Type XXX"; - PSTR keyname; - PSTR ptr; - - keyname = CRYPT_Alloc( (user ? strlen(USERSTR) : strlen(MACHINESTR)) +1); +static inline PWSTR CRYPT_GetTypeKeyName(DWORD dwType, BOOL user) +{ + static const WCHAR MACHINESTR[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'C','r','y','p','t','o','g','r','a','p','h','y','\\', + 'D','e','f','a','u','l','t','s','\\', + 'P','r','o','v','i','d','e','r',' ','T','y','p','e','s','\\', + 'T','y','p','e',' ','X','X','X',0 + }; + static const WCHAR USERSTR[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'C','r','y','p','t','o','g','r','a','p','h','y','\\', + 'P','r','o','v','i','d','e','r',' ','T','y','p','e',' ','X','X','X',0 + }; + PWSTR keyname; + PWSTR ptr; + + keyname = CRYPT_Alloc( ((user ? wcslen(USERSTR) : wcslen(MACHINESTR)) +1)*sizeof(WCHAR)); if (keyname) { - user ? strcpy(keyname, USERSTR) : strcpy(keyname, MACHINESTR); - ptr = keyname + strlen(keyname); + user ? wcscpy(keyname, USERSTR) : wcscpy(keyname, MACHINESTR); + ptr = keyname + wcslen(keyname); *(--ptr) = (dwType % 10) + '0'; *(--ptr) = ((dwType / 10) % 10) + '0'; *(--ptr) = (dwType / 100) + '0'; - } - else - { + } else SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } return keyname; } @@ -178,26 +189,23 @@ #define CRYPT_GetProvFunc(name) \ if ( !(provider->pFuncs->p##name = (void*)GetProcAddress(provider->hModule, #name)) ) goto error - #define CRYPT_GetProvFuncOpt(name) \ provider->pFuncs->p##name = (void*)GetProcAddress(provider->hModule, #name) -PCRYPTPROV CRYPT_LoadProvider(PSTR pImage) +static PCRYPTPROV CRYPT_LoadProvider(PCWSTR pImage) { PCRYPTPROV provider; DWORD errorcode = ERROR_NOT_ENOUGH_MEMORY; - if (!(provider = CRYPT_Alloc(sizeof(CRYPTPROV)))) + if ( !(provider = CRYPT_Alloc(sizeof(CRYPTPROV))) ) goto error; + if ( !(provider->pFuncs = CRYPT_Alloc(sizeof(PROVFUNCS))) ) goto error; + if ( !(provider->pVTable = CRYPT_Alloc(sizeof(VTableProvStruc))) ) goto error; + if ( !(provider->hModule = LoadLibraryW(pImage)) ) + { + errorcode = (GetLastError() == ERROR_FILE_NOT_FOUND) ? NTE_PROV_DLL_NOT_FOUND : NTE_PROVIDER_DLL_FAIL; + DPRINT("Failed to load dll %S\n", pImage); goto error; - if (!(provider->pFuncs = CRYPT_Alloc(sizeof(PROVFUNCS)))) - goto error; - if (!(provider->pVTable = CRYPT_Alloc(sizeof(VTableProvStruc)))) - goto error; - if (!(provider->hModule = LoadLibraryA(pImage))) - { - errorcode = (GetLastError() == ERROR_FILE_NOT_FOUND) ? NTE_PROV_DLL_NOT_FOUND : NTE_PROVIDER_DLL_FAIL; - DPRINT1("Failed to load dll %s\n", pImage); - goto error; - } + } + provider->dwMagic = MAGIC_CRYPTPROV; provider->refcount = 1; errorcode = NTE_PROVIDER_DLL_FAIL; @@ -243,6 +251,7 @@ SetLastError(errorcode); if (provider) { + provider->dwMagic = 0; if (provider->hModule) FreeLibrary(provider->hModule); CRYPT_Free(provider->pVTable); @@ -256,30 +265,35 @@ /****************************************************************************** - * CryptAcquireContextA (ADVAPI32.@) + * CryptAcquireContextW (ADVAPI32.@) + * * Acquire a crypto provider context handle. * * PARAMS - * phProv: Pointer to HCRYPTPROV for the output. - * pszContainer: Key Container Name - * pszProvider: Cryptographic Service Provider Name - * dwProvType: Crypto provider type to get a handle. - * dwFlags: flags for the operation - * - * RETURNS TRUE on success, FALSE on failure. - */ -BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, - LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags) + * phProv [O] Pointer to HCRYPTPROV for the output. + * pszContainer [I] Key Container Name + * pszProvider [I] Cryptographic Service Provider Name + * dwProvType [I] Crypto provider type to get a handle. + * dwFlags [I] flags for the operation + * + * RETURNS + * TRUE on success, FALSE on failure. + */ +BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, + LPCWSTR pszProvider, DWORD dwProvType, DWORD dwFlags) { PCRYPTPROV pProv = NULL; HKEY key; - PSTR imagepath = NULL, keyname = NULL, provname = NULL, temp = NULL; - BYTE* signature; + PWSTR imagepath = NULL, keyname = NULL, provname = NULL, temp = NULL; + PSTR provnameA = NULL, pszContainerA = NULL; DWORD keytype, type, len; ULONG r; - - DPRINT("(%p, %s, %s, %ld, %08lx)\n", phProv, pszContainer, - pszProvider, dwProvType, dwFlags); + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR typeW[] = {'T','y','p','e',0}; + static const WCHAR imagepathW[] = {'I','m','a','g','e',' ','P','a','t','h',0}; + + DPRINT("(%p, %S, %S, %d, %08x)\n", phProv, pszContainer, + pszProvider, dwProvType, dwFlags); if (dwProvType < 1 || dwProvType > MAXPROVTYPES) { @@ -298,26 +312,21 @@ /* No CSP name specified so try the user default CSP first * then try the machine default CSP */ - if (!(keyname = CRYPT_GetTypeKeyName(dwProvType, TRUE))) - { - DPRINT("No provider registered for crypto provider type %ld.\n", dwProvType); + if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, TRUE)) ) { + DPRINT("No provider registered for crypto provider type %d.\n", dwProvType); SetLastError(NTE_PROV_TYPE_NOT_DEF); return FALSE; } - - if (RegOpenKeyA(HKEY_CURRENT_USER, keyname, &key)) + if (RegOpenKeyW(HKEY_CURRENT_USER, keyname, &key)) { CRYPT_Free(keyname); - if (!(keyname = CRYPT_GetTypeKeyName(dwProvType, FALSE))) - { - DPRINT("No type registered for crypto provider type %ld.\n", dwProvType); + if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, FALSE)) ) { + DPRINT("No type registered for crypto provider type %d.\n", dwProvType); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_NOT_DEF); goto error; } - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, keyname, &key)) - { + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, keyname, &key)) { DPRINT("Did not find registry entry of crypto provider for %S.\n", keyname); CRYPT_Free(keyname); RegCloseKey(key); @@ -325,44 +334,41 @@ goto error; } } - CRYPT_Free(keyname); - r = RegQueryValueExA(key, "Name", NULL, &keytype, NULL, &len); - if (r != ERROR_SUCCESS || !len || keytype != REG_SZ) + r = RegQueryValueExW(key, nameW, NULL, &keytype, NULL, &len); + if( r != ERROR_SUCCESS || !len || keytype != REG_SZ) { - DPRINT("error %ld reading size of 'Name' from registry\n", r ); + DPRINT("error %d reading size of 'Name' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; } - if (!(provname = CRYPT_Alloc(len))) + if(!(provname = CRYPT_Alloc(len))) { RegCloseKey(key); SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto error; } - r = RegQueryValueExA(key, "Name", NULL, NULL, (LPBYTE)provname, &len); - if (r != ERROR_SUCCESS) + r = RegQueryValueExW(key, nameW, NULL, NULL, (LPBYTE)provname, &len); + if( r != ERROR_SUCCESS ) { - DPRINT("error %ld reading 'Name' from registry\n", r ); + DPRINT("error %d reading 'Name' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; } RegCloseKey(key); - } - else - { - if (!(provname = CRYPT_Alloc(strlen(pszProvider) +1))) + } else { + if ( !(provname = CRYPT_Alloc((wcslen(pszProvider) +1)*sizeof(WCHAR))) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto error; } - strcpy(provname, pszProvider); + wcscpy(provname, pszProvider); } keyname = CRYPT_GetProvKeyName(provname); - r = RegOpenKeyA(HKEY_LOCAL_MACHINE, keyname, &key); + r = RegOpenKeyW(HKEY_LOCAL_MACHINE, keyname, &key); CRYPT_Free(keyname); if (r != ERROR_SUCCESS) { @@ -370,7 +376,7 @@ goto error; } len = sizeof(DWORD); - r = RegQueryValueExA(key, "Type", NULL, NULL, (BYTE*)&type, &len); + r = RegQueryValueExW(key, typeW, NULL, NULL, (BYTE*)&type, &len); if (r != ERROR_SUCCESS) { SetLastError(NTE_PROV_TYPE_ENTRY_BAD); @@ -378,15 +384,15 @@ } if (type != dwProvType) { - DPRINT("Crypto provider has wrong type (%ld vs expected %ld).\n", type, dwProvType); + DPRINT("Crypto provider has wrong type (%d vs expected %d).\n", type, dwProvType); SetLastError(NTE_PROV_TYPE_NO_MATCH); goto error; } - r = RegQueryValueExA(key, "Image Path", NULL, &keytype, NULL, &len); + r = RegQueryValueExW(key, imagepathW, NULL, &keytype, NULL, &len); if ( r != ERROR_SUCCESS || keytype != REG_SZ) { - DPRINT("error %ld reading size of 'Image Path' from registry\n", r ); + DPRINT("error %d reading size of 'Image Path' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -397,90 +403,44 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto error; } - r = RegQueryValueExA(key, "Image Path", NULL, NULL, (LPBYTE)temp, &len); - if (r != ERROR_SUCCESS) - { - DPRINT("error %ld reading 'Image Path' from registry\n", r ); + r = RegQueryValueExW(key, imagepathW, NULL, NULL, (LPBYTE)temp, &len); + if( r != ERROR_SUCCESS ) + { + DPRINT("error %d reading 'Image Path' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; } - - r = RegQueryValueExA(key, "Signature", NULL, &keytype, NULL, &len); - if (r == ERROR_SUCCESS && keytype == REG_BINARY) - { - if (!(signature = CRYPT_Alloc(len))) - { - RegCloseKey(key); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto error; - } - r = RegQueryValueExA(key, "Signature", NULL, NULL, signature, &len); - if (r != ERROR_SUCCESS) - { - DPRINT("error %ld reading 'Signature'\n", r ); - CRYPT_Free(signature); - RegCloseKey(key); - SetLastError(NTE_PROV_TYPE_ENTRY_BAD); - goto error; - } - } - else - { - r = RegQueryValueExA(key, "SigInFile", NULL, &keytype, NULL, &len); - if (r != ERROR_SUCCESS) - { - DPRINT("error %ld reading size of 'SigInFile'\n", r ); - RegCloseKey(key); - SetLastError(NTE_PROV_TYPE_ENTRY_BAD); - goto error; - } - else - { - /* FIXME: The presence of the SigInFile value indicates the - * provider's signature is in its resources, so need to read it. - * But since CRYPT_VerifyImage is stubbed, provide any old thing - * for now. - */ - if (!(signature = CRYPT_Alloc(1))) - { - RegCloseKey(key); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto error; - } - } - } RegCloseKey(key); - len = ExpandEnvironmentStringsA(temp, NULL, 0); - if (!(imagepath = CRYPT_Alloc(len))) - { - CRYPT_Free(signature); + len = ExpandEnvironmentStringsW(temp, NULL, 0); + if ( !(imagepath = CRYPT_Alloc(len*sizeof(WCHAR))) ) + { SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto error; } - if (!ExpandEnvironmentStringsA(temp, imagepath, len)) - { - CRYPT_Free(signature); + if (!ExpandEnvironmentStringsW(temp, imagepath, len)) + { /* ExpandEnvironmentStrings will call SetLastError */ goto error; } - - if (!CRYPT_VerifyImage(imagepath, signature)) - { - CRYPT_Free(signature); - SetLastError(NTE_SIGNATURE_FILE_BAD); - goto error; - } pProv = CRYPT_LoadProvider(imagepath); - CRYPT_Free(signature); - if (!pProv) - { + if (!pProv) { /* CRYPT_LoadProvider calls SetLastError */ goto error; } pProv->pVTable->dwProvType = dwProvType; - pProv->pVTable->pszProvName = provname; - if (pProv->pFuncs->pCPAcquireContext(&pProv->hPrivate, (CHAR*)pszContainer, dwFlags, pProv->pVTable)) + if(!CRYPT_UnicodeToANSI(provname, &provnameA, -1)) + { + /* CRYPT_UnicodeToANSI calls SetLastError */ + goto error; + } + pProv->pVTable->pszProvName = provnameA; + if(!CRYPT_UnicodeToANSI(pszContainer, &pszContainerA, -1)) + { + /* CRYPT_UnicodeToANSI calls SetLastError */ + goto error; + } + if (pProv->pFuncs->pCPAcquireContext(&pProv->hPrivate, pszContainerA, dwFlags, pProv->pVTable)) { /* MSDN: When this flag is set, the value returned in phProv is undefined, * and thus, the CryptReleaseContext function need not be called afterwards. @@ -488,15 +448,17 @@ */ if (dwFlags & CRYPT_DELETEKEYSET) { + pProv->dwMagic = 0; FreeLibrary(pProv->hModule); - CRYPT_Free(provname); + CRYPT_Free(provnameA); + CRYPT_Free(pProv->pVTable); CRYPT_Free(pProv->pFuncs); CRYPT_Free(pProv); - } - else - { + } else { *phProv = (HCRYPTPROV)pProv; } + CRYPT_Free(pszContainerA); + CRYPT_Free(provname); CRYPT_Free(temp); CRYPT_Free(imagepath); return TRUE; @@ -505,51 +467,51 @@ error: if (pProv) { + pProv->dwMagic = 0; if (pProv->hModule) FreeLibrary(pProv->hModule); - if (pProv->pVTable) - CRYPT_Free(pProv->pVTable); - if (pProv->pFuncs) - CRYPT_Free(pProv->pFuncs); + CRYPT_Free(pProv->pVTable); + CRYPT_Free(pProv->pFuncs); CRYPT_Free(pProv); } - if (provname) - CRYPT_Free(provname); - if (temp) - CRYPT_Free(temp); - if (imagepath) - CRYPT_Free(imagepath); + CRYPT_Free(pszContainerA); + CRYPT_Free(provnameA); + CRYPT_Free(provname); + CRYPT_Free(temp); + CRYPT_Free(imagepath); return FALSE; } /****************************************************************************** - * CryptAcquireContextW (ADVAPI32.@) - * - * see CryptAcquireContextA - */ -BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, - LPCWSTR pszProvider, DWORD dwProvType, DWORD dwFlags) -{ - PSTR pProvider = NULL, pContainer = NULL; + * CryptAcquireContextA (ADVAPI32.@) + * + * See CryptAcquireContextW. + */ +BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, + LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags) +{ + PWSTR pProvider = NULL, pContainer = NULL; BOOL ret = FALSE; - DPRINT("(%p, %S, %S, %ld, %08lx)\n", phProv, pszContainer, + DPRINT("(%p, %s, %s, %d, %08x)\n", phProv, pszContainer, pszProvider, dwProvType, dwFlags); - if (!CRYPT_UnicodeToANSI(pszContainer, &pContainer, -1)) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); - if (!CRYPT_UnicodeToANSI(pszProvider, &pProvider, -1)) + if ( !CRYPT_ANSIToUnicode(pszContainer, &pContainer, -1) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if ( !CRYPT_ANSIToUnicode(pszProvider, &pProvider, -1) ) { CRYPT_Free(pContainer); - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); - } - - ret = CryptAcquireContextA(phProv, pContainer, pProvider, dwProvType, dwFlags); - - if (pContainer) - CRYPT_Free(pContainer); - if (pProvider) - CRYPT_Free(pProvider); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + ret = CryptAcquireContextW(phProv, pContainer, pProvider, dwProvType, dwFlags); + + CRYPT_Free(pContainer); + CRYPT_Free(pProvider); return ret; } @@ -1256,7 +1218,7 @@ } /****************************************************************************** - * CryptGetDefaultProviderA (ADVAPI32.@) + * CryptGetDefaultProviderW (ADVAPI32.@) * * Finds the default CSP of a certain provider type. * @@ -1275,29 +1237,43 @@ * If pszProvName is NULL, pcbProvName will hold the size of the buffer for * memory allocation purposes on return. */ -BOOL WINAPI CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved, - DWORD dwFlags, LPSTR pszProvName, DWORD *pcbProvName) +BOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, + DWORD dwFlags, LPWSTR pszProvName, DWORD *pcbProvName) { HKEY hKey; - PSTR keyname; + PWSTR keyname; DWORD result; + static const WCHAR nameW[] = {'N','a','m','e',0}; if (pdwReserved || !pcbProvName) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (dwFlags & ~(CRYPT_USER_DEFAULT | CRYPT_MACHINE_DEFAULT)) - CRYPT_ReturnLastError(NTE_BAD_FLAGS); + { + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (dwProvType > 999) - CRYPT_ReturnLastError(NTE_BAD_PROV_TYPE); - if (!(keyname = CRYPT_GetTypeKeyName(dwProvType, dwFlags & CRYPT_USER_DEFAULT))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); - if (RegOpenKeyA((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE ,keyname, &hKey)) + { + SetLastError(NTE_BAD_PROV_TYPE); + return FALSE; + } + if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, dwFlags & CRYPT_USER_DEFAULT)) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if (RegOpenKeyW((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE ,keyname, &hKey)) { CRYPT_Free(keyname); - CRYPT_ReturnLastError(NTE_PROV_TYPE_NOT_DEF); + SetLastError(NTE_PROV_TYPE_NOT_DEF); + return FALSE; } CRYPT_Free(keyname); - - result = RegQueryValueExA(hKey, "Name", NULL, NULL, (LPBYTE)pszProvName, pcbProvName); + + result = RegQueryValueExW(hKey, nameW, NULL, NULL, (LPBYTE)pszProvName, pcbProvName); if (result) { if (result != ERROR_MORE_DATA) @@ -1313,29 +1289,38 @@ } /****************************************************************************** - * CryptGetDefaultProviderW (ADVAPI32.@) - * - * see CryptGetDefaultProviderA - */ -BOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, - DWORD dwFlags, LPWSTR pszProvName, DWORD *pcbProvName) -{ - PSTR str = NULL; + * CryptGetDefaultProviderA (ADVAPI32.@) + * + * See CryptGetDefaultProviderW. + */ +BOOL WINAPI CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved, + DWORD dwFlags, LPSTR pszProvName, DWORD *pcbProvName) +{ + PWSTR str = NULL; DWORD strlen; BOOL ret = FALSE; - DPRINT("(%ld, %p, %08ld, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); - - strlen = *pcbProvName / sizeof(WCHAR); - if (pszProvName && !(str = CRYPT_Alloc(strlen))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); - ret = CryptGetDefaultProviderA(dwProvType, pdwReserved, dwFlags, str, &strlen); + DPRINT("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); + + CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &strlen); + if ( pszProvName && !(str = CRYPT_Alloc(strlen)) ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + ret = CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, str, &strlen); if (str) - { - CRYPT_ANSIToUnicode(str, &pszProvName, *pcbProvName); + CRYPT_UnicodeToANSI(str, &pszProvName, *pcbProvName); + *pcbProvName = strlen / sizeof(WCHAR); + if (str) + { CRYPT_Free(str); - } - *pcbProvName = strlen * sizeof(WCHAR); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + SetLastError(ERROR_MORE_DATA); + return FALSE; + } + } return ret; } @@ -1726,7 +1711,7 @@ } /****************************************************************************** - * CryptSetProviderExA (ADVAPI32.@) + * CryptSetProviderExW (ADVAPI32.@) * * Specifies the default CSP. * @@ -1740,58 +1725,75 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags) +BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags) { HKEY hProvKey, hTypeKey; - PSTR keyname; - - DPRINT("(%s, %ld, %p, %08ld)\n", pszProvName, dwProvType, pdwReserved, dwFlags); + PWSTR keyname; + static const WCHAR nameW[] = {'N','a','m','e',0}; + + DPRINT("(%S, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags); if (!pszProvName || pdwReserved) - CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (dwProvType > MAXPROVTYPES) - CRYPT_ReturnLastError(NTE_BAD_PROV_TYPE); + { + SetLastError(NTE_BAD_PROV_TYPE); + return FALSE; + } if (dwFlags & ~(CRYPT_MACHINE_DEFAULT | CRYPT_USER_DEFAULT | CRYPT_DELETE_DEFAULT) || dwFlags == CRYPT_DELETE_DEFAULT) - CRYPT_ReturnLastError(NTE_BAD_FLAGS); + { + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!(keyname = CRYPT_GetTypeKeyName(dwProvType, dwFlags & CRYPT_USER_DEFAULT))) - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); - if (RegOpenKeyA((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if (RegOpenKeyW((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, keyname, &hTypeKey)) { CRYPT_Free(keyname); - CRYPT_ReturnLastError(NTE_BAD_PROVIDER); + SetLastError(NTE_BAD_PROVIDER); + return FALSE; } CRYPT_Free(keyname); - + if (dwFlags & CRYPT_DELETE_DEFAULT) { - RegDeleteValueA(hTypeKey, "Name"); + RegDeleteValueW(hTypeKey, nameW); } else { if (!(keyname = CRYPT_GetProvKeyName(pszProvName))) { RegCloseKey(hTypeKey); - CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; } - if (RegOpenKeyA((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, + if (RegOpenKeyW((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, keyname, &hProvKey)) { CRYPT_Free(keyname); RegCloseKey(hTypeKey); - CRYPT_ReturnLastError(NTE_BAD_PROVIDER); + SetLastError(NTE_BAD_PROVIDER); + return FALSE; } CRYPT_Free(keyname); - - if (RegSetValueExA(hTypeKey, "Name", 0, REG_SZ, (LPBYTE)pszProvName, strlen(pszProvName) + 1)) + + if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (const BYTE *)pszProvName, + (wcslen(pszProvName) + 1)*sizeof(WCHAR))) { RegCloseKey(hTypeKey); RegCloseKey(hProvKey); return FALSE; } - + RegCloseKey(hProvKey); } RegCloseKey(hTypeKey); @@ -1800,20 +1802,20 @@ } /****************************************************************************** - * CryptSetProviderExW (ADVAPI32.@) - * - * See CryptSetProviderExA - */ -BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags) + * CryptSetProviderExA (ADVAPI32.@) + * + * See CryptSetProviderExW. + */ +BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags) { BOOL ret = FALSE; - PSTR str = NULL; - - DPRINT("(%S, %ld, %p, %08ld)\n", pszProvName, dwProvType, pdwReserved, dwFlags); - - if (CRYPT_UnicodeToANSI(pszProvName, &str, -1)) - { - ret = CryptSetProviderExA(str, dwProvType, pdwReserved, dwFlags); + PWSTR str = NULL; + + DPRINT("(%s, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags); + + if (CRYPT_ANSIToUnicode(pszProvName, &str, -1)) + { + ret = CryptSetProviderExW(str, dwProvType, pdwReserved, dwFlags); CRYPT_Free(str); } return ret; Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.h (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.h Thu Nov 15 17:08:18 2007 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_CRYPT_H @@ -56,25 +56,28 @@ BOOL (WINAPI *pCPVerifySignature)(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); } PROVFUNCS, *PPROVFUNCS; +#define MAGIC_CRYPTPROV 0xA39E741F + typedef struct tagCRYPTPROV { + DWORD dwMagic; UINT refcount; HMODULE hModule; PPROVFUNCS pFuncs; - HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ + HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ PVTableProvStruc pVTable; } CRYPTPROV, *PCRYPTPROV; typedef struct tagCRYPTKEY { PCRYPTPROV pProvider; - HCRYPTKEY hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ + HCRYPTKEY hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ } CRYPTKEY, *PCRYPTKEY; typedef struct tagCRYPTHASH { PCRYPTPROV pProvider; - HCRYPTHASH hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ + HCRYPTHASH hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ } CRYPTHASH, *PCRYPTHASH; #define MAXPROVTYPES 999 @@ -82,7 +85,17 @@ extern unsigned char *CRYPT_DESkey8to7( unsigned char *dst, const unsigned char *key ); extern unsigned char *CRYPT_DEShash( unsigned char *dst, const unsigned char *key, const unsigned char *src ); +extern unsigned char *CRYPT_DESunhash( unsigned char *dst, const unsigned char *key, + const unsigned char *src ); extern VOID byteReverse(unsigned char *buf, unsigned longs); +struct ustring { + DWORD Length; + DWORD MaximumLength; + unsigned char *Buffer; +}; + +NTSTATUS WINAPI SystemFunction032(struct ustring *data, struct ustring *key); + #endif /* __WINE_CRYPT_H_ */

1 0

[greatlrd] 30459: Implement wglGetDefaultProcAddress ------------------------------------ Simple copy the wglGetProcAddress, it is only one different between them it is wglGetProcAddress should call on glflush to clear the interface before it give the address.
by greatlrd＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: greatlrd Date: Thu Nov 15 15:57:21 2007 New Revision: 30459 URL: http://svn.reactos.org/svn/reactos?rev=30459&view=rev Log: Implement wglGetDefaultProcAddress ------------------------------------ Simple copy the wglGetProcAddress, it is only one different between them it is wglGetProcAddress should call on glflush to clear the interface before it give the address. Modified: trunk/reactos/dll/win32/opengl32/opengl32.def trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.def (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.def Thu Nov 15 15:57:21 2007 @@ -383,7 +383,7 @@ wglDescribePixelFormat@16=rosglDescribePixelFormat@16 wglGetCurrentContext@0=rosglGetCurrentContext@0 wglGetCurrentDC@0=rosglGetCurrentDC@0 -;wglGetDefaultProcAddress=rosglGetDefaultProcAddress@ +wglGetDefaultProcAddress=rosglGetDefaultProcAddress@4 wglGetLayerPaletteEntries@20=rosglGetLayerPaletteEntries@20 wglGetPixelFormat@4=rosglGetPixelFormat@4 wglGetProcAddress@4=rosglGetProcAddress@4 Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c Thu Nov 15 15:57:21 2007 @@ -909,6 +909,37 @@ PROC func; GLDRIVERDATA *icd; + /* FIXME we should Flush the gl here */ + + if (OPENGL32_threaddata->glrc == NULL) + { + DBGPRINT( "Error: No current GLRC!" ); + SetLastError( ERROR_INVALID_FUNCTION ); + return NULL; + } + + icd = OPENGL32_threaddata->glrc->icd; + func = icd->DrvGetProcAddress( proc ); + if (func != NULL) + { + DBGPRINT( "Info: Proc \"%s\" loaded from ICD.", proc ); + return func; + } + + /* FIXME: Should we return wgl/gl 1.1 functions? */ + SetLastError( ERROR_PROC_NOT_FOUND ); + return NULL; +} + +PROC +APIENTRY +rosglGetDefaultProcAddress( LPCSTR proc ) +{ + PROC func; + GLDRIVERDATA *icd; + + /* wglGetDefaultProcAddress does not flush the gl */ + if (OPENGL32_threaddata->glrc == NULL) { DBGPRINT( "Error: No current GLRC!" );

1 0

[cwittich] 30458: fix a resource leak
by cwittich＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: cwittich Date: Thu Nov 15 13:54:11 2007 New Revision: 30458 URL: http://svn.reactos.org/svn/reactos?rev=30458&view=rev Log: fix a resource leak Modified: trunk/reactos/base/applications/msconfig/msconfig.c Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Thu Nov 15 13:54:11 2007 @@ -190,6 +190,7 @@ DestroyWindow(hStartupPage); DestroyWindow(hFreeLdrPage); DestroyWindow(hSystemPage); + DestroyIcon(hIcon); return DefWindowProc(hDlg, message, wParam, lParam); }

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