Changeset 21916 for trunk/src/ole32/memlockbytes.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/memlockbytes.c (modified) (10 diffs)

trunk

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

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

trunk/src/ole32/memlockbytes.c

@@ -234 +234 @@
      * Initialize the size of the array to the size of the handle.
      */
-    newLockBytes->byteArraySize.s.HighPart = 0;
-    newLockBytes->byteArraySize.s.LowPart  = GlobalSize(
+    newLockBytes->byteArraySize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newLockBytes->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart  = GlobalSize(
                                               newLockBytes->supportHandle);
   }
@@ -384 +384 @@
    * Make sure the offset is valid.
    */
-  if (ulOffset.s.LowPart > This->byteArraySize.s.LowPart)
+  if (ulOffset.DUMMYSTRUCTNAME_DOT LowPart > This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart)
     return E_FAIL;
 
@@ -391 +391 @@
    * to read.
    */
-  bytesToReadFromBuffer = min(This->byteArraySize.s.LowPart -
-                              ulOffset.s.LowPart, cb);
+  bytesToReadFromBuffer = min(This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart -
+                              ulOffset.DUMMYSTRUCTNAME_DOT LowPart, cb);
 
   /*
@@ -400 +400 @@
 
   memcpy(pv,
-         (char *) supportBuffer + ulOffset.s.LowPart,
+         (char *) supportBuffer + ulOffset.DUMMYSTRUCTNAME_DOT LowPart,
          bytesToReadFromBuffer);
 
@@ -459 +459 @@
   else
   {
-    newSize.s.HighPart = 0;
-    newSize.s.LowPart = ulOffset.s.LowPart + cb;
+    newSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newSize.DUMMYSTRUCTNAME_DOT LowPart = ulOffset.DUMMYSTRUCTNAME_DOT LowPart + cb;
   }
 
@@ -466 +466 @@
    * Verify if we need to grow the stream
    */
-  if (newSize.s.LowPart > This->byteArraySize.s.LowPart)
+  if (newSize.DUMMYSTRUCTNAME_DOT LowPart > This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart)
   {
     /* grow stream */
@@ -478 +478 @@
   supportBuffer = GlobalLock(This->supportHandle);
 
-  memcpy((char *) supportBuffer + ulOffset.s.LowPart, pv, cb);
+  memcpy((char *) supportBuffer + ulOffset.DUMMYSTRUCTNAME_DOT LowPart, pv, cb);
 
   /*
@@ -519 +519 @@
    * As documented.
    */
-  if (libNewSize.s.HighPart != 0)
+  if (libNewSize.DUMMYSTRUCTNAME_DOT HighPart != 0)
     return STG_E_INVALIDFUNCTION;
 
-  if (This->byteArraySize.s.LowPart == libNewSize.s.LowPart)
+  if (This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart == libNewSize.DUMMYSTRUCTNAME_DOT LowPart)
     return S_OK;
 
@@ -529 +529 @@
    */
   This->supportHandle = GlobalReAlloc(This->supportHandle,
-                                      libNewSize.s.LowPart,
+                                      libNewSize.DUMMYSTRUCTNAME_DOT LowPart,
                                       0);
 
@@ -535 +535 @@
     return STG_E_MEDIUMFULL;
 
-  This->byteArraySize.s.LowPart = libNewSize.s.LowPart;
+  This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart = libNewSize.DUMMYSTRUCTNAME_DOT LowPart;
 
   return S_OK;

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