Minor Win64 fixes (Thanks JasonFriday13)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6556 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
e4a9e63d5e
commit
6d2adf744d
1 changed files with 3 additions and 3 deletions
|
@ -84,7 +84,7 @@ int WINAPI _tWinMain(HINSTANCE hInst,HINSTANCE hOldInst,LPTSTR CmdLineParams,int
|
|||
{
|
||||
InitCommonControls();
|
||||
g_hInstance=hInst;
|
||||
return DialogBox(g_hInstance,MAKEINTRESOURCE(IDD_DIALOG1),0,DlgProc);
|
||||
return (int) DialogBox(g_hInstance,MAKEINTRESOURCE(IDD_DIALOG1),0,DlgProc);
|
||||
}
|
||||
|
||||
static void doRMDir(TCHAR *buf)
|
||||
|
@ -431,10 +431,10 @@ DWORD WINAPI ThreadProc(LPVOID p) // thread that will start & monitor makensis
|
|||
if (lastLF == NULL) lastLF = iobuf+dwRead-1;
|
||||
char ch = *++lastLF;
|
||||
*lastLF = '\0';
|
||||
MultiByteToWideChar(CP_UTF8,0,iobuf,lastLF+1-iobuf,buf,COUNTOF(buf));
|
||||
MultiByteToWideChar(CP_UTF8,0,iobuf,(int)(lastLF+1-iobuf),buf,COUNTOF(buf));
|
||||
wnd_printf(buf);
|
||||
*lastLF = ch;
|
||||
dwLeft = iobuf+dwRead-lastLF;
|
||||
dwLeft = (DWORD)(iobuf+dwRead-lastLF);
|
||||
memmove(iobuf, lastLF, dwLeft);
|
||||
#else
|
||||
wnd_printf(iobuf);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue