January 2017 - Wine-commits

Alasdair Sinclair : configure: Fix make install for mf3216.dll.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 6981a86441f7e5863f6c411ed1b5415d58c4488b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6981a86441f7e5863f6c411ed… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Fri Jan 27 03:11:25 2017 +0000 configure: Fix make install for mf3216.dll. Signed-off-by: Alasdair Sinclair <alasdairsinc(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index c65ebc4..9364188 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -346,7 +346,7 @@ wine_fn_config_dll () AS_VAR_IF([enable_tools],[no],,[ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps"]) case $ac_name in - *16) ac_implibflags=" -m16" ;; + *.*16) ac_implibflags=" -m16" ;; *.*) ;; *) ac_dll=$ac_dll.dll ;; esac diff --git a/configure b/configure index 54329a6..f0081fb 100755 --- a/configure +++ b/configure @@ -7722,7 +7722,7 @@ else ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps" fi case $ac_name in - *16) ac_implibflags=" -m16" ;; + *.*16) ac_implibflags=" -m16" ;; *.*) ;; *) ac_dll=$ac_dll.dll ;; esac

1 0

Nikolay Sivov : Added scrobj.dll stub.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 899a249039879be338efb23976abe6a16d2e6846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899a249039879be338efb2397… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:36:08 2017 +0300 Added scrobj.dll stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/scrobj/Makefile.in | 6 +++ dlls/scrobj/scrobj.c | 84 ++++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/scrobj.idl | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/scrobj.spec | 4 ++ 6 files changed, 194 insertions(+) diff --git a/configure b/configure index f0081fb..6368926 100755 --- a/configure +++ b/configure @@ -1387,6 +1387,7 @@ enable_scarddlg enable_sccbase enable_schannel enable_schedsvc +enable_scrobj enable_scrrun enable_scsiport_sys enable_secur32 @@ -18272,6 +18273,7 @@ wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test wine_fn_config_dll schedsvc enable_schedsvc clean wine_fn_config_test dlls/schedsvc/tests schedsvc_test clean +wine_fn_config_dll scrobj enable_scrobj clean wine_fn_config_dll scrrun enable_scrrun clean wine_fn_config_test dlls/scrrun/tests scrrun_test clean wine_fn_config_dll scsiport.sys enable_scsiport_sys diff --git a/configure.ac b/configure.ac index 26be5e6..d30dd9c 100644 --- a/configure.ac +++ b/configure.ac @@ -3332,6 +3332,7 @@ WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) WINE_CONFIG_DLL(schedsvc,,[clean]) WINE_CONFIG_TEST(dlls/schedsvc/tests,[clean]) +WINE_CONFIG_DLL(scrobj,,[clean]) WINE_CONFIG_DLL(scrrun,,[clean]) WINE_CONFIG_TEST(dlls/scrrun/tests,[clean]) WINE_CONFIG_DLL(scsiport.sys) diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in new file mode 100644 index 0000000..fae99d1 --- /dev/null +++ b/dlls/scrobj/Makefile.in @@ -0,0 +1,6 @@ +MODULE = scrobj.dll + +C_SRCS = \ + scrobj.c + +IDL_SRCS = scrobj.idl diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c new file mode 100644 index 0000000..98f7c88 --- /dev/null +++ b/dlls/scrobj/scrobj.c @@ -0,0 +1,84 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * 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 + */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "olectl.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scrobj); + +static HINSTANCE scrobj_instance; + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + scrobj_instance = hinst; + break; + } + return TRUE; +} + +/*********************************************************************** + * DllRegisterServer (scrobj.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(scrobj_instance); +} + +/*********************************************************************** + * DllUnregisterServer (scrobj.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(scrobj_instance); +} + +/*********************************************************************** + * DllGetClassObject (scrobj.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (scrobj.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/scrobj/scrobj.idl b/dlls/scrobj/scrobj.idl new file mode 100644 index 0000000..80189ae --- /dev/null +++ b/dlls/scrobj/scrobj.idl @@ -0,0 +1,97 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * 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 + */ + +#pragma makedep regtypelib + +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +[ + uuid(06290c00-48aa-11d2-8432-006008c3fbfc), + version(1.0) +] +library Scriptlet +{ + importlib("stdole2.tlb"); + + [ + uuid(2de0a190-a1a4-11d1-b382-00a0c911e8b2), + dual, + oleautomation + ] + interface IGenScriptletTLib : IDispatch + { + [id(0x1)] + HRESULT AddURL([in] BSTR url); + + [id(0x2), propput] + HRESULT Path([in] BSTR path); + + [id(0x2), propget] + HRESULT Path([out, retval] BSTR *path); + + [id(0x4), propput] + HRESULT Doc([in] BSTR doc); + + [id(0x4), propget] + HRESULT Doc([out, retval] BSTR *doc); + + [id(0x5), propput] + HRESULT Name([in] BSTR name); + + [id(0x5), propget] + HRESULT Name([out, retval] BSTR *name); + + [id(0x6), propput] + HRESULT MajorVersion([in] WORD version); + + [id(0x6), propget] + HRESULT MajorVersion([out, retval] WORD *version); + + [id(0x7), propput] + HRESULT MinorVersion([in] WORD version); + + [id(0x7), propget] + HRESULT MinorVersion([out, retval] WORD *version); + + [id(0x3)] + HRESULT Write(); + + [id(0x8)] + HRESULT Reset(); + + [id(0x9), propput] + HRESULT GUID([in] BSTR guid); + + [id(0x9), propget] + HRESULT GUID([out, retval] BSTR *guid); + } + +} + +[ + uuid(06290bd5-48aa-11d2-8432-006008c3fbfc ), + version(1.0), + threading(apartment), + progid("Scriptlet.TypeLib") +] +coclass TypeLib +{ + [default] interface IGenScriptletTLib; +} diff --git a/dlls/scrobj/scrobj.spec b/dlls/scrobj/scrobj.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/scrobj/scrobj.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Nikolay Sivov : scrobj: Register Scriptlet.TypeLib.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 5555b3a9d3b9b81810bfcaf1fdce61cf07216828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5555b3a9d3b9b81810bfcaf1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:36:09 2017 +0300 scrobj: Register Scriptlet.TypeLib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.idl | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/scrobj/scrobj.idl b/dlls/scrobj/scrobj.idl index 80189ae..4153d31 100644 --- a/dlls/scrobj/scrobj.idl +++ b/dlls/scrobj/scrobj.idl @@ -83,15 +83,14 @@ library Scriptlet HRESULT GUID([out, retval] BSTR *guid); } -} - -[ - uuid(06290bd5-48aa-11d2-8432-006008c3fbfc ), - version(1.0), - threading(apartment), - progid("Scriptlet.TypeLib") -] -coclass TypeLib -{ - [default] interface IGenScriptletTLib; + [ + uuid(06290bd5-48aa-11d2-8432-006008c3fbfc ), + version(1.0), + threading(apartment), + progid("Scriptlet.TypeLib") + ] + coclass TypeLib + { + [default] interface IGenScriptletTLib; + } }

