diff --git a/README.md b/README.md index 493bc337..2f11ddd1 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,13 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [4]:** +**Bug fixes and features included in the next upcoming release [5]:** * Add stubs for d3dx10_43.D3DX10CreateEffectFromFileA/W ([Wine Bug #27739](https://bugs.winehq.org/show_bug.cgi?id=27739)) * Check architecture before trying to load libraries ([Wine Bug #38021](https://bugs.winehq.org/show_bug.cgi?id=38021)) * Forward exitcode from child process when in wineconsole * Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards ([Wine Bug #21817](https://bugs.winehq.org/show_bug.cgi?id=21817)) +* Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs ([Wine Bug #30076](https://bugs.winehq.org/show_bug.cgi?id=30076)) **Bug fixes and features in Wine Staging 1.7.47 [230]:** diff --git a/debian/changelog b/debian/changelog index aeb68ac8..c3cd1767 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ wine-staging (1.7.48) UNRELEASED; urgency=low * Added patch to share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards. * Added patch with stubs for d3dx10_43.D3DX10CreateEffectFromFileA/W. + * Added patch to silence repeated LocaleNameToLCID/LCIDToLocaleName + unsupported flags FIXMEs. * Removed patch to allow to enable/disable InsertMode in wineconsole settings (accepted upstream). * Removed patch to improve IoGetDeviceObjectPointer stub to appease SecuROM diff --git a/patches/kernel32-LocaleNameToLCID/0001-kernel32-Silence-repeated-LocaleNameToLCID-unsupport.patch b/patches/kernel32-LocaleNameToLCID/0001-kernel32-Silence-repeated-LocaleNameToLCID-unsupport.patch new file mode 100644 index 00000000..8c0d0f0b --- /dev/null +++ b/patches/kernel32-LocaleNameToLCID/0001-kernel32-Silence-repeated-LocaleNameToLCID-unsupport.patch @@ -0,0 +1,39 @@ +From 92cb03fb619558c2193475843fbde619f517469d Mon Sep 17 00:00:00 2001 +From: Jarkko Korpi +Date: Wed, 15 Jul 2015 02:38:25 +0300 +Subject: kernel32: Silence repeated LocaleNameToLCID unsupported flags + message. + +--- + dlls/kernel32/locale.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c +index eaf1183..74f77dd 100644 +--- a/dlls/kernel32/locale.c ++++ b/dlls/kernel32/locale.c +@@ -1093,8 +1093,10 @@ LANGID WINAPI GetSystemDefaultUILanguage(void) + LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) + { + struct locale_name locale_name; ++ static int once; + +- if (flags) FIXME( "unsupported flags %x\n", flags ); ++ if (flags && !once++) ++ FIXME( "unsupported flags %x\n", flags ); + + if (name == LOCALE_NAME_USER_DEFAULT) + return GetUserDefaultLCID(); +@@ -1124,7 +1126,8 @@ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) + */ + INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) + { +- if (flags) FIXME( "unsupported flags %x\n", flags ); ++ static int once; ++ if (flags && !once++) FIXME( "unsupported flags %x\n", flags ); + + return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); + } +-- +2.4.5 + diff --git a/patches/kernel32-LocaleNameToLCID/definition b/patches/kernel32-LocaleNameToLCID/definition new file mode 100644 index 00000000..af263a64 --- /dev/null +++ b/patches/kernel32-LocaleNameToLCID/definition @@ -0,0 +1 @@ +Fixes: [30076] Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 76ba399f..2cb8672f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -55,7 +55,7 @@ version() echo "Copyright (C) 2014-2015 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" - echo " commit 50d9d187c57448ca3f14de6a8eeb2520179db5b8" + echo " commit 4e6e9a14852298fe8c17f2666a16d5484cbe50b3" echo "" } @@ -129,6 +129,7 @@ patch_enable_all () enable_kernel32_CopyFileEx="$1" enable_kernel32_GetFinalPathNameByHandle="$1" enable_kernel32_GetLogicalProcessorInformationEx="$1" + enable_kernel32_LocaleNameToLCID="$1" enable_kernel32_Named_Pipe="$1" enable_kernel32_NeedCurrentDirectoryForExePath="$1" enable_kernel32_Profile="$1" @@ -455,6 +456,9 @@ patch_enable () kernel32-GetLogicalProcessorInformationEx) enable_kernel32_GetLogicalProcessorInformationEx="$2" ;; + kernel32-LocaleNameToLCID) + enable_kernel32_LocaleNameToLCID="$2" + ;; kernel32-Named_Pipe) enable_kernel32_Named_Pipe="$2" ;; @@ -2810,18 +2814,6 @@ if test "$enable_kernel32_CompareStringEx" -eq 1; then ) >> "$patchlist" fi -# Patchset kernel32-SetFileInformationByHandle -# | -# | Modified files: -# | * include/winbase.h -# | -if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then - patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch - ( - echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; - ) >> "$patchlist" -fi - # Patchset server-File_Permissions # | # | Modified files: @@ -2885,6 +2877,18 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then ) >> "$patchlist" fi +# Patchset kernel32-SetFileInformationByHandle +# | +# | Modified files: +# | * include/winbase.h +# | +if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then + patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch + ( + echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; + ) >> "$patchlist" +fi + # Patchset kernel32-CopyFileEx # | # | This patchset fixes the following Wine bugs: @@ -2929,6 +2933,21 @@ if test "$enable_kernel32_GetLogicalProcessorInformationEx" -eq 1; then ) >> "$patchlist" fi +# Patchset kernel32-LocaleNameToLCID +# | +# | This patchset fixes the following Wine bugs: +# | * [#30076] Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs +# | +# | Modified files: +# | * dlls/kernel32/locale.c +# | +if test "$enable_kernel32_LocaleNameToLCID" -eq 1; then + patch_apply kernel32-LocaleNameToLCID/0001-kernel32-Silence-repeated-LocaleNameToLCID-unsupport.patch + ( + echo '+ { "Jarkko Korpi", "kernel32: Silence repeated LocaleNameToLCID unsupported flags message.", 1 },'; + ) >> "$patchlist" +fi + # Patchset rpcrt4-Pipe_Transport # | # | Modified files: