shell32/tests: Updated Windows 7 has a new IShellDispatch6 in its typelib.
Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
c32cd1119c
commit
b670fc2c6d
|
@ -28,6 +28,8 @@
|
||||||
#include "winsvc.h"
|
#include "winsvc.h"
|
||||||
#include "wine/test.h"
|
#include "wine/test.h"
|
||||||
|
|
||||||
|
#include "initguid.h"
|
||||||
|
|
||||||
#define EXPECT_HR(hr,hr_exp) \
|
#define EXPECT_HR(hr,hr_exp) \
|
||||||
ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp)
|
ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp)
|
||||||
|
|
||||||
|
@ -38,6 +40,9 @@ static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*);
|
||||||
static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *);
|
static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *);
|
||||||
static DWORD (WINAPI *pGetLongPathNameW)(LPCWSTR, LPWSTR, DWORD);
|
static DWORD (WINAPI *pGetLongPathNameW)(LPCWSTR, LPWSTR, DWORD);
|
||||||
|
|
||||||
|
/* Updated Windows 7 has a new IShellDispatch6 in its typelib */
|
||||||
|
DEFINE_GUID(IID_IWin7ShellDispatch6, 0x34936ba1, 0x67ad, 0x4c41, 0x99,0xb8, 0x8c,0x12,0xdf,0xf1,0xe9,0x74);
|
||||||
|
|
||||||
static void init_function_pointers(void)
|
static void init_function_pointers(void)
|
||||||
{
|
{
|
||||||
HMODULE hshell32, hkernel32;
|
HMODULE hshell32, hkernel32;
|
||||||
|
@ -530,6 +535,7 @@ static void test_ShellFolderViewDual(void)
|
||||||
&IID_IShellDispatch5,
|
&IID_IShellDispatch5,
|
||||||
&IID_IShellDispatch4,
|
&IID_IShellDispatch4,
|
||||||
&IID_IShellDispatch2,
|
&IID_IShellDispatch2,
|
||||||
|
&IID_IWin7ShellDispatch6,
|
||||||
&IID_NULL
|
&IID_NULL
|
||||||
};
|
};
|
||||||
IShellFolderViewDual *viewdual;
|
IShellFolderViewDual *viewdual;
|
||||||
|
|
Loading…
Reference in New Issue