ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Properly calculate caption length when converting multi-byte string

Browse Source 
to wide character one.
- Wizard contents shouldn't be moved by the size of watermark bitmap.
- Fix PSH_WIZARD97_[NEW/OLD] checks.
- Blit the watermark even if PSH_USEHBMWATERMARK flag isn't set and
  blit only the part that fits into the dialog.
This commit is contained in:
Filip Navara 2004-07-21 21:17:59 +00:00 committed by Alexandre Julliard
parent 4385d305e1
commit c846f88fa2
1 changed files with 34 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
dlls/comctl32/propsheet.c
View File

@ -173,7 +173,7 @@ static BOOL PROPSHEET_AddPage(HWND hwndDlg,
static BOOL PROPSHEET_RemovePage(HWND hwndDlg, static BOOL PROPSHEET_RemovePage(HWND hwndDlg,
int index, int index,
HPROPSHEETPAGE hpage); HPROPSHEETPAGE hpage);
static void PROPSHEET_CleanUp(); static void PROPSHEET_CleanUp(HWND hwndDlg);
static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, PropSheetInfo* psInfo); static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, PropSheetInfo* psInfo);
static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags); static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags);
static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo); static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo);
@ -308,10 +308,9 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh,
{ {
if (HIWORD(lppsh->pszCaption)) if (HIWORD(lppsh->pszCaption))
{ {
int len = strlen(lppsh->pszCaption); int len = MultiByteToWideChar(CP_ACP, 0, lppsh->pszCaption, -1, NULL, 0);
psInfo->ppshheader.pszCaption = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof (WCHAR) ); psInfo->ppshheader.pszCaption = HeapAlloc( GetProcessHeap(), 0, len*sizeof (WCHAR) );
MultiByteToWideChar(CP_ACP, 0, lppsh->pszCaption, -1, (LPWSTR) psInfo->ppshheader.pszCaption, len+1); MultiByteToWideChar(CP_ACP, 0, lppsh->pszCaption, -1, (LPWSTR) psInfo->ppshheader.pszCaption, len);
/* strcpy( (char *)psInfo->ppshheader.pszCaption, lppsh->pszCaption ); */
} }
} }
psInfo->nPages = lppsh->nPages; psInfo->nPages = lppsh->nPages;
@ -361,7 +360,7 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
psInfo->ppshheader.pszCaption = NULL; psInfo->ppshheader.pszCaption = NULL;
else else
{ {
if (!(lppsh->dwFlags & INTRNL_ANY_WIZARD) && HIWORD(lppsh->pszCaption)) if (HIWORD(lppsh->pszCaption))
{ {
int len = strlenW(lppsh->pszCaption); int len = strlenW(lppsh->pszCaption);
psInfo->ppshheader.pszCaption = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(WCHAR) ); psInfo->ppshheader.pszCaption = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(WCHAR) );
@ -1511,7 +1510,6 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
psInfo->proppage[index].hwndPage = hwndPage; psInfo->proppage[index].hwndPage = hwndPage;
if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) { if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) {
int offsetx = 0;
int offsety = 0; int offsety = 0;
HWND hwndChild; HWND hwndChild;
RECT r; RECT r;
@ -1532,11 +1530,10 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
pageWidth, pageHeight, padding.x, padding.y); pageWidth, pageHeight, padding.x, padding.y);
/* If there is a watermark, offset the dialog items */ /* If there is a watermark, offset the dialog items */
if ( (psInfo->ppshheader.dwFlags & (PSH_WATERMARK | PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && if ( (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) &&
(psInfo->ppshheader.dwFlags & PSH_WATERMARK) &&
((index == 0) || (index == psInfo->nPages - 1)) ) ((index == 0) || (index == psInfo->nPages - 1)) )
{ {
BITMAP bm;
/* if PSH_USEHBMWATERMARK is not set, load the resource from pszbmWatermark /* if PSH_USEHBMWATERMARK is not set, load the resource from pszbmWatermark
and put the HBITMAP in hbmWatermark. Thus all the rest of the code always and put the HBITMAP in hbmWatermark. Thus all the rest of the code always
considers hbmWatermark as valid. */ considers hbmWatermark as valid. */
@ -1545,13 +1542,10 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
((PropSheetInfo *)psInfo)->ppshheader.u4.hbmWatermark = ((PropSheetInfo *)psInfo)->ppshheader.u4.hbmWatermark =
CreateMappedBitmap(ppshpage->hInstance, (INT)psInfo->ppshheader.u4.pszbmWatermark, 0, NULL, 0); CreateMappedBitmap(ppshpage->hInstance, (INT)psInfo->ppshheader.u4.pszbmWatermark, 0, NULL, 0);
} }
/* Compute the offset x */
GetObjectA(psInfo->ppshheader.u4.hbmWatermark, sizeof(BITMAP), (LPVOID)&bm);
offsetx = bm.bmWidth;
} }
if (psInfo->ppshheader.dwFlags & (PSH_HEADER | PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) if (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD) &&
psInfo->ppshheader.dwFlags & PSH_HEADER)
{ {
/* Same behavior as for watermarks */ /* Same behavior as for watermarks */
if (!(psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER)) if (!(psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER))
@ -1567,21 +1561,10 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent,
offsety = (ppshpage->dwFlags & PSP_HIDEHEADER)?0:r.bottom + 1; offsety = (ppshpage->dwFlags & PSP_HIDEHEADER)?0:r.bottom + 1;
} }
hwndChild = GetWindow(hwndPage, GW_CHILD);
while((offsetx!=0) && (hwndChild)) {
GetWindowRect(hwndChild, &r);
MapWindowPoints(0, hwndPage, (LPPOINT)&r, 2);
OffsetRect(&r, -offsetx, 0);
SetWindowPos(hwndChild, 0, r.left, r.top,
0, 0, SWP_NOSIZE | SWP_NOZORDER);
hwndChild = GetWindow(hwndChild, GW_HWNDNEXT);
}
SetWindowPos(hwndPage, HWND_TOP, SetWindowPos(hwndPage, HWND_TOP,
rc.left + padding.x/2 + offsetx, rc.left + padding.x/2,
rc.top + padding.y/2 + offsety, rc.top + padding.y/2 + offsety,
pageWidth - offsetx, pageHeight - offsety, 0); pageWidth, pageHeight - offsety, 0);
} }
else { else {
/* /*
@ -3053,7 +3036,8 @@ static LRESULT PROPSHEET_Paint(HWND hwnd)
hOldPal = SelectPalette(hdc, psInfo->ppshheader.hplWatermark, FALSE); hOldPal = SelectPalette(hdc, psInfo->ppshheader.hplWatermark, FALSE);
if ( (!(ppshpage->dwFlags & PSP_HIDEHEADER)) && if ( (!(ppshpage->dwFlags & PSP_HIDEHEADER)) &&
(psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_HEADER)) ) (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) &&
(psInfo->ppshheader.dwFlags & PSH_HEADER) )
{ {
RECT rzone; RECT rzone;
HWND hwndLineHeader = GetDlgItem(hwnd, IDC_SUNKEN_LINEHEADER); HWND hwndLineHeader = GetDlgItem(hwnd, IDC_SUNKEN_LINEHEADER);
@ -3109,35 +3093,33 @@ static LRESULT PROPSHEET_Paint(HWND hwnd)
} }
if ( ((psInfo->active_page == 0) || (psInfo->active_page == psInfo->nPages - 1)) && if ( ((psInfo->active_page == 0) || (psInfo->active_page == psInfo->nPages - 1)) &&
(psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WATERMARK)) ) (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) &&
(psInfo->ppshheader.dwFlags & PSH_WATERMARK) )
{ {
if (psInfo->ppshheader.dwFlags & PSH_USEHBMWATERMARK ) HWND hwndLine = GetDlgItem(hwnd, IDC_SUNKEN_LINE);
{
HWND hwndLine = GetDlgItem(hwnd, IDC_SUNKEN_LINE);
GetClientRect(hwndLine, &r); GetClientRect(hwndLine, &r);
MapWindowPoints(hwndLine, hwnd, (LPPOINT) &r, 2); MapWindowPoints(hwndLine, hwnd, (LPPOINT) &r, 2);
GetObjectA(psInfo->ppshheader.u4.hbmWatermark, sizeof(BITMAP), (LPVOID)&bm); GetObjectA(psInfo->ppshheader.u4.hbmWatermark, sizeof(BITMAP), (LPVOID)&bm);
hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u4.hbmWatermark); hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u4.hbmWatermark);
BitBlt(hdc, 0, offsety, bm.bmWidth, bm.bmHeight, BitBlt(hdc, 0, offsety, min(bm.bmWidth, r.right),
hdcSrc, 0, 0, SRCCOPY); min(bm.bmHeight, r.bottom), hdcSrc, 0, 0, SRCCOPY);
/* If the bitmap is not big enough, fill the remaining area /* If the bitmap is not big enough, fill the remaining area
with the color of pixel (0,0) of bitmap - see MSDN */ with the color of pixel (0,0) of bitmap - see MSDN */
if (r.top > bm.bmHeight) { if (r.top > bm.bmHeight) {
r.bottom = r.top - 1; r.bottom = r.top - 1;
r.top = bm.bmHeight; r.top = bm.bmHeight;
r.left = 0; r.left = 0;
r.right = bm.bmWidth; r.right = bm.bmWidth;
hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0));
FillRect(hdc, &r, hbr); FillRect(hdc, &r, hbr);
DeleteObject(hbr); DeleteObject(hbr);
}
SelectObject(hdcSrc, hbmp);
} }
SelectObject(hdcSrc, hbmp);
} }
if (psInfo->ppshheader.dwFlags & PSH_USEHPLWATERMARK) if (psInfo->ppshheader.dwFlags & PSH_USEHPLWATERMARK)