February 2009 - Wine-commits

Juan Lang : crypt32: Don' t assume intermediate certificates are allowed to be CAs.
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: 913affe4efa990a9e3e40b5a5b168d5da7667f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=913affe4efa990a9e3e40b5a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 10:07:33 2009 -0800 crypt32: Don't assume intermediate certificates are allowed to be CAs. --- dlls/crypt32/chain.c | 21 ++++++++++++++++----- dlls/crypt32/tests/chain.c | 6 ++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 64aba77..30b1422 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -412,8 +412,12 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, } /* Checks element's basic constraints to see if it can act as a CA, with - * remainingCAs CAs left in this chain. Updates chainConstraints with the - * element's constraints, if: + * remainingCAs CAs left in this chain. A root certificate is assumed to be + * allowed to be a CA whether or not the basic constraints extension is present, + * whereas an intermediate CA cert is not. This matches the expected usage in + * RFC 3280: a conforming intermediate CA MUST contain the basic constraints + * extension. It also appears to match Microsoft's implementation. + * Updates chainConstraints with the element's constraints, if: * 1. chainConstraints doesn't have a path length constraint, or * 2. element's path length constraint is smaller than chainConstraints's * Sets *pathLengthConstraintViolated to TRUE if a path length violation @@ -423,13 +427,13 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, */ static BOOL CRYPT_CheckBasicConstraintsForCA(PCCERT_CONTEXT cert, CERT_BASIC_CONSTRAINTS2_INFO *chainConstraints, DWORD remainingCAs, - BOOL *pathLengthConstraintViolated) + BOOL isRoot, BOOL *pathLengthConstraintViolated) { BOOL validBasicConstraints; CERT_BASIC_CONSTRAINTS2_INFO constraints; if ((validBasicConstraints = CRYPT_DecodeBasicConstraints(cert, - &constraints, TRUE))) + &constraints, isRoot))) { if (!constraints.fCA) { @@ -825,6 +829,13 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_TRUST_IS_NOT_TIME_VALID; if (i != 0) { + BOOL isRoot; + + if (i == chain->cElement - 1) + isRoot = CRYPT_IsCertificateSelfSigned( + chain->rgpElement[i]->pCertContext); + else + isRoot = FALSE; /* Check the signature of the cert this issued */ if (!CryptVerifyCertificateSignatureEx(0, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, @@ -841,7 +852,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_TRUST_INVALID_BASIC_CONSTRAINTS; else if (!CRYPT_CheckBasicConstraintsForCA( chain->rgpElement[i]->pCertContext, &constraints, i - 1, - &pathLengthConstraintViolated)) + isRoot, &pathLengthConstraintViolated)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_INVALID_BASIC_CONSTRAINTS; else if (constraints.fPathLenConstraint && diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 0b5263b..6197841 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1566,8 +1566,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, simpleStatus8 }, - TODO_ERROR }, + 1, simpleStatus8 }, 0 }, /* Earlier versions of Windows incorrectly don't set * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. */ @@ -1795,8 +1794,7 @@ static const ChainPolicyCheck basicConstraintsPolicyCheck[] = { { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, - { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, - TODO_ERROR | TODO_CHAINS | TODO_ELEMENTS }, + { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, 0 }, { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, 0 }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 },

1 0

Juan Lang : crypt32: Set the info status on the last element of a chain even if its issuer can' t be found.
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: b5d1bfe5ba874006d63d456db2d5a8bf71cb07d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d1bfe5ba874006d63d456db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 10:07:56 2009 -0800 crypt32: Set the info status on the last element of a chain even if its issuer can't be found. --- dlls/crypt32/chain.c | 10 +++++----- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 30b1422..dce06b7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -995,8 +995,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, issuer = CertFindCertificateInStore(store, subject->dwCertEncodingType, 0, CERT_FIND_SUBJECT_NAME, &subject->pCertInfo->Issuer, prevIssuer); - if (issuer) - *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; + *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } return issuer; } @@ -1013,12 +1012,13 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - DWORD infoStatus; - PCCERT_CONTEXT issuer = CRYPT_GetIssuer(world, cert, NULL, &infoStatus); + PCCERT_CONTEXT issuer = CRYPT_GetIssuer(world, cert, NULL, + &chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus); if (issuer) { - ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, infoStatus); + ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, + chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus); /* CRYPT_AddCertToSimpleChain add-ref's the issuer, so free it to * close the enumeration that found it */ diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 6197841..9c59965 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1620,7 +1620,7 @@ static ChainCheck chainCheckNoStore[] = { { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_PARTIAL_CHAIN, 0 }, 1, simpleStatus8NoStore }, - TODO_INFO }, + 0 }, }; /* Wednesday, Oct 1, 2007 */

