May 2023 - Wine-commits - list.winehq.org

Rémi Bernon : winemac: Use the default IME implementation for NotifyIME.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 4c9154536737e33bb17e3dafb073dba3292570dd URL: https://gitlab.winehq.org/wine/wine/-/commit/4c9154536737e33bb17e3dafb073db… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 9 11:38:32 2023 +0200 winemac: Use the default IME implementation for NotifyIME. --- dlls/winemac.drv/event.c | 10 +++ dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/ime.c | 154 +------------------------------------- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 9 --- dlls/winemac.drv/unixlib.h | 1 - dlls/winemac.drv/winemac.drv.spec | 1 - 7 files changed, 14 insertions(+), 163 deletions(-)

1 0

Brendan Shanks : winemac: Initialize retina_on to avoid incorrect cached display data in high-res/retina mode.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: d2789ef0678619d7c56a9e0c1aaa06f582a41ee3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2789ef0678619d7c56a9e0c1aaa06… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 9 15:22:44 2023 -0700 winemac: Initialize retina_on to avoid incorrect cached display data in high-res/retina mode. retina_on was being set (indirectly) by check_retina_status(), but it relies on retina_on itself. This resulted in incorrect (non-retina) monitor and work RECTs being cached, causing odd application bugs like a window that won't resize larger than 1/4 of the screen. Initialize retina_on to the value of retina_enabled, so later calls to check_retina_status() don't result in incorrect data being cached. --- dlls/winemac.drv/macdrv_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 9125574e35b..a55b2686080 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -383,6 +383,8 @@ static void setup_options(void) if (!get_config_key(hkey, NULL, "RetinaMode", buffer, sizeof(buffer))) retina_enabled = IS_OPTION_TRUE(buffer[0]); + retina_on = retina_enabled; + if (appkey) NtClose(appkey); if (hkey) NtClose(hkey); }

1 0

Piotr Caban : wineps: Define PSDRV_PDEVICE structure in unixlib.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 53daf8961f0b8c3a3ffa1540fa9017dc58f3b069 URL: https://gitlab.winehq.org/wine/wine/-/commit/53daf8961f0b8c3a3ffa1540fa9017… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 8 17:30:26 2023 +0200 wineps: Define PSDRV_PDEVICE structure in unixlib. --- dlls/wineps.drv/unixlib.c | 388 +++++++++++++++++++++++----------------------- 1 file changed, 197 insertions(+), 191 deletions(-)

1 0

Vijay Kiran Kamuju : winex11.drv: Fix compile when xrandr is not available.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 9d282171f5bbbf605fd382aeadacb14d40aa64b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d282171f5bbbf605fd382aeadacb1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed May 10 19:06:58 2023 +0200 winex11.drv: Fix compile when xrandr is not available. --- dlls/winex11.drv/xrandr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f54960f1c9b..9a27577ba78 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -30,7 +30,9 @@ #define NONAMELESSUNION #include <assert.h> #include <X11/Xlib.h> +#ifdef HAVE_X11_EXTENSIONS_XRANDR_H #include <X11/extensions/Xrandr.h> +#endif #include <dlfcn.h> #include "x11drv.h" #include "wine/debug.h"

1 0

Michael Stefaniuc : wbemprox: Avoid assigning COM objects to interface variables.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 0542346d3beeed7cf0d0af79e66789dae241daea URL: https://gitlab.winehq.org/wine/wine/-/commit/0542346d3beeed7cf0d0af79e66789… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 9 18:30:42 2023 +0200 wbemprox: Avoid assigning COM objects to interface variables. --- dlls/wbemprox/class.c | 4 ++-- dlls/wbemprox/qualifier.c | 2 +- dlls/wbemprox/services.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index d9848986044..1570a5e534a 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -78,7 +78,7 @@ static HRESULT WINAPI enum_class_object_QueryInterface( if ( IsEqualGUID( riid, &IID_IEnumWbemClassObject ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = ec; + *ppvObject = &ec->IEnumWbemClassObject_iface; } else if ( IsEqualGUID( riid, &IID_IClientSecurity ) ) { @@ -324,7 +324,7 @@ static HRESULT WINAPI class_object_QueryInterface( if ( IsEqualGUID( riid, &IID_IWbemClassObject ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = co; + *ppvObject = &co->IWbemClassObject_iface; } else if (IsEqualGUID( riid, &IID_IClientSecurity )) { diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index 9a8947ede80..167a8142223 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -79,7 +79,7 @@ static HRESULT WINAPI qualifier_set_QueryInterface( if ( IsEqualGUID( riid, &IID_IWbemQualifierSet ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = set; + *ppvObject = &set->IWbemQualifierSet_iface; } else { diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 203b0e90784..436097c1e8d 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -52,7 +52,7 @@ static HRESULT WINAPI client_security_QueryInterface( if ( IsEqualGUID( riid, &IID_IClientSecurity ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = cs; + *ppvObject = &cs->IClientSecurity_iface; } else { @@ -264,7 +264,7 @@ static HRESULT WINAPI wbem_services_QueryInterface( if ( IsEqualGUID( riid, &IID_IWbemServices ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = ws; + *ppvObject = &ws->IWbemServices_iface; } else if ( IsEqualGUID( riid, &IID_IClientSecurity ) ) {

1 0

Eric Pouech : winegstreamer: Fix typo.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 0e622f64e022e06a925f560796f668c4b64e28e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e622f64e022e06a925f560796f668… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed May 10 17:16:53 2023 +0200 winegstreamer: Fix typo. Introduced in 98d209752cee9abd8dc31dfe1f28811066b0b83f. An application (Idol Showdown) fails to play its intro video without this change. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 335b617becd..41271585454 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -947,7 +947,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) if (FAILED(hr = MFCreateMediaType(&iyuv_type))) goto done; - if (FAILED(hr = IMFMediaType_CopyAllItems(iyuv_type, (IMFAttributes *)iyuv_type))) + if (FAILED(hr = IMFMediaType_CopyAllItems(new_type, (IMFAttributes *)iyuv_type))) goto done; if (FAILED(hr = IMFMediaType_SetGUID(iyuv_type, &MF_MT_SUBTYPE, &MFVideoFormat_IYUV))) goto done;

1 0

Paul Gofman : ntdll: Retry send on ECONNREFUSED in try_send().
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: afaf6786153ced082412b63caf14adc73c6154fb URL: https://gitlab.winehq.org/wine/wine/-/commit/afaf6786153ced082412b63caf14ad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 20 19:32:18 2023 -0600 ntdll: Retry send on ECONNREFUSED in try_send(). --- dlls/ntdll/unix/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 25 ++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index ac351a17a70..4e706323a0a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -984,6 +984,7 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async ) { union unix_sockaddr unix_addr; struct msghdr hdr; + int attempt = 0; ssize_t ret; memset( &hdr, 0, sizeof(hdr) ); @@ -1028,6 +1029,17 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async ) else if (errno != EINTR) { if (errno != EWOULDBLOCK) WARN( "sendmsg: %s\n", strerror( errno ) ); + + /* ECONNREFUSED may be returned if this is connected datagram socket and the system received + * ICMP "destination port unreachable" message from the peer. That is ignored + * on Windows. The first sendmsg() will clear the error in this case and the next + * call should succeed. */ + if (!attempt && errno == ECONNREFUSED) + { + ++attempt; + continue; + } + return sock_errno_to_status( errno ); } } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1125d4519d3..cddc4c125ff 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2962,7 +2962,9 @@ static void test_UDP(void) /* peer 0 receives data from all other peers */ struct sock_info peer[NUM_UDP_PEERS]; char buf[16]; - int ss, i, n_recv, n_sent; + int ss, i, n_recv, n_sent, ret; + struct sockaddr_in addr; + int sock; memset (buf,0,sizeof(buf)); for ( i = NUM_UDP_PEERS - 1; i >= 0; i-- ) { @@ -3000,6 +3002,27 @@ static void test_UDP(void) ok ( n_recv == sizeof(buf), "UDP: recvfrom() received wrong amount of data or socket error: %d\n", n_recv ); ok ( memcmp ( &peer[0].peer.sin_port, buf, sizeof(peer[0].addr.sin_port) ) == 0, "UDP: port numbers do not match\n" ); } + + sock = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok( sock != INVALID_SOCKET, "got error %u.\n", WSAGetLastError() ); + + memset( &addr, 0, sizeof(addr) ); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + addr.sin_port = htons(255); + + ret = connect( sock, (struct sockaddr *)&addr, sizeof(addr) ); + ok( !ret, "got error %u.\n", WSAGetLastError() ); + + /* Send to UDP socket succeeds even if the packets are not received and the network is replying with + * "destination port unreachable" ICMP messages. */ + for (i = 0; i < 10; ++i) + { + ret = send( sock, buf, sizeof(buf), 0 ); + ok( ret == sizeof(buf), "got %d, error %u.\n", ret, WSAGetLastError() ); + } + + closesocket(sock); } static void test_WSASocket(void)

1 0

