Added some missing #defines I've run across.
This commit is contained in:
parent
0c3f70dbfd
commit
10141fec52
|
@ -104,7 +104,7 @@ BOOL WINAPI InitCommonControlsEx (LPINITCOMMONCONTROLSEX);
|
||||||
#define NM_SETCURSOR (NM_FIRST-17)
|
#define NM_SETCURSOR (NM_FIRST-17)
|
||||||
#define NM_CHAR (NM_FIRST-18)
|
#define NM_CHAR (NM_FIRST-18)
|
||||||
#define NM_TOOLTIPSCREATED (NM_FIRST-19)
|
#define NM_TOOLTIPSCREATED (NM_FIRST-19)
|
||||||
|
#define NM_UPDOWN NMUPDOWN
|
||||||
|
|
||||||
/* callback constants */
|
/* callback constants */
|
||||||
#define LPSTR_TEXTCALLBACKA ((LPSTR)-1L)
|
#define LPSTR_TEXTCALLBACKA ((LPSTR)-1L)
|
||||||
|
|
|
@ -29,9 +29,7 @@ extern "C" {
|
||||||
#define OFN_SHAREAWARE 0x00004000
|
#define OFN_SHAREAWARE 0x00004000
|
||||||
#define OFN_NOREADONLYRETURN 0x00008000
|
#define OFN_NOREADONLYRETURN 0x00008000
|
||||||
#define OFN_NOTESTFILECREATE 0x00010000
|
#define OFN_NOTESTFILECREATE 0x00010000
|
||||||
|
#define OFN_NONETWORKBUTTON 0x00020000
|
||||||
/* OFN_? 0x00020000 */
|
|
||||||
|
|
||||||
#define OFN_NOLONGNAMES 0x00040000
|
#define OFN_NOLONGNAMES 0x00040000
|
||||||
#define OFN_EXPLORER 0x00080000
|
#define OFN_EXPLORER 0x00080000
|
||||||
#define OFN_NODEREFERENCELINKS 0x00100000
|
#define OFN_NODEREFERENCELINKS 0x00100000
|
||||||
|
@ -254,7 +252,7 @@ DECL_WINELIB_TYPE_AW(LPFINDREPLACE)
|
||||||
#define FR_HIDEWHOLEWORD 0x00010000
|
#define FR_HIDEWHOLEWORD 0x00010000
|
||||||
|
|
||||||
|
|
||||||
#pragma pack(1)
|
#include "pshpack1.h"
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
@ -324,7 +322,7 @@ typedef struct
|
||||||
DECL_WINELIB_TYPE_AW(CHOOSEFONT)
|
DECL_WINELIB_TYPE_AW(CHOOSEFONT)
|
||||||
DECL_WINELIB_TYPE_AW(LPCHOOSEFONT)
|
DECL_WINELIB_TYPE_AW(LPCHOOSEFONT)
|
||||||
|
|
||||||
#pragma pack(4)
|
#include "poppack.h"
|
||||||
|
|
||||||
#define CF_SCREENFONTS 0x00000001
|
#define CF_SCREENFONTS 0x00000001
|
||||||
#define CF_PRINTERFONTS 0x00000002
|
#define CF_PRINTERFONTS 0x00000002
|
||||||
|
|
|
@ -300,6 +300,16 @@ ICOM_DEFINE(IPrint,IUnknown)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#define LPMSODOCUMENT LPOLEDOCUMENT
|
||||||
|
#define LPMSODOCUMENTSITE LPOLEDOCUMENTSITE
|
||||||
|
#define LPMSOVIEW LPOLEDOCUMENTVIEW
|
||||||
|
#define LPENUMMSOVIEW LPENUMOLEDOCUMENTVIEWS
|
||||||
|
#define LPMSOCOMMANDTARGET LPOLECOMMANDTARGET
|
||||||
|
#define IID_IMsoDocument IID_IOleDocument
|
||||||
|
#define IID_IMsoDocumentSite IID_IOleDocumentSite
|
||||||
|
#define IID_IMsoView IID_IOleDocumentView
|
||||||
|
#define IID_IEnumMsoView IID_IEnumOleDocumentViews
|
||||||
|
#define IID_IMsoCommandTarget IID_IOleCommandTarget
|
||||||
|
|
||||||
|
|
||||||
#endif /* __WINE_DOCOBJ_H */
|
#endif /* __WINE_DOCOBJ_H */
|
||||||
|
|
|
@ -39,25 +39,5 @@ static __inline__ SEGPTR WINE_UNUSED SEGPTR_Get(LPCVOID ptr) {
|
||||||
#define SEGPTR_FREE(ptr) \
|
#define SEGPTR_FREE(ptr) \
|
||||||
(HIWORD(ptr) ? HeapFree( SegptrHeap, 0, (ptr) ) : 0)
|
(HIWORD(ptr) ? HeapFree( SegptrHeap, 0, (ptr) ) : 0)
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
LPVOID lpData;
|
|
||||||
DWORD cbData;
|
|
||||||
BYTE cbOverhead;
|
|
||||||
BYTE iRegionIndex;
|
|
||||||
WORD wFlags;
|
|
||||||
union {
|
|
||||||
struct {
|
|
||||||
HANDLE hMem;
|
|
||||||
DWORD dwReserved[3];
|
|
||||||
} Block;
|
|
||||||
struct {
|
|
||||||
DWORD dwCommittedSize;
|
|
||||||
DWORD dwUnCommittedSize;
|
|
||||||
LPVOID lpFirstBlock;
|
|
||||||
LPVOID lpLastBlock;
|
|
||||||
} Region;
|
|
||||||
} Foo;
|
|
||||||
} PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY;
|
|
||||||
|
|
||||||
#endif /* __WINE_HEAP_H */
|
#endif /* __WINE_HEAP_H */
|
||||||
|
|
|
@ -39,6 +39,15 @@ void WINAPI DragFinish(HDROP h);
|
||||||
BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p);
|
BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p);
|
||||||
BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p);
|
BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p);
|
||||||
|
|
||||||
|
#define NIF_MESSAGE 0x00000001
|
||||||
|
#define NIF_ICON 0x00000002
|
||||||
|
#define NIF_TIP 0x00000004
|
||||||
|
|
||||||
|
#define NIM_ADD 0x00000000
|
||||||
|
#define NIM_MODIFY 0x00000001
|
||||||
|
#define NIM_DELETE 0x00000002
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/******************************************
|
/******************************************
|
||||||
* Application Bar
|
* Application Bar
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include "winnt.h"
|
#include "winnt.h"
|
||||||
|
|
||||||
#pragma pack(1)
|
#include "pshpack1.h"
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -206,6 +206,33 @@ typedef struct
|
||||||
DECL_WINELIB_TYPE_AW(WIN32_FIND_DATA)
|
DECL_WINELIB_TYPE_AW(WIN32_FIND_DATA)
|
||||||
DECL_WINELIB_TYPE_AW(LPWIN32_FIND_DATA)
|
DECL_WINELIB_TYPE_AW(LPWIN32_FIND_DATA)
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
LPVOID lpData;
|
||||||
|
DWORD cbData;
|
||||||
|
BYTE cbOverhead;
|
||||||
|
BYTE iRegionIndex;
|
||||||
|
WORD wFlags;
|
||||||
|
union {
|
||||||
|
struct {
|
||||||
|
HANDLE hMem;
|
||||||
|
DWORD dwReserved[3];
|
||||||
|
} Block;
|
||||||
|
struct {
|
||||||
|
DWORD dwCommittedSize;
|
||||||
|
DWORD dwUnCommittedSize;
|
||||||
|
LPVOID lpFirstBlock;
|
||||||
|
LPVOID lpLastBlock;
|
||||||
|
} Region;
|
||||||
|
} Foo;
|
||||||
|
} PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY;
|
||||||
|
|
||||||
|
#define PROCESS_HEAP_REGION 0x0001
|
||||||
|
#define PROCESS_HEAP_UNCOMMITTED_RANGE 0x0002
|
||||||
|
#define PROCESS_HEAP_ENTRY_BUSY 0x0004
|
||||||
|
#define PROCESS_HEAP_ENTRY_MOVEABLE 0x0010
|
||||||
|
#define PROCESS_HEAP_ENTRY_DDESHARE 0x0020
|
||||||
|
|
||||||
#define INVALID_HANDLE_VALUE16 ((HANDLE16) -1)
|
#define INVALID_HANDLE_VALUE16 ((HANDLE16) -1)
|
||||||
#define INVALID_HANDLE_VALUE ((HANDLE) -1)
|
#define INVALID_HANDLE_VALUE ((HANDLE) -1)
|
||||||
|
|
||||||
|
@ -1178,7 +1205,7 @@ typedef struct tagCOMMTIMEOUTS {
|
||||||
DWORD WriteTotalTimeoutConstant;
|
DWORD WriteTotalTimeoutConstant;
|
||||||
} COMMTIMEOUTS,*LPCOMMTIMEOUTS;
|
} COMMTIMEOUTS,*LPCOMMTIMEOUTS;
|
||||||
|
|
||||||
#pragma pack(4)
|
#include "poppack.h"
|
||||||
|
|
||||||
typedef VOID (CALLBACK *PAPCFUNC)(ULONG_PTR);
|
typedef VOID (CALLBACK *PAPCFUNC)(ULONG_PTR);
|
||||||
|
|
||||||
|
|
|
@ -74,13 +74,22 @@ extern "C" {
|
||||||
#define WINAPI __stdcall
|
#define WINAPI __stdcall
|
||||||
#define APIPRIVATE __stdcall
|
#define APIPRIVATE __stdcall
|
||||||
#define PASCAL __stdcall
|
#define PASCAL __stdcall
|
||||||
|
#define pascal __stdcall
|
||||||
#define _pascal __stdcall
|
#define _pascal __stdcall
|
||||||
#define _stdcall __stdcall
|
#define _stdcall __stdcall
|
||||||
#define _fastcall __stdcall
|
#define _fastcall __stdcall
|
||||||
#define __export __stdcall
|
#define __export __stdcall
|
||||||
|
#define CDECL __cdecl
|
||||||
|
#define _CDECL __cdecl
|
||||||
|
#define cdecl __cdecl
|
||||||
|
#define _cdecl __cdecl
|
||||||
#define WINAPIV __cdecl
|
#define WINAPIV __cdecl
|
||||||
#define APIENTRY WINAPI
|
#define APIENTRY WINAPI
|
||||||
|
|
||||||
|
#define __declspec(x)
|
||||||
|
#define dllimport
|
||||||
|
#define dllexport
|
||||||
|
|
||||||
#define CONST const
|
#define CONST const
|
||||||
|
|
||||||
/* Standard data types. These are the same for emulator and library. */
|
/* Standard data types. These are the same for emulator and library. */
|
||||||
|
|
|
@ -330,7 +330,7 @@ typedef struct tagFUNCDESC
|
||||||
SHORT cScodes;
|
SHORT cScodes;
|
||||||
ELEMDESC elemdescFunc;
|
ELEMDESC elemdescFunc;
|
||||||
WORD wFuncFlags;
|
WORD wFuncFlags;
|
||||||
} FUNCDESC;
|
} FUNCDESC, *LPFUNCDESC;
|
||||||
|
|
||||||
typedef enum tagVARKIND
|
typedef enum tagVARKIND
|
||||||
{
|
{
|
||||||
|
|
|
@ -134,6 +134,8 @@ typedef struct IStream IStream,*LPSTREAM;
|
||||||
*/
|
*/
|
||||||
#define STGTY_STORAGE 1
|
#define STGTY_STORAGE 1
|
||||||
#define STGTY_STREAM 2
|
#define STGTY_STREAM 2
|
||||||
|
#define STGTY_LOCKBYTES 3
|
||||||
|
#define STGTY_PROPERTY 4
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* STATFLAG enumeration
|
* STATFLAG enumeration
|
||||||
|
|
|
@ -243,6 +243,7 @@ extern int WIN32_LastError;
|
||||||
#define ERROR_CAN_NOT_COMPLETE 1003
|
#define ERROR_CAN_NOT_COMPLETE 1003
|
||||||
#define ERROR_INVALID_FLAGS 1004
|
#define ERROR_INVALID_FLAGS 1004
|
||||||
#define ERROR_BADKEY 1010 /* Config reg key invalid */
|
#define ERROR_BADKEY 1010 /* Config reg key invalid */
|
||||||
|
#define ERROR_CANTOPEN 1011
|
||||||
#define ERROR_CANTREAD 1012 /* Config reg key couldn't be read */
|
#define ERROR_CANTREAD 1012 /* Config reg key couldn't be read */
|
||||||
#define ERROR_CANTWRITE 1013 /* Config reg key couldn't be written */
|
#define ERROR_CANTWRITE 1013 /* Config reg key couldn't be written */
|
||||||
#define ERROR_DLL_INIT_FAILED 1114
|
#define ERROR_DLL_INIT_FAILED 1114
|
||||||
|
|
|
@ -9,7 +9,7 @@ extern "C" {
|
||||||
|
|
||||||
#define _WINGDI_
|
#define _WINGDI_
|
||||||
|
|
||||||
#pragma pack(1)
|
#include "pshpack1.h"
|
||||||
|
|
||||||
typedef struct _ABCFLOAT {
|
typedef struct _ABCFLOAT {
|
||||||
FLOAT abcfA;
|
FLOAT abcfA;
|
||||||
|
@ -227,6 +227,9 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE)
|
||||||
#define MOUSETRAILS 39
|
#define MOUSETRAILS 39
|
||||||
#define GETDEVICEUNITS 42
|
#define GETDEVICEUNITS 42
|
||||||
|
|
||||||
|
#define DESKTOPVERTRES 117
|
||||||
|
#define DESKTOPHORZRES 118
|
||||||
|
|
||||||
#define GETEXTENDEDTEXTMETRICS 256
|
#define GETEXTENDEDTEXTMETRICS 256
|
||||||
#define GETEXTENTTABLE 257
|
#define GETEXTENTTABLE 257
|
||||||
#define GETPAIRKERNTABLE 258
|
#define GETPAIRKERNTABLE 258
|
||||||
|
@ -313,6 +316,7 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE)
|
||||||
#define WHITEONBLACK 2
|
#define WHITEONBLACK 2
|
||||||
#define COLORONCOLOR 3
|
#define COLORONCOLOR 3
|
||||||
#define HALFTONE 4
|
#define HALFTONE 4
|
||||||
|
#define MAXSTRETCHBLTMODE 4
|
||||||
|
|
||||||
#define STRETCH_ANDSCANS BLACKONWHITE
|
#define STRETCH_ANDSCANS BLACKONWHITE
|
||||||
#define STRETCH_ORSCANS WHITEONBLACK
|
#define STRETCH_ORSCANS WHITEONBLACK
|
||||||
|
@ -1367,6 +1371,10 @@ typedef struct
|
||||||
#define TT_AVAILABLE 0x0001
|
#define TT_AVAILABLE 0x0001
|
||||||
#define TT_ENABLED 0x0002
|
#define TT_ENABLED 0x0002
|
||||||
|
|
||||||
|
#define TT_PRIM_LINE 1
|
||||||
|
#define TT_PRIM_QSPLINE 2
|
||||||
|
#define TT_POLYGON_TYPE 24
|
||||||
|
|
||||||
/* Get/SetSystemPaletteUse() values */
|
/* Get/SetSystemPaletteUse() values */
|
||||||
#define SYSPAL_STATIC 1
|
#define SYSPAL_STATIC 1
|
||||||
#define SYSPAL_NOSTATIC 2
|
#define SYSPAL_NOSTATIC 2
|
||||||
|
@ -1765,7 +1773,7 @@ typedef struct
|
||||||
UINT16 bcHeight;
|
UINT16 bcHeight;
|
||||||
UINT16 bcPlanes;
|
UINT16 bcPlanes;
|
||||||
UINT16 bcBitCount;
|
UINT16 bcBitCount;
|
||||||
} BITMAPCOREHEADER;
|
} BITMAPCOREHEADER, *LPBITMAPCOREHEADER;
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
@ -2942,7 +2950,7 @@ typedef struct _RGNDATA {
|
||||||
typedef BOOL16 (CALLBACK* ABORTPROC16)(HDC16, INT16);
|
typedef BOOL16 (CALLBACK* ABORTPROC16)(HDC16, INT16);
|
||||||
typedef BOOL (CALLBACK* ABORTPROC)(HDC, INT);
|
typedef BOOL (CALLBACK* ABORTPROC)(HDC, INT);
|
||||||
|
|
||||||
#pragma pack(4)
|
#include "poppack.h"
|
||||||
|
|
||||||
/* Declarations for functions that exist only in Win16 */
|
/* Declarations for functions that exist only in Win16 */
|
||||||
|
|
||||||
|
|
|
@ -80,5 +80,15 @@ UINT WINAPI MultinetGetErrorTextA(DWORD,DWORD,DWORD);
|
||||||
UINT WINAPI MultinetGetErrorTextW(DWORD,DWORD,DWORD);
|
UINT WINAPI MultinetGetErrorTextW(DWORD,DWORD,DWORD);
|
||||||
#define MultinetGetErrorText WINELIB_NAME_AW(MultinetGetErrorText_)
|
#define MultinetGetErrorText WINELIB_NAME_AW(MultinetGetErrorText_)
|
||||||
|
|
||||||
|
#define RESOURCETYPE_ANY 0x00000000
|
||||||
|
#define RESOURCETYPE_DISK 0x00000001
|
||||||
|
#define RESOURCETYPE_PRINT 0x00000002
|
||||||
|
|
||||||
|
#define CONNECT_UPDATE_PROFILE 0x00000001
|
||||||
|
#define CONNECT_UPDATE_RECENT 0x00000002
|
||||||
|
#define CONNECT_TEMPORARY 0x00000004
|
||||||
|
#define CONNECT_INTERACTIVE 0x00000008
|
||||||
|
#define CONNECT_PROMPT 0x00000010
|
||||||
|
#define CONNECT_NEED_DRIVE 0x00000020
|
||||||
|
|
||||||
#endif /* _WINNETWK_H_ */
|
#endif /* _WINNETWK_H_ */
|
||||||
|
|
|
@ -11,6 +11,13 @@
|
||||||
#endif
|
#endif
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
|
|
||||||
|
#define MB_PRECOMPOSED 0x00000001
|
||||||
|
#define MB_COMPOSITE 0x00000002
|
||||||
|
#define MB_USEGLYPHCHARS 0x00000004
|
||||||
|
#define MB_ERR_INVALID_CHARS 0x00000008
|
||||||
|
|
||||||
|
#define LCID_INSTALLED 0x00000001
|
||||||
|
|
||||||
/* flags to GetLocaleInfo */
|
/* flags to GetLocaleInfo */
|
||||||
#define LOCALE_NOUSEROVERRIDE 0x80000000
|
#define LOCALE_NOUSEROVERRIDE 0x80000000
|
||||||
#define LOCALE_USE_CP_ACP 0x40000000
|
#define LOCALE_USE_CP_ACP 0x40000000
|
||||||
|
@ -255,6 +262,7 @@
|
||||||
#define SUBLANG_SYS_DEFAULT 0x02 /* system default */
|
#define SUBLANG_SYS_DEFAULT 0x02 /* system default */
|
||||||
|
|
||||||
#define SUBLANG_ARABIC 0x01
|
#define SUBLANG_ARABIC 0x01
|
||||||
|
#define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
|
||||||
#define SUBLANG_ARABIC_IRAQ 0x02
|
#define SUBLANG_ARABIC_IRAQ 0x02
|
||||||
#define SUBLANG_ARABIC_EGYPT 0x03
|
#define SUBLANG_ARABIC_EGYPT 0x03
|
||||||
#define SUBLANG_ARABIC_LIBYA 0x04
|
#define SUBLANG_ARABIC_LIBYA 0x04
|
||||||
|
@ -350,6 +358,7 @@
|
||||||
#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
|
#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
|
||||||
#define SUBLANG_UZBEK 0x01
|
#define SUBLANG_UZBEK 0x01
|
||||||
#define SUBLANG_UZBEK_CYRILLIC 0x02
|
#define SUBLANG_UZBEK_CYRILLIC 0x02
|
||||||
|
#define SUBLANG_URDU_PAKISTAN 0x01
|
||||||
|
|
||||||
/* Sort definitions */
|
/* Sort definitions */
|
||||||
#define SORT_DEFAULT 0x0
|
#define SORT_DEFAULT 0x0
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#pragma pack(1)
|
#include "pshpack1.h"
|
||||||
|
|
||||||
/* flags for HIGHCONTRAST dwFlags field */
|
/* flags for HIGHCONTRAST dwFlags field */
|
||||||
#define HCF_HIGHCONTRASTON 0x00000001
|
#define HCF_HIGHCONTRASTON 0x00000001
|
||||||
|
@ -211,7 +211,15 @@ typedef struct
|
||||||
#define BS_ICON 0x00000040L
|
#define BS_ICON 0x00000040L
|
||||||
#define BS_BITMAP 0x00000080L
|
#define BS_BITMAP 0x00000080L
|
||||||
|
|
||||||
|
#define BS_TEXT 0x00000000L
|
||||||
|
#define BS_ICON 0x00000040L
|
||||||
|
#define BS_BITMAP 0x00000080L
|
||||||
#define BS_LEFT 0x00000100L
|
#define BS_LEFT 0x00000100L
|
||||||
|
#define BS_RIGHT 0x00000200L
|
||||||
|
#define BS_CENTER 0x00000300L
|
||||||
|
#define BS_TOP 0x00000400L
|
||||||
|
#define BS_BOTTOM 0x00000800L
|
||||||
|
#define BS_VCENTER 0x00000C00L
|
||||||
#define BS_PUSHLIKE 0x00001000L
|
#define BS_PUSHLIKE 0x00001000L
|
||||||
#define BS_MULTILINE 0x00002000L
|
#define BS_MULTILINE 0x00002000L
|
||||||
#define BS_NOTIFY 0x00004000L
|
#define BS_NOTIFY 0x00004000L
|
||||||
|
@ -2688,6 +2696,9 @@ typedef struct
|
||||||
#define CF_RIFF 11
|
#define CF_RIFF 11
|
||||||
#define CF_WAVE 12
|
#define CF_WAVE 12
|
||||||
#define CF_ENHMETAFILE 14
|
#define CF_ENHMETAFILE 14
|
||||||
|
#define CF_HDROP 15
|
||||||
|
#define CF_LOCALE 16
|
||||||
|
#define CF_MAX 17
|
||||||
|
|
||||||
#define CF_OWNERDISPLAY 0x0080
|
#define CF_OWNERDISPLAY 0x0080
|
||||||
#define CF_DSPTEXT 0x0081
|
#define CF_DSPTEXT 0x0081
|
||||||
|
@ -2786,7 +2797,7 @@ typedef struct
|
||||||
#define NF_QUERY 3
|
#define NF_QUERY 3
|
||||||
#define NF_REQUERY 4
|
#define NF_REQUERY 4
|
||||||
|
|
||||||
#pragma pack(4)
|
#include "poppack.h"
|
||||||
#define EnumTaskWindows(handle,proc,lparam) \
|
#define EnumTaskWindows(handle,proc,lparam) \
|
||||||
EnumThreadWindows(handle,proc,lparam)
|
EnumThreadWindows(handle,proc,lparam)
|
||||||
#define OemToAnsiA OemToCharA
|
#define OemToAnsiA OemToCharA
|
||||||
|
@ -3504,6 +3515,8 @@ INT WINAPI LoadMessageW(HMODULE,UINT,WORD,LPWSTR,INT);
|
||||||
|
|
||||||
VOID WINAPI ScreenSwitchEnable16(WORD);
|
VOID WINAPI ScreenSwitchEnable16(WORD);
|
||||||
|
|
||||||
|
#define WC_DIALOG (LPSTR)((DWORD)((WORD)( 0x8002)))
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1570,13 +1570,13 @@ static void BuildCallFrom16Func( FILE *outfile, char *profile )
|
||||||
int argsize = 0;
|
int argsize = 0;
|
||||||
int short_ret = 0;
|
int short_ret = 0;
|
||||||
int reg_func = 0;
|
int reg_func = 0;
|
||||||
int cdecl = 0;
|
int Cdecl = 0;
|
||||||
int thunk = 0;
|
int thunk = 0;
|
||||||
char *args = profile + 7;
|
char *args = profile + 7;
|
||||||
|
|
||||||
/* Parse function type */
|
/* Parse function type */
|
||||||
|
|
||||||
if (!strncmp( "c_", profile, 2 )) cdecl = 1;
|
if (!strncmp( "c_", profile, 2 )) Cdecl = 1;
|
||||||
else if (!strncmp( "t_", profile, 2 )) thunk = 1;
|
else if (!strncmp( "t_", profile, 2 )) thunk = 1;
|
||||||
else if (strncmp( "p_", profile, 2 ))
|
else if (strncmp( "p_", profile, 2 ))
|
||||||
{
|
{
|
||||||
|
@ -1654,7 +1654,7 @@ static void BuildCallFrom16Func( FILE *outfile, char *profile )
|
||||||
/* Transfer the arguments */
|
/* Transfer the arguments */
|
||||||
|
|
||||||
if (reg_func) BuildContext16( outfile );
|
if (reg_func) BuildContext16( outfile );
|
||||||
else if (*args) argsize = TransferArgs16To32( outfile, args, cdecl );
|
else if (*args) argsize = TransferArgs16To32( outfile, args, Cdecl );
|
||||||
else if (thunk)
|
else if (thunk)
|
||||||
{
|
{
|
||||||
/* Get the stack selector base */
|
/* Get the stack selector base */
|
||||||
|
@ -1701,7 +1701,7 @@ static void BuildCallFrom16Func( FILE *outfile, char *profile )
|
||||||
{
|
{
|
||||||
int ftype = 0;
|
int ftype = 0;
|
||||||
|
|
||||||
if (cdecl) ftype |= 4;
|
if (Cdecl) ftype |= 4;
|
||||||
if (reg_func) ftype |= 2;
|
if (reg_func) ftype |= 2;
|
||||||
if (short_ret) ftype |= 1;
|
if (short_ret) ftype |= 1;
|
||||||
|
|
||||||
|
@ -1820,7 +1820,7 @@ static void BuildCallFrom16Func( FILE *outfile, char *profile )
|
||||||
fprintf( outfile, "\t.byte 0x66\n" );
|
fprintf( outfile, "\t.byte 0x66\n" );
|
||||||
fprintf( outfile, "\tlret\n" );
|
fprintf( outfile, "\tlret\n" );
|
||||||
}
|
}
|
||||||
else if (argsize && !cdecl)
|
else if (argsize && !Cdecl)
|
||||||
{
|
{
|
||||||
fprintf( outfile, "\t.byte 0x66\n" );
|
fprintf( outfile, "\t.byte 0x66\n" );
|
||||||
fprintf( outfile, "\tlret $%d\n", argsize );
|
fprintf( outfile, "\tlret $%d\n", argsize );
|
||||||
|
|
Loading…
Reference in New Issue