Moved all Win16 definitions out of the standard Windows headers.
diff --git a/include/shellapi.h b/include/shellapi.h
index d8e0f83..38a05d8 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -29,18 +29,14 @@
DWORD grfKeyState;
} DRAGINFOW, LPDRAGINFOW;
-void WINAPI DragAcceptFiles(HWND hWnd, BOOL b);
-void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b);
+DECL_WINELIB_TYPE_AW(DRAGINFO)
+DECL_WINELIB_TYPE_AW(LPDRAGINFO)
-UINT16 WINAPI DragQueryFile16(HDROP16 hDrop, WORD wFile, LPSTR lpszFile, WORD wLength);
+void WINAPI DragAcceptFiles(HWND hWnd, BOOL b);
UINT WINAPI DragQueryFileA(HDROP hDrop, UINT lFile, LPSTR lpszFile, UINT lLength);
UINT WINAPI DragQueryFileW(HDROP hDrop, UINT lFile, LPWSTR lpszFile, UINT lLength);
-#define DragQueryFile WINELIB_NAME_AW(DragQueryFile)
-
-void WINAPI DragFinish16(HDROP16 h);
+#define DragQueryFile WINELIB_NAME_AW(DragQueryFile)
void WINAPI DragFinish(HDROP h);
-
-BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p);
BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p);
#define NIF_MESSAGE 0x00000001
@@ -207,7 +203,6 @@
#define SE_ERR_DDEBUSY 30
#define SE_ERR_NOASSOC 31
-HINSTANCE16 WINAPI ShellExecute16(HWND16,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT16);
HINSTANCE WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT);
HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
#define ShellExecute WINELIB_NAME_AW(ShellExecute)
@@ -247,30 +242,21 @@
* Misc
*/
-HICON16 WINAPI ExtractIcon16(HINSTANCE16,LPCSTR,UINT16);
-HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
-HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
+HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
+HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
#define ExtractIcon WINELIB_NAME_AW(ExtractIcon)
-
-HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16,LPSTR,LPWORD);
-HICON WINAPI ExtractAssociatedIconA(HINSTANCE,LPSTR,LPWORD);
-HICON WINAPI ExtractAssociatedIconW(HINSTANCE,LPWSTR,LPWORD);
+HICON WINAPI ExtractAssociatedIconA(HINSTANCE,LPSTR,LPWORD);
+HICON WINAPI ExtractAssociatedIconW(HINSTANCE,LPWSTR,LPWORD);
#define ExtractAssociatedIcon WINELIB_NAME_AW(ExtractAssociatedIcon)
-
-HICON16 WINAPI ExtractIconEx16 ( LPCSTR, INT16, HICON16 *, HICON16 *, UINT16 );
-HICON WINAPI ExtractIconExA( LPCSTR, INT, HICON *, HICON *, UINT );
-HICON WINAPI ExtractIconExW( LPCWSTR, INT, HICON *, HICON *, UINT );
-#define ExtractIconEx WINELIB_NAME_AW(ExtractIconEx)
-HICON WINAPI ExtractIconExAW(LPCVOID, INT, HICON *, HICON *, UINT );
-
-HINSTANCE16 WINAPI FindExecutable16(LPCSTR,LPCSTR,LPSTR);
-HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
-HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
+HICON WINAPI ExtractIconExA( LPCSTR, INT, HICON *, HICON *, UINT );
+HICON WINAPI ExtractIconExW( LPCWSTR, INT, HICON *, HICON *, UINT );
+#define ExtractIconEx WINELIB_NAME_AW(ExtractIconEx)
+HICON WINAPI ExtractIconExAW(LPCVOID, INT, HICON *, HICON *, UINT );
+HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
+HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
#define FindExecutable WINELIB_NAME_AW(FindExecutable)
-
-BOOL16 WINAPI ShellAbout16(HWND16,LPCSTR,LPCSTR,HICON16);
-BOOL WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
-BOOL WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
+BOOL WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
+BOOL WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
#define ShellAbout WINELIB_NAME_AW(ShellAbout)
#ifdef __cplusplus