Piotr Caban : wineps: Change initial printer font to DEVICE_DEFAULT_FONT.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 9e95b9e6fc16312996bde48cfcbf013fedcd8e2e URL: https://gitlab.winehq.org/wine/wine/-/commit/9e95b9e6fc16312996bde48cfcbf01… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 6 11:24:11 2023 +0200 wineps: Change initial printer font to DEVICE_DEFAULT_FONT. --- dlls/wineps.drv/init.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index b08f02ddb11..97f68d19a91 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -93,12 +93,6 @@ static const PSDRV_DEVMODE DefaultDevmode = HINSTANCE PSDRV_hInstance = 0; HANDLE PSDRV_Heap = 0; -static HFONT PSDRV_DefaultFont = 0; -static const LOGFONTA DefaultLogFont = { - 100, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, - DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" -}; - static struct gdi_dc_funcs psdrv_funcs; /********************************************************************* @@ -134,18 +128,11 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) HeapDestroy(PSDRV_Heap); return FALSE; } - - PSDRV_DefaultFont = CreateFontIndirectA(&DefaultLogFont); - if (PSDRV_DefaultFont == NULL) { - HeapDestroy(PSDRV_Heap); - return FALSE; - } break; } case DLL_PROCESS_DETACH: if (reserved) break; - DeleteObject( PSDRV_DefaultFont ); HeapDestroy( PSDRV_Heap ); break; } @@ -391,7 +378,7 @@ PSDRV_PDEVICE *create_psdrv_physdev( HDC hdc, const WCHAR *device, } PSDRV_UpdateDevCaps( pdev ); - SelectObject( hdc, PSDRV_DefaultFont ); + SelectObject( hdc, GetStockObject( DEVICE_DEFAULT_FONT )); return pdev; }

1 0

Piotr Caban : wineps: Introduce PSDRV_GET_GLYPH_NAME escape to obtain builtin glyph name from unixlib.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: d1b09fa24c1d5007af91a1a9d5ea8a617da37683 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1b09fa24c1d5007af91a1a9d5ea8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 6 12:24:01 2023 +0200 wineps: Introduce PSDRV_GET_GLYPH_NAME escape to obtain builtin glyph name from unixlib. --- dlls/wineps.drv/builtin.c | 7 +++-- dlls/wineps.drv/unixlib.c | 67 +++++++++++++++++++++++++++-------------------- dlls/wineps.drv/unixlib.h | 2 ++ 3 files changed, 44 insertions(+), 32 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 74ffda36f92..4fdbc58f099 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -31,6 +31,7 @@ #include "winternl.h" #include "psdrv.h" +#include "unixlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); @@ -244,14 +245,12 @@ BOOL PSDRV_WriteSetBuiltinFont(PHYSDEV dev) BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) { - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + char name[32]; int i; - LPCSTR name; for (i = 0; i < count; ++i) { - name = PSDRV_UVMetrics(str[i], physDev->font.fontinfo.Builtin.afm)->N->sz; - + ExtEscape(dev->hdc, PSDRV_GET_GLYPH_NAME, sizeof(str[i]), (const char *)&str[i], sizeof(name), name); PSDRV_WriteGlyphShow(dev, name); } diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 72f63c81300..36971f65495 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -518,6 +518,34 @@ static BOOL CDECL reset_dc(PHYSDEV dev, const DEVMODEW *devmode) return TRUE; } +static int metrics_by_uv(const void *a, const void *b) +{ + return (int)(((const AFMMETRICS *)a)->UV - ((const AFMMETRICS *)b)->UV); +} + +const AFMMETRICS *uv_metrics(LONG uv, const AFM *afm) +{ + const AFMMETRICS *needle; + AFMMETRICS key; + + /* + * Ugly work-around for symbol fonts. Wine is sending characters which + * belong in the Unicode private use range (U+F020 - U+F0FF) as ASCII + * characters (U+0020 - U+00FF). + */ + if ((afm->Metrics->UV & 0xff00) == 0xf000 && uv < 0x100) + uv |= 0xf000; + + key.UV = uv; + needle = bsearch(&key, afm->Metrics, afm->NumofMetrics, sizeof(AFMMETRICS), metrics_by_uv); + if (!needle) + { + WARN("No glyph for U+%.4X in '%s'\n", (int)uv, afm->FontName); + needle = afm->Metrics; + } + return needle; +} + static int CDECL ext_escape(PHYSDEV dev, int escape, int input_size, const void *input, int output_size, void *output) { @@ -770,6 +798,17 @@ static int CDECL ext_escape(PHYSDEV dev, int escape, int input_size, const void case CLIP_TO_PATH: return 1; + + case PSDRV_GET_GLYPH_NAME: + { + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + WCHAR *uv = (WCHAR *)input; + const char *name = uv_metrics(*uv, pdev->font.fontinfo.Builtin.afm)->N->sz; + + lstrcpynA(output, name, output_size); + return 1; + } + default: FIXME("Unimplemented code %d\n", escape); return 0; @@ -1135,34 +1174,6 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP return ret; } -static int metrics_by_uv(const void *a, const void *b) -{ - return (int)(((const AFMMETRICS *)a)->UV - ((const AFMMETRICS *)b)->UV); -} - -const AFMMETRICS *uv_metrics(LONG uv, const AFM *afm) -{ - const AFMMETRICS *needle; - AFMMETRICS key; - - /* - * Ugly work-around for symbol fonts. Wine is sending characters which - * belong in the Unicode private use range (U+F020 - U+F0FF) as ASCII - * characters (U+0020 - U+00FF). - */ - if ((afm->Metrics->UV & 0xff00) == 0xf000 && uv < 0x100) - uv |= 0xf000; - - key.UV = uv; - needle = bsearch(&key, afm->Metrics, afm->NumofMetrics, sizeof(AFMMETRICS), metrics_by_uv); - if (!needle) - { - WARN("No glyph for U+%.4X in '%s'\n", (int)uv, afm->FontName); - needle = afm->Metrics; - } - return needle; -} - static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index 95efdd4c310..eb82188807c 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -19,6 +19,8 @@ #include "ntuser.h" #include "wine/unixlib.h" +#define PSDRV_GET_GLYPH_NAME 0x10000 + enum wineps_funcs { unix_init_dc,

