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

Added some missing #defines I've run across.

oldstable
Jim Aston 1999-04-25 12:31:20 +00:00 committed by Alexandre Julliard
parent 0c3f70dbfd
commit 10141fec52
15 changed files with 115 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/commctrl.h
View File

@ -104,7 +104,7 @@ BOOL WINAPI InitCommonControlsEx (LPINITCOMMONCONTROLSEX);
#define NM_SETCURSOR (NM_FIRST-17)
#define NM_CHAR (NM_FIRST-18)
#define NM_TOOLTIPSCREATED (NM_FIRST-19)
#define NM_UPDOWN NMUPDOWN
/* callback constants */
#define LPSTR_TEXTCALLBACKA ((LPSTR)-1L)

8
include/commdlg.h
View File

@ -29,9 +29,7 @@ extern "C" {
#define OFN_SHAREAWARE 0x00004000
#define OFN_NOREADONLYRETURN 0x00008000
#define OFN_NOTESTFILECREATE 0x00010000
/* OFN_? 0x00020000 */
#define OFN_NONETWORKBUTTON 0x00020000
#define OFN_NOLONGNAMES 0x00040000
#define OFN_EXPLORER 0x00080000
#define OFN_NODEREFERENCELINKS 0x00100000
@ -254,7 +252,7 @@ DECL_WINELIB_TYPE_AW(LPFINDREPLACE)
#define FR_HIDEWHOLEWORD 0x00010000
#pragma pack(1)
#include "pshpack1.h"
typedef struct
{
@ -324,7 +322,7 @@ typedef struct
DECL_WINELIB_TYPE_AW(CHOOSEFONT)
DECL_WINELIB_TYPE_AW(LPCHOOSEFONT)
#pragma pack(4)
#include "poppack.h"
#define CF_SCREENFONTS 0x00000001
#define CF_PRINTERFONTS 0x00000002

10
include/docobj.h
View File

@ -300,6 +300,16 @@ ICOM_DEFINE(IPrint,IUnknown)
#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 */

20
include/heap.h
View File

@ -39,25 +39,5 @@ static __inline__ SEGPTR WINE_UNUSED SEGPTR_Get(LPCVOID ptr) {
#define SEGPTR_FREE(ptr) \
(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 */

9
include/shellapi.h
View File

@ -39,6 +39,15 @@ void WINAPI DragFinish(HDROP h);
BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *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

31
include/winbase.h
View File

@ -3,7 +3,7 @@
#include "winnt.h"
#pragma pack(1)
#include "pshpack1.h"
#ifdef __cplusplus
@ -206,6 +206,33 @@ typedef struct
DECL_WINELIB_TYPE_AW(WIN32_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_VALUE ((HANDLE) -1)
@ -1178,7 +1205,7 @@ typedef struct tagCOMMTIMEOUTS {
DWORD WriteTotalTimeoutConstant;
} COMMTIMEOUTS,*LPCOMMTIMEOUTS;
#pragma pack(4)
#include "poppack.h"
typedef VOID (CALLBACK *PAPCFUNC)(ULONG_PTR);

9
include/windef.h
View File

@ -74,13 +74,22 @@ extern "C" {
#define WINAPI __stdcall
#define APIPRIVATE __stdcall
#define PASCAL __stdcall
#define pascal __stdcall
#define _pascal __stdcall
#define _stdcall __stdcall
#define _fastcall __stdcall
#define __export __stdcall
#define CDECL __cdecl
#define _CDECL __cdecl
#define cdecl __cdecl
#define _cdecl __cdecl
#define WINAPIV __cdecl
#define APIENTRY WINAPI
#define __declspec(x)
#define dllimport
#define dllexport
#define CONST const
/* Standard data types. These are the same for emulator and library. */

2
include/wine/obj_oleaut.h
View File

@ -330,7 +330,7 @@ typedef struct tagFUNCDESC
SHORT cScodes;
ELEMDESC elemdescFunc;
WORD wFuncFlags;
} FUNCDESC;
} FUNCDESC, *LPFUNCDESC;
typedef enum tagVARKIND
{

2
include/wine/obj_storage.h
View File

@ -134,6 +134,8 @@ typedef struct IStream IStream,*LPSTREAM;
*/
#define STGTY_STORAGE 1
#define STGTY_STREAM 2
#define STGTY_LOCKBYTES 3
#define STGTY_PROPERTY 4
/*****************************************************************************
* STATFLAG enumeration

1
include/winerror.h
View File

@ -243,6 +243,7 @@ extern int WIN32_LastError;
#define ERROR_CAN_NOT_COMPLETE 1003
#define ERROR_INVALID_FLAGS 1004
#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_CANTWRITE 1013 /* Config reg key couldn't be written */
#define ERROR_DLL_INIT_FAILED 1114

14
include/wingdi.h
View File

@ -9,7 +9,7 @@ extern "C" {
#define _WINGDI_
#pragma pack(1)
#include "pshpack1.h"
typedef struct _ABCFLOAT {
FLOAT abcfA;
@ -227,6 +227,9 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE)
#define MOUSETRAILS 39
#define GETDEVICEUNITS 42
#define DESKTOPVERTRES 117
#define DESKTOPHORZRES 118
#define GETEXTENDEDTEXTMETRICS 256
#define GETEXTENTTABLE 257
#define GETPAIRKERNTABLE 258
@ -313,6 +316,7 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE)
#define WHITEONBLACK 2
#define COLORONCOLOR 3
#define HALFTONE 4
#define MAXSTRETCHBLTMODE 4
#define STRETCH_ANDSCANS BLACKONWHITE
#define STRETCH_ORSCANS WHITEONBLACK
@ -1367,6 +1371,10 @@ typedef struct
#define TT_AVAILABLE 0x0001
#define TT_ENABLED 0x0002
#define TT_PRIM_LINE 1
#define TT_PRIM_QSPLINE 2
#define TT_POLYGON_TYPE 24
/* Get/SetSystemPaletteUse() values */
#define SYSPAL_STATIC 1
#define SYSPAL_NOSTATIC 2
@ -1765,7 +1773,7 @@ typedef struct
UINT16 bcHeight;
UINT16 bcPlanes;
UINT16 bcBitCount;
} BITMAPCOREHEADER;
} BITMAPCOREHEADER, *LPBITMAPCOREHEADER;
typedef struct
{
@ -2942,7 +2950,7 @@ typedef struct _RGNDATA {
typedef BOOL16 (CALLBACK* ABORTPROC16)(HDC16, INT16);
typedef BOOL (CALLBACK* ABORTPROC)(HDC, INT);
#pragma pack(4)
#include "poppack.h"
/* Declarations for functions that exist only in Win16 */

10
include/winnetwk.h
View File

@ -80,5 +80,15 @@ UINT WINAPI MultinetGetErrorTextA(DWORD,DWORD,DWORD);
UINT WINAPI MultinetGetErrorTextW(DWORD,DWORD,DWORD);
#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_ */

9
include/winnls.h
View File

@ -11,6 +11,13 @@
#endif
#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 */
#define LOCALE_NOUSEROVERRIDE 0x80000000
#define LOCALE_USE_CP_ACP 0x40000000
@ -255,6 +262,7 @@
#define SUBLANG_SYS_DEFAULT 0x02 /* system default */
#define SUBLANG_ARABIC 0x01
#define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
#define SUBLANG_ARABIC_IRAQ 0x02
#define SUBLANG_ARABIC_EGYPT 0x03
#define SUBLANG_ARABIC_LIBYA 0x04
@ -350,6 +358,7 @@
#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
#define SUBLANG_UZBEK 0x01
#define SUBLANG_UZBEK_CYRILLIC 0x02
#define SUBLANG_URDU_PAKISTAN 0x01
/* Sort definitions */
#define SORT_DEFAULT 0x0

17
include/winuser.h
View File

@ -12,7 +12,7 @@
extern "C" {
#endif
#pragma pack(1)
#include "pshpack1.h"
/* flags for HIGHCONTRAST dwFlags field */
#define HCF_HIGHCONTRASTON 0x00000001
@ -211,7 +211,15 @@ typedef struct
#define BS_ICON 0x00000040L
#define BS_BITMAP 0x00000080L
#define BS_TEXT 0x00000000L
#define BS_ICON 0x00000040L
#define BS_BITMAP 0x00000080L
#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_MULTILINE 0x00002000L
#define BS_NOTIFY 0x00004000L
@ -2688,6 +2696,9 @@ typedef struct
#define CF_RIFF 11
#define CF_WAVE 12
#define CF_ENHMETAFILE 14
#define CF_HDROP 15
#define CF_LOCALE 16
#define CF_MAX 17
#define CF_OWNERDISPLAY 0x0080
#define CF_DSPTEXT 0x0081
@ -2786,7 +2797,7 @@ typedef struct
#define NF_QUERY 3
#define NF_REQUERY 4
#pragma pack(4)
#include "poppack.h"
#define EnumTaskWindows(handle,proc,lparam) \
EnumThreadWindows(handle,proc,lparam)
#define OemToAnsiA OemToCharA
@ -3504,6 +3515,8 @@ INT WINAPI LoadMessageW(HMODULE,UINT,WORD,LPWSTR,INT);
VOID WINAPI ScreenSwitchEnable16(WORD);
#define WC_DIALOG (LPSTR)((DWORD)((WORD)( 0x8002)))
#ifdef __cplusplus
}
#endif

10
tools/build.c
View File

@ -1570,13 +1570,13 @@ static void BuildCallFrom16Func( FILE *outfile, char *profile )
int argsize = 0;
int short_ret = 0;
int reg_func = 0;
int cdecl = 0;
int Cdecl = 0;
int thunk = 0;
char *args = profile + 7;
/* 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( "p_", profile, 2 ))
{
@ -1654,7 +1654,7 @@ static void BuildCallFrom16Func( FILE *outfile, char *profile )
/* Transfer the arguments */
if (reg_func) BuildContext16( outfile );
else if (*args) argsize = TransferArgs16To32( outfile, args, cdecl );
else if (*args) argsize = TransferArgs16To32( outfile, args, Cdecl );
else if (thunk)
{
/* Get the stack selector base */
@ -1701,7 +1701,7 @@ static void BuildCallFrom16Func( FILE *outfile, char *profile )
{
int ftype = 0;
if (cdecl) ftype |= 4;
if (Cdecl) ftype |= 4;
if (reg_func) ftype |= 2;
if (short_ret) ftype |= 1;
@ -1820,7 +1820,7 @@ static void BuildCallFrom16Func( FILE *outfile, char *profile )
fprintf( outfile, "\t.byte 0x66\n" );
fprintf( outfile, "\tlret\n" );
}
else if (argsize && !cdecl)
else if (argsize && !Cdecl)
{
fprintf( outfile, "\t.byte 0x66\n" );
fprintf( outfile, "\tlret $%d\n", argsize );