From 006c3c0e2934ca7164d52def4308be39401bb997 Mon Sep 17 00:00:00 2001 From: anders_k Date: Wed, 12 Aug 2020 23:32:31 +0000 Subject: [PATCH] Fix 64-bit warnings git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7216 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/build.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/build.cpp b/Source/build.cpp index 1ade37dc..8d4beafd 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -3608,7 +3608,7 @@ void CEXEBuild::notify(MakensisAPI::datatransfer_e code, const TCHAR *data) cons #endif } -bool CEXEBuild::hostapi_request_data(MakensisAPI::datatransfer_e operation, UINT minver, HOSTAPIREQUESTDATAPROC proc, void*cookie, const void* input, UINT inputsize) const +bool CEXEBuild::hostapi_request_data(MakensisAPI::datatransfer_e operation, UINT minver, HOSTAPIREQUESTDATAPROC proc, void*cookie, const void* input, size_t inputsize) const { using namespace MakensisAPI; #ifdef _WIN32 @@ -3626,7 +3626,7 @@ bool CEXEBuild::hostapi_request_data(MakensisAPI::datatransfer_e operation, UINT }; if (!notify_hwnd || (minver && (UINT) SendMessage(notify_hwnd, QUERYHOST, QH_SUPPORTEDVERSION, 0) < minver)) return false; size_t data[] = { (size_t) proc, (size_t) cookie }; - COPYDATASTRUCT cds = { (DWORD) operation, inputsize, (void*) input }; + COPYDATASTRUCT cds = { (DWORD) operation, (DWORD) inputsize, (void*) input }; HWND hWnd = CreateWindowEx(WS_EX_TOOLWINDOW, WC_DIALOG, NULL, WS_POPUP|WS_DISABLED, 0, 0, 0, 0, NULL, NULL, NULL, NULL); SetWindowLongPtr(hWnd, DWLP_USER, (LONG_PTR) data); SetWindowLongPtr(hWnd, DWLP_DLGPROC, (LONG_PTR) helper::Proc); @@ -3656,7 +3656,7 @@ bool CEXEBuild::prompt_for_output_path(TCHAR*path, UINT pathcap) const } }; size_t io[] = { false, (size_t) path, pathcap }, cb; - TinyGrowBuf inputbuf((cb = FIELD_OFFSET(PROMPT_FILEPATH_DATA, Path[pathcap]))); + TinyGrowBuf inputbuf((IGrowBuf::size_type) (cb = FIELD_OFFSET(PROMPT_FILEPATH_DATA, Path[pathcap]))); PROMPT_FILEPATH_DATA *p = (PROMPT_FILEPATH_DATA*) inputbuf.get(); p->Platform = (sizeof(void*) * 8) | sizeof(TCHAR), p->Reserved = 0; _tcscpy(p->Path, path);