diff --git a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch index da57bb34..1cdf0387 100644 --- a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch +++ b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch @@ -69,7 +69,7 @@ index d0dc4a8bcf..4a99d8d4e9 100644 +static void test_GetKeyboardLayoutList(void) +{ + int cnt, cnt2; -+ HKL *layouts; ++ HKL *layouts; + ULONG_PTR baselayout; + LANGID langid; + @@ -83,11 +83,11 @@ index d0dc4a8bcf..4a99d8d4e9 100644 + cnt = GetKeyboardLayoutList(0, NULL); + /* Most users will not have more than a few keyboard layouts installed at a time. */ + ok(cnt > 0 && cnt < 10, "Layout count %d\n", cnt); -+ if (cnt > 0) -+ { -+ layouts = HeapAlloc(GetProcessHeap(), 0, sizeof(*layouts) * cnt ); ++ if (cnt > 0) ++ { ++ layouts = HeapAlloc(GetProcessHeap(), 0, sizeof(*layouts) * cnt ); + -+ cnt2 = GetKeyboardLayoutList(cnt, layouts); ++ cnt2 = GetKeyboardLayoutList(cnt, layouts); + ok(cnt == cnt2, "wrong value %d!=%d\n", cnt, cnt2); + for(cnt = 0; cnt < cnt2; cnt++) + { @@ -96,8 +96,8 @@ index d0dc4a8bcf..4a99d8d4e9 100644 + } + ok(cnt < cnt2, "Didnt find current keyboard\n"); + -+ HeapFree(GetProcessHeap(), 0, layouts); -+ } ++ HeapFree(GetProcessHeap(), 0, layouts); ++ } +} + START_TEST(input) diff --git a/patches/mailing-list-patches/definition b/patches/mailing-list-patches/definition index 332a89d8..36f5fc77 100644 --- a/patches/mailing-list-patches/definition +++ b/patches/mailing-list-patches/definition @@ -1,3 +1,5 @@ -# These patches will either be dropped or moved to there own directoryes by wine release 4.14. -Fixes: Mailing list patches +# These patches will either be dropped or moved to their own directories after the wine release 4.14. +Fixes: Mailing list patches +Fixes: [47411] shell32: Add SHMultiFileProperties stub +Fixes: [47445] Define AT_NO_AUTOMOUNT if needed. diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7c0501d0..9ca23898 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2041,6 +2041,10 @@ fi # Patchset mailing-list-patches # | +# | This patchset fixes the following Wine bugs: +# | * [#47411] shell32: Add SHMultiFileProperties stub +# | * [#47445] Define AT_NO_AUTOMOUNT if needed. +# | # | Modified files: # | * configure, configure.ac, dlls/cryptext/Makefile.in, dlls/cryptext/cryptext.spec, dlls/cryptext/cryptext_main.c, # | dlls/cryptext/tests/Makefile.in, dlls/cryptext/tests/cryptext.c, dlls/d3drm/tests/d3drm.c, dlls/d3drm/viewport.c,