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

hhctrl.ocx: If a CHM file reports window dimensions and title but doesn't really set them use default values.

This commit is contained in:
Dmitry Timoshkov 2010-06-01 15:26:13 +09:00 committed by Alexandre Julliard
parent a70e10d03d
commit a314027b42
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/hhctrl.ocx/help.c
View File

@ -1260,7 +1260,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
RECT winPos = info->WinType.rcWindowPos; RECT winPos = info->WinType.rcWindowPos;
WNDCLASSEXW wcex; WNDCLASSEXW wcex;
DWORD dwStyles, dwExStyles; DWORD dwStyles, dwExStyles;
DWORD x, y, width, height; DWORD x, y, width = 0, height = 0;
LPCWSTR caption;
static const WCHAR windowClassW[] = { static const WCHAR windowClassW[] = {
'H','H',' ', 'P','a','r','e','n','t',0 'H','H',' ', 'P','a','r','e','n','t',0
@ -1301,7 +1302,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
width = winPos.right - x; width = winPos.right - x;
height = winPos.bottom - y; height = winPos.bottom - y;
} }
else if (!width || !height)
{ {
x = WINTYPE_DEFAULT_X; x = WINTYPE_DEFAULT_X;
y = WINTYPE_DEFAULT_Y; y = WINTYPE_DEFAULT_Y;
@ -1309,7 +1310,10 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
height = WINTYPE_DEFAULT_HEIGHT; height = WINTYPE_DEFAULT_HEIGHT;
} }
hWnd = CreateWindowExW(dwExStyles, windowClassW, info->WinType.pszCaption, caption = info->WinType.pszCaption;
if (!*caption) caption = info->pCHMInfo->defTitle;
hWnd = CreateWindowExW(dwExStyles, windowClassW, caption,
dwStyles, x, y, width, height, NULL, NULL, hhctrl_hinstance, NULL); dwStyles, x, y, width, height, NULL, NULL, hhctrl_hinstance, NULL);
if (!hWnd) if (!hWnd)
return FALSE; return FALSE;