diff --git a/patches/mmsystem.dll16-Fix_Argument_Order/0001-mmsystem.dll16-Fix-argument-order-in-GlobalAlloc16-c.patch b/patches/mmsystem.dll16-Fix_Argument_Order/0001-mmsystem.dll16-Fix-argument-order-in-GlobalAlloc16-c.patch new file mode 100644 index 00000000..84bded88 --- /dev/null +++ b/patches/mmsystem.dll16-Fix_Argument_Order/0001-mmsystem.dll16-Fix-argument-order-in-GlobalAlloc16-c.patch @@ -0,0 +1,25 @@ +From f1183d4c50ba5fc854873bdc8a6c96ace56a2e00 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Mon, 8 Feb 2016 03:24:47 +0100 +Subject: mmsystem.dll16: Fix argument order in GlobalAlloc16 call. + +--- + dlls/mmsystem.dll16/mmsystem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c +index fdf1318..d90240d 100644 +--- a/dlls/mmsystem.dll16/mmsystem.c ++++ b/dlls/mmsystem.dll16/mmsystem.c +@@ -1943,7 +1943,7 @@ LRESULT WINAPI mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE16 lpHndl, DWORD + + TRACE("(%p, %p, %08x, %08x)!\n", fpThreadAddr, lpHndl, dwPmt, dwFlags); + +- hndl = GlobalAlloc16(sizeof(WINE_MMTHREAD), GMEM_SHARE|GMEM_ZEROINIT); ++ hndl = GlobalAlloc16(GMEM_SHARE|GMEM_ZEROINIT, sizeof(WINE_MMTHREAD)); + + if (hndl == 0) { + ret = 2; +-- +2.7.0 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 610ac343..3b61e97a 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -181,6 +181,7 @@ patch_enable_all () enable_makedep_PARENTSPEC="$1" enable_mfplat_MFTRegister="$1" enable_mmdevapi_AEV_Stubs="$1" + enable_mmsystem_dll16_Fix_Argument_Order="$1" enable_mountmgr_DosDevices="$1" enable_mpr_WNetGetUniversalNameW="$1" enable_mscoree_CorValidateImage="$1" @@ -692,6 +693,9 @@ patch_enable () mmdevapi-AEV_Stubs) enable_mmdevapi_AEV_Stubs="$2" ;; + mmsystem.dll16-Fix_Argument_Order) + enable_mmsystem_dll16_Fix_Argument_Order="$2" + ;; mountmgr-DosDevices) enable_mountmgr_DosDevices="$2" ;; @@ -4288,6 +4292,18 @@ if test "$enable_mmdevapi_AEV_Stubs" -eq 1; then ) >> "$patchlist" fi +# Patchset mmsystem.dll16-Fix_Argument_Order +# | +# | Modified files: +# | * dlls/mmsystem.dll16/mmsystem.c +# | +if test "$enable_mmsystem_dll16_Fix_Argument_Order" -eq 1; then + patch_apply mmsystem.dll16-Fix_Argument_Order/0001-mmsystem.dll16-Fix-argument-order-in-GlobalAlloc16-c.patch + ( + echo '+ { "Sebastian Lackner", "mmsystem.dll16: Fix argument order in GlobalAlloc16 call.", 1 },'; + ) >> "$patchlist" +fi + # Patchset mountmgr-DosDevices # | # | This patchset fixes the following Wine bugs: