October 2021 - Wine-Commits

Nikolay Sivov : shcore/stream: Implement generic CopyTo().
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: c8d12b4e052a11f94ac948030088bcdc04b0c195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8d12b4e052a11f94ac94803… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 08:51:39 2021 +0300 shcore/stream: Implement generic CopyTo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e7f60e39f68f9190477a9e022c4f785724d55ae6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shcore/main.c | 48 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index d5fce76eade..3348976f0f1 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -697,20 +697,54 @@ static HRESULT WINAPI memstream_SetSize(IStream *iface, ULARGE_INTEGER new_size) return S_OK; } -static HRESULT WINAPI shstream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER size, ULARGE_INTEGER *read_len, ULARGE_INTEGER *written) +static HRESULT WINAPI shstream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGER size, + ULARGE_INTEGER *read_len, ULARGE_INTEGER *written) { struct shstream *stream = impl_from_IStream(iface); + ULARGE_INTEGER total_read, total_written; + HRESULT hr = S_OK; + BYTE buffer[0x400]; - TRACE("(%p)\n", stream); + TRACE("(%p, %p, %s, %p, %p)\n", stream, dest, wine_dbgstr_longlong(size.QuadPart), read_len, written); - if (read_len) - read_len->QuadPart = 0; + if (!dest) + return E_POINTER; + + total_read.QuadPart = 0; + total_written.QuadPart = 0; + + while (size.QuadPart > 0) + { + ULONG chunk_size = size.QuadPart >= sizeof(buffer) ? sizeof(buffer) : size.u.LowPart; + ULONG chunk_read, chunk_written; + + hr = IStream_Read(iface, buffer, chunk_size, &chunk_read); + if (FAILED(hr)) + break; + total_read.QuadPart += chunk_read; + + if (chunk_read) + { + hr = IStream_Write(dest, buffer, chunk_read, &chunk_written); + if (FAILED(hr)) + break; + + total_written.QuadPart += chunk_written; + } + + if (chunk_read != chunk_size) + size.QuadPart = 0; + else + size.QuadPart -= chunk_read; + } + + if (read_len) + read_len->QuadPart = total_read.QuadPart; if (written) - written->QuadPart = 0; + written->QuadPart = total_written.QuadPart; - /* TODO implement */ - return E_NOTIMPL; + return hr; } static HRESULT WINAPI shstream_Commit(IStream *iface, DWORD flags)

1 0

Torge Matthies : winex11.drv: Avoid race condition in X11 error handling.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 96a1855bb92d8ee080f3505245f1fda3368ebf70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96a1855bb92d8ee080f35052… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Jun 7 01:05:16 2021 +0200 winex11.drv: Avoid race condition in X11 error handling. The err_callback* globals need to be protected from being overwritten before X11DRV_check_error is called, otherwise no or the wrong error handler might be called. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2e4bfa642e31f9690365d6daf42ef87a74331cf7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9ec4c7a98f6..2fac560556b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -108,6 +108,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION x11drv_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION x11drv_error_section; +static CRITICAL_SECTION_DEBUG x11drv_error_section_debug = +{ + 0, 0, &x11drv_error_section, + { &x11drv_error_section_debug.ProcessLocksList, &x11drv_error_section_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": x11drv_error_section") } +}; +static CRITICAL_SECTION x11drv_error_section = { &x11drv_error_section_debug, -1, 0, 0, 0, 0 }; + struct d3dkmt_vidpn_source { D3DKMT_VIDPNSOURCEOWNER_TYPE type; /* VidPN source owner type */ @@ -256,6 +265,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) */ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) { + EnterCriticalSection( &x11drv_error_section ); err_callback = callback; err_callback_display = display; err_callback_arg = arg; @@ -272,8 +282,10 @@ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void */ int X11DRV_check_error(void) { + int res = err_callback_result; err_callback = NULL; - return err_callback_result; + LeaveCriticalSection( &x11drv_error_section ); + return res; }

1 0

Brendan Shanks : configure: Work around Xcode 12's ld assuming 16KB page sizes.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: d7e26f2f7ba9e62b35fe20477e93bac5e2d84000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e26f2f7ba9e62b35fe2047… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jun 15 13:25:31 2021 -0700 configure: Work around Xcode 12's ld assuming 16KB page sizes. Starting in Xcode 12, ld rounds page sizes and alignments up to 16KB for all architectures. Passing '-segalign 0x1000' resets this back to 4KB. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11fd7e8394b53b04b027d7c5b26c51b8b50242b9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index a57773e91ef..5ed620c0e2f 100755 --- a/configure +++ b/configure @@ -8719,10 +8719,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration" - WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : diff --git a/configure.ac b/configure.ac index a9add75bfd3..5c689789c86 100644 --- a/configure.ac +++ b/configure.ac @@ -742,10 +742,10 @@ case $host_os in AC_SUBST(APPKIT_LIBS,"-framework AppKit") AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration") - WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],,

