From e8ac7f2bebcaedeef32bef4e199eb03525430c19 Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Thu, 31 Jan 2002 15:34:42 +0000 Subject: [PATCH] Remove dead test code - ComFactory. b=113970 git-svn-id: svn://10.0.0.236/trunk@113315 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webshell/tests/ComFactory/Makefile.in | 42 ---------- .../tests/ComFactory/TestCOMFactory.cpp | 77 ------------------ .../webshell/tests/ComFactory/makefile.win | 80 ------------------- 3 files changed, 199 deletions(-) delete mode 100644 mozilla/webshell/tests/ComFactory/Makefile.in delete mode 100644 mozilla/webshell/tests/ComFactory/TestCOMFactory.cpp delete mode 100644 mozilla/webshell/tests/ComFactory/makefile.win diff --git a/mozilla/webshell/tests/ComFactory/Makefile.in b/mozilla/webshell/tests/ComFactory/Makefile.in deleted file mode 100644 index e3d49b0ef9a..00000000000 --- a/mozilla/webshell/tests/ComFactory/Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (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/MPL/ -# -# 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.org code -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 2001 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MAPFILE = TestCOMFactory.map -PROGRAM = TestCOMFactory$(BIN_SUFFIX) - -CPPSRCS = TestCOMFactory.cpp - -LIBS = $(XPCOM_LIBS) - -REQUIRES = xpcom \ - webshell \ - $(NULL) - -OS_LIBS += ole32.lib - -include $(topsrcdir)/config/rules.mk diff --git a/mozilla/webshell/tests/ComFactory/TestCOMFactory.cpp b/mozilla/webshell/tests/ComFactory/TestCOMFactory.cpp deleted file mode 100644 index dca5d4b9cf0..00000000000 --- a/mozilla/webshell/tests/ComFactory/TestCOMFactory.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (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 the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -// Standard Windows/COM headers -#include -#include - -// 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 webshell.dll\n"); - } else { - printf("Error: CoCreateInstance(...) failed.\n"); - } - - OleUninitialize(); - return 0; -} diff --git a/mozilla/webshell/tests/ComFactory/makefile.win b/mozilla/webshell/tests/ComFactory/makefile.win deleted file mode 100644 index b3934bae6c6..00000000000 --- a/mozilla/webshell/tests/ComFactory/makefile.win +++ /dev/null @@ -1,80 +0,0 @@ -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (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.org 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. -# -# Contributor(s): - -IGNORE_MANIFEST = 1 - -DEPTH= ..\..\.. -REQUIRES = xpcom \ - webshell \ - $(NULL) - - -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= $(DIST)\lib\xpcom.lib -WIN_LIBS=ole32.lib - -# clobber and clobber_all will remove the following garbage: -GARBAGE = $(GARBAGE) _gen - -#//------------------------------------------------------------------------ -#// -#// Include the common makefile rules -#// -#//------------------------------------------------------------------------ -include <$(DEPTH)/config/rules.mak> - -libs:: $(PROGRAM) - $(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin - -clobber:: - rm -f $(DIST)\bin\$(EXENAME).exe