From 09fe1097c643350b0dc62a66823682b285fd2ae4 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 6 Apr 2015 22:28:48 +0300 Subject: [PATCH] adjust for newer mingw --- c_auto.h | 5 ----- win32.hlist | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/c_auto.h b/c_auto.h index 5e4564b..d76e596 100644 --- a/c_auto.h +++ b/c_auto.h @@ -39,11 +39,6 @@ typedef struct { #define noreturn __attribute__((noreturn)) -#ifdef __WINE__ -#define PCVOID LPCVOID -#define __VALIST __ms_va_list -#endif - static inline BOOL PtInRect_sa(LPCRECT r, int x, int y) { POINT p = { x, y }; diff --git a/win32.hlist b/win32.hlist index 1f90f6e..7f3d941 100644 --- a/win32.hlist +++ b/win32.hlist @@ -108,10 +108,10 @@ WINBASEAPI HRSRC WINAPI FindResourceW(HINSTANCE,LPCWSTR,LPCWSTR); WINBASEAPI HRSRC WINAPI FindResourceExA(HINSTANCE,LPCSTR,LPCSTR,WORD); WINBASEAPI HRSRC WINAPI FindResourceExW(HINSTANCE,LPCWSTR,LPCWSTR,WORD); WINBASEAPI BOOL WINAPI FlushFileBuffers(HANDLE); -WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,PCVOID,DWORD); -WINBASEAPI BOOL WINAPI FlushViewOfFile(PCVOID,DWORD); -WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,PCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*); -WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,PCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*); +WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,DWORD); +WINBASEAPI BOOL WINAPI FlushViewOfFile(LPCVOID,DWORD); +WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*); +WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*); WINBASEAPI BOOL WINAPI FreeEnvironmentStringsA(LPSTR); WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); WINBASEAPI BOOL WINAPI FreeLibrary(HMODULE); @@ -310,9 +310,9 @@ PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY); WINBASEAPI BOOL WINAPI InitializeAcl(PACL,DWORD,DWORD); WINBASEAPI BOOL WINAPI InitializeCriticalSectionAndSpinCount(LPCRITICAL_SECTION,DWORD); WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC); -WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(PCVOID,UINT); +WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT); WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(PVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadReadPtr(PCVOID,UINT); +WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT); WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT); WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT); WINBASEAPI BOOL WINAPI IsBadWritePtr(PVOID,UINT); @@ -320,7 +320,7 @@ WINBASEAPI BOOL WINAPI IsDebuggerPresent(void); //WINBASEAPI BOOL IsProcessInJob(HANDLE,HANDLE,PBOOL); WINBASEAPI BOOL WINAPI IsProcessorFeaturePresent(DWORD); WINBASEAPI BOOL WINAPI IsSystemResumeAutomatic(void); -WINBASEAPI BOOL WINAPI IsTextUnicode(PCVOID,int,LPINT); +WINBASEAPI BOOL WINAPI IsTextUnicode(LPCVOID,int,LPINT); WINBASEAPI BOOL WINAPI IsValidAcl(PACL); WINBASEAPI BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR); WINBASEAPI BOOL WINAPI IsValidSid(PSID); @@ -435,7 +435,7 @@ WINBASEAPI BOOL WINAPI ReadEventLogW(HANDLE,DWORD,DWORD,PVOID,DWORD,DWORD *,DWOR WINBASEAPI BOOL WINAPI ReadFile(HANDLE,PVOID,DWORD,PDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI ReadFileEx(HANDLE,PVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); WINBASEAPI BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); -WINBASEAPI BOOL WINAPI ReadProcessMemory(HANDLE,PCVOID,PVOID,DWORD,PDWORD); +WINBASEAPI BOOL WINAPI ReadProcessMemory(HANDLE,LPCVOID,PVOID,DWORD,PDWORD); WINBASEAPI HANDLE WINAPI RegisterEventSourceA (LPCSTR,LPCSTR); WINBASEAPI HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR); WINBASEAPI BOOL WINAPI RegisterWaitForSingleObject(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); @@ -581,8 +581,8 @@ WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); WINBASEAPI BOOL WINAPI WinLoadTrustProvider(GUID*); -WINBASEAPI BOOL WINAPI WriteFile(HANDLE,PCVOID,DWORD,PDWORD,LPOVERLAPPED); -WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,PCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); +WINBASEAPI BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,PDWORD,LPOVERLAPPED); +WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); WINBASEAPI BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WritePrivateProfileSectionA(LPCSTR,LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI WritePrivateProfileSectionW(LPCWSTR,LPCWSTR,LPCWSTR); @@ -601,7 +601,7 @@ WINBASEAPI BOOL WINAPI AllocateUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR); WINBASEAPI BOOL WINAPI FreeUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR); WINBASEAPI BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR); WINBASEAPI BOOL WINAPI MapUserPhysicalPagesScatter(PVOID*,ULONG_PTR,PULONG_PTR); -WINBASEAPI DWORD WINAPI HeapSize(HANDLE,DWORD,PCVOID); +WINBASEAPI DWORD WINAPI HeapSize(HANDLE,DWORD,LPCVOID); WINBASEAPI HANDLE WINAPI HeapCreate(DWORD,DWORD,DWORD); WINBASEAPI PVOID WINAPI HeapAlloc(HANDLE,DWORD,DWORD); WINBASEAPI PVOID WINAPI HeapReAlloc(HANDLE,DWORD,PVOID,DWORD); @@ -614,7 +614,7 @@ WINGDIAPI HGDIOBJ WINAPI SelectObject(HDC,HGDIOBJ); WINGDIAPI HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL); WINGDIAPI int WINAPI SetAbortProc(HDC,ABORTPROC); WINGDIAPI int WINAPI SetArcDirection(HDC,int); -WINGDIAPI LONG WINAPI SetBitmapBits(HBITMAP,DWORD,PCVOID); +WINGDIAPI LONG WINAPI SetBitmapBits(HBITMAP,DWORD,LPCVOID); WINGDIAPI BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE); WINGDIAPI COLORREF WINAPI SetBkColor(HDC,COLORREF); WINGDIAPI int WINAPI SetBkMode(HDC,int); @@ -626,8 +626,8 @@ WINGDIAPI COLORREF WINAPI SetDCBrushColor(HDC,COLORREF); WINGDIAPI COLORREF WINAPI SetDCPenColor(HDC,COLORREF); WINGDIAPI BOOL WINAPI SetDeviceGammaRamp(HDC,PVOID); WINGDIAPI UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,const RGBQUAD*); -WINGDIAPI int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,PCVOID,const BITMAPINFO*,UINT); -WINGDIAPI int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,PCVOID,const BITMAPINFO*,UINT); +WINGDIAPI int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); +WINGDIAPI int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); WINGDIAPI HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE*); WINGDIAPI int WINAPI SetGraphicsMode(HDC,int); WINGDIAPI int WINAPI SetICMMode(HDC,int); @@ -865,7 +865,7 @@ WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileA(HENHMETAFILE,LPCSTR); WINGDIAPI HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR); WINGDIAPI HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR); WINGDIAPI HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR); -WINGDIAPI HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,PCVOID); +WINGDIAPI HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,LPCVOID); WINGDIAPI HBITMAP WINAPI CreateBitmapIndirect(const BITMAP*); WINGDIAPI HBRUSH WINAPI CreateBrushIndirect(const LOGBRUSH*); WINGDIAPI HCOLORSPACE WINAPI CreateColorSpaceA(LPLOGCOLORSPACEA); @@ -874,9 +874,9 @@ WINGDIAPI HBITMAP WINAPI CreateCompatibleBitmap(HDC,int,int); WINGDIAPI HDC WINAPI CreateCompatibleDC(HDC); WINGDIAPI HDC WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*); WINGDIAPI HDC WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); -WINGDIAPI HBITMAP WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,PCVOID,const BITMAPINFO*,UINT); +WINGDIAPI HBITMAP WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,LPCVOID,const BITMAPINFO*,UINT); WINGDIAPI HBRUSH WINAPI CreateDIBPatternBrush(HGLOBAL,UINT); -WINGDIAPI HBRUSH WINAPI CreateDIBPatternBrushPt(PCVOID,UINT); +WINGDIAPI HBRUSH WINAPI CreateDIBPatternBrushPt(LPCVOID,UINT); WINGDIAPI HBITMAP WINAPI CreateDIBSection(HDC,const BITMAPINFO*,UINT,void**,HANDLE,DWORD); WINGDIAPI HBITMAP WINAPI CreateDiscardableBitmap(HDC,int,int); WINGDIAPI HRGN WINAPI CreateEllipticRgn(int,int,int,int); @@ -1005,7 +1005,7 @@ WINUSERAPI int WINAPI CountClipboardFormats(void); WINUSERAPI HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,int); WINUSERAPI HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int); WINUSERAPI BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int); -WINUSERAPI HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID); +WINUSERAPI HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,LPCVOID,LPCVOID); WINUSERAPI HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); WINUSERAPI HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); WINUSERAPI HWND WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM); @@ -1575,7 +1575,7 @@ WINBASEAPI int WINAPI lstrlenW(LPCWSTR); HIMC WINAPI ImmAssociateContext(HWND,HIMC); LONG WINAPI ImmGetCompositionStringA(HIMC,DWORD,PVOID,DWORD); HIMC WINAPI ImmGetContext(HWND); -BOOL WINAPI ImmSetCompositionStringA(HIMC,DWORD,PCVOID,DWORD,PCVOID,DWORD); +BOOL WINAPI ImmSetCompositionStringA(HIMC,DWORD,LPCVOID,DWORD,LPCVOID,DWORD); BOOL WINAPI ImmReleaseContext(HWND,HIMC); WINADVAPI BOOL WINAPI AbortSystemShutdownA(LPCSTR); -- 2.39.2