--- trunk/xvidcore/vfw/src/config.c	2008/11/28 11:56:01	1816
+++ trunk/xvidcore/vfw/src/config.c	2008/11/30 17:57:14	1830
@@ -546,7 +546,7 @@
 #define UINT_BUF_SZ	20
 static int config_get_cbuint(HWND hDlg, UINT item, int def)
 {
-	int sel = SendMessage(GetDlgItem(hDlg, item), CB_GETCURSEL, 0, 0);
+	LRESULT sel = SendMessage(GetDlgItem(hDlg, item), CB_GETCURSEL, 0, 0);
 	char buf[UINT_BUF_SZ];
 
 	if (sel<0) {
@@ -703,7 +703,7 @@
 
 /* quantization matrix dialog proc */
 
-static BOOL CALLBACK quantmatrix_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK quantmatrix_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	CONFIG* config = (CONFIG*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
 
@@ -1487,7 +1487,7 @@
 
 /* advanced dialog proc */
 
-static BOOL CALLBACK adv_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK adv_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	PROPSHEETINFO *psi;
 
@@ -1918,7 +1918,7 @@
 static const int other_dlgs[] = { IDD_ENC, IDD_DEC, IDD_COMMON };
 
 
-BOOL CALLBACK main_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK main_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	CONFIG* config = (CONFIG*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
 	unsigned int i;
@@ -1958,7 +1958,7 @@
 			EnumChildWindows(hDlg, enum_tooltips, 0);
 		}
 
-		SetClassLongPtr(GetDlgItem(hDlg, IDC_BITRATE_S), GCLP_HCURSOR, (LONG)LoadCursor(NULL, IDC_HAND));
+		SetClassLongPtr(GetDlgItem(hDlg, IDC_BITRATE_S), GCLP_HCURSOR, (LONG_PTR)LoadCursor(NULL, IDC_HAND));
 
 		{
 			DWORD ext_style = ListView_GetExtendedListViewStyle(GetDlgItem(hDlg,IDC_ZONES));
@@ -2231,7 +2231,7 @@
 /* LICENSE DIALOG ====================================================================== */
 /* ===================================================================================== */
 
-static BOOL CALLBACK license_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK license_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch (uMsg)
 	{
@@ -2249,7 +2249,7 @@
 					}
 				}
 			}
-			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG)hGlobal);
+			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)hGlobal);
 		}
 		break;
 
@@ -2287,7 +2287,7 @@
 /* ABOUT DIALOG ======================================================================== */
 /* ===================================================================================== */
 
-BOOL CALLBACK about_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK about_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch (uMsg)
 	{
@@ -2340,7 +2340,7 @@
 				}
 			}
 
-			SetClassLongPtr(GetDlgItem(hDlg, IDC_WEBSITE), GCLP_HCURSOR, (LONG)LoadCursor(NULL, IDC_HAND));
+			SetClassLongPtr(GetDlgItem(hDlg, IDC_WEBSITE), GCLP_HCURSOR, (LONG_PTR)LoadCursor(NULL, IDC_HAND));
 			SetDlgItemText(hDlg, IDC_WEBSITE, XVID_WEBSITE);
 		}
 		break;
@@ -2349,7 +2349,7 @@
 		{
 			SetBkMode((HDC)wParam, TRANSPARENT) ;
 			SetTextColor((HDC)wParam, RGB(0x00,0x00,0xc0));
-			return (BOOL)GetStockObject(NULL_BRUSH);
+			return (INT_PTR)GetStockObject(NULL_BRUSH);
 		}
 		return 0;