wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Luca Bennati : cmd: Add Italian translation.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 79bb4bd5490fbb9fb95c0828d5d6ea80cfc58902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bb4bd5490fbb9fb95c0828d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Nov 7 21:07:33 2009 +0100 cmd: Add Italian translation. --- programs/cmd/It.rc | 282 ++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/Makefile.in | 1 + 2 files changed, 283 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79bb4bd5490fbb9fb95c0…

1 0

Rob Shearman : secur32: Output extra data in NTLM sign & seal test to diagnose failures seen on some Windows machines .
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: f6c9c72e21dd9f70fe9901aa32b19741cbc4c386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c9c72e21dd9f70fe9901aa3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 12:23:28 2009 +0100 secur32: Output extra data in NTLM sign & seal test to diagnose failures seen on some Windows machines. --- dlls/secur32/tests/ntlm.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 2a66cf6..db00d73 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1056,8 +1056,32 @@ static void testSignSeal(void) ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); + if (memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, + crypt.pBuffers[0].cbBuffer)) + { + int i; + for (i = 0; i < crypt.pBuffers[0].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[0].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); + } ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer)) + { + int i; + for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); + } data[0].cbBuffer = sizeof(crypt_trailer_server); data[1].cbBuffer = sizeof(crypt_message_server); @@ -1113,9 +1137,33 @@ static void testSignSeal(void) ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, crypt.pBuffers[3].cbBuffer), "Crypt trailer not as expected.\n"); + if (memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, + crypt.pBuffers[3].cbBuffer)) + { + int i; + for (i = 0; i < crypt.pBuffers[3].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[3].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); + } ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, + crypt.pBuffers[1].cbBuffer)) + { + int i; + for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); + } memcpy(complex_data[1].pvBuffer, crypt_message_server2, complex_data[1].cbBuffer); memcpy(complex_data[3].pvBuffer, crypt_trailer_server2, complex_data[3].cbBuffer);

1 0

Marcus Meissner : ws2_32: Use correct buffer for 17 byte write.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 94efd487f0d7b3c9b7dd349099cac610a41fe05a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94efd487f0d7b3c9b7dd34909… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Nov 7 14:06:10 2009 +0100 ws2_32: Use correct buffer for 17 byte write. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 518ab4a..98b94e8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2443,7 +2443,7 @@ static void test_addr_to_print(void) /* Test longer length is ok */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst, 18); + pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 18); ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); }

1 0

Nicolas Le Cam : winmm/tests: Skip tests when running on non-english locale .
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 556b1ca7edf89a8677b2fad963c66284126d2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556b1ca7edf89a8677b2fad96… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Fri Nov 6 23:32:33 2009 +0100 winmm/tests: Skip tests when running on non-english locale. --- dlls/winmm/tests/mci.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6b1ecb7..5366810 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -163,9 +163,16 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"mci %s returned error: %d\n", command_open, err); ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); - err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); - ok(!err,"mci status time format returned error: %d\n", err); - ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (test with hardcoded 'milliseconds')\n"); + } + else + { + err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); + ok(!err,"mci status time format returned error: %d\n", err); + ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + } err = mciSendString(command_close_my, NULL, 0, hwnd); ok(!err,"mci %s returned error: %d\n", command_close_my, err); @@ -376,10 +383,17 @@ static void test_asyncWAVE(HWND hwnd) * will be 333ms, 667ms etc. at best. */ Sleep(100); /* milliseconds */ - buf[0]=0; - err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); - ok(!err,"mci status time format returned error: %d\n", err); - ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (test with hardcoded 'milliseconds')\n"); + } + else + { + buf[0]=0; + err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); + ok(!err,"mci status time format returned error: %d\n", err); + ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + } buf[0]=0; err = mciSendString("status mysound position", buf, sizeof(buf), hwnd);

1 0

