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

Kill some compiler warnings under Linux and mingw32

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4994 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2007-03-11 15:58:46 +00:00
parent edeb26b7a7
commit 747ad310e5
25 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Makensisw/jnetlib/util.cpp
View file

@ -61,4 +61,4 @@ void mini_memcpy(void *o,void*i,int l)
char *oo=(char*)o;
char *ii=(char*)i;
while (l-- > 0) *oo++=*ii++;
}
}

12
Contrib/Makensisw/makensisw.cpp
View file

@ -103,7 +103,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
SetClassLong(hwndDlg,GCL_HICON,(long)hIcon);
// Altered by Darren Owen (DrO) on 29/9/2003
// Added in receiving of mouse and key events from the richedit control
SendMessage(GetDlgItem(hwndDlg,IDC_LOGWIN),EM_SETEVENTMASK,NULL,ENM_SELCHANGE|ENM_MOUSEEVENTS|ENM_KEYEVENTS);
SendMessage(GetDlgItem(hwndDlg,IDC_LOGWIN),EM_SETEVENTMASK,(WPARAM)NULL,ENM_SELCHANGE|ENM_MOUSEEVENTS|ENM_KEYEVENTS);
DragAcceptFiles(g_sdata.hwnd,FALSE);
g_sdata.menu = GetMenu(g_sdata.hwnd);
g_sdata.fileSubmenu = FindSubMenu(g_sdata.menu, IDM_FILE);
@ -207,7 +207,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
case WM_DROPFILES: {
int num;
char szTmp[MAX_PATH];
num = DragQueryFile((HDROP)wParam,-1,NULL,0);
num = DragQueryFile((HDROP)wParam,(UINT)-1,NULL,0);
if (num==1) {
DragQueryFile((HDROP)wParam,0,szTmp,MAX_PATH);
if (lstrlen(szTmp)>0) {
@ -295,14 +295,14 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
if(FileExists(temp_file_name)) {
hPrev = CreateFile(temp_file_name,GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, NULL, NULL);
NULL, OPEN_EXISTING, (DWORD)NULL, NULL);
if(hPrev != INVALID_HANDLE_VALUE) {
prevSize = GetFileSize(hPrev, 0);
CloseHandle(hPrev);
if(prevSize != INVALID_FILE_SIZE) {
hThis = CreateFile(g_sdata.output_exe,GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, NULL, NULL);
NULL, OPEN_EXISTING, (DWORD)NULL, NULL);
if(hThis != INVALID_HANDLE_VALUE) {
thisSize = GetFileSize(hThis, 0);
CloseHandle(hThis);
@ -1177,10 +1177,10 @@ BOOL CALLBACK SymbolSetProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
else {
HWND hwndParent = GetParent(hwndDlg);
if(g_symbol_set_mode == 1) { //Load
SendMessage(hwndParent, WM_MAKENSIS_LOADSYMBOLSET, (WPARAM)name, NULL);
SendMessage(hwndParent, WM_MAKENSIS_LOADSYMBOLSET, (WPARAM)name, (LPARAM)NULL);
}
else {
SendMessage(hwndParent, WM_MAKENSIS_SAVESYMBOLSET, (WPARAM)name, NULL);
SendMessage(hwndParent, WM_MAKENSIS_SAVESYMBOLSET, (WPARAM)name, (LPARAM)NULL);
}
EndDialog(hwndDlg, TRUE);
}

2
Contrib/Makensisw/makensisw.h
View file

@ -213,4 +213,4 @@ typedef struct ToolTipStruct {
HHOOK hook;
} NTOOLTIP;
#endif
#endif

2
Contrib/Makensisw/noclib.h
View file

@ -30,4 +30,4 @@ void *my_memset(void *dest, int c, size_t count);
// iceman_k's clib methods
int lstrncmp(char *s1, const char *s2, int chars);
int lstrncmpi(char *s1, const char *s2, int chars);
#endif
#endif

2
Contrib/Makensisw/toolbar.cpp
View file

@ -216,7 +216,7 @@ void ShowToolbarDropdownMenu()
RECT rect;
GetWindowRect(g_toolbar.hwnd, (LPRECT) &rect);
TrackPopupMenu(g_toolbar.dropdownmenu,
NULL,
(UINT)NULL,
rect.left + (int)(short)g_toolbar.dropdownpoint.x,
rect.top + (int)(short)g_toolbar.dropdownpoint.y,
0,

2
Contrib/Makensisw/toolbar.h
View file

@ -77,4 +77,4 @@ void EnableToolBarButton(int, BOOL);
void AddToolBarTooltips();
void ShowToolbarDropdownMenu();
void UpdateToolBarCompressorButton();
#endif
#endif

2
Contrib/Makensisw/utils.cpp
View file

@ -656,7 +656,7 @@ char* BuildSymbols()
}
else {
buf = (char *)GlobalAlloc(GPTR, sizeof(char));
buf[0] = NULL;
buf[0] = '\0';
}
return buf;

2
Contrib/Makensisw/utils.h
View file

@ -63,4 +63,4 @@ void ClearMRUList();
BOOL FileExists(char *fname);
HMENU FindSubMenu(HMENU hMenu, UINT uId);
#endif
#endif

2
Contrib/Makensisw/version.cpp
View file

@ -26,4 +26,4 @@
const char *NSISW_VERSION = "MakeNSISW " STR(RELEASE) " (NSIS Compiler Interface)";
#else
const char *NSISW_VERSION = "MakeNSISW " __DATE__;
#endif
#endif