July 2014 - Wine-commits - list.winehq.org

Bruno Jesus : rsaenh/tests: Simplify broken NT4 tests.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 3a7b89e4c0544db3d182d4a634748fe5f0652170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7b89e4c0544db3d182d4a63… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 19 15:10:27 2014 -0300 rsaenh/tests: Simplify broken NT4 tests. Based on Dmitry Timoshkov idea. --- dlls/rsaenh/tests/rsaenh.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 467551e..2abdc55 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -414,7 +414,7 @@ static void test_hashes(void) BYTE pbHashValue[36]; BYTE pbSigValue[128]; HCRYPTKEY hKeyExchangeKey; - DWORD hashlen, len, error; + DWORD hashlen, len, error, cryptflags; int i; for (i=0; i<2048; i++) pbData[i] = (unsigned char)i; @@ -449,9 +449,11 @@ static void test_hashes(void) result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); + cryptflags = CRYPT_USERDATA; + result = CryptHashData(hHash, pbData, sizeof(pbData), cryptflags); if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ { + cryptflags &= ~CRYPT_USERDATA; ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); result = CryptHashData(hHash, pbData, sizeof(pbData), 0); } @@ -481,12 +483,7 @@ static void test_hashes(void) result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); - if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ - { - ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); - result = CryptHashData(hHash, pbData, sizeof(pbData), 0); - } + result = CryptHashData(hHash, pbData, sizeof(pbData), cryptflags); ok(result, "%08x\n", GetLastError()); len = 16; @@ -535,12 +532,7 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, 5, CRYPT_USERDATA); - if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ - { - ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); - result = CryptHashData(hHash, pbData, 5, 0); - } + result = CryptHashData(hHash, pbData, 5, cryptflags); ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) {

1 0

Bruno Jesus : rsaenh/tests: Fix some Windows 8 tests.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 7e456b8f25cfe2096f96e146e700abaf565a897c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e456b8f25cfe2096f96e146e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 19 15:10:30 2014 -0300 rsaenh/tests: Fix some Windows 8 tests. --- dlls/rsaenh/tests/rsaenh.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 2abdc55..755ca3e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -656,7 +656,8 @@ static void test_hashes(void) ok(result, "CryptCreateHash failed 0x%08x\n", GetLastError()); /* Test that CryptHashData fails on this hash */ result = CryptHashData(hHash, pbData, sizeof(pbData), 0); - ok(!result && GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); + ok(!result && (GetLastError() == NTE_BAD_ALGID || broken(GetLastError() == ERROR_INVALID_HANDLE)) /* Win 8 */, + "%08x\n", GetLastError()); result = CryptSetHashParam(hHash, HP_HASHVAL, pbHashValue, 0); ok(result, "%08x\n", GetLastError()); len = (DWORD)sizeof(abPlainPrivateKey); @@ -779,11 +780,18 @@ static void test_block_cipher_modes(void) dwMode = CRYPT_MODE_OFB; result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0); - ok(result, "%08x\n", GetLastError()); - - dwLen = 23; - result = CryptEncrypt(hKey, 0, TRUE, 0, abData, &dwLen, 24); - ok(!result && GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); + if(!result && GetLastError() == ERROR_INTERNAL_ERROR) + { + ok(broken(1), "OFB mode not supported\n"); /* Windows 8 */ + } + else + { + ok(result, "%08x\n", GetLastError()); + + dwLen = 23; + result = CryptEncrypt(hKey, 0, TRUE, 0, abData, &dwLen, 24); + ok(!result && GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); + } CryptDestroyKey(hKey); }

1 0

