Added Dll [Un]RegisterServer Implementation.
Robert Wilhelm
robert.wilhelm at gmx.net
Sat Mar 7 10:53:44 CST 2009
---
dlls/vbscript/Makefile.in | 2 +
dlls/vbscript/rsrc.rc | 22 +++++++++
dlls/vbscript/vbscript.inf | 97 +++++++++++++++++++++++++++++++++++++++++
dlls/vbscript/vbscript_main.c | 66 +++++++++++++++++++++++++++-
4 files changed, 185 insertions(+), 2 deletions(-)
create mode 100644 dlls/vbscript/rsrc.rc
create mode 100644 dlls/vbscript/vbscript.inf
diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in
index 508c62e..1f62406 100644
--- a/dlls/vbscript/Makefile.in
+++ b/dlls/vbscript/Makefile.in
@@ -5,6 +5,8 @@ VPATH = @srcdir@
MODULE = vbscript.dll
IMPORTS = kernel32
+RC_SRCS = rsrc.rc
+
C_SRCS = \
vbscript_main.c
diff --git a/dlls/vbscript/rsrc.rc b/dlls/vbscript/rsrc.rc
new file mode 100644
index 0000000..64dc221
--- /dev/null
+++ b/dlls/vbscript/rsrc.rc
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2009 Robert Wilhelm
+ *
+ * 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
+ */
+
+/* @makedep: vbscript.inf */
+REGINST REGINST vbscript.inf
+
+
diff --git a/dlls/vbscript/vbscript.inf b/dlls/vbscript/vbscript.inf
new file mode 100644
index 0000000..22c69b4
--- /dev/null
+++ b/dlls/vbscript/vbscript.inf
@@ -0,0 +1,97 @@
+[version]
+Signature="$CHICAGO$"
+
+
+[RegisterDll]
+AddReg=Classes.Reg
+
+
+[UnregisterDll]
+DelReg=Classes.Reg
+
+
+[Classes.Reg]
+HKCR,"CLSID\%CLSID_VBScript%",,,"VBScript Language"
+HKCR,"CLSID\%CLSID_VBScript%\Implemented Categories\%CATID_ActiveScript%",,,
+HKCR,"CLSID\%CLSID_VBScript%\Implemented Categories\%CATID_ActiveScriptParse%",,,
+HKCR,"CLSID\%CLSID_VBScript%\InprocServer32",,,"%MODULE%"
+HKCR,"CLSID\%CLSID_VBScript%\InprocServer32","ThreadingModel",,"Both"
+HKCR,"CLSID\%CLSID_VBScript%\OLEScript",,,
+HKCR,"CLSID\%CLSID_VBScript%\ProgID",,,"VBScript"
+
+HKCR,"CLSID\%CLSID_VBScriptAuthor%",,,"VBScript Language Authoring"
+HKCR,"CLSID\%CLSID_VBScriptAuthor%\Implemented Categories\%CATID_ActiveScriptAuthor%",,,
+HKCR,"CLSID\%CLSID_VBScriptAuthor%\InprocServer32",,,"%MODULE%"
+HKCR,"CLSID\%CLSID_VBScriptAuthor%\InprocServer32","ThreadingModel",,"Both"
+HKCR,"CLSID\%CLSID_VBScriptAuthor%\OLEScript",,,
+HKCR,"CLSID\%CLSID_VBScriptAuthor%\ProgID",,,"VBScript Author"
+
+HKCR,"CLSID\%CLSID_VBScriptEncode%",,,"VBScript Language Encoding"
+HKCR,"CLSID\%CLSID_VBScriptEncode%\Implemented Categories\%CATID_ActiveScript%",,,
+HKCR,"CLSID\%CLSID_VBScriptEncode%\Implemented Categories\%CATID_ActiveScriptParse%",,,
+HKCR,"CLSID\%CLSID_VBScriptEncode%\Implemented Categories\%CATID_ActiveScriptEncode%",,,
+HKCR,"CLSID\%CLSID_VBScriptEncode%\InprocServer32",,,"%MODULE%"
+HKCR,"CLSID\%CLSID_VBScriptEncode%\InprocServer32","ThreadingModel",,"Both"
+HKCR,"CLSID\%CLSID_VBScriptEncode%\OLEScript",,,
+HKCR,"CLSID\%CLSID_VBScriptEncode%\ProgID",,,"VBScript.Encode"
+
+HKCR,"Component Categories\%CATID_ActiveScriptAuthor%","409",,"Active Scripting Engine with Authoring"
+HKCR,"Component Categories\%CATID_ActiveScript%","409",,"Active Scripting Engine"
+HKCR,"Component Categories\%CATID_ActiveScriptParse%","409",,"Active Scripting Engine with Parsing"
+HKCR,"Component Categories\%CATID_ActiveScriptEncode%","409",,"Active Scripting Engine with Encoding"
+
+HKCR,"ECMAScript",,,"VBScript Language"
+HKCR,"ECMAScript\CLSID",,,"%CLSID_VBScript%"
+HKCR,"ECMAScript\OLEScript",,,
+
+HKCR,"VBavaScript",,,"VBScript Language"
+HKCR,"VBavaScript\CLSID",,,"%CLSID_VBScript%"
+HKCR,"VBavaScript\OLEScript",,,
+
+HKCR,"VBavaScript Author",,,"VBScript Language Authoring"
+HKCR,"VBavaScript Author\CLSID",,,"%CLSID_VBScriptAuthor%"
+HKCR,"VBavaScript Author\OLEScript",,,
+
+HKCR,"VBavaScript1.1",,,"VBScript Language"
+HKCR,"VBavaScript1.1\CLSID",,,"%CLSID_VBScript%"
+HKCR,"VBavaScript1.1\OLEScript",,,
+
+HKCR,"VBavaScript1.1 Author",,,"VBScript Language Authoring"
+HKCR,"VBavaScript1.1 Author\CLSID",,,"%CLSID_VBScriptAuthor%"
+HKCR,"VBavaScript1.1 Author\OLEScript",,,
+
+HKCR,"VBavaScript1.2",,,"VBScript Language"
+HKCR,"VBavaScript1.2\CLSID",,,"%CLSID_VBScript%"
+HKCR,"VBavaScript1.2\OLEScript",,,
+
+HKCR,"VBavaScript1.2 Author",,,"VBScript Language Authoring"
+HKCR,"VBavaScript1.2 Author\CLSID",,,"%CLSID_VBScriptAuthor%"
+HKCR,"VBavaScript1.2 Author\OLEScript",,,
+
+HKCR,"VBavaScript1.3",,,"VBScript Language"
+HKCR,"VBavaScript1.3\CLSID",,,"%CLSID_VBScript%"
+HKCR,"VBavaScript1.3\OLEScript",,,
+
+HKCR,"VBScript",,,"VBScript Language"
+HKCR,"VBScript\CLSID",,,"%CLSID_VBScript%"
+HKCR,"VBScript\OLEScript",,,
+
+HKCR,"VBScript Author",,,"VBScript Language Authoring"
+HKCR,"VBScript Author\CLSID",,,"%CLSID_VBScriptAuthor%"
+HKCR,"VBScript Author\OLEScript",,,
+
+HKCR,"VBScript.Encode",,,"VBScript Language Encoding"
+HKCR,"VBScript.Encode\CLSID",,,"%CLSID_VBScriptEncode%"
+HKCR,"VBScript.Encode\OLEScript",,,
+
+HKCR,"LiveScript",,,"VBScript Language"
+HKCR,"LiveScript\CLSID",,,"%CLSID_VBScript%"
+HKCR,"LiveScript\OLEScript",,,
+
+HKCR,"LiveScript Author",,,"VBScript Language Authoring"
+HKCR,"LiveScript Author\CLSID",,,"%CLSID_VBScriptAuthor%"
+HKCR,"LiveScript Author\OLEScript",,,
+
+
+[Strings]
+MODULE="vbscript.dll"
diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c
index 7e57fff..540d9dc 100644
--- a/dlls/vbscript/vbscript_main.c
+++ b/dlls/vbscript/vbscript_main.c
@@ -32,6 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
LONG module_ref = 0;
+static const CLSID CLSID_VBScript =
+ {0xb54f3741,0x5b07,0x11cf,{0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8}};
+static const CLSID CLSID_VBScriptAuthor =
+ {0xb54f3742,0x5b07,0x11cf,{0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8}};
+static const CLSID CLSID_VBScriptEncode =
+ {0xb54f3743,0x5b07,0x11cf,{0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8}};
+
static HINSTANCE vbscript_hinstance;
/******************************************************************
@@ -74,7 +81,62 @@ HRESULT WINAPI DllCanUnloadNow(void)
return module_ref ? S_FALSE : S_OK;
}
+/***********************************************************************
+ * register_inf
+ */
+
+#define INF_SET_ID(id) \
+ do \
+ { \
+ static CHAR name[] = #id; \
+ \
+ pse[i].pszName = name; \
+ clsids[i++] = &id; \
+ } while (0)
+
+static HRESULT register_inf(BOOL doregister)
+{
+ HRESULT hres;
+ HMODULE hAdvpack;
+ HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable);
+ STRTABLEA strtable;
+ STRENTRYA pse[7];
+ static CLSID const *clsids[7];
+ unsigned int i = 0;
+
+ static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
+
+ INF_SET_ID(CLSID_VBScript);
+ INF_SET_ID(CLSID_VBScriptAuthor);
+ INF_SET_ID(CLSID_VBScriptEncode);
+ INF_SET_ID(CATID_ActiveScript);
+ INF_SET_ID(CATID_ActiveScriptParse);
+ INF_SET_ID(CATID_ActiveScriptEncode);
+ INF_SET_ID(CATID_ActiveScriptAuthor);
+
+ for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) {
+ pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39);
+ sprintf(pse[i].pszValue, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+ clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0],
+ clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4],
+ clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]);
+ }
+
+ strtable.cEntries = sizeof(pse)/sizeof(pse[0]);
+ strtable.pse = pse;
+
+ hAdvpack = LoadLibraryW(advpackW);
+ pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall");
+
+ hres = pRegInstall(vbscript_hinstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable);
+
+ for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++)
+ HeapFree(GetProcessHeap(), 0, pse[i].pszValue);
+
+ return hres;
+}
+#undef INF_SET_CLSID
/***********************************************************************
* DllRegisterServer (vbscript.@)
@@ -82,7 +144,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
HRESULT WINAPI DllRegisterServer(void)
{
TRACE("()\n");
- return S_OK;
+ return register_inf(TRUE);
}
/***********************************************************************
@@ -91,5 +153,5 @@ HRESULT WINAPI DllRegisterServer(void)
HRESULT WINAPI DllUnregisterServer(void)
{
TRACE("()\n");
- return S_OK;
+ return register_inf(FALSE);
}
--
1.6.0.6
--=-am9tRa2wvSQ9KHD5ai9O--
More information about the wine-patches
mailing list