November 2009 - Wine-Commits

Juan Lang : crypt32: Implement CryptGetIntendedKeyUsage.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: f5546692861f7eac76669d4fbd25f4f62684c84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5546692861f7eac76669d4fb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 3 10:45:51 2009 -0800 crypt32: Implement CryptGetIntendedKeyUsage. --- dlls/crypt32/cert.c | 33 +++++++++++++++++++++++++++++++-- dlls/crypt32/tests/cert.c | 4 ---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index cb1b973..c87b07c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2200,9 +2200,38 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, BOOL WINAPI CertGetIntendedKeyUsage(DWORD dwCertEncodingType, PCERT_INFO pCertInfo, BYTE *pbKeyUsage, DWORD cbKeyUsage) { - FIXME("(%08x, %p, %p, %d)\n", dwCertEncodingType, pCertInfo, pbKeyUsage, + PCERT_EXTENSION ext; + BOOL ret = FALSE; + + TRACE("(%08x, %p, %p, %d)\n", dwCertEncodingType, pCertInfo, pbKeyUsage, cbKeyUsage); - return FALSE; + + ext = CertFindExtension(szOID_KEY_USAGE, pCertInfo->cExtension, + pCertInfo->rgExtension); + if (ext) + { + CRYPT_BIT_BLOB usage; + DWORD size = sizeof(usage); + + ret = CryptDecodeObjectEx(dwCertEncodingType, X509_BITS, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_NOCOPY_FLAG, NULL, + &usage, &size); + if (ret) + { + if (cbKeyUsage < usage.cbData) + ret = FALSE; + else + { + memcpy(pbKeyUsage, usage.pbData, usage.cbData); + if (cbKeyUsage > usage.cbData) + memset(pbKeyUsage + usage.cbData, 0, + cbKeyUsage - usage.cbData); + } + } + } + else + SetLastError(0); + return ret; } BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags, diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index ea904f6..4dc8846 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2100,21 +2100,17 @@ static void testIntendedKeyUsage(void) /* The unused bytes are filled with 0. */ ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, sizeof(usage_bytes)); - todo_wine { ok(ret, "CertGetIntendedKeyUsage failed: %08x\n", GetLastError()); ok(!memcmp(usage_bytes, expected_usage1, sizeof(expected_usage1)), "unexpected value\n"); - } /* The usage bytes are copied in big-endian order. */ ext.Value.cbData = sizeof(usage2); ext.Value.pbData = usage2; ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, sizeof(usage_bytes)); - todo_wine { ok(ret, "CertGetIntendedKeyUsage failed: %08x\n", GetLastError()); ok(!memcmp(usage_bytes, expected_usage2, sizeof(expected_usage2)), "unexpected value\n"); - } } static const LPCSTR keyUsages[] = { szOID_PKIX_KP_CODE_SIGNING,

1 0

Juan Lang : crypt32: Add tests for CertGetIntendedKeyUsage.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 6ac162231b5286f66142afb5eccdcbb01a0b4a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac162231b5286f66142afb5e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 3 10:44:41 2009 -0800 crypt32: Add tests for CertGetIntendedKeyUsage. --- dlls/crypt32/tests/cert.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 685a564..ea904f6 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2065,6 +2065,58 @@ static void testCreateSelfSignCert(void) CRYPT_DELETEKEYSET); } +static void testIntendedKeyUsage(void) +{ + BOOL ret; + CERT_INFO info = { 0 }; + static char oid_key_usage[] = szOID_KEY_USAGE; + /* A couple "key usages". Really they're just encoded bits which aren't + * necessarily restricted to the defined key usage values. + */ + static BYTE usage1[] = { 0x03,0x03,0x00,0xff,0xff }; + static BYTE usage2[] = { 0x03,0x03,0x01,0xff,0xfe }; + static const BYTE expected_usage1[] = { 0xff,0xff,0x00,0x00 }; + static const BYTE expected_usage2[] = { 0xff,0xfe,0x00,0x00 }; + CERT_EXTENSION ext = { oid_key_usage, TRUE, { sizeof(usage1), usage1 } }; + BYTE usage_bytes[4]; + + if (0) + { + /* Crash */ + ret = CertGetIntendedKeyUsage(0, NULL, NULL, 0); + } + ret = CertGetIntendedKeyUsage(0, &info, NULL, 0); + ok(!ret, "expected failure\n"); + ret = CertGetIntendedKeyUsage(0, &info, usage_bytes, sizeof(usage_bytes)); + ok(!ret, "expected failure\n"); + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, NULL, 0); + ok(!ret, "expected failure\n"); + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, + sizeof(usage_bytes)); + info.cExtension = 1; + info.rgExtension = &ext; + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, NULL, 0); + ok(!ret, "expected failure\n"); + /* The unused bytes are filled with 0. */ + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, + sizeof(usage_bytes)); + todo_wine { + ok(ret, "CertGetIntendedKeyUsage failed: %08x\n", GetLastError()); + ok(!memcmp(usage_bytes, expected_usage1, sizeof(expected_usage1)), + "unexpected value\n"); + } + /* The usage bytes are copied in big-endian order. */ + ext.Value.cbData = sizeof(usage2); + ext.Value.pbData = usage2; + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, + sizeof(usage_bytes)); + todo_wine { + ok(ret, "CertGetIntendedKeyUsage failed: %08x\n", GetLastError()); + ok(!memcmp(usage_bytes, expected_usage2, sizeof(expected_usage2)), + "unexpected value\n"); + } +} + static const LPCSTR keyUsages[] = { szOID_PKIX_KP_CODE_SIGNING, szOID_PKIX_KP_CLIENT_AUTH, szOID_RSA_RSA }; @@ -3222,6 +3274,7 @@ START_TEST(cert) testCertSigs(); testSignAndEncodeCert(); testCreateSelfSignCert(); + testIntendedKeyUsage(); testKeyUsage(); testGetValidUsages(); testCompareCertName();

1 0

Paul Vriens : advapi32/tests: Add some ClearEventLog tests.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: e13ead694973add3eb0362b1dc0df84c87c30ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13ead694973add3eb0362b1d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 4 07:58:41 2009 +0100 advapi32/tests: Add some ClearEventLog tests. --- dlls/advapi32/tests/eventlog.c | 67 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 8a96c69..99990a2 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -36,6 +36,16 @@ static void init_function_pointers(void) pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); } +static void create_backup(const char *filename) +{ + HANDLE handle; + + DeleteFileA(filename); + handle = OpenEventLogA(NULL, "Application"); + BackupEventLogA(handle, filename); + CloseEventLog(handle); +} + static void test_open_close(void) { HANDLE handle; @@ -434,10 +444,7 @@ static void test_openbackup(void) "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); /* Make a backup eventlog to work with */ - DeleteFileA(backup); - handle = OpenEventLogA(NULL, "Application"); - BackupEventLogA(handle, backup); - CloseEventLog(handle); + create_backup(backup); /* FIXME: Wine stops here */ if (GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES) @@ -493,6 +500,57 @@ static void test_openbackup(void) DeleteFileA(backup); } +static void test_clear(void) +{ + HANDLE handle; + BOOL ret; + const char backup[] = "backup.evt"; + + SetLastError(0xdeadbeef); + ret = ClearEventLogA(NULL, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + /* Make a backup eventlog to work with */ + create_backup(backup); + + SetLastError(0xdeadbeef); + ret = ClearEventLogA(NULL, backup); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); + + /* A real eventlog would fail with ERROR_ALREADY_EXISTS */ + SetLastError(0xdeadbeef); + ret = ClearEventLogA(handle, backup); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + /* Show that ClearEventLog only works for real eventlogs. */ + SetLastError(0xdeadbeef); + ret = ClearEventLogA(handle, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + CloseEventLog(handle); + DeleteFileA(backup); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -513,4 +571,5 @@ START_TEST(eventlog) test_backup(); test_openbackup(); test_read(); + test_clear(); }

1 0

Alexandre Julliard : wia: Force specifying the correct header version in Wine code.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: ab1f58864e11810e418b3f69be75481326558de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1f58864e11810e418b3f69b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 12:27:01 2009 +0100 wia: Force specifying the correct header version in Wine code. --- dlls/wiaservc/wiaservc_main.c | 2 +- include/wia.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index 4f94275..2d30f9d 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -25,7 +25,7 @@ #include "olectl.h" #include "winsvc.h" -#include "wia.h" +#include "wia_lh.h" #include "initguid.h" #include "wine/debug.h" diff --git a/include/wia.h b/include/wia.h index 300f28a..3a0497e 100644 --- a/include/wia.h +++ b/include/wia.h @@ -17,6 +17,10 @@ */ +#ifdef __WINESRC__ +#error Specify wia_lh.h or wia_xp.h explicitly in Wine +#endif + #if (_WIN32_WINNT >= 0x0600) #include <wia_lh.h> #elif (_WIN32_WINNT >= 0x0501)

1 0

Austin English : wined3d: Add version resource.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 5f0940e08aecf0cebb81ee1a63251a9a03499cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0940e08aecf0cebb81ee1a6… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 30 17:03:08 2009 -0500 wined3d: Add version resource. --- dlls/wined3d/Makefile.in | 2 ++ dlls/wined3d/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index cdafc91..88e37dd 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -44,6 +44,8 @@ C_SRCS = \ volumetexture.c \ wined3d_main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wined3d/version.rc b/dlls/wined3d/version.rc new file mode 100644 index 0000000..0439375 --- /dev/null +++ b/dlls/wined3d/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2009 Austin English + * + * 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 "config.h" /* Needed to get PACKAGE_VERSION */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3D" +#define WINE_FILENAME_STR "wined3d.dll" +#define WINE_FILEVERSION_STR PACKAGE_VERSION +#define WINE_PRODUCTVERSION_STR PACKAGE_VERSION +#define WINE_PRODUCTNAME_STR "Wine D3D" + +#include "wine/wine_common_ver.rc"

1 0

Damjan Jovanovic : wiaservc: Add the class factory and IWiaDevMgr stubs.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 158f63d06a54d371082cd39af0c6317b69d41919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158f63d06a54d371082cd39af… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 31 16:06:18 2009 +0200 wiaservc: Add the class factory and IWiaDevMgr stubs. --- dlls/wiaservc/Makefile.in | 2 + dlls/wiaservc/factory.c | 103 +++++++++++++++++++++ dlls/wiaservc/service.c | 7 +- dlls/wiaservc/wiadevmgr.c | 181 ++++++++++++++++++++++++++++++++++++++ dlls/wiaservc/wiaservc_private.h | 39 ++++++++ 5 files changed, 329 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=158f63d06a54d371082cd…

1 0

André Hentschel : msvcrt: Do not overlap in strcpy ( Valgrind).
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: fbe6b57b7477edfe10bb39934790ad9ba3d52846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe6b57b7477edfe10bb39934… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 1 18:59:20 2009 +0100 msvcrt: Do not overlap in strcpy (Valgrind). --- dlls/msvcrt/math.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 010e1a6..315cdcd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -836,7 +836,7 @@ double CDECL _nextafter(double num, double next) */ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) { - int prec; + int prec, len; thread_data_t *data = msvcrt_get_thread_data(); /* FIXME: check better for overflow (native supports over 300 chars's) */ ndigits = min( ndigits, 80 - 7); /* 7 : space for dec point, 1 for "e", @@ -853,10 +853,10 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) /* handle cases with zero ndigits or less */ prec = ndigits; if( prec < 1) prec = 2; - snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); + len = snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); /* take the decimal "point away */ if( prec != 1) - strcpy( data->efcvt_buffer + 1, data->efcvt_buffer + 2); + memmove( data->efcvt_buffer + 1, data->efcvt_buffer + 2, len - 1 ); /* take the exponential "e" out */ data->efcvt_buffer[ prec] = '\0'; /* read the exponent */

1 0

Rico Schüller : d3d10/tests: Add constant buffer stride test.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 216ae014ee11b7c24d5eb040eedd0556300abc00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216ae014ee11b7c24d5eb040e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 1 13:42:52 2009 +0100 d3d10/tests: Add constant buffer stride test. --- dlls/d3d10/tests/effect.c | 294 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 294 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=216ae014ee11b7c24d5eb…

1 0

Rico Schüller : d3d10/tests: Add GetParentConstantBuffer() checks to effect variable type and class test.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: d390e6032058b36b866746091ff13d2674ce1685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d390e6032058b36b866746091… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 1 13:42:49 2009 +0100 d3d10/tests: Add GetParentConstantBuffer() checks to effect variable type and class test. --- dlls/d3d10/tests/effect.c | 74 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d390e6032058b36b86674…

1 0

Rico Schüller : d3d10/tests: Add IsValid() checks to effect variable type and class test.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 51fcacb8a95c8aecfd4024c29f8bc1c99f32ff7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51fcacb8a95c8aecfd4024c29… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 1 13:42:42 2009 +0100 d3d10/tests: Add IsValid() checks to effect variable type and class test. --- dlls/d3d10/tests/effect.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51fcacb8a95c8aecfd402…

1 0