1 0

Piotr Caban : wineps: Remove unused fields from PSFONT structure.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 96a6d1fd278df481c61da5255770f0bc7a3f92d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/96a6d1fd278df481c61da5255770f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 6 12:30:14 2023 +0200 wineps: Remove unused fields from PSFONT structure. --- dlls/wineps.drv/builtin.c | 5 ----- dlls/wineps.drv/download.c | 5 ----- dlls/wineps.drv/psdrv.h | 5 ----- dlls/wineps.drv/unixlib.c | 5 ----- 4 files changed, 20 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 4fdbc58f099..f4be5eb37fb 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -138,11 +138,6 @@ static VOID ScaleFont(const AFM *afm, LONG lfHeight, PSFONT *font, tm->tmMaxCharWidth = (LONG)Round( (afm->FontBBox.urx - afm->FontBBox.llx) * font->fontinfo.Builtin.scale); - font->underlinePosition = afm->UnderlinePosition * font->fontinfo.Builtin.scale; - font->underlineThickness = afm->UnderlineThickness * font->fontinfo.Builtin.scale; - font->strikeoutPosition = tm->tmAscent / 2; - font->strikeoutThickness = font->underlineThickness; - TRACE("Selected PS font '%s' size %d weight %ld.\n", afm->FontName, font->size.xx, tm->tmWeight ); TRACE("H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n", tm->tmHeight, diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index e8c3299e17c..191f8703e61 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -308,11 +308,6 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) physDev->font.size.yx = -ps_round(ppem * xform.eM21); physDev->font.size.yy = -ps_round(ppem * xform.eM22); - physDev->font.underlineThickness = potm->otmsUnderscoreSize; - physDev->font.underlinePosition = potm->otmsUnderscorePosition; - physDev->font.strikeoutThickness = potm->otmsStrikeoutSize; - physDev->font.strikeoutPosition = potm->otmsStrikeoutPosition; - if(physDev->font.fontinfo.Download == NULL) { RECT bbox; UINT emsize = get_bbox(dev->hdc, &bbox); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 40f590d0afd..3e6952f9618 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -316,11 +316,6 @@ typedef struct { /* These are needed by PSDRV_ExtTextOut */ int escapement; - int underlineThickness; - int underlinePosition; - int strikeoutThickness; - int strikeoutPosition; - } PSFONT; typedef struct { diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 36971f65495..73181d9cd93 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -904,11 +904,6 @@ static void scale_font(const AFM *afm, LONG height, PSFONT *font, TEXTMETRICW *t tm->tmMaxCharWidth = (LONG)gdi_round( (afm->FontBBox.urx - afm->FontBBox.llx) * font->fontinfo.Builtin.scale); - font->underlinePosition = afm->UnderlinePosition * font->fontinfo.Builtin.scale; - font->underlineThickness = afm->UnderlineThickness * font->fontinfo.Builtin.scale; - font->strikeoutPosition = tm->tmAscent / 2; - font->strikeoutThickness = font->underlineThickness; - TRACE("Selected PS font '%s' size %d weight %d.\n", afm->FontName, font->size.xx, (int)tm->tmWeight); TRACE("H = %d As = %d Des = %d IL = %d EL = %d\n", (int)tm->tmHeight,

1 0