Use correct tag names for compatability with fwd decls.
Some old code checks that _WINDEF_ is defined in windef.h.
This commit is contained in:
parent
bfb0653147
commit
39bbcb48b6
@ -245,7 +245,7 @@ DECL_WINELIB_TYPE_AW(LPFINDREPLACE)
|
|||||||
|
|
||||||
typedef UINT (CALLBACK *LPCFHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
|
typedef UINT (CALLBACK *LPCFHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagCHOOSEFONTA
|
||||||
{
|
{
|
||||||
UINT lStructSize;
|
UINT lStructSize;
|
||||||
HWND hwndOwner;
|
HWND hwndOwner;
|
||||||
@ -265,7 +265,7 @@ typedef struct
|
|||||||
INT nSizeMax;
|
INT nSizeMax;
|
||||||
} CHOOSEFONTA, *LPCHOOSEFONTA;
|
} CHOOSEFONTA, *LPCHOOSEFONTA;
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagCHOOSEFONTW
|
||||||
{
|
{
|
||||||
UINT lStructSize;
|
UINT lStructSize;
|
||||||
HWND hwndOwner;
|
HWND hwndOwner;
|
||||||
|
@ -673,7 +673,7 @@ typedef struct _SYSTEM_POWER_STATUS
|
|||||||
} SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;
|
} SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;
|
||||||
|
|
||||||
|
|
||||||
typedef struct tagSYSTEM_INFO
|
typedef struct _SYSTEM_INFO
|
||||||
{
|
{
|
||||||
union {
|
union {
|
||||||
DWORD dwOemId; /* Obsolete field - do not use */
|
DWORD dwOemId; /* Obsolete field - do not use */
|
||||||
|
@ -18,8 +18,8 @@
|
|||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __WINE_WINDEF_H
|
#ifndef _WINDEF_
|
||||||
#define __WINE_WINDEF_H
|
#define _WINDEF_
|
||||||
|
|
||||||
#ifndef WINVER
|
#ifndef WINVER
|
||||||
#define WINVER 0x0500
|
#define WINVER 0x0500
|
||||||
@ -343,4 +343,4 @@ typedef const RECTL *LPCRECTL;
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __WINE_WINDEF_H */
|
#endif /* _WINDEF_ */
|
||||||
|
@ -516,7 +516,7 @@ typedef LOGBRUSH PATTERN, *PPATTERN, *LPPATTERN;
|
|||||||
#define DEVICE_FONTTYPE 0x0002
|
#define DEVICE_FONTTYPE 0x0002
|
||||||
#define TRUETYPE_FONTTYPE 0x0004
|
#define TRUETYPE_FONTTYPE 0x0004
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagLOGFONTA
|
||||||
{
|
{
|
||||||
LONG lfHeight;
|
LONG lfHeight;
|
||||||
LONG lfWidth;
|
LONG lfWidth;
|
||||||
@ -534,7 +534,7 @@ typedef struct
|
|||||||
CHAR lfFaceName[LF_FACESIZE];
|
CHAR lfFaceName[LF_FACESIZE];
|
||||||
} LOGFONTA, *PLOGFONTA, *LPLOGFONTA;
|
} LOGFONTA, *PLOGFONTA, *LPLOGFONTA;
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagLOGFONTW
|
||||||
{
|
{
|
||||||
LONG lfHeight;
|
LONG lfHeight;
|
||||||
LONG lfWidth;
|
LONG lfWidth;
|
||||||
@ -653,7 +653,7 @@ typedef struct
|
|||||||
#define OBJ_ENHMETAFILE 13
|
#define OBJ_ENHMETAFILE 13
|
||||||
#define OBJ_COLORSPACE 14
|
#define OBJ_COLORSPACE 14
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagXFORM
|
||||||
{
|
{
|
||||||
FLOAT eM11;
|
FLOAT eM11;
|
||||||
FLOAT eM12;
|
FLOAT eM12;
|
||||||
@ -773,7 +773,7 @@ typedef struct
|
|||||||
#ifndef _TEXTMETRIC_DEFINED
|
#ifndef _TEXTMETRIC_DEFINED
|
||||||
#define _TEXTMETRIC_DEFINED
|
#define _TEXTMETRIC_DEFINED
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagTEXTMETRICA
|
||||||
{
|
{
|
||||||
LONG tmHeight;
|
LONG tmHeight;
|
||||||
LONG tmAscent;
|
LONG tmAscent;
|
||||||
@ -797,7 +797,7 @@ typedef struct
|
|||||||
BYTE tmCharSet;
|
BYTE tmCharSet;
|
||||||
} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
|
} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagTEXTMETRICW
|
||||||
{
|
{
|
||||||
LONG tmHeight;
|
LONG tmHeight;
|
||||||
LONG tmAscent;
|
LONG tmAscent;
|
||||||
|
@ -1834,7 +1834,7 @@ typedef struct
|
|||||||
#define CURSOR_SHOWING 0x00000001
|
#define CURSOR_SHOWING 0x00000001
|
||||||
|
|
||||||
/* this is the 6 byte accel struct used in Win32 when presented to the user */
|
/* this is the 6 byte accel struct used in Win32 when presented to the user */
|
||||||
typedef struct
|
typedef struct tagACCEL
|
||||||
{
|
{
|
||||||
BYTE fVirt;
|
BYTE fVirt;
|
||||||
WORD key;
|
WORD key;
|
||||||
|
@ -219,7 +219,7 @@ typedef struct _FILETIME {
|
|||||||
#endif
|
#endif
|
||||||
#ifndef _TEXTMETRIC_DEFINED
|
#ifndef _TEXTMETRIC_DEFINED
|
||||||
#define _TEXTMETRIC_DEFINED
|
#define _TEXTMETRIC_DEFINED
|
||||||
typedef struct {
|
typedef struct tagTEXTMETRICA {
|
||||||
LONG tmHeight;
|
LONG tmHeight;
|
||||||
LONG tmAscent;
|
LONG tmAscent;
|
||||||
LONG tmDescent;
|
LONG tmDescent;
|
||||||
@ -242,7 +242,7 @@ typedef struct {
|
|||||||
BYTE tmCharSet;
|
BYTE tmCharSet;
|
||||||
} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
|
} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct tagTEXTMETRICW {
|
||||||
LONG tmHeight;
|
LONG tmHeight;
|
||||||
LONG tmAscent;
|
LONG tmAscent;
|
||||||
LONG tmDescent;
|
LONG tmDescent;
|
||||||
|
@ -220,7 +220,7 @@ cpp_quote("#endif")
|
|||||||
|
|
||||||
cpp_quote("#ifndef _TEXTMETRIC_DEFINED")
|
cpp_quote("#ifndef _TEXTMETRIC_DEFINED")
|
||||||
cpp_quote("#define _TEXTMETRIC_DEFINED")
|
cpp_quote("#define _TEXTMETRIC_DEFINED")
|
||||||
typedef struct
|
typedef struct tagTEXTMETRICA
|
||||||
{
|
{
|
||||||
LONG tmHeight;
|
LONG tmHeight;
|
||||||
LONG tmAscent;
|
LONG tmAscent;
|
||||||
@ -244,7 +244,7 @@ typedef struct
|
|||||||
BYTE tmCharSet;
|
BYTE tmCharSet;
|
||||||
} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
|
} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagTEXTMETRICW
|
||||||
{
|
{
|
||||||
LONG tmHeight;
|
LONG tmHeight;
|
||||||
LONG tmAscent;
|
LONG tmAscent;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user