shell32/tests: Make tests run again on win95.
This commit is contained in:
parent
8d80b1323a
commit
f076919ca8
@ -41,6 +41,8 @@ static fnILFree pILFree;
|
|||||||
static fnILIsEqual pILIsEqual;
|
static fnILIsEqual pILIsEqual;
|
||||||
static fnSHILCreateFromPath pSHILCreateFromPath;
|
static fnSHILCreateFromPath pSHILCreateFromPath;
|
||||||
|
|
||||||
|
static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD);
|
||||||
|
|
||||||
static const GUID _IID_IShellLinkDataList = {
|
static const GUID _IID_IShellLinkDataList = {
|
||||||
0x45e2b4ae, 0xb1c3, 0x11d0,
|
0x45e2b4ae, 0xb1c3, 0x11d0,
|
||||||
{ 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1 }
|
{ 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1 }
|
||||||
@ -563,7 +565,7 @@ static void test_load_save(void)
|
|||||||
/* Create a temporary non-executable file */
|
/* Create a temporary non-executable file */
|
||||||
r=GetTempPath(sizeof(mypath), mypath);
|
r=GetTempPath(sizeof(mypath), mypath);
|
||||||
ok(r>=0 && r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError());
|
ok(r>=0 && r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError());
|
||||||
r=GetLongPathName(mypath, mydir, sizeof(mydir));
|
r=pGetLongPathNameA(mypath, mydir, sizeof(mydir));
|
||||||
ok(r>=0 && r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError());
|
ok(r>=0 && r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError());
|
||||||
p=strrchr(mydir, '\\');
|
p=strrchr(mydir, '\\');
|
||||||
if (p)
|
if (p)
|
||||||
@ -681,13 +683,15 @@ static void test_datalink(void)
|
|||||||
START_TEST(shelllink)
|
START_TEST(shelllink)
|
||||||
{
|
{
|
||||||
HRESULT r;
|
HRESULT r;
|
||||||
HMODULE hmod;
|
HMODULE hmod = GetModuleHandleA("shell32.dll");
|
||||||
|
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
|
||||||
|
|
||||||
hmod = GetModuleHandle("shell32");
|
|
||||||
pILFree = (fnILFree) GetProcAddress(hmod, (LPSTR)155);
|
pILFree = (fnILFree) GetProcAddress(hmod, (LPSTR)155);
|
||||||
pILIsEqual = (fnILIsEqual) GetProcAddress(hmod, (LPSTR)21);
|
pILIsEqual = (fnILIsEqual) GetProcAddress(hmod, (LPSTR)21);
|
||||||
pSHILCreateFromPath = (fnSHILCreateFromPath) GetProcAddress(hmod, (LPSTR)28);
|
pSHILCreateFromPath = (fnSHILCreateFromPath) GetProcAddress(hmod, (LPSTR)28);
|
||||||
|
|
||||||
|
pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA");
|
||||||
|
|
||||||
r = CoInitialize(NULL);
|
r = CoInitialize(NULL);
|
||||||
ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);
|
ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);
|
||||||
if (!SUCCEEDED(r))
|
if (!SUCCEEDED(r))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user