1 0

Juan Lang : crypt32: Include more info about skipped checks in skip message .
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: de2c6b8640cd2c4bbfd1d69bc7c2ba0c9a11e21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2c6b8640cd2c4bbfd1d69bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 10 10:52:33 2009 -0800 crypt32: Include more info about skipped checks in skip message. --- dlls/crypt32/tests/chain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 67b7e92..0b5263b 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1863,7 +1863,9 @@ static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, testIndex, check->status.dwError, policyStatus.dwError); if (policyStatus.dwError != check->status.dwError) { - skip("error doesn't match, not checking indexes\n"); + skip("%s[%d]: error %08x doesn't match expected %08x, not checking indexes\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), + testIndex, policyStatus.dwError, check->status.dwError); pCertFreeCertificateChain(chain); return; }

1 0

Juan Lang : crypt32: Add chain debugging channel for debugging certificate chaining errors.
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: e7dd46b8075af3003acf5e3194f79ee7fe9119a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7dd46b8075af3003acf5e319… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 10:06:27 2009 -0800 crypt32: Add chain debugging channel for debugging certificate chaining errors. --- dlls/crypt32/chain.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 6d7bb54..f36d360 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -28,6 +28,7 @@ #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); +WINE_DECLARE_DEBUG_CHANNEL(chain); #define DEFAULT_CYCLE_MODULUS 7 @@ -709,6 +710,101 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) } } +static void dump_basic_constraints(PCERT_EXTENSION ext) +{ + CERT_BASIC_CONSTRAINTS_INFO *info; + DWORD size = 0; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, szOID_BASIC_CONSTRAINTS, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, + NULL, &info, &size)) + { + TRACE_(chain)("SubjectType: %02x\n", info->SubjectType.pbData[0]); + TRACE_(chain)("%s path length constraint\n", + info->fPathLenConstraint ? "has" : "doesn't have"); + TRACE_(chain)("path length=%d\n", info->dwPathLenConstraint); + LocalFree(info); + } +} + +static void dump_basic_constraints2(PCERT_EXTENSION ext) +{ + CERT_BASIC_CONSTRAINTS2_INFO constraints; + DWORD size = sizeof(CERT_BASIC_CONSTRAINTS2_INFO); + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, + szOID_BASIC_CONSTRAINTS2, ext->Value.pbData, ext->Value.cbData, + 0, NULL, &constraints, &size)) + { + TRACE_(chain)("basic constraints:\n"); + TRACE_(chain)("can%s be a CA\n", constraints.fCA ? "" : "not"); + TRACE_(chain)("%s path length constraint\n", + constraints.fPathLenConstraint ? "has" : "doesn't have"); + TRACE_(chain)("path length=%d\n", constraints.dwPathLenConstraint); + } +} + +static void dump_extension(PCERT_EXTENSION ext) +{ + TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId), + ext->fCritical ? "" : "not "); + if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS)) + dump_basic_constraints(ext); + else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS2)) + dump_basic_constraints2(ext); +} + +static LPCWSTR filetime_to_str(const FILETIME *time) +{ + static WCHAR date[80]; + WCHAR dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ + SYSTEMTIME sysTime; + + if (!time) return NULL; + + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, + sizeof(dateFmt) / sizeof(dateFmt[0])); + FileTimeToSystemTime(time, &sysTime); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, + sizeof(date) / sizeof(date[0])); + return date; +} + +static void dump_element(PCCERT_CONTEXT cert) +{ + LPWSTR name = NULL; + DWORD len, i; + + TRACE_(chain)("%p\n", cert); + len = CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, + CERT_NAME_ISSUER_FLAG, NULL, NULL, 0); + name = CryptMemAlloc(len * sizeof(WCHAR)); + if (name) + { + CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, + CERT_NAME_ISSUER_FLAG, NULL, name, len); + TRACE_(chain)("issued by %s\n", debugstr_w(name)); + CryptMemFree(name); + } + len = CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, + NULL, 0); + name = CryptMemAlloc(len * sizeof(WCHAR)); + if (name) + { + CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, + name, len); + TRACE_(chain)("issued to %s\n", debugstr_w(name)); + CryptMemFree(name); + } + TRACE_(chain)("valid from %s", + debugstr_w(filetime_to_str(&cert->pCertInfo->NotBefore))); + TRACE_(chain)("to %s\n", + debugstr_w(filetime_to_str(&cert->pCertInfo->NotAfter))); + TRACE_(chain)("%d extensions\n", cert->pCertInfo->cExtension); + for (i = 0; i < cert->pCertInfo->cExtension; i++) + dump_extension(&cert->pCertInfo->rgExtension[i]); +} + static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, PCERT_SIMPLE_CHAIN chain, LPFILETIME time) { @@ -717,8 +813,12 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, BOOL pathLengthConstraintViolated = FALSE; CERT_BASIC_CONSTRAINTS2_INFO constraints = { TRUE, FALSE, 0 }; + TRACE_(chain)("checking chain with %d elements for time %s\n", + chain->cElement, debugstr_w(filetime_to_str(time))); for (i = chain->cElement - 1; i >= 0; i--) { + if (TRACE_ON(chain)) + dump_element(chain->rgpElement[i]->pCertContext); if (CertVerifyTimeValidity(time, chain->rgpElement[i]->pCertContext->pCertInfo) != 0) chain->rgpElement[i]->TrustStatus.dwErrorStatus |=

1 0

Juan Lang : crypt32: Change some traces to the chain channel.
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: ad2ea9d9cfc040a3b38ab10f0813462d6f88a74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2ea9d9cfc040a3b38ab10f0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 10:06:48 2009 -0800 crypt32: Change some traces to the chain channel. --- dlls/crypt32/chain.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index f36d360..64aba77 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -356,7 +356,7 @@ static void CRYPT_CheckRootCert(HCERTCHAINENGINE hRoot, CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, (void *)root, CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)root, 0, NULL)) { - TRACE("Last certificate's signature is invalid\n"); + TRACE_(chain)("Last certificate's signature is invalid\n"); rootElement->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_SIGNATURE_VALID; } @@ -433,7 +433,7 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(PCCERT_CONTEXT cert, { if (!constraints.fCA) { - TRACE("chain element %d can't be a CA\n", remainingCAs + 1); + TRACE_(chain)("chain element %d can't be a CA\n", remainingCAs + 1); validBasicConstraints = FALSE; } else if (constraints.fPathLenConstraint) @@ -445,7 +445,7 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(PCCERT_CONTEXT cert, constraints.dwPathLenConstraint < chainConstraints->dwPathLenConstraint) { - TRACE("setting path length constraint to %d\n", + TRACE_(chain)("setting path length constraint to %d\n", chainConstraints->dwPathLenConstraint); chainConstraints->fPathLenConstraint = TRUE; chainConstraints->dwPathLenConstraint = @@ -456,8 +456,8 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(PCCERT_CONTEXT cert, if (chainConstraints->fPathLenConstraint && remainingCAs > chainConstraints->dwPathLenConstraint) { - TRACE("remaining CAs %d exceed max path length %d\n", remainingCAs, - chainConstraints->dwPathLenConstraint); + TRACE_(chain)("remaining CAs %d exceed max path length %d\n", + remainingCAs, chainConstraints->dwPathLenConstraint); validBasicConstraints = FALSE; *pathLengthConstraintViolated = TRUE; } @@ -1016,7 +1016,7 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, } else { - TRACE("Couldn't find issuer, halting chain creation\n"); + TRACE_(chain)("Couldn't find issuer, halting chain creation\n"); chain->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_PARTIAL_CHAIN; break; }

1 0

Michael Stefaniuc : imm32: Make space for a 64bit pointer in the IMM window .
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: 7d2b787783193d32ba2d6c4e7fcd0754bf753418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2b787783193d32ba2d6c4e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 11 16:21:11 2009 +0100 imm32: Make space for a 64bit pointer in the IMM window. --- dlls/imm32/imm.c | 2 +- dlls/winex11.drv/ime.c | 4 ++-- include/ddk/imm.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 14178c3..bb50e5e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2291,7 +2291,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, data->immKbd->hIME, 0); - SetWindowLongW(data->imeWnd, IMMGWL_IMC, (LONG)data); + SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); IMM_GetThreadData()->hwndDefault = data->imeWnd; } diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 87d4faa..cfb0110 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -135,7 +135,7 @@ static void IME_RegisterClasses(void) wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; wndClass.lpfnWndProc = IME_WindowProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = 2 * sizeof(LONG); + wndClass.cbWndExtra = 2 * sizeof(LONG_PTR); wndClass.hInstance = x11drv_module; wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); wndClass.hIcon = LoadIconW(NULL, (LPWSTR)IDI_APPLICATION); @@ -1326,7 +1326,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, * messages. */ - hIMC = (HIMC)GetWindowLongW(hwnd,IMMGWL_IMC); + hIMC = (HIMC)GetWindowLongPtrW(hwnd,IMMGWL_IMC); if (!hIMC) hIMC = RealIMC(FROM_X11); diff --git a/include/ddk/imm.h b/include/ddk/imm.h index 6e4d42f..bc9617e 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -114,7 +114,7 @@ HIMCC WINAPI ImmReSizeIMCC(HIMCC, DWORD); DWORD WINAPI ImmGetIMCCSize(HIMCC); #define IMMGWL_IMC 0 -#define IMMGWL_PRIVATE (sizeof(LONG)) +#define IMMGWL_PRIVATE (sizeof(LONG_PTR)) /* IME Property bits */ #define IME_PROP_END_UNLOAD 0x0001

