Code Cleanup...
git-svn-id: svn://10.0.0.236/trunk@961 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
97e25edfcc
commit
a9f9424d30
@ -29,12 +29,6 @@
|
||||
{ 0xbf88e640, 0xdf99, 0x11d1, \
|
||||
{0x92, 0x44, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
|
||||
|
||||
//c6efb6c0-df99-11d1-9244-00805f8a7ab6
|
||||
#define NS_ISHELLINSTANCE_CID \
|
||||
{ 0xc6efb6c0, 0xdf99, 0x11d1, \
|
||||
{0x92, 0x44, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
|
||||
|
||||
|
||||
// Interface to the application shell.
|
||||
class nsIShellInstance : public nsISupports {
|
||||
public:
|
||||
|
||||
@ -24,7 +24,6 @@ DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN
|
||||
MODULE=raptor
|
||||
|
||||
EXPORTS = \
|
||||
nsShellInstance.h \
|
||||
nsApplicationManager.h \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -31,9 +31,6 @@
|
||||
|
||||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
|
||||
static NS_DEFINE_IID(kIShellInstanceIID, NS_ISHELLINSTANCE_IID);
|
||||
static NS_DEFINE_CID(kIShellInstanceCID, NS_ISHELLINSTANCE_CID);
|
||||
static NS_DEFINE_CID(kCShellInstanceIID, NS_ISHELLINSTANCE_CID);
|
||||
|
||||
class nsShellInstanceFactory : public nsIFactory {
|
||||
|
||||
@ -61,7 +58,7 @@ nsShellInstance::~nsShellInstance()
|
||||
|
||||
NS_IMPL_ADDREF(nsShellInstance)
|
||||
NS_IMPL_RELEASE(nsShellInstance)
|
||||
NS_IMPL_QUERY_INTERFACE(nsShellInstance,NS_ISHELLINSTANCE_CID);
|
||||
NS_IMPL_QUERY_INTERFACE(nsShellInstance,NS_ISHELLINSTANCE_IID);
|
||||
|
||||
nsresult nsShellInstance::Init()
|
||||
{
|
||||
@ -218,15 +215,3 @@ extern "C" NS_WEB nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFacto
|
||||
}
|
||||
|
||||
|
||||
NS_WEB nsresult NS_NewShellInstance(nsIShellInstance** aInstancePtrResult)
|
||||
{
|
||||
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
|
||||
if (nsnull == aInstancePtrResult) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
nsShellInstance* it = new nsShellInstance();
|
||||
if (nsnull == it) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
return it->QueryInterface(kIShellInstanceIID, (void **) aInstancePtrResult);
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ CPP_OBJS= \
|
||||
.\$(OBJDIR)\winmain.obj \
|
||||
$(NULL)
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\dom -I$(XPDIST)\public\js
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\dom -I$(XPDIST)\public\js -I..
|
||||
|
||||
MAKE_OBJ_TYPE = LIB
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ extern nsIID kIXPCOMApplicationShellCID ;
|
||||
|
||||
static NS_DEFINE_IID(kIApplicationShellIID, NS_IAPPLICATIONSHELL_IID);
|
||||
static NS_DEFINE_IID(kCApplicationShellIID, NS_IAPPLICATIONSHELL_CID);
|
||||
static NS_DEFINE_IID(kCShellInstanceIID, NS_ISHELLINSTANCE_CID);
|
||||
static NS_DEFINE_IID(kCShellInstanceIID, NS_ISHELLINSTANCE_IID);
|
||||
|
||||
int PASCAL WinMain(HANDLE instance, HANDLE prevInstance, LPSTR cmdParam, int nCmdShow)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user