shell32/tests: Use the IShellLinkDataList's standard 'C' interface.

Francois Gouget fgouget at free.fr
Tue Feb 26 05:14:31 CST 2008


---

Hopefully the patch will apply fine this time.

 dlls/shell32/tests/shelllink.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index 4e5ac2b..045492b 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -328,11 +328,11 @@ static void test_get_set(void)
     if (dl)
     {
         DWORD flags = 0;
-        r = dl->lpVtbl->GetFlags( dl, &flags );
+        r = IShellLinkDataList_GetFlags( dl, &flags );
         ok( r == S_OK, "GetFlags failed\n");
 
         flags|=SLDF_HAS_EXP_SZ | SLDF_HAS_EXP_ICON_SZ;
-        r = dl->lpVtbl->SetFlags( dl, flags );
+        r = IShellLinkDataList_SetFlags( dl, flags );
         ok( r == S_OK, "SetFlags failed\n");
 
         strcpy(buffer,"garbage");
@@ -702,12 +702,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");
 
@@ -716,17 +716,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