shell32/tests: Use the IShellLinkDataList's standard 'C' interface. (try3)
Francois Gouget
fgouget at free.fr
Tue Feb 26 09:28:10 CST 2008
---
It turns out it's not alpine that was corrupting the patch (this time),
but it's another patch I had on that file that was causing trouble.
Sorry for that. It goes to show I should really try to get back to these
older patches and finish them or drop them.
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");
--
1.5.4.1
More information about the wine-patches
mailing list