1 0

Nikolay Sivov : scrobj: Added IGenScriptletTLib stub.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 387dee7ff2ec8c271acb14c0df87ed586e2b0376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387dee7ff2ec8c271acb14c0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:36:10 2017 +0300 scrobj: Added IGenScriptletTLib stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/Makefile.in | 1 + dlls/scrobj/scrobj.c | 335 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/scrobj.idl | 1 + 3 files changed, 337 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=387dee7ff2ec8c271acb1…

1 0

Nikolay Sivov : scrobj: Added IDispatch support for Scriptlet.TypeLib object.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 99a9f5313870d64d51f5f241eb740c0093f854db URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a9f5313870d64d51f5f241e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:36:11 2017 +0300 scrobj: Added IDispatch support for Scriptlet.TypeLib object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/Makefile.in | 2 +- dlls/scrobj/scrobj.c | 115 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 108 insertions(+), 9 deletions(-) diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in index 3d5962c..75dd7ec 100644 --- a/dlls/scrobj/Makefile.in +++ b/dlls/scrobj/Makefile.in @@ -1,5 +1,5 @@ MODULE = scrobj.dll -IMPORTS = uuid +IMPORTS = uuid oleaut32 C_SRCS = \ scrobj.c diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index d2f9908..44cb778 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -34,6 +34,81 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrobj); static HINSTANCE scrobj_instance; +typedef enum tid_t +{ + NULL_tid, + IGenScriptletTLib_tid, + LAST_tid +} tid_t; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IGenScriptletTLib, +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + if (typelib) + return S_OK; + + hres = LoadRegTypeLib(&LIBID_Scriptlet, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hres)) + { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (FAILED(hres = load_typelib())) + return hres; + + 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]; + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + struct scriptlet_typelib { IGenScriptletTLib IGenScriptletTLib_iface; @@ -89,9 +164,10 @@ static HRESULT WINAPI scriptlet_typelib_GetTypeInfoCount(IGenScriptletTLib *ifac { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); - FIXME("(%p, %p): stub\n", This, count); + TRACE("(%p, %p)\n", This, count); - return E_NOTIMPL; + *count = 1; + return S_OK; } static HRESULT WINAPI scriptlet_typelib_GetTypeInfo(IGenScriptletTLib *iface, UINT index, LCID lcid, @@ -99,30 +175,49 @@ static HRESULT WINAPI scriptlet_typelib_GetTypeInfo(IGenScriptletTLib *iface, UI { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); - FIXME("(%p, %u, %x, %p): stub\n", This, index, lcid, tinfo); + TRACE("(%p, %u, %x, %p)\n", This, index, lcid, tinfo); - return E_NOTIMPL; + return get_typeinfo(IGenScriptletTLib_tid, tinfo); } static HRESULT WINAPI scriptlet_typelib_GetIDsOfNames(IGenScriptletTLib *iface, REFIID riid, LPOLESTR *names, UINT cNames, LCID lcid, DISPID *dispid) { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("(%p, %s, %p, %u, %x, %p): stub\n", This, debugstr_guid(riid), names, cNames, lcid, dispid); + TRACE("(%p, %s, %p, %u, %x, %p)\n", This, debugstr_guid(riid), names, cNames, lcid, dispid); - return E_NOTIMPL; + hr = get_typeinfo(IGenScriptletTLib_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, cNames, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI scriptlet_typelib_Invoke(IGenScriptletTLib *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *ei, UINT *argerr) { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("(%p, %d, %s, %x, %x, %p, %p, %p, %p): stub\n", This, dispid, debugstr_guid(riid), lcid, flags, + TRACE("(%p, %d, %s, %x, %x, %p, %p, %p, %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, params, result, ei, argerr); - return E_NOTIMPL; + hr = get_typeinfo(IGenScriptletTLib_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IGenScriptletTLib_iface, dispid, flags, + params, result, ei, argerr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI scriptlet_typelib_AddURL(IGenScriptletTLib *iface, BSTR url) @@ -298,6 +393,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) DisableThreadLibraryCalls(hinst); scrobj_instance = hinst; break; + case DLL_PROCESS_DETACH: + if (reserved) break; + release_typelib(); + break; } return TRUE; }

1 0

Nikolay Sivov : scrobj: Implement get_GUID().
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 0fa152791f324d992c4f3716b9b0165576ceba45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa152791f324d992c4f3716b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:36:12 2017 +0300 scrobj: Implement get_GUID(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/Makefile.in | 2 +- dlls/scrobj/scrobj.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in index 75dd7ec..179409a 100644 --- a/dlls/scrobj/Makefile.in +++ b/dlls/scrobj/Makefile.in @@ -1,5 +1,5 @@ MODULE = scrobj.dll -IMPORTS = uuid oleaut32 +IMPORTS = uuid ole32 oleaut32 C_SRCS = \ scrobj.c diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 44cb778..38f1c65 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -113,6 +113,8 @@ struct scriptlet_typelib { IGenScriptletTLib IGenScriptletTLib_iface; LONG ref; + + BSTR guid; }; static inline struct scriptlet_typelib *impl_from_IGenScriptletTLib(IGenScriptletTLib *iface) @@ -155,7 +157,10 @@ static ULONG WINAPI scriptlet_typelib_Release(IGenScriptletTLib *iface) TRACE("(%p)->(%u)\n", This, ref); if (!ref) + { + SysFreeString(This->guid); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -346,13 +351,34 @@ static HRESULT WINAPI scriptlet_typelib_put_GUID(IGenScriptletTLib *iface, BSTR return E_NOTIMPL; } -static HRESULT WINAPI scriptlet_typelib_get_GUID(IGenScriptletTLib *iface, BSTR *guid) +static HRESULT WINAPI scriptlet_typelib_get_GUID(IGenScriptletTLib *iface, BSTR *ret) { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); - FIXME("(%p, %p): stub\n", This, guid); + TRACE("(%p, %p)\n", This, ret); - return E_NOTIMPL; + *ret = NULL; + + if (!This->guid) + { + WCHAR guidW[39]; + GUID guid; + HRESULT hr; + + hr = CoCreateGuid(&guid); + if (FAILED(hr)) + return hr; + + hr = StringFromGUID2(&guid, guidW, sizeof(guidW)/sizeof(guidW[0])); + if (FAILED(hr)) + return hr; + + if (!(This->guid = SysAllocString(guidW))) + return E_OUTOFMEMORY; + } + + *ret = SysAllocString(This->guid); + return *ret ? S_OK : E_OUTOFMEMORY; } static const IGenScriptletTLibVtbl scriptlet_typelib_vtbl = @@ -434,6 +460,7 @@ HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown This->IGenScriptletTLib_iface.lpVtbl = &scriptlet_typelib_vtbl; This->ref = 1; + This->guid = NULL; hr = IGenScriptletTLib_QueryInterface(&This->IGenScriptletTLib_iface, riid, obj); IGenScriptletTLib_Release(&This->IGenScriptletTLib_iface);

1 0

Nikolay Sivov : dwrite: Implement GetOverhangMetrics().
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 426a5d4a5f61612411500b0cc1aa6d7c9c8a9906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426a5d4a5f61612411500b0cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:42:13 2017 +0300 dwrite: Implement GetOverhangMetrics(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/freetype.c | 31 ++++++++++ dlls/dwrite/layout.c | 135 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 155 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 882567c..d91735d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -287,6 +287,7 @@ extern void freetype_get_glyph_bbox(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; extern BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; extern INT freetype_get_charmap_index(IDWriteFontFace4*,BOOL*) DECLSPEC_HIDDEN; extern INT32 freetype_get_glyph_advance(IDWriteFontFace4*,FLOAT,UINT16,DWRITE_MEASURING_MODE) DECLSPEC_HIDDEN; +extern void freetype_get_design_glyph_bbox(IDWriteFontFace4*,UINT16,UINT16,RECT*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 9cc157e..596e8a5 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -639,6 +639,32 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) SetRect(&bitmap->bbox, bbox.xMin, -bbox.yMax, bbox.xMax, -bbox.yMin); } +void freetype_get_design_glyph_bbox(IDWriteFontFace4 *fontface, UINT16 unitsperEm, UINT16 glyph, RECT *bbox) +{ + FTC_ScalerRec scaler; + FT_Size size; + + scaler.face_id = fontface; + scaler.width = unitsperEm; + scaler.height = unitsperEm; + scaler.pixel = 1; + scaler.x_res = 0; + scaler.y_res = 0; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { + if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_SCALE) == 0) { + FT_Glyph_Metrics *metrics = &size->face->glyph->metrics; + + bbox->left = metrics->horiBearingX; + bbox->right = bbox->left + metrics->horiAdvance; + bbox->top = -metrics->horiBearingY; + bbox->bottom = bbox->top + metrics->height; + } + } + LeaveCriticalSection(&freetype_cs); +} + static BOOL freetype_get_aliased_glyph_bitmap(struct dwrite_glyphbitmap *bitmap, FT_Glyph glyph) { const RECT *bbox = &bitmap->bbox; @@ -889,6 +915,11 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) memset(&bitmap->bbox, 0, sizeof(bitmap->bbox)); } +void freetype_get_design_glyph_bbox(IDWriteFontFace4 *fontface, UINT16 unitsperEm, UINT16 glyph, RECT *bbox) +{ + memset(bbox, 0, sizeof(*bbox)); +} + BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) { return FALSE; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0d1ffb4..014fba4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -223,10 +223,12 @@ struct layout_cluster { }; enum layout_recompute_mask { - RECOMPUTE_CLUSTERS = 1 << 0, - RECOMPUTE_MINIMAL_WIDTH = 1 << 1, - RECOMPUTE_LINES = 1 << 2, - RECOMPUTE_EVERYTHING = 0xffff + RECOMPUTE_CLUSTERS = 1 << 0, + RECOMPUTE_MINIMAL_WIDTH = 1 << 1, + RECOMPUTE_LINES = 1 << 2, + RECOMPUTE_OVERHANGS = 1 << 3, + RECOMPUTE_LINES_AND_OVERHANGS = RECOMPUTE_LINES | RECOMPUTE_OVERHANGS, + RECOMPUTE_EVERYTHING = 0xffff }; struct dwrite_textlayout { @@ -267,6 +269,7 @@ struct dwrite_textlayout { UINT32 line_alloc; DWRITE_TEXT_METRICS1 metrics; + DWRITE_OVERHANG_METRICS overhangs; DWRITE_MEASURING_MODE measuringmode; @@ -2905,7 +2908,7 @@ static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout3 *iface, FL This->metrics.layoutWidth = maxWidth; if (changed) - This->recompute |= RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return S_OK; } @@ -2923,7 +2926,7 @@ static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout3 *iface, F This->metrics.layoutHeight = maxHeight; if (changed) - This->recompute |= RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return S_OK; } @@ -3468,11 +3471,119 @@ static HRESULT WINAPI dwritetextlayout_GetMetrics(IDWriteTextLayout3 *iface, DWR return hr; } -static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout3 *iface, DWRITE_OVERHANG_METRICS *overhangs) +static void scale_glyph_bbox(RECT *bbox, FLOAT emSize, UINT16 units_per_em, D2D_RECT_F *ret) +{ +#define SCALE(x) ((FLOAT)x * emSize / (FLOAT)units_per_em) + ret->left = SCALE(bbox->left); + ret->right = SCALE(bbox->right); + ret->top = SCALE(bbox->top); + ret->bottom = SCALE(bbox->bottom); +#undef SCALE +} + +static void d2d_rect_offset(D2D_RECT_F *rect, FLOAT x, FLOAT y) +{ + rect->left += x; + rect->right += x; + rect->top += y; + rect->bottom += y; +} + +static BOOL d2d_rect_is_empty(const D2D_RECT_F *rect) +{ + return ((rect->left >= rect->right) || (rect->top >= rect->bottom)); +} + +static void d2d_rect_union(D2D_RECT_F *dst, const D2D_RECT_F *src) +{ + if (d2d_rect_is_empty(dst)) { + if (d2d_rect_is_empty(src)) { + dst->left = dst->right = dst->top = dst->bottom = 0.0f; + return; + } + else + *dst = *src; + } + else { + if (!d2d_rect_is_empty(src)) { + dst->left = min(dst->left, src->left); + dst->right = max(dst->right, src->right); + dst->top = min(dst->top, src->top); + dst->bottom = max(dst->bottom, src->bottom); + } + } +} + +static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout_effective_run *run, D2D_RECT_F *bbox) +{ + const struct regular_layout_run *regular = &run->run->u.regular; + UINT32 start_glyph = regular->clustermap[run->start]; + const DWRITE_GLYPH_RUN *glyph_run = &regular->run; + DWRITE_FONT_METRICS font_metrics; + D2D_POINT_2F origin = { 0 }; + UINT32 i; + + IDWriteFontFace_GetMetrics(glyph_run->fontFace, &font_metrics); + + origin.x = run->origin_x + run->align_dx; + origin.y = run->origin_y; + for (i = 0; i < run->glyphcount; i++) { + D2D_RECT_F glyph_bbox; + RECT design_bbox; + + freetype_get_design_glyph_bbox((IDWriteFontFace4 *)glyph_run->fontFace, font_metrics.designUnitsPerEm, + glyph_run->glyphIndices[i + start_glyph], &design_bbox); + + scale_glyph_bbox(&design_bbox, glyph_run->fontEmSize, font_metrics.designUnitsPerEm, &glyph_bbox); + d2d_rect_offset(&glyph_bbox, origin.x + glyph_run->glyphOffsets[i + start_glyph].advanceOffset, + origin.y + glyph_run->glyphOffsets[i + start_glyph].ascenderOffset); + d2d_rect_union(bbox, &glyph_bbox); + + /* FIXME: take care of vertical/rtl */ + origin.x += glyph_run->glyphAdvances[i + start_glyph]; + } +} + +static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout3 *iface, + DWRITE_OVERHANG_METRICS *overhangs) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - FIXME("(%p)->(%p): stub\n", This, overhangs); - return E_NOTIMPL; + struct layout_effective_run *run; + D2D_RECT_F bbox = { 0 }; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, overhangs); + + memset(overhangs, 0, sizeof(*overhangs)); + + if (!(This->recompute & RECOMPUTE_OVERHANGS)) { + *overhangs = This->overhangs; + return S_OK; + } + + hr = layout_compute_effective_runs(This); + if (FAILED(hr)) + return hr; + + LIST_FOR_EACH_ENTRY(run, &This->eruns, struct layout_effective_run, entry) { + D2D_RECT_F run_bbox; + + layout_get_erun_bbox(This, run, &run_bbox); + d2d_rect_union(&bbox, &run_bbox); + } + + /* FIXME: iterate over inline objects too */ + + /* deltas from text content metrics */ + This->overhangs.left = -bbox.left; + This->overhangs.top = -bbox.top; + This->overhangs.right = bbox.right - This->metrics.layoutWidth; + This->overhangs.bottom = bbox.bottom - This->metrics.layoutHeight; + This->recompute &= ~RECOMPUTE_OVERHANGS; + + *overhangs = This->overhangs; + + return S_OK; } static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout3 *iface, @@ -3739,7 +3850,7 @@ static HRESULT WINAPI dwritetextlayout3_SetLineSpacing(IDWriteTextLayout3 *iface return hr; if (changed) - This->recompute = RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return S_OK; } @@ -3930,7 +4041,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetWordWrapping(IDWriteTextFormat1 return hr; if (changed) - This->recompute |= RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return S_OK; } @@ -3990,7 +4101,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat1 *if hr = format_set_trimming(&This->format, trimming, trimming_sign, &changed); if (changed) - This->recompute |= RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return hr; }

1 0

Erich E. Hoover : maintainers: Volunteer for auto-assigned patch review.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 4b9bc3a6f4dbbdac00e673b39969cd459e1458a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9bc3a6f4dbbdac00e673b39… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Jan 25 12:38:43 2017 -0700 maintainers: Volunteer for auto-assigned patch review. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f936afe..e5224ff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -165,6 +165,7 @@ F: programs/netstat/ Network P: Bruno Jesus <00cpxxx(a)gmail.com> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: dlls/iphlpapi/ F: dlls/ws2_32/ @@ -248,6 +249,7 @@ F: dlls/wmiutils/ Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: server/ Winemaker @@ -283,6 +285,7 @@ P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */

1 0

Michael Müller : msvideo.dll16: Implement DrawDibProfileDisplay.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 03435a55770927afcae84d3ee170b5fbe670c763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03435a55770927afcae84d3ee… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jan 26 22:24:42 2017 -0200 msvideo.dll16: Implement DrawDibProfileDisplay. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/msvideo.dll16.spec | 2 +- dlls/msvideo.dll16/msvideo16.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvideo.dll16/msvideo.dll16.spec b/dlls/msvideo.dll16/msvideo.dll16.spec index f45f644..02e2c95 100644 --- a/dlls/msvideo.dll16/msvideo.dll16.spec +++ b/dlls/msvideo.dll16/msvideo.dll16.spec @@ -35,7 +35,7 @@ 111 stub DRAWDIBCHANGEPALETTE 112 pascal -ret16 DrawDibRealize(word word word) DrawDibRealize16 113 stub DRAWDIBTIME -114 stub DRAWDIBPROFILEDISPLAY +114 pascal -ret16 DrawDibProfileDisplay(ptr) DrawDibProfileDisplay16 115 stub STRETCHDIB 118 pascal -ret16 DrawDibStart(word long) DrawDibStart16 119 pascal -ret16 DrawDibStop(word) DrawDibStop16 diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 8f02cc1..28f126c 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -121,6 +121,15 @@ UINT16 VFWAPI DrawDibRealize16(HDRAWDIB16 hdd, HDC16 hdc, } /************************************************************************* + * DrawDibProfileDisplay [MSVIDEO.114] + */ +BOOL16 VFWAPI DrawDibProfileDisplay16(LPBITMAPINFOHEADER lpbi) +{ + TRACE("(%p)\n", lpbi); + return DrawDibProfileDisplay(lpbi); +} + +/************************************************************************* * DrawDibStart [MSVIDEO.118] */ BOOL16 VFWAPI DrawDibStart16(HDRAWDIB16 hdd, DWORD rate)

1 0

André Hentschel : msi: Fix some spec file entries.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: c6592229a36090cf613c6ee06f2caadb05c5ad0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6592229a36090cf613c6ee06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:47:01 2017 +0100 msi: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index d48f08b..6f7266a 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -7,7 +7,7 @@ 11 stdcall MsiConfigureFeatureA(str str long) 12 stub MsiConfigureFeatureFromDescriptorA 13 stub MsiConfigureFeatureFromDescriptorW -14 stdcall MsiConfigureFeatureW(wstr wstr ptr) +14 stdcall MsiConfigureFeatureW(wstr wstr long) 15 stdcall MsiConfigureProductA(str long long) 16 stdcall MsiConfigureProductW(wstr long long) 17 stdcall MsiCreateRecord(long) @@ -60,10 +60,10 @@ 64 stdcall MsiGetMode(long long) 65 stdcall MsiGetProductCodeA(str str) 66 stdcall MsiGetProductCodeW(wstr wstr) -67 stdcall MsiGetProductInfoA(str str ptr long) +67 stdcall MsiGetProductInfoA(str str ptr ptr) 68 stub MsiGetProductInfoFromScriptA 69 stub MsiGetProductInfoFromScriptW -70 stdcall MsiGetProductInfoW(wstr wstr ptr long) +70 stdcall MsiGetProductInfoW(wstr wstr ptr ptr) 71 stdcall MsiGetProductPropertyA(long str ptr ptr) 72 stdcall MsiGetProductPropertyW(long wstr ptr ptr) 73 stdcall MsiGetPropertyA(ptr str ptr ptr) @@ -82,8 +82,8 @@ 86 stub MsiInstallMissingFileW 87 stdcall MsiInstallProductA(str str) 88 stdcall MsiInstallProductW(wstr wstr) -89 stdcall MsiLocateComponentA(str ptr long) -90 stdcall MsiLocateComponentW(wstr ptr long) +89 stdcall MsiLocateComponentA(str ptr ptr) +90 stdcall MsiLocateComponentW(wstr ptr ptr) 91 stdcall MsiOpenDatabaseA(str str ptr) 92 stdcall MsiOpenDatabaseW(wstr wstr ptr) 93 stdcall MsiOpenPackageA(str ptr)

1 0