comctl32/tests: Use the proper type for function pointers.

This commit is contained in:
Michael Stefaniuc 2012-09-13 13:35:56 +02:00 committed by Alexandre Julliard
parent 5b19a55910
commit 9f56598fb9
1 changed files with 8 additions and 8 deletions

View File

@ -45,7 +45,7 @@ typedef struct tagMRUINFOA
UINT fFlags; UINT fFlags;
HKEY hKey; HKEY hKey;
LPCSTR lpszSubKey; LPCSTR lpszSubKey;
PROC lpfnCompare; int (CALLBACK *lpfnCompare)(LPCSTR, LPCSTR);
} MRUINFOA; } MRUINFOA;
typedef struct tagMRUINFOW typedef struct tagMRUINFOW
@ -55,7 +55,7 @@ typedef struct tagMRUINFOW
UINT fFlags; UINT fFlags;
HKEY hKey; HKEY hKey;
LPCWSTR lpszSubKey; LPCWSTR lpszSubKey;
PROC lpfnCompare; int (CALLBACK *lpfnCompare)(LPCWSTR, LPCWSTR);
} MRUINFOW; } MRUINFOW;
#define MRU_STRING 0 /* this one's invented */ #define MRU_STRING 0 /* this one's invented */
@ -221,7 +221,7 @@ static void check_reg_entries(const char *mrulist, const char**items)
} }
} }
static INT CALLBACK cmp_mru_strA(LPCVOID data1, LPCVOID data2) static int CALLBACK cmp_mru_strA(LPCSTR data1, LPCSTR data2)
{ {
return lstrcmpiA(data1, data2); return lstrcmpiA(data1, data2);
} }
@ -252,7 +252,7 @@ static void test_MRUListA(void)
infoA.fFlags = MRU_STRING; infoA.fFlags = MRU_STRING;
infoA.hKey = NULL; infoA.hKey = NULL;
infoA.lpszSubKey = REG_TEST_SUBKEYA; infoA.lpszSubKey = REG_TEST_SUBKEYA;
infoA.lpfnCompare = (PROC)cmp_mru_strA; infoA.lpfnCompare = cmp_mru_strA;
SetLastError(0); SetLastError(0);
hMRU = pCreateMRUListA(&infoA); hMRU = pCreateMRUListA(&infoA);
@ -266,7 +266,7 @@ static void test_MRUListA(void)
infoA.fFlags = MRU_STRING; infoA.fFlags = MRU_STRING;
infoA.hKey = NULL; infoA.hKey = NULL;
infoA.lpszSubKey = REG_TEST_SUBKEYA; infoA.lpszSubKey = REG_TEST_SUBKEYA;
infoA.lpfnCompare = (PROC)cmp_mru_strA; infoA.lpfnCompare = cmp_mru_strA;
SetLastError(0); SetLastError(0);
hMRU = pCreateMRUListA(&infoA); hMRU = pCreateMRUListA(&infoA);
@ -280,7 +280,7 @@ static void test_MRUListA(void)
infoA.fFlags = MRU_STRING; infoA.fFlags = MRU_STRING;
infoA.hKey = NULL; infoA.hKey = NULL;
infoA.lpszSubKey = REG_TEST_SUBKEYA; infoA.lpszSubKey = REG_TEST_SUBKEYA;
infoA.lpfnCompare = (PROC)cmp_mru_strA; infoA.lpfnCompare = cmp_mru_strA;
SetLastError(0); SetLastError(0);
hMRU = pCreateMRUListA(&infoA); hMRU = pCreateMRUListA(&infoA);
@ -294,7 +294,7 @@ static void test_MRUListA(void)
infoA.fFlags = MRU_STRING; infoA.fFlags = MRU_STRING;
infoA.hKey = NULL; infoA.hKey = NULL;
infoA.lpszSubKey = NULL; infoA.lpszSubKey = NULL;
infoA.lpfnCompare = (PROC)cmp_mru_strA; infoA.lpfnCompare = cmp_mru_strA;
SetLastError(0); SetLastError(0);
hMRU = pCreateMRUListA(&infoA); hMRU = pCreateMRUListA(&infoA);
@ -312,7 +312,7 @@ static void test_MRUListA(void)
infoA.fFlags = MRU_STRING; infoA.fFlags = MRU_STRING;
infoA.hKey = hKey; infoA.hKey = hKey;
infoA.lpszSubKey = REG_TEST_SUBKEYA; infoA.lpszSubKey = REG_TEST_SUBKEYA;
infoA.lpfnCompare = (PROC)cmp_mru_strA; infoA.lpfnCompare = cmp_mru_strA;
hMRU = pCreateMRUListA(&infoA); hMRU = pCreateMRUListA(&infoA);
ok(hMRU && !GetLastError(), ok(hMRU && !GetLastError(),