Thomas Faber : wbemprox: Do not omit mandatory argument to DeviceIoControl.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: b5bcc63f6411ced4fe756000d61c2229d4d5fe57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5bcc63f6411ced4fe756000d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 20:52:03 2014 +0200 wbemprox: Do not omit mandatory argument to DeviceIoControl. --- dlls/wbemprox/builtin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ea54213..169227e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1498,6 +1498,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) ULARGE_INTEGER free; DISK_GEOMETRY_EX info; HANDLE handle; + DWORD bytes_returned; free.QuadPart = 512 * 1024 * 1024; GetDiskFreeSpaceExW( dir, NULL, NULL, &free ); @@ -1506,7 +1507,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) handle = CreateFileW( root, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (handle != INVALID_HANDLE_VALUE) { - if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), NULL, NULL )) + if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), &bytes_returned, NULL )) *disksize = info.DiskSize.QuadPart; CloseHandle( handle ); }

1 0

Thomas Faber : mpr: Do not omit mandatory argument to DeviceIoControl.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 21a7cc6fa77fffa558d56ffd330492de843c903e URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a7cc6fa77fffa558d56ffd3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 20:52:37 2014 +0200 mpr: Do not omit mandatory argument to DeviceIoControl. --- dlls/mpr/wnet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index bdc7ad0..dd34969 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1763,6 +1763,7 @@ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer; HANDLE mgr; DWORD ret = WN_NOT_CONNECTED; + DWORD bytes_returned; if ((mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, @@ -1774,7 +1775,7 @@ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) memset( data, 0, sizeof(*data) ); data->letter = letter; if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, data, sizeof(*data), - data, sizeof(buffer), NULL, NULL )) + data, sizeof(buffer), &bytes_returned, NULL )) { char *p, *mount_point = buffer + data->mount_point_offset; DWORD len;

1 0

Thomas Faber : kernel32: Do not omit mandatory argument to DeviceIoControl.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 7865b1a2774e4add531e43bbc706e1c39f9eb86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7865b1a2774e4add531e43bbc… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 20:53:10 2014 +0200 kernel32: Do not omit mandatory argument to DeviceIoControl. --- dlls/kernel32/volume.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 1509d73..d396764 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -187,6 +187,7 @@ static DWORD get_mountmgr_drive_type( LPCWSTR root ) { HANDLE mgr; struct mountmgr_unix_drive data; + DWORD br; memset( &data, 0, sizeof(data) ); if (root) data.letter = root[0]; @@ -203,7 +204,7 @@ static DWORD get_mountmgr_drive_type( LPCWSTR root ) if (mgr == INVALID_HANDLE_VALUE) return DRIVE_UNKNOWN; if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, &data, sizeof(data), &data, - sizeof(data), NULL, NULL ) && GetLastError() != ERROR_MORE_DATA) + sizeof(data), &br, NULL ) && GetLastError() != ERROR_MORE_DATA) data.type = DRIVE_UNKNOWN; CloseHandle( mgr ); @@ -1044,6 +1045,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR NTSTATUS status; HANDLE mgr = INVALID_HANDLE_VALUE; BOOL ret = FALSE; + DWORD br; TRACE("(%s, %p, %x)\n", debugstr_w(path), volume, size); if (path[lstrlenW(path)-1] != '\\') @@ -1110,7 +1112,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR /* now get the true volume name from the mountmgr */ if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, input, i_size, - output, o_size, NULL, NULL )) + output, o_size, &br, NULL )) goto err_ret; /* Verify and return the data, note string is not null terminated */ @@ -1869,6 +1871,7 @@ static MOUNTMGR_MOUNT_POINTS *query_mount_points( HANDLE mgr, MOUNTMGR_MOUNT_POI { MOUNTMGR_MOUNT_POINTS *output; DWORD outsize = 1024; + DWORD br; for (;;) { @@ -1877,7 +1880,7 @@ static MOUNTMGR_MOUNT_POINTS *query_mount_points( HANDLE mgr, MOUNTMGR_MOUNT_POI SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return NULL; } - if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, input, insize, output, outsize, NULL, NULL )) break; + if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, input, insize, output, outsize, &br, NULL )) break; outsize = output->Size; HeapFree( GetProcessHeap(), 0, output ); if (GetLastError() != ERROR_MORE_DATA) return NULL; @@ -2024,6 +2027,7 @@ HANDLE WINAPI FindFirstVolumeA(LPSTR volume, DWORD len) HANDLE WINAPI FindFirstVolumeW( LPWSTR volume, DWORD len ) { DWORD size = 1024; + DWORD br; HANDLE mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (mgr == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; @@ -2041,7 +2045,7 @@ HANDLE WINAPI FindFirstVolumeW( LPWSTR volume, DWORD len ) memset( &input, 0, sizeof(input) ); if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, &input, sizeof(input), - output, size, NULL, NULL )) + output, size, &br, NULL )) { if (GetLastError() != ERROR_MORE_DATA) break; size = output->Size;

1 0

Bruno Jesus : crypt32/tests: Add more tests related to certificates.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 70ff9620a84d40a3f2294d32a01c65a0ce824f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ff9620a84d40a3f2294d32a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jul 20 19:28:22 2014 -0300 crypt32/tests: Add more tests related to certificates. Thanks to Juan Lang for help. --- dlls/crypt32/tests/cert.c | 63 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 66f13db..e16ca5d 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1564,8 +1564,12 @@ static const BYTE chain7_1[] = { static void testGetIssuerCert(void) { BOOL ret; - PCCERT_CONTEXT parent, child, cert1, cert2; - DWORD flags = 0xffffffff; + PCCERT_CONTEXT parent, child, cert1, cert2, cert3; + DWORD flags = 0xffffffff, size; + CERT_NAME_BLOB certsubject; + BYTE *certencoded; + WCHAR rootW[] = {'R', 'O', 'O', 'T', '\0'}, + certname[] = {'C', 'N', '=', 'd', 'u', 'm', 'm', 'y', ',', ' ', 'T', '=', 'T', 'e', 's', 't', '\0'}; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -1640,6 +1644,7 @@ static void testGetIssuerCert(void) ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_1, sizeof(chain10_1), CERT_STORE_ADD_ALWAYS, &cert1); @@ -1648,6 +1653,7 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected only one issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding a second issuer allows two issuers to be found - and the second * issuer is found before the first, implying certs are added to the head * of a list. @@ -1661,6 +1667,7 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the second issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected no more than two issuers\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); @@ -1677,6 +1684,7 @@ static void testGetIssuerCert(void) ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_0, sizeof(chain10_0), CERT_STORE_ADD_ALWAYS, &cert1); @@ -1685,6 +1693,7 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected only one issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding a second issuer allows two issuers to be found - and the second * issuer is found before the first, implying certs are added to the head * of a list. @@ -1698,10 +1707,60 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the second issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected no more than two issuers\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); + + /* Self-sign a certificate, add to the store and test getting the issuer */ + size = 0; +todo_wine + ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, NULL, &size, NULL), + "CertStrToName should have worked\n"); + certencoded = HeapAlloc(GetProcessHeap(), 0, size); +todo_wine + ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), + "CertStrToName should have worked\n"); + certsubject.pbData = certencoded; + certsubject.cbData = size; + cert3 = CertCreateSelfSignCertificate(0, &certsubject, 0, NULL, NULL, NULL, NULL, NULL); + /* wine fails to create the certificate, this makes it crash later. + * Remove IF when wine is fixed, all windows versions must work */ + if(cert3 == NULL) + { + todo_wine ok(0, "Must work on windows\n"); + goto skiptest; + } + ok(cert3 != NULL, "CertCreateSelfSignCertificate should have worked\n"); + ret = CertAddCertificateContextToStore(store, cert3, CERT_STORE_ADD_REPLACE_EXISTING, 0); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + CertFreeCertificateContext(cert3); + cert3 = CertEnumCertificatesInStore(store, NULL); + ok(cert3 != NULL, "CertEnumCertificatesInStore should have worked\n"); + SetLastError(0xdeadbeef); + flags = 0; + parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); + ok(!parent, "Expected NULL\n"); + ok(GetLastError() == CRYPT_E_SELF_SIGNED, + "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); +skiptest: CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); CertCloseStore(store, 0); + HeapFree(GetProcessHeap(), 0, certencoded); + + /* Test root storage self-signed certificate */ + store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, rootW); + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + flags = 0; + cert1 = CertEnumCertificatesInStore(store, NULL); + ok(cert1 != NULL, "CertEnumCertificatesInStore should have worked\n"); + SetLastError(0xdeadbeef); + parent = CertGetIssuerCertificateFromStore(store, cert1, NULL, &flags); +todo_wine + ok(!parent, "Expected NULL\n"); +todo_wine + ok(GetLastError() == CRYPT_E_SELF_SIGNED, + "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); + CertCloseStore(store, 0); } static void testCryptHashCert(void)

