From c344492ccca8f1b33d676cc6b589b4b2745ef1bd Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 17 Jul 2002 03:37:45 +0000 Subject: [PATCH] 2002-07-17 Bart Oldeman * include/ddeml.h (MH_*) Add defines. (MONHSZSTRUCT): Add structure and typedefs. (MONLINKSTRUCT): Ditto. (MONCONVSTRUCT): Ditto. (MONCBSTRUCT): Ditto. (MONERRSTRUCT): Ditto. (MONMSGSTRUCT): Ditto. * include/windef.h: Don't define __cdecl or _cdecl for __WATCOM__. Don't define _export or __export for __WATCOM__. * include/windows.h (imm.h): #include. * include/winnt.h (LPEXCEPTION_RECORD): Add typedef. 2002-07-17 Danny Smith * include/wtypes.h: Remove duplicate #includes of rhc.h and rpcndr.h. --- winsup/w32api/ChangeLog | 22 ++++++++++- winsup/w32api/include/ddeml.h | 69 +++++++++++++++++++++++++++++++++ winsup/w32api/include/windef.h | 4 ++ winsup/w32api/include/windows.h | 1 + winsup/w32api/include/winnt.h | 2 +- winsup/w32api/include/wtypes.h | 2 - 6 files changed, 95 insertions(+), 5 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 6fb014f63..be2e787c3 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,22 @@ +2002-07-17 Bart Oldeman + + * include/ddeml.h (MH_*) Add defines. + (MONHSZSTRUCT): Add structure and typedefs. + (MONLINKSTRUCT): Ditto. + (MONCONVSTRUCT): Ditto. + (MONCBSTRUCT): Ditto. + (MONERRSTRUCT): Ditto. + (MONMSGSTRUCT): Ditto. + * include/windef.h: Don't define __cdecl or _cdecl for + __WATCOM__. + Don't define _export or __export for __WATCOM__. + * include/windows.h (imm.h): #include. + * include/winnt.h (LPEXCEPTION_RECORD): Add typedef. + +2002-07-17 Danny Smith + + * include/wtypes.h: Remove duplicate #includes of rhc.h and + 2002-07-05 Luke Dunstan * include/winbase.h (OpenThread): Add prototype. @@ -14,8 +33,7 @@ * include/wtypes.h: Include and before header guard. - -2002-07-02 Danny Smith +2002-07-02 Danny Smith * include/commctrl.h (WC_*): Remove some duplicate defines. diff --git a/winsup/w32api/include/ddeml.h b/winsup/w32api/include/ddeml.h index f6a9e21c5..6ae3bc12e 100644 --- a/winsup/w32api/include/ddeml.h +++ b/winsup/w32api/include/ddeml.h @@ -137,6 +137,10 @@ extern "C" { #define MF_LINKS 0x20000000 #define MF_CONV 0x40000000 #define MF_MASK 0xFF000000 +#define MH_CREATE 1 +#define MH_KEEP 2 +#define MH_DELETE 3 +#define MH_CLEANUP 4 DECLARE_HANDLE(HCONVLIST); DECLARE_HANDLE(HCONV); @@ -181,6 +185,71 @@ typedef struct tagDDEML_MSG_HOOK_DATA { DWORD cbData; DWORD Data[8]; } DDEML_MSG_HOOK_DATA; +typedef struct tagMONHSZSTRUCT { + UINT cb; + BOOL fsAction; + DWORD dwTime; + HSZ hsz; + HANDLE hTask; + TCHAR str[1]; +} MONHSZSTRUCT, *PMONHSZSTRUCT; +typedef struct tagMONLINKSTRUCT { + UINT cb; + DWORD dwTime; + HANDLE hTask; + BOOL fEstablished; + BOOL fNoData; + HSZ hszSvc; + HSZ hszTopic; + HSZ hszItem; + UINT wFmt; + BOOL fServer; + HCONV hConvServer; + HCONV hConvClient; +} MONLINKSTRUCT, *PMONLINKSTRUCT; +typedef struct tagMONCONVSTRUCT { + UINT cb; + BOOL fConnect; + DWORD dwTime; + HANDLE hTask; + HSZ hszSvc; + HSZ hszTopic; + HCONV hConvClient; + HCONV hConvServer; +} MONCONVSTRUCT, *PMONCONVSTRUCT; +typedef struct tagMONCBSTRUCT { + UINT cb; + DWORD dwTime; + HANDLE hTask; + DWORD dwRet; + UINT wType; + UINT wFmt; + HCONV hConv; + HSZ hsz1; + HSZ hsz2; + HDDEDATA hData; + ULONG_PTR dwData1; + ULONG_PTR dwData2; + CONVCONTEXT cc; + DWORD cbData; + DWORD Data[8]; +} MONCBSTRUCT, *PMONCBSTRUCT; +typedef struct tagMONERRSTRUCT { + UINT cb; + UINT wLastError; + DWORD dwTime; + HANDLE hTask; +} MONERRSTRUCT, *PMONERRSTRUCT; +typedef struct tagMONMSGSTRUCT { + UINT cb; + HWND hwndTo; + DWORD dwTime; + HANDLE hTask; + UINT wMsg; + WPARAM wParam; + LPARAM lParam; + DDEML_MSG_HOOK_DATA dmhd; +} MONMSGSTRUCT, *PMONMSGSTRUCT; BOOL WINAPI DdeAbandonTransaction(DWORD,HCONV,DWORD); PBYTE WINAPI DdeAccessData(HDDEDATA,PDWORD); diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h index aaf723349..24a84da9b 100644 --- a/winsup/w32api/include/windef.h +++ b/winsup/w32api/include/windef.h @@ -75,6 +75,8 @@ extern "C" { #ifndef _declspec #define _declspec(e) __attribute__((e)) #endif +#elif defined(__WATCOMC__) +#define PACKED #else #define PACKED #define _cdecl @@ -113,12 +115,14 @@ extern "C" { #define LOBYTE(w) ((BYTE)(w)) #define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) +#ifndef __WATCOMC__ #ifndef _export #define _export #endif #ifndef __export #define __export #endif +#endif #ifndef NOMINMAX #ifndef max diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h index a1e5c3d12..b5dfc7b93 100644 --- a/winsup/w32api/include/windows.h +++ b/winsup/w32api/include/windows.h @@ -77,6 +77,7 @@ #include #include #include +#include #include #include #include diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 85a8c3a27..ea56b02d5 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -1764,7 +1764,7 @@ typedef struct _EXCEPTION_RECORD { PVOID ExceptionAddress; DWORD NumberParameters; DWORD ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; -} EXCEPTION_RECORD,*PEXCEPTION_RECORD; +} EXCEPTION_RECORD,*PEXCEPTION_RECORD,*LPEXCEPTION_RECORD; typedef struct _EXCEPTION_POINTERS { PEXCEPTION_RECORD ExceptionRecord; PCONTEXT ContextRecord; diff --git a/winsup/w32api/include/wtypes.h b/winsup/w32api/include/wtypes.h index 4417a900d..f9409a894 100644 --- a/winsup/w32api/include/wtypes.h +++ b/winsup/w32api/include/wtypes.h @@ -7,8 +7,6 @@ #pragma GCC system_header #endif -#include -#include #ifdef __cplusplus extern "C" { #endif