propsheet: unicodification

Dimitrie O. Paun dpaun at rogers.com
Tue Mar 22 23:56:16 CST 2005


ChangeLog
    Complete unicodification of the propsheet common control.


Index: dlls/comctl32/propsheet.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/propsheet.c,v
retrieving revision 1.122
diff -u -r1.122 propsheet.c
--- dlls/comctl32/propsheet.c	9 Jan 2005 16:42:54 -0000	1.122
+++ dlls/comctl32/propsheet.c	23 Mar 2005 05:19:41 -0000
@@ -951,7 +951,7 @@
   SetWindowPos(hwndButton, 0, x, y, 0, 0,
                SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
 
-  SendMessageA(hwndParent, DM_SETDEFID, IDOK, 0);
+  SendMessageW(hwndParent, DM_SETDEFID, IDOK, 0);
 
 
   /*
@@ -1708,7 +1708,7 @@
 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+  msgResult = SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
   if (msgResult == -1)
     return FALSE;
   else if (msgResult == 0)
@@ -1789,7 +1789,7 @@
 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn) != FALSE)
+  if (SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn) != FALSE)
     return FALSE;
 
   /*
@@ -1803,7 +1803,7 @@
     hwndPage = psInfo->proppage[i].hwndPage;
     if (hwndPage)
     {
-       switch (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
+       switch (SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
        {
        case PSNRET_INVALID:
            PROPSHEET_ShowPage(hwndDlg, i, psInfo);
@@ -1823,7 +1823,7 @@
      psn.hdr.code = PSN_SETACTIVE;
      psn.lParam   = 0;
      hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-     SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+     SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
   }
 
   return TRUE;
@@ -1850,7 +1850,7 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
 
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
+  if (SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
     return;
 
   psn.hdr.code = PSN_RESET;
@@ -1861,7 +1861,7 @@
     hwndPage = psInfo->proppage[i].hwndPage;
 
     if (hwndPage)
-       SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+       SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
   }
 
   if (psInfo->isModeless)
@@ -1893,7 +1893,7 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
 
-  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+  SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 }
 
 /******************************************************************************
@@ -2036,7 +2036,7 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
 
-  res = !SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+  res = !SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 
 end:
   TRACE("<-- %d\n", res);
@@ -2222,7 +2222,7 @@
   EnableWindow(hwndButton, TRUE);
 
   /* Make it default pushbutton */
-  SendMessageA(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
+  SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
 
   /* Hide Back button */
   hwndButton = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
@@ -2267,13 +2267,12 @@
   int i = 0;
   HWND hwndPage;
   LRESULT msgResult = 0;
-  PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg,
-                                                    PropSheetInfoStr);
+  PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
 
   while ((i < psInfo->nPages) && (msgResult == 0))
   {
     hwndPage = psInfo->proppage[i].hwndPage;
-    msgResult = SendMessageA(hwndPage, PSM_QUERYSIBLINGS, wParam, lParam);
+    msgResult = SendMessageW(hwndPage, PSM_QUERYSIBLINGS, wParam, lParam);
     i++;
   }
 
@@ -2480,7 +2479,7 @@
     EnableWindow(hwndNext, TRUE);
 
     /* Set the Next button as the default pushbutton  */
-    SendMessageA(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0);
+    SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0);
   }
 
   if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH))
@@ -2495,7 +2494,7 @@
       EnableWindow(hwndFinish, TRUE);
 
     /* Set the Finish button as the default pushbutton  */
-    SendMessageA(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
+    SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
   }
 }
 
@@ -2969,7 +2968,7 @@
    if (lpMsg->message == WM_KEYDOWN && (GetKeyState(VK_CONTROL) & 0x8000))
    {
       int new_page = 0;
-      INT dlgCode = SendMessageA(lpMsg->hwnd, WM_GETDLGCODE, 0, (LPARAM)lpMsg);
+      INT dlgCode = SendMessageW(lpMsg->hwnd, WM_GETDLGCODE, 0, (LPARAM)lpMsg);
 
       if (!(dlgCode & DLGC_WANTMESSAGE))
       {
@@ -3005,7 +3004,7 @@
       }
    }
 
-   return IsDialogMessageA(hwnd, lpMsg);
+   return IsDialogMessageW(hwnd, lpMsg);
 }
 
 /******************************************************************************
@@ -3118,7 +3117,7 @@
 	MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2);
 	SetRect(&rzone, 0, 0, r.right + 1, r.top - 1);
 
-	GetObjectA(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), (LPVOID)&bm);		
+	GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), (LPVOID)&bm);		
 
  	if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD)
  	{
@@ -3241,7 +3240,7 @@
 	hbr = GetSysColorBrush(COLOR_WINDOW);
 	FillRect(hdc, &rzone, hbr);
 
-	GetObjectA(psInfo->ppshheader.u4.hbmWatermark, sizeof(BITMAP), (LPVOID)&bm);
+	GetObjectW(psInfo->ppshheader.u4.hbmWatermark, sizeof(BITMAP), (LPVOID)&bm);
 	hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u4.hbmWatermark);
 
 	BitBlt(hdc, 0, offsety, min(bm.bmWidth, r.right),
@@ -3290,7 +3289,7 @@
       HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL);
       LPCPROPSHEETPAGEW ppshpage;
       int idx;
-      LOGFONTA logFont;
+      LOGFONTW logFont;
 
       /* Using PropSheetInfoStr to store extra data doesn't match the native
        * common control: native uses TCM_[GS]ETITEM
@@ -3310,10 +3309,10 @@
       PROPSHEET_SetWizButtons(hwnd, PSWIZB_BACK|PSWIZB_NEXT);
 
       /* Set up fonts */
-      SystemParametersInfoA (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
-      psInfo->hFont = CreateFontIndirectA (&logFont);
+      SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
+      psInfo->hFont = CreateFontIndirectW (&logFont);
       logFont.lfWeight = FW_BOLD;
-      psInfo->hFontBold = CreateFontIndirectA (&logFont);
+      psInfo->hFontBold = CreateFontIndirectW (&logFont);
       
       /*
        * Small icon in the title bar.

-- 
Dimi.



More information about the wine-patches mailing list