January 2010 - Wine-commits

Alexandre Julliard : msacm32: Clear the type field when deleting a driver.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 6bc1a359f882e685b7632f036dddd32d99a8c4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc1a359f882e685b7632f036… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:47:44 2010 +0100 msacm32: Clear the type field when deleting a driver. --- dlls/msacm32/driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 9ca16dc..c02d89f 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -214,6 +214,7 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose) else if (pad->pLocalDrvrInst) MSACM_CloseLocalDriver(pad->pLocalDrvrInst); + pad->obj.dwType = 0; HeapFree(MSACM_hHeap, 0, pad); return MMSYSERR_NOERROR;

1 0

Alexandre Julliard : comctl32: Actually grow the array in DPA_Grow.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 9e47c59427d5c16cad90d187efd9765f8ee0d90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e47c59427d5c16cad90d187e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 13:18:56 2010 +0100 comctl32: Actually grow the array in DPA_Grow. --- dlls/comctl32/dpa.c | 17 ++++++++++++++++- dlls/comctl32/tests/dpa.c | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index e3c03c8..9682344 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -426,12 +426,27 @@ BOOL WINAPI DPA_Destroy (const HDPA hdpa) */ BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow) { + INT items; TRACE("(%p %d)\n", hdpa, nGrow); if (!hdpa) return FALSE; - hdpa->nGrow = max(8, nGrow); + nGrow = max( 8, nGrow ); + items = nGrow * (((hdpa->nMaxCount - 1) / nGrow) + 1); + if (items > hdpa->nMaxCount) + { + void *ptr; + + if (hdpa->ptrs) + ptr = HeapReAlloc( hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, items * sizeof(LPVOID) ); + else + ptr = HeapAlloc( hdpa->hHeap, HEAP_ZERO_MEMORY, items * sizeof(LPVOID) ); + if (!ptr) return FALSE; + hdpa->nMaxCount = items; + hdpa->ptrs = ptr; + } + hdpa->nGrow = nGrow; return TRUE; } diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 5fb11e3..419c1b1 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -213,9 +213,9 @@ static void test_dpa(void) dpa3 = pDPA_CreateEx(0, hHeap); ok(dpa3 != NULL, "\n"); ret = pDPA_Grow(dpa3, si.dwPageSize + 1); - todo_wine ok(!ret && GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + ok(!ret && GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "ret=%d error=%d\n", ret, GetLastError()); - + dpa = pDPA_Create(0); ok(dpa != NULL, "\n");

1 0

Juan Lang : wintrust: Return error directly from WINTRUST_VerifySigner.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 1781878b009c541ef6cd0e56d3b5945805283f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1781878b009c541ef6cd0e56d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:03:13 2010 -0800 wintrust: Return error directly from WINTRUST_VerifySigner. --- dlls/wintrust/softpub.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 8d017d2..4a702c1 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -520,9 +520,9 @@ static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, return certInfo; } -static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { - BOOL ret; + DWORD err; CERT_INFO *certInfo = WINTRUST_GetSignerCertInfo(data, signerIdx); if (certInfo) @@ -535,25 +535,24 @@ static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, signerIdx, CMSG_VERIFY_SIGNER_CERT, (LPVOID)subject }; - ret = CryptMsgControl(data->hMsg, 0, CMSG_CTRL_VERIFY_SIGNATURE_EX, - &para); - if (!ret) - SetLastError(TRUST_E_CERT_SIGNATURE); + if (!CryptMsgControl(data->hMsg, 0, CMSG_CTRL_VERIFY_SIGNATURE_EX, + &para)) + err = TRUST_E_CERT_SIGNATURE; else + { data->psPfns->pfnAddCert2Chain(data, signerIdx, FALSE, 0, subject); + err = ERROR_SUCCESS; + } CertFreeCertificateContext(subject); } else - { - SetLastError(TRUST_E_NO_SIGNER_CERT); - ret = FALSE; - } + err = TRUST_E_NO_SIGNER_CERT; data->psPfns->pfnFree(certInfo); } else - ret = FALSE; - return ret; + err = GetLastError(); + return err; } HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) @@ -579,7 +578,16 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) for (i = 0; ret && i < signerCount; i++) { if ((ret = WINTRUST_SaveSigner(data, i))) - ret = WINTRUST_VerifySigner(data, i); + { + DWORD err; + + err = WINTRUST_VerifySigner(data, i); + if (err) + { + SetLastError(err); + ret = FALSE; + } + } } } else

1 0

