b=477727; fix up Windows CE xptcall; r=stuart

xpcom/reflect/xptcall/src/md/win32/xptc_arm_ceppc.asm

@@ -108,12 +108,12 @@ $PrologName
 
 	MACRO
 	MY_STUB_NESTED_ARMENTRY	$Number
-;FuncName    SETS    VBar:CC:"?Stub$Number@nsXPTCStubBase@@UAAIXZ":CC:VBar
+FuncName    SETS    VBar:CC:"?Stub$Number@nsXPTCStubBase@@UAAIXZ":CC:VBar
-;PrologName  SETS    VBar:CC:"?Stub$Number@nsXPTCStubBase@@UAAIXZ":CC:"_Prolog":CC:VBar
+PrologName  SETS    VBar:CC:"?Stub$Number@nsXPTCStubBase@@UAAIXZ":CC:"_Prolog":CC:VBar
-;FuncEndName SETS    VBar:CC:"?Stub$Number@nsXPTCStubBase@@UAAIXZ":CC:"_end":CC:VBar
+FuncEndName SETS    VBar:CC:"?Stub$Number@nsXPTCStubBase@@UAAIXZ":CC:"_end":CC:VBar
-FuncName    SETS    VBar:CC:"?asmXPTCStubBase_Stub$Number@@YAIXZ":CC:VBar
+;FuncName    SETS    VBar:CC:"?asmXPTCStubBase_Stub$Number@@YAIXZ":CC:VBar ; 
-PrologName  SETS    VBar:CC:"?asmXPTCStubBase_Stub$Number@@YAIXZ":CC:"_Prolog":CC:VBar
+;PrologName  SETS    VBar:CC:"?asmXPTCStubBase_Stub$Number@@YAIXZ":CC:"_Prolog":CC:VBar
-FuncEndName SETS    VBar:CC:"?asmXPTCStubBase_Stub$Number@@YAIXZ":CC:"_end":CC:VBar
+;FuncEndName SETS    VBar:CC:"?asmXPTCStubBase_Stub$Number@@YAIXZ":CC:"_end":CC:VBar
 
 	AREA |.pdata|,ALIGN=2,PDATA
 	DCD	    $FuncName

xpcom/reflect/xptcall/src/md/win32/xptcstubsce.cpp

@@ -118,26 +118,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex,
 } // extern "C"
 
 
+/* We don't need STUB_ENTRY, since the stubs are defined explicitly in xptc_arm_ceppc.asm */
 
-// these macros get defined inside xptc_asm_ceppc.asm
+#define STUB_ENTRY(n) /* */
-// asm prototypes
-#define STUB_ENTRY(n)                               \
-nsresult __stdcall asmXPTCStubBase_Stub##n( void );
-
-#define SENTINEL_ENTRY(n)
-
-#include "xptcstubsdef.inc"
-
-#undef STUB_ENTRY
-#undef SENTINEL_ENTRY
-
-#define STUB_ENTRY(n)                               \
-nsresult 					                          \
-__stdcall nsXPTCStubBase::Stub##n()                 \
-{                                                   \
-	return asmXPTCStubBase_Stub##n();               \
-}                                                   \
-
 
 #define SENTINEL_ENTRY(n)                              \
 nsresult __stdcall nsXPTCStubBase::Sentinel##n()       \
@@ -147,8 +130,6 @@ nsresult __stdcall nsXPTCStubBase::Sentinel##n()       \
 }                                                      
 #include "xptcstubsdef.inc"
 
-
-
 void xptc_dummy()
 {
 }