diff --git a/include/msacm.h b/include/msacm.h index 988453d13ef95b27ca1926521e0266a364ca6000..d00310df19c24b967f9f028aa6d7c7d1bce3bc26 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -265,8 +265,8 @@ typedef struct _ACMDRIVERDETAILSW WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW; -DECL_WINELIB_TYPE_AW(ACMDRIVERDETAILS); -DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS); +DECL_WINELIB_TYPE_AW(ACMDRIVERDETAILS) +DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS) typedef struct _ACMFILTERCHOOSEA { @@ -320,8 +320,8 @@ typedef struct _ACMFILTERCHOOSEW ACMFILTERCHOOSEHOOKPROCW pfnHook; } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW; -DECL_WINELIB_TYPE_AW(ACMFILTERCHOOSE); -DECL_WINELIB_TYPE_AW(PACMFILTERCHOOSE); +DECL_WINELIB_TYPE_AW(ACMFILTERCHOOSE) +DECL_WINELIB_TYPE_AW(PACMFILTERCHOOSE) typedef struct _ACMFILTERDETAILSA { @@ -345,8 +345,8 @@ typedef struct _ACMFILTERDETAILSW WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILSW, *PACMFILTERDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFILTERDETAILS); -DECL_WINELIB_TYPE_AW(PACMFILTERDETAILS); +DECL_WINELIB_TYPE_AW(ACMFILTERDETAILS) +DECL_WINELIB_TYPE_AW(PACMFILTERDETAILS) typedef struct _ACMFILTERTAGDETAILSA { @@ -370,8 +370,8 @@ typedef struct _ACMFILTERTAGDETAILSW WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFILTERTAGDETAILS); -DECL_WINELIB_TYPE_AW(PACMFILTERTAGDETAILS); +DECL_WINELIB_TYPE_AW(ACMFILTERTAGDETAILS) +DECL_WINELIB_TYPE_AW(PACMFILTERTAGDETAILS) typedef struct _ACMFORMATCHOOSEA { @@ -425,8 +425,8 @@ typedef struct _ACMFORMATCHOOSEW ACMFORMATCHOOSEHOOKPROCW pfnHook; } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW; -DECL_WINELIB_TYPE_AW(ACMFORMATCHOOSE); -DECL_WINELIB_TYPE_AW(PACMFORMATCHOOSE); +DECL_WINELIB_TYPE_AW(ACMFORMATCHOOSE) +DECL_WINELIB_TYPE_AW(PACMFORMATCHOOSE) typedef struct _ACMFORMATDETAILSA { @@ -450,8 +450,8 @@ typedef struct _ACMFORMATDETAILSW WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILSW, *PACMFORMATDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFORMATDETAILS); -DECL_WINELIB_TYPE_AW(PACMFORMATDETAILS); +DECL_WINELIB_TYPE_AW(ACMFORMATDETAILS) +DECL_WINELIB_TYPE_AW(PACMFORMATDETAILS) typedef struct _ACMFORMATTAGDETAILSA { @@ -475,8 +475,8 @@ typedef struct _ACMFORMATTAGDETAILSW WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS); -DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS); +DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS) +DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS) typedef struct _ACMSTREAMHEADER { diff --git a/include/tchar.h b/include/tchar.h index b6fecbd9e43cc49150e5621c456e454317ab1360..62976472d5fdd4f971f694014d37fa3371017b5e 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -250,10 +250,10 @@ char *CRTDLL__strrev(char *string); typedef CHAR _TCHARA; typedef WCHAR _TCHARW; -DECL_WINELIB_TYPE_AW (_TCHAR) +DECL_WINELIB_TYPE_AW(_TCHAR) typedef UCHAR _TUCHARA; typedef WCHAR _TUCHARW; -DECL_WINELIB_TYPE_AW (_TUCHAR) +DECL_WINELIB_TYPE_AW(_TUCHAR) #ifdef __cplusplus } /* extern "C" */ diff --git a/include/wininet.h b/include/wininet.h index ee8572d5c959d4b5ad1602ec88c3eab319869f6d..a15c68ed09a790def9b86bff0a73a5d1e668264c 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -296,7 +296,7 @@ BOOLAPI InternetCombineUrlW(LPCWSTR ,LPCWSTR ,LPWSTR ,LPDWORD ,DWORD); INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR ,DWORD ,LPCSTR lpszProxy ,LPCSTR lpszProxyBypass ,DWORD); INTERNETAPI HINTERNET WINAPI InternetOpenW(LPCWSTR ,DWORD ,LPCWSTR lpszProxy ,LPCWSTR lpszProxyBypass ,DWORD); -#define InternetOpen WINELIB_NAME_AW(InternetOpen); +#define InternetOpen WINELIB_NAME_AW(InternetOpen) #define INTERNET_OPEN_TYPE_PRECONFIG 0 #define INTERNET_OPEN_TYPE_DIRECT 1 @@ -312,7 +312,7 @@ INTERNETAPI HINTERNET WINAPI InternetConnectA(HINTERNET ,LPCSTR ,INTERNET_PORT , LPCSTR lpszUserName ,LPCSTR lpszPassword ,DWORD ,DWORD ,DWORD ); INTERNETAPI HINTERNET WINAPI InternetConnectW(HINTERNET ,LPCWSTR ,INTERNET_PORT , LPCWSTR lpszUserName ,LPCWSTR lpszPassword ,DWORD ,DWORD ,DWORD ); -#define InternetConnect WINELIB_NAME_AW(InternetConnect); +#define InternetConnect WINELIB_NAME_AW(InternetConnect) #define INTERNET_SERVICE_URL 0 #define INTERNET_SERVICE_FTP 1 @@ -332,12 +332,12 @@ INTERNETAPI HINTERNET WINAPI InternetConnectW(HINTERNET ,LPCWSTR ,INTERNET_PORT INTERNETAPI HINTERNET WINAPI InternetOpenUrlA(HINTERNET ,LPCSTR ,LPCSTR lpszHeaders ,DWORD ,DWORD ,DWORD); INTERNETAPI HINTERNET WINAPI InternetOpenUrlW(HINTERNET ,LPCWSTR ,LPCWSTR lpszHeaders ,DWORD ,DWORD ,DWORD); -#define InternetOpenUrl WINELIB_NAME_AW(InternetOpenUrl); +#define InternetOpenUrl WINELIB_NAME_AW(InternetOpenUrl) BOOLAPI InternetReadFile( HINTERNET ,LPVOID ,DWORD ,LPDWORD ); INTERNETAPI BOOL WINAPI InternetReadFileExA( HINTERNET ,LPINTERNET_BUFFERSA ,DWORD ,DWORD ); INTERNETAPI BOOL WINAPI InternetReadFileExW( HINTERNET ,LPINTERNET_BUFFERSW ,DWORD ,DWORD ); -#define InternetReadFileEx WINELIB_NAME_AW(InternetReadFileEx); +#define InternetReadFileEx WINELIB_NAME_AW(InternetReadFileEx) #define IRF_ASYNC WININET_API_FLAG_ASYNC #define IRF_SYNC WININET_API_FLAG_SYNC @@ -349,19 +349,19 @@ BOOLAPI InternetWriteFile(HINTERNET ,LPCVOID ,DWORD ,LPDWORD); BOOLAPI InternetQueryDataAvailable(HINTERNET ,LPDWORD lpdwNumberOfBytesAvailable ,DWORD ,DWORD); BOOLAPI InternetFindNextFileA(HINTERNET ,LPVOID); BOOLAPI InternetFindNextFileW(HINTERNET ,LPVOID); -#define InternetFindNextFile WINELIB_NAME_AW*(InternetFindNextFile); +#define InternetFindNextFile WINELIB_NAME_AW(InternetFindNextFile) BOOLAPI InternetQueryOptionA(HINTERNET hInternet ,DWORD ,LPVOID lpBuffer ,LPDWORD); BOOLAPI InternetQueryOptionW(HINTERNET hInternet ,DWORD ,LPVOID lpBuffer ,LPDWORD); -#define InternetQueryOption WINELIB_NAME_AW(InternetQueryOption); +#define InternetQueryOption WINELIB_NAME_AW(InternetQueryOption) BOOLAPI InternetSetOptionA(HINTERNET hInternet ,DWORD ,LPVOID ,DWORD); BOOLAPI InternetSetOptionW(HINTERNET hInternet ,DWORD ,LPVOID ,DWORD); -#define InternetSetOption WINELIB_NAME_AW(InternetSetOption); +#define InternetSetOption WINELIB_NAME_AW(InternetSetOption) BOOLAPI InternetSetOptionExA(HINTERNET hInternet ,DWORD ,LPVOID ,DWORD ,DWORD); BOOLAPI InternetSetOptionExW(HINTERNET hInternet ,DWORD ,LPVOID ,DWORD ,DWORD); -#define InternetSetOptionEx WINELIB_NAME_AW(InternetSetOptionEx); +#define InternetSetOptionEx WINELIB_NAME_AW(InternetSetOptionEx) BOOLAPI InternetLockRequestFile(HINTERNET ,HANDLE *); BOOLAPI InternetUnlockRequestFile(HANDLE); @@ -473,7 +473,7 @@ BOOLAPI InternetUnlockRequestFile(HANDLE); BOOLAPI InternetGetLastResponseInfoA(LPDWORD ,LPSTR lpszBuffer ,LPDWORD); BOOLAPI InternetGetLastResponseInfoW(LPDWORD ,LPWSTR lpszBuffer ,LPDWORD); -#define InternetGetLastResponseInfo WINELIB_NAME_AW(InternetGetLastResponseInfo); +#define InternetGetLastResponseInfo WINELIB_NAME_AW(InternetGetLastResponseInfo) typedef VOID CALLBACK (*INTERNET_STATUS_CALLBACK)(HINTERNET ,DWORD ,DWORD , LPVOID lpvStatusInformation ,DWORD); @@ -518,43 +518,43 @@ INTERNETAPI HINTERNET WINAPI FtpFindFirstFileA(HINTERNET ,LPCSTR lpszSearchFile LPWIN32_FIND_DATAA lpFindFileData ,DWORD ,DWORD); INTERNETAPI HINTERNET WINAPI FtpFindFirstFileW(HINTERNET ,LPCWSTR lpszSearchFile , LPWIN32_FIND_DATAW lpFindFileData ,DWORD ,DWORD); -#define FtpFindFirstFile WINELIB_NAME_AW(FtpFindFirstFile); +#define FtpFindFirstFile WINELIB_NAME_AW(FtpFindFirstFile) BOOLAPI FtpGetFileA(HINTERNET ,LPCSTR ,LPCSTR ,BOOL ,DWORD ,DWORD ,DWORD); BOOLAPI FtpGetFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,BOOL ,DWORD ,DWORD ,DWORD); -#define FtpGetFile WINELIB_NAME_AW(FtpGetFileW); +#define FtpGetFile WINELIB_NAME_AW(FtpGetFileW) BOOLAPI FtpPutFileA(HINTERNET ,LPCSTR ,LPCSTR ,DWORD ,DWORD); BOOLAPI FtpPutFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,DWORD ,DWORD); -#define FtpPutFile WINELIB_NAME_AW(FtpPutFile); +#define FtpPutFile WINELIB_NAME_AW(FtpPutFile) BOOLAPI FtpDeleteFileA(HINTERNET ,LPCSTR); BOOLAPI FtpDeleteFileW(HINTERNET ,LPCWSTR); -#define FtpDeleteFile WINELIB_NAME_AW(FtpDeleteFile); +#define FtpDeleteFile WINELIB_NAME_AW(FtpDeleteFile) BOOLAPI FtpRenameFileA(HINTERNET ,LPCSTR ,LPCSTR); BOOLAPI FtpRenameFileW(HINTERNET ,LPCWSTR ,LPCWSTR); -#define FtpRenameFile WINELIB_NAME_AW(FtpRenameFile); +#define FtpRenameFile WINELIB_NAME_AW(FtpRenameFile) INTERNETAPI HINTERNET WINAPI FtpOpenFileA(HINTERNET ,LPCSTR ,DWORD ,DWORD ,DWORD); INTERNETAPI HINTERNET WINAPI FtpOpenFileW(HINTERNET ,LPCWSTR ,DWORD ,DWORD ,DWORD); -#define FtpOpenFile WINELIB_NAME_AW(FtpOpenFile); +#define FtpOpenFile WINELIB_NAME_AW(FtpOpenFile) BOOLAPI FtpCreateDirectoryA(HINTERNET ,LPCSTR); BOOLAPI FtpCreateDirectoryW(HINTERNET ,LPCWSTR); -#define FtpCreateDirectory WINELIB_NAME_AW(FtpCreateDirectory); +#define FtpCreateDirectory WINELIB_NAME_AW(FtpCreateDirectory) BOOLAPI FtpRemoveDirectoryA(HINTERNET ,LPCSTR); BOOLAPI FtpRemoveDirectoryW(HINTERNET ,LPCWSTR); -#define FtpRemoveDirectory WINELIB_NAME_AW(FtpRemoveDirectory); +#define FtpRemoveDirectory WINELIB_NAME_AW(FtpRemoveDirectory) BOOLAPI FtpSetCurrentDirectoryA(HINTERNET ,LPCSTR); BOOLAPI FtpSetCurrentDirectoryW(HINTERNET ,LPCWSTR); -#define FtpSetCurrentDirectory WINELIB_NAME_AW(FtpSetCurrentDirectory); +#define FtpSetCurrentDirectory WINELIB_NAME_AW(FtpSetCurrentDirectory) BOOLAPI FtpGetCurrentDirectoryA(HINTERNET ,LPSTR ,LPDWORD); BOOLAPI FtpGetCurrentDirectoryW(HINTERNET ,LPWSTR ,LPDWORD); -#define FtpGetCurrentDirectory WINELIB_NAME_AW(FtpGetCurrentDirectory); +#define FtpGetCurrentDirectory WINELIB_NAME_AW(FtpGetCurrentDirectory) #define MAX_GOPHER_DISPLAY_TEXT 128 #define MAX_GOPHER_SELECTOR_TEXT 256 @@ -591,8 +591,8 @@ typedef struct { WCHAR Locator[MAX_GOPHER_LOCATOR_LENGTH + 1]; } GOPHER_FIND_DATAW,* LPGOPHER_FIND_DATAW; -DECL_WINELIB_TYPE_AW(GOPHER_FIND_DATA); -DECL_WINELIB_TYPE_AW(LPGOPHER_FIND_DATA); +DECL_WINELIB_TYPE_AW(GOPHER_FIND_DATA) +DECL_WINELIB_TYPE_AW(LPGOPHER_FIND_DATA) #define GOPHER_TYPE_TEXT_FILE 0x00000001 #define GOPHER_TYPE_DIRECTORY 0x00000002