November 2009 - Wine-Commits

Vincent Povirk : ole32: Rename StorageUtl_CopyPropertyToSTATSTG.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 1bd2617c7a8b919735ba253710c463dca9740950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd2617c7a8b919735ba25371… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:49:47 2009 -0600 ole32: Rename StorageUtl_CopyPropertyToSTATSTG. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 6 +++--- dlls/ole32/storage32.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 781649c..4cc114a 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -860,7 +860,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( { StorageImpl *root = This->parentStorage->ancestorStorage; - StorageUtl_CopyPropertyToSTATSTG(pstatstg, + StorageUtl_CopyDirEntryToSTATSTG(pstatstg, &curProperty, grfStatFlag); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0639599..fa2980c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -657,7 +657,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( if (readSuccessful) { - StorageUtl_CopyPropertyToSTATSTG( + StorageUtl_CopyDirEntryToSTATSTG( pstatstg, &curProperty, grfStatFlag); @@ -3621,7 +3621,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( /* * Copy the information to the return buffer. */ - StorageUtl_CopyPropertyToSTATSTG(currentReturnStruct, + StorageUtl_CopyDirEntryToSTATSTG(currentReturnStruct, &currentProperty, STATFLAG_DEFAULT); @@ -4050,7 +4050,7 @@ void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value) memcpy(buffer+offset+8, value->Data4, sizeof(value->Data4)); } -void StorageUtl_CopyPropertyToSTATSTG( +void StorageUtl_CopyDirEntryToSTATSTG( STATSTG* destination, const DirEntry* source, int statFlags) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 405301c..090f8b5 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -419,7 +419,7 @@ void StorageUtl_WriteULargeInteger(BYTE* buffer, ULONG offset, const ULARGE_INTEGER *value); void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value); void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value); -void StorageUtl_CopyPropertyToSTATSTG(STATSTG* destination, const DirEntry* source, +void StorageUtl_CopyDirEntryToSTATSTG(STATSTG* destination, const DirEntry* source, int statFlags); /****************************************************************************

1 0

Juan Lang : crypt32/tests: Fix test failures.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 4d2c9c3e87fd1713bfbf785b7bbdb06349bcfbcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2c9c3e87fd1713bfbf785b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 11:22:45 2009 -0800 crypt32/tests: Fix test failures. --- dlls/crypt32/tests/encode.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9c2d739..f2fc727 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1714,8 +1714,10 @@ static void test_decodeAltName(DWORD dwEncoding) NULL, &buf, &bufSize); /* Fails on WinXP with CRYPT_E_ASN1_RULE. I'm not too concerned about the * particular failure, just that it doesn't decode. + * It succeeds on (broken) Windows versions that haven't addressed + * embedded NULLs in alternate names. */ - ok(!ret, "expected failure\n"); + ok(!ret || broken(ret), "expected failure\n"); /* An embedded bell character is allowed, however. */ ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, dns_embedded_bell, sizeof(dns_embedded_bell), CRYPT_DECODE_ALLOC_FLAG, @@ -1737,8 +1739,10 @@ static void test_decodeAltName(DWORD dwEncoding) NULL, &buf, &bufSize); /* Again, fails on WinXP with CRYPT_E_ASN1_RULE. I'm not too concerned * about the particular failure, just that it doesn't decode. + * It succeeds on (broken) Windows versions that haven't addressed + * embedded NULLs in alternate names. */ - ok(!ret, "expected failure\n"); + ok(!ret || broken(ret), "expected failure\n"); } struct UnicodeExpectedError @@ -3073,7 +3077,8 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) info.IssuerUniqueId.pbData = (BYTE *)serialNum; ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_BAD_PTR /* Win98 */), + "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { ok(size == sizeof(v1CertWithIssuerUniqueId), "Wrong size %d\n", size);

1 0

Vincent Povirk : ole32: Rename StorageImpl_WriteProperty to StorageImpl_WriteDirEntry.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 42a4b11e2dfcf19f1112f63a209df2f6fac37ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a4b11e2dfcf19f1112f63a2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:40:05 2009 -0600 ole32: Rename StorageImpl_WriteProperty to StorageImpl_WriteDirEntry. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 34 +++++++++++++++++----------------- dlls/ole32/storage32.h | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 813e629..781649c 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -659,7 +659,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( if (Success) { - StorageImpl_WriteProperty(This->parentStorage->ancestorStorage, + StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage, This->ownerProperty, &curProperty); } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 65f0f3e..0639599 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -729,7 +729,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( /* Change the name of the element */ strcpyW(currentProperty.name, pwcsNewName); - StorageImpl_WriteProperty(This->ancestorStorage, foundPropertyIndex, + StorageImpl_WriteDirEntry(This->ancestorStorage, foundPropertyIndex, &currentProperty); /* Insert the element in a new position in the tree */ @@ -932,7 +932,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( { curProperty.propertyUniqueID = *clsid; - success = StorageImpl_WriteProperty(This->ancestorStorage, + success = StorageImpl_WriteDirEntry(This->ancestorStorage, This->rootPropertySetIndex, &curProperty); if (success) @@ -1313,7 +1313,7 @@ static HRESULT insertIntoTree( else { currentProperty.leftChild = newPropertyIndex; - StorageImpl_WriteProperty(This, + StorageImpl_WriteDirEntry(This, current, &currentProperty); found = 1; @@ -1331,7 +1331,7 @@ static HRESULT insertIntoTree( else { currentProperty.rightChild = newPropertyIndex; - StorageImpl_WriteProperty(This, + StorageImpl_WriteDirEntry(This, current, &currentProperty); found = 1; @@ -1356,7 +1356,7 @@ static HRESULT insertIntoTree( * The root storage is empty, link the new property to its dir property */ currentProperty.dirProperty = newPropertyIndex; - StorageImpl_WriteProperty(This, + StorageImpl_WriteDirEntry(This, parentStorageIndex, &currentProperty); } @@ -2002,7 +2002,7 @@ static HRESULT removeFromTree( */ setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild); - res = StorageImpl_WriteProperty( + res = StorageImpl_WriteDirEntry( This, parentPropertyId, &parentProperty); @@ -2038,7 +2038,7 @@ static HRESULT removeFromTree( newRightChildParentProperty.rightChild = propertyToDelete.rightChild; - res = StorageImpl_WriteProperty( + res = StorageImpl_WriteDirEntry( This, newRightChildParent, &newRightChildParentProperty); @@ -2055,7 +2055,7 @@ static HRESULT removeFromTree( */ setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild); - res = StorageImpl_WriteProperty( + res = StorageImpl_WriteDirEntry( This, parentPropertyId, &parentProperty); @@ -2277,7 +2277,7 @@ static HRESULT StorageImpl_Construct( rootProp.size.u.HighPart = 0; rootProp.size.u.LowPart = 0; - StorageImpl_WriteProperty(This, 0, &rootProp); + StorageImpl_WriteDirEntry(This, 0, &rootProp); } /* @@ -3206,7 +3206,7 @@ BOOL StorageImpl_ReadDirEntry( /********************************************************************* * Write the specified property into the property chain */ -BOOL StorageImpl_WriteProperty( +BOOL StorageImpl_WriteDirEntry( StorageImpl* This, ULONG index, const DirEntry* buffer) @@ -3388,7 +3388,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( chainProperty.startingBlock = bbHeadOfChain; - StorageImpl_WriteProperty(This, propertyIndex, &chainProperty); + StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty); /* * Destroy the temporary propertyless big block chain. @@ -3477,7 +3477,7 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( StorageImpl_ReadDirEntry(This, propertyIndex, &chainProperty); chainProperty.startingBlock = sbHeadOfChain; - StorageImpl_WriteProperty(This, propertyIndex, &chainProperty); + StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty); SmallBlockChainStream_Destroy(sbTempChain); return SmallBlockChainStream_Construct(This, NULL, propertyIndex); @@ -4507,7 +4507,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, chainProp.startingBlock = blockIndex; - StorageImpl_WriteProperty( + StorageImpl_WriteDirEntry( This->parentStorage, This->ownerPropertyIndex, &chainProp); @@ -4907,7 +4907,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( rootProp.size.u.HighPart = 0; rootProp.size.u.LowPart = This->parentStorage->bigBlockSize; - StorageImpl_WriteProperty( + StorageImpl_WriteDirEntry( This->parentStorage, This->parentStorage->base.rootPropertySetIndex, &rootProp); @@ -4942,7 +4942,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( This->parentStorage->smallBlockRootChain, rootProp.size); - StorageImpl_WriteProperty( + StorageImpl_WriteDirEntry( This->parentStorage, This->parentStorage->base.rootPropertySetIndex, &rootProp); @@ -5183,7 +5183,7 @@ static BOOL SmallBlockChainStream_Shrink( chainProp.startingBlock = BLOCK_END_OF_CHAIN; - StorageImpl_WriteProperty(This->parentStorage, + StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex, &chainProp); @@ -5260,7 +5260,7 @@ static BOOL SmallBlockChainStream_Enlarge( chainProp.startingBlock = blockIndex; - StorageImpl_WriteProperty(This->parentStorage, This->ownerPropertyIndex, + StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex, &chainProp); } } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index fe8668e..405301c 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -307,7 +307,7 @@ BOOL StorageImpl_ReadDirEntry( ULONG index, DirEntry* buffer); -BOOL StorageImpl_WriteProperty( +BOOL StorageImpl_WriteDirEntry( StorageImpl* This, ULONG index, const DirEntry* buffer);

1 0

Maarten Lankhorst : include: Add PROPERTYKEY to wtypes.idl.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 92223ac91301128d944bc5a7e50f2a269d64f1a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92223ac91301128d944bc5a7e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 11 09:49:44 2009 +0100 include: Add PROPERTYKEY to wtypes.idl. --- include/wtypes.idl | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index bacf4cd..032d64b 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -827,4 +827,13 @@ typedef union switch(DWORD tyspec) } ByObjectId; } uCLSSPEC; +cpp_quote("#ifndef PROPERTYKEY_DEFINED") +cpp_quote("#define PROPERTYKEY_DEFINED") +typedef struct _tagpropertykey +{ + GUID fmtid; + DWORD pid; +} PROPERTYKEY; +cpp_quote("#endif /*PROPERTYKEY_DEFINED*/") + } /* interface IWinTypes */

1 0

Vincent Povirk : ole32: Remove the term "property type", it's just an STGTY .
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: b1baa05e28235e275c484a145d2418639b7bc969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1baa05e28235e275c484a145… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:21:31 2009 -0600 ole32: Remove the term "property type", it's just an STGTY. According to the MS spec, the types in compound storage files are simply STGTY values, with an extra value named STGTY_ROOT for the root storage. --- dlls/ole32/storage32.c | 26 +++++++++++++------------- dlls/ole32/storage32.h | 8 +++----- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e5b0717..50dbfe6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -451,7 +451,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( * If it was found, construct the stream object and return a pointer to it. */ if ( (foundPropertyIndex!=PROPERTY_NULL) && - (currentProperty.propertyType==PROPTYPE_STREAM) ) + (currentProperty.propertyType==STGTY_STREAM) ) { newStream = StgStreamImpl_Construct(This, grfMode, foundPropertyIndex); @@ -556,7 +556,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( &currentProperty); if ( (foundPropertyIndex!=PROPERTY_NULL) && - (currentProperty.propertyType==PROPTYPE_STORAGE) ) + (currentProperty.propertyType==STGTY_STORAGE) ) { newStorage = StorageInternalImpl_Construct( This->ancestorStorage, @@ -858,7 +858,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( strcpyW(newStreamProperty.name, pwcsName); - newStreamProperty.propertyType = PROPTYPE_STREAM; + newStreamProperty.propertyType = STGTY_STREAM; newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN; newStreamProperty.size.u.LowPart = 0; newStreamProperty.size.u.HighPart = 0; @@ -1041,7 +1041,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( strcpyW(newProperty.name, pwcsName); - newProperty.propertyType = PROPTYPE_STORAGE; + newProperty.propertyType = STGTY_STORAGE; newProperty.startingBlock = BLOCK_END_OF_CHAIN; newProperty.size.u.LowPart = 0; newProperty.size.u.HighPart = 0; @@ -1744,14 +1744,14 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( return STG_E_FILENOTFOUND; } - if ( propertyToDelete.propertyType == PROPTYPE_STORAGE ) + if ( propertyToDelete.propertyType == STGTY_STORAGE ) { hr = deleteStorageProperty( This, foundPropertyIndexToDelete, propertyToDelete); } - else if ( propertyToDelete.propertyType == PROPTYPE_STREAM ) + else if ( propertyToDelete.propertyType == STGTY_STREAM ) { hr = deleteStreamProperty( This, @@ -2269,7 +2269,7 @@ static HRESULT StorageImpl_Construct( MultiByteToWideChar( CP_ACP, 0, rootPropertyName, -1, rootProp.name, sizeof(rootProp.name)/sizeof(WCHAR) ); rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR); - rootProp.propertyType = PROPTYPE_ROOT; + rootProp.propertyType = STGTY_ROOT; rootProp.leftChild = PROPERTY_NULL; rootProp.rightChild = PROPERTY_NULL; rootProp.dirProperty = PROPERTY_NULL; @@ -2295,7 +2295,7 @@ static HRESULT StorageImpl_Construct( if (readSuccessful) { if ( (currentProperty.sizeOfNameString != 0 ) && - (currentProperty.propertyType == PROPTYPE_ROOT) ) + (currentProperty.propertyType == STGTY_ROOT) ) { This->base.rootPropertySetIndex = currentPropertyIndex; } @@ -3054,7 +3054,7 @@ void UpdateRawDirEntry(BYTE *buffer, const StgProperty *newData) newData->name, PROPERTY_NAME_BUFFER_LEN ); - memcpy(buffer + OFFSET_PS_PROPERTYTYPE, &newData->propertyType, 1); + memcpy(buffer + OFFSET_PS_STGTYPE, &newData->propertyType, 1); StorageUtl_WriteWord( buffer, @@ -3140,7 +3140,7 @@ BOOL StorageImpl_ReadProperty( PROPERTY_NAME_BUFFER_LEN ); TRACE("storage name: %s\n", debugstr_w(buffer->name)); - memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_PROPERTYTYPE, 1); + memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_STGTYPE, 1); StorageUtl_ReadWord( currentProperty, @@ -4074,11 +4074,11 @@ void StorageUtl_CopyPropertyToSTATSTG( switch (source->propertyType) { - case PROPTYPE_STORAGE: - case PROPTYPE_ROOT: + case STGTY_STORAGE: + case STGTY_ROOT: destination->type = STGTY_STORAGE; break; - case PROPTYPE_STREAM: + case STGTY_STREAM: destination->type = STGTY_STREAM; break; default: diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 1f3d264..6f78fec 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -53,7 +53,7 @@ static const ULONG OFFSET_EXTBBDEPOTCOUNT = 0x00000048; static const ULONG OFFSET_BBDEPOTSTART = 0x0000004C; static const ULONG OFFSET_PS_NAME = 0x00000000; static const ULONG OFFSET_PS_NAMELENGTH = 0x00000040; -static const ULONG OFFSET_PS_PROPERTYTYPE = 0x00000042; +static const ULONG OFFSET_PS_STGTYPE = 0x00000042; static const ULONG OFFSET_PS_LEFTCHILD = 0x00000044; static const ULONG OFFSET_PS_RIGHTCHILD = 0x00000048; static const ULONG OFFSET_PS_DIRPROP = 0x0000004C; @@ -87,11 +87,9 @@ static const ULONG PROPERTY_NULL = 0xFFFFFFFF; #define PROPERTY_RELATION_DIR 2 /* - * Property type constants + * type constant used in files for the root storage */ -#define PROPTYPE_STORAGE 0x01 -#define PROPTYPE_STREAM 0x02 -#define PROPTYPE_ROOT 0x05 +#define STGTY_ROOT 0x05 /* * These defines assume a hardcoded blocksize. The code will assert

1 0

Maarten Lankhorst : include: Add DEFINE_ENUM_FLAG_OPERATORS to winnt.h.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 912f040748a39e2a2a83f22f81e4cd1204da870a URL: http://source.winehq.org/git/wine.git/?a=commit;h=912f040748a39e2a2a83f22f8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 11 12:34:46 2009 +0100 include: Add DEFINE_ENUM_FLAG_OPERATORS to winnt.h. --- include/winnt.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 032e9c1..a77a607 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -309,6 +309,21 @@ extern "C" { #define ERROR_SEVERITY_WARNING 0x80000000 #define ERROR_SEVERITY_ERROR 0xC0000000 +#ifdef __cplusplus +#define DEFINE_ENUM_FLAG_OPERATORS(ENUMTYPE) \ +extern "C++" { \ + inline ENUMTYPE operator | (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)|((int)b)); } \ + inline ENUMTYPE operator |= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) |= ((int)b)); } \ + inline ENUMTYPE operator & (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)&((int)b)); } \ + inline ENUMTYPE operator &= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) &= ((int)b)); } \ + inline ENUMTYPE operator ~ (ENUMTYPE a) { return (ENUMTYPE)(~((int)a)); } \ + inline ENUMTYPE operator ^ (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)^((int)b)); } \ + inline ENUMTYPE operator ^= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) ^= ((int)b)); } \ +} +#else +#define DEFINE_ENUM_FLAG_OPERATORS(ENUMTYPE) /* */ +#endif + /* Microsoft's macros for declaring functions */ #ifdef __cplusplus

1 0

Alexandre Julliard : mshtml: Move some Content-Type registry keys to mshtml .inf.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 2976879c24036dfdd7b9ef22c0f320be3af10d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2976879c24036dfdd7b9ef22c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 20:33:46 2009 +0100 mshtml: Move some Content-Type registry keys to mshtml.inf. --- dlls/mshtml/mshtml.inf | 31 +++++++++++++++++++++++++++++++ tools/wine.inf.in | 16 ---------------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index f288236..dd5a266 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -272,6 +272,10 @@ HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:47 [FileAssoc.Reg] +;; AVI +HKCR,"MIME\Database\Content Type\video/avi","Extension",,".avi" +HKCR,".avi","Content Type",,"video/avi" + ;; BMP HKCR,"MIME\Database\Content Type\image/bmp","Extension",,".bmp" HKCR,"MIME\Database\Content Type\image/bmp","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%" @@ -285,6 +289,14 @@ HKCR,".css","Content Type",,"text/css" ;; DIB HKCR,".dib","Content Type",,"image/bmp" +;; DLL +HKCR,".dll","Content Type",,"application/x-msdownload" +HKCR,".dll",,,"dllfile" + +;; EXE +HKCR,".exe","Content Type",,"application/x-msdownload" +HKCR,".exe",,,"exefile" + ;; GIF HKCR,"MIME\Database\Content Type\image/gif","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\image/gif","Extension",,".gif" @@ -321,6 +333,10 @@ HKCR,"htmlfile\CLSID",,,"%CLSID_HTMLDocument%" HKCR,"htmlfile_FullWindowEmbed",,,"HTML Plugin Document" HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,,"" HKCR,"htmlfile_FullWindowEmbed\CLSID",,,"%CLSID_HTMLPluginDocument%" +HKCR,".htm",,,"htmlfile" +HKCR,".htm","Content Type",,"text/html" +HKCR,".html",,,"htmlfile" +HKCR,".html","Content Type",,"text/html" ;; ICO HKCR,"MIME\Database\Content Type\image/x-icon","CLSID",,"%CLSID_HTMLDocument%" @@ -403,12 +419,21 @@ HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%IEXPLORE%,9" +;; TIFF +HKCR,"MIME\Database\Content Type\image/tiff","Extension",,".tiff" +HKCR,".tif","Content Type",,"image/tiff" +HKCR,".tiff","Content Type",,"image/tiff" + ;; TXT HKCR,"MIME\Database\Content Type\text/plain","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\text/plain","Extension",,".txt" HKCR,"MIME\Database\Content Type\text/plain","Encoding",1,07,00,00,00 +HKCR,".txt",,,"txtfile" HKCR,".txt","Content Type",,"text/plain" +;; WAV +HKCR,".wav","Content Type",,"audio/wav" + ;; XBM HKCR,"MIME\Database\Content Type\image/xbm","Extension",,".xbm" HKCR,"MIME\Database\Content Type\image/x-xbitmap","CLSID",,"%CLSID_HTMLDocument%" @@ -420,3 +445,9 @@ HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;; HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%IEXPLORE%,9" + +;; XML +HKCR,".xml",,,"xmlfile" +HKCR,".xml","Content Type",,"text/xml" +HKCR,".xsl",,,"xslfile" +HKCR,".xsl","Content Type",,"text/xml" diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1550919..cdd5218 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -96,31 +96,15 @@ FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" Control="System\CurrentControlSet\Control" [Classes] -HKCR,.avi,"Content Type",2,"video/avi" HKCR,.chm,,2,"chm.file" HKCR,.cpl,,2,"cplfile" -HKCR,.dll,"Content Type",2,"application/x-msdownload" -HKCR,.exe,,2,"exefile" -HKCR,.exe,"Content Type",2,"application/x-msdownload" HKCR,.hlp,,2,"hlpfile" -HKCR,.htm,,2,"htmlfile" -HKCR,.htm,"Content Type",2,"text/html" -HKCR,.html,,2,"htmlfile" -HKCR,.html,"Content Type",2,"text/html" HKCR,.inf,,2,"inffile" HKCR,.ini,,2,"inifile" -HKCR,.jfif,"Content Type",2,"image/jpeg" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" HKCR,.rtf,,2,"rtffile" -HKCR,.tif,"Content Type",2,"image/tiff" -HKCR,.tiff,"Content Type",2,"image/tiff" -HKCR,.txt,,2,"txtfile" HKCR,.wri,,2,"wrifile" -HKCR,.wav,"Content Type",2,"audio/wav" -HKCR,.xml,,2,"xmlfile" -HKCR,.xml,"Content Type",2,"text/xml" -HKCR,.xsl,"Content Type",2,"text/xsl" HKCR,chm.file,,2,"Compiled HTML Help File" HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" HKCR,cplfile,,2,"Control Panel Item"

1 0

Maarten Lankhorst : include: Add partial structuredqueryexception header.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: af5822a7ea33c72dec350f7f86da65beb0e140d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5822a7ea33c72dec350f7f8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 11 00:47:39 2009 +0100 include: Add partial structuredqueryexception header. --- .gitignore | 1 + include/Makefile.in | 1 + include/structuredquerycondition.idl | 53 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 79499d8..d208ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -189,6 +189,7 @@ include/shtypes.h include/stamp-h include/stdole2.tlb include/strmif.h +include/structuredquerycondition.h include/textstor.h include/tom.h include/unknwn.h diff --git a/include/Makefile.in b/include/Makefile.in index e34d393..bf3c549 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -74,6 +74,7 @@ PUBLIC_IDL_H_SRCS = \ shobjidl.idl \ shtypes.idl \ strmif.idl \ + structuredquerycondition.idl \ textstor.idl \ tom.idl \ unknwn.idl \ diff --git a/include/structuredquerycondition.idl b/include/structuredquerycondition.idl new file mode 100644 index 0000000..8eb4d51 --- /dev/null +++ b/include/structuredquerycondition.idl @@ -0,0 +1,53 @@ +/* + * structured query condition + * + * Copyright 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + + +import "oaidl.idl"; +import "ocidl.idl"; +import "objidl.idl"; +import "propidl.idl"; + +typedef [v1_enum] enum tagCONDITION_TYPE +{ + CT_AND_CONDITION, + CT_OR_CONDITION, + CT_NOT_CONDITION, + CT_LEAF_CONDITION +} CONDITION_TYPE; + +typedef [v1_enum] enum tagCONDITION_OPERATION +{ + COP_IMPLICIT, + COP_EQUAL, + COP_NOTEQUAL, + COP_LESSTHAN, + COP_GREATERTHAN, + COP_LESSTHANOREQUAL, + COP_GREATERTHANOREQUAL, + COP_VALUE_STARTSWITH, + COP_VALUE_ENDSWITH, + COP_VALUE_CONTAINS, + COP_VALUE_NOTCONTAINS, + COP_DOSWILDCARDS, + COP_WORD_EQUAL, + COP_WORD_STARTSWITH, + COP_APPLICATION_SPECIFIC +} CONDITION_OPERATION;

1 0

Alexandre Julliard : ntdll: Moved RtlCaptureStackBackTrace stub to the cpu-specific files.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: d45fca8f7cc295c0f7badca2bb136a098aac9278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45fca8f7cc295c0f7badca2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 17:19:23 2009 +0100 ntdll: Moved RtlCaptureStackBackTrace stub to the cpu-specific files. --- dlls/ntdll/exception.c | 24 ------------------------ dlls/ntdll/signal_i386.c | 10 ++++++++++ dlls/ntdll/signal_powerpc.c | 9 +++++++++ dlls/ntdll/signal_sparc.c | 9 +++++++++ dlls/ntdll/signal_x86_64.c | 10 ++++++++++ 5 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 5fe0c28..63fd281 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -248,30 +248,6 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) } -/************************************************************************* - * RtlCaptureStackBackTrace [NTDLL.@] - * - * Captures stack backtrace - * - * PARAMS - * Skip [I] Number of stack frames to skip before starting a capture - * Count [I] Number of stack frames to capture into Buffer - * Buffer [O] Array of backtrace pointers captured from stack - * Hash [O] Optional pointer to variable where backtrace hash should be stored - * - * RETURNS - * Number of captured stack frames or 0 if error occurred - * - * NOTES - * Unimplemented - */ -USHORT WINAPI RtlCaptureStackBackTrace(ULONG Skip, ULONG Count, PVOID *Buffer, ULONG *Hash) -{ - FIXME("(%d, %d, %p, %p) stub!\n", Skip, Count, Buffer, Hash); - return 0; -} - - /************************************************************* * __wine_spec_unimplemented_stub * diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9be32a6..18a574d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2280,6 +2280,16 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + + /* wrapper for apps that don't declare the thread function correctly */ extern void DECLSPEC_NORETURN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ); __ASM_GLOBAL_FUNC(call_thread_func, diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 67bee92..a1a6ccc 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1086,6 +1086,15 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) if (status) raise_status( status, rec ); } +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + /*********************************************************************** * call_thread_entry_point */ diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 5450402..2952f8e 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -828,6 +828,15 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) if (status) raise_status( status, rec ); } +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + /*********************************************************************** * call_thread_entry_point */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 94b3d3c..7e6c634 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2882,6 +2882,16 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + + /*********************************************************************** * call_thread_func */

1 0

Maarten Lankhorst : include: Add SHCOLSTATE to shtypes.idl.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 760c3b606b848776ffac1d49e92f2972d2f20979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760c3b606b848776ffac1d49e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 11 00:45:44 2009 +0100 include: Add SHCOLSTATE to shtypes.idl. --- include/shobjidl.idl | 16 ---------------- include/shtypes.idl | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 5acd302..60da174 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -320,22 +320,6 @@ interface IEnumExtraSearch : IUnknown ] interface IShellFolder2 : IShellFolder { - typedef enum - { - SHCOLSTATE_TYPE_STR = 0x00000001, - SHCOLSTATE_TYPE_INT = 0x00000002, - SHCOLSTATE_TYPE_DATE = 0x00000003, - SHCOLSTATE_TYPEMASK = 0x0000000f, - SHCOLSTATE_ONBYDEFAULT = 0x00000010, - SHCOLSTATE_SLOW = 0x00000020, - SHCOLSTATE_EXTENDED = 0x00000040, - SHCOLSTATE_SECONDARYUI = 0x00000080, - SHCOLSTATE_HIDDEN = 0x00000100, - SHCOLSTATE_PREFER_VARCMP = 0x00000200 - } SHCOLSTATE; - - typedef DWORD SHCOLSTATEF; - typedef struct { GUID fmtid; diff --git a/include/shtypes.idl b/include/shtypes.idl index 89e6bb0..2433fb5 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -72,3 +72,29 @@ typedef struct STRRET str; } SHELLDETAILS, *LPSHELLDETAILS; cpp_quote("#include <poppack.h>") + +typedef [v1_enum] enum tagSHCOLSTATE +{ + SHCOLSTATE_DEFAULT = 0, + SHCOLSTATE_TYPE_STR, + SHCOLSTATE_TYPE_INT, + SHCOLSTATE_TYPE_DATE, + SHCOLSTATE_TYPEMASK = 0xf, + SHCOLSTATE_ONBYDEFAULT = 0x10, + SHCOLSTATE_SLOW = 0x20, + SHCOLSTATE_EXTENDED = 0x40, + SHCOLSTATE_SECONDARYUI = 0x80, + SHCOLSTATE_HIDDEN = 0x100, + SHCOLSTATE_PREFER_VARCMP = 0x200, + SHCOLSTATE_PREFER_FMTCMP = 0x400, + SHCOLSTATE_NOSORTBYFOLDERNESS = 0x800, + SHCOLSTATE_VIEWONLY = 0x10000, + SHCOLSTATE_BATCHREAD = 0x20000, + SHCOLSTATE_NO_GROUPBY = 0x40000, + SHCOLSTATE_FIXED_WIDTH = 0x1000, + SHCOLSTATE_NODPISCALE = 0x2000, + SHCOLSTATE_FIXED_RATIO = 0x4000, + SHCOLSTATE_DISPLAYMASK = 0xf000 +} SHCOLSTATE; + +typedef DWORD SHCOLSTATEF;

1 0