Skip to content

W
wine-cw
Commit 894077f4 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Authors: Albert Den Haan <albertd@corel.ca>, Adrian Thurston…

Authors: Albert Den Haan <albertd@corel.ca>, Adrian Thurston <athursto@corel.ca>, Paul Quinn <paulq@corel.ca>, Zygo Blaxell <zygob@corel.ca> Miscellaneous patches to header files. All of these are supposedly there to help build Winelib applications.
parent 9b301094
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 25 deletions
include/hook.h
View file @ 894077f4
......@@ -30,6 +30,9 @@ typedef struct
HWND32 hwnd;
} CWPSTRUCT32, *LPCWPSTRUCT32;
DECL_WINELIB_TYPE(CWPSTRUCT)
DECL_WINELIB_TYPE(LPCWPSTRUCT)
/* hook type mask */
#define HOOK_MAPTYPE (HOOK_WIN16 | HOOK_WIN32A | HOOK_WIN32W)
......
include/objidl.h
View file @ 894077f4
......@@ -18,5 +18,14 @@
/* the following depend on obj_moniker.h */
#include "wine/obj_dataobject.h"
typedef struct tagINTERFACEINFO
{
IUnknown *pUnk;
IID iid;
WORD wMethod;
} INTERFACEINFO;
typedef struct tagINTERFACEINFO *LPINTERFACEINFO;
#endif /* __WINE_OBJIDL_H */
include/ole2.h
View file @ 894077f4
......@@ -19,7 +19,9 @@ typedef LPVOID LPDROPTARGET;
/* FIXME: should be in oleidl.h */
typedef struct tagOleMenuGroupWidths
{ LONG width[ 6 ];
} OLEMENUGROUPWIDTHS32;
} OLEMENUGROUPWIDTHS32, OLEMENUGROUPWIDTHS;
typedef struct tagOleMenuGroupWidths *LPOLEMENUGROUPWIDTHS32;
......
include/tchar.h
View file @ 894077f4
#ifndef __WINE_TCHAR_H
#define __WINE_TCHAR_H
#include "wintypes.h"
#ifdef __cplusplus
extern "C" {
#endif
/* FIXME: this should be in direct.h but since it's a standard C library include (on some systems)... */
#define _chdir chdir
......@@ -34,21 +39,24 @@
/* FIXME: this should be in string.h but since it's a standard C library include... */
#define _stricmp strcasecmp
#define _strcmpi strcasecmp
#define strcmpi strcasecmp
#define _strnicmp strncasecmp
#define strnicmp strncasecmp
#define _strdup strdup
/* FIXME: stricoll is not implemented but strcasecmp is probably close enough in most cases */
#define _stricoll strcasecmp
#define stricoll _stricoll
#define strlwr _strlwr
/* FIXME: _strlwr is not implemented */
char *_strlwr(char *string);
#define strnset _strnset
/* FIXME: _strnset is not implemented */
#define strrev _strrev
/* FIXME: _strrev is not implemented */
char *_strrev(char *string);
#define strset _strset
/* FIXME: _strset is not implemented */
#define strupr _strupr
/* FIXME: _strupr is not implemented */
char *_strupr(char *string);
#define ultoa _ultoa
/* FIXME: _ultoa is not implemented */
......@@ -124,6 +132,7 @@
#define _putts WINE_tchar_routine(puts, puts, putws)
#define _tmain WINE_tchar_routine(main, main, wmain)
#define _sntprintf WINE_tchar_routine(sprintf, sprintf, swprintf)
#define _stprintf WINE_tchar_routine(sprintf, sprintf, swprintf)
#define _stscanf WINE_tchar_routine(sscanf, sscanf, swscanf)
#define _taccess WINE_tchar_routine(_access, _access, _waccess)
#define _tasctime WINE_tchar_routine(asctime, asctime, _wasctime)
......@@ -247,5 +256,17 @@ DECL_WINELIB_TYPE_AW (_TCHAR)
typedef UCHAR _TUCHAR32A;
typedef WCHAR _TUCHAR32W;
DECL_WINELIB_TYPE_AW (_TUCHAR)
typedef CHAR TCHAR32A, *PTCHAR32A;
typedef WCHAR TCHAR32W, *PTCHAR32W;
DECL_WINELIB_TYPE_AW (TCHAR)
DECL_WINELIB_TYPE_AW (PTCHAR)
typedef LPWSTR PTSTR32W, LPTSTR32W;
typedef LPSTR PTSTR32A, LPTSTR32A;
DECL_WINELIB_TYPE_AW (PTSTR)
DECL_WINELIB_TYPE_AW (LPTSTR)
#ifdef __cplusplus
} // extern "C"
#endif
#endif /* __WINE_TCHAR_H */
include/winbase.h
View file @ 894077f4
......@@ -1083,6 +1083,8 @@ typedef DWORD (WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE_I
#define HANDLE_FLAG_INHERIT 0x00000001
#define HANDLE_FLAG_PROTECT_FROM_CLOSE 0x00000002
#define HINSTANCE_ERROR 32
#define THREAD_PRIORITY_LOWEST THREAD_BASE_PRIORITY_MIN
#define THREAD_PRIORITY_BELOW_NORMAL (THREAD_PRIORITY_LOWEST+1)
#define THREAD_PRIORITY_NORMAL 0
......
include/wine/obj_clientserver.h
View file @ 894077f4
......@@ -42,6 +42,12 @@ HRESULT WINAPI CoDisconnectObject(LPUNKNOWN lpUnk, DWORD reserved);
* IMessageFilter interface
*/
/* FIXME: not implemented */
#define ICOM_INTERFACE IMessageFilter
ICOM_BEGIN(IMessageFilter, IUnknown)
ICOM_END(IMessageFilter)
#undef ICOM_INTERFACE
HRESULT WINAPI CoRegisterMessageFilter16(LPMESSAGEFILTER lpMessageFilter,LPMESSAGEFILTER *lplpMessageFilter);
HRESULT WINAPI CoRegisterMessageFilter32(LPMESSAGEFILTER lpMessageFilter,LPMESSAGEFILTER *lplpMessageFilter);
......
include/wine/obj_dataobject.h
View file @ 894077f4
......@@ -11,10 +11,12 @@
/*****************************************************************************
* Predeclare the structures
*/
typedef struct DVTARGETDEVICE16 DVTARGETDEVICE16, *LPDVTARGETDEVICE16;
typedef struct DVTARGETDEVICE32 DVTARGETDEVICE32, *LPDVTARGETDEVICE32;
DECL_WINELIB_TYPE(DVTARGETDEVICE)
DECL_WINELIB_TYPE(LPDVTARGETDEVICE)
typedef struct FORMATETC16 FORMATETC16, *LPFORMATETC16;
typedef struct FORMATETC32 FORMATETC32, *LPFORMATETC32;
DECL_WINELIB_TYPE(FORMATETC)
DECL_WINELIB_TYPE(LPFORMATETC)
......@@ -109,6 +111,10 @@ struct STGMEDIUM32
* IAdviseSink interface
*/
/* FIXME: not implemented */
#define ICOM_INTERFACE IAdviseSink
ICOM_BEGIN(IAdviseSink,IUnknown)
ICOM_END(IAdviseSink)
#undef ICOM_INTERFACE
/*****************************************************************************
......
include/wine/obj_storage.h
View file @ 894077f4
......@@ -229,7 +229,32 @@ ICOM_END(IPersistFile)
/*****************************************************************************
* IPersistStorage interface
*/
/* FIXME: not implemented */
#define ICOM_INTERFACE IPersistStorage
ICOM_BEGIN(IPersistStorage, IPersist)
ICOM_METHOD (HRESULT,IsDirty)
ICOM_METHOD1(HRESULT,InitNew, IStorage32*,pStg)
ICOM_METHOD1(HRESULT,Load, IStorage32*,pStg)
ICOM_METHOD2(HRESULT,Save, IStorage32*,pStgSave, BOOL32,fSameAsLoad)
ICOM_METHOD1(HRESULT,SaveCompleted, IStorage32*,pStgNew);
ICOM_METHOD (HRESULT,HandsOffStorage)
ICOM_END(IPersistStorage)
#undef ICOM_INTERFACE
#if !defined(__cplusplus) || defined(CINTERFACE)
/*** IUnknown methods ***/
#define IPersistStorage_QueryInterface(p,a,b) ICOM_ICALL2(IUnknown,QueryInterface,p,a,b)
#define IPersistStorage_AddRef(p) ICOM_ICALL (IUnknown,AddRef,p)
#define IPersistStorage_Release(p) ICOM_ICALL (IUnknown,Release,p)
/*** IPersist methods ***/
#define IPersistStorage_GetClassID(p,a) ICOM_ICALL1(IPersist,GetClassID,p,a)
/*** IPersistFile methods ***/
#define IPersistStorage_IsDirty(p) ICOM_CALL (IsDirty,p)
#define IPersistStorage_InitNew(p,a) ICOM_CALL1(InitNew,p,a)
#define IPersistStorage_Load(p,a) ICOM_CALL1(Load,p,a)
#define IPersistStorage_Save(p,a,b) ICOM_CALL2(Save,p,a,b)
#define IPersistStorage_SaveCompleted(p,a) ICOM_CALL1(SaveCompleted,p,a)
#define IPersistStorage_HandsOffStorage(p) ICOM_CALL (HandsOffStorage,p)
#endif
/*****************************************************************************
......
include/winerror.h
View file @ 894077f4
......@@ -226,6 +226,7 @@ extern int WIN32_LastError;
#define ERROR_NOACCESS 998
#define ERROR_SWAPERROR 999
#define ERROR_CAN_NOT_COMPLETE 1003
#define ERROR_INVALID_FLAGS 1004
#define ERROR_BADKEY 1010 /* Config reg key invalid */
#define ERROR_CANTREAD 1012 /* Config reg key couldn't be read */
#define ERROR_CANTWRITE 1013 /* Config reg key couldn't be written */
......@@ -255,7 +256,9 @@ extern int WIN32_LastError;
#define DISP_E_TYPEMISMATCH 0x80020005L
#define DISP_E_ARRAYISLOCKED 0x8002000D
#define DISP_E_BADINDEX 0x8002000B
#define DISP_E_MEMBERNOTFOUND 0x80020003L
#define TYPE_E_ELEMENTNOTFOUND 0x8002802BL
/* Drag and Drop */
......@@ -283,6 +286,7 @@ extern int WIN32_LastError;
#define CO_E_INIT_SCM_MAP_VIEW_OF_FILE 0x80004010
#define CO_E_INIT_SCM_EXEC_FAILURE 0x80004011
#define CO_E_INIT_ONLY_SINGLE_THREADED 0x80004012 */
#define CO_E_ERRORINDLL 0x800401F9L
#define CO_E_OBJISREG 0x800401FB
#define OLE_E_ENUM_NOMORE 0x80040002
......
include/winuser.h
View file @ 894077f4
......@@ -1680,21 +1680,6 @@ typedef struct
#define MB_RIGHT 0x00080000
#define MB_RTLREADING 0x00100000
typedef struct _PRINTER_DEFAULTS32A {
LPSTR pDatatype;
LPDEVMODE32A pDevMode;
ACCESS_MASK DesiredAccess;
} PRINTER_DEFAULTS32A, *LPPRINTER_DEFAULTS32A;
typedef struct _PRINTER_DEFAULTS32W {
LPWSTR pDatatype;
LPDEVMODE32W pDevMode;
ACCESS_MASK DesiredAccess;
} PRINTER_DEFAULTS32W, *LPPRINTER_DEFAULTS32W;
DECL_WINELIB_TYPE_AW(PRINTER_DEFAULTS)
DECL_WINELIB_TYPE_AW(LPPRINTER_DEFAULTS)
#define HELPINFO_WINDOW 0x0001
#define HELPINFO_MENUITEM 0x0002
typedef struct /* Structure pointed to by lParam of WM_HELP */
......
include/wtypes.h
View file @ 894077f4
......@@ -32,17 +32,31 @@ typedef BSTR16 *LPBSTR16;
typedef BSTR32 *LPBSTR32;
DECL_WINELIB_TYPE(LPBSTR)
struct _GUID
#ifndef GUID_DEFINED
#define GUID_DEFINED
typedef struct _GUID
{
DWORD Data1;
WORD Data2;
WORD Data3;
BYTE Data4[8];
};
} GUID;
#endif
typedef GUID *LPGUID;
typedef GUID CLSID,*LPCLSID;
typedef GUID IID,*LPIID;
#ifdef __cplusplus
#define REFGUID const GUID &
#define REFIID const IID &
#define REFCLSID const CLSID &
#else // !__cplusplus
#define REFGUID GUID *
#define REFIID IID *
#define REFCLSID CLSID *
#endif // !__cplusplus
typedef struct _GUID GUID,*LPGUID,*REFGUID;
typedef struct _GUID CLSID,*LPCLSID,*REFCLSID;
typedef struct _GUID IID,*REFIID,*LPIID;
#define DECLARE_HANDLE(a) typedef HANDLE16 a##16; typedef HANDLE32 a##32
DECLARE_HANDLE(HMETAFILEPICT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment