August 2009 - Wine-Commits - list.winehq.org

Marcus Meissner : fnt2bdf: Fixed 2 resource leaks.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: a30625306d1cdfad74ac27fd677ba38d0ca338fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30625306d1cdfad74ac27fd6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 8 10:44:09 2009 +0200 fnt2bdf: Fixed 2 resource leaks. --- tools/fnt2bdf.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index 277764b..f9f6647 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -216,7 +216,10 @@ static int dump_bdf( fnt_fontS* cpe_font_struct, unsigned char* file_buffer) } ic = dump_bdf_hdr(fp, cpe_font_struct, file_buffer); - if (ic) return (ic); + if (ic) { + fclose(fp); + return (ic); + } /* NOW, convert all chars to UNIX (lton) notation... */ @@ -544,7 +547,7 @@ int main(int argc, char **argv) parse_options( argc, argv); - if( (fd = open( g_lpstrInputFile, O_RDONLY | O_BINARY)) ) + if( (fd = open( g_lpstrInputFile, O_RDONLY | O_BINARY)) != -1 ) { int i; struct stat file_stat;

1 0

Marcus Meissner : wrc: Handle "no files == stdin".
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 39d4d12c08e033d997c25d28078c65f3ab8f6a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d4d12c08e033d997c25d280… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 8 11:00:36 2009 +0200 wrc: Handle "no files == stdin". --- tools/wrc/wrc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 6a856eb..5879d92 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -514,6 +514,13 @@ int main(int argc,char *argv[]) } if (load_file( input_name, output_name )) exit(1); } + /* stdin special case. NULL means "stdin" for wpp. */ + if (nb_files == 0) + { + if(!output_name && !preprocess_only) + output_name = strdup("wrc.tab.res"); + if (load_file( NULL, output_name )) exit(1); + } if(debuglevel & DEBUGLEVEL_DUMP) dump_resources(resource_top);

1 0

Marcus Meissner : winebuild: Added missing close.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 051535961ac3a4a7465a971a989f29b623e061a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=051535961ac3a4a7465a971a9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 8 10:53:56 2009 +0200 winebuild: Added missing close. --- tools/winebuild/res16.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c index 8a26ae2..a81f63b 100644 --- a/tools/winebuild/res16.c +++ b/tools/winebuild/res16.c @@ -184,6 +184,7 @@ void load_res16_file( const char *name, DLLSPEC *spec ) file_pos = base; file_end = file_pos + st.st_size; while (file_pos < file_end) load_next_resource( spec ); + close (fd); } /* compare two strings/ids */

1 0

