Commit 4a91265b authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

npmshtml: Added Mozilla plugin for mshtml ActiveX controls.

parent a273ce07
...@@ -15022,6 +15022,7 @@ wine_fn_config_dll nddeapi enable_nddeapi nddeapi ...@@ -15022,6 +15022,7 @@ wine_fn_config_dll nddeapi enable_nddeapi nddeapi
wine_fn_config_dll netapi32 enable_netapi32 netapi32 wine_fn_config_dll netapi32 enable_netapi32 netapi32
wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_test dlls/netapi32/tests netapi32_test
wine_fn_config_dll newdev enable_newdev newdev wine_fn_config_dll newdev enable_newdev newdev
wine_fn_config_dll npmshtml enable_npmshtml
wine_fn_config_dll ntdll enable_ntdll ntdll wine_fn_config_dll ntdll enable_ntdll ntdll
wine_fn_config_test dlls/ntdll/tests ntdll_test wine_fn_config_test dlls/ntdll/tests ntdll_test
wine_fn_config_dll ntdsapi enable_ntdsapi ntdsapi wine_fn_config_dll ntdsapi enable_ntdsapi ntdsapi
......
...@@ -2599,6 +2599,7 @@ WINE_CONFIG_DLL(nddeapi,,[nddeapi]) ...@@ -2599,6 +2599,7 @@ WINE_CONFIG_DLL(nddeapi,,[nddeapi])
WINE_CONFIG_DLL(netapi32,,[netapi32]) WINE_CONFIG_DLL(netapi32,,[netapi32])
WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_TEST(dlls/netapi32/tests)
WINE_CONFIG_DLL(newdev,,[newdev]) WINE_CONFIG_DLL(newdev,,[newdev])
WINE_CONFIG_DLL(npmshtml)
WINE_CONFIG_DLL(ntdll,,[ntdll]) WINE_CONFIG_DLL(ntdll,,[ntdll])
WINE_CONFIG_TEST(dlls/ntdll/tests) WINE_CONFIG_TEST(dlls/ntdll/tests)
WINE_CONFIG_DLL(ntdsapi,,[ntdsapi]) WINE_CONFIG_DLL(ntdsapi,,[ntdsapi])
......
...@@ -520,3 +520,12 @@ const char *debugstr_variant(const VARIANT *v) ...@@ -520,3 +520,12 @@ const char *debugstr_variant(const VARIANT *v)
return wine_dbg_sprintf("{vt %d}", V_VT(v)); return wine_dbg_sprintf("{vt %d}", V_VT(v));
} }
} }
/***********************************************************************
* NP_GetEntryPoints (npmshtml.@)
*/
INT16 WINAPI NP_GetEntryPoints(void *funcs)
{
FIXME("(%p)\n", funcs);
return 1;
}
...@@ -19,3 +19,6 @@ ...@@ -19,3 +19,6 @@
@ stub com_ms_osp_ospmrshl_copyToExternal @ stub com_ms_osp_ospmrshl_copyToExternal
@ stub com_ms_osp_ospmrshl_releaseByValExternal @ stub com_ms_osp_ospmrshl_releaseByValExternal
@ stub com_ms_osp_ospmrshl_toJava @ stub com_ms_osp_ospmrshl_toJava
#Wine extension for Mozilla plugin support
@ stdcall NP_GetEntryPoints(ptr)
...@@ -244,6 +244,8 @@ static void set_environment(LPCWSTR gre_path) ...@@ -244,6 +244,8 @@ static void set_environment(LPCWSTR gre_path)
static const WCHAR nspr_log_modulesW[] = static const WCHAR nspr_log_modulesW[] =
{'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0};
static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0};
static const WCHAR moz_plugin_pathW[] = {'M','O','Z','_','P','L','U','G','I','N','_','P','A','T','H',0};
static const WCHAR gecko_pluginW[] = {'\\','g','e','c','k','o','\\','p','l','u','g','i','n',0};
/* We have to modify PATH as XPCOM loads other DLLs from this directory. */ /* We have to modify PATH as XPCOM loads other DLLs from this directory. */
GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR));
...@@ -263,6 +265,12 @@ static void set_environment(LPCWSTR gre_path) ...@@ -263,6 +265,12 @@ static void set_environment(LPCWSTR gre_path)
sprintfW(buf, debug_formatW, debug_level); sprintfW(buf, debug_formatW, debug_level);
SetEnvironmentVariableW(nspr_log_modulesW, buf); SetEnvironmentVariableW(nspr_log_modulesW, buf);
len = GetSystemDirectoryW(path_env, (sizeof(path_env)-sizeof(gecko_pluginW))/sizeof(WCHAR)+1);
if(len) {
strcpyW(path_env+len, gecko_pluginW);
SetEnvironmentVariableW(moz_plugin_pathW, path_env);
}
} }
static BOOL load_xpcom(const PRUnichar *gre_path) static BOOL load_xpcom(const PRUnichar *gre_path)
......
MODULE = npmshtml.dll
IMPORTS = mshtml
C_SRCS = main.c
RC_SRCS = rsrc.rc
@MAKE_DLL_RULES@
/*
* Copyright 2010 Jacek Caban for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(npmshtml);
/***********************************************************************
* NP_Initialize (npmshtml.@)
*/
INT16 WINAPI NP_Initialize(void *arg)
{
return 0;
}
/***********************************************************************
* NP_Shutdown (npmshtml.@)
*/
INT16 WINAPI NP_Shutdown(void)
{
return 0;
}
1 stdcall NP_GetEntryPoints(ptr) mshtml.NP_GetEntryPoints
2 stdcall NP_Initialize(ptr)
3 stdcall NP_Shutdown()
/*
* Copyright 2010 Jacek Caban for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WINE_OLESELFREGISTER
#define WINE_FILEDESCRIPTION_STR "Wine ActiveX plugin"
#define WINE_FILENAME_STR "npmshtml.dll"
#define WINE_MIMETYPE "application/x-oleobject"
#include "wine/wine_common_ver.rc"
...@@ -111,6 +111,9 @@ FILESUBTYPE WINE_FILESUBTYPE ...@@ -111,6 +111,9 @@ FILESUBTYPE WINE_FILESUBTYPE
#ifdef WINE_OLESELFREGISTER #ifdef WINE_OLESELFREGISTER
VALUE "OLESelfRegister", "" VALUE "OLESelfRegister", ""
#endif #endif
#ifdef WINE_MIMETYPE
VALUE "MIMEType", WINE_MIMETYPE
#endif
} }
} }
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
...@@ -2607,6 +2607,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ...@@ -2607,6 +2607,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe 10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe
10,Microsoft.NET\Framework\v4.0.30319,ngen.exe 10,Microsoft.NET\Framework\v4.0.30319,ngen.exe
10,Microsoft.NET\Framework\v4.0.30319,fusion.dll 10,Microsoft.NET\Framework\v4.0.30319,fusion.dll
11,gecko\plugin,npmshtml.dll
11,wbem,mofcomp.exe 11,wbem,mofcomp.exe
16422,Internet Explorer,iexplore.exe 16422,Internet Explorer,iexplore.exe
11,,* 11,,*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment