x64 port

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@446 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 8 insertions, 8 deletions

diff --git a/updater/conf_comp_dialog.cpp b/updater/conf_comp_dialog.cpp
index e6c3445..6daebde 100644
--- a/updater/conf_comp_dialog.cpp
+++ b/updater/conf_comp_dialog.cpp
@@ -30,11 +30,11 @@ void FillFolder(TCHAR *folder_name, StringList *filenames) {
 	}

 }

 

-BOOL CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

+INT_PTR CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 	switch ( msg ) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault( hwndDlg );

-		SetWindowLong(hwndDlg, GWL_USERDATA, 0);

+		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);

 		SendMessage(GetDlgItem(hwndDlg, IDC_LIST_COMPONENTS),LVM_SETEXTENDEDLISTVIEWSTYLE, 0,LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES);

 

 		{

@@ -66,7 +66,7 @@ BOOL CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			lvI.mask = LVIF_TEXT | LVIF_NORECOMPUTE;// | LVIF_IMAGE; 

 

 

-			unsigned int temp_folder_name_len = _tcslen(options.temp_folder);

+			size_t temp_folder_name_len = _tcslen(options.temp_folder);

 			TCHAR *p;

 

 			FillFolder(options.temp_folder, &filenames);

@@ -83,7 +83,7 @@ BOOL CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			}

 

 			// do this after filling list - enables 'ITEMCHANGED' below

-			SetWindowLong(hwndDlg, GWL_USERDATA, 1L);

+			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 1);

 		}

 

 		Utils_RestoreWindowPositionNoSize(hwndDlg,0,MODULE,"ConfirmCompWindow");

@@ -95,7 +95,7 @@ BOOL CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			switch (((LPNMHDR) lParam)->code) {

 				

 			case LVN_ITEMCHANGED:

-				if(GetWindowLong(hwndDlg, GWL_USERDATA)) {

+				if(GetWindowLongPtr(hwndDlg, GWLP_USERDATA)) {

 					NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam;

 

 					if((nmlv->uNewState ^ nmlv->uOldState) & LVIS_STATEIMAGEMASK) {

@@ -160,14 +160,14 @@ BOOL CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				}

 				return TRUE;

 			case IDOK:

-				SetWindowLong(hwndDlg, GWL_USERDATA, 0);

+				SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);

 				Utils_SaveWindowPosition(hwndDlg,0,MODULE,"ConfirmCompWindow");

 

 				{

 					TCHAR fname_buff[MAX_PATH];

 					_tcscpy(fname_buff, options.temp_folder);

 					_tcscat(fname_buff, _T("\\"));

-					int path_len = _tcslen(fname_buff);

+					size_t path_len = _tcslen(fname_buff);

 					TCHAR *p = fname_buff + path_len;

 

 					int size = ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_LIST_COMPONENTS));

@@ -191,7 +191,7 @@ BOOL CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				EndDialog(hwndDlg, IDOK);

 				return TRUE;

 			case IDCANCEL:

-				SetWindowLong(hwndDlg, GWL_USERDATA, 0);

+				SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);

 				Utils_SaveWindowPosition(hwndDlg,0,MODULE,"ConfirmCompWindow");

 				EndDialog(hwndDlg, IDCANCEL);

 				return TRUE;