October 2007 - Wine-Commits

Juan Lang : crypt32: Always set cNumOIDs.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: fe7208604fbf0999e77a4c26f37d018c61a41c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7208604fbf0999e77a4c26f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 14:59:05 2007 -0700 crypt32: Always set cNumOIDs. --- 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 84d466a..486ba5b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2036,6 +2036,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, } else { + *cNumOIDs = validUsages.cUsageIdentifier; if (!rghOIDs) *pcbOIDs = cbOIDs; else if (*pcbOIDs < cbOIDs) @@ -2050,7 +2051,6 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, validUsages.cUsageIdentifier * sizeof(LPSTR)); *pcbOIDs = cbOIDs; - *cNumOIDs = validUsages.cUsageIdentifier; for (i = 0; i < validUsages.cUsageIdentifier; i++) { rghOIDs[i] = nextOID;

1 0

Juan Lang : crypt32: Don't fail if a cert is invalid, Windows doesn' t either (tests to follow).
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 95c2eb5d697a15bbf1930d7afe3319c2ac65825e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c2eb5d697a15bbf1930d7af… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 14:56:04 2007 -0700 crypt32: Don't fail if a cert is invalid, Windows doesn't either (tests to follow). --- dlls/crypt32/cert.c | 48 +++++++++++++++++++++++------------------------- 1 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 13ef4d4..84d466a 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1933,7 +1933,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, TRACE("(%d, %p, %d, %p, %d)\n", cCerts, rghCerts, *cNumOIDs, rghOIDs, *pcbOIDs); - for (i = 0; ret && i < cCerts; i++) + for (i = 0; i < cCerts; i++) { CERT_ENHKEY_USAGE usage; DWORD size = sizeof(usage); @@ -2028,36 +2028,34 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, ret = FALSE; } } - if (ret) + ret = TRUE; + if (allUsagesValid) + { + *cNumOIDs = -1; + *pcbOIDs = 0; + } + else { - if (allUsagesValid) + if (!rghOIDs) + *pcbOIDs = cbOIDs; + else if (*pcbOIDs < cbOIDs) { - *cNumOIDs = -1; - *pcbOIDs = 0; + *pcbOIDs = cbOIDs; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; } else { - if (!rghOIDs) - *pcbOIDs = cbOIDs; - else if (*pcbOIDs < cbOIDs) - { - *pcbOIDs = cbOIDs; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } - else - { - LPSTR nextOID = (LPSTR)((LPBYTE)rghOIDs + - validUsages.cUsageIdentifier * sizeof(LPSTR)); + LPSTR nextOID = (LPSTR)((LPBYTE)rghOIDs + + validUsages.cUsageIdentifier * sizeof(LPSTR)); - *pcbOIDs = cbOIDs; - *cNumOIDs = validUsages.cUsageIdentifier; - for (i = 0; i < validUsages.cUsageIdentifier; i++) - { - rghOIDs[i] = nextOID; - lstrcpyA(nextOID, validUsages.rgpszUsageIdentifier[i]); - nextOID += lstrlenA(nextOID) + 1; - } + *pcbOIDs = cbOIDs; + *cNumOIDs = validUsages.cUsageIdentifier; + for (i = 0; i < validUsages.cUsageIdentifier; i++) + { + rghOIDs[i] = nextOID; + lstrcpyA(nextOID, validUsages.rgpszUsageIdentifier[i]); + nextOID += lstrlenA(nextOID) + 1; } } }

1 0

Juan Lang : crypt32: Don't fail if buffer is NULL, just return required size.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 53b7babcbbe88b8366e7bced3b11c0cec454fcc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b7babcbbe88b8366e7bced3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 14:53:11 2007 -0700 crypt32: Don't fail if buffer is NULL, just return required size. --- dlls/crypt32/cert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9600bb1..13ef4d4 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2037,7 +2037,9 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, } else { - if (!rghOIDs || *pcbOIDs < cbOIDs) + if (!rghOIDs) + *pcbOIDs = cbOIDs; + else if (*pcbOIDs < cbOIDs) { *pcbOIDs = cbOIDs; SetLastError(ERROR_MORE_DATA);

1 0

Juan Lang : crypt32: Improve trace.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 851e19b3f9a630c288855c2f11b90b50f9b0945d URL: http://source.winehq.org/git/wine.git/?a=commit;h=851e19b3f9a630c288855c2f1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 08:56:31 2007 -0700 crypt32: Improve trace. --- dlls/crypt32/cert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 6ac3177..9600bb1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1930,7 +1930,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, BOOL allUsagesValid = TRUE; CERT_ENHKEY_USAGE validUsages = { 0, NULL }; - TRACE("(%d, %p, %p, %p, %d)\n", cCerts, *rghCerts, cNumOIDs, + TRACE("(%d, %p, %d, %p, %d)\n", cCerts, rghCerts, *cNumOIDs, rghOIDs, *pcbOIDs); for (i = 0; ret && i < cCerts; i++) @@ -2060,6 +2060,8 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, } } CryptMemFree(validUsages.rgpszUsageIdentifier); + TRACE("cNumOIDs: %d\n", *cNumOIDs); + TRACE("returning %d\n", ret); return ret; }

1 0

Juan Lang : crypt32: Fix a silly variable name.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: daa26ebd5a0563f1e8094b57653d9c6be97b91ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa26ebd5a0563f1e8094b576… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 08:18:49 2007 -0700 crypt32: Fix a silly variable name. --- dlls/crypt32/cert.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 024625c..6ac3177 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1923,14 +1923,14 @@ BOOL WINAPI CertRemoveEnhancedKeyUsageIdentifier(PCCERT_CONTEXT pCertContext, } BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, - int *cNumOIDSs, LPSTR *rghOIDs, DWORD *pcbOIDs) + int *cNumOIDs, LPSTR *rghOIDs, DWORD *pcbOIDs) { BOOL ret = TRUE; DWORD i, cbOIDs = 0; BOOL allUsagesValid = TRUE; CERT_ENHKEY_USAGE validUsages = { 0, NULL }; - TRACE("(%d, %p, %p, %p, %d)\n", cCerts, *rghCerts, cNumOIDSs, + TRACE("(%d, %p, %p, %p, %d)\n", cCerts, *rghCerts, cNumOIDs, rghOIDs, *pcbOIDs); for (i = 0; ret && i < cCerts; i++) @@ -2032,7 +2032,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, { if (allUsagesValid) { - *cNumOIDSs = -1; + *cNumOIDs = -1; *pcbOIDs = 0; } else @@ -2049,7 +2049,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, validUsages.cUsageIdentifier * sizeof(LPSTR)); *pcbOIDs = cbOIDs; - *cNumOIDSs = validUsages.cUsageIdentifier; + *cNumOIDs = validUsages.cUsageIdentifier; for (i = 0; i < validUsages.cUsageIdentifier; i++) { rghOIDs[i] = nextOID;

1 0

Andrew Talbot : shell32: Fix some memory leaks.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 481864d5e40d1e2569a63170d7b02c08f0d5d064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481864d5e40d1e2569a63170d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 4 20:14:38 2007 +0100 shell32: Fix some memory leaks. --- dlls/shell32/shelllink.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index b6f4b02..7778b58 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -404,6 +404,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) LPWSTR buffer; STARTUPINFOW si; PROCESS_INFORMATION pi; + BOOL ret; len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); buffer = HeapAlloc( GetProcessHeap(), 0, len ); @@ -416,11 +417,18 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - if (!CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return FALSE; - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - return TRUE; + ret = CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + + HeapFree( GetProcessHeap(), 0, buffer ); + + if (ret) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + + return ret; } static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember)

