wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Bang Jun-young : avifil32: Fix prototype for AVIStreamFindSample() to match the PSDK.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: aaa19088889926e6a8ecf99024d9f3116292ec1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa19088889926e6a8ecf9902… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Mon Oct 15 17:48:20 2007 +0900 avifil32: Fix prototype for AVIStreamFindSample() to match the PSDK. --- dlls/avifil32/api.c | 2 +- include/vfw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 2717bf0..4027966 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -550,7 +550,7 @@ HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi, * AVIStreamFindSample (AVIFIL32.@) * AVIStreamFindSample (AVIFILE.163) */ -HRESULT WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, DWORD flags) +LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags) { TRACE("(%p,%d,0x%X)\n", pstream, pos, flags); diff --git a/include/vfw.h b/include/vfw.h index bfb6f0d..aae8b1f 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -1041,7 +1041,7 @@ HRESULT WINAPI AVIStreamCreate(PAVISTREAM*,LONG,LONG,CLSID*); HRESULT WINAPI AVIStreamInfoA(PAVISTREAM iface,AVISTREAMINFOA *asi,LONG size); HRESULT WINAPI AVIStreamInfoW(PAVISTREAM iface,AVISTREAMINFOW *asi,LONG size); #define AVIStreamInfo WINELIB_NAME_AW(AVIStreamInfo) -HRESULT WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, DWORD flags); +LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags); HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG *formatsize); HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG formatsize); HRESULT WINAPI AVIStreamRead(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread);

1 0

Bang Jun-young : crypt32: Fix typo in CryptGetDefaultOIDFunctionAddress().
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 6ab44c807365668593b41e57eec19b8f2184275a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab44c807365668593b41e57e… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Mon Oct 15 17:12:26 2007 +0900 crypt32: Fix typo in CryptGetDefaultOIDFunctionAddress(). --- dlls/crypt32/oid.c | 2 +- include/wincrypt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 98ced9e..1e2de95 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -414,7 +414,7 @@ BOOL WINAPI CryptFreeOIDFunctionAddress(HCRYPTOIDFUNCADDR hFuncAddr, } BOOL WINAPI CryptGetDefaultOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, - DWORD dwEncodingType, LPCWSTR pwszDll, DWORD dwFlags, void *ppvFuncAddr, + DWORD dwEncodingType, LPCWSTR pwszDll, DWORD dwFlags, void **ppvFuncAddr, HCRYPTOIDFUNCADDR *phFuncAddr) { FIXME("(%p, %d, %s, %08x, %p, %p): stub\n", hFuncSet, dwEncodingType, diff --git a/include/wincrypt.h b/include/wincrypt.h index df709fe..7563051 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3541,7 +3541,7 @@ HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR,DWORD); BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, DWORD dwEncodingType, LPWSTR pwszDllList, DWORD *pcchDllList); BOOL WINAPI CryptGetDefaultOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, - DWORD dwEncodingType, LPCWSTR pwszDll, DWORD dwFlags, void *ppvFuncAddr, + DWORD dwEncodingType, LPCWSTR pwszDll, DWORD dwFlags, void **ppvFuncAddr, HCRYPTOIDFUNCADDR *phFuncAddr); BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, DWORD dwEncodingType, LPCSTR pszOID, DWORD dwFlags, void **ppvFuncAddr,

1 0

Bang Jun-young : configure: Add check for presence of _strdup() and strdup( ).
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: ff96bd6aec29d3e4809829e3e50c15e3b36d6173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff96bd6aec29d3e4809829e3e… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Mon Oct 15 17:09:12 2007 +0900 configure: Add check for presence of _strdup() and strdup(). --- configure | 4 ++++ configure.ac | 2 ++ include/config.h.in | 6 ++++++ include/wine/port.h | 4 ++++ 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 51b8f62..1153f74 100755 --- a/configure +++ b/configure @@ -15703,11 +15703,14 @@ esac + + for ac_func in \ _pclose \ _popen \ _snprintf \ _spawnvp \ + _strdup \ _stricmp \ _strnicmp \ _vsnprintf \ @@ -15756,6 +15759,7 @@ for ac_func in \ statfs \ statvfs \ strcasecmp \ + strdup \ strerror \ strncasecmp \ strtold \ diff --git a/configure.ac b/configure.ac index 153e269..b453dc6 100644 --- a/configure.ac +++ b/configure.ac @@ -1227,6 +1227,7 @@ AC_CHECK_FUNCS(\ _popen \ _snprintf \ _spawnvp \ + _strdup \ _stricmp \ _strnicmp \ _vsnprintf \ @@ -1275,6 +1276,7 @@ AC_CHECK_FUNCS(\ statfs \ statvfs \ strcasecmp \ + strdup \ strerror \ strncasecmp \ strtold \ diff --git a/include/config.h.in b/include/config.h.in index 8df3a1a..c352c42 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -633,6 +633,9 @@ /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR @@ -945,6 +948,9 @@ /* Define to 1 if you have the `_spawnvp' function. */ #undef HAVE__SPAWNVP +/* Define to 1 if you have the `_strdup' function. */ +#undef HAVE__STRDUP + /* Define to 1 if you have the `_stricmp' function. */ #undef HAVE__STRICMP diff --git a/include/wine/port.h b/include/wine/port.h index b8009cc..4b94a5e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -126,6 +126,10 @@ struct statvfs #define pclose _pclose #endif +#if !defined(HAVE_STRDUP) && defined(HAVE__STRDUP) +#define strdup _strdup +#endif + #if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF) #define snprintf _snprintf #endif

1 0

Gerald Pfeifer : crypt32: Fix incorrect casts in X509_CERT and friends.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 119e4d495578faa81f0e9b1e376363099d253fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=119e4d495578faa81f0e9b1e3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 15 13:58:45 2007 +0200 crypt32: Fix incorrect casts in X509_CERT and friends. --- dlls/crypt32/encode.c | 66 ++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 3dbadd8..fc55d98 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3488,101 +3488,101 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, { switch (LOWORD(lpszStructType)) { - case (WORD)X509_CERT: + case LOWORD(X509_CERT): encodeFunc = CRYPT_AsnEncodeCert; break; - case (WORD)X509_CERT_TO_BE_SIGNED: + case LOWORD(X509_CERT_TO_BE_SIGNED): encodeFunc = CRYPT_AsnEncodeCertInfo; break; - case (WORD)X509_CERT_CRL_TO_BE_SIGNED: + case LOWORD(X509_CERT_CRL_TO_BE_SIGNED): encodeFunc = CRYPT_AsnEncodeCRLInfo; break; - case (WORD)X509_EXTENSIONS: + case LOWORD(X509_EXTENSIONS): encodeFunc = CRYPT_AsnEncodeExtensions; break; - case (WORD)X509_NAME_VALUE: + case LOWORD(X509_NAME_VALUE): encodeFunc = CRYPT_AsnEncodeNameValue; break; - case (WORD)X509_NAME: + case LOWORD(X509_NAME): encodeFunc = CRYPT_AsnEncodeName; break; - case (WORD)X509_PUBLIC_KEY_INFO: + case LOWORD(X509_PUBLIC_KEY_INFO): encodeFunc = CRYPT_AsnEncodePubKeyInfo; break; - case (WORD)X509_AUTHORITY_KEY_ID: + case LOWORD(X509_AUTHORITY_KEY_ID): encodeFunc = CRYPT_AsnEncodeAuthorityKeyId; break; - case (WORD)X509_ALTERNATE_NAME: + case LOWORD(X509_ALTERNATE_NAME): encodeFunc = CRYPT_AsnEncodeAltName; break; - case (WORD)X509_BASIC_CONSTRAINTS: + case LOWORD(X509_BASIC_CONSTRAINTS): encodeFunc = CRYPT_AsnEncodeBasicConstraints; break; - case (WORD)X509_BASIC_CONSTRAINTS2: + case LOWORD(X509_BASIC_CONSTRAINTS2): encodeFunc = CRYPT_AsnEncodeBasicConstraints2; break; - case (WORD)RSA_CSP_PUBLICKEYBLOB: + case LOWORD(RSA_CSP_PUBLICKEYBLOB): encodeFunc = CRYPT_AsnEncodeRsaPubKey; break; - case (WORD)X509_UNICODE_NAME: + case LOWORD(X509_UNICODE_NAME): encodeFunc = CRYPT_AsnEncodeUnicodeName; break; - case (WORD)PKCS_CONTENT_INFO: + case LOWORD(PKCS_CONTENT_INFO): encodeFunc = CRYPT_AsnEncodePKCSContentInfo; break; - case (WORD)PKCS_ATTRIBUTE: + case LOWORD(PKCS_ATTRIBUTE): encodeFunc = CRYPT_AsnEncodePKCSAttribute; break; - case (WORD)X509_UNICODE_NAME_VALUE: + case LOWORD(X509_UNICODE_NAME_VALUE): encodeFunc = CRYPT_AsnEncodeUnicodeNameValue; break; - case (WORD)X509_OCTET_STRING: + case LOWORD(X509_OCTET_STRING): encodeFunc = CRYPT_AsnEncodeOctets; break; - case (WORD)X509_BITS: - case (WORD)X509_KEY_USAGE: + case LOWORD(X509_BITS): + case LOWORD(X509_KEY_USAGE): encodeFunc = CRYPT_AsnEncodeBits; break; - case (WORD)X509_INTEGER: + case LOWORD(X509_INTEGER): encodeFunc = CRYPT_AsnEncodeInt; break; - case (WORD)X509_MULTI_BYTE_INTEGER: + case LOWORD(X509_MULTI_BYTE_INTEGER): encodeFunc = CRYPT_AsnEncodeInteger; break; - case (WORD)X509_MULTI_BYTE_UINT: + case LOWORD(X509_MULTI_BYTE_UINT): encodeFunc = CRYPT_AsnEncodeUnsignedInteger; break; - case (WORD)X509_ENUMERATED: + case LOWORD(X509_ENUMERATED): encodeFunc = CRYPT_AsnEncodeEnumerated; break; - case (WORD)X509_CHOICE_OF_TIME: + case LOWORD(X509_CHOICE_OF_TIME): encodeFunc = CRYPT_AsnEncodeChoiceOfTime; break; - case (WORD)X509_AUTHORITY_KEY_ID2: + case LOWORD(X509_AUTHORITY_KEY_ID2): encodeFunc = CRYPT_AsnEncodeAuthorityKeyId2; break; - case (WORD)X509_SEQUENCE_OF_ANY: + case LOWORD(X509_SEQUENCE_OF_ANY): encodeFunc = CRYPT_AsnEncodeSequenceOfAny; break; - case (WORD)PKCS_UTC_TIME: + case LOWORD(PKCS_UTC_TIME): encodeFunc = CRYPT_AsnEncodeUtcTime; break; - case (WORD)X509_CRL_DIST_POINTS: + case LOWORD(X509_CRL_DIST_POINTS): encodeFunc = CRYPT_AsnEncodeCRLDistPoints; break; - case (WORD)X509_ENHANCED_KEY_USAGE: + case LOWORD(X509_ENHANCED_KEY_USAGE): encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage; break; - case (WORD)PKCS_ATTRIBUTES: + case LOWORD(PKCS_ATTRIBUTES): encodeFunc = CRYPT_AsnEncodePKCSAttributes; break; - case (WORD)X509_ISSUING_DIST_POINT: + case LOWORD(X509_ISSUING_DIST_POINT): encodeFunc = CRYPT_AsnEncodeIssuingDistPoint; break; - case (WORD)X509_NAME_CONSTRAINTS: + case LOWORD(X509_NAME_CONSTRAINTS): encodeFunc = CRYPT_AsnEncodeNameConstraints; break; - case (WORD)PKCS7_SIGNER_INFO: + case LOWORD(PKCS7_SIGNER_INFO): encodeFunc = CRYPT_AsnEncodePKCSSignerInfo; break; }

1 0

Juan Lang : crypt32: Implement CertVerifyCertificateChain for the Microsoft root policy.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 136f0331585131c52b9271db5aaacc9ea893edf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136f0331585131c52b9271db5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 13:16:24 2007 -0700 crypt32: Implement CertVerifyCertificateChain for the Microsoft root policy. --- dlls/crypt32/chain.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 3a38941..a64d951 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1523,6 +1523,120 @@ static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, return TRUE; } +static BYTE msPubKey1[] = { +0x30,0x82,0x01,0x0a,0x02,0x82,0x01,0x01,0x00,0xdf,0x08,0xba,0xe3,0x3f,0x6e, +0x64,0x9b,0xf5,0x89,0xaf,0x28,0x96,0x4a,0x07,0x8f,0x1b,0x2e,0x8b,0x3e,0x1d, +0xfc,0xb8,0x80,0x69,0xa3,0xa1,0xce,0xdb,0xdf,0xb0,0x8e,0x6c,0x89,0x76,0x29, +0x4f,0xca,0x60,0x35,0x39,0xad,0x72,0x32,0xe0,0x0b,0xae,0x29,0x3d,0x4c,0x16, +0xd9,0x4b,0x3c,0x9d,0xda,0xc5,0xd3,0xd1,0x09,0xc9,0x2c,0x6f,0xa6,0xc2,0x60, +0x53,0x45,0xdd,0x4b,0xd1,0x55,0xcd,0x03,0x1c,0xd2,0x59,0x56,0x24,0xf3,0xe5, +0x78,0xd8,0x07,0xcc,0xd8,0xb3,0x1f,0x90,0x3f,0xc0,0x1a,0x71,0x50,0x1d,0x2d, +0xa7,0x12,0x08,0x6d,0x7c,0xb0,0x86,0x6c,0xc7,0xba,0x85,0x32,0x07,0xe1,0x61, +0x6f,0xaf,0x03,0xc5,0x6d,0xe5,0xd6,0xa1,0x8f,0x36,0xf6,0xc1,0x0b,0xd1,0x3e, +0x69,0x97,0x48,0x72,0xc9,0x7f,0xa4,0xc8,0xc2,0x4a,0x4c,0x7e,0xa1,0xd1,0x94, +0xa6,0xd7,0xdc,0xeb,0x05,0x46,0x2e,0xb8,0x18,0xb4,0x57,0x1d,0x86,0x49,0xdb, +0x69,0x4a,0x2c,0x21,0xf5,0x5e,0x0f,0x54,0x2d,0x5a,0x43,0xa9,0x7a,0x7e,0x6a, +0x8e,0x50,0x4d,0x25,0x57,0xa1,0xbf,0x1b,0x15,0x05,0x43,0x7b,0x2c,0x05,0x8d, +0xbd,0x3d,0x03,0x8c,0x93,0x22,0x7d,0x63,0xea,0x0a,0x57,0x05,0x06,0x0a,0xdb, +0x61,0x98,0x65,0x2d,0x47,0x49,0xa8,0xe7,0xe6,0x56,0x75,0x5c,0xb8,0x64,0x08, +0x63,0xa9,0x30,0x40,0x66,0xb2,0xf9,0xb6,0xe3,0x34,0xe8,0x67,0x30,0xe1,0x43, +0x0b,0x87,0xff,0xc9,0xbe,0x72,0x10,0x5e,0x23,0xf0,0x9b,0xa7,0x48,0x65,0xbf, +0x09,0x88,0x7b,0xcd,0x72,0xbc,0x2e,0x79,0x9b,0x7b,0x02,0x03,0x01,0x00,0x01 }; +static BYTE msPubKey2[] = { +0x30,0x82,0x01,0x0a,0x02,0x82,0x01,0x01,0x00,0xa9,0x02,0xbd,0xc1,0x70,0xe6, +0x3b,0xf2,0x4e,0x1b,0x28,0x9f,0x97,0x78,0x5e,0x30,0xea,0xa2,0xa9,0x8d,0x25, +0x5f,0xf8,0xfe,0x95,0x4c,0xa3,0xb7,0xfe,0x9d,0xa2,0x20,0x3e,0x7c,0x51,0xa2, +0x9b,0xa2,0x8f,0x60,0x32,0x6b,0xd1,0x42,0x64,0x79,0xee,0xac,0x76,0xc9,0x54, +0xda,0xf2,0xeb,0x9c,0x86,0x1c,0x8f,0x9f,0x84,0x66,0xb3,0xc5,0x6b,0x7a,0x62, +0x23,0xd6,0x1d,0x3c,0xde,0x0f,0x01,0x92,0xe8,0x96,0xc4,0xbf,0x2d,0x66,0x9a, +0x9a,0x68,0x26,0x99,0xd0,0x3a,0x2c,0xbf,0x0c,0xb5,0x58,0x26,0xc1,0x46,0xe7, +0x0a,0x3e,0x38,0x96,0x2c,0xa9,0x28,0x39,0xa8,0xec,0x49,0x83,0x42,0xe3,0x84, +0x0f,0xbb,0x9a,0x6c,0x55,0x61,0xac,0x82,0x7c,0xa1,0x60,0x2d,0x77,0x4c,0xe9, +0x99,0xb4,0x64,0x3b,0x9a,0x50,0x1c,0x31,0x08,0x24,0x14,0x9f,0xa9,0xe7,0x91, +0x2b,0x18,0xe6,0x3d,0x98,0x63,0x14,0x60,0x58,0x05,0x65,0x9f,0x1d,0x37,0x52, +0x87,0xf7,0xa7,0xef,0x94,0x02,0xc6,0x1b,0xd3,0xbf,0x55,0x45,0xb3,0x89,0x80, +0xbf,0x3a,0xec,0x54,0x94,0x4e,0xae,0xfd,0xa7,0x7a,0x6d,0x74,0x4e,0xaf,0x18, +0xcc,0x96,0x09,0x28,0x21,0x00,0x57,0x90,0x60,0x69,0x37,0xbb,0x4b,0x12,0x07, +0x3c,0x56,0xff,0x5b,0xfb,0xa4,0x66,0x0a,0x08,0xa6,0xd2,0x81,0x56,0x57,0xef, +0xb6,0x3b,0x5e,0x16,0x81,0x77,0x04,0xda,0xf6,0xbe,0xae,0x80,0x95,0xfe,0xb0, +0xcd,0x7f,0xd6,0xa7,0x1a,0x72,0x5c,0x3c,0xca,0xbc,0xf0,0x08,0xa3,0x22,0x30, +0xb3,0x06,0x85,0xc9,0xb3,0x20,0x77,0x13,0x85,0xdf,0x02,0x03,0x01,0x00,0x01 }; +static BYTE msPubKey3[] = { +0x30,0x82,0x02,0x0a,0x02,0x82,0x02,0x01,0x00,0xf3,0x5d,0xfa,0x80,0x67,0xd4, +0x5a,0xa7,0xa9,0x0c,0x2c,0x90,0x20,0xd0,0x35,0x08,0x3c,0x75,0x84,0xcd,0xb7, +0x07,0x89,0x9c,0x89,0xda,0xde,0xce,0xc3,0x60,0xfa,0x91,0x68,0x5a,0x9e,0x94, +0x71,0x29,0x18,0x76,0x7c,0xc2,0xe0,0xc8,0x25,0x76,0x94,0x0e,0x58,0xfa,0x04, +0x34,0x36,0xe6,0xdf,0xaf,0xf7,0x80,0xba,0xe9,0x58,0x0b,0x2b,0x93,0xe5,0x9d, +0x05,0xe3,0x77,0x22,0x91,0xf7,0x34,0x64,0x3c,0x22,0x91,0x1d,0x5e,0xe1,0x09, +0x90,0xbc,0x14,0xfe,0xfc,0x75,0x58,0x19,0xe1,0x79,0xb7,0x07,0x92,0xa3,0xae, +0x88,0x59,0x08,0xd8,0x9f,0x07,0xca,0x03,0x58,0xfc,0x68,0x29,0x6d,0x32,0xd7, +0xd2,0xa8,0xcb,0x4b,0xfc,0xe1,0x0b,0x48,0x32,0x4f,0xe6,0xeb,0xb8,0xad,0x4f, +0xe4,0x5c,0x6f,0x13,0x94,0x99,0xdb,0x95,0xd5,0x75,0xdb,0xa8,0x1a,0xb7,0x94, +0x91,0xb4,0x77,0x5b,0xf5,0x48,0x0c,0x8f,0x6a,0x79,0x7d,0x14,0x70,0x04,0x7d, +0x6d,0xaf,0x90,0xf5,0xda,0x70,0xd8,0x47,0xb7,0xbf,0x9b,0x2f,0x6c,0xe7,0x05, +0xb7,0xe1,0x11,0x60,0xac,0x79,0x91,0x14,0x7c,0xc5,0xd6,0xa6,0xe4,0xe1,0x7e, +0xd5,0xc3,0x7e,0xe5,0x92,0xd2,0x3c,0x00,0xb5,0x36,0x82,0xde,0x79,0xe1,0x6d, +0xf3,0xb5,0x6e,0xf8,0x9f,0x33,0xc9,0xcb,0x52,0x7d,0x73,0x98,0x36,0xdb,0x8b, +0xa1,0x6b,0xa2,0x95,0x97,0x9b,0xa3,0xde,0xc2,0x4d,0x26,0xff,0x06,0x96,0x67, +0x25,0x06,0xc8,0xe7,0xac,0xe4,0xee,0x12,0x33,0x95,0x31,0x99,0xc8,0x35,0x08, +0x4e,0x34,0xca,0x79,0x53,0xd5,0xb5,0xbe,0x63,0x32,0x59,0x40,0x36,0xc0,0xa5, +0x4e,0x04,0x4d,0x3d,0xdb,0x5b,0x07,0x33,0xe4,0x58,0xbf,0xef,0x3f,0x53,0x64, +0xd8,0x42,0x59,0x35,0x57,0xfd,0x0f,0x45,0x7c,0x24,0x04,0x4d,0x9e,0xd6,0x38, +0x74,0x11,0x97,0x22,0x90,0xce,0x68,0x44,0x74,0x92,0x6f,0xd5,0x4b,0x6f,0xb0, +0x86,0xe3,0xc7,0x36,0x42,0xa0,0xd0,0xfc,0xc1,0xc0,0x5a,0xf9,0xa3,0x61,0xb9, +0x30,0x47,0x71,0x96,0x0a,0x16,0xb0,0x91,0xc0,0x42,0x95,0xef,0x10,0x7f,0x28, +0x6a,0xe3,0x2a,0x1f,0xb1,0xe4,0xcd,0x03,0x3f,0x77,0x71,0x04,0xc7,0x20,0xfc, +0x49,0x0f,0x1d,0x45,0x88,0xa4,0xd7,0xcb,0x7e,0x88,0xad,0x8e,0x2d,0xec,0x45, +0xdb,0xc4,0x51,0x04,0xc9,0x2a,0xfc,0xec,0x86,0x9e,0x9a,0x11,0x97,0x5b,0xde, +0xce,0x53,0x88,0xe6,0xe2,0xb7,0xfd,0xac,0x95,0xc2,0x28,0x40,0xdb,0xef,0x04, +0x90,0xdf,0x81,0x33,0x39,0xd9,0xb2,0x45,0xa5,0x23,0x87,0x06,0xa5,0x55,0x89, +0x31,0xbb,0x06,0x2d,0x60,0x0e,0x41,0x18,0x7d,0x1f,0x2e,0xb5,0x97,0xcb,0x11, +0xeb,0x15,0xd5,0x24,0xa5,0x94,0xef,0x15,0x14,0x89,0xfd,0x4b,0x73,0xfa,0x32, +0x5b,0xfc,0xd1,0x33,0x00,0xf9,0x59,0x62,0x70,0x07,0x32,0xea,0x2e,0xab,0x40, +0x2d,0x7b,0xca,0xdd,0x21,0x67,0x1b,0x30,0x99,0x8f,0x16,0xaa,0x23,0xa8,0x41, +0xd1,0xb0,0x6e,0x11,0x9b,0x36,0xc4,0xde,0x40,0x74,0x9c,0xe1,0x58,0x65,0xc1, +0x60,0x1e,0x7a,0x5b,0x38,0xc8,0x8f,0xbb,0x04,0x26,0x7c,0xd4,0x16,0x40,0xe5, +0xb6,0x6b,0x6c,0xaa,0x86,0xfd,0x00,0xbf,0xce,0xc1,0x35,0x02,0x03,0x01,0x00, +0x01 }; + +static BOOL WINAPI verify_ms_root_policy(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus) +{ + BOOL ret = verify_base_policy(szPolicyOID, pChainContext, pPolicyPara, + pPolicyStatus); + + if (ret && !pPolicyStatus->dwError) + { + CERT_PUBLIC_KEY_INFO msPubKey = { { 0 } }; + BOOL isMSRoot = FALSE; + DWORD i; + CRYPT_DATA_BLOB keyBlobs[] = { + { sizeof(msPubKey1), msPubKey1 }, + { sizeof(msPubKey2), msPubKey2 }, + { sizeof(msPubKey3), msPubKey3 }, + }; + PCERT_SIMPLE_CHAIN rootChain = + pChainContext->rgpChain[pChainContext->cChain -1 ]; + PCCERT_CONTEXT root = + rootChain->rgpElement[rootChain->cElement - 1]->pCertContext; + + for (i = 0; !isMSRoot && i < sizeof(keyBlobs) / sizeof(keyBlobs[0]); + i++) + { + msPubKey.PublicKey.cbData = keyBlobs[i].cbData; + msPubKey.PublicKey.pbData = keyBlobs[i].pbData; + if (CertComparePublicKeyInfo( + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + &root->pCertInfo->SubjectPublicKeyInfo, &msPubKey)) + isMSRoot = TRUE; + } + if (isMSRoot) + pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = 0; + } + return ret; +} + typedef BOOL (WINAPI *CertVerifyCertificateChainPolicyFunc)(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus); @@ -1552,6 +1666,9 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, case (int)CERT_CHAIN_POLICY_BASIC_CONSTRAINTS: verifyPolicy = verify_basic_constraints_policy; break; + case (int)CERT_CHAIN_POLICY_MICROSOFT_ROOT: + verifyPolicy = verify_ms_root_policy; + break; default: FIXME("unimplemented for %d\n", LOWORD(szPolicyOID)); }

1 0

Juan Lang : hhctrl.ocx: Avoid spamming console.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 776f434a6e7c00801b6d96a256e8947c2dd61ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=776f434a6e7c00801b6d96a25… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 11:19:56 2007 -0700 hhctrl.ocx: Avoid spamming console. --- dlls/hhctrl.ocx/hhctrl.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 44a1eb3..2ca3d84 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -151,6 +151,16 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return NULL; /* FIXME */ } + case HH_PRETRANSLATEMESSAGE: { + static BOOL warned = FALSE; + + if (!warned) + { + FIXME("HH_PRETRANSLATEMESSAGE unimplemented\n"); + warned = TRUE; + } + return 0; + } default: FIXME("HH case %s not handled.\n", command_to_string( command )); }

