Large-scale renaming of all Win32 functions and types to use the
standard Windows names.
diff --git a/include/ddeml.h b/include/ddeml.h
index cf76a8d..a8f6f3f 100644
--- a/include/ddeml.h
+++ b/include/ddeml.h
@@ -132,9 +132,8 @@
typedef HDDEDATA (CALLBACK *PFNCALLBACK16)(UINT16,UINT16,HCONV,HSZ,HSZ,
HDDEDATA,DWORD,DWORD);
-typedef HDDEDATA (CALLBACK *PFNCALLBACK32)(UINT32,UINT32,HCONV,HSZ,HSZ,
+typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT,UINT,HCONV,HSZ,HSZ,
HDDEDATA,DWORD,DWORD);
-DECL_WINELIB_TYPE(PFNCALLBACK)
/***************************************************
@@ -154,13 +153,13 @@
typedef struct
{
- UINT32 cb;
- UINT32 wFlags;
- UINT32 wCountryID;
- INT32 iCodePage;
+ UINT cb;
+ UINT wFlags;
+ UINT wCountryID;
+ INT iCodePage;
DWORD dwLangID;
DWORD dwSecurity;
-} CONVCONTEXT32, *LPCONVCONTEXT32;
+} CONVCONTEXT, *LPCONVCONTEXT;
// Internal data structures
@@ -172,89 +171,69 @@
BOOL16 Win16; /* flag to indicate Win16 API used to initialize */
LPDWORD Instance_id; // needed to track monitor usage
struct DDE_HANDLE_ENTRY *Next_Entry;
- PFNCALLBACK32 CallBack;
+ PFNCALLBACK CallBack;
DWORD CBF_Flags;
DWORD Monitor_flags;
- UINT32 Txn_count; // count transactions open to simplify closure
+ UINT Txn_count; // count transactions open to simplify closure
} DDE_HANDLE_ENTRY;
// Interface Definitions
-DECL_WINELIB_TYPE(CONVCONTEXT)
-DECL_WINELIB_TYPE(LPCONVCONTEXT)
UINT16 WINAPI DdeInitialize16(LPDWORD,PFNCALLBACK16,DWORD,DWORD);
-UINT32 WINAPI DdeInitialize32A(LPDWORD,PFNCALLBACK32,DWORD,DWORD);
-UINT32 WINAPI DdeInitialize32W(LPDWORD,PFNCALLBACK32,DWORD,DWORD);
+UINT WINAPI DdeInitializeA(LPDWORD,PFNCALLBACK,DWORD,DWORD);
+UINT WINAPI DdeInitializeW(LPDWORD,PFNCALLBACK,DWORD,DWORD);
#define DdeInitialize WINELIB_NAME_AW(DdeInitialize)
BOOL16 WINAPI DdeUninitialize16(DWORD);
-BOOL32 WINAPI DdeUninitialize32(DWORD);
-#define DdeUninitialize WINELIB_NAME(DdeUninitialize)
+BOOL WINAPI DdeUninitialize(DWORD);
HCONVLIST WINAPI DdeConnectList16(DWORD,HSZ,HSZ,HCONVLIST,LPCONVCONTEXT16);
-HCONVLIST WINAPI DdeConnectList32(DWORD,HSZ,HSZ,HCONVLIST,LPCONVCONTEXT32);
-#define DdeConnectList WINELIB_NAME(DdeConnectList)
+HCONVLIST WINAPI DdeConnectList(DWORD,HSZ,HSZ,HCONVLIST,LPCONVCONTEXT);
HCONV WINAPI DdeQueryNextServer16(HCONVLIST, HCONV);
-HCONV WINAPI DdeQueryNextServer32(HCONVLIST, HCONV);
-#define DdeQueryNextServer WINELIB_NAME(DdeQueryNextServer)
-DWORD WINAPI DdeQueryString32A(DWORD, HSZ, LPSTR, DWORD, INT32);
-DWORD WINAPI DdeQueryString32W(DWORD, HSZ, LPWSTR, DWORD, INT32);
+HCONV WINAPI DdeQueryNextServer(HCONVLIST, HCONV);
+DWORD WINAPI DdeQueryStringA(DWORD, HSZ, LPSTR, DWORD, INT);
+DWORD WINAPI DdeQueryStringW(DWORD, HSZ, LPWSTR, DWORD, INT);
#define DdeQueryString WINELIB_NAME_AW(DdeQueryString)
BOOL16 WINAPI DdeDisconnectList16(HCONVLIST);
-BOOL32 WINAPI DdeDisconnectList32(HCONVLIST);
-#define DdeDisConnectList WINELIB_NAME(DdeDisconnectList)
+BOOL WINAPI DdeDisconnectList(HCONVLIST);
HCONV WINAPI DdeConnect16(DWORD,HSZ,HSZ,LPCONVCONTEXT16);
-HCONV WINAPI DdeConnect32(DWORD,HSZ,HSZ,LPCONVCONTEXT32);
-#define DdeConnect WINELIB_NAME(DdeConnect)
+HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,LPCONVCONTEXT);
BOOL16 WINAPI DdeDisconnect16(HCONV);
-BOOL32 WINAPI DdeDisconnect32(HCONV);
-#define DdeDisconnect WINELIB_NAME(DdeDisconnect)
-BOOL16 WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD);
+BOOL WINAPI DdeDisconnect(HCONV);
+BOOL16 WINAPI DdeSetUserHandle16(HCONV,DWORD,DWORD);
HDDEDATA WINAPI DdeCreateDataHandle16(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT16,UINT16);
-HDDEDATA WINAPI DdeCreateDataHandle32(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT32,UINT32);
-#define DdeCreateDataHandle WINELIB_NAME(DdeCreateDataHandle)
+HDDEDATA WINAPI DdeCreateDataHandle(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT,UINT);
HCONV WINAPI DdeReconnect(HCONV);
HSZ WINAPI DdeCreateStringHandle16(DWORD,LPCSTR,INT16);
-HSZ WINAPI DdeCreateStringHandle32A(DWORD,LPCSTR,INT32);
-HSZ WINAPI DdeCreateStringHandle32W(DWORD,LPCWSTR,INT32);
+HSZ WINAPI DdeCreateStringHandleA(DWORD,LPCSTR,INT);
+HSZ WINAPI DdeCreateStringHandleW(DWORD,LPCWSTR,INT);
#define DdeCreateStringHandle WINELIB_NAME_AW(DdeCreateStringHandle)
BOOL16 WINAPI DdeFreeStringHandle16(DWORD,HSZ);
-BOOL32 WINAPI DdeFreeStringHandle32(DWORD,HSZ);
-#define DdeFreeStringHandle WINELIB_NAME(DdeFreeStringHandle)
+BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ);
BOOL16 WINAPI DdeFreeDataHandle16(HDDEDATA);
-BOOL32 WINAPI DdeFreeDataHandle32(HDDEDATA);
-#define DdeFreeDataHandle WINELIB_NAME(DdeFreeDataHandle)
+BOOL WINAPI DdeFreeDataHandle(HDDEDATA);
BOOL16 WINAPI DdeKeepStringHandle16(DWORD,HSZ);
-BOOL32 WINAPI DdeKeepStringHandle32(DWORD,HSZ);
-#define DdeKeepStringHandle WINELIB_NAME(DdeKeepStringHandle)
+BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ);
HDDEDATA WINAPI DdeClientTransaction16(LPVOID,DWORD,HCONV,HSZ,UINT16,
UINT16,DWORD,LPDWORD);
-HDDEDATA WINAPI DdeClientTransaction32(LPBYTE,DWORD,HCONV,HSZ,UINT32,
- UINT32,DWORD,LPDWORD);
-#define DdeClientTransaction WINELIB_NAME(DdeClientTransaction)
-BOOL16 WINAPI DdeAbandonTransaction(DWORD,HCONV,DWORD);
+HDDEDATA WINAPI DdeClientTransaction(LPBYTE,DWORD,HCONV,HSZ,UINT,
+ UINT,DWORD,LPDWORD);
+BOOL16 WINAPI DdeAbandonTransaction16(DWORD,HCONV,DWORD);
BOOL16 WINAPI DdePostAdvise16(DWORD,HSZ,HSZ);
-BOOL32 WINAPI DdePostAdvise32(DWORD,HSZ,HSZ);
-#define DdePostAdvise WINELIB_NAME(DdePostAdvise)
-HDDEDATA WINAPI DdeAddData(HDDEDATA,LPBYTE,DWORD,DWORD);
+BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ);
+HDDEDATA WINAPI DdeAddData16(HDDEDATA,LPBYTE,DWORD,DWORD);
DWORD WINAPI DdeGetData(HDDEDATA,LPBYTE,DWORD,DWORD);
LPBYTE WINAPI DdeAccessData16(HDDEDATA,LPDWORD);
-LPBYTE WINAPI DdeAccessData32(HDDEDATA,LPDWORD);
-#define DdeAccessData WINELIB_NAME(DdeAccessData)
+LPBYTE WINAPI DdeAccessData(HDDEDATA,LPDWORD);
BOOL16 WINAPI DdeUnaccessData16(HDDEDATA);
-BOOL32 WINAPI DdeUnaccessData32(HDDEDATA);
-#define DdeUnaccessData WINELIB_NAME(DdeUnaccessData)
+BOOL WINAPI DdeUnaccessData(HDDEDATA);
BOOL16 WINAPI DdeEnableCallback16(DWORD,HCONV,UINT16);
-BOOL32 WINAPI DdeEnableCallback32(DWORD,HCONV,UINT32);
-#define DdeEnableCallback WINELIB_NAME(DdeEnableCallback)
+BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
int WINAPI DdeCmpStringHandles16(HSZ,HSZ);
-int WINAPI DdeCmpStringHandles32(HSZ,HSZ);
-#define DdeCmpStringHandles WINELIB_NAME(DdeCmpStringHandles)
+int WINAPI DdeCmpStringHandles(HSZ,HSZ);
HDDEDATA WINAPI DdeNameService16(DWORD,HSZ,HSZ,UINT16);
-HDDEDATA WINAPI DdeNameService32(DWORD,HSZ,HSZ,UINT32);
-#define DdeNameService WINELIB_NAME(DdeNameService)
+HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT);
UINT16 WINAPI DdeGetLastError16(DWORD);
-UINT32 WINAPI DdeGetLastError32(DWORD);
-#define DdeGetLastError WINELIB_NAME(DdeGetLastError)
+UINT WINAPI DdeGetLastError(DWORD);
#endif /* __WINE__DDEML_H */
