Commit 0325ec71 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

scrrun: Moved script extensions registration to scrrun.dll.

parent e1da3d72
...@@ -116,7 +116,6 @@ HKCR ...@@ -116,7 +116,6 @@ HKCR
OLEScript OLEScript
} }
ForceRemove '.js' = s 'JSFile'
ForceRemove JSFile = s 'JScript Script File' ForceRemove JSFile = s 'JScript Script File'
{ {
ScriptEngine = s 'JScript' ScriptEngine = s 'JScript'
......
...@@ -21,10 +21,15 @@ ...@@ -21,10 +21,15 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "ole2.h"
#include "rpcproxy.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(scrrun); WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
static HINSTANCE scrrun_instance;
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
{ {
TRACE("%p, %u, %p\n", hinst, reason, reserved); TRACE("%p, %u, %p\n", hinst, reason, reserved);
...@@ -35,6 +40,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) ...@@ -35,6 +40,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
return FALSE; /* prefer native version */ return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls( hinst ); DisableThreadLibraryCalls( hinst );
scrrun_instance = hinst;
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
break; break;
...@@ -47,8 +53,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) ...@@ -47,8 +53,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
*/ */
HRESULT WINAPI DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
FIXME("\n"); TRACE("()\n");
return S_OK; return __wine_register_resources(scrrun_instance);
} }
/*********************************************************************** /***********************************************************************
...@@ -56,6 +62,6 @@ HRESULT WINAPI DllRegisterServer(void) ...@@ -56,6 +62,6 @@ HRESULT WINAPI DllRegisterServer(void)
*/ */
HRESULT WINAPI DllUnregisterServer(void) HRESULT WINAPI DllUnregisterServer(void)
{ {
FIXME("\n"); TRACE("()\n");
return S_OK; return __wine_unregister_resources(scrrun_instance);
} }
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/* @makedep: scrrun.rgs */
1 WINE_REGISTRY scrrun.rgs
#define WINE_FILEDESCRIPTION_STR "Wine ScrRun dll" #define WINE_FILEDESCRIPTION_STR "Wine ScrRun dll"
#define WINE_FILENAME_STR "scrrun.dll" #define WINE_FILENAME_STR "scrrun.dll"
#define WINE_FILEVERSION 5,8,7600,16385 #define WINE_FILEVERSION 5,8,7600,16385
......
HKCR
{
ForceRemove '.js' = s 'JSFile'
ForceRemove '.vbs' = s 'VBSFile'
}
...@@ -56,7 +56,6 @@ HKCR ...@@ -56,7 +56,6 @@ HKCR
{ {
OLEScript OLEScript
} }
ForceRemove '.vbs' = s 'VBSFile'
ForceRemove VBSFile = s 'VBScript Script File' ForceRemove VBSFile = s 'VBScript Script File'
{ {
ScriptEngine = s 'VBScript' ScriptEngine = s 'VBScript'
......
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