Vincent Povirk : windowscodecs: Add support for BI_BITFIELDS compressed BMP files.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: b364bc005d2daae3867f94e91e9985382a2ba3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b364bc005d2daae3867f94e91… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 14 14:16:03 2009 -0500 windowscodecs: Add support for BI_BITFIELDS compressed BMP files. --- dlls/windowscodecs/bmpdecode.c | 64 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 1c63253..5c805c8 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -619,6 +619,24 @@ static HRESULT BmpFrameDecode_ReadUnsupported(BmpFrameDecode* This) return E_FAIL; } +struct bitfields_format { + WORD bitcount; /* 0 for end of list */ + DWORD redmask; + DWORD greenmask; + DWORD bluemask; + DWORD alphamask; + const WICPixelFormatGUID *pixelformat; + ReadDataFunc read_data_func; +}; + +static const struct bitfields_format bitfields_formats[] = { + {16,0x7c00,0x3e0,0x1f,0,&GUID_WICPixelFormat16bppBGR555,BmpFrameDecode_ReadUncompressed}, + {16,0xf800,0x7e0,0x1f,0,&GUID_WICPixelFormat16bppBGR565,BmpFrameDecode_ReadUncompressed}, + {32,0xff0000,0xff00,0xff,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadUncompressed}, + {32,0xff0000,0xff00,0xff,0xff000000,&GUID_WICPixelFormat32bppBGRA,BmpFrameDecode_ReadUncompressed}, + {0} +}; + static const IWICBitmapFrameDecodeVtbl BmpFrameDecode_Vtbl = { BmpFrameDecode_QueryInterface, BmpFrameDecode_AddRef, @@ -677,6 +695,17 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) if (FAILED(hr)) return hr; if (bytestoread != bytesread) return E_FAIL; + /* if this is a BITMAPINFOHEADER with BI_BITFIELDS compression, we need to + read the extra fields */ + if (This->bih.bV5Size == sizeof(BITMAPINFOHEADER) && + This->bih.bV5Compression == BI_BITFIELDS) + { + hr = IStream_Read(stream, &This->bih.bV5RedMask, 12, &bytesread); + if (FAILED(hr)) return hr; + if (bytesread != 12) return E_FAIL; + This->bih.bV5AlphaMask = 0; + } + /* decide what kind of bitmap this is and how/if we can read it */ if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) { @@ -753,6 +782,41 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) This->read_data_func = BmpFrameDecode_ReadRLE4; This->pixelformat = &GUID_WICPixelFormat32bppBGR; break; + case BI_BITFIELDS: + { + const struct bitfields_format *format; + if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER2)) + { + /* BCH2 doesn't support bitfields; this is Huffman 1D compression */ + This->bitsperpixel = 0; + This->read_data_func = BmpFrameDecode_ReadUnsupported; + This->pixelformat = &GUID_WICPixelFormatUndefined; + FIXME("Huffman 1D compression is unsupported\n"); + break; + } + This->bitsperpixel = This->bih.bV5BitCount; + for (format = bitfields_formats; format->bitcount; format++) + { + if ((format->bitcount == This->bih.bV5BitCount) && + (format->redmask == This->bih.bV5RedMask) && + (format->greenmask == This->bih.bV5GreenMask) && + (format->bluemask == This->bih.bV5BlueMask) && + (format->alphamask == This->bih.bV5AlphaMask)) + { + This->read_data_func = format->read_data_func; + This->pixelformat = format->pixelformat; + break; + } + } + if (!format->bitcount) + { + This->read_data_func = BmpFrameDecode_ReadUncompressed; + This->pixelformat = &GUID_WICPixelFormatUndefined; + FIXME("unsupported bitfields type depth=%i red=%x green=%x blue=%x alpha=%x\n", + This->bih.bV5BitCount, This->bih.bV5RedMask, This->bih.bV5GreenMask, This->bih.bV5BlueMask, This->bih.bV5AlphaMask); + } + break; + } default: This->bitsperpixel = 0; This->read_data_func = BmpFrameDecode_ReadUnsupported;

1 0

Vincent Povirk : include: Add more pixel formats to wincodec.idl.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 42f4004aceac74a695aadd141334ddf639de79e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f4004aceac74a695aadd141… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 14 14:15:20 2009 -0500 include: Add more pixel formats to wincodec.idl. --- include/wincodec.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 6c868f4..4925e01 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -106,8 +106,11 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppIndexed, 0x6fddc324,0x4e03,0x4bfe, cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x04);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x09);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR565, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0a);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x10);") typedef struct WICRect { INT X;

1 0

Juan Lang : rsaenh: Implement exporting PLAINTEXTKEYBLOBs.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: d2827be07f42d4d59d2bb3d83894d58fc85bbaba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2827be07f42d4d59d2bb3d83… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 7 10:53:47 2009 -0700 rsaenh: Implement exporting PLAINTEXTKEYBLOBs. --- dlls/rsaenh/rsaenh.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index dbc78c7..8ae9659 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2481,6 +2481,33 @@ static BOOL crypt_export_private_key(CRYPTKEY *pCryptKey, BOOL force, return TRUE; } +static BOOL crypt_export_plaintext_key(CRYPTKEY *pCryptKey, BYTE *pbData, + DWORD *pdwDataLen) +{ + BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; + DWORD *pKeyLen = (DWORD*)(pBlobHeader+1); + BYTE *pbKey = (BYTE*)(pKeyLen+1); + DWORD dwDataLen; + + dwDataLen = sizeof(BLOBHEADER) + sizeof(DWORD) + pCryptKey->dwKeyLen; + if (pbData) { + if (*pdwDataLen < dwDataLen) { + SetLastError(ERROR_MORE_DATA); + *pdwDataLen = dwDataLen; + return FALSE; + } + + pBlobHeader->bType = PLAINTEXTKEYBLOB; + pBlobHeader->bVersion = CUR_BLOB_VERSION; + pBlobHeader->reserved = 0; + pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; + + *pKeyLen = pCryptKey->dwKeyLen; + memcpy(pbKey, &pCryptKey->abKeyValue, pCryptKey->dwKeyLen); + } + *pdwDataLen = dwDataLen; + return TRUE; +} /****************************************************************************** * crypt_export_key [Internal] * @@ -2535,6 +2562,9 @@ static BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey, case PRIVATEKEYBLOB: return crypt_export_private_key(pCryptKey, force, pbData, pdwDataLen); + + case PLAINTEXTKEYBLOB: + return crypt_export_plaintext_key(pCryptKey, pbData, pdwDataLen); default: SetLastError(NTE_BAD_TYPE); /* FIXME: error code? */

1 0

Juan Lang : rsaenh: Implement importing PLAINTEXTKEYBLOBs.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: ff6328efcc011574bbc1e3267768f954a97650c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6328efcc011574bbc1e3267… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 7 10:47:59 2009 -0700 rsaenh: Implement importing PLAINTEXTKEYBLOBs. --- dlls/rsaenh/rsaenh.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index f44db39..dbc78c7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2834,6 +2834,53 @@ static BOOL import_symmetric_key(HCRYPTPROV hProv, CONST BYTE *pbData, } /****************************************************************************** + * import_plaintext_key [Internal] + * + * Import a plaintext key into a key container. + * + * PARAMS + * hProv [I] Key container into which the symmetric key is to be imported. + * pbData [I] Pointer to a buffer which holds the plaintext key BLOB. + * dwDataLen [I] Length of data in buffer at pbData. + * dwFlags [I] One of: + * CRYPT_EXPORTABLE: the imported key is marked exportable + * phKey [O] Handle to the imported key. + * + * + * NOTES + * Assumes the caller has already checked the BLOBHEADER at pbData to ensure + * it's a PLAINTEXTKEYBLOB. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. + */ +static BOOL import_plaintext_key(HCRYPTPROV hProv, CONST BYTE *pbData, + DWORD dwDataLen, DWORD dwFlags, + HCRYPTKEY *phKey) +{ + CRYPTKEY *pCryptKey; + CONST BLOBHEADER *pBlobHeader = (CONST BLOBHEADER*)pbData; + CONST DWORD *pKeyLen = (CONST DWORD *)(pBlobHeader + 1); + CONST BYTE *pbKeyStream = (CONST BYTE*)(pKeyLen + 1); + + if (dwDataLen < sizeof(BLOBHEADER)+sizeof(DWORD)+*pKeyLen) + { + SetLastError(NTE_BAD_DATA); /* FIXME: error code */ + return FALSE; + } + + *phKey = new_key(hProv, pBlobHeader->aiKeyAlg, *pKeyLen<<19, &pCryptKey); + if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) + return FALSE; + memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); + setup_key(pCryptKey); + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; + return TRUE; +} + +/****************************************************************************** * import_key [Internal] * * Import a BLOB'ed key into a key container, optionally storing the key's @@ -2893,6 +2940,10 @@ static BOOL import_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, return import_symmetric_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); + case PLAINTEXTKEYBLOB: + return import_plaintext_key(hProv, pbData, dwDataLen, dwFlags, + phKey); + default: SetLastError(NTE_BAD_TYPE); /* FIXME: error code? */ return FALSE;

1 0

