diff options
| author | Jonas Kümmerlin <jonas@kuemmerlin.eu> | 2020-04-16 19:25:35 +0200 |
|---|---|---|
| committer | Jonas Kümmerlin <jonas@kuemmerlin.eu> | 2020-04-16 19:25:35 +0200 |
| commit | 8b5755851611574fd4010d9fa4e1046b78a501b9 (patch) | |
| tree | 84817c8bea211c099d72967470a1f054ece707c6 /alf/alf.cpp | |
| parent | 536ea04c34ba761d7031eeabb6d50adab0f0f2bd (diff) | |
make it build with -Wconversion
Diffstat (limited to 'alf/alf.cpp')
| -rw-r--r-- | alf/alf.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/alf/alf.cpp b/alf/alf.cpp index de8d9c3..b446b33 100644 --- a/alf/alf.cpp +++ b/alf/alf.cpp @@ -33,7 +33,7 @@ ALF_DestroyWindowPriv(ALFWindowPriv *priv) int ALF_CentipointsToPxPriv(ALFWindowPriv *priv, int cptValue) { - return MulDiv(cptValue, priv->fonts.dpi, 7200); + return MulDiv(cptValue, (int)priv->fonts.dpi, 7200); } void @@ -62,7 +62,7 @@ ALF_UpdateFontsPriv(HWND win, ALFWindowPriv *priv) // FIXME! fallback to default font, 8pt MS Shell Dlg ZeroMemory(&priv->fonts.lfMessageFont, sizeof(priv->fonts.lfMessageFont)); - priv->fonts.lfMessageFont.lfHeight = -MulDiv(8, priv->fonts.dpi, 72); + priv->fonts.lfMessageFont.lfHeight = -MulDiv(8, (int)priv->fonts.dpi, 72); lstrcpy(priv->fonts.lfMessageFont.lfFaceName, TEXT("MS Shell Dlg")); } @@ -246,9 +246,9 @@ ALF_DefWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) if (ALF_Compat_AdjustWindowRectExForDpi( &tmp, - GetWindowLong(hwnd, GWL_STYLE), + (DWORD)GetWindowLong(hwnd, GWL_STYLE), GetMenu(hwnd) != NULL, - GetWindowLong(hwnd, GWL_EXSTYLE), + (DWORD)GetWindowLong(hwnd, GWL_EXSTYLE), priv->fonts.dpi)) { MINMAXINFO *i = (MINMAXINFO *)lparam; i->ptMinTrackSize.x = tmp.right - tmp.left; @@ -454,12 +454,12 @@ void ALF_BuildUniqueName(TCHAR *buf, const TCHAR *prefix, ULONG_PTR uniquifier) { int prefixlen = lstrlen(prefix); - CopyMemory(buf, prefix, prefixlen * sizeof(*prefix)); + CopyMemory(buf, prefix, (SIZE_T)prefixlen * sizeof(*prefix)); int numlen = sizeof(LONG_PTR)*2; int i = numlen - 1; while (i >= 0) { - buf[prefixlen + i] = "0123456789ABCDEF"[uniquifier & 0xf]; + buf[prefixlen + i] = TEXT("0123456789ABCDEF")[uniquifier & 0xf]; uniquifier >>= 4; i--; } @@ -678,7 +678,7 @@ ALF_Text(HWND hwnd) { int len = GetWindowTextLength(hwnd); if (len > 0) { - TCHAR *buf = ALF_New(TCHAR, len+1); + TCHAR *buf = ALF_New(TCHAR, (SIZE_T)len+1); if (GetWindowText(hwnd, buf, len+1)) { return buf; } else { |