1 0

Vitaliy Margolen : winex11drv: Ignore mouse move events when position did not change only when other events are present .
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 82b1ba1f95d37ff5d7c836210b3e895200d9f06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b1ba1f95d37ff5d7c836210… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Oct 4 06:54:18 2007 -0600 winex11drv: Ignore mouse move events when position did not change only when other events are present. --- dlls/winex11.drv/mouse.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f0be019..6624c56 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -283,6 +283,11 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, { pt.x = x; pt.y = y; + wine_tsx11_lock(); + if (cursor_pos.x == x && cursor_pos.y == y && + (flags & ~(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE))) + flags &= ~MOUSEEVENTF_MOVE; + wine_tsx11_unlock(); } } else if (flags & MOUSEEVENTF_MOVE)

1 0

Andrew Talbot : secur32: Fix some memory leaks.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 9b1082ef3b76e6294673e729923a6208ce8f0751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1082ef3b76e6294673e7299… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Oct 3 20:20:42 2007 +0100 secur32: Fix some memory leaks. --- dlls/secur32/ntlm.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5041892..4ae00a4 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -457,7 +457,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( TRACE("First time in ISC()\n"); if(!phCredential) - return SEC_E_INVALID_HANDLE; + { + ret = SEC_E_INVALID_HANDLE; + goto isc_end; + } /* As the server side of sspi never calls this, make sure that * the handler is a client handler. @@ -466,7 +469,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(ntlm_cred->mode != NTLM_CLIENT) { TRACE("Cred mode = %d\n", ntlm_cred->mode); - return SEC_E_INVALID_HANDLE; + ret = SEC_E_INVALID_HANDLE; + goto isc_end; } client_argv[0] = ntlm_auth; @@ -657,7 +661,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( } if(!phContext) - return SEC_E_INVALID_HANDLE; + { + ret = SEC_E_INVALID_HANDLE; + goto isc_end; + } /* As the server side of sspi never calls this, make sure that * the handler is a client handler. @@ -666,7 +673,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(helper->mode != NTLM_CLIENT) { TRACE("Helper mode = %d\n", helper->mode); - return SEC_E_INVALID_HANDLE; + ret = SEC_E_INVALID_HANDLE; + goto isc_end; } if (!pInput->pBuffers[input_token_idx].pvBuffer)

1 0

Huw Davies : fonts: Add a very incomplete Tahoma Bold.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 3112a92349dcdbf185a885ef782da50d608031bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3112a92349dcdbf185a885ef7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 4 14:55:15 2007 +0100 fonts: Add a very incomplete Tahoma Bold. --- fonts/.gitignore | 1 + fonts/Makefile.in | 3 +- fonts/tahomabd.sfd |10856 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 10859 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3112a92349dcdbf185a88…

1 0

Huw Davies : gdi32: Fixed a misplaced break.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 36db3630ec1d0d85dce34e1cd7913132acf4df46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36db3630ec1d0d85dce34e1cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 4 12:22:37 2007 +0100 gdi32: Fixed a misplaced break. --- dlls/gdi32/freetype.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 62563e8..495db78 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3768,10 +3768,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, mult = 64; else if(format == WINE_GGO_GRAY16_BITMAP) return needed; - else { + else assert(0); - break; - } + break; } default: FIXME("loaded glyph format %x\n", ft_face->glyph->format);

1 0