From 65b8a5d11b43b668c60946b0a96888a9d11398cf Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sat, 27 Aug 2011 12:55:41 +0000 Subject: [PATCH] [Win32k] - remove some more unneeded functions svn path=/trunk/; revision=53468 --- reactos/subsystems/win32/win32k/eng/xlate.c | 9 -------- .../win32/win32k/include/accelerator.h | 2 -- .../win32/win32k/include/guicheck.h | 5 ----- .../subsystems/win32/win32k/include/monitor.h | 7 ------- .../win32/win32k/include/xlateobj.h | 6 ------ .../subsystems/win32/win32k/main/dllmain.c | 5 ----- .../win32/win32k/ntuser/accelerator.c | 15 ------------- .../subsystems/win32/win32k/ntuser/guicheck.c | 8 ------- .../subsystems/win32/win32k/ntuser/monitor.c | 21 ------------------- 9 files changed, 78 deletions(-) diff --git a/reactos/subsystems/win32/win32k/eng/xlate.c b/reactos/subsystems/win32/win32k/eng/xlate.c index d2d1fa6afb0..2c9ac0b422b 100644 --- a/reactos/subsystems/win32/win32k/eng/xlate.c +++ b/reactos/subsystems/win32/win32k/eng/xlate.c @@ -614,15 +614,6 @@ EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo) pexlo->xlo.pulXlate = pexlo->aulXlate; } -INIT_FUNCTION -NTSTATUS -NTAPI -InitXlateImpl(VOID) -{ - return STATUS_SUCCESS; -} - - /** Public DDI Functions ******************************************************/ #undef XLATEOBJ_iXlate diff --git a/reactos/subsystems/win32/win32k/include/accelerator.h b/reactos/subsystems/win32/win32k/include/accelerator.h index 2fb1f5a4aa9..996fa134e28 100644 --- a/reactos/subsystems/win32/win32k/include/accelerator.h +++ b/reactos/subsystems/win32/win32k/include/accelerator.h @@ -7,6 +7,4 @@ typedef struct _ACCELERATOR_TABLE LPACCEL Table; } ACCELERATOR_TABLE, *PACCELERATOR_TABLE; -INIT_FUNCTION NTSTATUS NTAPI InitAcceleratorImpl(VOID); -NTSTATUS FASTCALL CleanupAcceleratorImpl(VOID); PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL); diff --git a/reactos/subsystems/win32/win32k/include/guicheck.h b/reactos/subsystems/win32/win32k/include/guicheck.h index 8548ab6732c..f1397060c42 100644 --- a/reactos/subsystems/win32/win32k/include/guicheck.h +++ b/reactos/subsystems/win32/win32k/include/guicheck.h @@ -4,9 +4,4 @@ BOOL FASTCALL co_IntGraphicsCheck(BOOL Create); BOOL FASTCALL IntCreatePrimarySurface(VOID); VOID FASTCALL IntDestroyPrimarySurface(VOID); -INIT_FUNCTION -NTSTATUS -NTAPI -InitGuiCheckImpl (VOID); - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/monitor.h b/reactos/subsystems/win32/win32k/include/monitor.h index cc42f0d1edb..bfa40b36043 100644 --- a/reactos/subsystems/win32/win32k/include/monitor.h +++ b/reactos/subsystems/win32/win32k/include/monitor.h @@ -31,13 +31,6 @@ typedef struct _MONITOR struct _MONITOR* Prev; //Blink; } MONITOR, *PMONITOR; -/* functions */ -INIT_FUNCTION -NTSTATUS -NTAPI -InitMonitorImpl(VOID); -NTSTATUS CleanupMonitorImpl(VOID); - NTSTATUS IntAttachMonitor(PDEVOBJ *pGdiDevice, ULONG DisplayNumber); NTSTATUS IntDetachMonitor(PDEVOBJ *pGdiDevice); NTSTATUS IntUpdateMonitorSize(IN PDEVOBJ *pGdiDevice); diff --git a/reactos/subsystems/win32/win32k/include/xlateobj.h b/reactos/subsystems/win32/win32k/include/xlateobj.h index 6aca9bc254d..d61da38df5e 100644 --- a/reactos/subsystems/win32/win32k/include/xlateobj.h +++ b/reactos/subsystems/win32/win32k/include/xlateobj.h @@ -45,9 +45,3 @@ VOID NTAPI EXLATEOBJ_vInitialize(PEXLATEOBJ pexlo, PALETTE *ppalSrc, PALETTE *pp VOID NTAPI EXLATEOBJ_vInitXlateFromDCs(PEXLATEOBJ pexlo, PDC pdcSrc, PDC pdcDst); VOID NTAPI EXLATEOBJ_vInitSrcMonoXlate(PEXLATEOBJ pexlo, PPALETTE ppalDst, ULONG Color0, ULONG Color1); VOID NTAPI EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo); -INIT_FUNCTION -NTSTATUS -NTAPI -InitXlateImpl(VOID); - -//#define XLATEOBJ_iXlate(pxo, Color) ((EXLATEOBJ*)pxo)->pfnXlate(pxo, Color) diff --git a/reactos/subsystems/win32/win32k/main/dllmain.c b/reactos/subsystems/win32/win32k/main/dllmain.c index 7da6fb628d5..d6a5d8d2100 100644 --- a/reactos/subsystems/win32/win32k/main/dllmain.c +++ b/reactos/subsystems/win32/win32k/main/dllmain.c @@ -172,7 +172,6 @@ Win32kProcessCallback(struct _EPROCESS *Process, IntCleanupMenus(Process, Win32Process); IntCleanupCurIcons(Process, Win32Process); - CleanupMonitorImpl(); /* no process windows should exist at this point, or the function will assert! */ DestroyProcessClasses(Win32Process); @@ -574,7 +573,6 @@ DriverEntry( CreateStockObjects(); CreateSysColorObjects(); - NT_ROF(InitXlateImpl()); NT_ROF(InitPDEVImpl()); NT_ROF(InitLDEVImpl()); NT_ROF(InitDeviceImpl()); @@ -585,11 +583,8 @@ DriverEntry( NT_ROF(InitDesktopImpl()); NT_ROF(InitInputImpl()); NT_ROF(InitKeyboardImpl()); - NT_ROF(InitMonitorImpl()); NT_ROF(MsqInitializeImpl()); NT_ROF(InitTimerImpl()); - NT_ROF(InitAcceleratorImpl()); - NT_ROF(InitGuiCheckImpl()); /* Initialize FreeType library */ if (!InitFontSupport()) diff --git a/reactos/subsystems/win32/win32k/ntuser/accelerator.c b/reactos/subsystems/win32/win32k/ntuser/accelerator.c index 2b39484cd1c..9ad7906e99b 100644 --- a/reactos/subsystems/win32/win32k/ntuser/accelerator.c +++ b/reactos/subsystems/win32/win32k/ntuser/accelerator.c @@ -40,21 +40,6 @@ UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags); /* FUNCTIONS *****************************************************************/ -INIT_FUNCTION -NTSTATUS -NTAPI -InitAcceleratorImpl(VOID) -{ - return(STATUS_SUCCESS); -} - -NTSTATUS FASTCALL -CleanupAcceleratorImpl(VOID) -{ - return(STATUS_SUCCESS); -} - - PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) { PACCELERATOR_TABLE Accel; diff --git a/reactos/subsystems/win32/win32k/ntuser/guicheck.c b/reactos/subsystems/win32/win32k/ntuser/guicheck.c index 02acb58c177..0c58756a5c6 100644 --- a/reactos/subsystems/win32/win32k/ntuser/guicheck.c +++ b/reactos/subsystems/win32/win32k/ntuser/guicheck.c @@ -122,12 +122,4 @@ IntUserManualGuiCheck(LONG Check) } } -INIT_FUNCTION -NTSTATUS -NTAPI -InitGuiCheckImpl (VOID) -{ - return STATUS_SUCCESS; -} - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/ntuser/monitor.c b/reactos/subsystems/win32/win32k/ntuser/monitor.c index 979b8f9eba0..675ca7db64d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/monitor.c +++ b/reactos/subsystems/win32/win32k/ntuser/monitor.c @@ -28,27 +28,6 @@ DBG_DEFAULT_CHANNEL(UserMonitor); /* list of monitors */ static PMONITOR gMonitorList = NULL; -/* INITALIZATION FUNCTIONS ****************************************************/ - -INIT_FUNCTION -NTSTATUS -NTAPI -InitMonitorImpl() -{ - TRACE("Initializing monitor implementation...\n"); - - return STATUS_SUCCESS; -} - -NTSTATUS -CleanupMonitorImpl() -{ - TRACE("Cleaning up monitor implementation...\n"); - /* FIXME: Destroy monitor objects? */ - - return STATUS_SUCCESS; -} - /* PRIVATE FUNCTIONS **********************************************************/ /* IntCreateMonitorObject -- 2.17.1