1 0

Andrei Slăvoiu : wined3d: Remove usage of gl_info parameter from select_card_nvidia_binary.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 665c2e1e27ec2377fd0f633cecf232add21a3fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=665c2e1e27ec2377fd0f633ce… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Jul 20 19:41:08 2014 +0300 wined3d: Remove usage of gl_info parameter from select_card_nvidia_binary. --- dlls/wined3d/directx.c | 320 +++++++++++++++++++++++-------------------------- 1 file changed, 147 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=665c2e1e27ec2377fd0f6…

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateStrokeStyle().
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: c903192243e4438ab08e5426e24604b93c231493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c903192243e4438ab08e5426e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:56 2014 +0200 d2d1: Implement d2d_factory_CreateStrokeStyle(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 9 +++ dlls/d2d1/factory.c | 14 +++- dlls/d2d1/stroke.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index ed451ef..3c01957 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = uuid C_SRCS = \ brush.c \ factory.c \ - render_target.c + render_target.c \ + stroke.c RC_SRCS = version.rc diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2bcb594..720a96d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -55,4 +55,13 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; +struct d2d_stroke_style +{ + ID2D1StrokeStyle ID2D1StrokeStyle_iface; + LONG refcount; +}; + +void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, + const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 139c478..1003f0d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -144,10 +144,20 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle **stroke_style) { - FIXME("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p stub!\n", + struct d2d_stroke_style *object; + + TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n", iface, desc, dashes, dash_count, stroke_style); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_stroke_style_init(object, iface, desc, dashes, dash_count); + + TRACE("Created stroke style %p.\n", object); + *stroke_style = &object->ID2D1StrokeStyle_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory *iface, diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c new file mode 100644 index 0000000..81d3dde --- /dev/null +++ b/dlls/d2d1/stroke.c @@ -0,0 +1,165 @@ +/* + * Copyright 2014 Henri Verbeet for CodeWeavers + * + * 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" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_stroke_style *impl_from_ID2D1StrokeStyle(ID2D1StrokeStyle *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_stroke_style, ID2D1StrokeStyle_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyle *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1StrokeStyle) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1StrokeStyle_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle *iface) +{ + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + ULONG refcount = InterlockedIncrement(&style->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) +{ + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + ULONG refcount = InterlockedDecrement(&style->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, style); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_CAP_STYLE_FLAT; +} + +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetEndCap(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_CAP_STYLE_FLAT; +} + +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashCap(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_CAP_STYLE_FLAT; +} + +static float STDMETHODCALLTYPE d2d_stroke_style_GetMiterLimit(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0.0f; +} + +static D2D1_LINE_JOIN STDMETHODCALLTYPE d2d_stroke_style_GetLineJoin(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_LINE_JOIN_MITER; +} + +static float STDMETHODCALLTYPE d2d_stroke_style_GetDashOffset(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0.0f; +} + +static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_DASH_STYLE_SOLID; +} + +static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle *iface, float *dashes, UINT32 count) +{ + FIXME("iface %p, dashes %p, count %u stub!\n", iface, dashes, count); +} + +static const struct ID2D1StrokeStyleVtbl d2d_stroke_style_vtbl = +{ + d2d_stroke_style_QueryInterface, + d2d_stroke_style_AddRef, + d2d_stroke_style_Release, + d2d_stroke_style_GetFactory, + d2d_stroke_style_GetStartCap, + d2d_stroke_style_GetEndCap, + d2d_stroke_style_GetDashCap, + d2d_stroke_style_GetMiterLimit, + d2d_stroke_style_GetLineJoin, + d2d_stroke_style_GetDashOffset, + d2d_stroke_style_GetDashStyle, + d2d_stroke_style_GetDashesCount, + d2d_stroke_style_GetDashes, +}; + +void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, + const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) +{ + FIXME("Ignoring stroke style properties.\n"); + + style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl; + style->refcount = 1; +}

1 0

Henri Verbeet : d2d1: Implement D2D1MakeRotateMatrix().
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: 6944803ccc2422e83608a4281b421145b74de819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6944803ccc2422e83608a4281… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:57 2014 +0200 d2d1: Implement D2D1MakeRotateMatrix(). --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 19 +++++++++++++++++++ include/d2d1.idl | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index b1bfe9b..26d17c6 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -1,5 +1,5 @@ @ stdcall D2D1CreateFactory(long ptr ptr ptr) -@ stub D2D1MakeRotateMatrix +@ stdcall D2D1MakeRotateMatrix(float float float ptr) @ stub D2D1MakeSkewMatrix @ stub D2D1IsMatrixInvertible @ stub D2D1InvertMatrix diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 1003f0d..0bc465e 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -264,3 +264,22 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, return hr; } + +void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_3X2_F *matrix) +{ + float theta, sin_theta, cos_theta; + + TRACE("angle %.8e, center {%.8e, %.8e}, matrix %p.\n", angle, center.x, center.y, matrix); + + theta = angle * (M_PI / 180.0f); + sin_theta = sinf(theta); + cos_theta = cosf(theta); + + /* translate(center) * rotate(theta) * translate(-center) */ + matrix->_11 = cos_theta; + matrix->_12 = sin_theta; + matrix->_21 = -sin_theta; + matrix->_22 = cos_theta; + matrix->_31 = center.x - center.x * cos_theta + center.y * sin_theta; + matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; +} diff --git a/include/d2d1.idl b/include/d2d1.idl index a6d0d36..4637338 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1248,3 +1248,4 @@ interface ID2D1Factory : IUnknown [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); +[local] void __stdcall D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_3X2_F *matrix);

