marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unquoted some 16-bit types, so the IDL compiler can use them.

oldstable
Ove Kaaven 2002-12-18 20:50:19 +00:00 committed by Alexandre Julliard
parent fcb40e8f63
commit 158063fecb
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/wtypes.h
View File

@ -9,12 +9,6 @@ extern "C" {
#endif
#include "basetsd.h"
#include "guiddef.h"
typedef CHAR OLECHAR16;
typedef LPSTR LPOLESTR16;
typedef LPCSTR LPCOLESTR16;
typedef OLECHAR16 *BSTR16;
typedef BSTR16 *LPBSTR16;
#define OLESTR16(x) x
#if 0 /* winnt.h */
typedef unsigned char BYTE;
@ -160,6 +154,15 @@ typedef const OLECHAR *LPCOLESTR;
#ifndef __WINE__
#define OLESTR(str) WINE_UNICODE_TEXT(str)
#endif
typedef CHAR OLECHAR16;
typedef LPSTR LPOLESTR16;
typedef LPCSTR LPCOLESTR16;
typedef OLECHAR16 *BSTR16;
typedef BSTR16 *LPBSTR16;
#define OLESTR16(x) x
typedef LONG SCODE;
typedef struct _COAUTHIDENTITY {

21
include/wtypes.idl
View File

@ -31,15 +31,6 @@ interface IWinTypes
cpp_quote("#include \"basetsd.h\"")
cpp_quote("#include \"guiddef.h\"")
/* from Wine's pre-WIDL wtypes.h */
/* FIXME: does not belong here */
cpp_quote("typedef CHAR OLECHAR16;")
cpp_quote("typedef LPSTR LPOLESTR16;")
cpp_quote("typedef LPCSTR LPCOLESTR16;")
cpp_quote("typedef OLECHAR16 *BSTR16;")
cpp_quote("typedef BSTR16 *LPBSTR16;")
cpp_quote("#define OLESTR16(x) x")
/******************** BASIC WIN32 TYPES ********************/
cpp_quote("#if 0 /* winnt.h */") /* don't redefine these */
@ -166,6 +157,18 @@ cpp_quote("#ifndef __WINE__")
cpp_quote("#define OLESTR(str) WINE_UNICODE_TEXT(str)")
cpp_quote("#endif")
/* from Wine's pre-WIDL wtypes.h */
/* FIXME: does not belong here */
typedef CHAR OLECHAR16;
typedef LPSTR LPOLESTR16;
typedef LPCSTR LPCOLESTR16;
/* quoted because if BSTR16 is ever used in IDL files,
* it'll probably need some wire_marshal stuff too,
* and quoting these will detect any such necessity */
cpp_quote("typedef OLECHAR16 *BSTR16;")
cpp_quote("typedef BSTR16 *LPBSTR16;")
cpp_quote("#define OLESTR16(x) x")
typedef LONG SCODE;
typedef struct _COAUTHIDENTITY {