Eric Pouech : comctl32: Use correct integral type.
Alexandre Julliard
julliard at winehq.org
Thu Jan 27 15:36:16 CST 2022
Module: wine
Branch: master
Commit: 5e56ada9c4552ff6865f668fae472df3321bba8d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e56ada9c4552ff6865f668fae472df3321bba8d
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Thu Jan 27 10:17:47 2022 +0100
comctl32: Use correct integral type.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/button.c | 7 ++++++-
dlls/comctl32/taskdialog.c | 6 ++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index a2a1c9e0561..88b48a4a5c0 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -1229,7 +1229,12 @@ static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr)
/* ImageList has priority over image */
if (infoPtr->imagelist.himl)
- ImageList_GetIconSize(infoPtr->imagelist.himl, &size.cx, &size.cy);
+ {
+ int scx, scy;
+ ImageList_GetIconSize(infoPtr->imagelist.himl, &scx, &scy);
+ size.cx = scx;
+ size.cy = scy;
+ }
else if (infoPtr->u.image)
{
if (infoPtr->image_type == IMAGE_ICON)
diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c
index 92a2b533efb..4523695d614 100644
--- a/dlls/comctl32/taskdialog.c
+++ b/dlls/comctl32/taskdialog.c
@@ -430,7 +430,8 @@ static void taskdialog_get_expando_size(struct taskdialog_info *dialog_info, HWN
HFONT hfont, old_hfont;
HDC hdc;
RECT rect = {0};
- LONG icon_width, icon_height, text_offset;
+ LONG icon_width, icon_height;
+ INT text_offset;
LONG max_width, max_text_height;
hdc = GetDC(hwnd);
@@ -1092,7 +1093,8 @@ static void taskdialog_draw_expando_control(struct taskdialog_info *dialog_info,
HDC hdc;
RECT rect = {0};
WCHAR *text;
- LONG icon_width, icon_height, text_offset;
+ LONG icon_width, icon_height;
+ INT text_offset;
UINT style = DFCS_FLAT;
BOOL draw_focus;
More information about the wine-cvs
mailing list