Juan Lang : wintrust: Correct alignment for 64-bit.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 64b320b7d9b2696f6ab9a22c420cf0cead6a9c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b320b7d9b2696f6ab9a22c4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 7 08:59:12 2009 -0700 wintrust: Correct alignment for 64-bit. --- dlls/wintrust/asn.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index ec5c4de..002eab5 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1465,6 +1465,10 @@ struct AsnDecodeSequenceItem DWORD size; }; +/* Align up to a DWORD_PTR boundary + */ +#define ALIGN_DWORD_PTR(x) (((x) + sizeof(DWORD_PTR) - 1) & ~(sizeof(DWORD_PTR) - 1)) + /* Decodes the items in a sequence, where the items are described in items, * the encoded data are in pbEncoded with length cbEncoded. Decodes into * pvStructInfo. nextData is a pointer to the memory location at which the @@ -1517,9 +1521,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, if (ret) { /* Account for alignment padding */ - if (items[i].size % sizeof(DWORD)) - items[i].size += sizeof(DWORD) - - items[i].size % sizeof(DWORD); + items[i].size = ALIGN_DWORD_PTR(items[i].size); TRACE("item %d size: %d\n", i, items[i].size); if (nextData && items[i].hasPointer && items[i].size > items[i].minSize)

1 0

Juan Lang : secur32: Implement QueryContextAttributes for SECPKG_ATTR_CONNECTION_INFO.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 15512454fb99130a7884b9d36547d0eb377f1ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15512454fb99130a7884b9d36… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 7 08:38:17 2009 -0700 secur32: Implement QueryContextAttributes for SECPKG_ATTR_CONNECTION_INFO. --- dlls/secur32/schannel.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 201304b..cd204c1 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -50,6 +50,7 @@ MAKE_FUNCPTR(gnutls_certificate_allocate_credentials); MAKE_FUNCPTR(gnutls_certificate_free_credentials); MAKE_FUNCPTR(gnutls_certificate_get_peers); MAKE_FUNCPTR(gnutls_cipher_get); +MAKE_FUNCPTR(gnutls_cipher_get_key_size); MAKE_FUNCPTR(gnutls_credentials_set); MAKE_FUNCPTR(gnutls_deinit); MAKE_FUNCPTR(gnutls_global_deinit); @@ -58,9 +59,11 @@ MAKE_FUNCPTR(gnutls_global_set_log_function); MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_handshake); MAKE_FUNCPTR(gnutls_init); +MAKE_FUNCPTR(gnutls_kx_get); MAKE_FUNCPTR(gnutls_mac_get); MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); +MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_set_default_priority); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); @@ -858,6 +861,69 @@ static unsigned int schannel_get_cipher_block_size(gnutls_cipher_algorithm_t cip return 1; } +static DWORD schannel_get_protocol(gnutls_protocol_t proto) +{ + /* FIXME: currently schannel only implements client connections, but + * there's no reason it couldn't be used for servers as well. The + * context doesn't tell us which it is, so assume client for now. + */ + switch (proto) + { + case GNUTLS_SSL3: return SP_PROT_SSL3_CLIENT; + case GNUTLS_TLS1_0: return SP_PROT_TLS1_CLIENT; + default: + FIXME("unknown protocol %d\n", proto); + return 0; + } +} + +static ALG_ID schannel_get_cipher_algid(gnutls_cipher_algorithm_t cipher) +{ + switch (cipher) + { + case GNUTLS_CIPHER_UNKNOWN: + case GNUTLS_CIPHER_NULL: return 0; + case GNUTLS_CIPHER_DES_CBC: + case GNUTLS_CIPHER_3DES_CBC: return CALG_DES; + case GNUTLS_CIPHER_AES_128_CBC: + case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES; + case GNUTLS_CIPHER_RC2_40_CBC: return CALG_RC2; + default: + FIXME("unknown algorithm %d\n", cipher); + return 0; + } +} + +static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) +{ + switch (mac) + { + case GNUTLS_MAC_UNKNOWN: + case GNUTLS_MAC_NULL: return 0; + case GNUTLS_MAC_MD5: return CALG_MD5; + case GNUTLS_MAC_SHA1: + case GNUTLS_MAC_SHA256: + case GNUTLS_MAC_SHA384: + case GNUTLS_MAC_SHA512: return CALG_SHA; + default: + FIXME("unknown algorithm %d\n", mac); + return 0; + } +} + +static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) +{ + switch (kx) + { + case GNUTLS_KX_RSA: return CALG_RSA_KEYX; + case GNUTLS_KX_DHE_DSS: + case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; + default: + FIXME("unknown algorithm %d\n", kx); + return 0; + } +} + static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( PCtxtHandle context_handle, ULONG attribute, PVOID buffer) { @@ -910,6 +976,24 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( else return SEC_E_INTERNAL_ERROR; } + case SECPKG_ATTR_CONNECTION_INFO: + { + SecPkgContext_ConnectionInfo *info = buffer; + gnutls_protocol_t proto = pgnutls_protocol_get_version(ctx->session); + gnutls_cipher_algorithm_t alg = pgnutls_cipher_get(ctx->session); + gnutls_mac_algorithm_t mac = pgnutls_mac_get(ctx->session); + gnutls_kx_algorithm_t kx = pgnutls_kx_get(ctx->session); + + info->dwProtocol = schannel_get_protocol(proto); + info->aiCipher = schannel_get_cipher_algid(alg); + info->dwCipherStrength = pgnutls_cipher_get_key_size(alg); + info->aiHash = schannel_get_mac_algid(mac); + info->dwHashStrength = pgnutls_mac_get_key_size(mac); + info->aiExch = schannel_get_kx_algid(kx); + /* FIXME: info->dwExchStrength? */ + info->dwExchStrength = 0; + return SEC_E_OK; + } default: FIXME("Unhandled attribute %#x\n", attribute); @@ -929,6 +1013,8 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( return schan_QueryContextAttributesW(context_handle, attribute, buffer); case SECPKG_ATTR_REMOTE_CERT_CONTEXT: return schan_QueryContextAttributesW(context_handle, attribute, buffer); + case SECPKG_ATTR_CONNECTION_INFO: + return schan_QueryContextAttributesW(context_handle, attribute, buffer); default: FIXME("Unhandled attribute %#x\n", attribute); @@ -1263,6 +1349,7 @@ void SECUR32_initSchannelSP(void) LOAD_FUNCPTR(gnutls_certificate_free_credentials) LOAD_FUNCPTR(gnutls_certificate_get_peers) LOAD_FUNCPTR(gnutls_cipher_get) + LOAD_FUNCPTR(gnutls_cipher_get_key_size) LOAD_FUNCPTR(gnutls_credentials_set) LOAD_FUNCPTR(gnutls_deinit) LOAD_FUNCPTR(gnutls_global_deinit) @@ -1271,9 +1358,11 @@ void SECUR32_initSchannelSP(void) LOAD_FUNCPTR(gnutls_global_set_log_level) LOAD_FUNCPTR(gnutls_handshake) LOAD_FUNCPTR(gnutls_init) + LOAD_FUNCPTR(gnutls_kx_get) LOAD_FUNCPTR(gnutls_mac_get) LOAD_FUNCPTR(gnutls_mac_get_key_size) LOAD_FUNCPTR(gnutls_perror) + LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_set_default_priority) LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send);

1 0

Alexander Nicolaysen Sørnes : screenshot : Fix default values for objectGetEntries[Count]
by Alexander Nicolaysen Sørnes Aug. 9, 2009

Aug. 9, 2009

Module: appdb Branch: master Commit: c8bdd765e9390ea33aea0d52e1d8219a4906846f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c8bdd765e9390ea33aea0d52… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 9 22:21:22 2009 +0200 screenshot: Fix default values for objectGetEntries[Count] --- include/screenshot.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 6e2ccf9..91378fc 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -687,13 +687,13 @@ class screenshot return $oFilter; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = true) + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = null) { return appData::objectGetEntries($sState, $iRows, $iStart, $sOrderBy, $bAscending, 'screenshot', $oFilters); } - function objectGetEntriesCount($sState, $oFilters = true) + function objectGetEntriesCount($sState, $oFilters = null) { return appData::objectGetEntriesCount($sState, 'screenshot', $oFilters); }

1 0