1 0

Juan Lang : setupapi: Avoid spamming console.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 1392883b8ea51a49b7aa69e5da2155645915f3fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1392883b8ea51a49b7aa69e5d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 11:18:22 2007 -0700 setupapi: Avoid spamming console. --- dlls/setupapi/misc.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index bc3e764..1e88485 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -852,7 +852,13 @@ void WINAPI pSetupSetGlobalFlags( DWORD flags ) */ DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout ) { - FIXME("%d\n", dwTimeout); + static BOOL warned = FALSE; + + if (!warned) + { + FIXME("%d\n", dwTimeout); + warned = TRUE; + } return WAIT_OBJECT_0; }

1 0

Juan Lang : wininet.h: Add some more defines.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: dce5feb1a83011c820deb7cbac2fe03c8f1c7238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce5feb1a83011c820deb7cba… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 11:15:38 2007 -0700 wininet.h: Add some more defines. --- include/wininet.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 5b1f4fe..8293ce7 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -307,6 +307,70 @@ typedef struct _INTERNET_CACHE_GROUP_INFOW { DECL_WINELIB_TYPE_AW(INTERNET_CACHE_GROUP_INFO) DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_GROUP_INFO) +typedef struct _INTERNET_PER_CONN_OPTIONA { + DWORD dwOption; + union { + DWORD dwValue; + LPSTR pszValue; + FILETIME ftValue; + } Value; +} INTERNET_PER_CONN_OPTIONA, *LPINTERNET_PER_CONN_OPTIONA; + +typedef struct _INTERNET_PER_CONN_OPTIONW { + DWORD dwOption; + union { + DWORD dwValue; + LPWSTR pszValue; + FILETIME ftValue; + } Value; +} INTERNET_PER_CONN_OPTIONW, *LPINTERNET_PER_CONN_OPTIONW; + +DECL_WINELIB_TYPE_AW(INTERNET_PER_CONN_OPTION) +DECL_WINELIB_TYPE_AW(LPINTERNET_PER_CONN_OPTION) + +#define INTERNET_PER_CONN_FLAGS 1 +#define INTERNET_PER_CONN_PROXY_SERVER 2 +#define INTERNET_PER_CONN_PROXY_BYPASS 3 +#define INTERNET_PER_CONN_AUTOCONFIG_URL 4 +#define INTERNET_PER_CONN_AUTODISCOVERY_FLAGS 5 +#define INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL 6 +#define INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS 7 +#define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME 8 +#define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL 9 + +/* Values for INTERNET_PER_CONN_FLAGS */ +#define PROXY_TYPE_DIRECT 0x00000001 +#define PROXY_TYPE_PROXY 0x00000002 +#define PROXY_TYPE_AUTO_PROXY_URL 0x00000004 +#define PROXY_TYPE_AUTO_DETECT 0x00000008 +/* Values for INTERNET_PER_CONN_AUTODISCOVERY_FLAGS */ +#define AUTO_PROXY_FLAG_USER_SET 0x00000001 +#define AUTO_PROXY_FLAG_ALWAYS_DETECT 0x00000002 +#define AUTO_PROXY_FLAG_DETECTION_RUN 0x00000004 +#define AUTO_PROXY_FLAG_MIGRATED 0x00000008 +#define AUTO_PROXY_FLAG_DONT_CACHE_PROXY_RESULT 0x00000010 +#define AUTO_PROXY_FLAG_CACHE_INIT_RUN 0x00000020 +#define AUTO_PROXY_FLAG_DETECTION_SUSPECT 0x00000040 + +typedef struct _INTERNET_PER_CONN_OPTION_LISTA { + DWORD dwSize; + LPSTR pszConnection; + DWORD dwOptionCount; + DWORD dwOptionError; + LPINTERNET_PER_CONN_OPTIONA pOptions; +} INTERNET_PER_CONN_OPTION_LISTA, *LPINTERNET_PER_CONN_OPTION_LISTA; + +typedef struct _INTERNET_PER_CONN_OPTION_LISTW { + DWORD dwSize; + LPWSTR pszConnection; + DWORD dwOptionCount; + DWORD dwOptionError; + LPINTERNET_PER_CONN_OPTIONW pOptions; +} INTERNET_PER_CONN_OPTION_LISTW, *LPINTERNET_PER_CONN_OPTION_LISTW; + +DECL_WINELIB_TYPE_AW(INTERNET_PER_CONN_OPTION_LIST) +DECL_WINELIB_TYPE_AW(LPINTERNET_PER_CONN_OPTION_LIST) + BOOLAPI InternetTimeFromSystemTimeA(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); BOOLAPI InternetTimeFromSystemTimeW(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); #define InternetTimeFromSystemTime WINELIB_NAME_AW(InternetTimeFromSystemTime)

