[PATCH 3/3] [Msacm32]: in acmFormatChoose, added support for template

Eric Pouech eric.pouech at orange.fr
Sun Aug 12 03:03:46 CDT 2012




A+
---

 dlls/msacm32/format.c |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)


diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c
index c81b5dc..005e7ef 100644
--- a/dlls/msacm32/format.c
+++ b/dlls/msacm32/format.c
@@ -210,7 +210,9 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
 	MSACM_FillFormatTags(hWnd);
 	MSACM_FillFormat(hWnd);
 	if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP|
-			       ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0)
+			       ACMFORMATCHOOSE_STYLEF_SHOWHELP|
+                               ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE|
+                               ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0)
             FIXME("Unsupported style %08x\n", afc->fdwStyle);
 	if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP))
 	    ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE);
@@ -352,8 +354,18 @@ done:
  */
 MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc)
 {
-    return DialogBoxParamW(MSACM_hInstance32, MAKEINTRESOURCEW(DLG_ACMFORMATCHOOSE_ID),
-                           pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc);
+    MMRESULT    ret;
+
+    if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE)
+        ret = DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance,
+                                      pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc);
+    else if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)
+        ret = DialogBoxParamW(pafmtc->hInstance, pafmtc->pszTemplateName,
+                              pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc);
+    else
+        ret = DialogBoxParamW(MSACM_hInstance32, MAKEINTRESOURCEW(DLG_ACMFORMATCHOOSE_ID),
+                              pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc);
+    return ret;
 }
 
 /***********************************************************************




More information about the wine-patches mailing list