Changeset 6507 for trunk/src

Timestamp:

Aug 10, 2001, 9:28:47 PM (24 years ago)

Author:

sandervl

Message:

update

Location:

trunk/src/oleaut32

Files:

• iPicture.cpp (deleted)
• iPicture.h (deleted)
• iPictureBmp.cpp (deleted)
• iPictureEmf.cpp (deleted)
• iPictureIcon.cpp (deleted)
• iPictureMeta.cpp (deleted)
• iPictureNone.cpp (deleted)
• itypecomp.cpp (deleted)
• itypeinfo.cpp (deleted)
• itypelib.cpp (deleted)
• itypelib.h (deleted)
• safearray.c (modified) (9 diffs)
• typelib.h (added)
• variant.c (modified) (1 diff)

trunk/src/oleaut32/safearray.c

@@ -142 +142 @@
   ULONG  ulWholeArraySize;   /* to store the size of the whole thing */
 
+  dprintf(("SafeArrayAllocData %x", psa));
+
   if(! validArg(psa)) 
     return E_INVALIDARG;
@@ -170 +172 @@
   HRESULT   hRes;
   USHORT    cDim;
+
+  dprintf(("SafeArrayCreate %x %d %x", vt, cDims, rgsabound));
 
   /* Validate supported VARTYPE */
@@ -210 +214 @@
   SAFEARRAY *psa)
 {
+  dprintf(("SafeArrayDestroyDescriptor %x", psa));
+
   /* Check for lockness before to free... */
   if(psa->cLocks > 0) 
@@ -233 +239 @@
   SAFEARRAY *psa)
 {
+  dprintf(("SafeArrayLock %x", psa));
+
   if(! validArg(psa))     
     return E_INVALIDARG;
@@ -248 +256 @@
   SAFEARRAY *psa)
 {
+  dprintf(("SafeArrayUnlock %x", psa));
+
   if(! validArg(psa)) 
     return E_INVALIDARG;
@@ -271 +281 @@
   PVOID elementStorageAddress = NULL; /* Adress to store the data */
   BSTR  pbstrReAllocStr     = NULL; /* BSTR reallocated */
+
+  dprintf(("SafeArrayPutElement %x %x %x", psa, rgIndices, pv));
 
   /* Validate the index given */
@@ -328 +340 @@
   PVOID elementStorageAddress = NULL; /* Adress to store the data */
   BSTR  pbstrReturnedStr    = NULL; /* BSTR reallocated */
+
+  dprintf(("SafeArrayGetElement %x %x %x", psa, rgIndices, pv));
 
   if(! validArg(psa)) 
@@ -373 +387 @@
   LONG      *plUbound)
 {
+
+  dprintf(("SafeArrayGetUBound %x %x %x", psa, nDim, plUbound));
+
   if(! validArg(psa))   
     return E_INVALIDARG;
@@ -791 +808 @@
   /* Check whether the size of the chunk makes sense... That's the only thing
      I can think of now... */
-
   psaSize = HeapSize(GetProcessHeap(), 0, psa);
   if (psaSize == -1)

trunk/src/oleaut32/variant.c

@@ -48 +48 @@
 
 DEFAULT_DEBUG_CHANNEL(ole);
-
-#ifdef __WIN32OS2__
-#undef FIXME
-#undef TRACE
-#ifdef DEBUG
-#define FIXME WriteLogNoEOL("FIXME %s: ", __FUNCTION__); WriteLog
-#define TRACE WriteLogNoEOL("%s", __FUNCTION__); WriteLog
-#else
-#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#endif
-#endif
 
 #ifndef FLT_MAX