Francois Gouget : shell32: Microsoft' s EXP_DARWIN_LINK structure does not have a dbh

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c22eb7e3a3b9ffa43227e10f3fbb7b4bf9cb8d1e
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=c22eb7e3a3b9ffa43227e10f...

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Tue Oct  3 14:12:18 2006 +0200

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.

---

 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 );