ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Define HIC in this header rather than in windef.h (this is the 

correct thing to do although it is unrelated to the C++ issues).
- WINE_HIC is an internal structure and it won't compile in C++ because
  it contains a field called 'private'. Enclosed in a __WINE__ ifdef.
- Reordered the CALLBACK and WINAPI directives so that it compiles with
  old g++ versions.
This commit is contained in:
Francois Gouget 2000-06-11 20:07:08 +00:00 committed by Alexandre Julliard
parent 091dc85b73
commit a537bec4d1
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/vfw.h
View File

@ -34,6 +34,9 @@ typedef struct IGetFrame IGetFrame,*PGETFRAME;
/* Installable Compressor M? */ /* Installable Compressor M? */
DECLARE_HANDLE(HIC);
#ifdef __WINE__
/* HIC struct (same layout as Win95 one) */ /* HIC struct (same layout as Win95 one) */
typedef struct tagWINE_HIC { typedef struct tagWINE_HIC {
DWORD magic; /* 00: 'Smag' */ DWORD magic; /* 00: 'Smag' */
@ -48,6 +51,7 @@ typedef struct tagWINE_HIC {
DWORD x3; /* 22: */ DWORD x3; /* 22: */
/* 26: */ /* 26: */
} WINE_HIC; } WINE_HIC;
#endif
/* error return codes */ /* error return codes */
#define ICERR_OK 0 #define ICERR_OK 0
@ -231,8 +235,8 @@ typedef struct {
DWORD dwScale; DWORD dwScale;
DWORD dwOverheadPerFrame; DWORD dwOverheadPerFrame;
DWORD dwReserved2; DWORD dwReserved2;
LONG (CALLBACK *GetData)(LPARAM lInput,LONG lFrame,LPVOID lpBits,LONG len); LONG CALLBACK (*GetData)(LPARAM lInput,LONG lFrame,LPVOID lpBits,LONG len);
LONG (CALLBACK *PutData)(LPARAM lOutput,LONG lFrame,LPVOID lpBits,LONG len); LONG CALLBACK (*PutData)(LPARAM lOutput,LONG lFrame,LPVOID lpBits,LONG len);
} ICCOMPRESSFRAMES; } ICCOMPRESSFRAMES;
/* Values for wMode of ICOpen() */ /* Values for wMode of ICOpen() */

39
include/windef.h
View File

@ -296,7 +296,6 @@ DECLARE_HANDLE(HWINSTA);
DECLARE_HANDLE(HDESK); DECLARE_HANDLE(HDESK);
DECLARE_HANDLE(HWND); DECLARE_HANDLE(HWND);
DECLARE_HANDLE(HKL); DECLARE_HANDLE(HKL);
DECLARE_HANDLE(HIC);
DECLARE_HANDLE(HRASCONN); DECLARE_HANDLE(HRASCONN);
/* Handle types that must remain interchangeable even with strict on */ /* Handle types that must remain interchangeable even with strict on */
@ -310,30 +309,30 @@ typedef HANDLE LOCALHANDLE;
/* Callback function pointers types */ /* Callback function pointers types */
typedef BOOL (CALLBACK* DATEFMT_ENUMPROCA)(LPSTR); typedef BOOL CALLBACK (*DATEFMT_ENUMPROCA)(LPSTR);
typedef BOOL (CALLBACK* DATEFMT_ENUMPROCW)(LPWSTR); typedef BOOL CALLBACK (*DATEFMT_ENUMPROCW)(LPWSTR);
DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROC) DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROC)
typedef BOOL (CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); typedef BOOL CALLBACK (*DLGPROC)(HWND,UINT,WPARAM,LPARAM);
typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM); typedef LRESULT CALLBACK (*DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
typedef INT (CALLBACK *EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT); typedef INT CALLBACK (*EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT);
typedef INT (CALLBACK *EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT); typedef INT CALLBACK (*EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT);
DECL_WINELIB_TYPE_AW(EDITWORDBREAKPROC) DECL_WINELIB_TYPE_AW(EDITWORDBREAKPROC)
typedef LRESULT (CALLBACK *FARPROC)(); typedef LRESULT CALLBACK (*FARPROC)();
typedef INT (CALLBACK *PROC)(); typedef INT CALLBACK (*PROC)();
typedef BOOL (CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,INT); typedef BOOL CALLBACK (*GRAYSTRINGPROC)(HDC,LPARAM,INT);
typedef LRESULT (CALLBACK *HOOKPROC)(INT,WPARAM,LPARAM); typedef LRESULT CALLBACK (*HOOKPROC)(INT,WPARAM,LPARAM);
typedef BOOL (CALLBACK *PROPENUMPROCA)(HWND,LPCSTR,HANDLE); typedef BOOL CALLBACK (*PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
typedef BOOL (CALLBACK *PROPENUMPROCW)(HWND,LPCWSTR,HANDLE); typedef BOOL CALLBACK (*PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
DECL_WINELIB_TYPE_AW(PROPENUMPROC) DECL_WINELIB_TYPE_AW(PROPENUMPROC)
typedef BOOL (CALLBACK *PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,LPARAM); typedef BOOL CALLBACK (*PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,LPARAM);
typedef BOOL (CALLBACK *PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,LPARAM); typedef BOOL CALLBACK (*PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,LPARAM);
DECL_WINELIB_TYPE_AW(PROPENUMPROCEX) DECL_WINELIB_TYPE_AW(PROPENUMPROCEX)
typedef BOOL (CALLBACK* TIMEFMT_ENUMPROCA)(LPSTR); typedef BOOL CALLBACK (*TIMEFMT_ENUMPROCA)(LPSTR);
typedef BOOL (CALLBACK* TIMEFMT_ENUMPROCW)(LPWSTR); typedef BOOL CALLBACK (*TIMEFMT_ENUMPROCW)(LPWSTR);
DECL_WINELIB_TYPE_AW(TIMEFMT_ENUMPROC) DECL_WINELIB_TYPE_AW(TIMEFMT_ENUMPROC)
typedef VOID (CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD); typedef VOID CALLBACK (*TIMERPROC)(HWND,UINT,UINT,DWORD);
typedef BOOL (CALLBACK *WNDENUMPROC)(HWND,LPARAM); typedef BOOL CALLBACK (*WNDENUMPROC)(HWND,LPARAM);
typedef LRESULT (CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM); typedef LRESULT CALLBACK (*WNDPROC)(HWND,UINT,WPARAM,LPARAM);
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
** FIXME: Better isolate Wine's reliance on the xxx16 type definitions. ** FIXME: Better isolate Wine's reliance on the xxx16 type definitions.