1 0

Juan Lang : wincrypt.h: Add a few more definitions.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: a62afe7403b422afdb4652f135e866ee21f540ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62afe7403b422afdb4652f13… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 10:52:44 2007 -0700 wincrypt.h: Add a few more definitions. --- include/wincrypt.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index f59bd79..df709fe 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -872,7 +872,13 @@ typedef struct _HTTPSPolicyCallbackData { DWORD dwAuthType; DWORD fdwChecks; WCHAR *pwszServerName; -} HTTPSPolicyCallbackData, *PHTTPSPolicyCallbackData; +} HTTPSPolicyCallbackData, *PHTTPSPolicyCallbackData, + SSL_EXTRA_CERT_CHAIN_POLICY_PARA, *PSSL_EXTRA_CERT_CHAIN_POLICY_PARA; + +/* Values for HTTPSPolicyCallbackData's dwAuthType */ +#define AUTHTYPE_CLIENT 1 +#define AUTHTYPE_SERVER 2 +/* Values for HTTPSPolicyCallbackData's fdwChecks are defined in wininet.h */ #define BASIC_CONSTRAINTS_CERT_CHAIN_POLICY_CA_FLAG 0x80000000 #define BASIC_CONSTRAINTS_CERT_CHAIN_POLICY_END_ENTITY_FLAG 0x40000000