Kai Blin : secur32: Use empty credentials when cached creds fail.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: e987ec429945483908182490a0df12483f443b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e987ec429945483908182490a… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 7 11:27:54 2009 +0100 secur32: Use empty credentials when cached creds fail. --- dlls/secur32/ntlm.c | 3 +-- dlls/secur32/tests/ntlm.c | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7e44dd7..79f55e7 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -659,8 +659,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(!strncmp(buffer, "PW", 2)) { TRACE("Using cached credentials failed.\n"); - ret = SEC_E_NO_CREDENTIALS; - goto isc_end; + lstrcpynA(buffer, "PW AA==", max_len-1); } else /* Just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index b7c5105..2a66cf6 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1309,7 +1309,6 @@ static void test_null_auth_data(void) status = pInitializeSecurityContextA(&cred, NULL, (SEC_CHAR *)user, ISC_REQ_CONNECTION, 0, SECURITY_NETWORK_DREP, NULL, 0, &ctx, &buffer_desc, &attr, &ttl); - todo_wine ok(status == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed %s\n", getSecError(status)); }

1 0

Kai Blin : netapi32: Implement NetUserGetGroups stub.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: a61044b6757f134ca139a23f7032e261463b1c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61044b6757f134ca139a23f7… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 7 07:45:13 2009 +0100 netapi32: Implement NetUserGetGroups stub. --- dlls/netapi32/netapi32.spec | 2 +- dlls/netapi32/wksta.c | 23 +++++++++++++++++++++++ include/lmaccess.h | 1 + 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index eb3b841..6470280 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -205,7 +205,7 @@ @ stdcall NetUserChangePassword(wstr wstr wstr wstr) @ stdcall NetUserDel(wstr wstr) @ stdcall NetUserEnum(wstr long long ptr long ptr ptr ptr) -@ stub NetUserGetGroups +@ stdcall NetUserGetGroups(wstr wstr long ptr long ptr ptr) @ stdcall NetUserGetInfo(wstr wstr long ptr) @ stdcall NetUserGetLocalGroups(wstr wstr long long ptr long ptr ptr) @ stdcall NetUserModalsGet(wstr long ptr) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 67690b8..122a685 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -591,3 +591,26 @@ NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( return NERR_Success; } + +/************************************************************ + * NetUserGetGroups (NETAPI32.@) + */ +NET_API_STATUS NET_API_FUNCTION NetUserGetGroups( + LPCWSTR servername, + LPCWSTR username, + DWORD level, + LPBYTE *bufptr, + DWORD prefixmaxlen, + LPDWORD entriesread, + LPDWORD totalentries) +{ + FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername), + debugstr_w(username), level, bufptr, prefixmaxlen, entriesread, + totalentries); + + *bufptr = NULL; + *entriesread = 0; + *totalentries = 0; + + return ERROR_INVALID_LEVEL; +} diff --git a/include/lmaccess.h b/include/lmaccess.h index c29a40c..03bd504 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -467,6 +467,7 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetUserDel(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetUserEnum(LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR,LPCWSTR,DWORD,LPBYTE*); +NET_API_STATUS WINAPI NetUserGetGroups(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserGetLocalGroups(LPCWSTR,LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR,DWORD,LPBYTE*);

1 0

Paul Chitescu : crypt32: Check the result of CryptAcquireContextW() when initializing default provider.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 7223d8b6d2f03533799eac3f958708042ce21cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7223d8b6d2f03533799eac3f9… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Nov 6 14:18:14 2009 +0200 crypt32: Check the result of CryptAcquireContextW() when initializing default provider. --- dlls/crypt32/main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index d93163c..1a5972f 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -64,8 +64,9 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void) { HCRYPTPROV prov; - CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT); + if (!CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT)) + return hDefProv; InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, NULL); if (hDefProv != prov)

1 0

Dan Kegel : wininet: FTP_FtpOpenFileW: initialize dwInternalFlags.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 15d7b7b777ed7920e7227dd2c21c6c9af3dfec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d7b7b777ed7920e7227dd2c… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Nov 5 21:45:25 2009 -0800 wininet: FTP_FtpOpenFileW: initialize dwInternalFlags. --- dlls/wininet/ftp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index b0dc695..f0c3cbd 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1293,6 +1293,7 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, lpwh->hdr.vtbl = &FTPFILEVtbl; lpwh->hdr.dwFlags = dwFlags; lpwh->hdr.dwContext = dwContext; + lpwh->hdr.dwInternalFlags = 0; lpwh->hdr.refs = 1; lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwh->nDataSocket = nDataSocket;

1 0

Dan Kegel : user32: Fix uninitialized variable so first call to DdeGetLastError isn' t undefined.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 75d613f64f418afafb584c794d79c9e87c0181ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d613f64f418afafb584c794… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Nov 5 19:16:34 2009 -0800 user32: Fix uninitialized variable so first call to DdeGetLastError isn't undefined. --- dlls/user32/dde_misc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 1a9b662..d2de954 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -380,6 +380,7 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, pInstance->nodeList = NULL; /* node will be added later */ pInstance->monitorFlags = afCmd & MF_MASK; pInstance->wStatus = 0; + pInstance->lastError = DMLERR_NO_ERROR; pInstance->servers = NULL; pInstance->convs[0] = NULL; pInstance->convs[1] = NULL;

1 0

Juan Lang : crypt32: Permit lack of basic constraints extension on root certificates.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 5274777b1c090d81d52e8a42a989b27b9e0ab3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5274777b1c090d81d52e8a42a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 13:15:43 2009 -0800 crypt32: Permit lack of basic constraints extension on root certificates. --- dlls/crypt32/chain.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c9ca356..5323ac4 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -427,6 +427,10 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, * through out-of-band means or reject the certificate." Rejecting the * certificate prohibits a large number of commonly used certificates, so * accepting locally installed ones is a compromise. + * Root certificates are also allowed to be CAs even without a basic + * constraints extension. This is implied by RFC 5280, section 6.1: the + * root of a certificate chain's only requirement is that it was used to issue + * the next certificate in the chain. * 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 @@ -437,12 +441,14 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, */ static BOOL CRYPT_CheckBasicConstraintsForCA(PCertificateChainEngine engine, PCCERT_CONTEXT cert, CERT_BASIC_CONSTRAINTS2_INFO *chainConstraints, - DWORD remainingCAs, BOOL *pathLengthConstraintViolated) + DWORD remainingCAs, BOOL isRoot, BOOL *pathLengthConstraintViolated) { BOOL validBasicConstraints, implicitCA = FALSE; CERT_BASIC_CONSTRAINTS2_INFO constraints; - if (cert->pCertInfo->dwVersion == CERT_V1 || + if (isRoot) + implicitCA = TRUE; + else if (cert->pCertInfo->dwVersion == CERT_V1 || cert->pCertInfo->dwVersion == CERT_V2) { BYTE hash[20]; @@ -1307,7 +1313,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_INVALID_BASIC_CONSTRAINTS; else if (!CRYPT_CheckBasicConstraintsForCA(engine, - chain->rgpElement[i]->pCertContext, &constraints, i - 1, + chain->rgpElement[i]->pCertContext, &constraints, i - 1, isRoot, &pathLengthConstraintViolated)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_INVALID_BASIC_CONSTRAINTS;

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
91
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 November 2009