From 004488e96738c45cacd03b034185fe7c2a3ddfa9 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Tue, 11 Mar 2003 03:29:47 +0000 Subject: [PATCH] Landing mingw plugin changes. Thanks to Dan Mosedale for the changes. Bug #134113 r=peterl sr=dbaron git-svn-id: svn://10.0.0.236/trunk@139250 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp | 4 ++++ mozilla/modules/plugin/samples/default/windows/npnul32.rc | 2 +- .../modules/plugin/tools/sdk/samples/basic/windows/basic.rc | 4 ++-- .../tools/sdk/samples/scriptable/windows/npscriptable.rc | 4 ++-- mozilla/modules/plugin/tools/sdk/samples/simple/npsimple.rc | 2 +- .../plugin/tools/sdk/samples/winless/windows/npwinless.rc | 4 ++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index f8efd402ec4..ac849919668 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -4542,11 +4542,15 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi nsGetFactory = (nsFactoryProc) PR_FindSymbol(pluginTag->mLibrary, "NSGetFactory"); if(nsGetFactory != nsnull && IsCompatibleExecutable(pluginTag->mFullPath)) { +// XPCOM-style plugins (or at least the OJI one) cause crashes on +// on windows GCC builds, so we're just turning them off for now. +#if !defined(XP_WIN) || !defined(__GNUC__) rv = nsGetFactory(serviceManager, kPluginCID, nsnull, nsnull, // XXX fix ClassName/ContractID (nsIFactory**)&pluginTag->mEntryPoint); plugin = pluginTag->mEntryPoint; if (plugin != NULL) plugin->Initialize(); +#endif } else { diff --git a/mozilla/modules/plugin/samples/default/windows/npnul32.rc b/mozilla/modules/plugin/samples/default/windows/npnul32.rc index 06531c49f1d..6a0ef0c7e83 100644 --- a/mozilla/modules/plugin/samples/default/windows/npnul32.rc +++ b/mozilla/modules/plugin/samples/default/windows/npnul32.rc @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winresrc.h""\r\n" "\0" END diff --git a/mozilla/modules/plugin/tools/sdk/samples/basic/windows/basic.rc b/mozilla/modules/plugin/tools/sdk/samples/basic/windows/basic.rc index 49e1613a86a..a1374e95a25 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/basic/windows/basic.rc +++ b/mozilla/modules/plugin/tools/sdk/samples/basic/windows/basic.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winresrc.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -83,7 +83,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winresrc.h""\r\n" "\0" END diff --git a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.rc b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.rc index a9135e647de..3fd92eadd3a 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.rc +++ b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/npscriptable.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winresrc.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -83,7 +83,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winresrc.h""\r\n" "\0" END diff --git a/mozilla/modules/plugin/tools/sdk/samples/simple/npsimple.rc b/mozilla/modules/plugin/tools/sdk/samples/simple/npsimple.rc index fa0d8099aec..b45db870c0c 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/simple/npsimple.rc +++ b/mozilla/modules/plugin/tools/sdk/samples/simple/npsimple.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/mozilla/modules/plugin/tools/sdk/samples/winless/windows/npwinless.rc b/mozilla/modules/plugin/tools/sdk/samples/winless/windows/npwinless.rc index 997334f2ae7..a2c9bbe7086 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/winless/windows/npwinless.rc +++ b/mozilla/modules/plugin/tools/sdk/samples/winless/windows/npwinless.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winresrc.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -83,7 +83,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winresrc.h""\r\n" "\0" END