Skip to content

W
wine-winehq
Commit 9f56598f authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

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

parent 5b19a559
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
dlls/comctl32/tests/mru.c
View file @ 9f56598f
...@@ -45,7 +45,7 @@ typedef struct tagMRUINFOA ...@@ -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 ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment