October 2021 - Wine-commits

Alexandre Julliard : explorer: Store the graphics driver basename instead of the full path.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 4f9701317bd116fe2160664db2e378630cb541d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f9701317bd116fe2160664d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 16:00:58 2021 +0200 explorer: Store the graphics driver basename instead of the full path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d47be63faec9670454b137fa8d8de5f732e76202) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/desktop.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index f525c23d819..94d178880a8 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -857,11 +857,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) name = next; } - if (module) - { - GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); - } + TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(libname) ); swprintf( key, ARRAY_SIZE(key), device_keyW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], @@ -872,7 +868,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { if (module || null_driver) RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); + (BYTE *)libname, (lstrlenW(libname) + 1) * sizeof(WCHAR) ); else RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey );

1 0

Gijs Vermeulen : winecfg: Disable virtual desktop when using macdrv.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: e2e053ea57e8aef9411d38fc99c83419a4c40b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e053ea57e8aef9411d38fc… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Aug 18 14:06:35 2021 +0200 winecfg: Disable virtual desktop when using macdrv. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2db7ef7f47b667962f533691aa1ef0246264076) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/x11drvdlg.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index fbc6716e94e..34b194d04a6 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -111,17 +111,44 @@ static void update_gui_for_desktop_mode(HWND dialog) updating_ui = FALSE; } +static BOOL can_enable_desktop(void) +{ + char *value; + UINT guid_atom; + BOOL ret = FALSE; + char key[sizeof("System\\CurrentControlSet\\Control\\Video\\{}\\0000") + 40]; + + guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), "__wine_display_device_guid")); + strcpy( key, "System\\CurrentControlSet\\Control\\Video\\{" ); + if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) return ret; + strcat( key, "}\\0000" ); + if ((value = get_reg_key(HKEY_LOCAL_MACHINE, key, "GraphicsDriver", NULL))) + { + if(strcmp(value, "winemac.drv")) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, value); + } + return ret; +} + static void init_dialog(HWND dialog) { char* buf; + BOOL enable_desktop; convert_x11_desktop_key(); - update_gui_for_desktop_mode(dialog); + if ((enable_desktop = can_enable_desktop())) + update_gui_for_desktop_mode(dialog); + else + disable(IDC_ENABLE_DESKTOP); updating_ui = TRUE; - SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); - SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + if (enable_desktop) + { + SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); + SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + } buf = get_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "N"); if (IS_OPTION_TRUE(*buf))

1 0

Gijs Vermeulen : secur32: Default to building with GnuTLS support on macOS, if present.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 4a0a4d150d460550e7ad17f681f11dcfc37f7757 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a0a4d150d460550e7ad17f6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 17 22:46:29 2021 +0200 secur32: Default to building with GnuTLS support on macOS, if present. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4940d2ada276a5c6e9f855177ef54ce23490d36e) Conflicts: dlls/secur32/schannel_gnutls.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 784c1ffe6e8..21e6ac7eae3 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -42,7 +42,7 @@ #include "wine/debug.h" #include "wine/unicode.h" -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) +#if defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -1098,4 +1098,4 @@ void schan_imp_deinit(void) libgnutls_handle = NULL; } -#endif /* SONAME_LIBGNUTLS && !HAVE_SECURITY_SECURITY_H */ +#endif /* SONAME_LIBGNUTLS */ diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index d725c9d22c2..ba589274b62 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -39,7 +39,7 @@ #include "secur32_priv.h" #include "wine/debug.h" -#ifdef HAVE_SECURITY_SECURITY_H +#if defined(HAVE_SECURITY_SECURITY_H) && !defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -1242,4 +1242,4 @@ void schan_imp_deinit(void) TRACE("()\n"); } -#endif /* HAVE_SECURITY_SECURITY_H */ +#endif /* HAVE_SECURITY_SECURITY_H && !SONAME_LIBGNUTLS */

1 0

Alexandre Julliard : gdi32/tests: Regenerate ttf files with the official fontforge version.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 1c9679a35f0622fed68bef2856089605c7482b0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9679a35f0622fed68bef28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:43:55 2021 +0100 gdi32/tests: Regenerate ttf files with the official fontforge version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8d373a67e179ecfb4dfa86be17bc7236ac1c690d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/vertical.ttf | Bin 3560 -> 3560 bytes dlls/gdi32/tests/wine_langnames.sfd | 2 +- dlls/gdi32/tests/wine_langnames.ttf | Bin 2792 -> 2760 bytes dlls/gdi32/tests/wine_langnames2.sfd | 2 +- dlls/gdi32/tests/wine_langnames2.ttf | Bin 2016 -> 1984 bytes dlls/gdi32/tests/wine_langnames3.sfd | 2 +- dlls/gdi32/tests/wine_langnames3.ttf | Bin 2076 -> 2044 bytes dlls/gdi32/tests/wine_nul.sfd | 2 +- dlls/gdi32/tests/wine_nul.ttf | Bin 1600 -> 1604 bytes dlls/gdi32/tests/wine_ttfnames.sfd | 2 +- dlls/gdi32/tests/wine_ttfnames.ttf | Bin 2232 -> 2200 bytes dlls/gdi32/tests/wine_ttfnames_bold.sfd | 2 +- dlls/gdi32/tests/wine_ttfnames_bold.ttf | Bin 2272 -> 2240 bytes 13 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/vertical.ttf b/dlls/gdi32/tests/vertical.ttf index 0fc07796047..d82cbb106cb 100644 Binary files a/dlls/gdi32/tests/vertical.ttf and b/dlls/gdi32/tests/vertical.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames.sfd b/dlls/gdi32/tests/wine_langnames.sfd index 4ce1e70baca..14b422f48da 100644 --- a/dlls/gdi32/tests/wine_langnames.sfd +++ b/dlls/gdi32/tests/wine_langnames.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames.ttf b/dlls/gdi32/tests/wine_langnames.ttf index 674fd1bc7e4..ff3fb6b7a10 100644 Binary files a/dlls/gdi32/tests/wine_langnames.ttf and b/dlls/gdi32/tests/wine_langnames.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames2.sfd b/dlls/gdi32/tests/wine_langnames2.sfd index 50199af9adf..8ed0a302ce9 100644 --- a/dlls/gdi32/tests/wine_langnames2.sfd +++ b/dlls/gdi32/tests/wine_langnames2.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames2.ttf b/dlls/gdi32/tests/wine_langnames2.ttf index 47082dbd67e..8a61f0d5dd5 100644 Binary files a/dlls/gdi32/tests/wine_langnames2.ttf and b/dlls/gdi32/tests/wine_langnames2.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames3.sfd b/dlls/gdi32/tests/wine_langnames3.sfd index 55536fa58c1..914105d50b6 100644 --- a/dlls/gdi32/tests/wine_langnames3.sfd +++ b/dlls/gdi32/tests/wine_langnames3.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames3.ttf b/dlls/gdi32/tests/wine_langnames3.ttf index 408d127fb1e..64317e81dc4 100644 Binary files a/dlls/gdi32/tests/wine_langnames3.ttf and b/dlls/gdi32/tests/wine_langnames3.ttf differ diff --git a/dlls/gdi32/tests/wine_nul.sfd b/dlls/gdi32/tests/wine_nul.sfd index c82180f1007..f28616bcb02 100644 --- a/dlls/gdi32/tests/wine_nul.sfd +++ b/dlls/gdi32/tests/wine_nul.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: wine_nul FullName: wine_nul FamilyName: wine_nul diff --git a/dlls/gdi32/tests/wine_nul.ttf b/dlls/gdi32/tests/wine_nul.ttf index 89e5648fd92..17a68419377 100644 Binary files a/dlls/gdi32/tests/wine_nul.ttf and b/dlls/gdi32/tests/wine_nul.ttf differ diff --git a/dlls/gdi32/tests/wine_ttfnames.sfd b/dlls/gdi32/tests/wine_ttfnames.sfd index 566749d19a7..bef10463d6c 100644 --- a/dlls/gdi32/tests/wine_ttfnames.sfd +++ b/dlls/gdi32/tests/wine_ttfnames.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: Wine_TTF_Names_Long_Family1_Cond_Regular FamilyName: Wine_TTF_Names_Long_Family1_Cond Weight: Regular diff --git a/dlls/gdi32/tests/wine_ttfnames.ttf b/dlls/gdi32/tests/wine_ttfnames.ttf index 2eb2ad1f95e..6e5ce78fb7a 100644 Binary files a/dlls/gdi32/tests/wine_ttfnames.ttf and b/dlls/gdi32/tests/wine_ttfnames.ttf differ diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.sfd b/dlls/gdi32/tests/wine_ttfnames_bold.sfd index b3bf4ddfe90..40c94e7e7c1 100644 --- a/dlls/gdi32/tests/wine_ttfnames_bold.sfd +++ b/dlls/gdi32/tests/wine_ttfnames_bold.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: Wine_TTF_Names_Long_Family1_Cond_Regular FamilyName: Wine_TTF_Names_Long_Family1_Cond Weight: Regular diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.ttf b/dlls/gdi32/tests/wine_ttfnames_bold.ttf index 919a5ea1310..a9293d7d7ca 100644 Binary files a/dlls/gdi32/tests/wine_ttfnames_bold.ttf and b/dlls/gdi32/tests/wine_ttfnames_bold.ttf differ

1 0

Alexandre Julliard : gdiplus/tests: Regenerate ttf files with the official fontforge version.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 4f158c1ca69ad2c4b42b4e84dced0877e6a10f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f158c1ca69ad2c4b42b4e84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:44:03 2021 +0100 gdiplus/tests: Regenerate ttf files with the official fontforge version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0ec38429f35ba3fdc3510f46550ea384b423fdef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/tests/wine_testfont0.sfd | 2 +- dlls/gdiplus/tests/wine_testfont0.ttf | Bin 1688 -> 1656 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/wine_testfont0.sfd b/dlls/gdiplus/tests/wine_testfont0.sfd index ba99b9f99b4..c71f717c4a6 100644 --- a/dlls/gdiplus/tests/wine_testfont0.sfd +++ b/dlls/gdiplus/tests/wine_testfont0.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: winegdiptestfont0 FullName: Wine GDI+ Test Font 0 FamilyName: winegdiptestfont diff --git a/dlls/gdiplus/tests/wine_testfont0.ttf b/dlls/gdiplus/tests/wine_testfont0.ttf index 227c2251432..fb899cb342f 100644 Binary files a/dlls/gdiplus/tests/wine_testfont0.ttf and b/dlls/gdiplus/tests/wine_testfont0.ttf differ

1 0

Michael Stefaniuc : Release 6.0.2.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 3c9afe8f878aa5281e7ed94c79e50ab1f5ed758a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9afe8f878aa5281e7ed94c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 6 20:03:40 2021 +0200 Release 6.0.2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 447 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 234 insertions(+), 237 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c9afe8f878aa5281e7e…

1 0

Tag wine-6.0.2 : Alexandre Julliard : Release 6.0.2
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: refs/tags/wine-6.0.2 Tag: dbe4b125d9e200e06db3d3bd8ed1908ec9685f92 URL: https://source.winehq.org/git/wine.git/?a=tag;h=dbe4b125d9e200e06db3d3bd8ed… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 16:38:44 2021 +0200 Release 6.0.2

1 0

Piotr Caban : msvcrt: Improve memmove performance on i386 and x86_64 architectures.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: cdab0e40b9c36e77db7f9c62440e55fa0e3527ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdab0e40b9c36e77db7f9c62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 26 19:42:03 2021 +0100 msvcrt: Improve memmove performance on i386 and x86_64 architectures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 38c490496000c5852f14e9c022868c5107d9ff03) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/string.c | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cdab0e40b9c36e77db7f…

1 0

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

26 Oct '21

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

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

26 Oct '21

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