From 0fa558e2b58b0a701f639b5d6c87f7666a18102d Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 1 Mar 2017 10:54:59 +0000 Subject: [PATCH] [MSACM32] - Free session driver instance using the correct heap. Fixes crash in msacm32_winetest. - Remove obsolete diff file svn path=/trunk/; revision=74010 --- reactos/dll/win32/msacm32/internal.c | 2 +- reactos/dll/win32/msacm32/msacm_ros.diff | 64 ------------------------ 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 reactos/dll/win32/msacm32/msacm_ros.diff diff --git a/reactos/dll/win32/msacm32/internal.c b/reactos/dll/win32/msacm32/internal.c index f8cb5198ee5..6550f4c2705 100644 --- a/reactos/dll/win32/msacm32/internal.c +++ b/reactos/dll/win32/msacm32/internal.c @@ -1070,7 +1070,7 @@ LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST paldrv) MSACM_DRIVER_SendMessage(lpDrv0, DRV_CLOSE, 0L, 0L); lpDrv0->dwDriverID = 0; MSACM_RemoveFromList(lpDrv0); - HeapFree(GetProcessHeap(), 0, lpDrv0); + HeapFree(MSACM_hHeap, 0, lpDrv0); } HeapFree(MSACM_hHeap, 0, paldrv); diff --git a/reactos/dll/win32/msacm32/msacm_ros.diff b/reactos/dll/win32/msacm32/msacm_ros.diff deleted file mode 100644 index 93414ffaa2e..00000000000 --- a/reactos/dll/win32/msacm32/msacm_ros.diff +++ /dev/null @@ -1,64 +0,0 @@ -Index: msacm_Uk.rc -=================================================================== ---- msacm_Uk.rc (revision 25687) -+++ msacm_Uk.rc (working copy) -@@ -0,0 +1,44 @@ -+/* -+ * PROJECT: OLE User Interface Support -+ * LICENSE: GPL - See COPYING in the top level directory -+ * FILE: dll/win32/msacm/msacm_Uk.rc -+ * PURPOSE: Ukraianian resource file for MS ACM -+ * TRANSLATOR: Artem Reznikov -+ */ -+ -+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -+ -+DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 -+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -+CAPTION "Sound Selection" -+FONT 8, "MS Shell Dlg" -+BEGIN -+ -+ LTEXT "&²ì'ÿ:", -1, 5, 5, 115, 8, NOT WS_GROUP -+ -+ COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, -+ CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP -+ -+ PUSHBUTTON "Çáåðåãòè &ÿê...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 -+ PUSHBUTTON "&Âèäàëèòè", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 -+ -+ LTEXT "&Ôîðìàò:", -1, 5, 41, 44, 8, NOT WS_GROUP -+ -+ COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, -+ CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP -+ -+ LTEXT "&Âëàñòèâîñò³:", -1, 5, 59, 44, 8, NOT WS_GROUP -+ -+#if 0 -+ COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, -+ CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | -+ CBS_OWNERDRAWFIXED | CBS_HASSTRINGS -+#else -+ COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, -+ CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -+#endif -+ DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 -+ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 92, 80, 40, 14 -+ PUSHBUTTON "&Äîâ³äêà", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 -+ -+END - -Property changes on: msacm_Uk.rc -___________________________________________________________________ -Name: svn:eol-style - + native - -Index: msacm.rc -=================================================================== ---- msacm.rc (revision 25687) -+++ msacm.rc (working copy) -@@ -34,3 +34,4 @@ - #include "msacm_Ru.rc" - #include "msacm_Sv.rc" - #include "msacm_Hu.rc" -+#include "msacm_Uk.rc" -- 2.17.1