vbscript: Added Dll[Un]RegisterServer implementation.
Robert Wilhelm
robert at localhost.localdomain
Wed Mar 4 00:31:17 CST 2009
---
dlls/vbscript/Makefile.in | 2 +
dlls/vbscript/vbscript_main.c | 68 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 68 insertions(+), 2 deletions(-)
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/vbscript_main.c b/dlls/vbscript/vbscript_main.c
index 7e57fff..604e372 100644
--- a/dlls/vbscript/vbscript_main.c
+++ b/dlls/vbscript/vbscript_main.c
@@ -32,6 +32,15 @@ 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}};
+
+DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
+
static HINSTANCE vbscript_hinstance;
/******************************************************************
@@ -74,7 +83,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 +146,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
HRESULT WINAPI DllRegisterServer(void)
{
TRACE("()\n");
- return S_OK;
+ return register_inf(TRUE);
}
/***********************************************************************
@@ -91,5 +155,5 @@ HRESULT WINAPI DllRegisterServer(void)
HRESULT WINAPI DllUnregisterServer(void)
{
TRACE("()\n");
- return S_OK;
+ return register_inf(FALSE);
}
--
1.6.0.6
--=-Vugr48pNGSe/N6kcnBR0--
More information about the wine-patches
mailing list