--- mstools/h/shellapi.h	2018/08/09 18:20:28	1.1
+++ mstools/h/shellapi.h	2018/08/09 18:21:06	1.1.1.2
@@ -1,3 +1,10 @@
+#ifndef _SHELLAPI_INCLUDED_
+#define _SHELLAPI_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  shell.h
  *
@@ -11,12 +18,14 @@
 /* API exports from the library
  */
 
-WORD APIENTRY DragQueryFile(HANDLE,WORD,LPSTR,WORD);
-BOOL APIENTRY DragQueryPoint(HANDLE,LPPOINT);
-VOID APIENTRY DragFinish(HANDLE);
+DECLARE_HANDLE(HDROP);
+
+UINT APIENTRY DragQueryFile(HDROP,UINT,LPSTR,UINT);
+BOOL APIENTRY DragQueryPoint(HDROP,LPPOINT);
+VOID APIENTRY DragFinish(HDROP);
 VOID APIENTRY DragAcceptFiles(HWND,BOOL);
 
-HICON  APIENTRY ExtractIcon(HANDLE hInst, LPSTR lpszExeFileName, WORD nIconIndex);
+HICON  APIENTRY ExtractIcon(HINSTANCE hInst, LPSTR lpszExeFileName, UINT nIconIndex);
 
 /* error values for ShellExecute() beyond the regular WinExec() codes */
 #define SE_ERR_SHARE		 	26
@@ -26,10 +35,15 @@ HICON  APIENTRY ExtractIcon(HANDLE hInst
 #define SE_ERR_DDEBUSY   		30
 #define SE_ERR_NOASSOC   		31
 
-HANDLE APIENTRY ShellExecute(HWND hwnd, LPSTR lpOperation, LPSTR lpFile, LPSTR lpParameters, LPSTR lpDirectory, WORD nShowCmd);
-HANDLE APIENTRY FindExecutable(LPSTR lpFile, LPSTR lpDirectory, LPSTR lpResult);
+HINSTANCE APIENTRY ShellExecute(HWND hwnd, LPCSTR lpOperation, LPCSTR lpFile, LPCSTR lpParameters, LPCSTR lpDirectory, int iShowCmd);
+HINSTANCE APIENTRY FindExecutable(LPCSTR lpFile, LPCSTR lpDirectory, LPCSTR lpResult);
 				
-INT   APIENTRY ShellAbout(HWND hWnd, LPSTR szApp, LPSTR szOtherStuff, HICON hIcon); 	/* ;Internal */
-HICON APIENTRY DuplicateIcon(HANDLE hInst, HICON hIcon);				/* ;Internal */
-HICON APIENTRY ExtractAssociatedIcon(HANDLE hInst, LPSTR lpIconPath, LPWORD lpiIcon);	/* ;Internal */
+INT   APIENTRY ShellAbout(HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON hIcon);	/* ;Internal */
+HICON APIENTRY DuplicateIcon(HINSTANCE hInst, HICON hIcon);				/* ;Internal */
+HICON APIENTRY ExtractAssociatedIcon(HINSTANCE hInst, LPCSTR lpIconPath, LPWORD lpiIcon);	/* ;Internal */
+
+#ifdef __cplusplus
+}
+#endif
 
+#endif // _SHELLAPI_INCLUDED_