update to make ns*ID's work

xpcom/base/nsISupports.idl

@@ -16,6 +16,7 @@
  * Reserved.
  */
 
+#include "nsID.idl"
 %{C++
 #include "nsDebug.h"
 #include "nsTraceRefcnt.h"
@@ -29,11 +30,8 @@
 native nsQIResult(void *);
 native voidStar(void*);
 native voidStarRef(void**);
-native nsID(nsID *);
 native nsCIDRef(nsCID&);
 native nsIIDRef(nsIID&);
-native nsCID(nsCID);
-native nsIID(nsIID);
 
 typedef unsigned long   nsrefcnt;
 
@@ -42,7 +40,7 @@ typedef unsigned long   nsrefcnt;
 	uuid(00000000-0000-0000-c000-000000000046)
 ]
 interface nsISupports {
-  void QueryInterface(in nsID uuid, out nsQIResult result);
+  void QueryInterface(in nsIID uuid, out nsQIResult result);
   [notxpcom] void AddRef();
   [notxpcom] void Release();
 };

xpcom/idl/nsID.idl

@@ -0,0 +1,36 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* declare nsID in IDL */
+/*
+struct nsID {
+  unsigned long m0;
+  unsigned short m1;
+  unsigned short m2;
+  unsigned short m3[8];
+};
+typedef nsID nsIID;
+typedef nsID nsCID;
+*/
+
+/* the above doesn't make nsID/nsIID/nsCID pass by reference in
+ * method calls so we make these fake interfaces:
+ */
+interface nsID {};
+interface nsIID {};
+interface nsCID {};

xpcom/idl/nsISupports.idl

@@ -16,6 +16,7 @@
  * Reserved.
  */
 
+#include "nsID.idl"
 %{C++
 #include "nsDebug.h"
 #include "nsTraceRefcnt.h"
@@ -29,11 +30,8 @@
 native nsQIResult(void *);
 native voidStar(void*);
 native voidStarRef(void**);
-native nsID(nsID *);
 native nsCIDRef(nsCID&);
 native nsIIDRef(nsIID&);
-native nsCID(nsCID);
-native nsIID(nsIID);
 
 typedef unsigned long   nsrefcnt;
 
@@ -42,7 +40,7 @@ typedef unsigned long   nsrefcnt;
 	uuid(00000000-0000-0000-c000-000000000046)
 ]
 interface nsISupports {
-  void QueryInterface(in nsID uuid, out nsQIResult result);
+  void QueryInterface(in nsIID uuid, out nsQIResult result);
   [notxpcom] void AddRef();
   [notxpcom] void Release();
 };