1 0

Alexandre Julliard : kernel32: Fix GlobalMemoryStatus to take into account the IMAGE_FILE_LARGE_ADDRESS_AWARE flag .
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: b22183703f8f77f8e1e32482f34934cadd207963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22183703f8f77f8e1e32482f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 22:32:36 2007 +0200 kernel32: Fix GlobalMemoryStatus to take into account the IMAGE_FILE_LARGE_ADDRESS_AWARE flag. Also the page file size must not be truncated to 2Gb no matter what the flag is set to. --- dlls/kernel32/heap.c | 57 +++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 587499a..f3b269f 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1220,13 +1220,18 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) int rval; #endif + if (lpmemex->dwLength != sizeof(*lpmemex)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (time(NULL)==cache_lastchecked) { memcpy(lpmemex,&cached_memstatus,sizeof(*lpmemex)); return TRUE; } cache_lastchecked = time(NULL); - lpmemex->dwLength = sizeof(*lpmemex); lpmemex->dwMemoryLoad = 0; lpmemex->ullTotalPhys = 16*1024*1024; lpmemex->ullAvailPhys = 16*1024*1024; @@ -1366,10 +1371,12 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { MEMORYSTATUSEX memstatus; OSVERSIONINFOW osver; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( GetModuleHandleW(0) ); /* Because GlobalMemoryStatus is identical to GlobalMemoryStatusEX save for one extra field in the struct, and the lack of a bug, we simply call GlobalMemoryStatusEx and copy the values across. */ + memstatus.dwLength = sizeof(memstatus); GlobalMemoryStatusEx(&memstatus); lpBuffer->dwLength = sizeof(*lpBuffer); @@ -1377,7 +1384,6 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) /* Windows 2000 and later report -1 when values are greater than 4 Gb. * NT reports values modulo 4 Gb. - * Values between 2 Gb and 4 Gb are rounded down to 2 Gb. */ osver.dwOSVersionInfoSize = sizeof(osver); @@ -1385,33 +1391,32 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) if ( osver.dwMajorVersion >= 5 ) { - lpBuffer->dwTotalPhys = (memstatus.ullTotalPhys > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalPhys > MAXLONG) ? MAXLONG : memstatus.ullTotalPhys; - lpBuffer->dwAvailPhys = (memstatus.ullAvailPhys > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailPhys > MAXLONG) ? MAXLONG : memstatus.ullAvailPhys; - lpBuffer->dwTotalPageFile = (memstatus.ullTotalPageFile > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalPageFile > MAXLONG) ? MAXLONG : memstatus.ullTotalPageFile; - lpBuffer->dwAvailPageFile = (memstatus.ullAvailPageFile > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailPageFile > MAXLONG) ? MAXLONG : memstatus.ullAvailPageFile; - lpBuffer->dwTotalVirtual = (memstatus.ullTotalVirtual > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalVirtual > MAXLONG) ? MAXLONG : memstatus.ullTotalVirtual; - lpBuffer->dwAvailVirtual = (memstatus.ullAvailVirtual > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailVirtual > MAXLONG) ? MAXLONG : memstatus.ullAvailVirtual; + lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); + lpBuffer->dwAvailPhys = min( memstatus.ullAvailPhys, MAXDWORD ); + lpBuffer->dwTotalPageFile = min( memstatus.ullTotalPageFile, MAXDWORD ); + lpBuffer->dwAvailPageFile = min( memstatus.ullAvailPageFile, MAXDWORD ); + lpBuffer->dwTotalVirtual = min( memstatus.ullTotalVirtual, MAXDWORD ); + lpBuffer->dwAvailVirtual = min( memstatus.ullAvailVirtual, MAXDWORD ); + } else /* duplicate NT bug */ { - lpBuffer->dwTotalPhys = (memstatus.ullTotalPhys > MAXDWORD) ? memstatus.ullTotalPhys : - (memstatus.ullTotalPhys > MAXLONG) ? MAXLONG : memstatus.ullTotalPhys; - lpBuffer->dwAvailPhys = (memstatus.ullAvailPhys > MAXDWORD) ? memstatus.ullAvailPhys : - (memstatus.ullAvailPhys > MAXLONG) ? MAXLONG : memstatus.ullAvailPhys; - lpBuffer->dwTotalPageFile = (memstatus.ullTotalPageFile > MAXDWORD) ? memstatus.ullTotalPageFile : - (memstatus.ullTotalPageFile > MAXLONG) ? MAXLONG : memstatus.ullTotalPageFile; - lpBuffer->dwAvailPageFile = (memstatus.ullAvailPageFile > MAXDWORD) ? memstatus.ullAvailPageFile : - (memstatus.ullAvailPageFile > MAXLONG) ? MAXLONG : memstatus.ullAvailPageFile; - lpBuffer->dwTotalVirtual = (memstatus.ullTotalVirtual > MAXDWORD) ? memstatus.ullTotalVirtual : - (memstatus.ullTotalVirtual > MAXLONG) ? MAXLONG : memstatus.ullTotalVirtual; - lpBuffer->dwAvailVirtual = (memstatus.ullAvailVirtual > MAXDWORD) ? memstatus.ullAvailVirtual : - (memstatus.ullAvailVirtual > MAXLONG) ? MAXLONG : memstatus.ullAvailVirtual; + lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; + lpBuffer->dwAvailPhys = memstatus.ullAvailPhys; + lpBuffer->dwTotalPageFile = memstatus.ullTotalPageFile; + lpBuffer->dwAvailPageFile = memstatus.ullAvailPageFile; + lpBuffer->dwTotalVirtual = memstatus.ullTotalVirtual; + lpBuffer->dwAvailVirtual = memstatus.ullAvailVirtual; + } + + /* values are limited to 2Gb unless the app has the IMAGE_FILE_LARGE_ADDRESS_AWARE flag */ + /* page file sizes are not limited (Adobe Illustrator 8 depends on this) */ + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) + { + if (lpBuffer->dwTotalPhys > MAXLONG) lpBuffer->dwTotalPhys = MAXLONG; + if (lpBuffer->dwAvailPhys > MAXLONG) lpBuffer->dwAvailPhys = MAXLONG; + if (lpBuffer->dwTotalVirtual > MAXLONG) lpBuffer->dwTotalVirtual = MAXLONG; + if (lpBuffer->dwAvailVirtual > MAXLONG) lpBuffer->dwAvailVirtual = MAXLONG; } /* work around for broken photoshop 4 installer */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2007