interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolved ambiguous WINAPI issues on Windows.

This commit is contained in:
Pietro Gagliardi 2014-07-21 09:43:37 -04:00
parent cb96b8c6fd
commit 55db438d63
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redo/comctl32_windows.c
View File

@ -5,7 +5,7 @@
static ULONG_PTR comctlManifestCookie; static ULONG_PTR comctlManifestCookie;
static HMODULE comctl32; static HMODULE comctl32;
/* TODO do any of these take WINAPI? */ /* these are listed as WINAPI in both Microsoft's and MinGW's headers, but not on MSDN for some reason */
BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR);
LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM); LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM);
@ -16,7 +16,7 @@ DWORD initCommonControls(LPCWSTR manifest, char **errmsg)
HANDLE ac; HANDLE ac;
INITCOMMONCONTROLSEX icc; INITCOMMONCONTROLSEX icc;
FARPROC f; FARPROC f;
/* TODO does this take WINAPI? */ /* this is listed as WINAPI in both Microsoft's and MinGW's headers, but not on MSDN for some reason */
BOOL (*WINAPI ficc)(const LPINITCOMMONCONTROLSEX); BOOL (*WINAPI ficc)(const LPINITCOMMONCONTROLSEX);
ZeroMemory(&actctx, sizeof (ACTCTX)); ZeroMemory(&actctx, sizeof (ACTCTX));

2
redo/winapi_windows.h
View File

@ -32,7 +32,7 @@ extern DWORD makemsgwin(char **);
/* comctl32_windows.c */ /* comctl32_windows.c */
extern DWORD initCommonControls(LPCWSTR, char **); extern DWORD initCommonControls(LPCWSTR, char **);
/* TODO do any of these take WINAPI? */ /* these are listed as WINAPI in both Microsoft's and MinGW's headers, but not on MSDN for some reason */
extern BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); extern BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
extern BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); extern BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR);
extern LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM); extern LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM);