shell32: Microsoft's EXP_DARWIN_LINK structure does not have a dbh field so cast it to DATABLOCK_HEADER to access the dwSignature field. Fixes the compilation with Visual C++ on Windows.

Francois Gouget fgouget at free.fr
Tue Oct 3 07:12:18 CDT 2006


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

diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index aaf0283..174c95f 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -32,11 +32,6 @@ #include "wine/test.h"
 
 #include "shell32_test.h"
 
-#ifndef _MSC_VER
-#define DBH(x)  (x).dbh
-#else
-#define DBH(x)  (x)
-#endif
 
 typedef void (WINAPI *fnILFree)(LPITEMIDLIST);
 typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
@@ -612,7 +607,7 @@ static void test_datalink(void)
     r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar );
     ok( r == S_OK, "CopyDataBlock failed\n");
 
-    ok( dar && DBH(*dar).dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n");
+    ok( dar && ((DATABLOCK_HEADER*)dar)->dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n");
     ok( dar && 0==lstrcmpW(dar->szwDarwinID, comp ), "signature wrong\n");
 
     LocalFree( dar );
-- 
1.4.1.1




More information about the wine-patches mailing list