Francois Gouget : shell32/tests: Use the IShellLinkDataList's standard 'C' interface.
Alexandre Julliard
julliard at winehq.org
Wed Feb 27 08:03:02 CST 2008
Module: wine
Branch: master
Commit: e98a468ebe1ac026153b2e8a970412ae158cd813
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98a468ebe1ac026153b2e8a970412ae158cd813
Author: Francois Gouget <fgouget at free.fr>
Date: Tue Feb 26 16:28:10 2008 +0100
shell32/tests: Use the IShellLinkDataList's standard 'C' interface.
---
dlls/shell32/tests/shelllink.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index f5a0dac..9b61c38 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -650,12 +650,12 @@ static void test_datalink(void)
}
flags = 0;
- r = dl->lpVtbl->GetFlags( dl, &flags );
+ r = IShellLinkDataList_GetFlags( dl, &flags );
ok( r == S_OK, "GetFlags failed\n");
ok( flags == 0, "GetFlags returned wrong flags\n");
dar = (void*)-1;
- r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar );
+ r = IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar );
ok( r == E_FAIL, "CopyDataBlock failed\n");
ok( dar == NULL, "should be null\n");
@@ -664,17 +664,17 @@ static void test_datalink(void)
/*
* The following crashes:
- * r = dl->lpVtbl->GetFlags( dl, NULL );
+ * r = IShellLinkDataList_GetFlags( dl, NULL );
*/
flags = 0;
- r = dl->lpVtbl->GetFlags( dl, &flags );
+ r = IShellLinkDataList_GetFlags( dl, &flags );
ok( r == S_OK, "GetFlags failed\n");
ok( flags == (SLDF_HAS_DARWINID|SLDF_HAS_LOGO3ID),
"GetFlags returned wrong flags\n");
dar = NULL;
- r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar );
+ r = IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar );
ok( r == S_OK, "CopyDataBlock failed\n");
ok( dar && ((DATABLOCK_HEADER*)dar)->dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n");
More information about the wine-cvs
mailing list