dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix 64-bit warnings

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7216 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2020-08-12 23:32:31 +00:00
parent 523b810377
commit 006c3c0e29
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/build.cpp
View file

@ -3608,7 +3608,7 @@ void CEXEBuild::notify(MakensisAPI::datatransfer_e code, const TCHAR *data) cons
#endif #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; using namespace MakensisAPI;
#ifdef _WIN32 #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; if (!notify_hwnd || (minver && (UINT) SendMessage(notify_hwnd, QUERYHOST, QH_SUPPORTEDVERSION, 0) < minver)) return false;
size_t data[] = { (size_t) proc, (size_t) cookie }; 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); 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_USER, (LONG_PTR) data);
SetWindowLongPtr(hWnd, DWLP_DLGPROC, (LONG_PTR) helper::Proc); 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; 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(); PROMPT_FILEPATH_DATA *p = (PROMPT_FILEPATH_DATA*) inputbuf.get();
p->Platform = (sizeof(void*) * 8) | sizeof(TCHAR), p->Reserved = 0; p->Platform = (sizeof(void*) * 8) | sizeof(TCHAR), p->Reserved = 0;
_tcscpy(p->Path, path); _tcscpy(p->Path, path);