From: mlevedahl AT fallschurch DOT esys DOT com (Mark Levedahl)
Subject: Re: shellapi.h problems in beta 20.1
17 Dec 1998 16:43:32 -0800
Message-ID: <36793B53.4B74F632.cygnus.gnu-win32@fallschurch.esys.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: "gnu-win32 AT cygnus DOT com" <gnu-win32 AT cygnus DOT com>

On Tue, Dec 15, 1998 at 06:41:21AM -0500, William D Kirby wrote:
> ----------------------------- diff --------------
> *** shellapi.h.org Tue Dec 15 06:02:43 1998
> --- shellapi.h Tue Dec 15 06:07:39 1998
> ***************
> *** 127,133 ****
>
>   unsigned int WINAPI DragQueryFileW (HDROP, unsigned int, wchar_t *,
> unsigned int);
>   unsigned int WINAPI DragQueryFileA (HDROP, unsigned int, char *,
> unsigned int);
> ! BOOL WINAPI DragQueryPoint (HDROP, POint *);
>   void WINAPI DragFinish (HDROP);
>   void WINAPI DragAcceptFiles (HWND, BOOL);
>   HICON WINAPI DuplicateIcon (HINSTANCE, HICON );
> --- 127,133 ----
>
>   unsigned int WINAPI DragQueryFileW (HDROP, unsigned int, wchar_t *,
> unsigned int);
>   unsigned int WINAPI DragQueryFileA (HDROP, unsigned int, char *,
> unsigned int);
> ! BOOL WINAPI DragQueryPoint (HDROP, POINT *);
>   void WINAPI DragFinish (HDROP);
>   void WINAPI DragAcceptFiles (HWND, BOOL);
>   HICON WINAPI DuplicateIcon (HINSTANCE, HICON );

This doesn't completely fix the problem. The 2-line file

#include <windows.h>
#include <shellapi.h>

still generates errors. As far as I can tell, shellapi.h has is
completely subsumed by the headers included by windows.h. Replacing
shellapi.h with a placeholder patterned after windowsx.h seems the more
appropriate patch:

/* shellapi.h
   Definitions are in a different layout than MS headers
   This file includes our windows.h which in turn should include the
   normal contents of this header file (and the other Win32 headers).
*/

#ifndef _PLACEHOLDER_SHELLAPI_H
#define _PLACEHOLDER_SHELLAPI_H

#include <windows.h>

#endif /* _PLACEHOLDER_SHELLAPI_H */

Mark Levedahl

-
For help on using this list (especially unsubscribing), send a message to
"gnu-win32-request AT cygnus DOT com" with one line of text: "help".