Dmitry Timoshkov : hhctrl.ocx: If a CHM file reports window dimensions and title but doesn' t really set them use default values.
Alexandre Julliard
julliard at winehq.org
Tue Jun 1 12:12:42 CDT 2010
Module: wine
Branch: master
Commit: a314027b4211ddd045e12bd768962c3c47f56d68
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a314027b4211ddd045e12bd768962c3c47f56d68
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Tue Jun 1 15:26:13 2010 +0900
hhctrl.ocx: If a CHM file reports window dimensions and title but doesn't really set them use default values.
---
dlls/hhctrl.ocx/help.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index 30cb008..2ea0132 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -1260,7 +1260,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
RECT winPos = info->WinType.rcWindowPos;
WNDCLASSEXW wcex;
DWORD dwStyles, dwExStyles;
- DWORD x, y, width, height;
+ DWORD x, y, width = 0, height = 0;
+ LPCWSTR caption;
static const WCHAR windowClassW[] = {
'H','H',' ', 'P','a','r','e','n','t',0
@@ -1301,7 +1302,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
width = winPos.right - x;
height = winPos.bottom - y;
}
- else
+ if (!width || !height)
{
x = WINTYPE_DEFAULT_X;
y = WINTYPE_DEFAULT_Y;
@@ -1309,7 +1310,10 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
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);
if (!hWnd)
return FALSE;
More information about the wine-cvs
mailing list