- Timestamp:
- Sep 18, 2000, 12:31:42 AM (25 years ago)
- Location:
- trunk/src/oleaut32
- Files:
-
- 6 edited
-
iPicture.cpp (modified) (11 diffs)
-
itypeinfo.cpp (modified) (3 diffs)
-
itypelib.cpp (modified) (6 diffs)
-
ole2disp.cpp (modified) (2 diffs)
-
typelib.cpp (modified) (5 diffs)
-
variant.cpp (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/oleaut32/iPicture.cpp
r1824 r4278 1 /* $Id: iPicture.cpp,v 1. 3 1999-11-23 20:45:23davidr Exp $ */1 /* $Id: iPicture.cpp,v 1.4 2000-09-17 22:31:40 davidr Exp $ */ 2 2 /* 3 3 * OLE Picture functions … … 230 230 231 231 // ---------------------------------------------------------------------- 232 // IPictureImpl_ QueryInterface232 // IPictureImpl_Destructor 233 233 // ---------------------------------------------------------------------- 234 234 static void IPictureImpl_Destructor(IPictureImpl * This) … … 578 578 unsigned int* pctinfo) 579 579 { 580 dprintf((" Stub"));580 dprintf(("%s: Stub", __FUNCTION__)); 581 581 return E_NOTIMPL; 582 582 } … … 588 588 UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) 589 589 { 590 dprintf((" Stub"));590 dprintf(("%s: Stub", __FUNCTION__)); 591 591 return E_NOTIMPL; 592 592 } … … 599 599 LCID lcid, DISPID* rgDispId) 600 600 { 601 dprintf((" Stub"));601 dprintf(("%s: Stub", __FUNCTION__)); 602 602 return E_NOTIMPL; 603 603 } … … 612 612 EXCEPINFO* pExepInfo, UINT* puArgErr) 613 613 { 614 dprintf((" Stub"));614 dprintf(("%s: Stub", __FUNCTION__)); 615 615 return E_NOTIMPL; 616 616 } … … 653 653 CLSID * pClassID) 654 654 { 655 dprintf((" Stub"));655 dprintf(("%s: Stub", __FUNCTION__)); 656 656 return E_NOTIMPL; 657 657 } … … 662 662 static HRESULT WINAPI IPictureImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) 663 663 { 664 dprintf((" Stub"));664 dprintf(("%s: Stub", __FUNCTION__)); 665 665 return E_NOTIMPL; 666 666 } … … 672 672 LPSTREAM pLoadStream) 673 673 { 674 dprintf((" Stub"));674 dprintf(("%s: Stub", __FUNCTION__)); 675 675 return E_NOTIMPL; 676 676 } … … 682 682 LPSTREAM pOutStream, BOOL fClearDirty) 683 683 { 684 dprintf((" Stub"));684 dprintf(("%s: Stub", __FUNCTION__)); 685 685 return E_NOTIMPL; 686 686 } … … 692 692 ULARGE_INTEGER * pcbSize) 693 693 { 694 dprintf((" Stub"));694 dprintf(("%s: Stub", __FUNCTION__)); 695 695 return E_NOTIMPL; 696 696 } -
trunk/src/oleaut32/itypeinfo.cpp
r3324 r4278 1 /* $Id: itypeinfo.cpp,v 1. 3 2000-04-05 22:28:47davidr Exp $ */1 /* $Id: itypeinfo.cpp,v 1.4 2000-09-17 22:31:41 davidr Exp $ */ 2 2 /* 3 3 * ITypeInfo interface … … 77 77 ITypeInfoImpl * pNew; 78 78 79 dprintf(("OLEAUT32: ITypeInfo()->Constructor()"));79 // dprintf(("OLEAUT32: ITypeInfo()->Constructor()")); 80 80 81 81 pNew = new ITypeInfoImpl; … … 119 119 // Go find the correct interface... 120 120 if (IsEqualIID(&IID_IUnknown, riid)) 121 { 121 122 *ppvObject = &(This->lpvtbl); 123 dprintf((" ->IUnknown")); 124 } 122 125 else if (IsEqualIID(&IID_ITypeInfo, riid)) 126 { 123 127 *ppvObject = &(This->lpvtbl); 128 dprintf((" ->ITypeInfo")); 129 } 124 130 else if (IsEqualIID(&IID_ITypeInfo2, riid)) 131 { 125 132 *ppvObject = &(This->lpvtbl); 133 dprintf((" ->ITypeInfo2")); 134 } 126 135 else 136 { 137 char tmp[50]; 138 139 WINE_StringFromCLSID(riid, tmp); 140 141 dprintf((" ->E_NOINTERFACE(%s)", tmp)); 127 142 return E_NOINTERFACE; 143 } 128 144 129 145 // Query Interface always increases the reference count by one... -
trunk/src/oleaut32/itypelib.cpp
r3324 r4278 1 /* $Id: itypelib.cpp,v 1. 3 2000-04-05 22:28:48davidr Exp $ */1 /* $Id: itypelib.cpp,v 1.4 2000-09-17 22:31:41 davidr Exp $ */ 2 2 /* 3 3 * ITypelib interface … … 54 54 ITypeLibImpl * pNew; 55 55 56 dprintf(("OLEAUT32: ITypeLib()->Constructor()"));56 // dprintf(("OLEAUT32: ITypeLib()->Constructor()")); 57 57 58 58 pNew = new ITypeLibImpl; … … 72 72 dprintf(("OLEAUT32: ITypeLibImpl(%p)->Destructor()", This)); 73 73 74 // TODO - ne ad to relase all substructures etc.74 // TODO - need to relase all substructures etc. 75 75 // delete This; 76 76 } … … 98 98 // Go find the correct interface... 99 99 if (IsEqualIID(&IID_IUnknown, riid)) 100 { 101 dprintf((" ->IUnknown")); 100 102 *ppvObject = &(This->lpvtbl); 103 } 101 104 else if (IsEqualIID(&IID_ITypeLib, riid)) 105 { 106 dprintf((" ->ITypeLib")); 102 107 *ppvObject = &(This->lpvtbl); 108 } 103 109 else if (IsEqualIID(&IID_ITypeLib2, riid)) 110 { 111 dprintf((" ->ITypeLib2")); 104 112 *ppvObject = &(This->lpvtbl); 113 } 105 114 else 115 { 116 char tmp[50]; 117 118 WINE_StringFromCLSID(riid, tmp); 119 120 dprintf((" ->E_NOINTERFACE(%s)", tmp)); 106 121 return E_NOINTERFACE; 122 } 107 123 108 124 // Query Interface always increases the reference count by one... … … 375 391 ICOM_THIS(ITypeLibImpl, iface); 376 392 377 dprintf(("OLEAUT32: ITypeLibImpl(%p)->IsName()\n", This));378 379 393 char * astr = HEAP_strdupWtoA( GetProcessHeap(), 0, szNameBuf ); 394 395 dprintf(("OLEAUT32: ITypeLibImpl(%p,%s)->IsName(%s)\n", This, This->szName, astr)); 396 380 397 BOOL fFound = IsNameSub(This, astr); 381 398 … … 607 624 return S_OK; 608 625 } 609 -
trunk/src/oleaut32/ole2disp.cpp
r3324 r4278 1 /* $Id: ole2disp.cpp,v 1. 3 2000-04-05 22:28:48davidr Exp $ */1 /* $Id: ole2disp.cpp,v 1.4 2000-09-17 22:31:41 davidr Exp $ */ 2 2 /* 3 3 * OLE2DISP library … … 228 228 BYTE b = HIBYTE(HIWORD(clr)); 229 229 230 TRACE("O leTranslateColor(%08lx, %d, %p)\n", clr, hpal, pColorRef);230 TRACE("OLEAUT32: OleTranslateColor(%08lx, %d, %p)\n", clr, hpal, pColorRef); 231 231 232 232 /* -
trunk/src/oleaut32/typelib.cpp
r3466 r4278 1 /* $Id: typelib.cpp,v 1.1 4 2000-04-30 17:05:51 sandervlExp $ */1 /* $Id: typelib.cpp,v 1.15 2000-09-17 22:31:41 davidr Exp $ */ 2 2 /* 3 3 * ITypelib interface … … 24 24 25 25 #define PRIVATE_LOGGING // Private logfile 26 #define DEBUG2 26 27 27 28 #include "oleaut32.h" … … 983 984 984 985 // Allocate BSTR container and then convert directly into it... 985 //???A Fix 986 //SvL: *pStringLen == -1 in MS Office 2k install 986 // SvL: *pStringLen == -1 in MS Office 2k install 987 // DjR: *pStringLen == -1 is used to denote VBA.vbNullString 988 // *pStringLen == 0 for a string that happens to be 0 length 989 // *pStringLen > 0 for a string with defined content. 987 990 if(*pStringLen == -1) 988 991 *pStringLen = 0; 992 989 993 V_UNION(pVar, bstrVal) = SysAllocStringLen(NULL, *pStringLen); 990 AsciiToUnicodeN(pString, V_UNION(pVar, bstrVal), *pStringLen); 994 995 if (*pStringLen != 0) // Save cluttering up logfile 996 AsciiToUnicodeN(pString, V_UNION(pVar, bstrVal), *pStringLen); 997 991 998 return; 992 999 } … … 1012 1019 default: 1013 1020 size = 0; 1014 dprintf((LOG, " VARTYPE %d is not supported, setting pointer to NULL\n", pVar->vt)); 1021 dprintf((LOG, 1022 " VARTYPE %d (%s) is not supported yet, setting to NULL\n", 1023 pVar->vt, 1024 VariantTypeAsString(pVar->vt))); 1015 1025 } 1016 1026 … … 1621 1631 LoadSt loadData; 1622 1632 1623 dprintf((LOG, "TypeLibExtract::Load( )"));1633 dprintf((LOG, "TypeLibExtract::Load(%s)", szFile)); 1624 1634 1625 1635 // Open file -
trunk/src/oleaut32/variant.cpp
r632 r4278 1 /* $Id: variant.cpp,v 1. 2 1999-08-22 22:08:50 sandervlExp $ */1 /* $Id: variant.cpp,v 1.3 2000-09-17 22:31:42 davidr Exp $ */ 2 2 /* 3 3 * VARIANT … … 233 233 int leapYear = 0; 234 234 235 236 237 238 239 235 /* Start at 1. This is the way DATE is defined. 236 * January 1, 1900 at Midnight is 1.00. 237 * January 1, 1900 at 6AM is 1.25. 238 * and so on. 239 */ 240 240 *pDateOut = 1; 241 241 … … 271 271 break; 272 272 case 3: 273 *pDateOut += ( 59 + leapYear);273 *pDateOut += (59 + leapYear); 274 274 break; 275 275 case 4: 276 *pDateOut += ( 90 + leapYear);276 *pDateOut += (90 + leapYear); 277 277 break; 278 278 case 5: 279 *pDateOut += ( 120 + leapYear);279 *pDateOut += (120 + leapYear); 280 280 break; 281 281 case 6: 282 *pDateOut += ( 151 + leapYear);282 *pDateOut += (151 + leapYear); 283 283 break; 284 284 case 7: 285 *pDateOut += ( 181 + leapYear);285 *pDateOut += (181 + leapYear); 286 286 break; 287 287 case 8: 288 *pDateOut += ( 212 + leapYear);288 *pDateOut += (212 + leapYear); 289 289 break; 290 290 case 9: 291 *pDateOut += ( 243 + leapYear);291 *pDateOut += (243 + leapYear); 292 292 break; 293 293 case 10: 294 *pDateOut += ( 273 + leapYear);294 *pDateOut += (273 + leapYear); 295 295 break; 296 296 case 11: 297 *pDateOut += ( 304 + leapYear);297 *pDateOut += (304 + leapYear); 298 298 break; 299 299 case 12: 300 *pDateOut += ( 334 + leapYear);300 *pDateOut += (334 + leapYear); 301 301 break; 302 302 } … … 366 366 * add the value to the year field. 367 367 */ 368 yearsSince1900 = floor( wholePart / DAYS_IN_ONE_YEAR);368 yearsSince1900 = floor( (wholePart / DAYS_IN_ONE_YEAR) + 0.001 ); 369 369 pTm->tm_year += yearsSince1900; 370 370 /* determine if this is a leap year. 371 371 */ 372 372 if( isleap( pTm->tm_year ) ) 373 { 373 374 leapYear = 1; 375 wholePart++; 376 } 377 374 378 /* find what day of that year does the "wholePart" corresponds to. 375 379 * Note: nDay is in [1-366] format … … 875 879 vtFrom = ps->vt & VT_TYPEMASK; 876 880 877 /* Note: Since "long" and "int" values both have 4 bytes and are both signed integers 878 * "int" will be treated as "long" in the following code. 879 * The same goes for there unsigned versions. 880 */ 881 881 /* Note: Since "long" and "int" values both have 4 bytes and are 882 * both signed integers "int" will be treated as "long" in the 883 * following code. 884 * The same goes for their unsigned versions. 885 */ 886 887 /* Trivial Case: If the coercion is from two types that are 888 * identical then we can blindly copy from one argument to another.*/ 889 if ((vt==vtFrom)) 890 { 891 return VariantCopy(pd,ps); 892 } 893 894 /* Cases requiring thought*/ 882 895 switch( vt ) 883 896 { 884 897 885 898 case( VT_EMPTY ): 886 899 res = VariantClear( pd ); 887 900 break; 888 901 case( VT_NULL ): 889 902 res = VariantClear( pd ); 890 903 if( res == S_OK ) … … 1693 1706 break; 1694 1707 case( VT_DISPATCH ): 1708 if(pvarg->u.pdispVal!=NULL) 1709 ICOM_CALL(Release,pvarg->u.pdispVal); 1695 1710 break; 1696 1711 case( VT_VARIANT ): 1712 VariantClear(pvarg->u.pvarVal); 1697 1713 break; 1698 1714 case( VT_UNKNOWN ): 1715 if(pvarg->u.punkVal!=NULL) 1716 ICOM_CALL(Release,pvarg->u.punkVal); 1699 1717 break; 1700 1718 case( VT_SAFEARRAY ): … … 1770 1788 break; 1771 1789 case( VT_DISPATCH ): 1790 pvargDest->u.pdispVal = pvargSrc->u.pdispVal; 1791 if (pvargDest->u.pdispVal!=NULL) 1792 ICOM_CALL(AddRef,pvargDest->u.pdispVal); 1772 1793 break; 1773 1794 case( VT_VARIANT ): 1795 VariantCopy(pvargDest->u.pvarVal,pvargSrc->u.pvarVal); 1774 1796 break; 1775 1797 case( VT_UNKNOWN ): 1798 pvargDest->u.punkVal = pvargSrc->u.punkVal; 1799 if (pvargDest->u.pdispVal!=NULL) 1800 ICOM_CALL(AddRef,pvargDest->u.punkVal); 1776 1801 break; 1777 1802 case( VT_SAFEARRAY ): … … 3246 3271 } 3247 3272 3248 if( lcid& VAR_DATEVALUEONLY )3249 strftime( pBuffer, BUFFER_MAX, "% x", &TM );3250 else if( lcid& VAR_TIMEVALUEONLY )3251 strftime( pBuffer, BUFFER_MAX, "% X", &TM );3273 if( dwFlags & VAR_DATEVALUEONLY ) 3274 strftime( pBuffer, BUFFER_MAX, "%lx", &TM ); 3275 else if( dwFlags & VAR_TIMEVALUEONLY ) 3276 strftime( pBuffer, BUFFER_MAX, "%lX", &TM ); 3252 3277 else 3253 strftime( pBuffer, BUFFER_MAX, "% x %X", &TM );3278 strftime( pBuffer, BUFFER_MAX, "%lx %lX", &TM ); 3254 3279 3255 3280 *pbstrOut = StringDupAtoBstr( pBuffer ); … … 3448 3473 if( ret == S_OK ) 3449 3474 { 3450 // if( strncasecmp( pNewString, "True", strlen( pNewString ) ) == 0 ) 3451 if( stricmp( pNewString, "True" ) == 0 ) 3475 if( strncasecmp( pNewString, "True", strlen( pNewString ) ) == 0 ) 3452 3476 { 3453 3477 *pboolOut = VARIANT_TRUE; 3454 3478 } 3455 // else if( strncasecmp( pNewString, "False", strlen( pNewString ) ) == 0 ) 3456 if( stricmp( pNewString, "False" ) == 0 ) 3479 else if( strncasecmp( pNewString, "False", strlen( pNewString ) ) == 0 ) 3457 3480 { 3458 3481 *pboolOut = VARIANT_FALSE; … … 4296 4319 } 4297 4320 4321
Note:
See TracChangeset
for help on using the changeset viewer.