1 0

Owen Rudge : winspool: Filter invalid characters when creating the PPD filename.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: fb5322856891bd0f6fb349c7999c409569f46995 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5322856891bd0f6fb349c7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 10 12:26:50 2021 +0000 winspool: Filter invalid characters when creating the PPD filename. Fixes potential crash when trying to print if a CUPS printer name contains an asterisk. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6b906e82371513e9f5b94fa2d67ad8e0ee865335) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb9c1599d38..4d0542d20e3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -721,13 +721,18 @@ fail: static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { static const WCHAR dot_ppd[] = {'.','p','p','d',0}; - int len = (strlenW( dir ) + strlenW( file_name )) * sizeof(WCHAR) + sizeof(dot_ppd); - WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ); + static const WCHAR invalid_chars[] = {'*','?','<','>','|','"','/','\\',0}; + int dir_len = strlenW( dir ), file_len = strlenW( file_name ); + int len = (dir_len + file_len + ARRAY_SIZE( dot_ppd )) * sizeof(WCHAR); + WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ), *p; if (!ppd) return NULL; - strcpyW( ppd, dir ); - strcatW( ppd, file_name ); - strcatW( ppd, dot_ppd ); + memcpy( ppd, dir, dir_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len, file_name, file_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len + file_len, dot_ppd, sizeof(dot_ppd) ); + + p = ppd + dir_len; + while ((p = strpbrkW( p, invalid_chars ))) *p++ = '_'; return ppd; }

1 0

Andrew Eikum : windowscodecs: Avoid types deprecated in libtiff 4.3.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: fbe42005a5267e36628991ba5035c988a380634e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbe42005a5267e36628991ba… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 19 16:04:57 2021 -0500 windowscodecs: Avoid types deprecated in libtiff 4.3. dlls/windowscodecs/libtiff.c:256:5: warning: ‘uint16’ is deprecated [-Wdeprecated-declarations] Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5e3758a70fb0068df0ffed9e1470e01e5a3cd9df) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/libtiff.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 6f5cfc53c62..bafabb68ea7 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -29,6 +29,7 @@ #include <unistd.h> #endif #ifdef HAVE_TIFFIO_H +#include <stdint.h> #include <tiffio.h> #endif @@ -253,9 +254,9 @@ static inline struct tiff_decoder *impl_from_decoder(struct decoder* iface) static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { - uint16 photometric, bps, samples, planar; - uint16 extra_sample_count, extra_sample, *extra_samples; - uint16 *red, *green, *blue; + uint16_t photometric, bps, samples, planar; + uint16_t extra_sample_count, extra_sample, *extra_samples; + uint16_t *red, *green, *blue; UINT resolution_unit; float xres=0.0, yres=0.0; int ret, i; @@ -1282,32 +1283,32 @@ static HRESULT CDECL tiff_encoder_create_frame(struct encoder* iface, const stru This->format = &formats[i]; - pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16)This->format->photometric); - pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16)1); - pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16)This->format->bps); - pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)This->format->samples); + pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16_t)This->format->photometric); + pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16_t)1); + pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16_t)This->format->bps); + pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16_t)This->format->samples); if (This->format->extra_sample) { - uint16 extra_samples; + uint16_t extra_samples; extra_samples = This->format->extra_sample_type; - pTIFFSetField(This->tiff, TIFFTAG_EXTRASAMPLES, (uint16)1, &extra_samples); + pTIFFSetField(This->tiff, TIFFTAG_EXTRASAMPLES, (uint16_t)1, &extra_samples); } - pTIFFSetField(This->tiff, TIFFTAG_IMAGEWIDTH, (uint32)frame->width); - pTIFFSetField(This->tiff, TIFFTAG_IMAGELENGTH, (uint32)frame->height); + pTIFFSetField(This->tiff, TIFFTAG_IMAGEWIDTH, (uint32_t)frame->width); + pTIFFSetField(This->tiff, TIFFTAG_IMAGELENGTH, (uint32_t)frame->height); if (frame->dpix != 0.0 && frame->dpiy != 0.0) { - pTIFFSetField(This->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16)2); /* Inch */ + pTIFFSetField(This->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16_t)2); /* Inch */ pTIFFSetField(This->tiff, TIFFTAG_XRESOLUTION, (float)frame->dpix); pTIFFSetField(This->tiff, TIFFTAG_YRESOLUTION, (float)frame->dpiy); } if (This->format->bpp <= 8 && frame->num_colors && This->format->indexed) { - uint16 red[256], green[256], blue[256]; + uint16_t red[256], green[256], blue[256]; UINT i; for (i = 0; i < frame->num_colors; i++)

