Francois Gouget : shell32/tests: Get rid of unneeded function typedefs.
Alexandre Julliard
julliard at winehq.org
Fri Jun 15 13:34:40 CDT 2012
Module: wine
Branch: master
Commit: ef6f3a30cc88ef4cbec79433f234de8b2fe1fe9b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6f3a30cc88ef4cbec79433f234de8b2fe1fe9b
Author: Francois Gouget <fgouget at free.fr>
Date: Fri Jun 15 15:20:30 2012 +0200
shell32/tests: Get rid of unneeded function typedefs.
---
dlls/shell32/tests/shelllink.c | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index d28cff0..8c6275d 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -37,15 +37,10 @@
# define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */
#endif
-typedef void (WINAPI *fnILFree)(LPITEMIDLIST);
-typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
-typedef HRESULT (WINAPI *fnSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*);
-typedef HRESULT (WINAPI *fnSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT);
-
-static fnILFree pILFree;
-static fnILIsEqual pILIsEqual;
-static fnSHILCreateFromPath pSHILCreateFromPath;
-static fnSHDefExtractIconA pSHDefExtractIconA;
+static void (WINAPI *pILFree)(LPITEMIDLIST);
+static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
+static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*);
+static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT);
static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD);
static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD);
@@ -1005,10 +1000,10 @@ START_TEST(shelllink)
HMODULE hmod = GetModuleHandleA("shell32.dll");
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
- pILFree = (fnILFree) GetProcAddress(hmod, (LPSTR)155);
- pILIsEqual = (fnILIsEqual) GetProcAddress(hmod, (LPSTR)21);
- pSHILCreateFromPath = (fnSHILCreateFromPath) GetProcAddress(hmod, (LPSTR)28);
- pSHDefExtractIconA = (fnSHDefExtractIconA) GetProcAddress(hmod, "SHDefExtractIconA");
+ pILFree = (void *)GetProcAddress(hmod, (LPSTR)155);
+ pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21);
+ pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28);
+ pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA");
pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA");
pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA");
More information about the wine-cvs
mailing list