shell32/tests: Get rid of unneeded function typedefs.
This commit is contained in:
parent
74605efe74
commit
ef6f3a30cc
|
@ -37,15 +37,10 @@
|
||||||
# define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */
|
# define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef void (WINAPI *fnILFree)(LPITEMIDLIST);
|
static void (WINAPI *pILFree)(LPITEMIDLIST);
|
||||||
typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
|
static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
|
||||||
typedef HRESULT (WINAPI *fnSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*);
|
static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*);
|
||||||
typedef HRESULT (WINAPI *fnSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT);
|
static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT);
|
||||||
|
|
||||||
static fnILFree pILFree;
|
|
||||||
static fnILIsEqual pILIsEqual;
|
|
||||||
static fnSHILCreateFromPath pSHILCreateFromPath;
|
|
||||||
static fnSHDefExtractIconA pSHDefExtractIconA;
|
|
||||||
|
|
||||||
static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD);
|
static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD);
|
||||||
static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD);
|
static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD);
|
||||||
|
@ -1005,10 +1000,10 @@ START_TEST(shelllink)
|
||||||
HMODULE hmod = GetModuleHandleA("shell32.dll");
|
HMODULE hmod = GetModuleHandleA("shell32.dll");
|
||||||
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
|
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
|
||||||
|
|
||||||
pILFree = (fnILFree) GetProcAddress(hmod, (LPSTR)155);
|
pILFree = (void *)GetProcAddress(hmod, (LPSTR)155);
|
||||||
pILIsEqual = (fnILIsEqual) GetProcAddress(hmod, (LPSTR)21);
|
pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21);
|
||||||
pSHILCreateFromPath = (fnSHILCreateFromPath) GetProcAddress(hmod, (LPSTR)28);
|
pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28);
|
||||||
pSHDefExtractIconA = (fnSHDefExtractIconA) GetProcAddress(hmod, "SHDefExtractIconA");
|
pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA");
|
||||||
|
|
||||||
pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA");
|
pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA");
|
||||||
pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA");
|
pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA");
|
||||||
|
|
Loading…
Reference in New Issue