From 03ab4bea9c72972a9e54eff76e3a6cadf43ca6a7 Mon Sep 17 00:00:00 2001
From: Eric Pouech <eric.pouech@orange.fr>
Date: Sun, 12 Aug 2012 10:03:35 +0200
Subject: [PATCH] msacm32: In format chosse dialog, get rid of static
 variables, and store information as a property of dialog.

---
 dlls/msacm32/format.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c
index 9866139af35..f11799410d3 100644
--- a/dlls/msacm32/format.c
+++ b/dlls/msacm32/format.c
@@ -39,8 +39,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
-static	PACMFORMATCHOOSEA	afc;
-
 struct MSACM_FillFormatData {
     HWND		hWnd;
 #define WINE_ACMFF_TAG		0
@@ -195,20 +193,24 @@ static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEA afc)
     return affd.ret;
 }
 
-static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
-				       WPARAM wParam, LPARAM lParam)
-{
+static const char* fmt_prop = "acmprop";
 
-    TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd,  msg, wParam, lParam );
+static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
+                                            WPARAM wParam, LPARAM lParam)
+{
+    PACMFORMATCHOOSEA   afc = (PACMFORMATCHOOSEA)GetPropA(hWnd, fmt_prop);
+
+    TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd,  msg, wParam, lParam);
 
     switch (msg) {
     case WM_INITDIALOG:
 	afc = (PACMFORMATCHOOSEA)lParam;
+        SetPropA(hWnd, fmt_prop, (HANDLE)afc);
 	MSACM_FillFormatTags(hWnd);
 	MSACM_FillFormat(hWnd);
 	if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP|
 			       ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0)
-            FIXME("Unsupported style %08x\n", ((PACMFORMATCHOOSEA)lParam)->fdwStyle);
+            FIXME("Unsupported style %08x\n", afc->fdwStyle);
 	if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP))
 	    ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE);
 	return TRUE;