October 2021 - Wine-commits

Arkadiusz Hiler : msvcp90: Add helpers for creating base class RTTI.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 95154afde7d4544288802bce7f8d2b250c770a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95154afde7d4544288802bce… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 6 17:05:10 2021 +0300 msvcp90: Add helpers for creating base class RTTI. Suggested by Piotr Caban. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3f948a5a39ecff5d83f02e11256a0359624d54b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/cxx.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 5052f433875..0c5b83f93f6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -46,7 +46,7 @@ #ifndef __x86_64__ -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -58,7 +58,10 @@ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static const rtti_base_array name ## _rtti_base_array = { \ { \ @@ -122,7 +125,7 @@ static const cxx_exception_type type ## _cxx_type = { \ #else -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -134,7 +137,18 @@ static rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + \ + static void init_ ## name ## _rtti(char *base) \ + { \ + name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \ + } + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static rtti_base_array name ## _rtti_base_array = { \ { \

1 0

Arkadiusz Hiler : msvcp140_1: Implement the DLL.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 8180241f02fd6b187a059e1e75f166a611cf8a62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8180241f02fd6b187a059e1e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 6 17:02:45 2021 +0200 msvcp140_1: Implement the DLL. This backs C++17's std::pmr implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49954 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9cbff7e68c6138eac567eeecbc8022ae54e7760a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcp140_1/Makefile.in | 7 +- dlls/msvcp140_1/msvcp140_1.c | 290 +++++++++++++++++++++++++++++++++++ dlls/msvcp140_1/msvcp140_1.spec | 14 +- dlls/msvcp140_1/tests/Makefile.in | 3 + dlls/msvcp140_1/tests/msvcp140_1.c | 305 +++++++++++++++++++++++++++++++++++++ 7 files changed, 613 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8180241f02fd6b187a05…

1 0

Alexandre Julliard : configure: Fix package name for FAudio.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 5d5d7f41f51f87de4ade62b73206c88ee469872f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5d7f41f51f87de4ade62b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 11:45:18 2021 +0200 configure: Fix package name for FAudio. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50436 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f126809ec017570325b98abd797356ceba17e15e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 12 ++++++------ configure.ac | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 5fe75e483fc..a57773e91ef 100755 --- a/configure +++ b/configure @@ -2711,8 +2711,8 @@ Some influential environment variables: SDL2_CFLAGS C compiler flags for sdl2, overriding pkg-config SDL2_LIBS Linker flags for sdl2, overriding pkg-config FAUDIO_CFLAGS - C compiler flags for faudio, overriding pkg-config - FAUDIO_LIBS Linker flags for faudio, overriding pkg-config + C compiler flags for FAudio, overriding pkg-config + FAUDIO_LIBS Linker flags for FAudio, overriding pkg-config CAPI20_CFLAGS C compiler flags for capi20, overriding pkg-config CAPI20_LIBS Linker flags for capi20, overriding pkg-config @@ -15007,19 +15007,19 @@ if test "x$with_faudio" != "xno" then if ${FAUDIO_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : - FAUDIO_CFLAGS=`$PKG_CONFIG --cflags faudio 2>/dev/null` + FAUDIO_CFLAGS=`$PKG_CONFIG --cflags FAudio 2>/dev/null` fi fi if ${FAUDIO_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : - FAUDIO_LIBS=`$PKG_CONFIG --libs faudio 2>/dev/null` + FAUDIO_LIBS=`$PKG_CONFIG --libs FAudio 2>/dev/null` fi fi FAUDIO_LIBS=${FAUDIO_LIBS:-"-lFAudio"} -$as_echo "$as_me:${as_lineno-$LINENO}: faudio cflags: $FAUDIO_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: faudio libs: $FAUDIO_LIBS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: FAudio cflags: $FAUDIO_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: FAudio libs: $FAUDIO_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $FAUDIO_CFLAGS" for ac_header in FAudio.h diff --git a/configure.ac b/configure.ac index 1ba2601a81d..a9add75bfd3 100644 --- a/configure.ac +++ b/configure.ac @@ -1695,7 +1695,7 @@ WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], dnl **** Check for FAudio **** if test "x$with_faudio" != "xno" then - WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, + WINE_PACKAGE_FLAGS(FAUDIO,[FAudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \

1 0

Jacek Caban : mshtml: Support DispHTMLHeadElement interface.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 158c49ca4824b8c28a78820c19a6ef4e9d27c8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=158c49ca4824b8c28a78820c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 29 12:05:20 2021 +0200 mshtml: Support DispHTMLHeadElement interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50492 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4efad17a9ffc1be95663b1c6cc84c16fb7830d89) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlhead.c | 2 ++ dlls/mshtml/tests/dom.c | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 879eca424ae..5dbf8d6b6bd 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -719,6 +719,8 @@ static HRESULT HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHTMLHeadElement, riid)) *ppv = &This->IHTMLHeadElement_iface; + else if(IsEqualGUID(&DIID_DispHTMLHeadElement, riid)) + *ppv = &This->IHTMLHeadElement_iface; else return HTMLElement_QI(&This->element.node, riid, ppv); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e46fc54bb70..e87eee94cdf 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -375,6 +375,7 @@ static const IID * const html_iids[] = { static const IID * const head_iids[] = { ELEM_IFACES, &IID_IHTMLHeadElement, + &DIID_DispHTMLHeadElement, &IID_IConnectionPointContainer, NULL };

1 0

Rémi Bernon : dinput: Wait for the hook thread to exit when stopping it.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 4dc5606c35e2ce9763299087342d29dee29d8b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dc5606c35e2ce9763299087… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 26 18:36:01 2021 +0100 dinput: Wait for the hook thread to exit when stopping it. FlatOut2 demo calls FreeLibrary on the dinput8 module more times than it has loaded it, and the module reference that the internal thread has is getting decremented before its exit. Having an internal window to destroy also makes it more likely to crash as it takes more time to exit calls the window procedure function. Waiting for the thread to complete when all the dinput instances are destroyed ensures that the thread isn't alive when the game frees the DLL, and prevents the thread from crashing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50673 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b71cea76ed24ca940783e01da54917eefa0bb36b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/dinput_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 45023fc104a..5da60cf1f7c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1861,6 +1861,7 @@ static BOOL check_hook_thread(void) { static HANDLE hook_thread; HMODULE module; + HANDLE wait_handle = NULL; EnterCriticalSection(&dinput_hook_crit); @@ -1884,11 +1885,17 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - CloseHandle(hook_thread); + wait_handle = hook_thread; hook_thread = NULL; } LeaveCriticalSection(&dinput_hook_crit); + + if (wait_handle) + { + WaitForSingleObject(wait_handle, INFINITE); + CloseHandle(wait_handle); + } return hook_thread_id != 0; }

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Implement IOleObject::SetExtent and IOleObject::GetExtent functions.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 4705790ee3631dc70c25728bc4e4ac9410129385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4705790ee3631dc70c25728b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Mar 10 21:30:28 2021 +0100 dhtmled.ocx: Implement IOleObject::SetExtent and IOleObject::GetExtent functions. This time without tests as the ocx file is not available from windows 7 & IE 8 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50697 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6ca1a92684fcbaa1c569b60411a8036b6d11dc99) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dhtmled.ocx/Makefile.in | 2 +- dlls/dhtmled.ocx/edit.c | 30 ++++++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index 0a890a57d44..077a072e010 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = dhtmled.ocx -IMPORTS = uuid ole32 +IMPORTS = uuid ole32 user32 gdi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index dfa300b9590..53dcdfc9ac6 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alex Henrie + * Copyright 2021 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,7 @@ typedef struct IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; IOleClientSite *client_site; + SIZEL extent; LONG ref; } DHTMLEditImpl; @@ -700,15 +702,25 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD type_type, static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD aspect, SIZEL *size_limit) { DHTMLEditImpl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%u, %p) stub\n", This, aspect, size_limit); - return E_NOTIMPL; + TRACE("(%p)->(%u, %p)\n", This, aspect, size_limit); + + if(aspect != DVASPECT_CONTENT) + return DV_E_DVASPECT; + + This->extent = *size_limit; + return S_OK; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD aspect, SIZEL *size_limit) { DHTMLEditImpl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%u, %p) stub\n", This, aspect, size_limit); - return E_NOTIMPL; + TRACE("(%p)->(%u, %p)\n", This, aspect, size_limit); + + if(aspect != DVASPECT_CONTENT) + return E_FAIL; + + *size_limit = This->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *sink, DWORD *conn) @@ -849,6 +861,8 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; + DWORD dpi_x, dpi_y; + HDC hdc; HRESULT ret; TRACE("(%s, %p)\n", debugstr_guid(iid), out); @@ -863,6 +877,14 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->client_site = NULL; This->ref = 1; + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + This->extent.cx = MulDiv(192, 2540, dpi_x); + This->extent.cy = MulDiv(192, 2540, dpi_y); + ret = IDHTMLEdit_QueryInterface(&This->IDHTMLEdit_iface, iid, out); IDHTMLEdit_Release(&This->IDHTMLEdit_iface); return ret;

1 0

Austin English : tdh: Add TdhLoadManifestFromBinary stub.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: bdf3307a15bcd04f4834cb14e7cb9b9ff32e1882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf3307a15bcd04f4834cb14… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 4 01:07:38 2021 -0600 tdh: Add TdhLoadManifestFromBinary stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50725 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a9bab3601ed741982e661a04951241478442bebb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/tdh/tdh.spec | 2 +- dlls/tdh/tdh_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/tdh/tdh.spec b/dlls/tdh/tdh.spec index 0e7c5a5995a..cde397c3899 100644 --- a/dlls/tdh/tdh.spec +++ b/dlls/tdh/tdh.spec @@ -22,7 +22,7 @@ @ stub TdhGetWppMessage @ stub TdhGetWppProperty @ stdcall TdhLoadManifest(wstr) -@ stub TdhLoadManifestFromBinary +@ stdcall TdhLoadManifestFromBinary(wstr) @ stub TdhOpenDecodingHandle @ stub TdhQueryProviderFieldInformation @ stub TdhQueryRemoteWBEMProviderFieldInformation diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index 29e7d50c241..1f9d20f0987 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -48,3 +48,9 @@ ULONG WINAPI TdhLoadManifest(LPWSTR manifest) FIXME("(%s): stub\n", debugstr_w(manifest)); return STATUS_SUCCESS; } + +ULONG WINAPI TdhLoadManifestFromBinary(LPWSTR binary) +{ + FIXME("(%s): stub\n", debugstr_w(binary)); + return STATUS_SUCCESS; +}

1 0

Akihiro Sagawa : gdi32: Move otmEMSquare initialization to freetype_load_font.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: bc76df8934657bbc229112cb0eb572c91596b637 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc76df8934657bbc229112cb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 6 21:34:19 2021 +0900 gdi32: Move otmEMSquare initialization to freetype_load_font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8f6f1c8f7aa2b848f0ebb15ec9e2b03854caf710) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fffa3288503..d94643b4451 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2489,6 +2489,7 @@ static BOOL CDECL freetype_load_font( struct gdi_font *font ) TRACE( "height %d => ppem %d\n", font->lf.lfHeight, font->ppem ); height = font->ppem; font->ttc_item_offset = get_ttc_offset( ft_face, font->face_index ); + font->otm.otmEMSquare = ft_face->units_per_EM; } else { @@ -3952,7 +3953,6 @@ static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ) font->otm.otmsCharSlopeRise = pHori->caret_Slope_Rise; font->otm.otmsCharSlopeRun = pHori->caret_Slope_Run; font->otm.otmItalicAngle = 0; /* POST table */ - font->otm.otmEMSquare = ft_face->units_per_EM; font->otm.otmAscent = SCALE_Y(pOS2->sTypoAscender); font->otm.otmDescent = SCALE_Y(pOS2->sTypoDescender); font->otm.otmLineGap = SCALE_Y(pOS2->sTypoLineGap);

1 0

Akihiro Sagawa : gdi32: Fix text metrics used in EnumFonts families.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 08397d23464bb24e7da741185494d7e8ccfd8473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08397d23464bb24e7da74118… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 6 21:34:21 2021 +0900 gdi32: Fix text metrics used in EnumFonts families. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50818 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 837c4f4b87b4a810e57d7e50af2023b38d03b5cd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6f50cc92a83..814c6153b89 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2685,7 +2685,9 @@ static UINT get_font_type( const NEWTEXTMETRICEXW *ntm ) static BOOL get_face_enum_data( struct gdi_font_face *face, ENUMLOGFONTEXW *elf, NEWTEXTMETRICEXW *ntm ) { struct gdi_font *font; - LOGFONTW lf = { .lfHeight = 100 }; + LOGFONTW lf = { .lfHeight = -4096 /* preferable EM Square size */ }; + + if (!face->scalable) lf.lfHeight = 0; if (!(font = create_gdi_font( face, NULL, &lf ))) return FALSE; @@ -2695,12 +2697,42 @@ static BOOL get_face_enum_data( struct gdi_font_face *face, ENUMLOGFONTEXW *elf, return FALSE; } + if (font->scalable && -lf.lfHeight % font->otm.otmEMSquare != 0) + { + /* reload with the original EM Square size */ + lf.lfHeight = -font->otm.otmEMSquare; + free_gdi_font( font ); + + if (!(font = create_gdi_font( face, NULL, &lf ))) return FALSE; + if (!font_funcs->load_font( font )) + { + free_gdi_font( font ); + return FALSE; + } + } + if (font_funcs->set_outline_text_metrics( font )) { - memcpy( &ntm->ntmTm, &font->otm.otmTextMetrics, sizeof(TEXTMETRICW) ); + static const DWORD ntm_ppem = 32; + +#define TM font->otm.otmTextMetrics +#define SCALE_NTM(value) (MulDiv( ntm->ntmTm.tmHeight, (value), TM.tmHeight )) + ntm->ntmTm.tmHeight = MulDiv( ntm_ppem, font->ntmCellHeight, font->otm.otmEMSquare ); + ntm->ntmTm.tmAscent = SCALE_NTM( TM.tmAscent ); + ntm->ntmTm.tmDescent = ntm->ntmTm.tmHeight - ntm->ntmTm.tmAscent; + ntm->ntmTm.tmInternalLeading = SCALE_NTM( TM.tmInternalLeading ); + ntm->ntmTm.tmExternalLeading = SCALE_NTM( TM.tmExternalLeading ); + ntm->ntmTm.tmAveCharWidth = SCALE_NTM( TM.tmAveCharWidth ); + ntm->ntmTm.tmMaxCharWidth = SCALE_NTM( TM.tmMaxCharWidth ); + + memcpy((char *)&ntm->ntmTm + offsetof( TEXTMETRICW, tmWeight ), + (const char *)&TM + offsetof( TEXTMETRICW, tmWeight ), + sizeof(TEXTMETRICW) - offsetof( TEXTMETRICW, tmWeight )); ntm->ntmTm.ntmSizeEM = font->otm.otmEMSquare; ntm->ntmTm.ntmCellHeight = font->ntmCellHeight; ntm->ntmTm.ntmAvgWidth = font->ntmAvgWidth; +#undef SCALE_NTM +#undef TM } else if (font_funcs->set_bitmap_text_metrics( font )) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index da5fdf2238e..0344e5621e8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3927,6 +3927,25 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", font_name, ntm->ntmCellHeight, cell_height, ascent, descent); + /* NEWTEXTMETRIC's scaling method is different from TEXTMETRIC's */ +#define SCALE_NTM(value) (MulDiv(ntm->tmHeight, (value), cell_height)) + size = MulDiv(32, ntm->ntmCellHeight, ntm->ntmSizeEM); + ok(ntm->tmHeight == size, "%s: ntm->tmHeight %d != %d (%u/%u)\n", + font_name, ntm->tmHeight, size, ntm->ntmCellHeight, ntm->ntmSizeEM); + size = SCALE_NTM(ntm->ntmAvgWidth); + ok(ntm->tmAveCharWidth == size, "%s: ntm->tmAveCharWidth %d != %d (%u/%u,%d)\n", + font_name, ntm->tmAveCharWidth, size, ntm->ntmAvgWidth, cell_height, ntm->tmHeight); + size = SCALE_NTM(ascent); + ok(ntm->tmAscent == size, "%s: ntm->tmAscent %d != %d (%u/%u,%d)\n", + font_name, ntm->tmAscent, size, ascent, cell_height, ntm->tmHeight); + size = ntm->tmHeight - ntm->tmAscent; + ok(ntm->tmDescent == size, "%s: ntm->tmDescent %d != %d (%u/%u,%d)\n", + font_name, ntm->tmDescent, size, descent, cell_height, ntm->tmHeight); + size = SCALE_NTM(cell_height - ntm->ntmSizeEM); + ok(ntm->tmInternalLeading == size, "%s: ntm->tmInternalLeading %d != %d (%u/%u,%d)\n", + font_name, ntm->tmInternalLeading, size, cell_height - ntm->ntmSizeEM, cell_height, ntm->tmHeight); +#undef SCALE_NTM + version = GET_BE_WORD(tt_os2.version); os2_first_char = GET_BE_WORD(tt_os2.usFirstCharIndex);

1 0

Jacek Caban : jscript: Use quiet NaNs in jsval.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: adc1b84adb9bd39a74a9ef3914073316feaa78cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc1b84adb9bd39a74a9ef39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 20:40:42 2021 +0200 jscript: Use quiet NaNs in jsval. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50845 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d9a4392d6bbd50b0a9690aa20fe7baa199f38d96) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/jsval.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index 963f59f6a08..9f451b12831 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -35,8 +35,8 @@ #endif #ifdef JSVAL_DOUBLE_LAYOUT_PTR32 -/* NaN exponent and our 0x80000 marker */ -#define JSV_VAL(x) (0x7ff80000|x) +/* NaN exponent, quiet bit 0x80000 and our 0x10000 marker */ +#define JSV_VAL(x) (0x7ff90000|x) #else #define JSV_VAL(x) x #endif @@ -150,10 +150,10 @@ static inline jsval_t jsval_number(double n) if((ret.u.s.tag & 0x7ff00000) == 0x7ff00000) { /* isinf */ if(ret.u.s.tag & 0xfffff) { - ret.u.s.tag = 0x7ff00000; + ret.u.s.tag = 0x7ff80000; ret.u.s.u.as_uintptr = ~0; }else if(ret.u.s.u.as_uintptr) { - ret.u.s.tag = 0x7ff00000; + ret.u.s.tag = 0x7ff80000; } } #else @@ -191,7 +191,7 @@ static inline BOOL is_string(jsval_t v) static inline BOOL is_number(jsval_t v) { #ifdef JSVAL_DOUBLE_LAYOUT_PTR32 - return (v.u.s.tag & 0x7ff80000) != 0x7ff80000; + return (v.u.s.tag & 0x7ff10000) != 0x7ff10000; #else return v.type == JSV_NUMBER; #endif

1 0