Added a new test for the raptorweb.dll COM factory. This is WIN32 only

webshell/tests/ComFactory/TestCOMFactory.cpp

@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+// Standard Windows/COM headers
+#include <windows.h>
+#include <ole2.h>
+
+// NGLayout headers...
+#include "nsIWebShell.h"
+
+//
+// Define GUIDS for the WebShell class and IWebshell interface...
+//
+static GUID kWebShell_CID  = NS_WEB_SHELL_CID;
+static GUID kIWebShell_IID = NS_IWEB_SHELL_IID;
+
+
+int main(int argc, char **argv)
+{
+    HRESULT hr;
+    nsIWebShell* webShell;
+
+    OleInitialize(NULL);
+
+    hr = CoCreateInstance(kWebShell_CID, 
+                          NULL, 
+                          CLSCTX_INPROC_SERVER,
+                          kIWebShell_IID,
+                          (void**)&webShell);
+
+    if (S_OK == hr) {
+        printf("CoCreateInstance(...) succeeded.\n");
+
+        webShell->Release();
+    } else if (REGDB_E_CLASSNOTREG == hr) {
+        printf("Error: No registry entry.  Try running REGSVR32 raptorweb.dll\n");
+    } else {
+        printf("Error: CoCreateInstance(...) failed.\n");
+    }
+
+    OleUninitialize();
+    return 0;
+}

webshell/tests/ComFactory/makefile.win

@@ -0,0 +1,92 @@
+# 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.
+
+NODEPEND=1
+IGNORE_MANIFEST = 1
+
+#//------------------------------------------------------------------------
+#//
+# New build system where zip dll is build indepenant of java stubs.
+#//
+#//------------------------------------------------------------------------
+MODULE =testcomfactory
+#EXPORTS =               \
+#        $(NULL)
+
+
+#//------------------------------------------------------------------------
+#//
+#// Specify the depth of the current directory relative to the
+#// root of NS
+#//
+#//------------------------------------------------------------------------
+DEPTH= ..\..\..
+
+MAKE_OBJ_TYPE=EXE
+#//------------------------------------------------------------------------
+#//
+#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
+#//
+#//------------------------------------------------------------------------
+EXENAME=TestCOMFactory
+PDBFILE=TestCOMFactory.pdb
+MAPFILE=TestCOMFactory.map
+
+#//------------------------------------------------------------------------
+#// 
+#// Define the files necessary to build the target (ie. OBJS)
+#//
+#//------------------------------------------------------------------------
+OBJS=                                   \
+        .\$(OBJDIR)\TestCOMFactory.obj         \
+        $(NULL)
+#//------------------------------------------------------------------------
+#//
+#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
+#// (these must be defined before the common makefiles are included)
+#//
+#//------------------------------------------------------------------------
+
+PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
+
+
+#//------------------------------------------------------------------------
+#//
+#// Define any local options for the make tools 
+#//     (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
+#//
+#//------------------------------------------------------------------------
+LCFLAGS=-DNETSCAPE
+LLIBS=$(LLIBS) ole32.lib	
+
+LINCS=$(LINCS)  -I. \
+                -I$(PUBLIC)\raptor   \
+                -I$(PUBLIC)\xpcom
+
+# clobber and clobber_all will remove the following garbage:
+GARBAGE	= $(GARBAGE) _gen
+
+#//------------------------------------------------------------------------
+#//
+#// Include the common makefile rules
+#//
+#//------------------------------------------------------------------------
+include <$(DEPTH)/config/rules.mak>
+
+install:: $(PROGRAM)
+    $(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
+
+clobber::
+	rm -f $(DIST)\bin\$(EXENAME).exe

webshell/tests/makefile.win

@@ -18,6 +18,6 @@
 DEPTH=..\..
 IGNORE_MANIFEST=1
 
-DIRS= viewer imgtest
+DIRS= viewer imgtest ComFactory
 
 include <$(DEPTH)\config\rules.mak>