Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

register correct components directory

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@41739 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dveditz%netscape.com 1999-07-31 20:28:58 +00:00
parent fcd30e3c4e
commit e68940adbb
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/xpinstall/stub/makefile.win
View File

@ -32,6 +32,7 @@ OBJS = \
$(NULL)
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\xpcom.lib \
$(NULL)

45
mozilla/xpinstall/stub/xpistub.cpp
View File

@ -38,6 +38,11 @@
#include "nsISoftwareUpdate.h"
#include "nsSoftwareUpdateIIDs.h"
#include "plstr.h"
#ifdef XP_PC
#include <direct.h>
#endif
//------------------------------------------------------------------------
@ -58,9 +63,39 @@ PR_PUBLIC_API(nsresult) XPI_Init( pfnXPIStart startCB,
pfnXPIProgress progressCB,
pfnXPIFinal finalCB )
{
nsresult rv;
nsresult rv;
char szTemp[_MAX_PATH];
nsCOMPtr<nsIFileSpec> nsIfsDirectory;
nsFileSpec nsfsDirectory;
#ifdef XP_PC
//
// Passing 0 as the 2nd parameter to AutoRegister() will tell it to
// automatically determine the path to the components directory.
// Since XPI_Init() is being called by Setup.exe, not apprunner.exe,
// the wrong components directory is determined.
// As a requirement to loading xpistub.dll, it must be loaded from
// the same directory as xpcom.dll.
// This makes is easy to locate the correct components directory by
// using a form of GetCurrentDirectory().
//
// Since nsFileSpec() does not contain a GetCwd() function,
// a call to getcwd() is being used under Windows only.
//
getcwd(szTemp, _MAX_PATH);
PL_strcat(szTemp, "\\");
PL_strcat(szTemp, "components");
nsfsDirectory = szTemp;
rv = NS_NewFileSpecWithSpec(*(&nsfsDirectory), getter_AddRefs(nsIfsDirectory));
if(NS_FAILED(rv))
return rv;
rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, nsIfsDirectory);
#else
rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, 0);
#endif
if (NS_SUCCEEDED(rv))
{
rv = nsComponentManager::CreateInstance(kSoftwareUpdateCID,
@ -70,14 +105,16 @@ PR_PUBLIC_API(nsresult) XPI_Init( pfnXPIStart startCB,
if (NS_SUCCEEDED(rv))
{
gNotifier = new nsStubNotifier( startCB, progressCB, finalCB );
if (!gNotifier)
nsStubNotifier* stub = new nsStubNotifier( startCB, progressCB, finalCB );
if (!stub)
{
gXPI->Release();
rv = NS_ERROR_OUT_OF_MEMORY;
}
else
gNotifier->AddRef();
{
rv = stub->QueryInterface(nsIXPINotifier::GetIID(), (void**)&gNotifier);
}
}
}