October 2018 - Wine-devel - list.winehq.org

[PATCH 1/5] wined3d: Get rid of the "device" parameter to context_bind_dummy_textures().
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bdd291b74f5..3d1a48321f1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1743,7 +1743,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } /* Context activation is done by the caller. */ -void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) +void context_bind_dummy_textures(const struct wined3d_context *context) { const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2287,7 +2287,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ if (device->dummy_textures.tex_2d) - context_bind_dummy_textures(device, context); + context_bind_dummy_textures(context); /* Initialise all rectangles to avoid resetting unused ones later. */ gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b50d6677ab2..17ef5d90148 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -738,7 +738,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("create dummy textures"); - context_bind_dummy_textures(device, context); + context_bind_dummy_textures(context); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33d248fcfdd..88dce65a15a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2156,8 +2156,7 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; -void context_bind_dummy_textures(const struct wined3d_device *device, - const struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, -- 2.11.0

1 0

[PATCH 3/3] crypt32: CertComparePublicKeyInfo should not try to decode a non-RSA public key.
by Dmitry Timoshkov 26 Oct '18

26 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 7 +++++++ dlls/crypt32/tests/cert.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9157814d69..d09d049b8b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -28,6 +28,7 @@ #include "winternl.h" #define CRYPT_OID_INFO_HAS_EXTRA_FIELDS #include "wincrypt.h" +#include "snmp.h" #include "bcrypt.h" #include "winnls.h" #include "rpc.h" @@ -1242,6 +1243,12 @@ BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType, TRACE("(%08x, %p, %p)\n", dwCertEncodingType, pPublicKey1, pPublicKey2); + /* RSA public key data should start with ASN_SEQUENCE, + * otherwise it's not a RSA_CSP_PUBLICKEYBLOB. + */ + if (!pPublicKey1->PublicKey.cbData || pPublicKey1->PublicKey.pbData[0] != ASN_SEQUENCE) + dwCertEncodingType = 0; + switch (GET_CERT_ENCODING_TYPE(dwCertEncodingType)) { case 0: /* Seems to mean "raw binary bits" */ diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index cc7bd4c88b..f653741ea7 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3210,7 +3210,6 @@ static void testComparePublicKeyInfo(void) ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); /* Different OIDs appear to compare */ @@ -3219,14 +3218,12 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info2.Algorithm.pszObjId = oid_x957_dsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info1.PublicKey.cbData = sizeof(bits1); @@ -3238,7 +3235,6 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info2.Algorithm.pszObjId = oid_rsa_rsa; @@ -3297,11 +3293,9 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info1); ok(ret, "CertComparePublicKeyInfo: as raw binary: keys should be equal\n"); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); -todo_wine ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */ ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); -todo_wine ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); /* ASN.1 encoded non-comparing case */ -- 2.17.1

1 0

[PATCH 2/3] crypt32/tests: Add more tests for CertComparePublicKeyInfo.
by Dmitry Timoshkov 26 Oct '18

26 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/tests/cert.c | 63 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index d6c249c6f3..cc7bd4c88b 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3196,9 +3196,12 @@ static void testComparePublicKeyInfo(void) static BYTE bits1[] = { 1, 0 }; static BYTE bits2[] = { 0 }; static BYTE bits3[] = { 1 }; - static BYTE bits4[] = { 0x30,8, 2,1,0x81, 2,3,1,0,1 }; - static BYTE bits5[] = { 0x30,9, 2,2,0,0x81, 2,3,1,0,1 }; - static BYTE bits6[] = { 0x30,9, 2,2,0,0x82, 2,3,1,0,1 }; + static BYTE bits4[] = { 0x30,8, 2,1,0x81, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits5[] = { 0x30,9, 2,2,0,0x81, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits6[] = { 0x30,9, 2,2,0,0x82, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits7[] = { 0x04,8, 2,1,0x81, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ + static BYTE bits8[] = { 0x04,9, 2,2,0,0x81, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ + static BYTE bits9[] = { 0x04,9, 2,2,0,0x82, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ /* crashes ret = CertComparePublicKeyInfo(0, NULL, NULL); @@ -3206,14 +3209,26 @@ static void testComparePublicKeyInfo(void) /* Empty public keys compare */ ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + /* Different OIDs appear to compare */ info1.Algorithm.pszObjId = oid_rsa_rsa; info2.Algorithm.pszObjId = oid_rsa_sha1rsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info2.Algorithm.pszObjId = oid_x957_dsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info1.PublicKey.cbData = sizeof(bits1); info1.PublicKey.pbData = bits1; info1.PublicKey.cUnusedBits = 0; @@ -3222,6 +3237,10 @@ static void testComparePublicKeyInfo(void) info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info2.Algorithm.pszObjId = oid_rsa_rsa; info1.PublicKey.cbData = sizeof(bits4); info1.PublicKey.pbData = bits4; @@ -3233,6 +3252,7 @@ static void testComparePublicKeyInfo(void) ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + info1.PublicKey.cUnusedBits = 1; info2.PublicKey.cUnusedBits = 5; ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); @@ -3252,11 +3272,38 @@ static void testComparePublicKeyInfo(void) ret = CertComparePublicKeyInfo(0, &info1, &info2); /* Simple (non-comparing) case */ ok(!ret, "Expected keys not to compare\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "Expected keys not to compare\n"); + info2.PublicKey.cbData = sizeof(bits1); info2.PublicKey.pbData = bits1; info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(!ret, "Expected keys not to compare\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "Expected keys not to compare\n"); + + info1.PublicKey.cbData = sizeof(bits7); + info1.PublicKey.pbData = bits7; + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cbData = sizeof(bits8); + info2.PublicKey.pbData = bits8; + info2.PublicKey.cUnusedBits = 0; + ret = CertComparePublicKeyInfo(0, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be unequal\n"); + + ret = CertComparePublicKeyInfo(0, &info1, &info1); + ok(ret, "CertComparePublicKeyInfo: as raw binary: keys should be equal\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); +todo_wine + ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */ + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); +todo_wine + ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + /* ASN.1 encoded non-comparing case */ info1.PublicKey.cbData = sizeof(bits5); info1.PublicKey.pbData = bits5; @@ -3266,6 +3313,16 @@ static void testComparePublicKeyInfo(void) info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); ok(!ret, "CertComparePublicKeyInfo: different keys should be unequal\n"); + + /* ASN.1 encoded non-comparing case */ + info1.PublicKey.cbData = sizeof(bits8); + info1.PublicKey.pbData = bits8; + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cbData = sizeof(bits9); + info2.PublicKey.pbData = bits9; + info2.PublicKey.cUnusedBits = 0; + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: different keys should be unequal\n"); } static void testHashPublicKeyInfo(void) -- 2.17.1

1 0

[PATCH 1/3] crypt32: Trace entry contents in CryptInstallOIDFunctionAddress.
by Dmitry Timoshkov 26 Oct '18

26 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/oid.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 1eb82829d2..d6c411c791 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -250,6 +250,8 @@ BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, { struct OIDFunction *func; + TRACE("OID %s, func %p\n", debugstr_a(rgFuncEntry[i].pszOID), rgFuncEntry[i].pvFuncAddr); + if (!IS_INTOID(rgFuncEntry[i].pszOID)) func = CryptMemAlloc(sizeof(struct OIDFunction) + strlen(rgFuncEntry[i].pszOID) + 1); -- 2.17.1

1 0

[PATCH v2] ntdll: Fix overflow if running 32bit app w/ wine64
by Brendan McGrath 26 Oct '18

26 Oct '18

wine64 was using IMAGE_NT_HEADERS to access header information regardless of the execution type; hence it would use IMAGE_OPTIONAL_HEADER64 for a 32bit app. This could result in an overflow and a request to mmap for a huge amount of memory causing an out of memory error. This patch ensures IMAGE_OPTIONAL_HEADER32 is used for a 32-bit app and IMAGE_OPTIONAL_HEADER64 is used for a 64-bit app Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Fixed the formatting - sorry about that dlls/ntdll/virtual.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index af1509eae5d..a05000f2e2b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1933,9 +1933,26 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi if (!reserve_size || !commit_size) { - IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); - if (!reserve_size) reserve_size = nt->OptionalHeader.SizeOfStackReserve; - if (!commit_size) commit_size = nt->OptionalHeader.SizeOfStackCommit; + struct nt + { + DWORD Signature; + IMAGE_FILE_HEADER FileHeader; + union + { + IMAGE_OPTIONAL_HEADER32 hdr32; + IMAGE_OPTIONAL_HEADER64 hdr64; + } opt; + }; + + struct nt *nt = (struct nt*) RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + if (nt->opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { + if (!reserve_size) reserve_size = nt->opt.hdr32.SizeOfStackReserve; + if (!commit_size) commit_size = nt->opt.hdr32.SizeOfStackCommit; + } else { + if (!reserve_size) reserve_size = nt->opt.hdr64.SizeOfStackReserve; + if (!commit_size) commit_size = nt->opt.hdr64.SizeOfStackCommit; + } + TRACE("reserve_size: %lu, commit_size: %lu", reserve_size, commit_size); } size = max( reserve_size, commit_size ); -- 2.17.1

4 10

[PATCH 1/2] ntdll: Implement RtlWaitOnAddress functions.
by Daniel Lehman 26 Oct '18

26 Oct '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/ntdll.spec | 3 ++ dlls/ntdll/sync.c | 64 +++++++++++++++++++++++++++++++++ dlls/ntdll/tests/om.c | 83 +++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 3 ++ 4 files changed, 153 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 247f05f561..818ae0090c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -978,6 +978,9 @@ # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall RtlWaitOnAddress(ptr ptr long ptr) +@ stdcall RtlWakeAddressAll(ptr) +@ stdcall RtlWakeAddressSingle(ptr) @ stdcall RtlWakeAllConditionVariable(ptr) @ stdcall RtlWakeConditionVariable(ptr) @ stub RtlWalkFrameChain diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 4ae8e36ce0..dc6f7ecf32 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1955,3 +1955,67 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RtlAcquireSRWLockExclusive( lock ); return status; } + +static HANDLE woa_event; +static RTL_RUN_ONCE init_once_woa = RTL_RUN_ONCE_INIT; +static DWORD WINAPI init_woa( RTL_RUN_ONCE *once, void *param, void **context ) +{ + NtCreateKeyedEvent( &woa_event, GENERIC_READ|GENERIC_WRITE, NULL, 0 ); + return TRUE; +} + +/*********************************************************************** + * RtlWaitOnAddress (NTDLL.@) + */ +NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, + const LARGE_INTEGER *timeout ) +{ + switch (size) + { + case 1: + if (*(const UCHAR *)addr != *(const UCHAR *)cmp) + return STATUS_SUCCESS; + break; + case 2: + if (*(const USHORT *)addr != *(const USHORT *)cmp) + return STATUS_SUCCESS; + break; + case 4: + if (*(const ULONG *)addr != *(const ULONG *)cmp) + return STATUS_SUCCESS; + break; + case 8: + if (*(const ULONG64 *)addr != *(const ULONG64 *)cmp) + return STATUS_SUCCESS; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + RtlRunOnceExecuteOnce( &init_once_woa, init_woa, NULL, NULL ); + return NtWaitForKeyedEvent( woa_event, addr, 0, timeout ); +} + +/*********************************************************************** + * RtlWakeAddressAll (NTDLL.@) + */ +void WINAPI RtlWakeAddressAll( const void *addr ) +{ + LARGE_INTEGER now; + + RtlRunOnceExecuteOnce( &init_once_woa, init_woa, NULL, NULL ); + NtQuerySystemTime( &now ); + while (NtReleaseKeyedEvent( woa_event, addr, 0, &now ) == STATUS_SUCCESS) {} +} + +/*********************************************************************** + * RtlWakeAddressSingle (NTDLL.@) + */ +void WINAPI RtlWakeAddressSingle( const void *addr ) +{ + LARGE_INTEGER now; + + RtlRunOnceExecuteOnce( &init_once_woa, init_woa, NULL, NULL ); + NtQuerySystemTime( &now ); + NtReleaseKeyedEvent( woa_event, addr, 0, &now ); +} diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 524085474d..b83a8fc841 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -70,6 +70,10 @@ static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); +static void (WINAPI *pRtlWakeAddressAll)( const void * ); +static void (WINAPI *pRtlWakeAddressSingle)( const void * ); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2064,6 +2068,80 @@ static void test_mutant(void) NtClose( mutant ); } +static void test_wait_on_address(void) +{ + DWORD ticks; + SIZE_T size; + NTSTATUS status; + LARGE_INTEGER timeout; + LONG64 address, compare; + + if (!pRtlWaitOnAddress) + { + win_skip("RtlWaitOnAddress not supported, skipping test\n"); + return; + } + + if (0) /* crash on Windows */ + { + pRtlWaitOnAddress(&address, NULL, 8, NULL); + pRtlWaitOnAddress(NULL, &compare, 8, NULL); + pRtlWaitOnAddress(NULL, NULL, 8, NULL); + } + + /* don't crash */ + pRtlWakeAddressSingle(NULL); + pRtlWakeAddressAll(NULL); + + /* invalid values */ + address = 0; + compare = 0; + status = pRtlWaitOnAddress(&address, &compare, 5, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got %x\n", status); + + /* values match */ + address = 0; + compare = 0; + pNtQuerySystemTime(&timeout); + timeout.QuadPart += (LONGLONG)1000*10000; + ticks = GetTickCount(); + status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); + ticks = GetTickCount() - ticks; + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(ticks >= 1000 && ticks <= 1500, "got %u\n", ticks); + ok(address == 0, "got %ld\n", address); + ok(compare == 0, "got %ld\n", compare); + + /* different address size */ + for (size = 1; size <= 4; size <<= 1) + { + compare = ~0; + compare <<= size * 8; + + pNtQuerySystemTime(&timeout); + timeout.QuadPart += (LONGLONG)1000 * 10000; + ticks = GetTickCount(); + status = pRtlWaitOnAddress(&address, &compare, size, &timeout); + ticks = GetTickCount() - ticks; + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(ticks >= 1000 && ticks <= 1500, "got %u\n", ticks); + + status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); + ok(!status, "got 0x%08x\n", status); + } + address = 0; + compare = 1; + status = pRtlWaitOnAddress(&address, &compare, 8, NULL); + ok(!status, "got 0x%08x\n", status); + + /* no waiters */ + address = 0; + pRtlWakeAddressSingle(&address); + ok(address == 0, "got %ld\n", address); + pRtlWakeAddressAll(&address); + ok(address == 0, "got %ld\n", address); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2117,6 +2195,10 @@ START_TEST(om) pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); + pNtQuerySystemTime = (void *)GetProcAddress(hntdll, "NtQuerySystemTime"); + pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); + pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); + pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); test_case_sensitive(); test_namespace_pipe(); @@ -2130,4 +2212,5 @@ START_TEST(om) test_mutant(); test_keyed_events(); test_null_device(); + test_wait_on_address(); } diff --git a/include/winternl.h b/include/winternl.h index 1cec3cfc96..9c8861334a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2865,6 +2865,9 @@ NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); +NTSYSAPI NTSTATUS WINAPI RtlWaitOnAddress(const void *,const void *,SIZE_T,const LARGE_INTEGER *); +NTSYSAPI void WINAPI RtlWakeAddressAll(const void *); +NTSYSAPI void WINAPI RtlWakeAddressSingle(const void *); NTSYSAPI void WINAPI RtlWakeAllConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); -- 2.17.1

1 1

[v2 PATCH] d2d1: Add ID2D1Factory2 stub.
by Nikolay Sivov 26 Oct '18

26 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: restored masking for previous interface version. We can remove it when command list is implemented. dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 106 +++++++++++++++++++++------------------ dlls/uuid/d2d.c | 2 +- include/Makefile.in | 1 + include/d2d1_2.idl | 58 +++++++++++++++++++++ 5 files changed, 119 insertions(+), 50 deletions(-) create mode 100644 include/d2d1_2.idl diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0a5bc36c9a..5f451b22d9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -25,7 +25,7 @@ #include <assert.h> #include <limits.h> #define COBJMACROS -#include "d2d1_1.h" +#include "d2d1_2.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index dea25effa9..d48673cd85 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -32,7 +32,7 @@ struct d2d_settings d2d_settings = struct d2d_factory { - ID2D1Factory1 ID2D1Factory1_iface; + ID2D1Factory2 ID2D1Factory2_iface; LONG refcount; ID3D10Device1 *device; @@ -41,9 +41,9 @@ struct d2d_factory float dpi_y; }; -static inline struct d2d_factory *impl_from_ID2D1Factory1(ID2D1Factory1 *iface) +static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) { - return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory1_iface); + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory2_iface); } static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) @@ -64,15 +64,16 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if ((IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) + if ((IsEqualGUID(iid, &IID_ID2D1Factory2) && d2d_settings.max_version_factory >= 2) + || (IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1Factory1_AddRef(iface); + ID2D1Factory2_AddRef(iface); *out = iface; return S_OK; } @@ -83,9 +84,9 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory1 *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory2 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); ULONG refcount = InterlockedIncrement(&factory->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -93,9 +94,9 @@ static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory1 *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -110,18 +111,18 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) return refcount; } -static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory1 *iface) +static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory2 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); TRACE("iface %p.\n", iface); return d2d_factory_reload_sysmetrics(factory); } -static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory1 *iface, float *dpi_x, float *dpi_y) +static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory2 *iface, float *dpi_x, float *dpi_y) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); @@ -129,7 +130,7 @@ static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory1 *iface, fl *dpi_y = factory->dpi_y; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory2 *iface, const D2D1_RECT_F *rect, ID2D1RectangleGeometry **geometry) { struct d2d_geometry *object; @@ -153,7 +154,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory2 *iface, const D2D1_ROUNDED_RECT *rect, ID2D1RoundedRectangleGeometry **geometry) { FIXME("iface %p, rect %p, geometry %p stub!\n", iface, rect, geometry); @@ -161,7 +162,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory2 *iface, const D2D1_ELLIPSE *ellipse, ID2D1EllipseGeometry **geometry) { FIXME("iface %p, ellipse %p, geometry %p stub!\n", iface, ellipse, geometry); @@ -169,7 +170,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory1 return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory2 *iface, D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, UINT32 geometry_count, ID2D1GeometryGroup **group) { FIXME("iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p stub!\n", @@ -178,7 +179,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory1 * return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory2 *iface, ID2D1Geometry *src_geometry, const D2D1_MATRIX_3X2_F *transform, ID2D1TransformedGeometry **transformed_geometry) { @@ -198,7 +199,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *iface, ID2D1PathGeometry **geometry) +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory2 *iface, ID2D1PathGeometry **geometry) { struct d2d_geometry *object; @@ -215,7 +216,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *iface, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle **stroke_style) { @@ -241,7 +242,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *if return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory2 *iface, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock **state_block) { @@ -281,10 +282,10 @@ static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory2 *iface, IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); struct d2d_wic_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -300,7 +301,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return hr; } - if (FAILED(hr = d2d_wic_render_target_init(object, iface, device, target, desc))) + if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory1 *)iface, device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); @@ -313,11 +314,11 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory2 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc, ID2D1HwndRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); struct d2d_hwnd_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -330,7 +331,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_hwnd_render_target_init(object, iface, device, desc, hwnd_rt_desc))) + if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory1 *)iface, device, desc, hwnd_rt_desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); @@ -343,7 +344,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory2 *iface, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { IDXGIDevice *dxgi_device; @@ -358,7 +359,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 return hr; } - hr = ID2D1Factory1_CreateDevice(iface, dxgi_device, &device); + hr = ID2D1Factory1_CreateDevice((ID2D1Factory1 *)iface, dxgi_device, &device); IDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { @@ -371,10 +372,10 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory2 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1DCRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); struct d2d_dc_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -387,7 +388,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_dc_render_target_init(object, iface, device, desc))) + if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory1 *)iface, device, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); @@ -400,7 +401,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { struct d2d_device *object; @@ -410,7 +411,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_device_init(object, iface, dxgi_device); + d2d_device_init(object, (ID2D1Factory1 *)iface, dxgi_device); TRACE("Create device %p.\n", object); *device = &object->ID2D1Device_iface; @@ -418,7 +419,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory2 *iface, const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle1 **stroke_style) { @@ -428,14 +429,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory1 *iface, ID2D1PathGeometry1 **geometry) +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory2 *iface, ID2D1PathGeometry1 **geometry) { FIXME("iface %p, geometry %p stub!\n", iface, geometry); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory2 *iface, const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock1 **state_block) { @@ -455,7 +456,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Facto return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory2 *iface, IStream *stream, ID2D1GdiMetafile **metafile) { FIXME("iface %p, stream %p, metafile %p stub!\n", iface, stream, metafile); @@ -463,7 +464,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory1 *if return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory2 *iface, REFCLSID effect_id, IStream *property_xml, const D2D1_PROPERTY_BINDING *bindings, UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) { @@ -473,7 +474,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory2 *iface, REFCLSID effect_id, const WCHAR *property_xml, const D2D1_PROPERTY_BINDING *bindings, UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) { @@ -483,14 +484,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Facto return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory1 *iface, REFCLSID effect_id) +static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory2 *iface, REFCLSID effect_id) { FIXME("iface %p, effect_id %s stub!\n", iface, debugstr_guid(effect_id)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory2 *iface, CLSID *effects, UINT32 effect_count, UINT32 *returned, UINT32 *registered) { FIXME("iface %p, effects %p, effect_count %u, returned %p, registered %p stub!\n", @@ -499,7 +500,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory1 return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory2 *iface, REFCLSID effect_id, ID2D1Properties **props) { FIXME("iface %p, effect_id %s, props %p stub!\n", iface, debugstr_guid(effect_id), props); @@ -507,7 +508,15 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory1 * return E_NOTIMPL; } -static const struct ID2D1Factory1Vtbl d2d_factory_vtbl = +static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory1_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, + ID2D1Device1 **device) +{ + FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + + return E_NOTIMPL; +} + +static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = { d2d_factory_QueryInterface, d2d_factory_AddRef, @@ -536,6 +545,7 @@ static const struct ID2D1Factory1Vtbl d2d_factory_vtbl = d2d_factory_UnregisterEffect, d2d_factory_GetRegisteredEffects, d2d_factory_GetEffectProperties, + d2d_factory_ID2D1Factory1_CreateDevice, }; static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, @@ -546,7 +556,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); - factory->ID2D1Factory1_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Factory2_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); } @@ -567,8 +577,8 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("Created factory %p.\n", object); - hr = ID2D1Factory1_QueryInterface(&object->ID2D1Factory1_iface, iid, factory); - ID2D1Factory1_Release(&object->ID2D1Factory1_iface); + hr = ID2D1Factory2_QueryInterface(&object->ID2D1Factory2_iface, iid, factory); + ID2D1Factory2_Release(&object->ID2D1Factory2_iface); return hr; } diff --git a/dlls/uuid/d2d.c b/dlls/uuid/d2d.c index d2cf6db5fa..c74ebc9c49 100644 --- a/dlls/uuid/d2d.c +++ b/dlls/uuid/d2d.c @@ -18,4 +18,4 @@ #include "d3d10_1.h" #include "initguid.h" -#include "d2d1_1.h" +#include "d2d1_2.h" diff --git a/include/Makefile.in b/include/Makefile.in index f60f91970a..47c7b5e328 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -80,6 +80,7 @@ SOURCES = \ cvconst.h \ d2d1.idl \ d2d1_1.idl \ + d2d1_2.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl new file mode 100644 index 0000000000..3506c796cc --- /dev/null +++ b/include/d2d1_2.idl @@ -0,0 +1,58 @@ +/* + * Copyright 2018 Nikolay Sivov 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 + */ + +import "d2d1_1.idl"; + +interface ID2D1DeviceContext1; + +typedef enum D2D1_RENDERING_PRIORITY +{ + D2D1_RENDERING_PRIORITY_NORMAL = 0, + D2D1_RENDERING_PRIORITY_LOW = 1, + D2D1_RENDERING_PRIORITY_FORCE_DWORD = 0xffffffff, +} D2D1_RENDERING_PRIORITY; + +[ + object, + uuid(d21768e1-23a4-4823-a14b-7c3eba85d658), + local, +] +interface ID2D1Device1 : ID2D1Device +{ + D2D1_RENDERING_PRIORITY GetRenderingPriority(); + void SetRenderingPriority( + [in] D2D1_RENDERING_PRIORITY priority + ); + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext1 **device_context + ); +} + +[ + object, + uuid(94f81a73-9212-4376-9c58-b16a3a0d3992), + local, +] +interface ID2D1Factory2 : ID2D1Factory1 +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device1 **device + ); +} -- 2.19.1

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 26 Oct '18

26 Oct '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/po/fi.po b/po/fi.po index db5ed00df6..0dbeb081b9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -304,25 +304,23 @@ msgstr "Perutaan..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 jäljellä" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 ja %3!u! %4 jäljellä" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Sekunnit" +msgstr "sekuntia" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minuuttia" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "tuntia" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -4586,7 +4584,7 @@ msgstr "Ei voida suorittaa koko ruudulla.\n" #: winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "Lipuketta ei ole.\n" +msgstr "Tunnusta ei ole.\n" #: winerror.mc:1063 msgid "Registry corrupt.\n" @@ -5298,7 +5296,7 @@ msgstr "Virheellinen ensisijainen ryhmä.\n" #: winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "Ei tekeytymislipuketta.\n" +msgstr "Ei tekeytymistunnusta.\n" #: winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5446,7 +5444,7 @@ msgstr "Tekeytymistaso ei kelpaa.\n" #: winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "Nimetöntä suojauslipuketta ei voida avata.\n" +msgstr "Ei voida avata nimetöntä suojaustunnusta.\n" #: winerror.mc:2143 msgid "Bad validation class.\n" @@ -5454,7 +5452,7 @@ msgstr "Vahvistusluokka ei kelpaa.\n" #: winerror.mc:2148 msgid "Bad token type.\n" -msgstr "Väärä avaintyyppi.\n" +msgstr "Väärä tunnuksen tyyppi.\n" #: winerror.mc:2153 msgid "No security on object.\n" @@ -11054,10 +11052,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Virhe: Virheellinen valinta '%c'.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Virhe: Prosessia \"%1\" ei löytynyt.\n" +msgstr "Virhe: Ei saatu haettua isäntänimeä: %u.\n" #: hostname.rc:33 msgid "" -- 2.19.1

1 0

[PATCH] wine.inf: Install oledb32,msdaps to the right location for WOW64
by Alistair Leslie-Hughes 26 Oct '18

26 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 77adb8f..f1d00fa 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2577,6 +2577,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe 16422,Windows NT\Accessories,wordpad.exe +16427,System\OLE DB,oledb32.dll +16427,System\OLE DB,msdaps.dll 11,,* [FakeDlls] -- 1.9.1

1 0

[PATCH vkd3d 05/10] vkd3d: Enable VK_EXT_vertex_attribute_divisor.
by Józef Kucia 25 Oct '18

25 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 24 ++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 1 + libs/vkd3d/vulkan_procs.h | 2 ++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 419b9042b178..fca446160db8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -64,6 +64,8 @@ static const char * const required_device_extensions[] = static const struct vkd3d_optional_extension_info optional_device_extensions[] = { {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, + {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, + offsetof(struct vkd3d_vulkan_info, EXT_vertex_attribute_divisor)}, }; static bool is_extension_disabled(const char *extension_name) @@ -993,9 +995,11 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, { unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; VkQueueFamilyProperties *queue_properties = NULL; VkDeviceQueueCreateInfo *queue_info = NULL; - VkPhysicalDeviceFeatures device_features; + VkPhysicalDeviceFeatures2 features2; VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_count; @@ -1082,11 +1086,19 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); - VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); - if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) + memset(&vertex_divisor_features, 0, sizeof(vertex_divisor_features)); + vertex_divisor_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; + features2.pNext = &vertex_divisor_features; + if (vulkan_info->KHR_get_physical_device_properties2) + VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &features2)); + else + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2.features)); + + if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &features2.features, &extension_count))) goto done; - device_features.shaderTessellationAndGeometryPointSize = VK_FALSE; + features2.features.shaderTessellationAndGeometryPointSize = VK_FALSE; if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { @@ -1096,7 +1108,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, /* Create device */ device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - device_info.pNext = NULL; + device_info.pNext = &vertex_divisor_features; device_info.flags = 0; device_info.queueCreateInfoCount = queue_family_count; device_info.pQueueCreateInfos = queue_info; @@ -1108,7 +1120,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, create_info->device_extensions, create_info->device_extension_count, NULL, 0, NULL, &device->vk_info); device_info.ppEnabledExtensionNames = extensions; - device_info.pEnabledFeatures = &device_features; + device_info.pEnabledFeatures = &features2.features; vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device)); vkd3d_free(extensions); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4be160b89b9c..e4e1e118cc0a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -83,6 +83,7 @@ struct vkd3d_vulkan_info bool EXT_debug_report; /* device extensions */ bool KHR_push_descriptor; + bool EXT_vertex_attribute_divisor; VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index 690a1a2b5acf..e14121c1a76b 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -46,6 +46,8 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) +/* VK_KHR_get_physical_device_properties2 */ +VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2KHR) /* VK_EXT_debug_report */ VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT) VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT) -- 2.18.1

5 7