December 2019 - Wine-commits

Nikolay Sivov : oleaut32/typelib: Simplify variable and function description lookup helpers.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 06842c709d2fd87898277e0d1b5304c3c4540ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06842c709d2fd87898277e0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 10 16:49:04 2019 +0300 oleaut32/typelib: Simplify variable and function description lookup helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 67 ++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f490795cc7..528fe6372c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1679,39 +1679,42 @@ static BSTR TLB_MultiByteToBSTR(const char *ptr) return ret; } -static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(TLBFuncDesc *funcdescs, - UINT n, MEMBERID memid) +static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(ITypeInfoImpl *typeinfo, MEMBERID memid) { - while(n){ - if(funcdescs->funcdesc.memid == memid) - return funcdescs; - ++funcdescs; - --n; + int i; + + for (i = 0; i < typeinfo->typeattr.cFuncs; ++i) + { + if (typeinfo->funcdescs[i].funcdesc.memid == memid) + return &typeinfo->funcdescs[i]; } + return NULL; } -static inline TLBVarDesc *TLB_get_vardesc_by_memberid(TLBVarDesc *vardescs, - UINT n, MEMBERID memid) +static inline TLBVarDesc *TLB_get_vardesc_by_memberid(ITypeInfoImpl *typeinfo, MEMBERID memid) { - while(n){ - if(vardescs->vardesc.memid == memid) - return vardescs; - ++vardescs; - --n; + int i; + + for (i = 0; i < typeinfo->typeattr.cVars; ++i) + { + if (typeinfo->vardescs[i].vardesc.memid == memid) + return &typeinfo->vardescs[i]; } + return NULL; } -static inline TLBVarDesc *TLB_get_vardesc_by_name(TLBVarDesc *vardescs, - UINT n, const OLECHAR *name) +static inline TLBVarDesc *TLB_get_vardesc_by_name(ITypeInfoImpl *typeinfo, const OLECHAR *name) { - while(n){ - if(!lstrcmpiW(TLB_get_bstr(vardescs->Name), name)) - return vardescs; - ++vardescs; - --n; + int i; + + for (i = 0; i < typeinfo->typeattr.cVars; ++i) + { + if (!lstrcmpiW(TLB_get_bstr(typeinfo->vardescs[i].Name), name)) + return &typeinfo->vardescs[i]; } + return NULL; } @@ -5128,7 +5131,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName( } } - var = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->typeattr.cVars, name); + var = TLB_get_vardesc_by_name(pTInfo, name); if (var) { memid[count] = var->vardesc.memid; goto ITypeLib2_fnFindName_exit; @@ -6117,7 +6120,7 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, *pcNames = 0; - pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->typeattr.cFuncs, memid); + pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc) { if(!cMaxNames || !pFDesc->Name) @@ -6135,7 +6138,7 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, return S_OK; } - pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->typeattr.cVars, memid); + pVDesc = TLB_get_vardesc_by_memberid(This, memid); if(pVDesc) { *rgBstrNames=SysAllocString(TLB_get_bstr(pVDesc->Name)); @@ -6294,7 +6297,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, return ret; } } - pVDesc = TLB_get_vardesc_by_name(This->vardescs, This->typeattr.cVars, *rgszNames); + pVDesc = TLB_get_vardesc_by_name(This, *rgszNames); if(pVDesc){ if(cNames) *pMemId = pVDesc->vardesc.memid; @@ -7743,7 +7746,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, *pBstrHelpFile=SysAllocString(TLB_get_bstr(This->pTypeLib->HelpFile)); return S_OK; }else {/* for a member */ - pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->typeattr.cFuncs, memid); + pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc){ if(pBstrName) *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Name)); @@ -7755,7 +7758,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, *pBstrHelpFile = SysAllocString(TLB_get_bstr(This->pTypeLib->HelpFile)); return S_OK; } - pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->typeattr.cVars, memid); + pVDesc = TLB_get_vardesc_by_memberid(This, memid); if(pVDesc){ if(pBstrName) *pBstrName = SysAllocString(TLB_get_bstr(pVDesc->Name)); @@ -7809,7 +7812,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid if (This->typeattr.typekind != TKIND_MODULE) return TYPE_E_BADMODULEKIND; - pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->typeattr.cFuncs, memid); + pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc){ dump_TypeInfo(This); if (TRACE_ON(ole)) @@ -8317,7 +8320,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarIndexOfMemId( ITypeInfo2 * iface, TRACE("%p %d %p\n", iface, memid, pVarIndex); - pVarInfo = TLB_get_vardesc_by_memberid(This->vardescs, This->typeattr.cVars, memid); + pVarInfo = TLB_get_vardesc_by_memberid(This, memid); if(!pVarInfo) return TYPE_E_ELEMENTNOTFOUND; @@ -8510,7 +8513,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2( SysAllocString(TLB_get_bstr(This->pTypeLib->HelpStringDll));/* FIXME */ return S_OK; }else {/* for a member */ - pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->typeattr.cFuncs, memid); + pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc){ if(pbstrHelpString) *pbstrHelpString=SysAllocString(TLB_get_bstr(pFDesc->HelpString)); @@ -8521,7 +8524,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2( SysAllocString(TLB_get_bstr(This->pTypeLib->HelpStringDll));/* FIXME */ return S_OK; } - pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->typeattr.cVars, memid); + pVDesc = TLB_get_vardesc_by_memberid(This, memid); if(pVDesc){ if(pbstrHelpString) *pbstrHelpString=SysAllocString(TLB_get_bstr(pVDesc->HelpString)); @@ -8868,7 +8871,7 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfo_AddRef(*ppTInfo); return S_OK; } else { - pVDesc = TLB_get_vardesc_by_name(This->vardescs, This->typeattr.cVars, szName); + pVDesc = TLB_get_vardesc_by_name(This, szName); if(pVDesc){ HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc); if (FAILED(hr))

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeComp_BindType.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 422c66a671c444ce5ece6b15c445287a0e720ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=422c66a671c444ce5ece6b15… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 9 17:29:25 2019 +0200 vbscript: Implement ScriptTypeComp_BindType. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 2f68c16567..6dc34b32d9 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -988,8 +988,25 @@ static HRESULT WINAPI ScriptTypeComp_BindType(ITypeComp *iface, LPOLESTR szName, ITypeInfo **ppTInfo, ITypeComp **ppTComp) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeComp(iface); - FIXME("(%p)->(%s %08x %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp); - return E_NOTIMPL; + ITypeInfo *disp_typeinfo; + ITypeComp *disp_typecomp; + HRESULT hr; + + TRACE("(%p)->(%s %08x %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp); + + if (!szName || !ppTInfo || !ppTComp) + return E_INVALIDARG; + + /* Look into the inherited IDispatch */ + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + hr = ITypeInfo_GetTypeComp(disp_typeinfo, &disp_typecomp); + if (FAILED(hr)) return hr; + + hr = ITypeComp_BindType(disp_typecomp, szName, lHashVal, ppTInfo, ppTComp); + ITypeComp_Release(disp_typecomp); + return hr; } static const ITypeCompVtbl ScriptTypeCompVtbl = {

1 0

Gabriel Ivăncescu : vbscript/tests: Add tests for the script TypeInfo's TypeComp binds.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: d393681e41b59b475d1e91e6f7da7c8243105037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d393681e41b59b475d1e91e6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 9 17:29:26 2019 +0200 vbscript/tests: Add tests for the script TypeInfo's TypeComp binds. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 1d246c50b4..ad3ccf37a0 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1077,6 +1077,65 @@ static void test_script_typeinfo(void) ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); hr = ITypeComp_Bind(typecomp, str, 0, 0, &typeinfo2, &desckind, NULL); ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); + + hr = ITypeComp_Bind(typecomp, str, 0, 0, &typeinfo2, &desckind, &bindptr); + ok(hr == S_OK, "Bind failed: %08x\n", hr); + ok(desckind == DESCKIND_NONE, "Unexpected desckind %u\n", desckind); + wcscpy(str, L"GLOBAL_VAR"); + hr = ITypeComp_Bind(typecomp, str, 0, INVOKE_FUNC, &typeinfo2, &desckind, &bindptr); + ok(hr == TYPE_E_TYPEMISMATCH, "Bind returned: %08x\n", hr); + ok(!lstrcmpW(str, L"GLOBAL_VAR"), "Unexpected string %s\n", wine_dbgstr_w(str)); + wcscpy(str, L"C"); + hr = ITypeComp_Bind(typecomp, str, 0, 0, &typeinfo2, &desckind, &bindptr); + ok(hr == S_OK, "Bind failed: %08x\n", hr); + ok(desckind == DESCKIND_NONE, "Unexpected desckind %u\n", desckind); + wcscpy(str, L"addRef"); + hr = ITypeComp_Bind(typecomp, str, 0, 0, &typeinfo2, &desckind, &bindptr); + ok(hr == S_OK, "Bind failed: %08x\n", hr); + ok(desckind == DESCKIND_FUNCDESC, "Unexpected desckind %u\n", desckind); + ok(!lstrcmpW(str, L"addRef"), "Unexpected string %s\n", wine_dbgstr_w(str)); + ITypeInfo_ReleaseFuncDesc(typeinfo2, bindptr.lpfuncdesc); + ITypeInfo_Release(typeinfo2); + for (i = 0; i < ARRAY_SIZE(var); i++) + { + wcscpy(str, var[i].name); + hr = ITypeComp_Bind(typecomp, str, 0, INVOKE_PROPERTYGET, &typeinfo2, &desckind, &bindptr); + ok(hr == S_OK, "Bind failed: %08x\n", hr); + ok(desckind == DESCKIND_VARDESC, "Unexpected desckind %u\n", desckind); + ITypeInfo_ReleaseVarDesc(typeinfo2, bindptr.lpvardesc); + ITypeInfo_Release(typeinfo2); + } + for (i = 0; i < ARRAY_SIZE(func); i++) + { + wcscpy(str, func[i].name); + hr = ITypeComp_Bind(typecomp, str, 0, INVOKE_FUNC, &typeinfo2, &desckind, &bindptr); + ok(hr == S_OK, "Bind failed: %08x\n", hr); + ok(desckind == DESCKIND_FUNCDESC, "Unexpected desckind %u\n", desckind); + ITypeInfo_ReleaseFuncDesc(typeinfo2, bindptr.lpfuncdesc); + ITypeInfo_Release(typeinfo2); + } + wcscpy(str, L"VBScriptTypeInfo"); + hr = ITypeComp_BindType(typecomp, NULL, 0, &typeinfo2, &typecomp2); + ok(hr == E_INVALIDARG, "BindType returned: %08x\n", hr); + hr = ITypeComp_BindType(typecomp, str, 0, NULL, &typecomp2); + ok(hr == E_INVALIDARG, "BindType returned: %08x\n", hr); + hr = ITypeComp_BindType(typecomp, str, 0, &typeinfo2, NULL); + ok(hr == E_INVALIDARG, "BindType returned: %08x\n", hr); + hr = ITypeComp_BindType(typecomp, str, 0, &typeinfo2, &typecomp2); + ok(hr == S_OK, "BindType failed: %08x\n", hr); + ok(!typeinfo2, "Unexpected TypeInfo %p (expected null)\n", typeinfo2); + ok(!typecomp2, "Unexpected TypeComp %p (expected null)\n", typecomp2); + wcscpy(str, L"C"); + hr = ITypeComp_BindType(typecomp, str, 0, &typeinfo2, &typecomp2); + ok(hr == S_OK, "BindType failed: %08x\n", hr); + ok(!typeinfo2, "Unexpected TypeInfo %p (expected null)\n", typeinfo2); + ok(!typecomp2, "Unexpected TypeComp %p (expected null)\n", typecomp2); + wcscpy(str, L"IDispatch"); + hr = ITypeComp_BindType(typecomp, str, 0, &typeinfo2, &typecomp2); + ok(hr == S_OK, "BindType failed: %08x\n", hr); + ok(!typeinfo2, "Unexpected TypeInfo %p (expected null)\n", typeinfo2); + ok(!typecomp2, "Unexpected TypeComp %p (expected null)\n", typecomp2); + ITypeComp_Release(typecomp); /* Updating the script won't update the typeinfo obtained before,

1 0

Jacek Caban : mshtml: Refactor Gecko loading code.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: ba462a06609b106ecaadce48f3c2544f8f81a9d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba462a06609b106ecaadce48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 9 17:04:22 2019 +0100 mshtml: Refactor Gecko loading code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 271 ++++++++++++++++++++++++-------------------------- 1 file changed, 132 insertions(+), 139 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 244341248e..f47f727630 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -432,6 +432,8 @@ static BOOL install_wine_gecko(void) CloseHandle(pi.hThread); WaitForSingleObject(pi.hProcess, INFINITE); CloseHandle(pi.hProcess); + }else { + WARN("installation failed\n"); } return ret; @@ -483,139 +485,6 @@ static void set_environment(LPCWSTR gre_path) heap_free(path); } -static BOOL load_xul(const PRUnichar *gre_path) -{ - static const WCHAR xul_dllW[] = {'\\','x','u','l','.','d','l','l',0}; - WCHAR file_name[MAX_PATH]; - - lstrcpyW(file_name, gre_path); - lstrcatW(file_name, xul_dllW); - - TRACE("(%s)\n", debugstr_w(file_name)); - - set_environment(gre_path); - - xul_handle = LoadLibraryExW(file_name, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); - if(!xul_handle) { - WARN("Could not load XUL: %d\n", GetLastError()); - return FALSE; - } - -#define NS_DLSYM(func) \ - func = (void *)GetProcAddress(xul_handle, #func); \ - if(!func) \ - ERR("Could not GetProcAddress(" #func ") failed\n") - - NS_DLSYM(NS_InitXPCOM2); - NS_DLSYM(NS_ShutdownXPCOM); - NS_DLSYM(NS_GetComponentRegistrar); - NS_DLSYM(NS_StringContainerInit2); - NS_DLSYM(NS_CStringContainerInit2); - NS_DLSYM(NS_StringContainerFinish); - NS_DLSYM(NS_CStringContainerFinish); - NS_DLSYM(NS_StringSetData); - NS_DLSYM(NS_CStringSetData); - NS_DLSYM(NS_NewLocalFile); - NS_DLSYM(NS_StringGetData); - NS_DLSYM(NS_CStringGetData); - NS_DLSYM(NS_StringGetIsVoid); - NS_DLSYM(NS_Alloc); - NS_DLSYM(NS_Free); - NS_DLSYM(ccref_incr); - NS_DLSYM(ccref_decr); - NS_DLSYM(ccref_init); - NS_DLSYM(ccp_init); - NS_DLSYM(describe_cc_node); - NS_DLSYM(note_cc_edge); - -#undef NS_DLSYM - - return TRUE; -} - -static BOOL check_version(LPCWSTR gre_path, const char *version_string) -{ - WCHAR file_name[MAX_PATH]; - char version[128]; - DWORD read=0; - HANDLE hfile; - - static const WCHAR wszVersion[] = {'\\','V','E','R','S','I','O','N',0}; - - lstrcpyW(file_name, gre_path); - lstrcatW(file_name, wszVersion); - - hfile = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if(hfile == INVALID_HANDLE_VALUE) { - ERR("Could not open VERSION file\n"); - return FALSE; - } - - ReadFile(hfile, version, sizeof(version), &read, NULL); - version[read] = 0; - CloseHandle(hfile); - - TRACE("%s\n", debugstr_a(version)); - - if(strcmp(version, version_string)) { - ERR("Unexpected version %s, expected %s\n", debugstr_a(version), - debugstr_a(version_string)); - return FALSE; - } - - return TRUE; -} - -static BOOL load_wine_gecko_v(PRUnichar *gre_path, HKEY mshtml_key, - const char *version, const char *version_string) -{ - DWORD res, type, size = MAX_PATH; - HKEY hkey = mshtml_key; - - static const WCHAR wszGeckoPath[] = - {'G','e','c','k','o','P','a','t','h',0}; - - if(version) { - /* @@ Wine registry key: HKLM\Software\Wine\MSHTML\<version> */ - res = RegOpenKeyA(mshtml_key, version, &hkey); - if(res != ERROR_SUCCESS) - return FALSE; - } - - res = RegQueryValueExW(hkey, wszGeckoPath, NULL, &type, (LPBYTE)gre_path, &size); - if(hkey != mshtml_key) - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) - return FALSE; - - if(!check_version(gre_path, version_string)) - return FALSE; - - return load_xul(gre_path); -} - -static BOOL load_wine_gecko(PRUnichar *gre_path) -{ - HKEY hkey; - DWORD res; - BOOL ret; - - static const WCHAR wszMshtmlKey[] = { - 'S','o','f','t','w','a','r','e','\\','W','i','n','e', - '\\','M','S','H','T','M','L',0}; - - /* @@ Wine registry key: HKLM\Software\Wine\MSHTML */ - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, wszMshtmlKey, &hkey); - if(res != ERROR_SUCCESS) - return FALSE; - - ret = load_wine_gecko_v(gre_path, hkey, GECKO_VERSION, GECKO_VERSION_STRING); - - RegCloseKey(hkey); - return ret; -} - static void set_bool_pref(nsIPrefBranch *pref, const char *pref_name, BOOL val) { nsresult nsres; @@ -743,6 +612,124 @@ static BOOL init_xpcom(const PRUnichar *gre_path) return TRUE; } +static BOOL load_xul(WCHAR *gecko_path) +{ + size_t len; + + set_environment(gecko_path); + + TRACE("(%s)\n", debugstr_w(gecko_path)); + + len = wcslen(gecko_path); + wcscpy(gecko_path + len, L"\\xul.dll"); + xul_handle = LoadLibraryExW(gecko_path, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); + gecko_path[len] = 0; + if(!xul_handle) { + WARN("Could not load XUL: %d\n", GetLastError()); + return FALSE; + } + +#define NS_DLSYM(func) \ + func = (void *)GetProcAddress(xul_handle, #func); \ + if(!func) \ + ERR("Could not GetProcAddress(" #func ") failed\n") + + NS_DLSYM(NS_InitXPCOM2); + NS_DLSYM(NS_ShutdownXPCOM); + NS_DLSYM(NS_GetComponentRegistrar); + NS_DLSYM(NS_StringContainerInit2); + NS_DLSYM(NS_CStringContainerInit2); + NS_DLSYM(NS_StringContainerFinish); + NS_DLSYM(NS_CStringContainerFinish); + NS_DLSYM(NS_StringSetData); + NS_DLSYM(NS_CStringSetData); + NS_DLSYM(NS_NewLocalFile); + NS_DLSYM(NS_StringGetData); + NS_DLSYM(NS_CStringGetData); + NS_DLSYM(NS_StringGetIsVoid); + NS_DLSYM(NS_Alloc); + NS_DLSYM(NS_Free); + NS_DLSYM(ccref_incr); + NS_DLSYM(ccref_decr); + NS_DLSYM(ccref_init); + NS_DLSYM(ccp_init); + NS_DLSYM(describe_cc_node); + NS_DLSYM(note_cc_edge); + +#undef NS_DLSYM + + return init_xpcom(gecko_path); +} + +static WCHAR *check_version(const WCHAR *path) +{ + WCHAR *file_name; + char version[128]; + DWORD read=0; + size_t len; + HANDLE hfile; + + if(!wcsncmp(path, L"\\??\\", 4)) + path += 4; + if(path[1] != ':') { + TRACE("Skipping %s\n", debugstr_w(path)); + return FALSE; /* Gecko needs to be accessible via dos path */ + } + + len = wcslen(path); + file_name = heap_alloc((len + 12) * sizeof(WCHAR)); + if(!file_name) + return NULL; + + PathCanonicalizeW(file_name, path); + len = lstrlenW(file_name); + wcscpy(file_name + len, L"\\VERSION"); + + hfile = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + file_name[len] = 0; + if(hfile == INVALID_HANDLE_VALUE) { + TRACE("%s not found\n", debugstr_w(file_name)); + heap_free(file_name); + return NULL; + } + + ReadFile(hfile, version, sizeof(version), &read, NULL); + version[read] = 0; + CloseHandle(hfile); + + TRACE("%s: %s\n", debugstr_w(file_name), debugstr_a(version)); + + if(strcmp(version, GECKO_VERSION_STRING)) { + ERR("Unexpected version %s, expected \"%s\"\n", debugstr_a(version), + GECKO_VERSION_STRING); + heap_free(file_name); + return NULL; + } + + return file_name; +} + +static WCHAR *find_wine_gecko_reg(void) +{ + WCHAR buffer[MAX_PATH]; + DWORD res, type, size; + HKEY hkey; + + /* @@ Wine registry key: HKLM\Software\Wine\MSHTML\<version> */ + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\Wine\\MSHTML\\" GECKO_VERSION, &hkey); + if(res != ERROR_SUCCESS) + return NULL; + + size = ARRAY_SIZE(buffer); + res = RegQueryValueExW(hkey, L"GeckoPath", NULL, &type, (LPBYTE)buffer, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) + return FALSE; + + return check_version(buffer); +} + static CRITICAL_SECTION cs_load_gecko; static CRITICAL_SECTION_DEBUG cs_load_gecko_dbg = { @@ -754,7 +741,6 @@ static CRITICAL_SECTION cs_load_gecko = { &cs_load_gecko_dbg, -1, 0, 0, 0, 0 }; BOOL load_gecko(void) { - PRUnichar gre_path[MAX_PATH]; BOOL ret = FALSE; static DWORD loading_thread; @@ -768,13 +754,20 @@ BOOL load_gecko(void) EnterCriticalSection(&cs_load_gecko); if(!loading_thread) { + WCHAR *gecko_path; + loading_thread = GetCurrentThreadId(); - if(load_wine_gecko(gre_path) - || (install_wine_gecko() && load_wine_gecko(gre_path))) - ret = init_xpcom(gre_path); - else - MESSAGE("Could not load wine-gecko. HTML rendering will be disabled.\n"); + if(!(gecko_path = find_wine_gecko_reg()) + && install_wine_gecko()) + gecko_path = find_wine_gecko_reg(); + + if(gecko_path) { + ret = load_xul(gecko_path); + heap_free(gecko_path); + }else { + MESSAGE("Could not find Wine Gecko. HTML rendering will be disabled.\n"); + } }else { ret = pCompMgr != NULL; }

1 0

Jacek Caban : mshtml: Support loading Gecko from global location.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 077fd3891a57a3d460688ce20d1b8db50c1ac752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=077fd3891a57a3d460688ce2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 9 17:04:37 2019 +0100 mshtml: Support loading Gecko from global location. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 2 ++ dlls/mshtml/nsembed.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 7e1d517f07..469667081e 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -65,6 +65,8 @@ C_SRCS = \ view.c \ xmlhttprequest.c +nsembed_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\"" + RC_SRCS = mshtml.rc IDL_SRCS = \ diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f47f727630..2122536fc5 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -54,6 +54,16 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_STRING_CONTAINER_INIT_DEPEND 0x0002 #define NS_CSTRING_CONTAINER_INIT_DEPEND 0x0002 +#ifdef __i386__ +#define GECKO_ARCH_STRING "x86" +#elif defined(__x86_64__) +#define GECKO_ARCH_STRING "x86_64" +#else +#define GECKO_ARCH_STRING "" +#endif + +#define GECKO_DIR_NAME "wine-gecko-" GECKO_VERSION "-" GECKO_ARCH_STRING + typedef UINT32 PRUint32; static nsresult (CDECL *NS_InitXPCOM2)(nsIServiceManager**,void*,void*); @@ -730,6 +740,56 @@ static WCHAR *find_wine_gecko_reg(void) return check_version(buffer); } +static WCHAR *heap_strcat(const WCHAR *str1, const WCHAR *str2) +{ + size_t len1 = lstrlenW(str1); + size_t len2 = lstrlenW(str2); + WCHAR *ret = heap_alloc((len1 + len2 + 1) * sizeof(WCHAR)); + if(!ret) return NULL; + memcpy(ret, str1, len1 * sizeof(WCHAR)); + memcpy(ret + len1, str2, len2 * sizeof(WCHAR)); + ret[len1 + len2] = 0; + return ret; +} + +static WCHAR *find_wine_gecko_datadir(void) +{ + const WCHAR *data_dir; + WCHAR *path = NULL, *ret; + + if((data_dir = _wgetenv(L"WINEDATADIR"))) + path = heap_strcat(data_dir, L"\\gecko\\" GECKO_DIR_NAME); + else if((data_dir = _wgetenv(L"WINEBUILDDIR"))) + path = heap_strcat(data_dir, L"\\..\\gecko\\" GECKO_DIR_NAME); + if(!path) + return NULL; + + ret = check_version(path); + heap_free(path); + return ret; +} + +static WCHAR *find_wine_gecko_unix(const char *unix_path) +{ + static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); + WCHAR *dos_dir, *ret; + + if(!p_wine_get_dos_file_name) { + p_wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "wine_get_dos_file_name"); + if(!p_wine_get_dos_file_name) + return FALSE; + } + + dos_dir = p_wine_get_dos_file_name(unix_path); + if(!dos_dir) + return FALSE; + + ret = check_version(dos_dir); + + heap_free(dos_dir); + return ret; +} + static CRITICAL_SECTION cs_load_gecko; static CRITICAL_SECTION_DEBUG cs_load_gecko_dbg = { @@ -747,6 +807,11 @@ BOOL load_gecko(void) TRACE("()\n"); + if(!GECKO_ARCH_STRING[0]) { + FIXME("Wine Gecko is not supported on this architecture.\n"); + return FALSE; + } + /* load_gecko may be called recursively */ if(loading_thread == GetCurrentThreadId()) return pCompMgr != NULL; @@ -759,6 +824,11 @@ BOOL load_gecko(void) loading_thread = GetCurrentThreadId(); if(!(gecko_path = find_wine_gecko_reg()) + && !(gecko_path = find_wine_gecko_datadir()) + && !(gecko_path = find_wine_gecko_unix(INSTALL_DATADIR "/wine/gecko/" GECKO_DIR_NAME)) + && (!strcmp(INSTALL_DATADIR, "/usr/share") || + !(gecko_path = find_wine_gecko_unix("/usr/share/wine/gecko/" GECKO_DIR_NAME))) + && !(gecko_path = find_wine_gecko_unix("/opt/wine/gecko/" GECKO_DIR_NAME)) && install_wine_gecko()) gecko_path = find_wine_gecko_reg();

1 0

Nikolay Sivov : comctl32/listview: Use wcsnicmp() instead of a local helper.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 88a3a5842ad82b443e5aa084441c51f5a5380e9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a3a5842ad82b443e5aa084… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 15:42:45 2019 +0300 comctl32/listview: Use wcsnicmp() instead of a local helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index eb42526f57..2dd25908db 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -539,12 +539,6 @@ static inline int textcmpWT(LPCWSTR aw, LPCWSTR bt, BOOL isW) return 1; } - -static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n) -{ - n = min(min(n, lstrlenW(s1)), lstrlenW(s2)); - return CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n) - CSTR_EQUAL; -} /******** Debugging functions *****************************************/ @@ -1953,7 +1947,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L item.cchTextMax = MAX_PATH; if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; - if (!lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength)) + if (!wcsnicmp(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength)) { nItem = i; break; @@ -1961,7 +1955,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L /* this is used to find first char match when search string is not available yet, otherwise every WM_CHAR will search to next item by first char, ignoring that we're already waiting for user to complete a string */ - else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1)) + else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !wcsnicmp(item.pszText, infoPtr->szSearchParam, 1)) { /* this would work but we must keep looking for a longer match */ nItem = i;

1 0

Patrick Hibbs : wtsapi32: Make WTSRegisterSessionNotificationEx's return consistent with WTSRegisterSessionNotification.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: f870aa4988fa8e980919c144682da72865364ff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f870aa4988fa8e980919c144… Author: Patrick Hibbs <hibbsncc1701(a)gmail.com> Date: Sat Dec 7 03:06:14 2019 -0500 wtsapi32: Make WTSRegisterSessionNotificationEx's return consistent with WTSRegisterSessionNotification. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c2b817a6ed..026e7f4369 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -385,7 +385,7 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) { FIXME("Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); - return FALSE; + return TRUE; }

1 0

Jacek Caban : makedep: Build implib cross object files with -fno-builtin.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 55f803c81bb61f7a927d4803687632d7be112e14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f803c81bb61f7a927d4803… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 6 14:48:04 2019 +0100 makedep: Build implib cross object files with -fno-builtin. We want to be specific about used function and not want optimizations to interfere. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index d0e963f759..825c83aed4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3093,6 +3093,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( defines ); output_filenames( extra_cross_cflags ); + if (source->file->flags & FLAG_C_IMPLIB) output_filename( "-fno-builtin" ); output_filenames( cpp_flags ); output_filename( "$(CROSSCFLAGS)" ); output( "\n" );

1 0

Jacek Caban : msvcrt: Provide exp2 in importlib.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: bdf905d661cd3cd61fb2dbaa5ddd9e641f421ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf905d661cd3cd61fb2dbaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 6 14:48:11 2019 +0100 msvcrt: Provide exp2 in importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mathf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c index 9f27e64122..4aff6d7008 100644 --- a/dlls/msvcrt/mathf.c +++ b/dlls/msvcrt/mathf.c @@ -37,3 +37,7 @@ float sqrtf(float x) { return sqrt(x); } float floorf(float x) { return floor(x); } float ceilf(float x) { return ceil(x); } #endif + +#if _MSVCR_VER < 120 +double exp2(double x) { return pow(2.0, x); } +#endif

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeComp_Bind.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 87075726696ce6b642807b18221174418a24d83a URL: https://source.winehq.org/git/wine.git/?a=commit;h=87075726696ce6b642807b18… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 9 17:29:24 2019 +0200 vbscript: Implement ScriptTypeComp_Bind. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 4 ---- dlls/vbscript/vbdisp.c | 51 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 0c3acd0ca7..1d246c50b4 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1070,16 +1070,12 @@ static void test_script_typeinfo(void) ITypeComp_Release(typecomp2); wcscpy(str, L"not_found"); hr = ITypeComp_Bind(typecomp, NULL, 0, 0, &typeinfo2, &desckind, &bindptr); - todo_wine ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); hr = ITypeComp_Bind(typecomp, str, 0, 0, NULL, &desckind, &bindptr); - todo_wine ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); hr = ITypeComp_Bind(typecomp, str, 0, 0, &typeinfo2, NULL, &bindptr); - todo_wine ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); hr = ITypeComp_Bind(typecomp, str, 0, 0, &typeinfo2, &desckind, NULL); - todo_wine ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); ITypeComp_Release(typecomp); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 47ecc15be4..2f68c16567 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -932,9 +932,56 @@ static HRESULT WINAPI ScriptTypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULO ITypeInfo **ppTInfo, DESCKIND *pDescKind, BINDPTR *pBindPtr) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeComp(iface); - FIXME("(%p)->(%s %08x %d %p %p %p)\n", This, debugstr_w(szName), lHashVal, + UINT flags = wFlags ? wFlags : ~0; + ITypeInfo *disp_typeinfo; + ITypeComp *disp_typecomp; + HRESULT hr; + UINT i; + + TRACE("(%p)->(%s %08x %d %p %p %p)\n", This, debugstr_w(szName), lHashVal, wFlags, ppTInfo, pDescKind, pBindPtr); - return E_NOTIMPL; + + if (!szName || !ppTInfo || !pDescKind || !pBindPtr) + return E_INVALIDARG; + + for (i = 0; i < This->num_funcs; i++) + { + if (wcsicmp(szName, This->funcs[i].func->name)) continue; + if (!(flags & INVOKE_FUNC)) return TYPE_E_TYPEMISMATCH; + + hr = ITypeInfo_GetFuncDesc(&This->ITypeInfo_iface, i, &pBindPtr->lpfuncdesc); + if (FAILED(hr)) return hr; + + *pDescKind = DESCKIND_FUNCDESC; + *ppTInfo = &This->ITypeInfo_iface; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; + } + + for (i = 0; i < This->num_vars; i++) + { + if (wcsicmp(szName, This->disp->global_vars[i]->name)) continue; + if (!(flags & INVOKE_PROPERTYGET)) return TYPE_E_TYPEMISMATCH; + + hr = ITypeInfo_GetVarDesc(&This->ITypeInfo_iface, i, &pBindPtr->lpvardesc); + if (FAILED(hr)) return hr; + + *pDescKind = DESCKIND_VARDESC; + *ppTInfo = &This->ITypeInfo_iface; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; + } + + /* Look into the inherited IDispatch */ + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + hr = ITypeInfo_GetTypeComp(disp_typeinfo, &disp_typecomp); + if (FAILED(hr)) return hr; + + hr = ITypeComp_Bind(disp_typecomp, szName, lHashVal, wFlags, ppTInfo, pDescKind, pBindPtr); + ITypeComp_Release(disp_typecomp); + return hr; } static HRESULT WINAPI ScriptTypeComp_BindType(ITypeComp *iface, LPOLESTR szName, ULONG lHashVal,

1 0