1 0

Nikolay Sivov : kernel32/tests: Skip working tests properly.
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: 509bdae8e222d9df92159713714dd6dc1aae2669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509bdae8e222d9df921597137… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 18 13:26:29 2014 +0400 kernel32/tests: Skip working tests properly. --- dlls/kernel32/tests/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9e7f410..aad58b2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3128,7 +3128,7 @@ static void test_EnumDateFormatsA(void) ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_YEARMONTH); if (!ret && (GetLastError() == ERROR_INVALID_FLAGS)) { - skip("DATE_YEARMONTH is only present on W2K and later\n"); + win_skip("DATE_YEARMONTH is only present on W2K and later\n"); return; } ok(ret, "EnumDateFormatsA(DATE_YEARMONTH) error %d\n", GetLastError()); @@ -3183,7 +3183,7 @@ static void test_GetCPInfo(void) ret = GetCPInfo(CP_UTF7, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) { - skip("Codepage CP_UTF7 is not installed/available\n"); + win_skip("Codepage CP_UTF7 is not installed/available\n"); } else { @@ -3199,7 +3199,7 @@ static void test_GetCPInfo(void) ret = GetCPInfo(CP_UTF8, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) { - skip("Codepage CP_UTF8 is not installed/available\n"); + win_skip("Codepage CP_UTF8 is not installed/available\n"); } else { @@ -3982,7 +3982,7 @@ static void test_EnumSystemGeoID(void) geoidenum_count = 0; ret = pEnumSystemGeoID(GEOCLASS_REGION, 39070, test_geoid_enumproc2); if (ret == 0) - skip("GEOCLASS_REGION is not supported in EnumSystemGeoID.\n"); + win_skip("GEOCLASS_REGION is not supported in EnumSystemGeoID.\n"); else { ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count);

1 0