wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Luca Bennati : cryptui: Add Italian translation.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: fd421c34c19013c90ca3ccae4ff17e01d875f725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd421c34c19013c90ca3ccae4… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Jun 16 10:06:14 2010 +0200 cryptui: Add Italian translation. --- dlls/cryptui/Makefile.in | 1 + dlls/cryptui/cryptui_It.rc | 467 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 468 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd421c34c19013c90ca3c…

1 0

Aric Stewart : usp10/tests: Having numbers in the ScriptStringXtoCP tests causes unpredictable behavior .
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 25f45df11d6c1ae4d5889d2ccd09751f8741052c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f45df11d6c1ae4d5889d2cc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 16 15:12:44 2010 +0900 usp10/tests: Having numbers in the ScriptStringXtoCP tests causes unpredictable behavior. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e47d7c5..8b1f603 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1243,7 +1243,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) */ HRESULT hr; - WCHAR teststr1[] = {'T', 'e', 's', 't', 'e', '1', '2', ' ', 'a', '\0'}; + WCHAR teststr1[] = {'T', 'e', 's', 't', 'e', 'a', 'b', ' ', 'a', '\0'}; void *String = (WCHAR *) &teststr1; /* ScriptStringAnalysis needs void */ int String_len = (sizeof(teststr1)/sizeof(WCHAR))-1; int Glyphs = String_len * 2 + 16; /* size of buffer as recommended */

1 0

Detlef Riekenberg : winspool: Return ERROR_MORE_DATA, when the app probe for the needed buffer size.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 18193b193bd80190b51b57ef8312e7e38369ad9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=18193b193bd80190b51b57ef8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 16 00:42:23 2010 +0200 winspool: Return ERROR_MORE_DATA, when the app probe for the needed buffer size. --- dlls/winspool.drv/info.c | 12 ++++++++++++ dlls/winspool.drv/tests/info.c | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3f97ebd..885b8df 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5367,6 +5367,8 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); if (ret) return ret; + TRACE("printer->name: %s\n", debugstr_w(printer->name)); + if (printer->name) { ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); @@ -5385,9 +5387,13 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, ret = RegQueryValueExA(printer->name ? hkeySubkey : hkeyPrinters, pValueName, 0, pType, pData, pcbNeeded); + if (!ret && !pData) ret = ERROR_MORE_DATA; + RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters); + + TRACE("--> %d\n", ret); return ret; } @@ -5411,6 +5417,8 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); if (ret) return ret; + TRACE("printer->name: %s\n", debugstr_w(printer->name)); + if (printer->name) { ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); @@ -5429,9 +5437,13 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, ret = RegQueryValueExW(printer->name ? hkeySubkey : hkeyPrinters, pValueName, 0, pType, pData, pcbNeeded); + if (!ret && !pData) ret = ERROR_MORE_DATA; + RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters); + + TRACE("--> %d\n", ret); return ret; } diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index be7be7d..b86d367 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2364,6 +2364,14 @@ static void test_GetPrinterData(void) ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", res, type, needed, buffer, len, len * sizeof(WCHAR)); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = GetPrinterDataA(hprn, defaultspooldirectory, NULL, NULL, 0, &needed); + ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", + res, needed, len, len * sizeof(WCHAR)); + /* ToDo: test SPLREG_* */ SetLastError(0xdeadbeef); @@ -2451,6 +2459,13 @@ static void test_GetPrinterDataEx(void) "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", res, type, needed, buffer, len, len * sizeof(WCHAR)); + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); + ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", + res, needed, len, len * sizeof(WCHAR)); + SetLastError(0xdeadbeef); res = ClosePrinter(hprn); ok(res, "ClosePrinter error %d\n", GetLastError());

1 0

Michael Stefaniuc : mapi32: The Portuguese translation is in UTF-8.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 8e151f51260598f2bbd1e6e9290edaa1ad950696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e151f51260598f2bbd1e6e92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 15 23:12:11 2010 +0200 mapi32: The Portuguese translation is in UTF-8. --- dlls/mapi32/Pt.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Pt.rc b/dlls/mapi32/Pt.rc index 4772bcf..ab8a8d1 100644 --- a/dlls/mapi32/Pt.rc +++ b/dlls/mapi32/Pt.rc @@ -23,6 +23,8 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +#pragma code_page(65001) + STRINGTABLE { IDS_NO_MAPI_CLIENT, "O envio de correio falhou porque não existe um cliente de correio MAPI instalado."