1 0

David Adam : d3dx9_36: Remove a duplicate declaration for D3DXGetFVFVertexSize.
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: ff4a3f3d263ba28812e42733249f0619ef9e6905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4a3f3d263ba28812e427332… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Feb 11 17:24:41 2009 +0100 d3dx9_36: Remove a duplicate declaration for D3DXGetFVFVertexSize. --- include/d3dx9mesh.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 72ea607..a85f80d 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -31,7 +31,6 @@ BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); -UINT WINAPI D3DXGetFVFVertexSize(DWORD); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); #ifdef __cplusplus

1 0

Aric Stewart : wininet: Print better stubs for the internet options IE7 uses.
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: 101991255b0e91b9ccfdc6ea0b1d4b1b0acc908f URL: http://source.winehq.org/git/wine.git/?a=commit;h=101991255b0e91b9ccfdc6ea0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 11 10:50:36 2009 -0600 wininet: Print better stubs for the internet options IE7 uses. --- dlls/wininet/internet.c | 31 +++++++++++++++++++++++++++++-- include/wininet.h | 5 +++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 363f7a4..a14a158 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2367,8 +2367,35 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_DISABLE_AUTODIAL: FIXME("Option INTERNET_OPTION_DISABLE_AUTODIAL; STUB\n"); break; - case 86: - FIXME("86\n"); + case INTERNET_OPTION_HTTP_DECODING: + FIXME("INTERNET_OPTION_HTTP_DECODING; STUB\n"); + INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + ret = FALSE; + break; + case INTERNET_OPTION_COOKIES_3RD_PARTY: + FIXME("INTERNET_OPTION_COOKIES_3RD_PARTY; STUB\n"); + INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + ret = FALSE; + break; + case INTERNET_OPTION_SEND_UTF8_SERVERNAME_TO_PROXY: + FIXME("INTERNET_OPTION_SEND_UTF8_SERVERNAME_TO_PROXY; STUB\n"); + INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + ret = FALSE; + break; + case INTERNET_OPTION_CODEPAGE_PATH: + FIXME("INTERNET_OPTION_CODEPAGE_PATH; STUB\n"); + INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + ret = FALSE; + break; + case INTERNET_OPTION_CODEPAGE_EXTRA: + FIXME("INTERNET_OPTION_CODEPAGE_EXTRA; STUB\n"); + INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + ret = FALSE; + break; + case INTERNET_OPTION_IDN: + FIXME("INTERNET_OPTION_IDN; STUB\n"); + INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); + ret = FALSE; break; default: FIXME("Option %d STUB\n",dwOption); diff --git a/include/wininet.h b/include/wininet.h index 523fb48..d3263fe 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -540,6 +540,7 @@ BOOLAPI InternetUnlockRequestFile(HANDLE); #define INTERNET_OPTION_ERROR_MASK 62 #define INTERNET_OPTION_FROM_CACHE_TIMEOUT 63 #define INTERNET_OPTION_BYPASS_EDITED_ENTRY 64 +#define INTERNET_OPTION_HTTP_DECODING 65 #define INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO 67 #define INTERNET_OPTION_CODEPAGE 68 #define INTERNET_OPTION_CACHE_TIMESTAMPS 69 @@ -571,6 +572,10 @@ BOOLAPI InternetUnlockRequestFile(HANDLE); #define INTERNET_OPTION_PROXY_SETTINGS_CHANGED 95 #define INTERNET_OPTION_DATAFILE_EXT 96 +#define INTERNET_OPTION_CODEPAGE_PATH 100 +#define INTERNET_OPTION_CODEPAGE_EXTRA 101 +#define INTERNET_OPTION_IDN 102 + #define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK #define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT

1 0

Alexandre Julliard : loader: Start phasing out the LinuxThreads support.
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: 4ccf78fbcd6df296365a22a41855c9287360596b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccf78fbcd6df296365a22a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 11:42:06 2009 +0100 loader: Start phasing out the LinuxThreads support. --- loader/glibc.c | 14 +++++++++++++- loader/kthread.c | 8 -------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/loader/glibc.c b/loader/glibc.c index 28a8d19..e312cf3 100644 --- a/loader/glibc.c +++ b/loader/glibc.c @@ -56,11 +56,23 @@ static void *xmalloc( size_t size ) /* separate thread to check for NPTL and TLS features */ static void *needs_pthread( void *arg ) { + const char *loader; pid_t tid = gettid(); /* check for NPTL */ if (tid != -1 && tid != getpid()) return (void *)1; /* check for TLS glibc */ - return (void *)(wine_get_gs() != 0); + if (wine_get_gs() != 0) return (void *)1; + /* check for exported epoll_create to detect new glibc versions without TLS */ + if (wine_dlsym( RTLD_DEFAULT, "epoll_create", NULL, 0 )) + fprintf( stderr, + "wine: glibc >= 2.3 without NPTL or TLS is not a supported combination.\n" + " Please upgrade to a glibc with NPTL support.\n" ); + else + fprintf( stderr, + "wine: Your C library is too old. You need at least glibc 2.3 with NPTL support.\n" ); + if (!(loader = getenv( "WINELOADER" )) || !strstr( loader, "wine-kthread" )) + exit(1); + return 0; } /* return the name of the Wine threading variant to use */ diff --git a/loader/kthread.c b/loader/kthread.c index c791ef6..fcdd34d 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -907,14 +907,6 @@ void __pthread_initialize(void) if (!done) { done = 1; - /* check for exported epoll_create to detect glibc versions that we cannot support */ - if (wine_dlsym( RTLD_DEFAULT, "epoll_create", NULL, 0 )) - { - static const char warning[] = - "wine: glibc >= 2.3 without NPTL or TLS is not a supported combination.\n" - " It will most likely crash. Please upgrade to a glibc with NPTL support.\n"; - write( 2, warning, sizeof(warning)-1 ); - } libc_fork = wine_dlsym( RTLD_NEXT, "fork", NULL, 0 ); libc_sigaction = wine_dlsym( RTLD_NEXT, "sigaction", NULL, 0 ); libc_uselocale = wine_dlsym( RTLD_DEFAULT, "uselocale", NULL, 0 );

1 0

Artem Reznikov : wininet: Ukranian translation.
by Alexandre Julliard 12 Feb '09

12 Feb '09

Module: wine Branch: master Commit: 30f9296409d83f516569d456142f10ecea26f749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f9296409d83f516569d4561… Author: Artem Reznikov <temarez(a)yandex.ru> Date: Wed Feb 11 15:49:36 2009 +0100 wininet: Ukranian translation. --- dlls/wininet/rsrc.rc | 1 + dlls/wininet/wininet_Uk.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc index 29e72d6..5a81511 100644 --- a/dlls/wininet/rsrc.rc +++ b/dlls/wininet/rsrc.rc @@ -61,5 +61,6 @@ #include "wininet_Ru.rc" #include "wininet_Si.rc" #include "wininet_Sv.rc" +#include "wininet_Uk.rc" #include "wininet_Tr.rc" #include "wininet_Zh.rc" diff --git a/dlls/wininet/wininet_Uk.rc b/dlls/wininet/wininet_Uk.rc new file mode 100644 index 0000000..be58bb6 --- /dev/null +++ b/dlls/wininet/wininet_Uk.rc @@ -0,0 +1,46 @@ +/* + * wininet.dll (Ukrainian resources) + * + * Copyright 2006 Artem Reznikov + * + * 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 + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� , �� '� �� :", -1, 40, 6, 150, 15 + LTEXT "��", -1, 40, 26, 50, 10 + LTEXT "��", -1, 40, 46, 50, 10 + LTEXT "��", -1, 40, 66, 50, 10 + LTEXT "��", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&�� (��)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "ϳ�� " +}

1 0