August 2007 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Use the authority key identifier to search for a certificate's issuer.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: d89528b0161fd3524500aa6bcaac86473ec3631a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89528b0161fd3524500aa6bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 7 13:14:02 2007 -0700 crypt32: Use the authority key identifier to search for a certificate's issuer. --- dlls/crypt32/cert.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c9f31e3..5e5bed8 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -961,8 +961,105 @@ static BOOL compare_cert_by_cert_id(PCCERT_CONTEXT pCertContext, DWORD dwType, static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { - return compare_cert_by_subject_cert(pCertContext, dwType, dwFlags, - ((PCCERT_CONTEXT)pvPara)->pCertInfo); + BOOL ret = FALSE; + PCCERT_CONTEXT subject = (PCCERT_CONTEXT)pvPara; + PCERT_EXTENSION ext; + DWORD size; + + if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER, + subject->pCertInfo->cExtension, subject->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_KEY_ID_INFO *info; + + ret = CryptDecodeObjectEx(subject->dwCertEncodingType, + X509_AUTHORITY_KEY_ID, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &info, &size); + if (ret) + { + CERT_ID id; + + if (info->CertIssuer.cbData && info->CertSerialNumber.cbData) + { + id.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + memcpy(&id.u.IssuerSerialNumber.Issuer, &info->CertIssuer, + sizeof(CERT_NAME_BLOB)); + memcpy(&id.u.IssuerSerialNumber.SerialNumber, + &info->CertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); + ret = compare_cert_by_cert_id(pCertContext, dwType, dwFlags, + &id); + } + else if (info->KeyId.cbData) + { + id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); + ret = compare_cert_by_cert_id(pCertContext, dwType, dwFlags, + &id); + } + else + ret = FALSE; + LocalFree(info); + } + } + else if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER2, + subject->pCertInfo->cExtension, subject->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_KEY_ID2_INFO *info; + + ret = CryptDecodeObjectEx(subject->dwCertEncodingType, + X509_AUTHORITY_KEY_ID2, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &info, &size); + if (ret) + { + CERT_ID id; + + if (info->AuthorityCertIssuer.cAltEntry && + info->AuthorityCertSerialNumber.cbData) + { + PCERT_ALT_NAME_ENTRY directoryName = NULL; + DWORD i; + + for (i = 0; !directoryName && + i < info->AuthorityCertIssuer.cAltEntry; i++) + if (info->AuthorityCertIssuer.rgAltEntry[i].dwAltNameChoice + == CERT_ALT_NAME_DIRECTORY_NAME) + directoryName = + &info->AuthorityCertIssuer.rgAltEntry[i]; + if (directoryName) + { + id.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + memcpy(&id.u.IssuerSerialNumber.Issuer, + &directoryName->u.DirectoryName, sizeof(CERT_NAME_BLOB)); + memcpy(&id.u.IssuerSerialNumber.SerialNumber, + &info->AuthorityCertSerialNumber, + sizeof(CRYPT_INTEGER_BLOB)); + ret = compare_cert_by_cert_id(pCertContext, dwType, dwFlags, + &id); + } + else + { + FIXME("no supported name type in authority key id2\n"); + ret = FALSE; + } + } + else if (info->KeyId.cbData) + { + id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); + ret = compare_cert_by_cert_id(pCertContext, dwType, dwFlags, + &id); + } + else + ret = FALSE; + LocalFree(info); + } + } + else + ret = compare_cert_by_name(pCertContext, + CERT_COMPARE_NAME | CERT_COMPARE_SUBJECT_CERT, dwFlags, + &subject->pCertInfo->Issuer); + return ret; } PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore,

1 0

Juan Lang : crypt32: Fix typo.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: c91e591a95d15c09b994d2d7f25798d7e3e0942e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91e591a95d15c09b994d2d7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 7 09:19:41 2007 -0700 crypt32: Fix typo. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index cc9de4b..c9f31e3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -767,7 +767,7 @@ BOOL WINAPI CertCompareIntegerBlob(PCRYPT_INTEGER_BLOB pInt1, if (cb1 == cb2) { if (cb1) - ret = !memcmp(pInt1->pbData, pInt1->pbData, cb1); + ret = !memcmp(pInt1->pbData, pInt2->pbData, cb1); else ret = TRUE; }

1 0

Misha Koshelev : urlmon/tests: Add test for binding to a URL from which a very short response is received .
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 59b2365c7d03cedba303c5545eace6460e024d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b2365c7d03cedba303c5545… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue Aug 7 20:11:18 2007 -0500 urlmon/tests: Add test for binding to a URL from which a very short response is received. --- dlls/urlmon/tests/url.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ef3bd30..031d76f 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -93,6 +93,10 @@ static const WCHAR TEST_PART_URL_1[] = {'/','t','e','s','t','/','\0'}; static const WCHAR WINE_ABOUT_URL[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.', 'o','r','g','/','s','i','t','e','/','a','b','o','u','t',0}; +static const WCHAR SHORT_RESPONSE_URL[] = + {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', + 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', + 'p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR ABOUT_BLANK[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static WCHAR INDEX_HTML[MAX_PATH]; static const WCHAR ITS_URL[] = @@ -108,7 +112,7 @@ static BOOL stopped_binding = FALSE, emulate_protocol = FALSE, data_available = FALSE, http_is_first = TRUE; static DWORD read = 0, bindf = 0; -static const LPCWSTR urls[] = { +static LPCWSTR urls[] = { WINE_ABOUT_URL, ABOUT_BLANK, INDEX_HTML, @@ -910,7 +914,7 @@ static void test_BindToStorage(int protocol, BOOL emul) } CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == HTTP_TEST) - CHECK_CALLED(OnProgress_DOWNLOADINGDATA); + CLEAR_CALLED(OnProgress_DOWNLOADINGDATA); CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); CHECK_CALLED(OnDataAvailable); CHECK_CALLED(OnStopBinding); @@ -998,6 +1002,11 @@ START_TEST(url) trace("http test...\n"); test_BindToStorage(HTTP_TEST, FALSE); + trace("http test (short response)...\n"); + http_is_first = TRUE; + urls[HTTP_TEST] = SHORT_RESPONSE_URL; + test_BindToStorage(HTTP_TEST, FALSE); + trace("about test...\n"); CoInitialize(NULL); test_BindToStorage(ABOUT_TEST, FALSE);

1 0

Juan Lang : crypt32: Implement CertRDNValueToStr for UTF-8 strings.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 05d2ab176a83d251c5fd698885ae892e0f971c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d2ab176a83d251c5fd69888… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 7 09:18:44 2007 -0700 crypt32: Implement CertRDNValueToStr for UTF-8 strings. --- dlls/crypt32/str.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index ef2d2e3..96430dc 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -59,6 +59,17 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, } } break; + case CERT_RDN_UTF8_STRING: + if (!psz || !csz) + ret = WideCharToMultiByte(CP_UTF8, 0, (LPWSTR)pValue->pbData, + pValue->cbData / sizeof(WCHAR) + 1, NULL, 0, NULL, NULL); + else + { + ret = WideCharToMultiByte(CP_UTF8, 0, (LPWSTR)pValue->pbData, + pValue->cbData / sizeof(WCHAR) + 1, psz, csz - 1, NULL, NULL); + csz -= ret; + } + break; default: FIXME("string type %d unimplemented\n", dwValueType); } @@ -110,6 +121,24 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, } } break; + case CERT_RDN_UTF8_STRING: + if (!psz || !csz) + ret = pValue->cbData / sizeof(WCHAR); + else + { + DWORD chars = min(pValue->cbData / sizeof(WCHAR), csz - 1); + + if (chars) + { + DWORD i; + + for (i = 0; i < chars; i++) + psz[i] = *((LPWSTR)pValue->pbData + i); + ret += chars; + csz -= chars; + } + } + break; default: FIXME("string type %d unimplemented\n", dwValueType); }

1 0

Juan Lang : crypt32: Introduce cryptasn debug channel to quiet down crypt traces.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 53087dbe12ea5997c554755107e69c128443fe73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53087dbe12ea5997c55475510… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 7 09:19:17 2007 -0700 crypt32: Introduce cryptasn debug channel to quiet down crypt traces. --- dlls/crypt32/decode.c | 9 +++++---- dlls/crypt32/encode.c | 17 +++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 495febd..5601862 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -53,7 +53,8 @@ #define ASN_FLAGS_MASK 0xe0 #define ASN_TYPE_MASK 0x1f -WINE_DEFAULT_DEBUG_CHANNEL(crypt); +WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); +WINE_DECLARE_DEBUG_CHANNEL(crypt); struct GenericArray { @@ -132,7 +133,7 @@ BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, CryptDecodeObjectFunc pCryptDecodeObject; HCRYPTOIDFUNCADDR hFunc; - TRACE("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, + TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); @@ -3988,7 +3989,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, CryptDecodeObjectExFunc decodeFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE("(0x%08x, %s, %p, %d, 0x%08x, %p, %p, %p)\n", + TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); @@ -4154,7 +4155,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) decodeFunc = CRYPT_AsnDecodeIssuingDistPoint; else - TRACE("OID %s not found or unimplemented, looking for DLL\n", + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", debugstr_a(lpszStructType)); if (!decodeFunc) { diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index e361e77..591a1e0 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -47,7 +47,8 @@ #include "wine/unicode.h" #include "crypt32_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(crypt); +WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); +WINE_DECLARE_DEBUG_CHANNEL(crypt); typedef BOOL (WINAPI *CryptEncodeObjectFunc)(DWORD, LPCSTR, const void *, BYTE *, DWORD *); @@ -99,7 +100,7 @@ BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, HCRYPTOIDFUNCADDR hFunc; CryptEncodeObjectFunc pCryptEncodeObject; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE_(crypt)("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); @@ -3343,7 +3344,7 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, CryptEncodeObjectExFunc encodeFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, + TRACE_(crypt)("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara, pvEncoded, pcbEncoded); @@ -3499,7 +3500,7 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) encodeFunc = CRYPT_AsnEncodeIssuingDistPoint; else - TRACE("OID %s not found or unimplemented, looking for DLL\n", + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", debugstr_a(lpszStructType)); if (!encodeFunc) { @@ -3613,9 +3614,9 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptPro ExportPublicKeyInfoExFunc exportFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, dwKeySpec, - dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, pvAuxInfo, - pInfo, pcbInfo); + TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, + dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, + pvAuxInfo, pInfo, pcbInfo); if (!hCryptProv) { @@ -3692,7 +3693,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, ImportPublicKeyInfoExFunc importFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, + TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); if (!set)

1 0

James Hawkins : msi: Implement the remaining contexts for MsiQueryComponentState.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 0713c3286934e38704125f3a55748cf03b1756f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0713c3286934e38704125f3a5… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 7 14:25:14 2007 -0700 msi: Implement the remaining contexts for MsiQueryComponentState. --- dlls/msi/msi.c | 55 ++++++++++++++++++++++++++++++---------------- dlls/msi/tests/install.c | 30 ++++++++++++++++++++----- dlls/msi/tests/msi.c | 41 ++++++++-------------------------- 3 files changed, 70 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0713c3286934e38704125…

1 0

Nigel Liang : winecfg: Fix apply button always available in graphics tab bug.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 6e56e37b2d4176912fbc81778c3580c2debb5712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e56e37b2d4176912fbc81778… Author: Nigel Liang <ncliang(a)gmail.com> Date: Tue Aug 7 12:02:27 2007 -0700 winecfg: Fix apply button always available in graphics tab bug. --- programs/winecfg/x11drvdlg.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 5f6e2d6..fbe0dad 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -257,12 +257,16 @@ static void init_dpi_editbox(HWND hDlg) DWORD dwLogpixels; char szLogpixels[MAXBUFLEN]; + updating_ui = TRUE; + dwLogpixels = read_logpixels_reg(); WINE_TRACE("%d\n", (int) dwLogpixels); szLogpixels[0] = 0; sprintf(szLogpixels, "%d", dwLogpixels); SendMessage(hDpiEditBox, WM_SETTEXT, 0, (LPARAM) szLogpixels); + + updating_ui = FALSE; } static void init_trackbar(HWND hDlg) @@ -270,10 +274,14 @@ static void init_trackbar(HWND hDlg) HWND hTrackBar = GetDlgItem(hDlg, IDC_RES_TRACKBAR); DWORD dwLogpixels; + updating_ui = TRUE; + dwLogpixels = read_logpixels_reg(); SendMessageW(hTrackBar, TBM_SETRANGE, TRUE, MAKELONG(MINDPI, MAXDPI)); SendMessageW(hTrackBar, TBM_SETPOS, TRUE, dwLogpixels); + + updating_ui = FALSE; } INT_PTR CALLBACK @@ -330,8 +338,6 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; } case PSN_APPLY: { - int i = SendMessageW(GetDlgItem(hDlg, IDC_RES_TRACKBAR), TBM_GETPOS, 0, 0); - set_reg_key_dword(HKEY_LOCAL_MACHINE, logpixels_reg, "LogPixels", i); apply(); SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); break; @@ -351,6 +357,7 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) buf[0] = 0; sprintf(buf, "%d", i); SendMessage(GetDlgItem(hDlg, IDC_RES_DPIEDIT), WM_SETTEXT, 0, (LPARAM) buf); + set_reg_key_dword(HKEY_LOCAL_MACHINE, logpixels_reg, "LogPixels", i); break; } }

