diff -r 414d4b727fd9 -r 89bd4cfee505 windowing/windowserver/SERVER/w32cmd.h --- a/windowing/windowserver/SERVER/w32cmd.h Thu Sep 09 10:13:45 2010 +0300 +++ b/windowing/windowserver/SERVER/w32cmd.h Fri Sep 17 17:00:49 2010 +0300 @@ -262,7 +262,6 @@ EWsClOpSendEffectCommand, EWsClOpRegisterTFXEffectBuf, EWsClOpRegisterTFXEffectIPC, - EWsClOpUnregisterTFXEffect, EWsClOpUnregisterAllTFXEffect, EWsClOpOverrideEffectBuf, EWsClOpOverrideEffectIPC, @@ -440,6 +439,7 @@ EWsWinOpSendEffectCommand, EWsWinOpOverrideEffectBuf, EWsWinOpOverrideEffectIPC, + EWsWinOpSetPointerAcceptanceRegion, EWsWinOpTestLowPriorityRedraw=0x2000, //Specific opcode for testing redraw queue priorities }; @@ -988,13 +988,6 @@ TUint tfxAppUid; TBitFlags tfxFlags; }; -struct TWsClCmdUnRegisterEffect - { - inline TWsClCmdUnRegisterEffect(TInt aAction, TInt aPurpose, TUint aAppUid); - TInt tfxAction; - TInt tfxPurpose; - TUint tfxAppUid; - }; struct TWsClCmdOverrideEffect { inline TWsClCmdOverrideEffect(TInt aAction, TInt aPurpose, TInt aDirStrSize, TInt aPhase1StrSize, TInt aPhase2StrSize, TBitFlags aFlags); @@ -1058,7 +1051,6 @@ const TWsClCmdCreateDrawableSource* CreateDrawableSource; const TWsClCmdSendEffectCommand* SendEffectCommand; const TWsClCmdRegisterEffect* RegisterEffect; - const TWsClCmdUnRegisterEffect* UnRegisterEffect; const TWsClCmdOverrideEffect* OverrideEffect; const TRenderOrientation* Orientation; }; @@ -2289,9 +2281,6 @@ inline TWsClCmdRegisterEffect::TWsClCmdRegisterEffect(TInt aAction, TInt aPurpose, TInt aDirStrSize, TInt aPhase1StrSize, TInt aPhase2StrSize, TUint aAppUid, TBitFlags aFlags) : tfxAction(aAction), tfxPurpose(aPurpose), tfxDirStrSize(aDirStrSize), tfxPhase1StrSize(aPhase1StrSize), tfxPhase2StrSize(aPhase2StrSize), tfxAppUid(aAppUid), tfxFlags(aFlags) {} -inline TWsClCmdUnRegisterEffect::TWsClCmdUnRegisterEffect(TInt aAction, TInt aPurpose, TUint aAppUid) : - tfxAction(aAction), tfxPurpose(aPurpose), tfxAppUid(aAppUid) - {} inline TWsClCmdOverrideEffect::TWsClCmdOverrideEffect(TInt aAction, TInt aPurpose, TInt aDirStrSize, TInt aPhase1StrSize, TInt aPhase2StrSize, TBitFlags aFlags) : tfxAction(aAction), tfxPurpose(aPurpose), tfxDirStrSize(aDirStrSize), tfxPhase1StrSize(aPhase1StrSize), tfxPhase2StrSize(aPhase2StrSize), tfxFlags(aFlags) {}