1 0

Nguyễn Chính Hữu : wined3d: Add GPU information for NVIDIA GT 1030.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 08d4d30a12e5051695e5914a66bc2b77c1fba662 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d4d30a12e5051695e5914a… Author: Nguyễn Chính Hữu <huupoke12(a)gmail.com> Date: Thu Jun 10 17:41:08 2021 +0700 wined3d: Add GPU information for NVIDIA GT 1030. Signed-off-by: Nguyễn Chính Hữu <huupoke12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8854fd2b07b0ac17b1cc3753d3390ee4ef4e7957) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 9338bd2ba10..c5bafe146a9 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1327,6 +1327,7 @@ cards_nvidia_binary[] = {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ {"GTX 1050 Ti", CARD_NVIDIA_GEFORCE_GTX1050TI}, /* GeForce 1000 - midend */ {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ + {"GT 1030", CARD_NVIDIA_GEFORCE_GT1030}, /* GeForce 1000 - lowend */ {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1bfedad7975..317a5dd9e51 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -435,6 +435,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_KEPLER, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_KEPLER, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_KEPLER, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT1030, "NVIDIA GeForce GT 1030", DRIVER_NVIDIA_KEPLER, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_KEPLER, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050TI, "NVIDIA GeForce GTX 1050 Ti", DRIVER_NVIDIA_KEPLER, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060_3GB,"NVIDIA GeForce GTX 1060 3GB", DRIVER_NVIDIA_KEPLER, 3072}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9ded086389..df51de27345 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3024,6 +3024,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, + CARD_NVIDIA_GEFORCE_GT1030 = 0x1d01, CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, CARD_NVIDIA_GEFORCE_GTX1050TI = 0x1c82, CARD_NVIDIA_GEFORCE_GTX1060_3GB = 0x1c02,

1 0

Alistair Leslie-Hughes : gdi32: Don't override FontSubstitutes on a DPI only change.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 2f06215a8eb364ba5256ae8e86fc6735f7f05769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f06215a8eb364ba5256ae8e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 27 15:50:48 2021 +1000 gdi32: Don't override FontSubstitutes on a DPI only change. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36010 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7763efa347327868f6c8ba0c91f60f53a885688a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b6840d8d809..6300e6e1251 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2485,7 +2485,8 @@ static void update_codepage(void) add_font_list(hkey, &nls_update_font_list[i], screen_dpi); RegCloseKey(hkey); } - if (!RegCreateKeyW( HKEY_LOCAL_MACHINE, + /* Only update these if the Codepage changed. */ + if (strcmp( buf, cpbuf ) && !RegCreateKeyW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", &hkey )) { RegSetValueExA(hkey, "MS Shell Dlg", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].shelldlg,

1 0

Esme Povirk : gdiplus: Implement reference counting for private font families.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: a0b7fb69e767770f6c02de0e15f1945df3ceac08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b7fb69e767770f6c02de0e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed May 26 15:49:18 2021 -0500 gdiplus: Implement reference counting for private font families. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50896 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a5540798605b3ef9abcf654bc28d9dd8d8736e53) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/font.c | 22 ++++++++++++++++------ dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/tests/font.c | 13 ++++++++++++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 05663b71aad..c18e5702ca2 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -190,7 +190,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->unit = unit; (*font)->emSize = emSize; (*font)->otm = otm; - (*font)->family = (GpFontFamily *)fontFamily; + GdipCloneFontFamily((GpFontFamily*)fontFamily, &(*font)->family); TRACE("<-- %p\n", *font); @@ -323,8 +323,7 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) if (!(font && family)) return InvalidParameter; - *family = font->family; - return Ok; + return GdipCloneFontFamily(font->family, family); } static REAL get_font_size(const GpFont *font) @@ -746,9 +745,8 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, { if (!wcsicmp(lf.lfFaceName, collection->FontFamilies[i]->FamilyName)) { - *family = collection->FontFamilies[i]; + status = GdipCloneFontFamily(collection->FontFamilies[i], family); TRACE("<-- %p\n", *family); - status = Ok; break; } } @@ -778,6 +776,10 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clo TRACE("%p (%s), %p\n", family, debugstr_w(family->FamilyName), clone); *clone = family; + + if (!family->installed) + InterlockedIncrement(&family->ref); + return Ok; } @@ -835,6 +837,11 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) if (!FontFamily) return InvalidParameter; + if (!FontFamily->installed && !InterlockedDecrement(&FontFamily->ref)) + { + heap_free(FontFamily); + } + return Ok; } @@ -1079,7 +1086,7 @@ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontColle if (!fontCollection) return InvalidParameter; - for (i = 0; i < (*fontCollection)->count; i++) heap_free((*fontCollection)->FontFamilies[i]); + for (i = 0; i < (*fontCollection)->count; i++) GdipDeleteFontFamily((*fontCollection)->FontFamilies[i]); heap_free((*fontCollection)->FontFamilies); heap_free(*fontCollection); @@ -1541,6 +1548,7 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList( for (i = 0; i < numSought && i < fontCollection->count; i++) { + /* caller is responsible for cloning these if it keeps references */ gpfamilies[i] = fontCollection->FontFamilies[i]; } @@ -1641,6 +1649,8 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, family->descent = fm.descent; family->line_spacing = fm.line_spacing; family->dpi = fm.dpi; + family->installed = param->is_system; + family->ref = 1; lstrcpyW(family->FamilyName, lfw->lfFaceName); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index aac5509afa7..07716690d47 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -528,6 +528,8 @@ struct GpFontFamily{ WCHAR FamilyName[LF_FACESIZE]; UINT16 em_height, ascent, descent, line_spacing; /* in font units */ int dpi; + BOOL installed; + LONG ref; }; /* internal use */ diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 32cd1ff2c4f..b208989c054 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -72,7 +72,7 @@ static void test_long_name(void) GpStatus stat; GpFontCollection *fonts; INT num_families; - GpFontFamily *family; + GpFontFamily *family, *cloned_family; WCHAR family_name[LF_FACESIZE]; GpFont *font; @@ -98,6 +98,10 @@ static void test_long_name(void) stat = GdipCreateFont(family, 256.0, FontStyleRegular, UnitPixel, &font); ok(stat == Ok, "GdipCreateFont failed: %d\n", stat); + stat = GdipCloneFontFamily(family, &cloned_family); + ok(stat == Ok, "GdipCloneFontFamily failed: %d\n", stat); + ok(family == cloned_family, "GdipCloneFontFamily returned new object\n"); + /* Cleanup */ stat = GdipDeleteFont(font); @@ -106,6 +110,13 @@ static void test_long_name(void) stat = GdipDeletePrivateFontCollection(&fonts); ok(stat == Ok, "GdipDeletePrivateFontCollection failed: %d\n", stat); + /* Cloned family survives after collection is deleted */ + stat = GdipGetFamilyName(cloned_family, family_name, LANG_NEUTRAL); + ok(stat == Ok, "GdipGetFamilyName failed: %d\n", stat); + + stat = GdipDeleteFontFamily(cloned_family); + ok(stat == Ok, "GdipDeleteFontFamily failed: %d\n", stat); + DELETE_FONTFILE(path); }