1 0

Nigel Liang : winecfg: Fix crash in graphics tab.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 4a21ad9f5cb5cf7c7865d27a7f8efd6deece982c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a21ad9f5cb5cf7c7865d27a7… Author: Nigel Liang <ncliang(a)gmail.com> Date: Tue Aug 7 12:02:26 2007 -0700 winecfg: Fix crash in graphics tab. --- programs/winecfg/x11drvdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index fbe0dad..0a4e597 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -246,7 +246,7 @@ static INT read_logpixels_reg(void) DWORD dwLogPixels; char *buf = get_reg_key(HKEY_LOCAL_MACHINE, logpixels_reg, "LogPixels", NULL); - dwLogPixels = *buf; + dwLogPixels = buf ? *buf : DEFDPI; HeapFree(GetProcessHeap(), 0, buf); return dwLogPixels; }

1 0

Andrew Talbot : quartz: Constify some variables.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 1f3133d2149052748275e76f2688925731c665e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3133d2149052748275e76f2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 7 21:01:25 2007 +0100 quartz: Constify some variables. --- dlls/quartz/control.c | 2 +- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/filtermapper.c | 2 +- dlls/quartz/memallocator.c | 2 +- dlls/quartz/parser.c | 3 ++- dlls/quartz/parser.h | 3 ++- dlls/quartz/pin.c | 3 ++- dlls/quartz/pin.h | 3 ++- dlls/quartz/transform.c | 4 +++- 10 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 5f13df6..4a7eb02 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -163,7 +163,7 @@ HRESULT WINAPI MediaSeekingImpl_ConvertTimeFormat(IMediaSeeking * iface, LONGLON return E_INVALIDARG; } -static inline LONGLONG Adjust(LONGLONG value, LONGLONG * pModifier, DWORD dwFlags) +static inline LONGLONG Adjust(LONGLONG value, const LONGLONG * pModifier, DWORD dwFlags) { switch (dwFlags & AM_SEEKING_PositioningBitsMask) { diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9e73eee..a7ebd9f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -146,7 +146,7 @@ static inline HRESULT DSoundRender_GetPos(DSoundRenderImpl *This, DWORD *pPlayPo return hr; } -static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DWORD size) +static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, const BYTE *data, DWORD size) { HRESULT hr; LPBYTE lpbuf1 = NULL; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index df1929d..a64562a 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -89,7 +89,7 @@ static int EventsQueue_Destroy(EventsQueue* omr) return TRUE; } -static int EventsQueue_PutEvent(EventsQueue* omr, Event* evt) +static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) { EnterCriticalSection(&omr->msg_crst); if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size))) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 7f36fd2..8b7cf7d 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -189,7 +189,7 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) return index; } -static int find_data(struct Vector * v, const BYTE * pData, int size) +static int find_data(const struct Vector * v, const BYTE * pData, int size) { int index; for (index = 0; index < v->current; index++) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f9c64ac..f1700aa 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -void dump_AM_SAMPLE2_PROPERTIES(AM_SAMPLE2_PROPERTIES * pProps) +void dump_AM_SAMPLE2_PROPERTIES(const AM_SAMPLE2_PROPERTIES * pProps) { if (!pProps) { diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 9bbda09..39ea58b 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -495,7 +495,8 @@ static const IBaseFilterVtbl Parser_Vtbl = Parser_QueryVendorInfo }; -HRESULT Parser_AddPin(ParserImpl * This, PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, AM_MEDIA_TYPE * amt, float fSamplesPerSec, DWORD dwSampleSize, DWORD dwLength) +HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, + const AM_MEDIA_TYPE * amt, float fSamplesPerSec, DWORD dwSampleSize, DWORD dwLength) { IPin ** ppOldPins; HRESULT hr; diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 25f1d6d..590e6a5 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -55,5 +55,6 @@ typedef struct Parser_OutputPin MediaSeekingImpl mediaSeeking; } Parser_OutputPin; -HRESULT Parser_AddPin(ParserImpl * This, PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, AM_MEDIA_TYPE * amt, float fSamplesPerSec, DWORD dwSampleSize, DWORD dwLength); +HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, + const AM_MEDIA_TYPE * amt, float fSamplesPerSec, DWORD dwSampleSize, DWORD dwLength); HRESULT Parser_Create(ParserImpl*, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index b7d9a52..9960dff 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -178,7 +178,8 @@ HRESULT InputPin_Init(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LPVOID return S_OK; } -HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES * props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl) +HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, const ALLOCATOR_PROPERTIES * props, LPVOID pUserData, + QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl) { TRACE("\n"); diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 02830cc..29b5a32 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -89,7 +89,8 @@ typedef struct PullPin /*** Initializers ***/ HRESULT InputPin_Init(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, InputPin * pPinImpl); -HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl); +HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, const ALLOCATOR_PROPERTIES *props, LPVOID pUserData, + QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, OutputPin * pPinImpl); HRESULT PullPin_Init(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, PullPin * pPinImpl); /*** Constructors ***/ diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 9adaf17..b63cacd 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -110,7 +110,9 @@ static HRESULT TransformFilter_InputPin_Construct(const PIN_INFO * pPinInfo, SAM return E_FAIL; } -static HRESULT TransformFilter_OutputPin_Construct(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +static HRESULT TransformFilter_OutputPin_Construct(const PIN_INFO * pPinInfo, const ALLOCATOR_PROPERTIES *props, + LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, + LPCRITICAL_SECTION pCritSec, IPin ** ppPin) { OutputPin * pPinImpl;

1 0

Rob Shearman : secur32: Remove valid_session_key from NegoHelper since it is only ever set and not read .
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 610a3b1ad2e6e5e62e5e422f794f9779cbbb0313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610a3b1ad2e6e5e62e5e422f7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Aug 7 17:12:54 2007 +0100 secur32: Remove valid_session_key from NegoHelper since it is only ever set and not read. --- dlls/secur32/ntlm.c | 4 ---- dlls/secur32/secur32_priv.h | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 3300439..21fbc59 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -786,7 +786,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( TRACE("Failed to decode session key\n"); } TRACE("Session key is %s\n", debugstr_a(buffer+3)); - helper->valid_session_key = TRUE; HeapFree(GetProcessHeap(), 0, helper->session_key); helper->session_key = HeapAlloc(GetProcessHeap(), 0, bin_len); if(!helper->session_key) @@ -1155,7 +1154,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( if(strncmp(buffer, "BH ", 3) == 0) { TRACE("Helper sent %s\n", debugstr_a(buffer+3)); - helper->valid_session_key = FALSE; helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); /*FIXME: Generate the dummy session key = MD4(MD4(password))*/ memset(helper->session_key, 0 , 16); @@ -1168,7 +1166,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( TRACE("Failed to decode session key\n"); } TRACE("Session key is %s\n", debugstr_a(buffer+3)); - helper->valid_session_key = TRUE; helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); if(!helper->session_key) { @@ -1226,7 +1223,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContex SECUR32_arc4Cleanup(helper->crypt.ntlm.a4i); HeapFree(GetProcessHeap(), 0, helper->session_key); - helper->valid_session_key = FALSE; SECUR32_arc4Cleanup(helper->crypt.ntlm2.send_a4i); SECUR32_arc4Cleanup(helper->crypt.ntlm2.recv_a4i); HeapFree(GetProcessHeap(), 0, helper->crypt.ntlm2.send_sign_key); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index a11cc20..303d8fc 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -70,7 +70,6 @@ typedef struct _NegoHelper { int com_buf_size; int com_buf_offset; BYTE *session_key; - BOOL valid_session_key; unsigned long neg_flags; struct { struct {

1 0