Changeset 21916 for trunk/src/ole32/clipboard.c

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/ole32/clipboard.c (modified) (6 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/ole32/clipboard.c

@@ -937 +937 @@
     hStorage = GlobalAlloc(GMEM_SHARE|GMEM_MOVEABLE, 0);
     hr = CreateILockBytesOnHGlobal(hStorage, FALSE, &ptrILockBytes);
-    hr = StgCreateDocfileOnILockBytes(ptrILockBytes, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &std.u.pstg);
+    hr = StgCreateDocfileOnILockBytes(ptrILockBytes, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &std.DUMMYUNIONNAME_DOT pstg);
 
     if (FAILED(hr = IDataObject_GetDataHere(theOleClipboard->pIDataObjectSrc, pFormatetc, &std)))
@@ -964 +964 @@
       if (!FAILED(hr = IDataObject_GetData(theOleClipboard->pIDataObjectSrc, &fmt2, &std2)))
       {
-        mfp = (METAFILEPICT *)GlobalLock(std2.u.hGlobal);
+        mfp = (METAFILEPICT *)GlobalLock(std2.DUMMYUNIONNAME_DOT hGlobal);
       }
 
@@ -994 +994 @@
         pdh.dwSize = nSize;
 
-        hr = IStorage_CreateStream(std.u.pstg, name, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &pStream);
+        hr = IStorage_CreateStream(std.DUMMYUNIONNAME_DOT pstg, name, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &pStream);
 
         hr = IStream_Write(pStream, &pdh, sizeof(PresentationDataHeader), NULL);
@@ -1007 +1007 @@
         HeapFree(GetProcessHeap(), 0, mfBits);
 
-        GlobalUnlock(std2.u.hGlobal);
-
-        ReadClassStg(std.u.pstg, &clsID);
+        GlobalUnlock(std2.DUMMYUNIONNAME_DOT hGlobal);
+
+        ReadClassStg(std.DUMMYUNIONNAME_DOT pstg, &clsID);
         ProgIDFromCLSID(&clsID, &strProgID);
 
         WideCharToMultiByte( CP_ACP, 0, strProgID, -1, strOleTypeName, sizeof(strOleTypeName), NULL, NULL );
-        OLECONVERT_CreateOleStream(std.u.pstg);
-        OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName);
+        OLECONVERT_CreateOleStream(std.DUMMYUNIONNAME_DOT pstg);
+        OLECONVERT_CreateCompObjStream(std.DUMMYUNIONNAME_DOT pstg, strOleTypeName);
       }
     }
@@ -1028 +1028 @@
     /* To put a copy back on the clipboard */
 
-    hStorage = std.u.hGlobal;
+    hStorage = std.DUMMYUNIONNAME_DOT hGlobal;
   }
 
@@ -1278 +1278 @@
    */
   pmedium->tymed = (hData == 0) ? TYMED_NULL : TYMED_HGLOBAL;
-  pmedium->u.hGlobal = (HGLOBAL)hData;
+  pmedium->DUMMYUNIONNAME_DOT hGlobal = (HGLOBAL)hData;
   pmedium->pUnkForRelease = NULL;
 

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk