[MinGW-cvs] w32api/include shldisp.h,NONE,1.1 w32api.h,1.17,1.18

[Earnie B. <ea...@us...>]

Update of /cvsroot/mingw/w32api/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15363/include

Modified Files:
	w32api.h 
Added Files:
	shldisp.h 
Log Message:
Merge winsup changes

--- NEW FILE: shldisp.h ---
#ifndef _SHLDISP_H
#define _SHLDISP_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif

#ifdef __cplusplus
extern "C" {
#endif

#define ACO_AUTOSUGGEST 0x01

#undef INTERFACE
#define INTERFACE IAutoComplete
DECLARE_INTERFACE_(IAutoComplete, IUnknown)
{
	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
	STDMETHOD_(ULONG,Release)(THIS) PURE;
	STDMETHOD(Init)(THIS_ HWND,IUnknown*,LPCOLESTR,LPCOLESTR) PURE;
	STDMETHOD(Enable)(THIS_ BOOL) PURE;
};
typedef IAutoComplete *LPAUTOCOMPLETE;

#ifdef COBJMACROS
#define IAutoComplete_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
#define IAutoComplete_AddRef(T) (T)->lpVtbl->AddRef(T)
#define IAutoComplete_Release(T) (T)->lpVtbl->Release(T)
#define IAutoComplete_Init(T,a,b,c,d) (T)->lpVtbl->Init(T,a,b,c,d)
#define IAutoComplete_Enable(T,a) (T)->lpVtbl->Enable(T,a)
#endif

#undef INTERFACE
#define INTERFACE IAutoComplete2
DECLARE_INTERFACE_(IAutoComplete2, IAutoComplete)
{
	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
	STDMETHOD_(ULONG,Release)(THIS) PURE;
	STDMETHOD(Init)(THIS_ HWND,IUnknown*,LPCOLESTR,LPCOLESTR) PURE;
	STDMETHOD(Enable)(THIS_ BOOL) PURE;
	STDMETHOD(SetOptions)(THIS_ DWORD) PURE;
	STDMETHOD(GetOptions)(THIS_ DWORD*) PURE;
};
typedef IAutoComplete2 *LPAUTOCOMPLETE2;

#ifdef COBJMACROS
#define IAutoComplete2_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
#define IAutoComplete2_AddRef(T) (T)->lpVtbl->AddRef(T)
#define IAutoComplete2_Release(T) (T)->lpVtbl->Release(T)
#define IAutoComplete2_Init(T,a,b,c,d) (T)->lpVtbl->Init(T,a,b,c,d)
#define IAutoComplete2_Enable(T,a) (T)->lpVtbl->Enable(T,a)
#define IAutoComplete2_SetOptions(T,a) (T)->lpVtbl->Enable(T,a)
#define IAutoComplete2_GetOptions(T,a) (T)->lpVtbl->Enable(T,a)
#endif

#ifdef __cplusplus
}
#endif

#endif /* _SHLDISP_H */

Index: w32api.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/w32api.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** w32api.h	2 Jan 2005 13:10:37 -0000	1.17
--- w32api.h	2 Jan 2005 14:16:34 -0000	1.18
***************
*** 5,11 ****
  #endif
  
! #define __W32API_VERSION 3.1
  #define __W32API_MAJOR_VERSION 3
! #define __W32API_MINOR_VERSION 1
  
  /* The following defines are for documentation purposes.  The following defines
--- 5,11 ----
  #endif
  
! #define __W32API_VERSION 3.2
  #define __W32API_MAJOR_VERSION 3
! #define __W32API_MINOR_VERSION 2
  
  /* The following defines are for documentation purposes.  The following defines