Francois Gouget : urlmon: Fix compilation on systems that don' t support nameless unions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 988be5dd8f75957e783d2d3b54bcf61302453331
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=988be5dd8f75957e783d2d3b54...

Author: Francois Gouget 
Date:   Wed Aug  8 10:48:45 2007 +0200

urlmon: Fix compilation on systems that don't support nameless unions.

---

dlls/urlmon/http.c           |    3 ++-
 dlls/urlmon/tests/protocol.c |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c
index 8dc3432..08d6419 100644
--- a/dlls/urlmon/http.c
+++ b/dlls/urlmon/http.c
@@ -25,6 +25,7 @@
 #include <stdarg.h>

#define COBJMACROS
+#define NONAMELESSUNION

#include "windef.h"
 #include "winbase.h"
@@ -516,7 +517,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
             WARN("Expected This->bind_info.stgmedData.tymed to be TYMED_HGLOBAL, not %d\n",
                  This->bind_info.stgmedData.tymed);
         else
-            optional = (LPWSTR)This->bind_info.stgmedData.hGlobal;
+            optional = (LPWSTR)This->bind_info.stgmedData.u.hGlobal;
     }
     if (!HttpSendRequestW(This->request, This->full_header, lstrlenW(This->full_header),
                           optional,
diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 72cb2fc..13b0f15 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -547,14 +547,14 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB
     {
         /* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly
          * with urlmon on native (Win98 and WinXP) */
-        pbindinfo->stgmedData.hGlobal = GlobalAlloc(GPTR, sizeof(szPostData));
-        if (!pbindinfo->stgmedData.hGlobal)
+        U(pbindinfo->stgmedData).hGlobal = GlobalAlloc(GPTR, sizeof(szPostData));
+        if (!U(pbindinfo->stgmedData).hGlobal)
         {
             http_post_test = FALSE;
             skip("Out of memory\n");
             return E_OUTOFMEMORY;
         }
-        lstrcpy((LPSTR)pbindinfo->stgmedData.hGlobal, szPostData);
+        lstrcpy((LPSTR)U(pbindinfo->stgmedData).hGlobal, szPostData);
         pbindinfo->cbstgmedData = sizeof(szPostData)-1;
         pbindinfo->dwBindVerb = BINDVERB_POST;
         pbindinfo->stgmedData.tymed = TYMED_HGLOBAL;