--- mstools/samples/owncombo/owncombo.c	2018/08/09 18:20:01	1.1
+++ mstools/samples/owncombo/owncombo.c	2018/08/09 18:20:48	1.1.1.2
@@ -201,7 +201,7 @@ LONG APIENTRY OwnComboWndProc (
 		    DialogBox (hInst,
 			       "AboutBox",
 			       hWnd,
-			       (WNDPROC)lpProc);
+			       lpProc);
 
 		    FreeProcInstance (lpProc);
 		    break;
@@ -212,7 +212,7 @@ LONG APIENTRY OwnComboWndProc (
 		    DialogBox (hInst,
 			       "ListBoxDialog",
 			       hWnd,
-			       (WNDPROC)lpProc);
+			       lpProc);
 		    FreeProcInstance (lpProc);
 		    break;
 
@@ -222,7 +222,7 @@ LONG APIENTRY OwnComboWndProc (
 		    DialogBox (hInst,
 			       "MultiListBoxDialog",
 			       hWnd,
-			       (WNDPROC)lpProc);
+			       lpProc);
 		    FreeProcInstance (lpProc);
 		    break;
 
@@ -232,7 +232,7 @@ LONG APIENTRY OwnComboWndProc (
 		    DialogBox (hInst,
 			       "ComboBoxDialog",
 			       hWnd,
-			       (WNDPROC)lpProc);
+			       lpProc);
 		    FreeProcInstance (lpProc);
 		    break;
 
@@ -242,7 +242,7 @@ LONG APIENTRY OwnComboWndProc (
 		    DialogBox (hInst,
 			       "OwnerComboBoxDialog",
 			       hWnd,
-			       (WNDPROC)lpProc);
+			       lpProc);
 		    FreeProcInstance (lpProc);
 		    break;
 	    }
@@ -541,7 +541,7 @@ BOOL APIENTRY ComboBoxExample(
 		    if (wIndex == CB_ERR)
 			MessageBox (hDlg, (LPSTR)"No Selection", NULL, MB_OK);
 		    else
-			SendMessage (hWndCombo, CB_SETCURSEL, -1, 0L);
+			SendMessage (hWndCombo, CB_SETCURSEL, (WPARAM)-1, 0L);
 		    SetFocus (GetDlgItem (hDlg, ID_SINGLEEDIT));
 		    break;
 
@@ -572,7 +572,7 @@ BOOL APIENTRY ComboBoxExample(
 				 (LPSTR)strSingleEditLine, 255);
 		    wIndex = (WORD) SendMessage (hWndCombo,
 						CB_SELECTSTRING,
-						-1,
+						(WPARAM)-1,
 						(LONG)(LPSTR)strSingleEditLine);
 		    if (wIndex == CB_ERR)
 		      MessageBox (hDlg, (LPSTR)"Bad Selection", NULL, MB_OK);
@@ -592,7 +592,7 @@ BOOL APIENTRY ComboBoxExample(
 				    (LPSTR)strSingleEditLine,
 				    255);
 		    wIndex = (WORD)SendMessage (hWndCombo,
-					       CB_FINDSTRING,-1,
+					       CB_FINDSTRING,(WPARAM)-1,
 					       (LONG)(LPSTR)strSingleEditLine);
 		    if (wIndex == CB_ERR)
 			MessageBox (hDlg, (LPSTR)"Bad Selection", NULL, MB_OK);