Juan Lang : wintrust: Return error directly from WINTRUST_SaveSigner.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 47e75329e352eaffb727c37206e85261cdeca2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e75329e352eaffb727c3720… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:07:58 2010 -0800 wintrust: Return error directly from WINTRUST_SaveSigner. --- dlls/wintrust/softpub.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 4a702c1..3fc14c2 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -474,9 +474,9 @@ static CMSG_SIGNER_INFO *WINTRUST_GetSigner(CRYPT_PROVIDER_DATA *data, return signerInfo; } -static BOOL WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +static DWORD WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { - BOOL ret; + DWORD err; CMSG_SIGNER_INFO *signerInfo = WINTRUST_GetSigner(data, signerIdx); if (signerInfo) @@ -485,11 +485,14 @@ static BOOL WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) sgnr.psSigner = signerInfo; sgnr.sftVerifyAsOf = data->sftSystemTime; - ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr); + if (!data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr)) + err = GetLastError(); + else + err = ERROR_SUCCESS; } else - ret = FALSE; - return ret; + err = GetLastError(); + return err; } static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, @@ -574,21 +577,15 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) if (ret) { DWORD i; + DWORD err = ERROR_SUCCESS; - for (i = 0; ret && i < signerCount; i++) + for (i = 0; !err && i < signerCount; i++) { - if ((ret = WINTRUST_SaveSigner(data, i))) - { - DWORD err; - + if (!(err = WINTRUST_SaveSigner(data, i))) err = WINTRUST_VerifySigner(data, i); - if (err) - { - SetLastError(err); - ret = FALSE; - } - } } + if (err) + ret = FALSE; } else SetLastError(TRUST_E_NOSIGNATURE);

1 0

Juan Lang : wintrust: Simplify error handling in SoftpubLoadSignature.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: c9c23190f76a89cb12d8241dec5725b6ae3984d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c23190f76a89cb12d8241de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:09:37 2010 -0800 wintrust: Simplify error handling in SoftpubLoadSignature. --- dlls/wintrust/softpub.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 3fc14c2..c7d5f6a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -560,7 +560,7 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; TRACE("(%p)\n", data); @@ -572,30 +572,26 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) DWORD signerCount, size; size = sizeof(signerCount); - ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0, - &signerCount, &size); - if (ret) + if (CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0, + &signerCount, &size)) { DWORD i; - DWORD err = ERROR_SUCCESS; + err = ERROR_SUCCESS; for (i = 0; !err && i < signerCount; i++) { if (!(err = WINTRUST_SaveSigner(data, i))) err = WINTRUST_VerifySigner(data, i); } - if (err) - ret = FALSE; } else - SetLastError(TRUST_E_NOSIGNATURE); + err = TRUST_E_NOSIGNATURE; } else - ret = TRUE; - if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = - GetLastError(); - return ret ? S_OK : S_FALSE; + err = ERROR_SUCCESS; + if (err) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = err; + return !err ? S_OK : S_FALSE; } static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus)

1 0

Juan Lang : wintrust: Return error directly from WINTRUST_CopyChain.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 59dcf9c9eee14a4772ec0f38975a3416aa15386d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59dcf9c9eee14a4772ec0f389… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:13:06 2010 -0800 wintrust: Return error directly from WINTRUST_CopyChain. --- dlls/wintrust/softpub.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index c7d5f6a..29d8523 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -694,24 +694,22 @@ static DWORD WINTRUST_TrustStatusToError(DWORD errorStatus) return error; } -static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +static DWORD WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { - BOOL ret; + DWORD err, i; PCERT_SIMPLE_CHAIN simpleChain = data->pasSigners[signerIdx].pChainContext->rgpChain[0]; - DWORD i; data->pasSigners[signerIdx].pasCertChain[0].dwConfidence = WINTRUST_TrustStatusToConfidence( simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus); data->pasSigners[signerIdx].pasCertChain[0].pChainElement = simpleChain->rgpElement[0]; - ret = TRUE; - for (i = 1; ret && i < simpleChain->cElement; i++) + err = ERROR_SUCCESS; + for (i = 1; !err && i < simpleChain->cElement; i++) { - ret = data->psPfns->pfnAddCert2Chain(data, signerIdx, FALSE, 0, - simpleChain->rgpElement[i]->pCertContext); - if (ret) + if (data->psPfns->pfnAddCert2Chain(data, signerIdx, FALSE, 0, + simpleChain->rgpElement[i]->pCertContext)) { data->pasSigners[signerIdx].pasCertChain[i].pChainElement = simpleChain->rgpElement[i]; @@ -719,12 +717,14 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) WINTRUST_TrustStatusToConfidence( simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus); } + else + err = GetLastError(); } data->pasSigners[signerIdx].pasCertChain[simpleChain->cElement - 1].dwError = WINTRUST_TrustStatusToError( simpleChain->rgpElement[simpleChain->cElement - 1]-> TrustStatus.dwErrorStatus); - return ret; + return err; } static void WINTRUST_CreateChainPolicyCreateInfo( @@ -792,7 +792,9 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, } else { - if ((ret = WINTRUST_CopyChain(data, signer))) + DWORD err; + + if (!(err = WINTRUST_CopyChain(data, signer))) { if (data->psPfns->pfnCertCheckPolicy) ret = data->psPfns->pfnCertCheckPolicy(data, signer, @@ -800,6 +802,11 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, else TRACE("no cert check policy, skipping policy check\n"); } + else + { + SetLastError(err); + ret = FALSE; + } } } }

1 0

Juan Lang : wintrust: Fail creating a chain if a store couldn't be created.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 711ca0f4f3a3ec1fcaffac8c47dce0bf316cf1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=711ca0f4f3a3ec1fcaffac8c4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:14:53 2010 -0800 wintrust: Fail creating a chain if a store couldn't be created. --- dlls/wintrust/softpub.c | 64 +++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 29d8523..a0a3455 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -771,46 +771,52 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, for (i = 0; i < data->chStores; i++) CertAddStoreToCollection(store, data->pahStores[i], 0, 0); } + else + ret = FALSE; } - /* Expect the end certificate for each signer to be the only cert in the - * chain: - */ - if (data->pasSigners[signer].csCertChain) + if (ret) { - /* Create a certificate chain for each signer */ - ret = CertGetCertificateChain(createInfo->hChainEngine, - data->pasSigners[signer].pasCertChain[0].pCert, - &data->pasSigners[signer].sftVerifyAsOf, store, - chainPara, createInfo->dwFlags, createInfo->pvReserved, - &data->pasSigners[signer].pChainContext); - if (ret) + /* Expect the end certificate for each signer to be the only cert in + * the chain: + */ + if (data->pasSigners[signer].csCertChain) { - if (data->pasSigners[signer].pChainContext->cChain != 1) - { - FIXME("unimplemented for more than 1 simple chain\n"); - ret = FALSE; - } - else + /* Create a certificate chain for each signer */ + ret = CertGetCertificateChain(createInfo->hChainEngine, + data->pasSigners[signer].pasCertChain[0].pCert, + &data->pasSigners[signer].sftVerifyAsOf, store, + chainPara, createInfo->dwFlags, createInfo->pvReserved, + &data->pasSigners[signer].pChainContext); + if (ret) { - DWORD err; - - if (!(err = WINTRUST_CopyChain(data, signer))) + if (data->pasSigners[signer].pChainContext->cChain != 1) { - if (data->psPfns->pfnCertCheckPolicy) - ret = data->psPfns->pfnCertCheckPolicy(data, signer, - FALSE, 0); - else - TRACE("no cert check policy, skipping policy check\n"); + FIXME("unimplemented for more than 1 simple chain\n"); + ret = FALSE; } else { - SetLastError(err); - ret = FALSE; + DWORD err; + + if (!(err = WINTRUST_CopyChain(data, signer))) + { + if (data->psPfns->pfnCertCheckPolicy) + ret = data->psPfns->pfnCertCheckPolicy(data, signer, + FALSE, 0); + else + TRACE( + "no cert check policy, skipping policy check\n"); + } + else + { + SetLastError(err); + ret = FALSE; + } } } } + CertCloseStore(store, 0); } - CertCloseStore(store, 0); return ret; }

1 0

Juan Lang : wintrust: Return error directly from WINTRUST_CreateChainForSigner.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 428fc17934017dfda2ceff0c1143c8379c10be00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428fc17934017dfda2ceff0c1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:20:26 2010 -0800 wintrust: Return error directly from WINTRUST_CreateChainForSigner. --- dlls/wintrust/softpub.c | 49 ++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index a0a3455..3e79172 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -753,11 +753,11 @@ static void WINTRUST_CreateChainPolicyCreateInfo( info->pvReserved = NULL; } -static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, +static DWORD WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, DWORD signer, PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO createInfo, PCERT_CHAIN_PARA chainPara) { - BOOL ret = TRUE; + DWORD err = ERROR_SUCCESS; HCERTSTORE store = NULL; if (data->chStores) @@ -772,15 +772,17 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, CertAddStoreToCollection(store, data->pahStores[i], 0, 0); } else - ret = FALSE; + err = GetLastError(); } - if (ret) + if (!err) { /* Expect the end certificate for each signer to be the only cert in * the chain: */ if (data->pasSigners[signer].csCertChain) { + BOOL ret; + /* Create a certificate chain for each signer */ ret = CertGetCertificateChain(createInfo->hChainEngine, data->pasSigners[signer].pasCertChain[0].pCert, @@ -792,45 +794,41 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, if (data->pasSigners[signer].pChainContext->cChain != 1) { FIXME("unimplemented for more than 1 simple chain\n"); - ret = FALSE; + err = E_NOTIMPL; } else { - DWORD err; - if (!(err = WINTRUST_CopyChain(data, signer))) { if (data->psPfns->pfnCertCheckPolicy) + { ret = data->psPfns->pfnCertCheckPolicy(data, signer, FALSE, 0); + if (!ret) + err = GetLastError(); + } else TRACE( "no cert check policy, skipping policy check\n"); } - else - { - SetLastError(err); - ret = FALSE; - } } } + else + err = GetLastError(); } CertCloseStore(store, 0); } - return ret; + return err; } HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; TRACE("(%p)\n", data); if (!data->csSigners) - { - ret = FALSE; - SetLastError(TRUST_E_NOSIGNATURE); - } + err = TRUST_E_NOSIGNATURE; else { DWORD i; @@ -838,17 +836,16 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) CERT_CHAIN_PARA chainPara; WINTRUST_CreateChainPolicyCreateInfo(data, &createInfo, &chainPara); - ret = TRUE; - for (i = 0; i < data->csSigners; i++) - ret = WINTRUST_CreateChainForSigner(data, i, &createInfo, + err = ERROR_SUCCESS; + for (i = 0; !err && i < data->csSigners; i++) + err = WINTRUST_CreateChainForSigner(data, i, &createInfo, &chainPara); } - if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = - GetLastError(); - TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + if (err) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = err; + TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); - return ret ? S_OK : S_FALSE; + return !err ? S_OK : S_FALSE; } HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data)

1 0

Igor Paliychuk : mshtml: Add Ukrainian translations.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: d165f1890525623c1649c0b7ed04e6c9f11572bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d165f1890525623c1649c0b7e… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:02:30 2010 +0200 mshtml: Add Ukrainian translations. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/Uk.rc | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index b9c9245..c0b7b2a 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -92,6 +92,7 @@ RC_SRCS = \ Si.rc \ Sv.rc \ Tr.rc \ + Uk.rc \ Zh.rc \ rsrc.rc diff --git a/dlls/mshtml/Uk.rc b/dlls/mshtml/Uk.rc new file mode 100644 index 0000000..5e11b4d --- /dev/null +++ b/dlls/mshtml/Uk.rc @@ -0,0 +1,72 @@ +/* + * Copyright 2005-2006 Jacek Caban + * Copyright 2010 Igor Paliychuk + * + * 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 + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "HTML rendering is currently disabled." + IDS_HTMLDOCUMENT "Документ HTML" + IDS_DOWNLOADING "Завантаження..." + IDS_INSTALLING "Встановлення..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko Installer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine не може знайти пакунок Gecko, який потрібний для додатків embedding HTML " \ + "для коректної роботи. Wine може автоматично завантажити та встановити його для Вас.\n\n" \ + "Зауважте: Рекомендується використати пакет з вашого дистрибутиву. Детальніше читайте http://wiki.winehq.org/Gecko.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Прогрес", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Встановити", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Скасувати", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Гіперпосилання" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Дані про Гіперпосилання", -1, 5, 5, 190, 55 + LTEXT "&Тип:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Скасувати", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Скасувати", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Hans Leidekker : msi: Improve some traces.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: aa19638cb9c2477befe48de6dceeb2f91e04ee48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa19638cb9c2477befe48de6d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 28 11:06:05 2010 +0100 msi: Improve some traces. --- dlls/msi/action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 783acb4..af028c7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4492,7 +4492,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) service = OpenServiceW(scm, name, SERVICE_START); if (!service) { - ERR("Failed to open service %s\n", debugstr_w(name)); + ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); goto done; } @@ -4500,7 +4500,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) if (!StartServiceW(service, numargs, vector)) { - ERR("Failed to start service %s\n", debugstr_w(name)); + ERR("Failed to start service %s (%u)\n", debugstr_w(name), GetLastError()); goto done; }

1 0