From a39904388fa5789749f1687692bfa9b96a7e29f2 Mon Sep 17 00:00:00 2001 From: Tim Kosse Date: Tue, 11 Aug 2015 14:25:42 +0200 Subject: [PATCH] Fix type of third argument to AppendMenu We are passing pointers as third argument to AppendMenu. Do not truncate them to UINT, use UINT_PTR instead which has the required size on 64bit Windows. --- windows/winpgen.c | 8 ++++---- windows/winpgnt.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/winpgen.c b/windows/winpgen.c index 1086c08c..cc21746e 100644 --- a/windows/winpgen.c +++ b/windows/winpgen.c @@ -790,7 +790,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, AppendMenu(menu1, MF_ENABLED, IDC_SAVE, "&Save private key"); AppendMenu(menu1, MF_SEPARATOR, 0, 0); AppendMenu(menu1, MF_ENABLED, IDC_QUIT, "E&xit"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, "&File"); + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "&File"); state->filemenu = menu1; menu1 = CreateMenu(); @@ -801,7 +801,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2DSA, "SSH-2 &DSA key"); AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2ECDSA, "SSH-2 &ECDSA key"); AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2ED25519, "SSH-2 ED&25519 key"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, "&Key"); + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "&Key"); state->keymenu = menu1; menu1 = CreateMenu(); @@ -813,7 +813,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, "Export &OpenSSH key (force new file format)"); AppendMenu(menu1, MF_ENABLED, IDC_EXPORT_SSHCOM, "Export &ssh.com key"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "Con&versions"); state->cvtmenu = menu1; @@ -821,7 +821,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, AppendMenu(menu1, MF_ENABLED, IDC_ABOUT, "&About"); if (has_help()) AppendMenu(menu1, MF_ENABLED, IDC_GIVEHELP, "&Help"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, "&Help"); + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "&Help"); SetMenu(hwnd, menu); } diff --git a/windows/winpgnt.c b/windows/winpgnt.c index e9d91e3d..69b05946 100644 --- a/windows/winpgnt.c +++ b/windows/winpgnt.c @@ -1191,7 +1191,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) session_menu = CreateMenu(); AppendMenu(systray_menu, MF_ENABLED, IDM_PUTTY, "&New Session"); AppendMenu(systray_menu, MF_POPUP | MF_ENABLED, - (UINT) session_menu, "&Saved Sessions"); + (UINT_PTR) session_menu, "&Saved Sessions"); AppendMenu(systray_menu, MF_SEPARATOR, 0, 0); } AppendMenu(systray_menu, MF_ENABLED, IDM_VIEWKEYS,