[2/2] comctl32: Implement PSM_SETHEADERSUBTITLE[AW] (try 2)

[André Hentschel]

improved string handling as in CreatePropertySheetPage
---
 dlls/comctl32/propsheet.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index f7a16a3..35f12f6 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -34,7 +34,6 @@
  *   - Messages:
  *     o PSM_INSERTPAGE
  *     o PSM_RECALCPAGESIZES
- *     o PSM_SETHEADERSUBTITLE
  *     o WM_HELP
  *     o WM_CONTEXTMENU
  *   - Notifications:
@@ -2556,7 +2555,13 @@ static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, int iPageIndex, LPCSTR pszHe
  */
 static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderSubTitle)
 {
-    FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_w(pszHeaderSubTitle));
+    PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr);
+    LPPROPSHEETPAGEW ppshpage = (LPPROPSHEETPAGEW)psInfo->proppage[iPageIndex].hpage;
+
+    TRACE("(%p, %d, %s)\n", hwndDlg, iPageIndex, debugstr_w(pszHeaderSubTitle));
+
+    ppshpage->pszHeaderSubTitle = load_string( ppshpage->hInstance, pszHeaderSubTitle );
+    ppshpage->dwFlags |= PSP_USEHEADERSUBTITLE;
 }
 
 /******************************************************************************
@@ -2564,7 +2569,16 @@ static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR p
  */
 static void PROPSHEET_SetHeaderSubTitleA(HWND hwndDlg, int iPageIndex, LPCSTR pszHeaderSubTitle)
 {
-    FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_a(pszHeaderSubTitle));
+    PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr);
+    LPPROPSHEETPAGEW ppshpage = (LPPROPSHEETPAGEW)psInfo->proppage[iPageIndex].hpage;
+
+    TRACE("(%p, %d, %s)\n", hwndDlg, iPageIndex, debugstr_a(pszHeaderSubTitle));
+
+    if (!IS_INTRESOURCE( pszHeaderSubTitle ))
+        PROPSHEET_AtoW(&ppshpage->pszHeaderSubTitle, pszHeaderSubTitle);
+    else
+        ppshpage->pszHeaderSubTitle = load_string( ppshpage->hInstance, (LPCWSTR)pszHeaderSubTitle );
+    ppshpage->dwFlags |= PSP_USEHEADERSUBTITLE;
 }
 
 /******************************************************************************
-- 

Best Regards, André Hentschel
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Nachrichtenteil als Anhang
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20111228/5adc60d4/attachment.ksh>