[VBSCRIPT] Sync with Wine Staging 4.18. CORE-16441

[reactos.git] / dll / win32 / vbscript / vbscript_main.c

diff --git a/dll/win32/vbscript/vbscript_main.c b/dll/win32/vbscript/vbscript_main.c
index 786b7fb..6e6f386 100644 (file)
--- a/dll/win32/vbscript/vbscript_main.c
+++ b/dll/win32/vbscript/vbscript_main.c
@@ -35,64 +35,19 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 static HINSTANCE vbscript_hinstance;
 
-static ITypeLib *typelib;
-static ITypeInfo *typeinfos[LAST_tid];
-
-static REFIID tid_ids[] = {
-#define XDIID(iface) &DIID_ ## iface,
-TID_LIST
-#undef XDIID
-};
-
-HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
+BSTR get_vbscript_string(int id)
 {
-    HRESULT hres;
-
-    if (!typelib) {
-        ITypeLib *tl;
-
-        static const WCHAR vbscript_dll1W[] = {'v','b','s','c','r','i','p','t','.','d','l','l','\\','1',0};
-
-        hres = LoadTypeLib(vbscript_dll1W, &tl);
-        if(FAILED(hres)) {
-            ERR("LoadRegTypeLib failed: %08x\n", hres);
-            return hres;
-        }
-
-        if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL))
-            ITypeLib_Release(tl);
-    }
-
-    if(!typeinfos[tid]) {
-        ITypeInfo *ti;
-
-        hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti);
-        if(FAILED(hres)) {
-            ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres);
-            return hres;
-        }
-
-        if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL))
-            ITypeInfo_Release(ti);
-    }
-
-    *typeinfo = typeinfos[tid];
-    return S_OK;
+    WCHAR buf[512];
+    if(!LoadStringW(vbscript_hinstance, id, buf, ARRAY_SIZE(buf))) return NULL;
+    return SysAllocString(buf);
 }
 
-static void release_typelib(void)
+BSTR get_vbscript_error_string(HRESULT error)
 {
-    unsigned i;
-
-    if(!typelib)
-        return;
-
-    for(i = 0; i < ARRAY_SIZE(typeinfos); i++) {
-        if(typeinfos[i])
-            ITypeInfo_Release(typeinfos[i]);
-    }
-
-    ITypeLib_Release(typelib);
+    BSTR ret;
+    if(HRESULT_FACILITY(error) != FACILITY_VBS || !(ret = get_vbscript_string(HRESULT_CODE(error))))
+        ret = get_vbscript_string(VBS_UNKNOWN_RUNTIME_ERROR);
+    return ret;
 }
 
 #define MIN_BLOCK_SIZE  128
@@ -301,7 +256,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
         break;
     case DLL_PROCESS_DETACH:
         if (lpv) break;
-        release_typelib();
         release_regexp_typelib();
     }