1 0

Haoyang Chen : gdiplus: Avoid filtering of special characters.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: bf92d6bedf418fed06a1698479051a9f0598c335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf92d6bedf418fed06a16984… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Wed May 12 17:30:06 2021 +0800 gdiplus: Avoid filtering of special characters. Symbols such as ← should also be displayed. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 43e2563f449372a0f7ff72052bda56505f0c4359) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 291f6a94b9d..e5a709f6aa5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5225,9 +5225,6 @@ GpStatus gdip_format_string(HDC hdc, hotkeyprefix_count = 0; for(i = 0, j = 0; i < length; i++){ - /* FIXME: This makes the indexes passed to callback inaccurate. */ - if(!iswprint(string[i]) && (string[i] != '\n')) - continue; /* FIXME: tabs should be handled using tabstops from stringformat */ if (string[i] == '\t')

1 0

Sebastian Lackner : ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 717e8d5366468326302f0dcaeea0670adf917324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717e8d5366468326302f0dca… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 4 18:05:00 2021 -0600 ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 43de1407e92296882c9c04e095f141a5df968808) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/file.c | 1 - dlls/ntdll/unix/file.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2507437c8c3..839046a7488 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -171,7 +171,6 @@ static void create_file_test(void) U(io).Status = 0xdeadbeef; offset.QuadPart = 0; status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL ); - todo_wine ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status ); if (status == STATUS_PENDING) { diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 014beacb35f..18e9a10252a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -344,7 +344,7 @@ NTSTATUS errno_to_status( int err ) case EACCES: return STATUS_ACCESS_DENIED; case ENOTDIR: return STATUS_OBJECT_PATH_NOT_FOUND; case ENOENT: return STATUS_OBJECT_NAME_NOT_FOUND; - case EISDIR: return STATUS_FILE_IS_A_DIRECTORY; + case EISDIR: return STATUS_INVALID_DEVICE_REQUEST; case EMFILE: case ENFILE: return STATUS_TOO_MANY_OPENED_FILES; case EINVAL: return STATUS_INVALID_PARAMETER;

1 0