Skip to content

W
wine-winehq
Commit 087a397b authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

Initialize the NONCLIENTMETRICS with 0 (helps moorhuhn.exe).

parent 383da68c
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 0 deletions
misc/main.c
View file @ 087a397b
...@@ -982,6 +982,13 @@ BOOL WINAPI SystemParametersInfoA( UINT uAction, UINT uParam, ...@@ -982,6 +982,13 @@ BOOL WINAPI SystemParametersInfoA( UINT uAction, UINT uParam,
{ {
LPLOGFONTA lpLogFont = &(lpnm->lfMenuFont); LPLOGFONTA lpLogFont = &(lpnm->lfMenuFont);
/* clear the struct, so we have 'sane' members */
memset(
(char*)lpvParam+sizeof(lpnm->cbSize),
0,
lpnm->cbSize-sizeof(lpnm->cbSize)
);
/* FIXME: initialize geometry entries */ /* FIXME: initialize geometry entries */
/* FIXME: As these values are presumably in device units, /* FIXME: As these values are presumably in device units,
* we should calculate the defaults based on the screen dpi * we should calculate the defaults based on the screen dpi
...@@ -1207,6 +1214,12 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam, ...@@ -1207,6 +1214,12 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
#define lpnm ((LPNONCLIENTMETRICS16)lpvParam) #define lpnm ((LPNONCLIENTMETRICS16)lpvParam)
if( lpnm->cbSize == sizeof(NONCLIENTMETRICS16) ) if( lpnm->cbSize == sizeof(NONCLIENTMETRICS16) )
{ {
/* clear the struct, so we have 'sane' members */
memset(
(char*)lpvParam+sizeof(lpnm->cbSize),
0,
lpnm->cbSize-sizeof(lpnm->cbSize)
);
/* FIXME: initialize geometry entries */ /* FIXME: initialize geometry entries */
SystemParametersInfo16( SPI_GETICONTITLELOGFONT, 0, SystemParametersInfo16( SPI_GETICONTITLELOGFONT, 0,
(LPVOID)&(lpnm->lfCaptionFont),0); (LPVOID)&(lpnm->lfCaptionFont),0);
...@@ -1304,6 +1317,11 @@ BOOL WINAPI SystemParametersInfoW( UINT uAction, UINT uParam, ...@@ -1304,6 +1317,11 @@ BOOL WINAPI SystemParametersInfoW( UINT uAction, UINT uParam,
/* FIXME: implement correctly */ /* FIXME: implement correctly */
LPNONCLIENTMETRICSW lpnm=(LPNONCLIENTMETRICSW)lpvParam; LPNONCLIENTMETRICSW lpnm=(LPNONCLIENTMETRICSW)lpvParam;
/* clear the struct, so we have 'sane' members */
memset((char*)lpvParam+sizeof(lpnm->cbSize),
0,
lpnm->cbSize-sizeof(lpnm->cbSize)
);
SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfCaptionFont),0); SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfCaptionFont),0);
lpnm->lfCaptionFont.lfWeight = FW_BOLD; lpnm->lfCaptionFont.lfWeight = FW_BOLD;
SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfSmCaptionFont),0); SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfSmCaptionFont),0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment