mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

scanning Plugins folder under the application now.

This commit is contained in:
beard%netscape.com 1999-09-18 22:40:36 +00:00
Родитель c0c7604c50
Коммит 80c2af0d9f
2 изменённых файлов: 22 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

17
modules/plugin/base/src/nsPluginsDirMac.cpp
Просмотреть файл

@ -34,24 +34,22 @@
#include <Aliases.h>
#include <string.h>
static nsresult getApplicationDir(nsFileSpec& outAppDir)
static nsresult getApplicationSpec(FSSpec& outAppSpec)
{
// Use the process manager to get the application's FSSpec,
// then construct an nsFileSpec that encapsulates it.
FSSpec spec;
ProcessInfoRec info;
info.processInfoLength = sizeof(info);
info.processName = NULL;
info.processAppSpec = &spec;
info.processAppSpec = &outAppSpec;
ProcessSerialNumber psn = { 0, kCurrentProcess };
OSErr result = GetProcessInformation(&psn, &info);
nsFileSpec appSpec(spec);
appSpec.GetParent(outAppDir);
return NS_OK;
return (result == noErr ? NS_OK : NS_ERROR_FAILURE);
}
nsPluginsDir::nsPluginsDir()
{
#if 0
// Use the folder manager to get location of Extensions folder, and
// build an FSSpec for "Netscape Plugins" within it.
FSSpec& pluginsDir = *this;
@ -63,6 +61,13 @@ nsPluginsDir::nsPluginsDir()
if (result == noErr) {
SetLeafName("Netscape Plugins");
}
#else
// The "Plugins" folder in the application's directory is where plugins are loaded from.
mError = getApplicationSpec(mSpec);
if (NS_SUCCEEDED(mError)) {
SetLeafName("Plugins");
}
#endif
}
nsPluginsDir::~nsPluginsDir() {}

17
modules/plugin/nglsrc/nsPluginsDirMac.cpp
Просмотреть файл

@ -34,24 +34,22 @@
#include <Aliases.h>
#include <string.h>
static nsresult getApplicationDir(nsFileSpec& outAppDir)
static nsresult getApplicationSpec(FSSpec& outAppSpec)
{
// Use the process manager to get the application's FSSpec,
// then construct an nsFileSpec that encapsulates it.
FSSpec spec;
ProcessInfoRec info;
info.processInfoLength = sizeof(info);
info.processName = NULL;
info.processAppSpec = &spec;
info.processAppSpec = &outAppSpec;
ProcessSerialNumber psn = { 0, kCurrentProcess };
OSErr result = GetProcessInformation(&psn, &info);
nsFileSpec appSpec(spec);
appSpec.GetParent(outAppDir);
return NS_OK;
return (result == noErr ? NS_OK : NS_ERROR_FAILURE);
}
nsPluginsDir::nsPluginsDir()
{
#if 0
// Use the folder manager to get location of Extensions folder, and
// build an FSSpec for "Netscape Plugins" within it.
FSSpec& pluginsDir = *this;
@ -63,6 +61,13 @@ nsPluginsDir::nsPluginsDir()
if (result == noErr) {
SetLeafName("Netscape Plugins");
}
#else
// The "Plugins" folder in the application's directory is where plugins are loaded from.
mError = getApplicationSpec(mSpec);
if (NS_SUCCEEDED(mError)) {
SetLeafName("Plugins");
}
#endif
}
nsPluginsDir::~nsPluginsDir() {}