November 2009 - Wine-commits

Juan Lang : crypt32: Fix more test failures on older crypt32 versions.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 574de15f515adb94b502e69285816e1d34bd0f4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=574de15f515adb94b502e6928… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 12:40:19 2009 -0800 crypt32: Fix more test failures on older crypt32 versions. --- dlls/crypt32/tests/chain.c | 53 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index d3d33ac..65be7ec 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2547,6 +2547,15 @@ static const CERT_TRUST_STATUS elementStatus27[] = { static const SimpleChainStatusCheck simpleStatus27[] = { { sizeof(elementStatus27) / sizeof(elementStatus27[0]), elementStatus27 }, }; +static const CERT_TRUST_STATUS elementStatus27Broken[] = { + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, +}; +static const SimpleChainStatusCheck simpleStatus27Broken[] = { + { sizeof(elementStatus27Broken) / sizeof(elementStatus27Broken[0]), + elementStatus27Broken }, +}; static CONST_DATA_BLOB chain28[] = { { sizeof(chain28_0), chain28_0 }, { sizeof(chain28_1), chain28_1 }, @@ -2797,13 +2806,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus26 }, 0 }, - { { sizeof(chain27) / sizeof(chain27[0]), chain27 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, - CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_NAME_CONSTRAINTS | - CERT_TRUST_INVALID_EXTENSION, 0 }, - 1, simpleStatus27 }, - 0 }, + /* chain27 is handled separately elsewhere */ { { sizeof(chain28) / sizeof(chain28[0]), chain28 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | @@ -2852,6 +2855,29 @@ static ChainCheck chainCheckNoStore[] = { 0 }, }; +/* Chain27 checks a certificate with a subject alternate name containing an + * embedded NULL. Newer crypt32 versions fail to decode such alternate names, + * correctly prohibiting them. Older crypt32 versions do not. Rather than + * ignoring the expected error bits, check each version separately depending + * on the chain's error status. + */ +static ChainCheck chainCheckEmbeddedNull = { + { sizeof(chain27) / sizeof(chain27[0]), chain27 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_NAME_CONSTRAINTS | + CERT_TRUST_INVALID_EXTENSION, 0 }, + 1, simpleStatus27 }, + 0 }; +static ChainCheck chainCheckEmbeddedNullBroken = { + { sizeof(chain27) / sizeof(chain27[0]), chain27 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, + 1, simpleStatus27Broken }, + 0 }; + /* Wednesday, Oct 1, 2007 */ static SYSTEMTIME oct2007 = { 2007, 10, 1, 1, 0, 0, 0, 0 }; /* Wednesday, Oct 28, 2009 */ @@ -2946,6 +2972,19 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); } } + chain = getChain(&chainCheckEmbeddedNull.certs, 0, TRUE, &oct2007, + chainCheckEmbeddedNull.todo, 0); + if (chain) + { + if (chainCheckEmbeddedNull.status.status.dwErrorStatus == + chain->TrustStatus.dwErrorStatus) + checkChainStatus(chain, &chainCheckEmbeddedNull.status, + chainCheckEmbeddedNull.todo, 0); + else + checkChainStatus(chain, &chainCheckEmbeddedNullBroken.status, + chainCheckEmbeddedNullBroken.todo, 0); + pCertFreeCertificateChain(chain); + } } static void test_CERT_CHAIN_PARA_cbSize(void)

1 0

Juan Lang : rsaenh/tests: Fix length of copied buffer.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 9369dfbab6554abed3bc3ad89258dfcd28561c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9369dfbab6554abed3bc3ad89… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 13:38:17 2009 -0800 rsaenh/tests: Fix length of copied buffer. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4a69483..e59ad95 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -459,7 +459,7 @@ static void test_block_cipher_modes(void) result = derive_key(CALG_RC2, &hKey, 40); if (!result) return; - memcpy(abData, plain, sizeof(abData)); + memcpy(abData, plain, sizeof(plain)); dwMode = CRYPT_MODE_ECB; result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0);

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 564c619ae3c13bb4c56b419b8b343a8fa49ccf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=564c619ae3c13bb4c56b419b8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 12 00:12:22 2009 +0100 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 8c23e41..f70029d 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -46,6 +46,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Objet booléen attendu" IDS_JSCRIPT_EXPECTED "Objet JScript attendu" IDS_REGEXP_SYNTAX_ERROR "Erreur de syntaxe dans l'expression rationnelle" + IDS_URI_INVALID_CHAR "L'URI à coder contient des caractères invalides" IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" IDS_ARRAY_EXPECTED "Objet tableau attendu" }

1 0

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

12 Nov '09

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

Alexandre Julliard : ntdll: Implemented RtlCaptureStackBackTrace for i386.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: d90f691e58ccf3deed6bd4a45bcae350bb7587ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90f691e58ccf3deed6bd4a45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 17:38:18 2009 +0100 ntdll: Implemented RtlCaptureStackBackTrace for i386. --- dlls/ntdll/signal_i386.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 18a574d..79e3806 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2285,8 +2285,30 @@ DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) */ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { - FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); - return 0; + CONTEXT context; + ULONG i; + ULONG *frame; + + RtlCaptureContext( &context ); + if (hash) *hash = 0; + frame = (ULONG *)context.Ebp; + + while (skip--) + { + if (((void *)frame < NtCurrentTeb()->Tib.StackLimit) || + ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase)) return 0; + frame = (ULONG *)*frame; + } + + for (i = 0; i < count; i++) + { + if (((void *)frame < NtCurrentTeb()->Tib.StackLimit) || + ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase)) break; + buffer[i] = (void *)frame[1]; + if (hash) *hash += frame[1]; + frame = (ULONG *)*frame; + } + return i; }