1 0

André Hentschel : winegcc: Add detection for --param options.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 7d7562d7394c55ac0bc472890e1d5f092e47fba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7562d7394c55ac0bc472890… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 15 21:30:01 2010 +0200 winegcc: Add detection for --param options. --- tools/winegcc/winegcc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index fd31060..40f44c3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1189,6 +1189,10 @@ int main(int argc, char **argv) if (strcmp("-framework", argv[i]) == 0) next_is_arg = 1; break; + case '-': + if (strcmp("--param", argv[i]) == 0) + next_is_arg = 1; + break; } if (next_is_arg) option_arg = argv[i+1];

1 0

Juan Lang : crypt32: Add support for CERT_STORE_PROV_SERIALIZED to CertOpenStore.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 88a016184dcd6a88bfdf046da971fcaf7a8efce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a016184dcd6a88bfdf046da… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 11:54:23 2010 -0700 crypt32: Add support for CERT_STORE_PROV_SERIALIZED to CertOpenStore. --- dlls/crypt32/store.c | 33 +++++++++++++++++++++++++++++++++ dlls/crypt32/tests/store.c | 3 --- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index dc18786..df12e3e 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -724,6 +724,34 @@ static PWINECRYPT_CERTSTORE CRYPT_PKCSOpenStore(HCRYPTPROV hCryptProv, return store; } +static PWINECRYPT_CERTSTORE CRYPT_SerializedOpenStore(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + HCERTSTORE store; + const CRYPT_DATA_BLOB *data = pvPara; + + TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara); + + if (dwFlags & CERT_STORE_DELETE_FLAG) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; + } + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (store) + { + if (!CRYPT_ReadSerializedStoreFromBlob(data, store)) + { + CertCloseStore(store, 0); + store = NULL; + } + } + TRACE("returning %p\n", store); + return (PWINECRYPT_CERTSTORE)store; +} + static PWINECRYPT_CERTSTORE CRYPT_PhysOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { @@ -761,6 +789,9 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, case LOWORD(CERT_STORE_PROV_PKCS7): openFunc = CRYPT_PKCSOpenStore; break; + case LOWORD(CERT_STORE_PROV_SERIALIZED): + openFunc = CRYPT_SerializedOpenStore; + break; case LOWORD(CERT_STORE_PROV_REG): openFunc = CRYPT_RegOpenStore; break; @@ -801,6 +832,8 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, openFunc = CRYPT_SysOpenStoreW; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7)) openFunc = CRYPT_PKCSOpenStore; + else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SERIALIZED)) + openFunc = CRYPT_SerializedOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION)) openFunc = CRYPT_CollectionOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY)) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 652eac9..3d55935 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1780,11 +1780,9 @@ static void testSerializedStore(void) blob.pbData = (BYTE *)serializedStoreWithCert; store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, CERT_STORE_DELETE_FLAG, &blob); - todo_wine ok(!store && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, "Expected ERROR_CALL_NOT_IMPLEMENTED, got %08x\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob); - todo_wine ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (store) { @@ -1806,7 +1804,6 @@ static void testSerializedStore(void) blob.cbData = sizeof(serializedStoreWithCertAndCRL); blob.pbData = (BYTE *)serializedStoreWithCertAndCRL; store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob); - todo_wine ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (store) {

1 0

Juan Lang : crypt32: Increment current pointer on successful reads from memory.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 06a3cea1cd5dd122b66f6a77feef4c62d5cb91f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a3cea1cd5dd122b66f6a77f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 11:53:22 2010 -0700 crypt32: Increment current pointer on successful reads from memory. --- dlls/crypt32/serialize.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 095a492..ab4c48a 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -562,6 +562,12 @@ static BOOL read_blob_wrapper(void *handle, void *buffer, DWORD bytesToRead, { *bytesRead = min(bytesToRead, reader->blob->cbData - reader->current); memcpy(buffer, reader->blob->pbData + reader->current, *bytesRead); + reader->current += *bytesRead; + ret = TRUE; + } + else if (reader->current == reader->blob->cbData) + { + *bytesRead = 0; ret = TRUE; } else

1 0

Juan Lang : crypt32: Terminate reading a serialized store upon reading an empty property.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 02b9e3198aa5a62c4f5b9b885365b699088d8e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b9e3198aa5a62c4f5b9b885… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 12:17:30 2010 -0700 crypt32: Terminate reading a serialized store upon reading an empty property. --- dlls/crypt32/serialize.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 0c366bf..095a492 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -472,7 +472,9 @@ static BOOL CRYPT_ReadSerializedStore(void *handle, buf = CryptMemAlloc(propHdr.cb); bufSize = propHdr.cb; } - if (buf) + if (!propHdr.cb) + ; /* Property is empty, nothing to do */ + else if (buf) { ret = read_func(handle, buf, propHdr.cb, &read); if (ret && read == propHdr.cb) @@ -516,7 +518,7 @@ static BOOL CRYPT_ReadSerializedStore(void *handle, else ret = FALSE; } - } while (ret && read > 0); + } while (ret && read > 0 && propHdr.cb); if (contextInterface && context) { /* Free the last context added */

1 0

Juan Lang : crypt32/tests: Test opening serialized stores.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: ecbb3c3f18f261aa4a1e5532af9267dbed6cef3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbb3c3f18f261aa4a1e5532a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 11:23:35 2010 -0700 crypt32/tests: Test opening serialized stores. --- dlls/crypt32/tests/store.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index de5a9d4..652eac9 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1764,6 +1764,72 @@ static void testMessageStore(void) "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); } +static void testSerializedStore(void) +{ + HCERTSTORE store; + CRYPT_DATA_BLOB blob; + + if (0) + { + /* Crash */ + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, NULL); + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, + CERT_STORE_DELETE_FLAG, NULL); + } + blob.cbData = sizeof(serializedStoreWithCert); + blob.pbData = (BYTE *)serializedStoreWithCert; + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, + CERT_STORE_DELETE_FLAG, &blob); + todo_wine + ok(!store && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, + "Expected ERROR_CALL_NOT_IMPLEMENTED, got %08x\n", GetLastError()); + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob); + todo_wine + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (store) + { + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + + cert = CertEnumCertificatesInStore(store, NULL); + ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n", + GetLastError()); + cert = CertEnumCertificatesInStore(store, cert); + ok(!cert, "Expected only one cert\n"); + if (pCertEnumCRLsInStore) + { + crl = pCertEnumCRLsInStore(store, NULL); + ok(!crl, "Expected no CRLs\n"); + } + CertCloseStore(store, 0); + } + blob.cbData = sizeof(serializedStoreWithCertAndCRL); + blob.pbData = (BYTE *)serializedStoreWithCertAndCRL; + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob); + todo_wine + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (store) + { + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + + cert = CertEnumCertificatesInStore(store, NULL); + ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n", + GetLastError()); + cert = CertEnumCertificatesInStore(store, cert); + ok(!cert, "Expected only one cert\n"); + if (pCertEnumCRLsInStore) + { + crl = pCertEnumCRLsInStore(store, NULL); + ok(crl != NULL, "CertEnumCRLsInStore failed: %08x\n", + GetLastError()); + crl = pCertEnumCRLsInStore(store, crl); + ok(!crl, "Expected only one CRL\n"); + } + CertCloseStore(store, 0); + } +} + static void testCertOpenSystemStore(void) { HCERTSTORE store; @@ -2520,6 +2586,7 @@ START_TEST(store) testFileStore(); testFileNameStore(); testMessageStore(); + testSerializedStore(); testCertOpenSystemStore(); testCertEnumSystemStore();

1 0

Juan Lang : crypt32: Add support for szCERT_STORE_PROV_PKCS7 to CertOpenStore.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 1cff4f5229104d91cc87b84b415587c9c400014a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cff4f5229104d91cc87b84b4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 10:37:45 2010 -0700 crypt32: Add support for szCERT_STORE_PROV_PKCS7 to CertOpenStore. --- dlls/crypt32/store.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index da3de56..dc18786 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -799,6 +799,8 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, openFunc = CRYPT_FileOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM)) openFunc = CRYPT_SysOpenStoreW; + else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7)) + openFunc = CRYPT_PKCSOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION)) openFunc = CRYPT_CollectionOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY))

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2010