- Rename some files for MSVC compatibility. Thanks Brezenbak. Deleted: trunk/reactos/subsys/win32k/eng/brush.c Added: trunk/reactos/subsys/win32k/eng/engbrush.c Added: trunk/reactos/subsys/win32k/eng/engmisc.c Added: trunk/reactos/subsys/win32k/eng/engwindow.c Deleted: trunk/reactos/subsys/win32k/eng/misc.c Deleted: trunk/reactos/subsys/win32k/eng/window.c Added: trunk/reactos/subsys/win32k/misc/err.c Deleted: trunk/reactos/subsys/win32k/misc/error.c Added: trunk/reactos/subsys/win32k/ntuser/ntstubs.c Deleted: trunk/reactos/subsys/win32k/ntuser/stubs.c Deleted: trunk/reactos/subsys/win32k/objects/dib.c Added: trunk/reactos/subsys/win32k/objects/dibobj.c Deleted: trunk/reactos/subsys/win32k/objects/paint.c Added: trunk/reactos/subsys/win32k/objects/paintobj.c Deleted: trunk/reactos/subsys/win32k/objects/palette.c Added: trunk/reactos/subsys/win32k/objects/palobj.c Modified: trunk/reactos/subsys/win32k/win32k.xml _____
Deleted: trunk/reactos/subsys/win32k/eng/brush.c --- trunk/reactos/subsys/win32k/eng/brush.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/eng/brush.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,64 +0,0 @@
-/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: GDI Driver Brush Functions - * FILE: subsys/win32k/eng/brush.c - * PROGRAMER: Jason Filby - * REVISION HISTORY: - * 3/7/1999: Created - */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -/* - * @implemented - */ -PVOID STDCALL -BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj, - IN ULONG ObjSize) -{ - BrushObj->pvRbrush=EngAllocMem(0, ObjSize, 0); - return(BrushObj->pvRbrush); -} - -/* - * @implemented - */ -PVOID STDCALL -BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj) -{ - return(BrushObj->pvRbrush); -} - -/* - * @implemented - */ -ULONG STDCALL -BRUSHOBJ_ulGetBrushColor(IN BRUSHOBJ *BrushObj) -{ - return BrushObj->iSolidColor; -} - -/* EOF */ _____
Copied: trunk/reactos/subsys/win32k/eng/engbrush.c (from rev 20743, trunk/reactos/subsys/win32k/eng/brush.c) _____
Copied: trunk/reactos/subsys/win32k/eng/engmisc.c (from rev 20743, trunk/reactos/subsys/win32k/eng/misc.c) _____
Copied: trunk/reactos/subsys/win32k/eng/engwindow.c (from rev 20743, trunk/reactos/subsys/win32k/eng/window.c) _____
Deleted: trunk/reactos/subsys/win32k/eng/misc.c --- trunk/reactos/subsys/win32k/eng/misc.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/eng/misc.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,236 +0,0 @@
-/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -BOOL STDCALL -IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, - SURFOBJ *DestObj, - RECTL *DestRect, - BOOL ReadOnly, - POINTL *Translate, - SURFOBJ **OutputObj) -{ - LONG Exchange; - SIZEL BitmapSize; - POINTL SrcPoint; - LONG Width; - RECTL ClippedDestRect; - - /* Normalize */ - if (DestRect->right < DestRect->left) - { - Exchange = DestRect->left; - DestRect->left = DestRect->right; - DestRect->right = Exchange; - } - if (DestRect->bottom < DestRect->top) - { - Exchange = DestRect->top; - DestRect->top = DestRect->bottom; - DestRect->bottom = Exchange; - } - - if (NULL != DestObj && STYPE_BITMAP != DestObj->iType && - (NULL == DestObj->pvScan0 || 0 == DestObj->lDelta)) - { - /* Driver needs to support DrvCopyBits, else we can't do anything */ - /* FIXME: Remove typecast! */ - if (!(((BITMAPOBJ*)DestObj)->flHooks & HOOK_COPYBITS)) - { - return FALSE; - } - - /* Allocate a temporary bitmap */ - BitmapSize.cx = DestRect->right - DestRect->left; - BitmapSize.cy = DestRect->bottom - DestRect->top; - Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestObj->iBitmapFormat)); - EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width, - DestObj->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, NULL); - *OutputObj = EngLockSurface((HSURF)EnterLeave->OutputBitmap); - - EnterLeave->DestRect.left = 0; - EnterLeave->DestRect.top = 0; - EnterLeave->DestRect.right = BitmapSize.cx; - EnterLeave->DestRect.bottom = BitmapSize.cy; - SrcPoint.x = DestRect->left; - SrcPoint.y = DestRect->top; - ClippedDestRect = EnterLeave->DestRect; - if (SrcPoint.x < 0) - { - ClippedDestRect.left -= SrcPoint.x; - SrcPoint.x = 0; - } - if (DestObj->sizlBitmap.cx < SrcPoint.x + ClippedDestRect.right - ClippedDestRect.left) - { - ClippedDestRect.right = ClippedDestRect.left + DestObj->sizlBitmap.cx - SrcPoint.x; - } - if (SrcPoint.y < 0) - { - ClippedDestRect.top -= SrcPoint.y; - SrcPoint.y = 0; - } - if (DestObj->sizlBitmap.cy < SrcPoint.y + ClippedDestRect.bottom - ClippedDestRect.top) - { - ClippedDestRect.bottom = ClippedDestRect.top + DestObj->sizlBitmap.cy - SrcPoint.y; - } - EnterLeave->TrivialClipObj = EngCreateClip(); - EnterLeave->TrivialClipObj->iDComplexity = DC_TRIVIAL; - if (ClippedDestRect.left < (*OutputObj)->sizlBitmap.cx && - 0 <= ClippedDestRect.right && - SrcPoint.x < DestObj->sizlBitmap.cx && - ClippedDestRect.top <= (*OutputObj)->sizlBitmap.cy && - 0 <= ClippedDestRect.bottom && - SrcPoint.y < DestObj->sizlBitmap.cy && - ! GDIDEVFUNCS(DestObj).CopyBits( - *OutputObj, DestObj, - EnterLeave->TrivialClipObj, NULL, - &ClippedDestRect, &SrcPoint)) - { - EngDeleteClip(EnterLeave->TrivialClipObj); - EngFreeMem((*OutputObj)->pvBits); - EngUnlockSurface(*OutputObj); - EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); - return FALSE; - } - EnterLeave->DestRect.left = DestRect->left; - EnterLeave->DestRect.top = DestRect->top; - EnterLeave->DestRect.right = DestRect->right; - EnterLeave->DestRect.bottom = DestRect->bottom; - Translate->x = - DestRect->left; - Translate->y = - DestRect->top; - } - else - { - Translate->x = 0; - Translate->y = 0; - *OutputObj = DestObj; - } - - if (NULL != *OutputObj - && 0 != (((BITMAPOBJ*) *OutputObj)->flHooks & HOOK_SYNCHRONIZE)) - { - if (NULL != GDIDEVFUNCS(*OutputObj).SynchronizeSurface) - { - GDIDEVFUNCS(*OutputObj).SynchronizeSurface(*OutputObj, DestRect, 0); - } - else if (STYPE_BITMAP == (*OutputObj)->iType - && NULL != GDIDEVFUNCS(*OutputObj).Synchronize) - { - GDIDEVFUNCS(*OutputObj).Synchronize((*OutputObj)->dhpdev, DestRect); - } - } - - EnterLeave->DestObj = DestObj; - EnterLeave->OutputObj = *OutputObj; - EnterLeave->ReadOnly = ReadOnly; - - return TRUE; -} - -BOOL STDCALL -IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave) -{ - POINTL SrcPoint; - BOOL Result = TRUE; - - if (EnterLeave->OutputObj != EnterLeave->DestObj && NULL != EnterLeave->OutputObj) - { - if (! EnterLeave->ReadOnly) - { - SrcPoint.x = 0; - SrcPoint.y = 0; - if (EnterLeave->DestRect.left < 0) - { - SrcPoint.x = - EnterLeave->DestRect.left; - EnterLeave->DestRect.left = 0; - } - if (EnterLeave->DestObj->sizlBitmap.cx < EnterLeave->DestRect.right) - { - EnterLeave->DestRect.right = EnterLeave->DestObj->sizlBitmap.cx; - } - if (EnterLeave->DestRect.top < 0) - { - SrcPoint.y = - EnterLeave->DestRect.top; - EnterLeave->DestRect.top = 0; - } - if (EnterLeave->DestObj->sizlBitmap.cy < EnterLeave->DestRect.bottom) - { - EnterLeave->DestRect.bottom = EnterLeave->DestObj->sizlBitmap.cy; - } - if (SrcPoint.x < EnterLeave->OutputObj->sizlBitmap.cx && - EnterLeave->DestRect.left <= EnterLeave->DestRect.right && - EnterLeave->DestRect.left < EnterLeave->DestObj->sizlBitmap.cx && - SrcPoint.y < EnterLeave->OutputObj->sizlBitmap.cy && - EnterLeave->DestRect.top <= EnterLeave->DestRect.bottom && - EnterLeave->DestRect.top < EnterLeave->DestObj->sizlBitmap.cy) - { - Result = GDIDEVFUNCS(EnterLeave->DestObj).CopyBits( - EnterLeave->DestObj, - EnterLeave->OutputObj, - EnterLeave->TrivialClipObj, NULL, - &EnterLeave->DestRect, &SrcPoint); - } - else - { - Result = TRUE; - } - } - EngFreeMem(EnterLeave->OutputObj->pvBits); - EngUnlockSurface(EnterLeave->OutputObj); - EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); - EngDeleteClip(EnterLeave->TrivialClipObj); - } - else - { - Result = TRUE; - } - - return Result; -} - -HANDLE STDCALL -EngGetCurrentProcessId(VOID) -{ - /* http://www.osr.com/ddk/graphics/gdifncs_5ovb.htm */ - return PsGetCurrentProcessId(); -} - -HANDLE STDCALL -EngGetCurrentThreadId(VOID) -{ - /* http://www.osr.com/ddk/graphics/gdifncs_25rb.htm */ - return PsGetCurrentThreadId(); -} - -HANDLE STDCALL -EngGetProcessHandle(VOID) -{ - /* http://www.osr.com/ddk/graphics/gdifncs_3tif.htm - In Windows 2000 and later, the EngGetProcessHandle function always returns NULL. - FIXME - what does NT4 return? */ - return NULL; -} - -/* EOF */ _____
Deleted: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/eng/window.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,391 +0,0 @@
-/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: GDI WNDOBJ Functions - * FILE: subsys/win32k/eng/window.c - * PROGRAMER: Gregor Anich - * REVISION HISTORY: - * 16/11/2004: Created - */ - -/* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -/* - * Calls the WNDOBJCHANGEPROC of the given WNDOBJ - */ -VOID -FASTCALL -IntEngWndCallChangeProc( - IN WNDOBJ *pwo, - IN FLONG flChanged) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - - if (WndObjInt->ChangeProc == NULL) - { - return; - } - - /* check flags of the WNDOBJ */ - flChanged &= WndObjInt->Flags; - if (flChanged == 0) - { - return; - } - - /* Call the WNDOBJCHANGEPROC */ - if (flChanged == WOC_CHANGED) - { - pwo = NULL; - } - - DPRINT("Calling WNDOBJCHANGEPROC (0x%x), Changed = 0x%x\n", - WndObjInt->ChangeProc, flChanged); - WndObjInt->ChangeProc(pwo, flChanged); -} - -/* - * Fills the CLIPOBJ and client rect of the WNDOBJ with the data from the given WINDOW_OBJECT - */ -BOOLEAN -FASTCALL -IntEngWndUpdateClipObj( - WNDGDI *WndObjInt, - PWINDOW_OBJECT Window) -{ - HRGN hVisRgn; - PROSRGNDATA visRgn; - CLIPOBJ *ClipObj = NULL; - CLIPOBJ *OldClipObj; - - hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); - if (hVisRgn != NULL) - { - NtGdiOffsetRgn(hVisRgn, Window->ClientRect.left, Window->ClientRect.top); - visRgn = RGNDATA_LockRgn(hVisRgn); - if (visRgn != NULL) - { - if (visRgn->rdh.nCount > 0) - { - ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, (PRECTL)visRgn->Buffer, - (PRECTL)&visRgn->rdh.rcBound); - DPRINT("Created visible region with %d rects\n", visRgn->rdh.nCount); - DPRINT(" BoundingRect: %d, %d %d, %d\n", - visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, - visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); - { - INT i; - for (i = 0; i < visRgn->rdh.nCount; i++) - { - DPRINT(" Rect #%d: %d,%d %d,%d\n", i+1, - visRgn->Buffer[i].left, visRgn->Buffer[i].top, - visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); - } - } - } - RGNDATA_UnlockRgn(visRgn); - } - else - { - DPRINT1("Warning: Couldn't lock visible region of window DC\n"); - } - } - else - { - DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); - } - - if (ClipObj == NULL) - { - /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, (PRECTL)&Window->ClientRect, - (PRECTL)&Window->ClientRect); - } - - if (ClipObj == NULL) - { - DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); - return FALSE; - } - - RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); - RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->ClientRect, sizeof (RECT)); - OldClipObj = InterlockedExchangePointer(&WndObjInt->ClientClipObj, ClipObj); - if (OldClipObj != NULL) - IntEngDeleteClipRegion(OldClipObj); - - return TRUE; -} - -/* - * Updates all WNDOBJs of the given WINDOW_OBJECT and calls the change-procs. - */ -VOID -FASTCALL -IntEngWindowChanged( - PWINDOW_OBJECT Window, - FLONG flChanged) -{ - PLIST_ENTRY CurrentEntry; - WNDGDI *Current; - - ASSERT_IRQL(PASSIVE_LEVEL); - - CurrentEntry = Window->WndObjListHead.Flink; - while (CurrentEntry != &Window->WndObjListHead) - { - Current = CONTAINING_RECORD(CurrentEntry, WNDGDI, ListEntry); - - if (Current->WndObj.pvConsumer != NULL) - { - /* Update the WNDOBJ */ - switch (flChanged) - { - case WOC_RGN_CLIENT: - /* Update the clipobj and client rect of the WNDOBJ */ - IntEngWndUpdateClipObj(Current, Window); - break; - - case WOC_DELETE: - /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ - break; - } - - /* Call the change proc */ - IntEngWndCallChangeProc(&Current->WndObj, flChanged); - - /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ - if (flChanged == WOC_RGN_CLIENT) - { - IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); - } - - CurrentEntry = CurrentEntry->Flink; - } - } - -} - -/* - * @implemented - */ -WNDOBJ* -STDCALL -EngCreateWnd( - SURFOBJ *pso, - HWND hWnd, - WNDOBJCHANGEPROC pfn, - FLONG fl, - int iPixelFormat) -{ - WNDGDI *WndObjInt = NULL; - WNDOBJ *WndObjUser = NULL; - PWINDOW_OBJECT Window; - BOOL calledFromUser; - DECLARE_RETURN(WNDOBJ*); - - DPRINT("EngCreateWnd: pso = 0x%x, hwnd = 0x%x, pfn = 0x%x, fl = 0x%x, pixfmt = %d\n", - pso, hWnd, pfn, fl, iPixelFormat); - - calledFromUser = UserIsEntered(); - if (!calledFromUser){ - UserEnterShared(); - } - - /* Get window object */ - Window = UserGetWindowObject(hWnd); - if (Window == NULL) - { - RETURN( NULL); - } - - /* Create WNDOBJ */ - WndObjInt = EngAllocMem(0, sizeof (WNDGDI), TAG_WNDOBJ); - if (WndObjInt == NULL) - { - DPRINT1("Failed to allocate memory for a WND structure!\n"); - RETURN( NULL); - } - - /* Fill the clipobj */ - WndObjInt->ClientClipObj = NULL; - if (!IntEngWndUpdateClipObj(WndObjInt, Window)) - { - EngFreeMem(WndObjInt); - RETURN( NULL); - } - - /* Fill user object */ - WndObjUser = GDIToObj(WndObjInt, WND); - WndObjUser->psoOwner = pso; - WndObjUser->pvConsumer = NULL; - - /* Fill internal object */ - WndObjInt->Hwnd = hWnd; - WndObjInt->ChangeProc = pfn; - WndObjInt->Flags = fl; - WndObjInt->PixelFormat = iPixelFormat; - - /* associate object with window */ - InsertTailList(&Window->WndObjListHead, &WndObjInt->ListEntry); - - DPRINT("EngCreateWnd: SUCCESS!\n"); - - RETURN( WndObjUser); - -CLEANUP: - - if (!calledFromUser){ - UserLeave(); - } - - END_CLEANUP; -} - - -/* - * @implemented - */ -VOID -STDCALL -EngDeleteWnd( - IN WNDOBJ *pwo) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - PWINDOW_OBJECT Window; - BOOL calledFromUser; - - DPRINT("EngDeleteWnd: pwo = 0x%x\n", pwo); - - calledFromUser = UserIsEntered(); - if (!calledFromUser){ - UserEnterExclusive(); - } - - /* Get window object */ - Window = UserGetWindowObject(WndObjInt->Hwnd); - if (Window == NULL) - { - DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); - RemoveEntryList(&WndObjInt->ListEntry); - } - else - { - /* Remove object from window */ - RemoveEntryList(&WndObjInt->ListEntry); - } - - if (!calledFromUser){ - UserLeave(); - } - - /* Free resources */ - IntEngDeleteClipRegion(WndObjInt->ClientClipObj); - EngFreeMem(WndObjInt); -} - - -/* - * @implemented - */ -BOOL -STDCALL -WNDOBJ_bEnum( - IN WNDOBJ *pwo, - IN ULONG cj, - OUT ULONG *pul) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - BOOL Ret; - - DPRINT("WNDOBJ_bEnum: pwo = 0x%x, cj = %d, pul = 0x%x\n", pwo, cj, pul); - Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - - DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); - return Ret; -} - - -/* - * @implemented - */ -ULONG -STDCALL -WNDOBJ_cEnumStart( - IN WNDOBJ *pwo, - IN ULONG iType, - IN ULONG iDirection, - IN ULONG cLimit) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - ULONG Ret; - - DPRINT("WNDOBJ_cEnumStart: pwo = 0x%x, iType = %d, iDirection = %d, cLimit = %d\n", - pwo, iType, iDirection, cLimit); - - /* FIXME: Should we enumerate all rectangles or not? */ - Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - - DPRINT("WNDOBJ_cEnumStart: Returning 0x%x\n", Ret); - return Ret; -} - - -/* - * @implemented - */ -VOID -STDCALL -WNDOBJ_vSetConsumer( - IN WNDOBJ *pwo, - IN PVOID pvConsumer) -{ - BOOL Hack; - - DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%x, pvConsumer = 0x%x\n", pwo, pvConsumer); - - Hack = (pwo->pvConsumer == NULL); - pwo->pvConsumer = pvConsumer; - - /* HACKHACKHACK - * - * MSDN says that the WNDOBJCHANGEPROC will be called with the most recent state - * when a WNDOBJ is created - we do it here because most drivers will need pvConsumer - * in the callback to identify the WNDOBJ I think. - * - * - blight - */ - if (Hack) - { - IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); - IntEngWndCallChangeProc(pwo, WOC_CHANGED); - IntEngWndCallChangeProc(pwo, WOC_DRAWN); - } -} - -/* EOF */ - _____
Copied: trunk/reactos/subsys/win32k/misc/err.c (from rev 20743, trunk/reactos/subsys/win32k/misc/error.c) _____
Deleted: trunk/reactos/subsys/win32k/misc/error.c --- trunk/reactos/subsys/win32k/misc/error.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/misc/error.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,64 +0,0 @@
-/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Errors - * FILE: subsys/win32k/misc/error.c - * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) - * REVISION HISTORY: - * 06-06-2001 CSH Created - */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -VOID FASTCALL -SetLastNtError(NTSTATUS Status) -{ - SetLastWin32Error(RtlNtStatusToDosError(Status)); -} - -VOID FASTCALL -SetLastWin32Error(DWORD Status) -{ - PTEB Teb = PsGetCurrentThread()->Tcb.Teb; - - if (NULL != Teb) - { - Teb->LastErrorValue = Status; - } -} - -NTSTATUS FASTCALL -GetLastNtError() -{ - PTEB Teb = PsGetCurrentThread()->Tcb.Teb; - - if ( NULL != Teb ) - { - return Teb->LastStatusValue; - } - return 0; -} - -/* EOF */ _____
Copied: trunk/reactos/subsys/win32k/ntuser/ntstubs.c (from rev 20743, trunk/reactos/subsys/win32k/ntuser/stubs.c) _____
Deleted: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,760 +0,0 @@
-/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Native User stubs - * FILE: subsys/win32k/ntuser/stubs.c - * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) - * REVISION HISTORY: - * 04-06-2001 CSH Created - */ -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -DWORD -STDCALL -NtUserActivateKeyboardLayout( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserAttachThreadInput( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserBitBltSysBmp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwnd( - DWORD Unknown0, - DWORD Unknown1) -{ - switch (Unknown0) - { - case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: - if (IntIsWindow((HWND) Unknown1)) - return IntRegisterShellHookWindow((HWND) Unknown1); - return FALSE; - break; - case HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW: - if (IntIsWindow((HWND) Unknown1)) - return IntDeRegisterShellHookWindow((HWND) Unknown1); - return FALSE; - } - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwndParam( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwndParamLock( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - - -DWORD -STDCALL -NtUserConvertMemHandle( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCreateLocalMemHandle( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDdeGetQualityOfService( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDdeInitialize( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDdeSetQualityOfService( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 -) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDrawAnimatedRects( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDrawCaption( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, [truncated at 1000 lines; 2248 more skipped]
-
ion＠svn.reactos.org