1 0

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

12 Nov '09

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

Alexandre Julliard : mshtml: Register a few more MIME types.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 56e729726bc6cd5873da60933ca64003a2613b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e729726bc6cd5873da60933… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 21:16:43 2009 +0100 mshtml: Register a few more MIME types. --- dlls/mshtml/mshtml.inf | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index dd5a266..aa7e814 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -273,6 +273,7 @@ HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:47 [FileAssoc.Reg] ;; AVI +HKCR,"MIME\Database\Content Type\video/avi","CLSID",,"{CD3AFA88-B84F-48F0-9393-7EDC34128127}" HKCR,"MIME\Database\Content Type\video/avi","Extension",,".avi" HKCR,".avi","Content Type",,"video/avi" @@ -312,6 +313,10 @@ HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%IEXPLORE%,9" +;; GZIP +HKCR,"MIME\Database\Content Type\application/x-gzip","Extension",,".gz" +HKCR,".gz","Content Type",,"application/x-gzip" + ;; HTC HKCR,"MIME\Database\Content Type\text/x-component","CLSID",,"%CLSID_CHtmlComponentConstructor%" HKCR,"MIME\Database\Content Type\text/x-component","Extension",,".htc" @@ -391,6 +396,18 @@ HKCR,"mhtmlfile",,,"MHTML Document" HKCR,"mhtmlfile\BrowseInPlace",,,"" HKCR,"mhtmlfile\CLSID",,,"%CLSID_MHTMLDocument%" +;; MPEG +HKCR,"MIME\Database\Content Type\audio/mpeg","CLSID",,"{CD3AFA76-B84F-48F0-9393-7EDC34128127}" +HKCR,"MIME\Database\Content Type\audio/mpeg","Extension",,".mp3" +HKCR,"MIME\Database\Content Type\audio/mpg","CLSID",,"{CD3AFA76-B84F-48F0-9393-7EDC34128127}" +HKCR,"MIME\Database\Content Type\audio/mpg","Extension",,".mp3" +HKCR,"MIME\Database\Content Type\video/mpeg","CLSID",,"{CD3AFA89-B84F-48F0-9393-7EDC34128127}" +HKCR,"MIME\Database\Content Type\video/mpeg","Extension",,".mpeg" +HKCR,".mp3","Content Type",,"audio/mpeg" +HKCR,".mpe","Content Type",,"video/mpeg" +HKCR,".mpeg","Content Type",,"video/mpeg" +HKCR,".mpg","Content Type",,"video/mpeg" + ;; PJPG HKCR,"MIME\Database\Content Type\image/pjpeg","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\image/pjpeg","Extension",,".jpg" @@ -419,6 +436,20 @@ HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%IEXPLORE%,9" +;; PS +HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" +HKCR,".ai","Content Type",,"application/postscript" +HKCR,".eps","Content Type",,"application/postscript" +HKCR,".ps","Content Type",,"application/postscript" + +;; TAR +HKCR,"MIME\Database\Content Type\application/x-tar","Extension",,".tar" +HKCR,".tar","Content Type",,"application/x-tar" + +;; TGZ +HKCR,"MIME\Database\Content Type\application/x-compressed","Extension",,".tgz" +HKCR,".tgz","Content Type",,"application/x-compressed" + ;; TIFF HKCR,"MIME\Database\Content Type\image/tiff","Extension",,".tiff" HKCR,".tif","Content Type",,"image/tiff" @@ -432,6 +463,8 @@ HKCR,".txt",,,"txtfile" HKCR,".txt","Content Type",,"text/plain" ;; WAV +HKCR,"MIME\Database\Content Type\audio/wav","CLSID",,"{CD3AFA7B-B84F-48F0-9393-7EDC34128127}" +HKCR,"MIME\Database\Content Type\audio/wav","Extension",,".wav" HKCR,".wav","Content Type",,"audio/wav" ;; XBM @@ -447,7 +480,17 @@ HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%IEXPLORE%,9" ;; XML +HKCR,"MIME\Database\Content Type\application/xml","CLSID",,"{48123BC4-99D9-11D1-A6B3-00C04FD91555}" +HKCR,"MIME\Database\Content Type\application/xml","Extension",,".xml" +HKCR,"MIME\Database\Content Type\application/xml","Encoding",1,08,00,00,00 +HKCR,"MIME\Database\Content Type\text/xml","CLSID",,"{48123BC4-99D9-11D1-A6B3-00C04FD91555}" +HKCR,"MIME\Database\Content Type\text/xml","Extension",,".xml" +HKCR,"MIME\Database\Content Type\text/xml","Encoding",1,08,00,00,00 HKCR,".xml",,,"xmlfile" HKCR,".xml","Content Type",,"text/xml" HKCR,".xsl",,,"xslfile" HKCR,".xsl","Content Type",,"text/xml" + +;; ZIP +HKCR,"MIME\Database\Content Type\application/x-zip-compressed","Extension",,".zip" +HKCR,".zip","Content Type",,"application/x-zip-compressed"

1 0

Maarten Lankhorst : include: Add SHCOLSTATE to shtypes.idl.
by Alexandre Julliard 12 Nov '09

12 Nov '09

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

Maarten Lankhorst : include: Add partial structuredqueryexception header.
by Alexandre Julliard 12 Nov '09

12 Nov '09

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

Maarten Lankhorst : include: Add PROPERTYKEY to wtypes.idl.
by Alexandre Julliard 12 Nov '09

12 Nov '09

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