Huw Davies : ole32: Rename structure member to target device size.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 32766b5253b36b407e0a68452a292312fd65c1b0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=32766b5253b36b407e0a68452a...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Wed Nov 22 08:30:51 2017 +0000

ole32: Rename structure member to target device size.

Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ole32/datacache.c  |  5 +++--
 dlls/ole32/tests/ole2.c | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index 48453b4..0256957 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -79,7 +79,8 @@ typedef struct PresentationDataHeader
    *  DWORD length;
    *  CHAR format_name[length]; (null-terminated)
    */
-  DWORD unknown3;	/* 4, possibly TYMED_ISTREAM */
+  DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD)
+                   then there are tdSize - sizeof(DWORD) more bytes before dvAspect */
   DVASPECT dvAspect;
   DWORD lindex;
   DWORD advf;
@@ -808,7 +809,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag
 
     if (cache_entry->fmtetc.ptd)
         FIXME("ptd not serialized\n");
-    header.unknown3 = 4;
+    header.tdSize = sizeof(header.tdSize);
     header.dvAspect = cache_entry->fmtetc.dwAspect;
     header.lindex = cache_entry->fmtetc.lindex;
     header.advf = cache_entry->advise_flags;
diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c
index 07157a7..a72985e 100644
--- a/dlls/ole32/tests/ole2.c
+++ b/dlls/ole32/tests/ole2.c
@@ -143,7 +143,8 @@ typedef struct PresentationDataHeader
      *  DWORD length;
      *  CHAR format_name[length]; (null-terminated)
      */
-    DWORD unknown3; /* 4, possibly TYMED_ISTREAM */
+    DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD)
+                     then there are tdSize - sizeof(DWORD) more bytes before dvAspect */
     DVASPECT dvAspect;
     DWORD lindex;
     DWORD advf;
@@ -1279,7 +1280,7 @@ static void test_OleLoad(IStorage *pStorage)
                 break;
             }
 
-            header.unknown3 = 4;
+            header.tdSize = sizeof(header.tdSize);
             header.dvAspect = DVASPECT_CONTENT;
             header.lindex = -1;
             header.advf = 1 << i;
@@ -3691,7 +3692,7 @@ static void test_data_cache_save(void)
     hr = IStream_Write(stm, clipformat, sizeof(clipformat), NULL);
     ok(hr == S_OK, "unexpected %#x\n", hr);
 
-    hdr.unknown3 = 4;
+    hdr.tdSize = sizeof(hdr.tdSize);
     hdr.dvAspect = DVASPECT_CONTENT;
     hdr.lindex = -1;
     hdr.advf = ADVF_PRIMEFIRST;
@@ -3966,8 +3967,8 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_
             ok(bytes >= 24, "read %u bytes\n", bytes);
 
             if (winetest_debug > 1)
-                trace("header: unknown3 %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n",
-                    header.unknown3, header.dvAspect, header.lindex, header.advf, header.unknown7,
+                trace("header: tdSize %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n",
+                    header.tdSize, header.dvAspect, header.lindex, header.advf, header.unknown7,
                     header.dwObjectExtentX, header.dwObjectExtentY, header.dwSize);
         }
 
@@ -4049,7 +4050,7 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def)
             }
             ok(hr == S_OK, "unexpected %#x\n", hr);
 
-            hdr.unknown3 = 4;
+            hdr.tdSize = sizeof(hdr.tdSize);
             hdr.dvAspect = stg_def->stream[i].dvAspect;
             hdr.lindex = -1;
             hdr.advf = stg_def->stream[i].advf;