- wine-devel - winehq.org

[PATCH] include: add missing structures in dcommon.idl
by Biswapriyo Nath 15 May '20

15 May '20

1 0

[PATCH] mfreadwrite/reader: Consider end-of-stream state when picking stream for MF_SOURCE_READER_ANY_STREAM requests.
by Nikolay Sivov 15 May '20

15 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Otherwise first selected stream to reach EOS will be continuously queried returning error, and remaining selected streams that still might have data will be not. dlls/mfreadwrite/reader.c | 60 ++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index eaf52ce31e3..e69c2b980b1 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -114,6 +114,7 @@ struct media_stream enum media_stream_state state; unsigned int flags; unsigned int requests; + unsigned int responses; }; enum source_reader_async_op @@ -360,6 +361,7 @@ static void source_reader_queue_response(struct source_reader *reader, struct me IMFSample_AddRef(response->sample); list_add_tail(&reader->responses, &response->entry); + stream->responses++; if (stream->requests) { @@ -831,6 +833,22 @@ static ULONG WINAPI source_reader_async_commands_callback_Release(IMFAsyncCallba return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } +static struct stream_response * media_stream_detach_response(struct source_reader *reader, struct stream_response *response) +{ + struct media_stream *stream; + + list_remove(&response->entry); + + if (response->stream_index < reader->stream_count) + { + stream = &reader->streams[response->stream_index]; + if (stream->responses) + --stream->responses; + } + + return response; +} + static struct stream_response *media_stream_pop_response(struct source_reader *reader, struct media_stream *stream) { struct stream_response *response; @@ -841,20 +859,13 @@ static struct stream_response *media_stream_pop_response(struct source_reader *r LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { if (response->stream_index == stream->index) - { - list_remove(&response->entry); - return response; - } + return media_stream_detach_response(reader, response); } } else { if ((head = list_head(&reader->responses))) - { - response = LIST_ENTRY(head, struct stream_response, entry); - list_remove(&response->entry); - return response; - } + return media_stream_detach_response(reader, LIST_ENTRY(head, struct stream_response, entry)); } return NULL; @@ -979,20 +990,35 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m static HRESULT source_reader_get_first_selected_stream(struct source_reader *reader, unsigned int flags, unsigned int *stream_index) { - unsigned int i; - BOOL selected; + unsigned int i, first_selected = ~0u; + BOOL selected, stream_drained; for (i = 0; i < reader->stream_count; ++i) { - source_reader_get_stream_selection(reader, i, &selected); - if (SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected && - !(reader->streams[i].flags & flags)) + stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; + selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; + + if (selected && !(reader->streams[i].flags & flags)) { - *stream_index = i; - break; + if (first_selected == ~0u) + first_selected = i; + + if (!stream_drained) + { + *stream_index = i; + break; + } } } + /* If all selected streams reached EOS, use first selected. This fallback only applies after reader went through all + selected streams once. */ + if (i == reader->stream_count && first_selected != ~0u && !flags) + { + *stream_index = first_selected; + i = first_selected; + } + return i == reader->stream_count ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } @@ -1046,7 +1072,7 @@ static void source_reader_release_responses(struct source_reader *reader, struct { continue; } - list_remove(&ptr->entry); + media_stream_detach_response(reader, ptr); source_reader_release_response(ptr); } } -- 2.26.2

1 0

[PATCH 2/2] crypt32: Microsoft root policy does not include the base policy.
by Hans Leidekker 15 May '20

15 May '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/chain.c | 57 +++-- dlls/crypt32/tests/chain.c | 440 +++++++++++++++++++++++++++++++++++++ 2 files changed, 468 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4712024d3a..72a103699a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3703,38 +3703,37 @@ static BOOL WINAPI verify_ms_root_policy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) { - BOOL ret = verify_base_policy(szPolicyOID, pChainContext, pPolicyPara, - pPolicyStatus); + BOOL isMSRoot = FALSE; - if (ret && !pPolicyStatus->dwError) - { - CERT_PUBLIC_KEY_INFO msPubKey = { { 0 } }; - BOOL isMSRoot = FALSE; - DWORD i; - CRYPT_DATA_BLOB keyBlobs[] = { - { sizeof(msPubKey1), msPubKey1 }, - { sizeof(msPubKey2), msPubKey2 }, - { sizeof(msPubKey3), msPubKey3 }, - { sizeof(msPubKey4), msPubKey4 }, - }; - PCERT_SIMPLE_CHAIN rootChain = - pChainContext->rgpChain[pChainContext->cChain -1 ]; - PCCERT_CONTEXT root = - rootChain->rgpElement[rootChain->cElement - 1]->pCertContext; + CERT_PUBLIC_KEY_INFO msPubKey = { { 0 } }; + DWORD i; + CRYPT_DATA_BLOB keyBlobs[] = { + { sizeof(msPubKey1), msPubKey1 }, + { sizeof(msPubKey2), msPubKey2 }, + { sizeof(msPubKey3), msPubKey3 }, + { sizeof(msPubKey4), msPubKey4 }, + }; + PCERT_SIMPLE_CHAIN rootChain = + pChainContext->rgpChain[pChainContext->cChain - 1]; + PCCERT_CONTEXT root = + rootChain->rgpElement[rootChain->cElement - 1]->pCertContext; - for (i = 0; !isMSRoot && i < ARRAY_SIZE(keyBlobs); i++) - { - msPubKey.PublicKey.cbData = keyBlobs[i].cbData; - msPubKey.PublicKey.pbData = keyBlobs[i].pbData; - if (CertComparePublicKeyInfo( - X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, - &root->pCertInfo->SubjectPublicKeyInfo, &msPubKey)) - isMSRoot = TRUE; - } - if (isMSRoot) - pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = 0; + for (i = 0; !isMSRoot && i < ARRAY_SIZE(keyBlobs); i++) + { + msPubKey.PublicKey.cbData = keyBlobs[i].cbData; + msPubKey.PublicKey.pbData = keyBlobs[i].pbData; + if (CertComparePublicKeyInfo(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + &root->pCertInfo->SubjectPublicKeyInfo, &msPubKey)) isMSRoot = TRUE; } - return ret; + + pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = 0; + + if (isMSRoot) + pPolicyStatus->dwError = 0; + else + pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; + + return TRUE; } typedef BOOL (WINAPI *CertVerifyCertificateChainPolicyFunc)(LPCSTR szPolicyOID, diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 30a69a21f9..18f7eca682 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2924,6 +2924,415 @@ static const BYTE chain31_1[] = { 0x43,0x08,0xe5,0x78,0x2b,0x95,0xf3,0x75,0xb6,0x88,0xf0,0x6b,0x5c,0x5b,0x50, 0x04,0x91,0x3b,0x89,0x5a,0x60,0x1f,0xfc,0x36,0x53,0x32,0x36,0x0a,0x4d,0x03, 0x2c,0xd7 }; +/* Microsoft Root Certificate Authority 2010 */ +static const BYTE chain32_1[] = { +0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10, +0x28,0xcc,0x3a,0x25,0xbf,0xba,0x44,0xac,0x44,0x9a,0x9b,0x58,0x6b,0x43,0x39, +0xaa,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05, +0x00,0x30,0x81,0x88,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02, +0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61, +0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55, +0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c, +0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66, +0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e,0x31,0x32, +0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29,0x4d,0x69,0x63,0x72,0x6f,0x73, +0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66, +0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79, +0x20,0x32,0x30,0x31,0x30,0x30,0x1e,0x17,0x0d,0x31,0x30,0x30,0x36,0x32,0x33, +0x32,0x31,0x35,0x37,0x32,0x34,0x5a,0x17,0x0d,0x33,0x35,0x30,0x36,0x32,0x33, +0x32,0x32,0x30,0x34,0x30,0x31,0x5a,0x30,0x81,0x88,0x31,0x0b,0x30,0x09,0x06, +0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31, +0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f, +0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69, +0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61, +0x74,0x69,0x6f,0x6e,0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20, +0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74, +0x68,0x6f,0x72,0x69,0x74,0x79,0x20,0x32,0x30,0x31,0x30,0x30,0x82,0x02,0x22, +0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00, +0x03,0x82,0x02,0x0f,0x00,0x30,0x82,0x02,0x0a,0x02,0x82,0x02,0x01,0x00,0xb9, +0x08,0x9e,0x28,0xe4,0xe4,0xec,0x06,0x4e,0x50,0x68,0xb3,0x41,0xc5,0x7b,0xeb, +0xae,0xb6,0x8e,0xaf,0x81,0xba,0x22,0x44,0x1f,0x65,0x34,0x69,0x4c,0xbe,0x70, +0x40,0x17,0xf2,0x16,0x7b,0xe2,0x79,0xfd,0x86,0xed,0x0d,0x39,0xf4,0x1b,0xa8, +0xad,0x92,0x90,0x1e,0xcb,0x3d,0x76,0x8f,0x5a,0xd9,0xb5,0x91,0x10,0x2e,0x3c, +0x05,0x8d,0x8a,0x6d,0x24,0x54,0xe7,0x1f,0xed,0x56,0xad,0x83,0xb4,0x50,0x9c, +0x15,0xa5,0x17,0x74,0x88,0x59,0x20,0xfc,0x08,0xc5,0x84,0x76,0xd3,0x68,0xd4, +0x6f,0x28,0x78,0xce,0x5c,0xb8,0xf3,0x50,0x90,0x44,0xff,0xe3,0x63,0x5f,0xbe, +0xa1,0x9a,0x2c,0x96,0x15,0x04,0xd6,0x07,0xfe,0x1e,0x84,0x21,0xe0,0x42,0x31, +0x11,0xc4,0x28,0x36,0x94,0xcf,0x50,0xa4,0x62,0x9e,0xc9,0xd6,0xab,0x71,0x00, +0xb2,0x5b,0x0c,0xe6,0x96,0xd4,0x0a,0x24,0x96,0xf5,0xff,0xc6,0xd5,0xb7,0x1b, +0xd7,0xcb,0xb7,0x21,0x62,0xaf,0x12,0xdc,0xa1,0x5d,0x37,0xe3,0x1a,0xfb,0x1a, +0x46,0x98,0xc0,0x9b,0xc0,0xe7,0x63,0x1f,0x2a,0x08,0x93,0x02,0x7e,0x1e,0x6a, +0x8e,0xf2,0x9f,0x18,0x89,0xe4,0x22,0x85,0xa2,0xb1,0x84,0x57,0x40,0xff,0xf5, +0x0e,0xd8,0x6f,0x9c,0xed,0xe2,0x45,0x31,0x01,0xcd,0x17,0xe9,0x7f,0xb0,0x81, +0x45,0xe3,0xaa,0x21,0x40,0x26,0xa1,0x72,0xaa,0xa7,0x4f,0x3c,0x01,0x05,0x7e, +0xee,0x83,0x58,0xb1,0x5e,0x06,0x63,0x99,0x62,0x91,0x78,0x82,0xb7,0x0d,0x93, +0x0c,0x24,0x6a,0xb4,0x1b,0xdb,0x27,0xec,0x5f,0x95,0x04,0x3f,0x93,0x4a,0x30, +0xf5,0x97,0x18,0xb3,0xa7,0xf9,0x19,0xa7,0x93,0x33,0x1d,0x01,0xc8,0xdb,0x22, +0x52,0x5c,0xd7,0x25,0xc9,0x46,0xf9,0xa2,0xfb,0x87,0x59,0x43,0xbe,0x9b,0x62, +0xb1,0x8d,0x2d,0x86,0x44,0x1a,0x46,0xac,0x78,0x61,0x7e,0x30,0x09,0xfa,0xae, +0x89,0xc4,0x41,0x2a,0x22,0x66,0x03,0x91,0x39,0x45,0x9c,0xc7,0x8b,0x0c,0xa8, +0xca,0x0d,0x2f,0xfb,0x52,0xea,0x0c,0xf7,0x63,0x33,0x23,0x9d,0xfe,0xb0,0x1f, +0xad,0x67,0xd6,0xa7,0x50,0x03,0xc6,0x04,0x70,0x63,0xb5,0x2c,0xb1,0x86,0x5a, +0x43,0xb7,0xfb,0xae,0xf9,0x6e,0x29,0x6e,0x21,0x21,0x41,0x26,0x06,0x8c,0xc9, +0xc3,0xee,0xb0,0xc2,0x85,0x93,0xa1,0xb9,0x85,0xd9,0xe6,0x32,0x6c,0x4b,0x4c, +0x3f,0xd6,0x5d,0xa3,0xe5,0xb5,0x9d,0x77,0xc3,0x9c,0xc0,0x55,0xb7,0x74,0x00, +0xe3,0xb8,0x38,0xab,0x83,0x97,0x50,0xe1,0x9a,0x42,0x24,0x1d,0xc6,0xc0,0xa3, +0x30,0xd1,0x1a,0x5a,0xc8,0x52,0x34,0xf7,0x73,0xf1,0xc7,0x18,0x1f,0x33,0xad, +0x7a,0xec,0xcb,0x41,0x60,0xf3,0x23,0x94,0x20,0xc2,0x48,0x45,0xac,0x5c,0x51, +0xc6,0x2e,0x80,0xc2,0xe2,0x77,0x15,0xbd,0x85,0x87,0xed,0x36,0x9d,0x96,0x91, +0xee,0x00,0xb5,0xa3,0x70,0xec,0x9f,0xe3,0x8d,0x80,0x68,0x83,0x76,0xba,0xaf, +0x5d,0x70,0x52,0x22,0x16,0xe2,0x66,0xfb,0xba,0xb3,0xc5,0xc2,0xf7,0x3e,0x2f, +0x77,0xa6,0xca,0xde,0xc1,0xa6,0xc6,0x48,0x4c,0xc3,0x37,0x51,0x23,0xd3,0x27, +0xd7,0xb8,0x4e,0x70,0x96,0xf0,0xa1,0x44,0x76,0xaf,0x78,0xcf,0x9a,0xe1,0x66, +0x13,0x02,0x03,0x01,0x00,0x01,0xa3,0x51,0x30,0x4f,0x30,0x0b,0x06,0x03,0x55, +0x1d,0x0f,0x04,0x04,0x03,0x02,0x01,0x86,0x30,0x0f,0x06,0x03,0x55,0x1d,0x13, +0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1d,0x06,0x03,0x55, +0x1d,0x0e,0x04,0x16,0x04,0x14,0xd5,0xf6,0x56,0xcb,0x8f,0xe8,0xa2,0x5c,0x62, +0x68,0xd1,0x3d,0x94,0x90,0x5b,0xd7,0xce,0x9a,0x18,0xc4,0x30,0x10,0x06,0x09, +0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x15,0x01,0x04,0x03,0x02,0x01,0x00,0x30, +0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x03, +0x82,0x02,0x01,0x00,0xac,0xa5,0x96,0x8c,0xbf,0xbb,0xae,0xa6,0xf6,0xd7,0x71, +0x87,0x43,0x31,0x56,0x88,0xfd,0x1c,0x32,0x71,0x5b,0x35,0xb7,0xd4,0xf0,0x91, +0xf2,0xaf,0x37,0xe2,0x14,0xf1,0xf3,0x02,0x26,0x05,0x3e,0x16,0x14,0x7f,0x14, +0xba,0xb8,0x4f,0xfb,0x89,0xb2,0xb2,0xe7,0xd4,0x09,0xcc,0x6d,0xb9,0x5b,0x3b, +0x64,0x65,0x70,0x66,0xb7,0xf2,0xb1,0x5a,0xdf,0x1a,0x02,0xf3,0xf5,0x51,0xb8, +0x67,0x6d,0x79,0xf3,0xbf,0x56,0x7b,0xe4,0x84,0xb9,0x2b,0x1e,0x9b,0x40,0x9c, +0x26,0x34,0xf9,0x47,0x18,0x98,0x69,0xd8,0x1c,0xd7,0xb6,0xd1,0xbf,0x8f,0x61, +0xc2,0x67,0xc4,0xb5,0xef,0x60,0x43,0x8e,0x10,0x1b,0x36,0x49,0xe4,0x20,0xca, +0xad,0xa7,0xc1,0xb1,0x27,0x65,0x09,0xf8,0xcd,0xf5,0x5b,0x2a,0xd0,0x84,0x33, +0xf3,0xef,0x1f,0xf2,0xf5,0x9c,0x0b,0x58,0x93,0x37,0xa0,0x75,0xa0,0xde,0x72, +0xde,0x6c,0x75,0x2a,0x66,0x22,0xf5,0x8c,0x06,0x30,0x56,0x9f,0x40,0xb9,0x30, +0xaa,0x40,0x77,0x15,0x82,0xd7,0x8b,0xec,0xc0,0xd3,0xb2,0xbd,0x83,0xc5,0x77, +0x0c,0x1e,0xae,0xaf,0x19,0x53,0xa0,0x4d,0x79,0x71,0x9f,0x0f,0xaf,0x30,0xce, +0x67,0xf9,0xd6,0x2c,0xcc,0x22,0x41,0x7a,0x07,0xf2,0x97,0x42,0x18,0xce,0x59, +0x79,0x10,0x55,0xde,0x6f,0x10,0xe4,0xb8,0xda,0x83,0x66,0x40,0x16,0x09,0x68, +0x23,0x5b,0x97,0x2e,0x26,0x9a,0x02,0xbb,0x57,0x8c,0xc5,0xb8,0xba,0x69,0x62, +0x32,0x80,0x89,0x9e,0xa1,0xfd,0xc0,0x92,0x7c,0x7b,0x2b,0x33,0x19,0x84,0x2a, +0x63,0xc5,0x00,0x68,0x62,0xfa,0x9f,0x47,0x8d,0x99,0x7a,0x45,0x3a,0xa7,0xe9, +0xed,0xee,0x69,0x42,0xb5,0xf3,0x81,0x9b,0x47,0x56,0x10,0x7b,0xfc,0x70,0x36, +0x84,0x18,0x73,0xea,0xef,0xf9,0x97,0x4d,0x9e,0x33,0x23,0xdd,0x26,0x0b,0xba, +0x2a,0xb7,0x3f,0x44,0xdc,0x83,0x27,0xff,0xbd,0x61,0x59,0x2b,0x11,0xb7,0xca, +0x4f,0xdb,0xc5,0x8b,0x0c,0x1c,0x31,0xae,0x32,0xf8,0xf8,0xb9,0x42,0xf7,0x7f, +0xdc,0x61,0x9a,0x76,0xb1,0x5a,0x04,0xe1,0x11,0x3d,0x66,0x45,0xb7,0x18,0x71, +0xbe,0xc9,0x24,0x85,0xd6,0xf3,0xd4,0xba,0x41,0x34,0x5d,0x12,0x2d,0x25,0xb9, +0x8d,0xa6,0x13,0x48,0x6d,0x4b,0xb0,0x07,0x7d,0x99,0x93,0x09,0x61,0x81,0x74, +0x57,0x26,0x8a,0xab,0x69,0xe3,0xe4,0xd9,0xc7,0x88,0xcc,0x24,0xd8,0xec,0x52, +0x24,0x5c,0x1e,0xbc,0x91,0x14,0xe2,0x96,0xde,0xeb,0x0a,0xda,0x9e,0xdd,0x5f, +0xb3,0x5b,0xdb,0xd4,0x82,0xec,0xc6,0x20,0x50,0x87,0x25,0x40,0x3a,0xfb,0xc7, +0xee,0xcd,0xfe,0x33,0xe5,0x6e,0xc3,0x84,0x09,0x55,0x03,0x25,0x39,0xc0,0xe9, +0x35,0x5d,0x65,0x31,0xa8,0xf6,0xbf,0xa0,0x09,0xcd,0x29,0xc7,0xb3,0x36,0x32, +0x2e,0xdc,0x95,0xf3,0x83,0xc1,0x5a,0xcf,0x8b,0x8d,0xf6,0xea,0xb3,0x21,0xf8, +0xa4,0xed,0x1e,0x31,0x0e,0xb6,0x4c,0x11,0xab,0x60,0x0b,0xa4,0x12,0x23,0x22, +0x17,0xa3,0x36,0x64,0x82,0x91,0x04,0x12,0xe0,0xab,0x6f,0x1e,0xcb,0x50,0x05, +0x61,0xb4,0x40,0xff,0x59,0x86,0x71,0xd1,0xd5,0x33,0x69,0x7c,0xa9,0x73,0x8a, +0x38,0xd7,0x64,0x0c,0xf1,0x69 }; +/* Microsoft Code Signing PCA 2010 */ +static const BYTE chain32_2[] = { +0x30,0x82,0x06,0x70,0x30,0x82,0x04,0x58,0xa0,0x03,0x02,0x01,0x02,0x02,0x0a, +0x61,0x0c,0x52,0x4c,0x00,0x00,0x00,0x00,0x00,0x03,0x30,0x0d,0x06,0x09,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x30,0x81,0x88,0x31,0x0b, +0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74, +0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65, +0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13, +0x15,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70, +0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e,0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04, +0x03,0x13,0x29,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x52,0x6f, +0x6f,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20, +0x41,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79,0x20,0x32,0x30,0x31,0x30,0x30, +0x1e,0x17,0x0d,0x31,0x30,0x30,0x37,0x30,0x36,0x32,0x30,0x34,0x30,0x31,0x37, +0x5a,0x17,0x0d,0x32,0x35,0x30,0x37,0x30,0x36,0x32,0x30,0x35,0x30,0x31,0x37, +0x5a,0x30,0x7e,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55, +0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61,0x73, +0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55,0x04, +0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06, +0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74, +0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e,0x31,0x28,0x30, +0x26,0x06,0x03,0x55,0x04,0x03,0x13,0x1f,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f, +0x66,0x74,0x20,0x43,0x6f,0x64,0x65,0x20,0x53,0x69,0x67,0x6e,0x69,0x6e,0x67, +0x20,0x50,0x43,0x41,0x20,0x32,0x30,0x31,0x30,0x30,0x82,0x01,0x22,0x30,0x0d, +0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x82, +0x01,0x0f,0x00,0x30,0x82,0x01,0x0a,0x02,0x82,0x01,0x01,0x00,0xe9,0x0e,0x64, +0x50,0x79,0x67,0xb5,0xc4,0xe3,0xfd,0x09,0x00,0x4c,0x9e,0x94,0xac,0xf7,0x56, +0x68,0xea,0x44,0xd8,0xcf,0xc5,0x58,0x4f,0xa9,0xa5,0x76,0x7c,0x6d,0x45,0xba, +0xd3,0x39,0x92,0xb4,0xa4,0x1e,0xf9,0xf9,0x65,0x82,0xe4,0x17,0xd2,0x8f,0xfd, +0x44,0x9c,0x08,0xe8,0x65,0x93,0xce,0x2c,0x55,0x84,0xbf,0x7d,0x08,0xe3,0x2e, +0x2b,0xa8,0x41,0x2b,0x18,0xb7,0xa2,0x4b,0x6e,0x49,0x4c,0x6b,0x15,0x07,0xde, +0xd1,0xd2,0xc2,0x89,0x1e,0x71,0x94,0xcd,0xb5,0x7f,0x4b,0xb4,0xaf,0x08,0xd8, +0xcc,0x88,0xd6,0x6b,0x17,0x94,0x3a,0x93,0xce,0x26,0x3f,0xec,0xe6,0xfe,0x34, +0x98,0x57,0xd5,0x1d,0x5d,0x49,0xf6,0xb2,0x2a,0x2e,0xd5,0x85,0xbb,0x59,0x3f, +0xf8,0x90,0xb4,0x2b,0x83,0x74,0xca,0x2b,0xb3,0x3b,0x46,0xe3,0xf0,0x46,0x49, +0xc1,0x17,0x66,0x54,0xc9,0x1c,0xbd,0x1d,0xc4,0x55,0x62,0x57,0x72,0xf8,0x67, +0xb9,0x25,0x20,0x34,0xde,0x5d,0xa6,0xa5,0x95,0x5e,0xab,0x28,0x80,0xcd,0xd5, +0xb2,0x9e,0xe5,0x03,0xb5,0x63,0xd3,0xb2,0x14,0xc8,0xc1,0xc8,0x8a,0x26,0x0a, +0x59,0x7f,0x07,0xec,0xff,0x0e,0xed,0x80,0x12,0x35,0x4c,0x12,0xa6,0xbe,0x52, +0x5b,0xf5,0xa6,0xda,0xe0,0x8b,0x0b,0x48,0x77,0xd6,0x85,0x47,0xd5,0x10,0xb9, +0xc6,0xe8,0xaa,0xee,0x8b,0x6a,0x2d,0x05,0x5c,0x60,0xc6,0xb4,0x2a,0x5b,0x9c, +0x23,0x1c,0x5f,0x45,0xe3,0x1a,0x14,0x1e,0x6f,0x37,0xcb,0x19,0x33,0x80,0x6a, +0x89,0x4d,0xa3,0x6a,0x66,0x63,0x78,0x93,0xd5,0x30,0xcf,0x95,0x1f,0x02,0x03, +0x01,0x00,0x01,0xa3,0x82,0x01,0xe3,0x30,0x82,0x01,0xdf,0x30,0x10,0x06,0x09, +0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x15,0x01,0x04,0x03,0x02,0x01,0x00,0x30, +0x1d,0x06,0x03,0x55,0x1d,0x0e,0x04,0x16,0x04,0x14,0xe6,0xfc,0x5f,0x7b,0xbb, +0x22,0x00,0x58,0xe4,0x72,0x4e,0xb5,0xf4,0x21,0x74,0x23,0x32,0xe6,0xef,0xac, +0x30,0x19,0x06,0x09,0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x04,0x0c, +0x1e,0x0a,0x00,0x53,0x00,0x75,0x00,0x62,0x00,0x43,0x00,0x41,0x30,0x0b,0x06, +0x03,0x55,0x1d,0x0f,0x04,0x04,0x03,0x02,0x01,0x86,0x30,0x0f,0x06,0x03,0x55, +0x1d,0x13,0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1f,0x06, +0x03,0x55,0x1d,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0xd5,0xf6,0x56,0xcb,0x8f, +0xe8,0xa2,0x5c,0x62,0x68,0xd1,0x3d,0x94,0x90,0x5b,0xd7,0xce,0x9a,0x18,0xc4, +0x30,0x56,0x06,0x03,0x55,0x1d,0x1f,0x04,0x4f,0x30,0x4d,0x30,0x4b,0xa0,0x49, +0xa0,0x47,0x86,0x45,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x63,0x72,0x6c,0x2e, +0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x2e,0x63,0x6f,0x6d,0x2f,0x70, +0x6b,0x69,0x2f,0x63,0x72,0x6c,0x2f,0x70,0x72,0x6f,0x64,0x75,0x63,0x74,0x73, +0x2f,0x4d,0x69,0x63,0x52,0x6f,0x6f,0x43,0x65,0x72,0x41,0x75,0x74,0x5f,0x32, +0x30,0x31,0x30,0x2d,0x30,0x36,0x2d,0x32,0x33,0x2e,0x63,0x72,0x6c,0x30,0x5a, +0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x01,0x04,0x4e,0x30,0x4c,0x30, +0x4a,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x30,0x02,0x86,0x3e,0x68,0x74, +0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x6d,0x69,0x63,0x72,0x6f,0x73, +0x6f,0x66,0x74,0x2e,0x63,0x6f,0x6d,0x2f,0x70,0x6b,0x69,0x2f,0x63,0x65,0x72, +0x74,0x73,0x2f,0x4d,0x69,0x63,0x52,0x6f,0x6f,0x43,0x65,0x72,0x41,0x75,0x74, +0x5f,0x32,0x30,0x31,0x30,0x2d,0x30,0x36,0x2d,0x32,0x33,0x2e,0x63,0x72,0x74, +0x30,0x81,0x9d,0x06,0x03,0x55,0x1d,0x20,0x04,0x81,0x95,0x30,0x81,0x92,0x30, +0x81,0x8f,0x06,0x09,0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x2e,0x03,0x30,0x81, +0x81,0x30,0x3d,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x02,0x01,0x16,0x31, +0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x6d,0x69,0x63,0x72, +0x6f,0x73,0x6f,0x66,0x74,0x2e,0x63,0x6f,0x6d,0x2f,0x50,0x4b,0x49,0x2f,0x64, +0x6f,0x63,0x73,0x2f,0x43,0x50,0x53,0x2f,0x64,0x65,0x66,0x61,0x75,0x6c,0x74, +0x2e,0x68,0x74,0x6d,0x30,0x40,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x02, +0x02,0x30,0x34,0x1e,0x32,0x20,0x1d,0x00,0x4c,0x00,0x65,0x00,0x67,0x00,0x61, +0x00,0x6c,0x00,0x5f,0x00,0x50,0x00,0x6f,0x00,0x6c,0x00,0x69,0x00,0x63,0x00, +0x79,0x00,0x5f,0x00,0x53,0x00,0x74,0x00,0x61,0x00,0x74,0x00,0x65,0x00,0x6d, +0x00,0x65,0x00,0x6e,0x00,0x74,0x00,0x2e,0x20,0x1d,0x30,0x0d,0x06,0x09,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x03,0x82,0x02,0x01,0x00, +0x1a,0x74,0xef,0x57,0x4f,0x29,0x7b,0xc4,0x16,0x85,0x78,0xb8,0x50,0xd3,0x22, +0xfc,0x09,0x9d,0xac,0x82,0x97,0xf8,0x34,0xff,0x2a,0x2c,0x97,0x95,0x12,0xe5, +0xe4,0xbf,0xcf,0xbf,0x93,0xc8,0xe3,0x34,0xa9,0xdb,0x81,0xb8,0xdc,0x1e,0x00, +0xbe,0xd2,0x35,0x6f,0xaf,0xe5,0x7f,0x79,0x95,0x77,0xe5,0x02,0xd4,0xf1,0xeb, +0xd8,0xcd,0x4e,0x1e,0x1b,0x61,0xa2,0xc2,0x5a,0x23,0x1a,0xf0,0x8c,0xa8,0x62, +0x51,0x45,0x67,0x08,0xe3,0x3f,0x3c,0x1e,0x93,0xf8,0x30,0x85,0x17,0xc8,0x39, +0x40,0xa6,0xd7,0x0e,0xb3,0x21,0x29,0xe5,0xa5,0xa1,0x69,0x8c,0x22,0x93,0xcc, +0x74,0x98,0xe7,0xa1,0x47,0x43,0xf2,0x53,0xac,0xc0,0x0f,0x30,0x69,0x7f,0xfe, +0xd2,0x25,0x20,0x6d,0x6f,0x61,0xd3,0xdf,0x07,0xd5,0xd9,0x72,0x00,0x2c,0x69, +0x86,0x76,0x3d,0x51,0xdb,0xa6,0x39,0x48,0xc9,0x37,0x61,0x6d,0x07,0xdd,0x53, +0x19,0xcb,0xa7,0xd6,0x61,0xc2,0xbf,0xe2,0x83,0xab,0x0f,0xe0,0x6b,0x9b,0x95, +0xd6,0x7d,0x28,0x51,0xb0,0x89,0x4a,0x51,0xa4,0x9a,0x6c,0xc8,0xb7,0x1f,0x4a, +0x1a,0x0e,0x69,0xa9,0xd7,0xdc,0xc1,0x7e,0xd1,0x49,0x70,0xaa,0xb6,0xad,0xbb, +0x72,0x47,0x63,0x17,0xfa,0xa6,0xd6,0xa2,0xa6,0x86,0xec,0xa8,0x10,0x44,0x9b, +0x63,0xb6,0xb2,0x69,0x89,0x06,0xc7,0x46,0x86,0x7a,0x18,0x3f,0xe8,0xc5,0x1d, +0x21,0xd5,0x7b,0xf9,0x02,0x23,0x2d,0xc5,0x41,0xcb,0xbf,0x1d,0x4c,0xc8,0x16, +0xef,0xb1,0x9c,0x7f,0xfc,0x22,0x4b,0x49,0x8a,0x6e,0x15,0xe3,0xa6,0x7f,0x76, +0x5b,0xd1,0x53,0x79,0x91,0x85,0x9d,0xd5,0xd2,0xdb,0x3d,0x73,0x35,0xf3,0x3c, +0xae,0x54,0xb2,0x52,0x47,0x6a,0xc0,0xaa,0x13,0x95,0xd2,0x8e,0x11,0xda,0x99, +0x67,0x5e,0x32,0x8c,0xfb,0x37,0x85,0xd1,0xdc,0x75,0x85,0x9c,0x87,0xc6,0x5a, +0x57,0x85,0xc2,0xbf,0xdd,0x0d,0x8f,0x8c,0x9b,0x2d,0xeb,0xb4,0xee,0xcf,0x27, +0xd3,0xb5,0x5e,0x69,0xfa,0xa4,0x16,0x04,0x01,0xa7,0x24,0x67,0x73,0xcf,0x4d, +0x4f,0xb6,0xde,0x05,0x56,0x97,0x7a,0xf7,0xe9,0x52,0x4d,0xf4,0x77,0x05,0x4f, +0x85,0xc6,0xd8,0x0b,0xf1,0x8e,0xed,0x42,0x09,0xd1,0x0d,0x76,0xe3,0x23,0x56, +0x78,0x22,0x26,0x36,0xbe,0xca,0xb1,0x8c,0x6e,0xaa,0x1d,0xe4,0x85,0xda,0x47, +0x33,0x62,0x8f,0xa4,0xc9,0x91,0x33,0x5f,0x71,0x1e,0x40,0xaf,0x98,0x65,0xc9, +0x22,0xe8,0x42,0x21,0x25,0x8a,0x1c,0x2d,0x60,0xd9,0x37,0x89,0x41,0x89,0x2a, +0x16,0x0f,0xd7,0x61,0x3c,0x94,0x68,0x60,0x52,0xef,0xd6,0x47,0x99,0xa0,0x80, +0x40,0xee,0x15,0x81,0x77,0x3e,0x9c,0xe0,0x53,0x18,0x1a,0x50,0x1d,0x38,0x95, +0x9b,0x1e,0x66,0x33,0x13,0x27,0x39,0x17,0x78,0x87,0x36,0xce,0x4e,0xc3,0x5f, +0xb2,0xf5,0x3d,0x47,0x53,0xb6,0xe0,0xe5,0xdb,0x0b,0x61,0x3d,0x2a,0xd7,0x92, +0x2c,0xce,0x37,0x5a,0x3e,0x40,0x42,0x31,0xa4,0x1f,0x10,0x08,0xc2,0x56,0x9c, +0xbf,0x24,0x5d,0x51,0x02,0x9d,0x6a,0x79,0xd2,0x17,0xd3,0xda,0xc1,0x94,0x8e, +0x07,0x7b,0x25,0x71,0x44,0xab,0x06,0x6a,0xe6,0xd4,0xc6,0xdf,0x23,0x9a,0x96, +0x75,0xc5 }; +/* Microsoft Corporation (expired) */ +static const BYTE chain32_3[] = { +0x30,0x82,0x04,0xfe,0x30,0x82,0x03,0xe6,0xa0,0x03,0x02,0x01,0x02,0x02,0x13, +0x33,0x00,0x00,0x02,0xcf,0x6d,0x2c,0xc5,0x7c,0xaa,0x65,0xa6,0xd8,0x00,0x00, +0x00,0x00,0x02,0xcf,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x0b,0x05,0x00,0x30,0x7e,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06, +0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a, +0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06, +0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e, +0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f,0x73, +0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e, +0x31,0x28,0x30,0x26,0x06,0x03,0x55,0x04,0x03,0x13,0x1f,0x4d,0x69,0x63,0x72, +0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x64,0x65,0x20,0x53,0x69,0x67,0x6e, +0x69,0x6e,0x67,0x20,0x50,0x43,0x41,0x20,0x32,0x30,0x31,0x30,0x30,0x1e,0x17, +0x0d,0x31,0x39,0x30,0x35,0x30,0x32,0x32,0x31,0x32,0x35,0x34,0x32,0x5a,0x17, +0x0d,0x32,0x30,0x30,0x35,0x30,0x32,0x32,0x31,0x32,0x35,0x34,0x32,0x5a,0x30, +0x74,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31, +0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69, +0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13, +0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55, +0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43, +0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e,0x31,0x1e,0x30,0x1c,0x06, +0x03,0x55,0x04,0x03,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74, +0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e,0x30,0x82,0x01, +0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05, +0x00,0x03,0x82,0x01,0x0f,0x00,0x30,0x82,0x01,0x0a,0x02,0x82,0x01,0x01,0x00, +0xb9,0x5a,0xf3,0xb5,0x5d,0x58,0xf9,0x43,0x0f,0x95,0x01,0x79,0xfa,0x74,0xe5, +0xb0,0xca,0xb5,0x38,0xf0,0x92,0xca,0xec,0x9b,0x99,0x42,0x1d,0x3a,0xea,0xb5, +0x8f,0x75,0x75,0x83,0xa9,0x1b,0x36,0xff,0x40,0x96,0x8e,0xd7,0x75,0x0a,0xd1, +0x96,0xae,0xc7,0xb3,0x77,0x12,0x39,0x82,0xd9,0xee,0x48,0x75,0x3d,0x47,0xad, +0x53,0x39,0x3c,0x69,0xd1,0xca,0xd8,0xf0,0x3f,0x21,0x5a,0x4c,0x3a,0xe8,0x28, +0x67,0xc3,0x7d,0x20,0x53,0x4b,0x9c,0x8b,0xbc,0x93,0xf9,0x20,0x46,0xf0,0x50, +0x82,0xca,0x6f,0x6a,0x4e,0x56,0xf1,0xd4,0x43,0xae,0xd8,0xe9,0xdb,0xbe,0x7c, +0x77,0x7d,0x46,0x73,0x03,0x3a,0x64,0xe9,0xf6,0x2d,0xcb,0x25,0x51,0x0d,0x90, +0xc9,0x16,0x59,0x29,0x0c,0x15,0x20,0x63,0xa8,0xb8,0x4f,0x70,0x24,0x9d,0x01, +0xe5,0x69,0x94,0x49,0xc9,0xd6,0x58,0xa8,0x9b,0x89,0xb8,0x2f,0xe0,0x6e,0x1b, +0xa7,0xcc,0x9d,0x75,0x08,0xa6,0xc8,0x31,0x65,0x0f,0xa3,0xed,0xbd,0xd6,0xc6, +0x93,0x8c,0x66,0x22,0xbf,0x48,0x57,0x1d,0x8c,0xa1,0xc1,0xe6,0xad,0x90,0x81, +0x29,0x2b,0x8a,0x62,0xf4,0xc2,0xa1,0xdb,0xc8,0xc1,0x79,0x23,0x74,0x37,0x08, +0x92,0x65,0xe3,0x57,0x01,0xe4,0x4f,0xa1,0x0a,0xf5,0x68,0x96,0xd6,0x09,0x80, +0x4a,0x05,0xdc,0xae,0x30,0xd7,0xb1,0x5a,0xfb,0x1d,0xf9,0x84,0xde,0x92,0xcb, +0xf2,0xc0,0xf8,0xea,0x26,0x6e,0xd3,0x73,0x7e,0xc5,0x66,0xa5,0x05,0xac,0xc4, +0xeb,0x10,0xda,0x0c,0x5c,0x7c,0x36,0x99,0x9c,0x59,0x89,0xc6,0x94,0x47,0xf6, +0xbb,0x02,0x03,0x01,0x00,0x01,0xa3,0x82,0x01,0x7d,0x30,0x82,0x01,0x79,0x30, +0x1f,0x06,0x03,0x55,0x1d,0x25,0x04,0x18,0x30,0x16,0x06,0x0a,0x2b,0x06,0x01, +0x04,0x01,0x82,0x37,0x3d,0x06,0x01,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07, +0x03,0x03,0x30,0x1d,0x06,0x03,0x55,0x1d,0x0e,0x04,0x16,0x04,0x14,0x37,0xf3, +0x4d,0xec,0x4d,0xaf,0x2c,0x04,0x31,0xa9,0x10,0x88,0x0b,0x58,0xc0,0x6f,0x03, +0xbc,0x55,0x08,0x30,0x54,0x06,0x03,0x55,0x1d,0x11,0x04,0x4d,0x30,0x4b,0xa4, +0x49,0x30,0x47,0x31,0x2d,0x30,0x2b,0x06,0x03,0x55,0x04,0x0b,0x13,0x24,0x4d, +0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x49,0x72,0x65,0x6c,0x61,0x6e, +0x64,0x20,0x4f,0x70,0x65,0x72,0x61,0x74,0x69,0x6f,0x6e,0x73,0x20,0x4c,0x69, +0x6d,0x69,0x74,0x65,0x64,0x31,0x16,0x30,0x14,0x06,0x03,0x55,0x04,0x05,0x13, +0x0d,0x32,0x33,0x30,0x38,0x36,0x35,0x2b,0x34,0x35,0x34,0x32,0x34,0x34,0x30, +0x1f,0x06,0x03,0x55,0x1d,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0xe6,0xfc,0x5f, +0x7b,0xbb,0x22,0x00,0x58,0xe4,0x72,0x4e,0xb5,0xf4,0x21,0x74,0x23,0x32,0xe6, +0xef,0xac,0x30,0x56,0x06,0x03,0x55,0x1d,0x1f,0x04,0x4f,0x30,0x4d,0x30,0x4b, +0xa0,0x49,0xa0,0x47,0x86,0x45,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x63,0x72, +0x6c,0x2e,0x6d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x2e,0x63,0x6f,0x6d, +0x2f,0x70,0x6b,0x69,0x2f,0x63,0x72,0x6c,0x2f,0x70,0x72,0x6f,0x64,0x75,0x63, +0x74,0x73,0x2f,0x4d,0x69,0x63,0x43,0x6f,0x64,0x53,0x69,0x67,0x50,0x43,0x41, +0x5f,0x32,0x30,0x31,0x30,0x2d,0x30,0x37,0x2d,0x30,0x36,0x2e,0x63,0x72,0x6c, +0x30,0x5a,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x01,0x04,0x4e,0x30, +0x4c,0x30,0x4a,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x30,0x02,0x86,0x3e, +0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x6d,0x69,0x63,0x72, +0x6f,0x73,0x6f,0x66,0x74,0x2e,0x63,0x6f,0x6d,0x2f,0x70,0x6b,0x69,0x2f,0x63, +0x65,0x72,0x74,0x73,0x2f,0x4d,0x69,0x63,0x43,0x6f,0x64,0x53,0x69,0x67,0x50, +0x43,0x41,0x5f,0x32,0x30,0x31,0x30,0x2d,0x30,0x37,0x2d,0x30,0x36,0x2e,0x63, +0x72,0x74,0x30,0x0c,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x02,0x30, +0x00,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05, +0x00,0x03,0x82,0x01,0x01,0x00,0xaa,0x30,0x8f,0x08,0x74,0xb1,0x28,0x88,0x0a, +0x81,0x0c,0xcc,0x38,0xea,0xb1,0xc0,0x47,0x9a,0x7d,0xf3,0x19,0x35,0xa6,0xe8, +0x8b,0xe9,0x16,0x04,0xe4,0xc3,0x32,0xe1,0x29,0xf7,0xcc,0xb8,0xf0,0xc6,0xc3, +0x02,0xd5,0xb0,0x8d,0x0b,0x41,0xfe,0x5c,0xa9,0x03,0x86,0x25,0xf5,0x24,0x9f, +0xb0,0x04,0xc4,0x69,0x0a,0x27,0x94,0x04,0xb2,0x09,0xdc,0x19,0xaf,0xbb,0x01, +0x8b,0x92,0xe4,0xd8,0x72,0x04,0x07,0x72,0x81,0xd3,0x89,0xca,0xd7,0x79,0x98, +0x41,0xe5,0xa0,0x29,0xfb,0x95,0x91,0xd9,0xf8,0x8c,0x40,0x23,0x70,0x9a,0xb2, +0xf6,0xcb,0x0a,0x75,0x0b,0xbd,0x1c,0x72,0xd7,0xff,0x98,0x20,0x01,0xde,0xc0, +0xcd,0xd0,0xd3,0xa5,0xff,0x6b,0x0c,0x8b,0xf9,0x85,0x69,0x22,0x15,0x09,0xd7, +0x4e,0xf2,0xc1,0xe9,0xd4,0x78,0xa7,0xd1,0xe3,0x46,0xf6,0x3d,0xa9,0x06,0x66, +0x11,0xa3,0x9e,0x2f,0xef,0xe6,0xd3,0xc5,0x80,0x29,0xc8,0xfa,0xd3,0xb7,0x98, +0x0d,0xdc,0xa4,0xce,0x84,0x68,0xeb,0x9b,0xfb,0x14,0x83,0x28,0x6d,0x22,0x57, +0x9a,0x46,0xbe,0x37,0x71,0xc4,0xec,0xed,0x38,0x8f,0x4d,0x6e,0x13,0x54,0x39, +0x87,0xc6,0xf4,0x1e,0x41,0xdf,0xba,0x87,0x28,0xda,0xc2,0xc0,0x02,0xa5,0x80, +0x52,0x3c,0xbd,0x9a,0xe2,0x66,0xc0,0x5e,0xc3,0x56,0xe8,0x65,0x1d,0xcc,0xd4, +0xec,0xf5,0x4d,0x05,0xae,0xf3,0x9b,0x96,0x7b,0xf2,0xa9,0x3b,0xae,0xe0,0xbb, +0x3b,0x42,0x9b,0xec,0x20,0xba,0xea,0x1c,0x6d,0xf4,0x6a,0x24,0x8f,0x31,0x01, +0x3c,0x8a,0x0a,0x58,0x61,0x67,0x58 }; +/* Microsoft Root Certificate Authority 2011 */ +static const BYTE chain33_1[] = { +0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10, +0x3f,0x8b,0xc8,0xb5,0xfc,0x9f,0xb2,0x96,0x43,0xb5,0x69,0xd6,0x6c,0x42,0xe1, +0x44,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05, +0x00,0x30,0x81,0x88,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02, +0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61, +0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55, +0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c, +0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66, +0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e,0x31,0x32, +0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29,0x4d,0x69,0x63,0x72,0x6f,0x73, +0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66, +0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79, +0x20,0x32,0x30,0x31,0x31,0x30,0x1e,0x17,0x0d,0x31,0x31,0x30,0x33,0x32,0x32, +0x32,0x32,0x30,0x35,0x32,0x38,0x5a,0x17,0x0d,0x33,0x36,0x30,0x33,0x32,0x32, +0x32,0x32,0x31,0x33,0x30,0x34,0x5a,0x30,0x81,0x88,0x31,0x0b,0x30,0x09,0x06, +0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31, +0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f, +0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69, +0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61, +0x74,0x69,0x6f,0x6e,0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20, +0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74, +0x68,0x6f,0x72,0x69,0x74,0x79,0x20,0x32,0x30,0x31,0x31,0x30,0x82,0x02,0x22, +0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00, +0x03,0x82,0x02,0x0f,0x00,0x30,0x82,0x02,0x0a,0x02,0x82,0x02,0x01,0x00,0xb2, +0x80,0x41,0xaa,0x35,0x38,0x4d,0x13,0x72,0x32,0x68,0x22,0x4d,0xb8,0xb2,0xf1, +0xff,0xd5,0x52,0xbc,0x6c,0xc7,0xf5,0xd2,0x4a,0x8c,0x36,0xee,0xd1,0xc2,0x5c, +0x7e,0x8c,0x8a,0xae,0xaf,0x13,0x28,0x6f,0xc0,0x73,0xe3,0x3a,0xce,0xd0,0x25, +0xa8,0x5a,0x3a,0x6d,0xef,0xa8,0xb8,0x59,0xab,0x13,0x23,0x68,0xcd,0x0c,0x29, +0x87,0xd1,0x6f,0x80,0x5c,0x8f,0x44,0x7f,0x5d,0x90,0x01,0x52,0x58,0xac,0x51, +0xc5,0x5f,0x2a,0x87,0xdc,0xdc,0xd8,0x0a,0x1d,0xc1,0x03,0xb9,0x7b,0xb0,0x56, +0xe8,0xa3,0xde,0x64,0x61,0xc2,0x9e,0xf8,0xf3,0x7c,0xb9,0xec,0x0d,0xb5,0x54, +0xfe,0x4c,0xb6,0x65,0x4f,0x88,0xf0,0x9c,0x48,0x99,0x0c,0x42,0x0b,0x09,0x7c, +0x31,0x59,0x17,0x79,0x06,0x78,0x28,0x8d,0x89,0x3a,0x4c,0x03,0x25,0xbe,0x71, +0x6a,0x5c,0x0b,0xe7,0x84,0x60,0xa4,0x99,0x22,0xe3,0xd2,0xaf,0x84,0xa4,0xa7, +0xfb,0xd1,0x98,0xed,0x0c,0xa9,0xde,0x94,0x89,0xe1,0x0e,0xa0,0xdc,0xc0,0xce, +0x99,0x3d,0xea,0x08,0x52,0xbb,0x56,0x79,0xe4,0x1f,0x84,0xba,0x1e,0xb8,0xb4, +0xc4,0x49,0x5c,0x4f,0x31,0x4b,0x87,0xdd,0xdd,0x05,0x67,0x26,0x99,0x80,0xe0, +0x71,0x11,0xa3,0xb8,0xa5,0x41,0xe2,0xa4,0x53,0xb9,0xf7,0x32,0x29,0x83,0x0c, +0x13,0xbf,0x36,0x5e,0x04,0xb3,0x4b,0x43,0x47,0x2f,0x6b,0xe2,0x91,0x1e,0xd3, +0x98,0x4f,0xdd,0x42,0x07,0xc8,0xe8,0x1d,0x12,0xfc,0x99,0xa9,0x6b,0x3e,0x92, +0x7e,0xc8,0xd6,0x69,0x3a,0xfc,0x64,0xbd,0xb6,0x09,0x9d,0xca,0xfd,0x0c,0x0b, +0xa2,0x9b,0x77,0x60,0x4b,0x03,0x94,0xa4,0x30,0x69,0x12,0xd6,0x42,0x2d,0xc1, +0x41,0x4c,0xca,0xdc,0xaa,0xfd,0x8f,0x5b,0x83,0x46,0x9a,0xd9,0xfc,0xb1,0xd1, +0xe3,0xb3,0xc9,0x7f,0x48,0x7a,0xcd,0x24,0xf0,0x41,0x8f,0x5c,0x74,0xd0,0xac, +0xb0,0x10,0x20,0x06,0x49,0xb7,0xc7,0x2d,0x21,0xc8,0x57,0xe3,0xd0,0x86,0xf3, +0x03,0x68,0xfb,0xd0,0xce,0x71,0xc1,0x89,0x99,0x4a,0x64,0x01,0x6c,0xfd,0xec, +0x30,0x91,0xcf,0x41,0x3c,0x92,0xc7,0xe5,0xba,0x86,0x1d,0x61,0x84,0xc7,0x5f, +0x83,0x39,0x62,0xae,0xb4,0x92,0x2f,0x47,0xf3,0x0b,0xf8,0x55,0xeb,0xa0,0x1f, +0x59,0xd0,0xbb,0x74,0x9b,0x1e,0xd0,0x76,0xe6,0xf2,0xe9,0x06,0xd7,0x10,0xe8, +0xfa,0x64,0xde,0x69,0xc6,0x35,0x96,0x88,0x02,0xf0,0x46,0xb8,0x3f,0x27,0x99, +0x6f,0xcb,0x71,0x89,0x29,0x35,0xf7,0x48,0x16,0x02,0x35,0x8f,0xd5,0x79,0x7c, +0x4d,0x02,0xcf,0x5f,0xeb,0x8a,0x83,0x4f,0x45,0x71,0x88,0xf9,0xa9,0x0d,0x4e, +0x72,0xe9,0xc2,0x9c,0x07,0xcf,0x49,0x1b,0x4e,0x04,0x0e,0x63,0x51,0x8c,0x5e, +0xd8,0x00,0xc1,0x55,0x2c,0xb6,0xc6,0xe0,0xc2,0x65,0x4e,0xc9,0x34,0x39,0xf5, +0x9c,0xb3,0xc4,0x7e,0xe8,0x61,0x6e,0x13,0x5f,0x15,0xc4,0x5f,0xd9,0x7e,0xed, +0x1d,0xce,0xee,0x44,0xec,0xcb,0x2e,0x86,0xb1,0xec,0x38,0xf6,0x70,0xed,0xab, +0x5c,0x13,0xc1,0xd9,0x0f,0x0d,0xc7,0x80,0xb2,0x55,0xed,0x34,0xf7,0xac,0x9b, +0xe4,0xc3,0xda,0xe7,0x47,0x3c,0xa6,0xb5,0x8f,0x31,0xdf,0xc5,0x4b,0xaf,0xeb, +0xf1,0x02,0x03,0x01,0x00,0x01,0xa3,0x51,0x30,0x4f,0x30,0x0b,0x06,0x03,0x55, +0x1d,0x0f,0x04,0x04,0x03,0x02,0x01,0x86,0x30,0x0f,0x06,0x03,0x55,0x1d,0x13, +0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1d,0x06,0x03,0x55, +0x1d,0x0e,0x04,0x16,0x04,0x14,0x72,0x2d,0x3a,0x02,0x31,0x90,0x43,0xb9,0x14, +0x05,0x4e,0xe1,0xea,0xa7,0xc7,0x31,0xd1,0x23,0x89,0x34,0x30,0x10,0x06,0x09, +0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x15,0x01,0x04,0x03,0x02,0x01,0x00,0x30, +0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x03, +0x82,0x02,0x01,0x00,0x7f,0x72,0xcf,0x0f,0xb7,0xc5,0x15,0xdb,0x9b,0xc0,0x49, +0xca,0x26,0x5b,0xfe,0x9e,0x13,0xe6,0xd3,0xf0,0xd2,0xdb,0x97,0x5f,0xf2,0x4b, +0x3f,0x4d,0xb3,0xae,0x19,0xae,0xed,0xd7,0x97,0xa0,0xac,0xef,0xa9,0x3a,0xa3, +0xc2,0x41,0xb0,0xe5,0xb8,0x91,0x9e,0x13,0x81,0x24,0x03,0xe6,0x09,0xfd,0x3f, +0x57,0x40,0x39,0x21,0x24,0x56,0xd1,0x10,0x2f,0x4b,0x40,0xa9,0x36,0x86,0x4b, +0xb4,0x53,0x57,0x9a,0xfb,0xf1,0x7e,0x89,0x8f,0x11,0xfe,0x18,0x6c,0x51,0xaa, +0xe8,0xed,0x09,0x95,0xb5,0xe5,0x71,0xc9,0xa1,0xe9,0x87,0x75,0xa6,0x15,0x7f, +0xc9,0x7e,0x37,0x54,0x5e,0x74,0x93,0xc5,0xc3,0x67,0xcc,0x0d,0x4f,0x6b,0xa8, +0x17,0x0c,0x6d,0x08,0x92,0x7e,0x8b,0xdd,0x81,0xaa,0x2d,0x70,0x21,0xc3,0x3d, +0x06,0x14,0xbb,0xbf,0x24,0x5e,0xa7,0x84,0xd7,0x3f,0x0f,0x21,0x22,0xbd,0x4b, +0x00,0x06,0xdb,0x97,0x1c,0xd8,0x5e,0xd4,0xc5,0x0b,0x5c,0x87,0x6e,0x50,0xa4, +0xe8,0xc3,0x38,0xa4,0xfb,0xcb,0x2c,0xc5,0x92,0x66,0x9b,0x85,0x5e,0xcb,0x7a, +0x6c,0x93,0x7c,0x80,0x29,0x58,0x5b,0x57,0xb5,0x40,0x69,0xba,0x08,0x79,0xa6, +0x64,0x62,0x15,0x9d,0x87,0x96,0x45,0xb5,0x66,0x23,0x20,0x03,0x8b,0x1c,0x73, +0xa0,0xd3,0xa2,0x79,0x33,0xe0,0x50,0x59,0x86,0xdb,0x2f,0xe5,0x02,0x25,0xea, +0x73,0x2a,0x9f,0x00,0x14,0xc8,0x36,0xc7,0x92,0x3b,0xe9,0x4e,0x00,0xec,0xd8, +0x56,0x09,0xb9,0x33,0x49,0x12,0xd2,0x54,0x0b,0x01,0xab,0xac,0x47,0xb6,0x91, +0x29,0x7d,0x4c,0xb4,0x75,0x80,0x52,0x01,0xe8,0xca,0x82,0xf6,0x9f,0xcc,0xac, +0x9c,0x8f,0x17,0xea,0x2f,0x26,0xb0,0xab,0x72,0xac,0x0b,0xfe,0x9e,0x51,0x1e, +0xc7,0x43,0x55,0x67,0x4f,0x51,0xb3,0x57,0xd6,0xb6,0xec,0xee,0x52,0xb7,0x3a, +0xe9,0x4e,0xe1,0xd7,0x81,0x88,0xbc,0x4f,0x8e,0x75,0xbb,0x4b,0xa8,0xf0,0x35, +0xaa,0x26,0xd4,0x67,0x67,0x49,0xb2,0x70,0x4c,0x3b,0x93,0xdc,0x1d,0xdf,0x78, +0x90,0x86,0x72,0xb2,0x38,0xa4,0xd1,0xdc,0x92,0x4d,0xc9,0x58,0xeb,0x2b,0x12, +0x5c,0xd4,0x3b,0xae,0x8c,0x6b,0xb0,0x83,0xe5,0x01,0x3f,0xf8,0x09,0x32,0xf6, +0x93,0x35,0x34,0x22,0xaf,0xdd,0x37,0x0d,0x77,0x09,0x80,0x2b,0xcd,0x48,0x00, +0xf1,0x8c,0x99,0x19,0x47,0x05,0x01,0xe9,0xd1,0xbf,0xd1,0x4e,0xd0,0xe6,0x28, +0x43,0x37,0x99,0xa4,0x0a,0x4a,0x08,0xd9,0x9a,0x71,0x73,0xd2,0xaa,0xcd,0x31, +0x13,0x63,0x76,0xa1,0x37,0x6f,0x92,0x38,0x1e,0x7d,0x12,0x3c,0x66,0x32,0xe7, +0xcb,0x6d,0xe1,0xfc,0x52,0x89,0xdd,0xca,0xd6,0x66,0x05,0x9a,0x96,0x61,0xbe, +0xa2,0x28,0xc7,0x1c,0xa3,0xa7,0x36,0x50,0x3c,0x3a,0xa4,0xdf,0x4a,0x6e,0xe6, +0x87,0x3b,0xce,0xeb,0xf0,0xe0,0x81,0x37,0x9d,0x13,0x3c,0x52,0x8e,0xbd,0xb9, +0x1d,0x34,0xc6,0x1d,0xd5,0x0a,0x6a,0x3d,0x98,0x29,0x70,0x8c,0x89,0x2a,0xd1, +0xab,0x82,0x10,0x48,0x1f,0xdc,0xf4,0xef,0xa5,0xc5,0xbb,0x55,0x1a,0x38,0x63, +0x84,0x4e,0xb7,0x6c,0xad,0x95,0x54,0xec,0x65,0x22,0x10,0x49,0x17,0xb8,0xc0, +0x1e,0xc7,0x0f,0xac,0x54,0x47 }; typedef struct _CONST_DATA_BLOB { @@ -3121,6 +3530,8 @@ static SYSTEMTIME jun2013 = { 2013, 6, 5, 6, 0, 0, 0, 0 }; static SYSTEMTIME oct2016 = { 2016, 10, 6, 1, 0, 0, 0, 0 }; /* Wednesday, Nov 17, 2016 */ static SYSTEMTIME nov2016 = { 2016, 11, 3, 17, 0, 0, 0, 0 }; +/* Thursday, May 14, 2020 */ +static SYSTEMTIME may2020 = { 2020, 5, 4, 14, 0, 0, 0, 0 }; typedef struct _ChainCheck { @@ -3520,6 +3931,14 @@ static CONST_DATA_BLOB chain31[] = { { sizeof(chain0_0), chain0_0 }, { sizeof(chain31_1), chain31_1 }, }; +static CONST_DATA_BLOB chain32[] = { + { sizeof(chain32_1), chain32_1 }, + { sizeof(chain32_2), chain32_2 }, + { sizeof(chain32_3), chain32_3 }, +}; +static CONST_DATA_BLOB chain33[] = { + { sizeof(chain33_1), chain33_1 }, +}; static CONST_DATA_BLOB selfSignedChain[] = { { sizeof(selfSignedCert), selfSignedCert } }; @@ -4549,6 +4968,20 @@ static const ChainPolicyCheck basicConstraintsPolicyCheck[] = { { 0, 0, -1, -1, NULL }, NULL, 0 }, }; +static const CERT_CHAIN_POLICY_STATUS chain32BrokenStatus = + { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }; + +static const ChainPolicyCheck msRootPolicyCheck[] = { + { { ARRAY_SIZE(chain0), chain0 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, TODO_ELEMENTS }, + { { ARRAY_SIZE(selfSignedChain), selfSignedChain }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, + { { ARRAY_SIZE(chain32), chain32 }, + { 0, 0, 0, 0, NULL }, &chain32BrokenStatus, 0 }, + { { ARRAY_SIZE(chain33), chain33 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, +}; + static const char *num_to_str(WORD num) { static char buf[6]; @@ -4906,6 +5339,12 @@ static void check_ssl_policy(void) nullTerminatedDomainComponentPolicyCheck, &oct2010, &policyPara); } +static void check_msroot_policy(void) +{ + CHECK_CHAIN_POLICY_STATUS_ARRAY(CERT_CHAIN_POLICY_MICROSOFT_ROOT, NULL, + msRootPolicyCheck, &may2020, NULL); +} + static void testVerifyCertChainPolicy(void) { BOOL ret; @@ -4974,6 +5413,7 @@ static void testVerifyCertChainPolicy(void) check_authenticode_policy(); CHECK_CHAIN_POLICY_STATUS_ARRAY(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, NULL, basicConstraintsPolicyCheck, &oct2007, NULL); + check_msroot_policy(); } START_TEST(chain) -- 2.20.1

1 0

[PATCH 1/2] crypt32: Recognize 'Microsoft Root Certificate Authority 2010' when verifying the Microsoft root policy.
by Hans Leidekker 15 May '20

15 May '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/chain.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 935fd6e344..4712024d3a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3660,6 +3660,44 @@ static BYTE msPubKey3[] = { 0x60,0x1e,0x7a,0x5b,0x38,0xc8,0x8f,0xbb,0x04,0x26,0x7c,0xd4,0x16,0x40,0xe5, 0xb6,0x6b,0x6c,0xaa,0x86,0xfd,0x00,0xbf,0xce,0xc1,0x35,0x02,0x03,0x01,0x00, 0x01 }; +/* from Microsoft Root Certificate Authority 2010 */ +static BYTE msPubKey4[] = { +0x30,0x82,0x02,0x0a,0x02,0x82,0x02,0x01,0x00,0xb9,0x08,0x9e,0x28,0xe4,0xe4, +0xec,0x06,0x4e,0x50,0x68,0xb3,0x41,0xc5,0x7b,0xeb,0xae,0xb6,0x8e,0xaf,0x81, +0xba,0x22,0x44,0x1f,0x65,0x34,0x69,0x4c,0xbe,0x70,0x40,0x17,0xf2,0x16,0x7b, +0xe2,0x79,0xfd,0x86,0xed,0x0d,0x39,0xf4,0x1b,0xa8,0xad,0x92,0x90,0x1e,0xcb, +0x3d,0x76,0x8f,0x5a,0xd9,0xb5,0x91,0x10,0x2e,0x3c,0x05,0x8d,0x8a,0x6d,0x24, +0x54,0xe7,0x1f,0xed,0x56,0xad,0x83,0xb4,0x50,0x9c,0x15,0xa5,0x17,0x74,0x88, +0x59,0x20,0xfc,0x08,0xc5,0x84,0x76,0xd3,0x68,0xd4,0x6f,0x28,0x78,0xce,0x5c, +0xb8,0xf3,0x50,0x90,0x44,0xff,0xe3,0x63,0x5f,0xbe,0xa1,0x9a,0x2c,0x96,0x15, +0x04,0xd6,0x07,0xfe,0x1e,0x84,0x21,0xe0,0x42,0x31,0x11,0xc4,0x28,0x36,0x94, +0xcf,0x50,0xa4,0x62,0x9e,0xc9,0xd6,0xab,0x71,0x00,0xb2,0x5b,0x0c,0xe6,0x96, +0xd4,0x0a,0x24,0x96,0xf5,0xff,0xc6,0xd5,0xb7,0x1b,0xd7,0xcb,0xb7,0x21,0x62, +0xaf,0x12,0xdc,0xa1,0x5d,0x37,0xe3,0x1a,0xfb,0x1a,0x46,0x98,0xc0,0x9b,0xc0, +0xe7,0x63,0x1f,0x2a,0x08,0x93,0x02,0x7e,0x1e,0x6a,0x8e,0xf2,0x9f,0x18,0x89, +0xe4,0x22,0x85,0xa2,0xb1,0x84,0x57,0x40,0xff,0xf5,0x0e,0xd8,0x6f,0x9c,0xed, +0xe2,0x45,0x31,0x01,0xcd,0x17,0xe9,0x7f,0xb0,0x81,0x45,0xe3,0xaa,0x21,0x40, +0x26,0xa1,0x72,0xaa,0xa7,0x4f,0x3c,0x01,0x05,0x7e,0xee,0x83,0x58,0xb1,0x5e, +0x06,0x63,0x99,0x62,0x91,0x78,0x82,0xb7,0x0d,0x93,0x0c,0x24,0x6a,0xb4,0x1b, +0xdb,0x27,0xec,0x5f,0x95,0x04,0x3f,0x93,0x4a,0x30,0xf5,0x97,0x18,0xb3,0xa7, +0xf9,0x19,0xa7,0x93,0x33,0x1d,0x01,0xc8,0xdb,0x22,0x52,0x5c,0xd7,0x25,0xc9, +0x46,0xf9,0xa2,0xfb,0x87,0x59,0x43,0xbe,0x9b,0x62,0xb1,0x8d,0x2d,0x86,0x44, +0x1a,0x46,0xac,0x78,0x61,0x7e,0x30,0x09,0xfa,0xae,0x89,0xc4,0x41,0x2a,0x22, +0x66,0x03,0x91,0x39,0x45,0x9c,0xc7,0x8b,0x0c,0xa8,0xca,0x0d,0x2f,0xfb,0x52, +0xea,0x0c,0xf7,0x63,0x33,0x23,0x9d,0xfe,0xb0,0x1f,0xad,0x67,0xd6,0xa7,0x50, +0x03,0xc6,0x04,0x70,0x63,0xb5,0x2c,0xb1,0x86,0x5a,0x43,0xb7,0xfb,0xae,0xf9, +0x6e,0x29,0x6e,0x21,0x21,0x41,0x26,0x06,0x8c,0xc9,0xc3,0xee,0xb0,0xc2,0x85, +0x93,0xa1,0xb9,0x85,0xd9,0xe6,0x32,0x6c,0x4b,0x4c,0x3f,0xd6,0x5d,0xa3,0xe5, +0xb5,0x9d,0x77,0xc3,0x9c,0xc0,0x55,0xb7,0x74,0x00,0xe3,0xb8,0x38,0xab,0x83, +0x97,0x50,0xe1,0x9a,0x42,0x24,0x1d,0xc6,0xc0,0xa3,0x30,0xd1,0x1a,0x5a,0xc8, +0x52,0x34,0xf7,0x73,0xf1,0xc7,0x18,0x1f,0x33,0xad,0x7a,0xec,0xcb,0x41,0x60, +0xf3,0x23,0x94,0x20,0xc2,0x48,0x45,0xac,0x5c,0x51,0xc6,0x2e,0x80,0xc2,0xe2, +0x77,0x15,0xbd,0x85,0x87,0xed,0x36,0x9d,0x96,0x91,0xee,0x00,0xb5,0xa3,0x70, +0xec,0x9f,0xe3,0x8d,0x80,0x68,0x83,0x76,0xba,0xaf,0x5d,0x70,0x52,0x22,0x16, +0xe2,0x66,0xfb,0xba,0xb3,0xc5,0xc2,0xf7,0x3e,0x2f,0x77,0xa6,0xca,0xde,0xc1, +0xa6,0xc6,0x48,0x4c,0xc3,0x37,0x51,0x23,0xd3,0x27,0xd7,0xb8,0x4e,0x70,0x96, +0xf0,0xa1,0x44,0x76,0xaf,0x78,0xcf,0x9a,0xe1,0x66,0x13,0x02,0x03,0x01,0x00, +0x01 }; static BOOL WINAPI verify_ms_root_policy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, @@ -3677,6 +3715,7 @@ static BOOL WINAPI verify_ms_root_policy(LPCSTR szPolicyOID, { sizeof(msPubKey1), msPubKey1 }, { sizeof(msPubKey2), msPubKey2 }, { sizeof(msPubKey3), msPubKey3 }, + { sizeof(msPubKey4), msPubKey4 }, }; PCERT_SIMPLE_CHAIN rootChain = pChainContext->rgpChain[pChainContext->cChain -1 ]; -- 2.20.1

1 0

[PATCH 1/4] d3d10core: Implement D3D10CoreRegisterLayers.
by Rémi Bernon 15 May '20

15 May '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/d3d10core/d3d10core_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index d364be90d6da..5a9a4a211c15 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -29,11 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, ID3D11Device **device); +HRESULT WINAPI D3D11CoreRegisterLayers(void); + HRESULT WINAPI D3D10CoreRegisterLayers(void) { TRACE("\n"); - return E_NOTIMPL; + return D3D11CoreRegisterLayers(); } HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, -- 2.26.1

2 5

[PATCH v4 1/4] d3d11: Return DXGI_ERROR_INVALID_CALL from immediate FinishCommandList().
by Chip Davis 15 May '20

15 May '20

This is only used with deferred contexts to record all commands thus far submitted to a command list object. It has no effect on immediate contexts. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v4: Add casts to avoid warning which is only generated because C doesn't have interface inheritance. --- dlls/d3d11/device.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7544bc86f4b..01b32002408 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2416,9 +2416,9 @@ static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11Devi static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D11DeviceContext1 *iface, BOOL restore, ID3D11CommandList **command_list) { - FIXME("iface %p, restore %#x, command_list %p stub!\n", iface, restore, command_list); + WARN("iface %p, restore %#x, command_list %p called on immediate context.\n", iface, restore, command_list); - return E_NOTIMPL; + return DXGI_ERROR_INVALID_CALL; } static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3ae05537a1e..36c637abe5c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30062,6 +30062,42 @@ static void test_dual_source_blend(void) release_test_context(&test_context); } +static void test_deferred_methods_on_immediate_context(void) +{ + static const unsigned int buffer_contents[] = {0xdeadbeef, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, + 0xbaadf00d, 0xbaadf00d, 0xbaadf00d, 0xbaadf00d}; + ID3D11DeviceContext *immediate_context; + ID3D11CommandList *command_list; + ID3D11Buffer *buffer[2]; + ID3D11Device *device; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + ID3D11Device_GetImmediateContext(device, &immediate_context); + + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); + ok(hr == DXGI_ERROR_INVALID_CALL, "Immediate FinishCommandList returned hr %#x.\n", hr); + + buffer[0] = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 16, &buffer_contents[0]); + buffer[1] = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 16, &buffer_contents[4]); + + ID3D11DeviceContext_CopyResource(immediate_context, (ID3D11Resource *)buffer[1], + (ID3D11Resource *)buffer[0]); + + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); + ok(hr == DXGI_ERROR_INVALID_CALL, "Immediate FinishCommandList returned hr %#x.\n", hr); + + ID3D11DeviceContext_Release(immediate_context); + ID3D11Buffer_Release(buffer[0]); + ID3D11Buffer_Release(buffer[1]); + ID3D11Device_Release(device); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30225,6 +30261,7 @@ START_TEST(d3d11) queue_test(test_color_mask); queue_test(test_independent_blend); queue_test(test_dual_source_blend); + queue_test(test_deferred_methods_on_immediate_context); run_queued_tests(); } -- 2.24.0

2 5

[PATCH 2/2] gdiplus: Allow setting rasterization limit only during recording.
by Esme Povirk 15 May '20

15 May '20

From: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 3 +++ dlls/gdiplus/tests/metafile.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3fdbc69fdc5..f9a9ab750f0 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4031,6 +4031,9 @@ GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metaf if (!metafile) return InvalidParameter; + if (!metafile->record_dc) + return WrongState; + metafile->limit_dpi = limitDpi; return Ok; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index b9dc33fce35..82854d4240c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -445,6 +445,9 @@ static void test_empty(void) expect(WrongState, stat); expect(0xdeadbeef, limit_dpi); + stat = GdipSetMetafileDownLevelRasterizationLimit(metafile, 1); + expect(WrongState, stat); + check_metafile(metafile, empty_records, "empty metafile", dst_points, &frame, UnitPixel); sync_metafile(&metafile, "empty.emf"); -- 2.17.1

3 2

[PATCH 1/2] gdiplus: Implement GdipGetMetafileDownLevelRasterizationLimit.
by Esme Povirk 15 May '20

15 May '20

From: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 22 ++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 25 +++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 43dc0a82d2b..a722ab7b237 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -298,7 +298,7 @@ 298 stdcall GdipGetLogFontA(ptr ptr ptr) 299 stdcall GdipGetLogFontW(ptr ptr ptr) 300 stdcall GdipGetMatrixElements(ptr ptr) -301 stub GdipGetMetafileDownLevelRasterizationLimit +301 stdcall GdipGetMetafileDownLevelRasterizationLimit(ptr ptr) 302 stdcall GdipGetMetafileHeaderFromEmf(ptr ptr) 303 stdcall GdipGetMetafileHeaderFromFile(wstr ptr) 304 stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 39caf1a91e4..9e90a5d28cf 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -407,6 +407,7 @@ struct GpMetafile{ BOOL auto_frame; /* If true, determine the frame automatically */ GpPointF auto_frame_min, auto_frame_max; DWORD next_object_id; + UINT limit_dpi; /* playback */ GpGraphics *playback_graphics; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 2cb1c5f2847..3fdbc69fdc5 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -810,6 +810,7 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->comment_data = NULL; (*metafile)->comment_data_size = 0; (*metafile)->comment_data_length = 0; + (*metafile)->limit_dpi = 96; (*metafile)->hemf = NULL; list_init(&(*metafile)->containers); @@ -4006,11 +4007,32 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, return Ok; } +GpStatus WINGDIPAPI GdipGetMetafileDownLevelRasterizationLimit(GDIPCONST GpMetafile *metafile, + UINT *limitDpi) +{ + TRACE("(%p,%p)\n", metafile, limitDpi); + + if (!metafile || !limitDpi) + return InvalidParameter; + + if (!metafile->record_dc) + return WrongState; + + *limitDpi = metafile->limit_dpi; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metafile, UINT limitDpi) { TRACE("(%p,%u)\n", metafile, limitDpi); + if (!metafile) + return InvalidParameter; + + metafile->limit_dpi = limitDpi; + return Ok; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 49adbf71e30..b9dc33fce35 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -379,6 +379,7 @@ static void test_empty(void) static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + UINT limit_dpi; hdc = CreateCompatibleDC(0); @@ -408,6 +409,25 @@ static void test_empty(void) if (stat != Ok) return; + stat = GdipGetMetafileDownLevelRasterizationLimit(metafile, NULL); + expect(InvalidParameter, stat); + + stat = GdipGetMetafileDownLevelRasterizationLimit(NULL, &limit_dpi); + expect(InvalidParameter, stat); + + limit_dpi = 0xdeadbeef; + stat = GdipGetMetafileDownLevelRasterizationLimit(metafile, &limit_dpi); + expect(Ok, stat); + ok(limit_dpi == 96, "limit_dpi was %d\n", limit_dpi); + + stat = GdipSetMetafileDownLevelRasterizationLimit(metafile, 255); + expect(Ok, stat); + + limit_dpi = 0xdeadbeef; + stat = GdipGetMetafileDownLevelRasterizationLimit(metafile, &limit_dpi); + expect(Ok, stat); + ok(limit_dpi == 255, "limit_dpi was %d\n", limit_dpi); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(InvalidParameter, stat); @@ -420,6 +440,11 @@ static void test_empty(void) stat = GdipDeleteGraphics(graphics); expect(Ok, stat); + limit_dpi = 0xdeadbeef; + stat = GdipGetMetafileDownLevelRasterizationLimit(metafile, &limit_dpi); + expect(WrongState, stat); + expect(0xdeadbeef, limit_dpi); + check_metafile(metafile, empty_records, "empty metafile", dst_points, &frame, UnitPixel); sync_metafile(&metafile, "empty.emf"); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ed0f498483e..b7da5427d4e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -545,6 +545,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST Wm GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); +GpStatus WINGDIPAPI GdipGetMetafileDownLevelRasterizationLimit(GDIPCONST GpMetafile*,UINT*); GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); -- 2.17.1

1 0

[PATCH 3/3] gdiplus: Add tests for image palette size.
by Esme Povirk 15 May '20

15 May '20

From: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/tests/image.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index f63346e1dbf..de6fad093d5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3583,20 +3583,22 @@ static void test_image_properties(void) UINT prop_size2; /* if win7 behaves differently */ UINT prop_id; UINT prop_id2; /* if win7 behaves differently */ + INT palette_size; } td[] = { - { pngimage, sizeof(pngimage), ImageTypeBitmap, 4, ~0, 1, 20, 0x5110, 0x132 }, - { jpgimage, sizeof(jpgimage), ImageTypeBitmap, 2, ~0, 128, 0, 0x5090, 0x5091 }, - { tiffimage, sizeof(tiffimage), ImageTypeBitmap, 16, 0, 4, 0, 0xfe, 0 }, - { bmpimage, sizeof(bmpimage), ImageTypeBitmap, 0, 0, 0, 0, 0, 0 }, - { wmfimage, sizeof(wmfimage), ImageTypeMetafile, 0, 0, 0, 0, 0, 0 } + { pngimage, sizeof(pngimage), ImageTypeBitmap, 4, ~0, 1, 20, 0x5110, 0x132, 12 }, + { jpgimage, sizeof(jpgimage), ImageTypeBitmap, 2, ~0, 128, 0, 0x5090, 0x5091, 12 }, + { tiffimage, sizeof(tiffimage), ImageTypeBitmap, 16, 0, 4, 0, 0xfe, 0, 12 }, + { bmpimage, sizeof(bmpimage), ImageTypeBitmap, 0, 0, 0, 0, 0, 0, 16 }, + { wmfimage, sizeof(wmfimage), ImageTypeMetafile, 0, 0, 0, 0, 0, 0, -GenericError } }; GpStatus status; GpImage *image; UINT prop_count, prop_size, i; PROPID prop_id[16] = { 0 }; ImageType image_type; + INT palette_size; union { PropertyItem data; @@ -3617,6 +3619,21 @@ static void test_image_properties(void) ok(td[i].image_type == image_type, "%u: expected image_type %d, got %d\n", i, td[i].image_type, image_type); + palette_size = -1; + status = GdipGetImagePaletteSize(image, &palette_size); + if (td[i].palette_size >= 0) + { + ok(status == Ok, "%u: GdipGetImagePaletteSize error %d\n", i, status); + ok(td[i].palette_size == palette_size, "%u: expected palette_size %d, got %d\n", + i, td[i].palette_size, palette_size); + } + else + { + ok(status == -td[i].palette_size, "%u: GdipGetImagePaletteSize returned %d\n", i, status); + ok(palette_size == 0, "%u: expected palette_size 0, got %d\n", + i, palette_size); + } + status = GdipGetPropertyCount(image, &prop_count); ok(status == Ok, "%u: GdipGetPropertyCount error %d\n", i, status); todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage) -- 2.17.1

1 0

[PATCH 2/3] gdiplus: Return an error retrieving the palette for a metafile.
by Esme Povirk 15 May '20

15 May '20

From: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/image.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 17cccf2b427..cafe69d8f43 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2285,6 +2285,12 @@ GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage *image, INT *size) if(!image || !size) return InvalidParameter; + if (image->type == ImageTypeMetafile) + { + *size = 0; + return GenericError; + } + if (!image->palette || image->palette->Count == 0) *size = sizeof(ColorPalette); else -- 2.17.1

1 0

[PATCH 1/3] gdiplus: Don't set a palette when loading non-indexed images.
by Esme Povirk 15 May '20

15 May '20

From: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4fd7d95a9c7..17cccf2b427 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -58,11 +58,11 @@ static const struct { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, - { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, 0 }, + { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, 0 }, + { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, 0 }, + { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, 0 }, + { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, 0 }, { NULL } }; @@ -82,7 +82,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT hr = WINCODEC_ERR_PALETTEUNAVAILABLE; if (frame) hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); - if (hr != S_OK) + if (hr != S_OK && palette_type != 0) { TRACE("using predefined palette %#x\n", palette_type); hr = IWICPalette_InitializePredefined(wic_palette, palette_type, FALSE); -- 2.17.1

1 0

[PATCH] ntdll: Also initialize server_dir when the server is already running.
by Chip Davis 15 May '20

15 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49131 Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntdll/server.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3f637ac6885..ac8e4695eff 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1924,6 +1924,11 @@ void server_init_process(void) server_pid = -1; if (env_socket) { + struct stat st; + + if (stat( config_dir, &st ) == -1) fatal_perror( "stat %s", config_dir ); + server_dir = init_server_dir( st.st_dev, st.st_ino ); + fd_socket = atoi( env_socket ); if (fcntl( fd_socket, F_SETFD, FD_CLOEXEC ) == -1) fatal_perror( "Bad server socket %d", fd_socket ); -- 2.24.0

1 1

llvm-mingw support update
by Jacek Caban 14 May '20

14 May '20

Hi all, Last night Martin pushed an update to llvm-mingw bumping version of LLVM to a commit that includes a number of fixes for Wine. See [1] for details. Thank you, Martin! Meantime, Wine got required fixes, so that it all should mostly work together. If you want to try it, just clone [2] git and run: DEFAULT_MSVCRT=msvcrt-os ./build-all.sh /path/to/install If the installation is on PATH, current Wine should be able to use it without any additional tweaks. You should be able to configure it just like configuration on GCC-based mingw works. DEFAULT_MSVCRT=msvcrt-os part is needed because Wine can't deal with mingw-w64 defaulting to crt version other than msvcrt.dll. This is not a problem specific to LLVM, we will hit the same problem on GCC if mingw-w64 is configured to use other crt (usually ucrt, things like msvcrt100 is also possible). It is not yet a popular setup, but it will probably be more popular over time, so it would be great to have it supported. The ultimate solution for Wine is to always use -nodefaultlibs for all its binaries. It's already the case for all Wine builtin DLLs, we just need to do the same for EXEs. I have some unfinished patches for that, but it's not something appropriate for code freeze. I'm experimenting with a smaller fix, because it would be great to have something sooner, but using DEFAULT_MSVCRT=msvcrt-os is required for now. One of nice LLVM features is support for PDB files. If you want to make a build with PDB files, configure Wine like this: configure CROSSCFLAGS="-g -gcodeview -O2" CROSSLDFLAGS="-Wl,-pdb=" #append your usual args and then run make like: make CROSSLDFLAGS="-Wl,-pdb=" The additional make argument is needed because Wine does not yet propagate CROSSLDFLAGS from configure. Patch [3] should fix it. Cheers, Jacek [1] https://github.com/mstorsjo/llvm-mingw/commit/056c1f5cd22b1c5ca76af38f2d1f9… [2] https://github.com/mstorsjo/llvm-mingw [3] https://source.winehq.org/patches/data/176054

2 3

[PATCH v2 1/4] advapi32: Set last error directly in GetUserName.
by Gijs Vermeulen 14 May '20

14 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/advapi32/advapi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index cfd79e02af..735b1db7c3 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -48,6 +48,7 @@ BOOL WINAPI GetUserNameA( LPSTR name, LPDWORD size ) BOOL ret; if (!len) return FALSE; + if (len > *size) SetLastError(ERROR_INSUFFICIENT_BUFFER); if ((ret = (len < *size))) len++; *size = len; return ret; @@ -63,6 +64,7 @@ BOOL WINAPI GetUserNameW( LPWSTR name, LPDWORD size ) BOOL ret; if (!len) return FALSE; + if (len > *size) SetLastError(ERROR_INSUFFICIENT_BUFFER); if ((ret = (len < *size))) len++; *size = len; return ret; -- 2.26.2

2 7

[PATCH v3 1/4] d3d11: Return DXGI_ERROR_INVALID_CALL from immediate FinishCommandList().
by Chip Davis 14 May '20

14 May '20

This is only used with deferred contexts to record all commands thus far submitted to a command list object. It has no effect on immediate contexts. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v3: Fix size of created constant buffers. Make description a bit more specific. --- dlls/d3d11/device.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7544bc86f4b..01b32002408 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2416,9 +2416,9 @@ static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11Devi static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D11DeviceContext1 *iface, BOOL restore, ID3D11CommandList **command_list) { - FIXME("iface %p, restore %#x, command_list %p stub!\n", iface, restore, command_list); + WARN("iface %p, restore %#x, command_list %p called on immediate context.\n", iface, restore, command_list); - return E_NOTIMPL; + return DXGI_ERROR_INVALID_CALL; } static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3ae05537a1e..90dadf84149 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30062,6 +30062,41 @@ static void test_dual_source_blend(void) release_test_context(&test_context); } +static void test_deferred_methods_on_immediate_context(void) +{ + static const unsigned int buffer_contents[] = {0xdeadbeef, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, + 0xbaadf00d, 0xbaadf00d, 0xbaadf00d, 0xbaadf00d}; + ID3D11DeviceContext *immediate_context; + ID3D11CommandList *command_list; + ID3D11Buffer *buffer[2]; + ID3D11Device *device; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + ID3D11Device_GetImmediateContext(device, &immediate_context); + + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); + ok(hr == DXGI_ERROR_INVALID_CALL, "Immediate FinishCommandList returned hr %#x.\n", hr); + + buffer[0] = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 16, &buffer_contents[0]); + buffer[1] = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 16, &buffer_contents[4]); + + ID3D11DeviceContext_CopyResource(immediate_context, buffer[1], buffer[0]); + + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); + ok(hr == DXGI_ERROR_INVALID_CALL, "Immediate FinishCommandList returned hr %#x.\n", hr); + + ID3D11DeviceContext_Release(immediate_context); + ID3D11Buffer_Release(buffer[0]); + ID3D11Buffer_Release(buffer[1]); + ID3D11Device_Release(device); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30225,6 +30260,7 @@ START_TEST(d3d11) queue_test(test_color_mask); queue_test(test_independent_blend); queue_test(test_dual_source_blend); + queue_test(test_deferred_methods_on_immediate_context); run_queued_tests(); } -- 2.24.0

2 6

[PATCH v2 4/4] d3d11: Implement immediate Flush().
by Chip Davis 14 May '20

14 May '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Add missing locking. --- dlls/d3d11/device.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 207d3869c27..368a66ce74e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2396,7 +2396,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_device_flush(device->wined3d_device); + wined3d_mutex_unlock(); } static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_immediate_context_GetType(ID3D11DeviceContext1 *iface) @@ -5246,7 +5252,13 @@ static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_device_flush(device->wined3d_device); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, -- 2.24.0

2 1

[PATCH v2 1/4] d3d11: Return an error from immediate FinishCommandList().
by Chip Davis 14 May '20

14 May '20

This is only used with deferred contexts to record all commands thus far submitted to a command list object. It has no effect on immediate contexts. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Add tests. Reword description. --- dlls/d3d11/device.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7544bc86f4b..01b32002408 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2416,9 +2416,9 @@ static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11Devi static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D11DeviceContext1 *iface, BOOL restore, ID3D11CommandList **command_list) { - FIXME("iface %p, restore %#x, command_list %p stub!\n", iface, restore, command_list); + WARN("iface %p, restore %#x, command_list %p called on immediate context.\n", iface, restore, command_list); - return E_NOTIMPL; + return DXGI_ERROR_INVALID_CALL; } static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3ae05537a1e..41e7ca7aa23 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30062,6 +30062,55 @@ static void test_dual_source_blend(void) release_test_context(&test_context); } +static void test_deferred_methods_on_immediate_context(void) +{ + static const unsigned int buffer_contents[] = {0xdeadbeef, 0xbaadf00d}; + ID3D11DeviceContext *immediate_context; + D3D11_SUBRESOURCE_DATA buffer_data; + ID3D11CommandList *command_list; + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *buffer[2]; + ID3D11Device *device; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + ID3D11Device_GetImmediateContext(device, &immediate_context); + + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); + ok(hr == DXGI_ERROR_INVALID_CALL, "Immediate FinishCommandList returned hr %#x.\n", hr); + + buffer_desc.ByteWidth = 4; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + buffer_data.pSysMem = &buffer_contents[0]; + buffer_data.SysMemPitch = buffer_data.SysMemSlicePitch = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer[0]); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + buffer_data.pSysMem = &buffer_contents[1]; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer[1]); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(immediate_context, buffer[1], buffer[0]); + + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); + ok(hr == DXGI_ERROR_INVALID_CALL, "Immediate FinishCommandList returned hr %#x.\n", hr); + + ID3D11DeviceContext_Release(immediate_context); + ID3D11Buffer_Release(buffer[0]); + ID3D11Buffer_Release(buffer[1]); + ID3D11Device_Release(device); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30225,6 +30274,7 @@ START_TEST(d3d11) queue_test(test_color_mask); queue_test(test_independent_blend); queue_test(test_dual_source_blend); + queue_test(test_deferred_methods_on_immediate_context); run_queued_tests(); } -- 2.24.0

2 5

[PATCH 1/4] devenum: Use calloc() in enum_moniker_create().
by Zebediah Figura 14 May '20

14 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/mediacatenum.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 9176d8470db..07dcb1438f7 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -789,7 +789,7 @@ static ULONG WINAPI enum_moniker_Release(IEnumMoniker *iface) IEnumDMO_Release(This->dmo_enum); RegCloseKey(This->sw_key); RegCloseKey(This->cm_key); - CoTaskMemFree(This); + free(This); DEVENUM_UnlockModule(); return 0; } @@ -922,41 +922,43 @@ static const IEnumMonikerVtbl IEnumMoniker_Vtbl = enum_moniker_Clone, }; -HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **ppEnumMoniker) +HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **out) { - EnumMonikerImpl * pEnumMoniker = CoTaskMemAlloc(sizeof(EnumMonikerImpl)); + EnumMonikerImpl *object; WCHAR buffer[78]; HRESULT hr; - if (!pEnumMoniker) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - pEnumMoniker->IEnumMoniker_iface.lpVtbl = &IEnumMoniker_Vtbl; - pEnumMoniker->ref = 1; - pEnumMoniker->sw_index = 0; - pEnumMoniker->cm_index = 0; - pEnumMoniker->class = *class; + object->IEnumMoniker_iface.lpVtbl = &IEnumMoniker_Vtbl; + object->ref = 1; + object->class = *class; lstrcpyW(buffer, clsidW); lstrcatW(buffer, backslashW); StringFromGUID2(class, buffer + lstrlenW(buffer), CHARS_IN_GUID); lstrcatW(buffer, instanceW); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &pEnumMoniker->sw_key)) - pEnumMoniker->sw_key = NULL; + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &object->sw_key)) + object->sw_key = NULL; lstrcpyW(buffer, wszActiveMovieKey); StringFromGUID2(class, buffer + lstrlenW(buffer), CHARS_IN_GUID); - if (RegOpenKeyExW(HKEY_CURRENT_USER, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &pEnumMoniker->cm_key)) - pEnumMoniker->cm_key = NULL; + if (RegOpenKeyExW(HKEY_CURRENT_USER, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &object->cm_key)) + object->cm_key = NULL; - hr = DMOEnum(class, 0, 0, NULL, 0, NULL, &pEnumMoniker->dmo_enum); + hr = DMOEnum(class, 0, 0, NULL, 0, NULL, &object->dmo_enum); if (FAILED(hr)) { - IEnumMoniker_Release(&pEnumMoniker->IEnumMoniker_iface); + if (object->cm_key) + RegCloseKey(object->cm_key); + if (object->sw_key) + RegCloseKey(object->sw_key); + free(object); return hr; } - *ppEnumMoniker = &pEnumMoniker->IEnumMoniker_iface; + *out = &object->IEnumMoniker_iface; DEVENUM_LockModule(); -- 2.26.2

2 4

[PATCH 1/3] kernelbase: Preserve last error when GetEnvironmentVariableA succeeds.
by Gijs Vermeulen 14 May '20

14 May '20

From: Vladimir Panteleev <git(a)vladimir.panteleev.md> Avoid clobbering last error with NO_ERROR when GetEnvironmentVariableA succeeds, matching the behavior of GetEnvironmentVariableW and Windows. Instead of naively saving and restoring the last error, call RtlQueryEnvironmentVariable_U directly to avoid unnecessarily setting it in the first place. Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernel32/tests/environ.c | 8 ++++---- dlls/kernelbase/process.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 26f24caad2..41d4095772 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -157,10 +157,10 @@ static void test_GetSetEnvironmentVariableA(void) "should not fail with empty value but GetLastError=%d\n", GetLastError()); lstrcpyA(buf, "foo"); - SetLastError(0); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); ok(ret_size == 0 && - ((GetLastError() == 0 && lstrcmpA(buf, "") == 0) || + ((GetLastError() == 0xdeadbeef && lstrcmpA(buf, "") == 0) || (GetLastError() == ERROR_ENVVAR_NOT_FOUND)), "%s should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d and buf=%s\n", name, ret_size, GetLastError(), buf); @@ -262,10 +262,10 @@ static void test_GetSetEnvironmentVariableW(void) ok(ret == TRUE, "should not fail with empty value but GetLastError=%d\n", GetLastError()); lstrcpyW(buf, fooW); - SetLastError(0); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); ok(ret_size == 0 && - ((GetLastError() == 0 && lstrcmpW(buf, empty_strW) == 0) || + ((GetLastError() == 0xdeadbeef && lstrcmpW(buf, empty_strW) == 0) || (GetLastError() == ERROR_ENVVAR_NOT_FOUND)), "should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index c426978114..b06706f11b 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1345,24 +1345,32 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentStringsW( WCHAR *env ) */ DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) { - UNICODE_STRING us_name; + UNICODE_STRING us_name, us_value; PWSTR valueW; - DWORD ret; + NTSTATUS status; + DWORD len, ret; /* limit the size to sane values */ size = min( size, 32767 ); if (!(valueW = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return 0; RtlCreateUnicodeStringFromAsciiz( &us_name, name ); - SetLastError( 0 ); - ret = GetEnvironmentVariableW( us_name.Buffer, valueW, size); - if (ret && ret < size) WideCharToMultiByte( CP_ACP, 0, valueW, ret + 1, value, size, NULL, NULL ); - - /* this is needed to tell, with 0 as a return value, the difference between: - * - an error (GetLastError() != 0) - * - returning an empty string (in this case, we need to update the buffer) - */ - if (ret == 0 && size && GetLastError() == 0) value[0] = 0; + us_value.Length = 0; + us_value.MaximumLength = (size ? size - 1 : 0) * sizeof(WCHAR); + us_value.Buffer = valueW; + + status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); + len = us_value.Length / sizeof(WCHAR); + if (status == STATUS_BUFFER_TOO_SMALL) ret = len + 1; + else if (!set_ntstatus( status )) ret = 0; + else if (!size) ret = len + 1; + else + { + if (len) WideCharToMultiByte( CP_ACP, 0, valueW, len + 1, value, size, NULL, NULL ); + value[len] = 0; + ret = len; + } + RtlFreeUnicodeString( &us_name ); HeapFree( GetProcessHeap(), 0, valueW ); return ret; -- 2.26.2

2 3

[PATCH 1/4] d3d11: Immediate contexts don't support ID3D11DeviceContext::FinishCommandList().
by Chip Davis 14 May '20

14 May '20

This is only used with deferred contexts to record all commands thus far submitted to a command list object. It has no effect on immediate contexts. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7544bc86f4b..01b32002408 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2416,9 +2416,9 @@ static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11Devi static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D11DeviceContext1 *iface, BOOL restore, ID3D11CommandList **command_list) { - FIXME("iface %p, restore %#x, command_list %p stub!\n", iface, restore, command_list); + WARN("iface %p, restore %#x, command_list %p called on immediate context.\n", iface, restore, command_list); - return E_NOTIMPL; + return DXGI_ERROR_INVALID_CALL; } static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3D11DeviceContext1 *iface, -- 2.24.0

3 7

[PATCH] wined3d: Allow setting user memory for mipmapped textures in wined3d_texture_update_desc().
by Henri Verbeet 14 May '20

14 May '20

From: Paul Gofman <pgofman(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185204. Do not modify the texture pitch when only setting user memory for the texture. This is perhaps not immediately obvious, but setting an explicit pitch overrides it for all sub-resources. That fine's for textures that only have a single level, but not for mip-mapped textures. dlls/ddraw/tests/ddraw7.c | 96 +++++++++++++++++++++++++++++--- dlls/wined3d/texture.c | 113 ++++++++++++++++++++++---------------- 2 files changed, 155 insertions(+), 54 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 53e47250e3d..c85f0201118 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7126,6 +7126,64 @@ static void test_set_surface_desc(void) IDirectDrawSurface7_Release(surface); + /* Test mipmap texture. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U2(ddsd).dwMipMapCount = 3; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + if (FAILED(hr)) + { + skip("Mipmaps are not supported.\n"); + } + else + { + /* Changing surface desc for mipmap fails even without changing any + * parameters. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDSURFACETYPE, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + } + + /* Test surface created with DDSD_LPSURFACE. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + /* Cannot reset lpSurface. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + /* Can change the parameters of surface created with DDSD_LPSURFACE. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface); + /* SetSurfaceDesc needs systemmemory surfaces. * * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing @@ -13347,14 +13405,14 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); width = surface_desc.dwWidth; height = surface_desc.dwHeight; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, width, height, NULL, NULL, NULL, NULL); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); bpp = 0; if (SUCCEEDED(IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0))) @@ -13367,7 +13425,7 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", @@ -13379,9 +13437,9 @@ static void test_display_mode_surface_pixel_format(void) U5(surface_desc).dwBackBufferCount = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", @@ -13397,15 +13455,39 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwHeight = height; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, bpp); IDirectDrawSurface7_Release(surface); + /* Test compatibility mode mipmap texture creation. */ + hr = IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0); + ok(hr == DD_OK || hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + win_skip("SetDisplayMode failed, skipping test."); + goto done; + } + bpp = 16; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT | DDSD_PITCH; + U2(surface_desc).dwMipMapCount = 2; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + U1(surface_desc).lPitch = surface_desc.dwWidth * bpp / 8; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_VIDEOMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW, "Got unexpected hr %#x.\n", hr); + if (surface) + IDirectDrawSurface7_Release(surface); + +done: refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 49373eb58ac..de6999105d1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1748,11 +1748,13 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; - const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; + const struct wined3d *d3d; + unsigned int slice_pitch; DWORD valid_location = 0; - BOOL create_dib = FALSE; + bool update_memory_only; + bool create_dib = false; TRACE("texture %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u, " "mem %p, pitch %u.\n", @@ -1765,10 +1767,27 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + update_memory_only = width == texture->resource.width && height == texture->resource.height + && format_id == texture->resource.format->id && multisample_type == texture->resource.multisample_type + && multisample_quality == texture->resource.multisample_quality; + + if (pitch) + slice_pitch = height * pitch; + else + wined3d_format_calculate_pitch(format, 1, width, height, &pitch, &slice_pitch); + + if (update_memory_only) + { + unsigned int current_row_pitch, current_slice_pitch; + + wined3d_texture_get_pitch(texture, 0, &current_row_pitch, &current_slice_pitch); + update_memory_only = pitch == current_row_pitch && slice_pitch == current_slice_pitch; + } + if (!resource_size) return WINED3DERR_INVALIDCALL; - if (texture->level_count * texture->layer_count > 1) + if (texture->level_count * texture->layer_count > 1 && !update_memory_only) { WARN("Texture has multiple sub-resources, not supported.\n"); return WINED3DERR_INVALIDCALL; @@ -1803,67 +1822,67 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_cs_emit_unload_resource(device->cs, &texture->resource); wined3d_resource_wait_idle(&texture->resource); - sub_resource = &texture->sub_resources[0]; if (texture->dc_info && texture->dc_info[0].dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; wined3d_cs_destroy_object(device->cs, wined3d_texture_destroy_dc, &texture_idx); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - create_dib = TRUE; + create_dib = true; } wined3d_resource_free_sysmem(&texture->resource); - if ((texture->row_pitch = pitch)) - texture->slice_pitch = height * pitch; - else - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(format, 1, width, height, - &texture->row_pitch, &texture->slice_pitch); - - texture->resource.format = format; - texture->resource.multisample_type = multisample_type; - texture->resource.multisample_quality = multisample_quality; - texture->resource.width = width; - texture->resource.height = height; - if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) - adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); - texture->resource.size = texture->slice_pitch; - sub_resource->size = texture->slice_pitch; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - - if (texture->texture_ops == &texture_gl_ops) - { - if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + if (!update_memory_only) + { + sub_resource = &texture->sub_resources[0]; + + texture->row_pitch = pitch; + texture->slice_pitch = slice_pitch; + + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); + texture->resource.size = texture->slice_pitch; + sub_resource->size = texture->slice_pitch; + sub_resource->locations = WINED3D_LOCATION_DISCARDED; + + if (texture->texture_ops == &texture_gl_ops) { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; - texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } + else + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } + } + + if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot + && !d3d_info->texture_npot_conditional) + { + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = width; + texture->pow2_height = height; } } - if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot - && !d3d_info->texture_npot_conditional) - { - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = texture->pow2_height = 1; - while (texture->pow2_width < width) - texture->pow2_width <<= 1; - while (texture->pow2_height < height) - texture->pow2_height <<= 1; - } - else - { - texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = width; - texture->pow2_height = height; - } - if ((texture->user_memory = mem)) { texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; -- 2.20.1

1 0

[PATCH 2/4] configure: Introduce --with-cross-debug option.
by Jacek Caban 14 May '20

14 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The main motivation is PDB files support, but split-dwarf is also nice to have - it largely reduces prefix size of unstripped (like in-tree) builds. Makefile.in | 1 + configure.ac | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-)

2 2

[PATCH 4/4] makedep: Support split debug for cross compiled modules.
by Jacek Caban 14 May '20

14 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-)

1 0

[PATCH 3/4] makedep: Use explicit output file name in linker rules for cross compiled files.
by Jacek Caban 14 May '20

14 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)

1 0

[PATCH 2/4] configure: Allow specifying cross debug format.
by Jacek Caban 14 May '20

14 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Makefile.in | 1 + configure.ac | 29 ++++++++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-)

1 0

[PATCH 1/4] winegcc: Introduce --debug-file option for generating separated symbol files.
by Jacek Caban 14 May '20

14 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 58 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-)

1 0

[PATCH 6/6] wined3d: Implement Vulkan NULL cube image shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 ++++ dlls/wined3d/device.c | 39 +++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c53b9aa6c65..f3b0a42b8f1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1352,6 +1352,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_3d, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_cube, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d_array, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ad475734b4..3716d3e0635 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -666,7 +666,7 @@ static void wined3d_null_image_vk_cleanup(struct wined3d_null_image_vk *image, } static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, struct wined3d_context_vk *context_vk, - VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int sample_count) + VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int layer_count, unsigned int sample_count) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -674,23 +674,27 @@ static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, stru VkImageSubresourceRange range; VkImageCreateInfo image_desc; unsigned int memory_type_idx; + uint32_t flags = 0; VkResult vr; static const VkClearColorValue colour = {0}; - TRACE("image %p, context_vk %p, vk_command_buffer %p, type %#x, sample_count %u.\n", - image, context_vk, vk_command_buffer, type, sample_count); + TRACE("image %p, context_vk %p, vk_command_buffer %p, type %#x, layer_count %u, sample_count %u.\n", + image, context_vk, vk_command_buffer, type, layer_count, sample_count); + + if (type == VK_IMAGE_TYPE_2D && layer_count >= 6) + flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; image_desc.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_desc.pNext = NULL; - image_desc.flags = 0; + image_desc.flags = flags; image_desc.imageType = type; image_desc.format = VK_FORMAT_R8G8B8A8_UNORM; image_desc.extent.width = 1; image_desc.extent.height = 1; image_desc.extent.depth = 1; image_desc.mipLevels = 1; - image_desc.arrayLayers = 1; + image_desc.arrayLayers = layer_count; image_desc.samples = sample_count; image_desc.tiling = VK_IMAGE_TILING_OPTIMAL; image_desc.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; @@ -748,7 +752,7 @@ static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, stru range.baseMipLevel = 0; range.levelCount = 1; range.baseArrayLayer = 0; - range.layerCount = 1; + range.layerCount = layer_count; VK_CALL(vkCmdClearColorImage(vk_command_buffer, image->vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &colour, 1, &range)); @@ -793,25 +797,25 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); - if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1)) + if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1, 1)) { ERR("Failed to create 1D image.\n"); goto fail; } - if (!wined3d_null_image_vk_init(&r->image_2d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, 1)) + if (!wined3d_null_image_vk_init(&r->image_2d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, 6, 1)) { ERR("Failed to create 2D image.\n"); goto fail; } - if (!wined3d_null_image_vk_init(&r->image_2dms, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, sample_count)) + if (!wined3d_null_image_vk_init(&r->image_2dms, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, 1, sample_count)) { ERR("Failed to create 2D MSAA image.\n"); goto fail; } - if (!wined3d_null_image_vk_init(&r->image_3d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_3D, 1)) + if (!wined3d_null_image_vk_init(&r->image_3d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_3D, 1, 1)) { ERR("Failed to create 3D image.\n"); goto fail; @@ -942,6 +946,18 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st TRACE("Created 3D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_3d.imageView)); view_desc.image = r->image_2d.vk_image; + view_desc.subresourceRange.layerCount = 6; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_CUBE; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_cube.imageView))) < 0) + { + ERR("Failed to create cube image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_cube.sampler = VK_NULL_HANDLE; + v->vk_info_cube.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created cube image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_cube.imageView)); + + view_desc.subresourceRange.layerCount = 1; view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d_array.imageView))) < 0) { @@ -968,6 +984,8 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st fail: if (v->vk_info_2d_array.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); + if (v->vk_info_cube.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_cube.imageView, NULL)); if (v->vk_info_3d.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_3d.imageView, NULL)); if (v->vk_info_2dms.imageView) @@ -989,6 +1007,7 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_cube.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_3d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebbe379f2d2..dda26aacd07 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3632,6 +3632,7 @@ struct wined3d_null_views_vk VkDescriptorImageInfo vk_info_2d; VkDescriptorImageInfo vk_info_2dms; VkDescriptorImageInfo vk_info_3d; + VkDescriptorImageInfo vk_info_cube; VkDescriptorImageInfo vk_info_2d_array; VkDescriptorImageInfo vk_info_2dms_array; }; -- 2.20.1

1 0

[PATCH 5/6] wined3d: Implement Vulkan NULL 3D image shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 ++++ dlls/wined3d/device.c | 23 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 29 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0bd4f2260ab..c53b9aa6c65 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1348,6 +1348,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_3d, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d_array, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed746c7efab..4ad475734b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -811,10 +811,18 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk goto fail; } + if (!wined3d_null_image_vk_init(&r->image_3d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_3D, 1)) + { + ERR("Failed to create 3D image.\n"); + goto fail; + } + return true; fail: id = context_vk->current_command_buffer.id; + if (r->image_2dms.vk_image) + wined3d_null_image_vk_cleanup(&r->image_2dms, context_vk, id); if (r->image_2d.vk_image) wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); if (r->image_1d.vk_image) @@ -832,6 +840,7 @@ void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_v /* We don't track command buffer references to NULL resources. We easily * could, but it doesn't seem worth it. */ + wined3d_null_image_vk_cleanup(&r->image_3d, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_2dms, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); @@ -921,6 +930,17 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st v->vk_info_2dms.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; TRACE("Created 2D MSAA image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms.imageView)); + view_desc.image = r->image_3d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_3D; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_3d.imageView))) < 0) + { + ERR("Failed to create 3D image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_3d.sampler = VK_NULL_HANDLE; + v->vk_info_3d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 3D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_3d.imageView)); + view_desc.image = r->image_2d.vk_image; view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d_array.imageView))) < 0) @@ -948,6 +968,8 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st fail: if (v->vk_info_2d_array.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); + if (v->vk_info_3d.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_3d.imageView, NULL)); if (v->vk_info_2dms.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2dms.imageView, NULL)); if (v->vk_info_2d.imageView) @@ -967,6 +989,7 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_3d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e87c364ab5..ebbe379f2d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3620,6 +3620,7 @@ struct wined3d_null_resources_vk struct wined3d_null_image_vk image_1d; struct wined3d_null_image_vk image_2d; struct wined3d_null_image_vk image_2dms; + struct wined3d_null_image_vk image_3d; }; struct wined3d_null_views_vk @@ -3630,6 +3631,7 @@ struct wined3d_null_views_vk VkDescriptorImageInfo vk_info_1d; VkDescriptorImageInfo vk_info_2d; VkDescriptorImageInfo vk_info_2dms; + VkDescriptorImageInfo vk_info_3d; VkDescriptorImageInfo vk_info_2d_array; VkDescriptorImageInfo vk_info_2dms_array; }; -- 2.20.1

1 0

[PATCH 4/6] wined3d: Implement Vulkan NULL 2D image shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 16 +++++ dlls/wined3d/device.c | 104 ++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 6 ++ 3 files changed, 117 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 648c53e48c6..0bd4f2260ab 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1340,6 +1340,22 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_1d, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d, NULL); + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms, NULL); + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d_array, NULL); + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms_array, NULL); + default: FIXME("Unhandled resource type %#x.\n", type); return false; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa031b986bd..ed746c7efab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -665,8 +665,8 @@ static void wined3d_null_image_vk_cleanup(struct wined3d_null_image_vk *image, wined3d_context_vk_destroy_memory(context_vk, image->vk_memory, command_buffer_id); } -static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, - struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer) +static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int sample_count) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -678,19 +678,20 @@ static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, static const VkClearColorValue colour = {0}; - TRACE("image %p, context_vk %p, vk_command_buffer %p.\n", image, context_vk, vk_command_buffer); + TRACE("image %p, context_vk %p, vk_command_buffer %p, type %#x, sample_count %u.\n", + image, context_vk, vk_command_buffer, type, sample_count); image_desc.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_desc.pNext = NULL; image_desc.flags = 0; - image_desc.imageType = VK_IMAGE_TYPE_1D; + image_desc.imageType = type; image_desc.format = VK_FORMAT_R8G8B8A8_UNORM; image_desc.extent.width = 1; image_desc.extent.height = 1; image_desc.extent.depth = 1; image_desc.mipLevels = 1; image_desc.arrayLayers = 1; - image_desc.samples = VK_SAMPLE_COUNT_1_BIT; + image_desc.samples = sample_count; image_desc.tiling = VK_IMAGE_TILING_OPTIMAL; image_desc.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; image_desc.sharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -767,9 +768,16 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk { struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; const struct wined3d_vk_info *vk_info; + const struct wined3d_format *format; VkMemoryPropertyFlags memory_type; VkCommandBuffer vk_command_buffer; + unsigned int sample_count = 2; VkBufferUsageFlags usage; + uint64_t id; + + format = wined3d_get_format(device_vk->d.adapter, WINED3DFMT_R8G8B8A8_UNORM, WINED3D_BIND_SHADER_RESOURCE); + while (sample_count && !(sample_count & format->multisample_types)) + sample_count <<= 1; if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { @@ -785,15 +793,35 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); - if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer)) + if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1)) { ERR("Failed to create 1D image.\n"); - wined3d_context_vk_reference_bo(context_vk, &r->bo); - wined3d_context_vk_destroy_bo(context_vk, &r->bo); - return false; + goto fail; + } + + if (!wined3d_null_image_vk_init(&r->image_2d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, 1)) + { + ERR("Failed to create 2D image.\n"); + goto fail; + } + + if (!wined3d_null_image_vk_init(&r->image_2dms, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, sample_count)) + { + ERR("Failed to create 2D MSAA image.\n"); + goto fail; } return true; + +fail: + id = context_vk->current_command_buffer.id; + if (r->image_2d.vk_image) + wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); + if (r->image_1d.vk_image) + wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); + wined3d_context_vk_reference_bo(context_vk, &r->bo); + wined3d_context_vk_destroy_bo(context_vk, &r->bo); + return false; } void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_vk, @@ -804,6 +832,8 @@ void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_v /* We don't track command buffer references to NULL resources. We easily * could, but it doesn't seem worth it. */ + wined3d_null_image_vk_cleanup(&r->image_2dms, context_vk, id); + wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); wined3d_context_vk_reference_bo(context_vk, &r->bo); wined3d_context_vk_destroy_bo(context_vk, &r->bo); @@ -869,9 +899,61 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st v->vk_info_1d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; TRACE("Created 1D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_1d.imageView)); + view_desc.image = r->image_2d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d.imageView))) < 0) + { + ERR("Failed to create 2D image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_2d.sampler = VK_NULL_HANDLE; + v->vk_info_2d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 2D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2d.imageView)); + + view_desc.image = r->image_2dms.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2dms.imageView))) < 0) + { + ERR("Failed to create 2D MSAA image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_2dms.sampler = VK_NULL_HANDLE; + v->vk_info_2dms.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 2D MSAA image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms.imageView)); + + view_desc.image = r->image_2d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d_array.imageView))) < 0) + { + ERR("Failed to create 2D array image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_2d_array.sampler = VK_NULL_HANDLE; + v->vk_info_2d_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 2D array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2d_array.imageView)); + + view_desc.image = r->image_2dms.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2dms_array.imageView))) < 0) + { + ERR("Failed to create 2D MSAA array image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_2dms_array.sampler = VK_NULL_HANDLE; + v->vk_info_2dms_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 2D MSAA array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms_array.imageView)); + return true; fail: + if (v->vk_info_2d_array.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); + if (v->vk_info_2dms.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2dms.imageView, NULL)); + if (v->vk_info_2d.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d.imageView, NULL)); + if (v->vk_info_1d.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_1d.imageView, NULL)); if (v->vk_view_buffer_float) VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_float, NULL)); VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_uint, NULL)); @@ -883,6 +965,10 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s struct wined3d_null_views_vk *v = &device_vk->null_views_vk; uint64_t id = context_vk->current_command_buffer.id; + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id); wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_float, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6124eabe185..3e87c364ab5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3618,6 +3618,8 @@ struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; struct wined3d_null_image_vk image_1d; + struct wined3d_null_image_vk image_2d; + struct wined3d_null_image_vk image_2dms; }; struct wined3d_null_views_vk @@ -3626,6 +3628,10 @@ struct wined3d_null_views_vk VkBufferView vk_view_buffer_float; VkDescriptorImageInfo vk_info_1d; + VkDescriptorImageInfo vk_info_2d; + VkDescriptorImageInfo vk_info_2dms; + VkDescriptorImageInfo vk_info_2d_array; + VkDescriptorImageInfo vk_info_2dms_array; }; #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) -- 2.20.1

1 0

[PATCH 3/6] wined3d: Implement Vulkan NULL 1D image shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 + dlls/wined3d/device.c | 153 ++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 10 +++ 3 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0199b655dff..648c53e48c6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1336,6 +1336,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, NULL, NULL, &v->vk_view_buffer_uint); + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_1d, NULL); + default: FIXME("Unhandled resource type %#x.\n", type); return false; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 081001e487e..aa031b986bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -655,6 +655,113 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device, stru device->null_sampler = NULL; } +static void wined3d_null_image_vk_cleanup(struct wined3d_null_image_vk *image, + struct wined3d_context_vk *context_vk, uint64_t command_buffer_id) +{ + wined3d_context_vk_destroy_image(context_vk, image->vk_image, command_buffer_id); + if (image->memory) + wined3d_context_vk_destroy_allocator_block(context_vk, image->memory, command_buffer_id); + else + wined3d_context_vk_destroy_memory(context_vk, image->vk_memory, command_buffer_id); +} + +static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, + struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkMemoryRequirements memory_requirements; + VkImageSubresourceRange range; + VkImageCreateInfo image_desc; + unsigned int memory_type_idx; + VkResult vr; + + static const VkClearColorValue colour = {0}; + + TRACE("image %p, context_vk %p, vk_command_buffer %p.\n", image, context_vk, vk_command_buffer); + + image_desc.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; + image_desc.pNext = NULL; + image_desc.flags = 0; + image_desc.imageType = VK_IMAGE_TYPE_1D; + image_desc.format = VK_FORMAT_R8G8B8A8_UNORM; + image_desc.extent.width = 1; + image_desc.extent.height = 1; + image_desc.extent.depth = 1; + image_desc.mipLevels = 1; + image_desc.arrayLayers = 1; + image_desc.samples = VK_SAMPLE_COUNT_1_BIT; + image_desc.tiling = VK_IMAGE_TILING_OPTIMAL; + image_desc.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; + image_desc.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + image_desc.queueFamilyIndexCount = 0; + image_desc.pQueueFamilyIndices = NULL; + image_desc.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; + if ((vr = VK_CALL(vkCreateImage(device_vk->vk_device, &image_desc, NULL, &image->vk_image))) < 0) + { + ERR("Failed to create Vulkan image, vr %s.\n", wined3d_debug_vkresult(vr)); + return false; + } + + VK_CALL(vkGetImageMemoryRequirements(device_vk->vk_device, image->vk_image, &memory_requirements)); + + memory_type_idx = wined3d_adapter_vk_get_memory_type_index(wined3d_adapter_vk(device_vk->d.adapter), + memory_requirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + if (memory_type_idx == ~0u) + { + ERR("Failed to find suitable image memory type.\n"); + VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); + image->vk_image = VK_NULL_HANDLE; + return false; + } + + image->memory = wined3d_context_vk_allocate_memory(context_vk, + memory_type_idx, memory_requirements.size, &image->vk_memory); + if (!image->vk_memory) + { + ERR("Failed to allocate image memory.\n"); + VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); + image->vk_image = VK_NULL_HANDLE; + return false; + } + + if ((vr = VK_CALL(vkBindImageMemory(device_vk->vk_device, image->vk_image, + image->vk_memory, image->memory ? image->memory->offset : 0))) < 0) + { + ERR("Failed to bind image memory, vr %s.\n", wined3d_debug_vkresult(vr)); + if (image->memory) + wined3d_allocator_block_free(image->memory); + else + VK_CALL(vkFreeMemory(device_vk->vk_device, image->vk_memory, NULL)); + VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); + image->vk_image = VK_NULL_HANDLE; + return false; + } + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, VK_ACCESS_TRANSFER_WRITE_BIT, + VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + image->vk_image, VK_IMAGE_ASPECT_COLOR_BIT); + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = 0; + range.levelCount = 1; + range.baseArrayLayer = 0; + range.layerCount = 1; + VK_CALL(vkCmdClearColorImage(vk_command_buffer, image->vk_image, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &colour, 1, &range)); + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, 0, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, + image->vk_image, VK_IMAGE_ASPECT_COLOR_BIT); + + TRACE("Created NULL image 0x%s, memory 0x%s.\n", + wine_dbgstr_longlong(image->vk_image), wine_dbgstr_longlong(image->vk_memory)); + + return true; +} + bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) { @@ -678,6 +785,14 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer)) + { + ERR("Failed to create 1D image.\n"); + wined3d_context_vk_reference_bo(context_vk, &r->bo); + wined3d_context_vk_destroy_bo(context_vk, &r->bo); + return false; + } + return true; } @@ -685,9 +800,11 @@ void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_v struct wined3d_context_vk *context_vk) { struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; + uint64_t id = context_vk->current_command_buffer.id; /* We don't track command buffer references to NULL resources. We easily * could, but it doesn't seem worth it. */ + wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); wined3d_context_vk_reference_bo(context_vk, &r->bo); wined3d_context_vk_destroy_bo(context_vk, &r->bo); } @@ -698,6 +815,7 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st struct wined3d_null_views_vk *v = &device_vk->null_views_vk; VkBufferViewCreateInfo buffer_create_info; const struct wined3d_vk_info *vk_info; + VkImageViewCreateInfo view_desc; VkResult vr; vk_info = context_vk->vk_info; @@ -723,12 +841,41 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st &buffer_create_info, NULL, &v->vk_view_buffer_float))) < 0) { ERR("Failed to create buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_uint, NULL)); - return false; + goto fail; } TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(v->vk_view_buffer_float)); + view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; + view_desc.pNext = NULL; + view_desc.flags = 0; + view_desc.image = r->image_1d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_1D; + view_desc.format = VK_FORMAT_R8G8B8A8_UNORM; + view_desc.components.r = VK_COMPONENT_SWIZZLE_ZERO; + view_desc.components.g = VK_COMPONENT_SWIZZLE_ZERO; + view_desc.components.b = VK_COMPONENT_SWIZZLE_ZERO; + view_desc.components.a = VK_COMPONENT_SWIZZLE_ZERO; + view_desc.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + view_desc.subresourceRange.baseMipLevel = 0; + view_desc.subresourceRange.levelCount = 1; + view_desc.subresourceRange.baseArrayLayer = 0; + view_desc.subresourceRange.layerCount = 1; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_1d.imageView))) < 0) + { + ERR("Failed to create 1D image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_1d.sampler = VK_NULL_HANDLE; + v->vk_info_1d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 1D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_1d.imageView)); + return true; + +fail: + if (v->vk_view_buffer_float) + VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_float, NULL)); + VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_uint, NULL)); + return false; } void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) @@ -736,6 +883,8 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s struct wined3d_null_views_vk *v = &device_vk->null_views_vk; uint64_t id = context_vk->current_command_buffer.id; + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id); + wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_float, id); wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_uint, id); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d2273b9f63..6124eabe185 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3607,15 +3607,25 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +struct wined3d_null_image_vk +{ + VkImage vk_image; + struct wined3d_allocator_block *memory; + VkDeviceMemory vk_memory; +}; + struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; + struct wined3d_null_image_vk image_1d; }; struct wined3d_null_views_vk { VkBufferView vk_view_buffer_uint; VkBufferView vk_view_buffer_float; + + VkDescriptorImageInfo vk_info_1d; }; #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) -- 2.20.1

1 0

[PATCH 2/6] wined3d: Implement Vulkan NULL buffer shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 ++ dlls/wined3d/context_vk.c | 27 ++++++++++- dlls/wined3d/device.c | 85 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 23 +++++++++ 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4dbbb0b80ef..cf82d00e40b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -678,6 +678,8 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) wined3d_vk_blitter_create(&device_vk->d.blitter); wined3d_device_create_default_samplers(device, &context_vk->c); + wined3d_device_vk_create_null_resources(device_vk, context_vk); + wined3d_device_vk_create_null_views(device_vk, context_vk); return WINED3D_OK; } @@ -701,6 +703,8 @@ static void adapter_vk_uninit_3d_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, NULL); device->shader_backend->shader_free_private(device, &context_vk->c); + wined3d_device_vk_destroy_null_views(device_vk, context_vk); + wined3d_device_vk_destroy_null_resources(device_vk, context_vk); wined3d_device_destroy_default_samplers(device, &context_vk->c); } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 2f170b085ba..0199b655dff 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1321,6 +1321,27 @@ static bool wined3d_shader_descriptor_writes_vk_add_write(struct wined3d_shader_ return true; } +static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d_shader_descriptor_writes_vk *writes, + VkDescriptorSet vk_descriptor_set, size_t binding_idx, enum wined3d_shader_resource_type type, + enum wined3d_data_type data_type, struct wined3d_context_vk *context_vk) +{ + const struct wined3d_null_views_vk *v = &wined3d_device_vk(context_vk->c.device)->null_views_vk; + + switch (type) + { + case WINED3D_SHADER_RESOURCE_BUFFER: + if (data_type == WINED3D_DATA_FLOAT) + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, + VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, NULL, NULL, &v->vk_view_buffer_float); + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, + VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, NULL, NULL, &v->vk_view_buffer_uint); + + default: + FIXME("Unhandled resource type %#x.\n", type); + return false; + } +} + static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer, const struct wined3d_state *state) { @@ -1374,8 +1395,10 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) { - FIXME("NULL shader resource views not implemented.\n"); - return false; + if (!wined3d_shader_resource_bindings_add_null_srv_binding(writes, vk_descriptor_set, + binding->binding_idx, binding->resource_type, binding->resource_data_type, context_vk)) + return false; + break; } resource = srv->resource; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cc13ab4863e..081001e487e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -655,6 +655,91 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device, stru device->null_sampler = NULL; } +bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; + const struct wined3d_vk_info *vk_info; + VkMemoryPropertyFlags memory_type; + VkCommandBuffer vk_command_buffer; + VkBufferUsageFlags usage; + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return false; + } + + vk_info = context_vk->vk_info; + + usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) + return false; + VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + + return true; +} + +void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; + + /* We don't track command buffer references to NULL resources. We easily + * could, but it doesn't seem worth it. */ + wined3d_context_vk_reference_bo(context_vk, &r->bo); + wined3d_context_vk_destroy_bo(context_vk, &r->bo); +} + +bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) +{ + struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; + struct wined3d_null_views_vk *v = &device_vk->null_views_vk; + VkBufferViewCreateInfo buffer_create_info; + const struct wined3d_vk_info *vk_info; + VkResult vr; + + vk_info = context_vk->vk_info; + + buffer_create_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; + buffer_create_info.pNext = NULL; + buffer_create_info.flags = 0; + buffer_create_info.buffer = r->bo.vk_buffer; + buffer_create_info.format = VK_FORMAT_R32_UINT; + buffer_create_info.offset = r->bo.buffer_offset;; + buffer_create_info.range = r->bo.size; + + if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, + &buffer_create_info, NULL, &v->vk_view_buffer_uint))) < 0) + { + ERR("Failed to create buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); + return false; + } + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(v->vk_view_buffer_uint)); + + buffer_create_info.format = VK_FORMAT_R32G32B32A32_SFLOAT; + if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, + &buffer_create_info, NULL, &v->vk_view_buffer_float))) < 0) + { + ERR("Failed to create buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_uint, NULL)); + return false; + } + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(v->vk_view_buffer_float)); + + return true; +} + +void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) +{ + struct wined3d_null_views_vk *v = &device_vk->null_views_vk; + uint64_t id = context_vk->current_command_buffer.id; + + wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_float, id); + wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_uint, id); +} + HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) { unsigned int screensaver_active; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9e8ffa816f..3d2273b9f63 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3607,6 +3607,17 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +struct wined3d_null_resources_vk +{ + struct wined3d_bo_vk bo; +}; + +struct wined3d_null_views_vk +{ + VkBufferView vk_view_buffer_uint; + VkBufferView vk_view_buffer_float; +}; + #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) #define WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT 15 #define WINED3D_ALLOCATOR_MIN_BLOCK_SIZE (WINED3D_ALLOCATOR_CHUNK_SIZE >> (WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT - 1)) @@ -3691,6 +3702,9 @@ struct wined3d_device_vk struct wined3d_vk_info vk_info; + struct wined3d_null_resources_vk null_resources_vk; + struct wined3d_null_views_vk null_views_vk; + struct wined3d_allocator allocator; }; @@ -3699,6 +3713,15 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } +bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + static inline float wined3d_alpha_ref(const struct wined3d_state *state) { return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f; -- 2.20.1

1 0

[PATCH 1/6] wined3d: Implement Vulkan unordered access view counter descriptors.
by Henri Verbeet 14 May '20

14 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index e37cbc787fc..2f170b085ba 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1329,6 +1329,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; + struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_unordered_access_view *uav; const VkDescriptorBufferInfo *buffer_info; struct wined3d_shader_resource_view *srv; @@ -1434,6 +1435,20 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: + if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx])) + { + FIXME("NULL unordered access view counters not implemented.\n"); + return false; + } + + uav_vk = wined3d_unordered_access_view_vk(uav); + if (!uav_vk->vk_counter_view || !wined3d_shader_descriptor_writes_vk_add_write(writes, + vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, + NULL, NULL, &uav_vk->vk_counter_view)) + return false; + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) sampler = context_vk->c.device->null_sampler; @@ -1443,7 +1458,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con break; default: - FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); + ERR("Invalid descriptor type %#x.\n", binding->shader_descriptor_type); return false; } } -- 2.20.1

1 0

[PATCH 1/2] mf/sar: Use MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS attribute to configure audio client.
by Nikolay Sivov 13 May '20

13 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 0ea46dcb891..aa0e4eb853c 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -95,6 +95,10 @@ struct audio_renderer IAudioRenderClient *audio_render_client; IAudioStreamVolume *stream_volume; ISimpleAudioVolume *audio_volume; + struct + { + unsigned int flags; + } stream_config; HANDLE buffer_ready_event; MFWORKITEM_KEY buffer_ready_key; unsigned int frame_size; @@ -1170,6 +1174,10 @@ static HRESULT sar_create_mmdevice(IMFAttributes *attributes, struct audio_rende else hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, role, &renderer->device); + /* Configuration attributes to be used later for audio client initialization. */ + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS, &renderer->stream_config.flags); + if (FAILED(hr)) hr = MF_E_NO_AUDIO_PLAYBACK_DEVICE; @@ -1503,6 +1511,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeByIndex(IMF static HRESULT audio_renderer_create_audio_client(struct audio_renderer *renderer) { IMFAsyncResult *result; + unsigned int flags; WAVEFORMATEX *wfx; HRESULT hr; @@ -1516,8 +1525,6 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } - /* FIXME: use SAR configuration for flags and session id. */ - /* FIXME: for now always use default format. */ if (FAILED(hr = IAudioClient_GetMixFormat(renderer->audio_client, &wfx))) { @@ -1527,8 +1534,12 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere renderer->frame_size = wfx->wBitsPerSample * wfx->nChannels / 8; - hr = IAudioClient_Initialize(renderer->audio_client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, - 1000000, 0, wfx, NULL); + flags = AUDCLNT_STREAMFLAGS_EVENTCALLBACK; + if (renderer->stream_config.flags & MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_CROSSPROCESS) + flags |= AUDCLNT_STREAMFLAGS_CROSSPROCESS; + if (renderer->stream_config.flags & MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_NOPERSIST) + flags |= AUDCLNT_STREAMFLAGS_NOPERSIST; + hr = IAudioClient_Initialize(renderer->audio_client, AUDCLNT_SHAREMODE_SHARED, flags, 1000000, 0, wfx, NULL); CoTaskMemFree(wfx); if (FAILED(hr)) { -- 2.26.2

1 1

[v2 PATCH] include/dwrite.idl: Fix typo in DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME member name.
by Nikolay Sivov 13 May '20

13 May '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index a8c523edda1..d5ce849386f 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -138,7 +138,7 @@ typedef enum DWRITE_INFORMATIONAL_STRING_ID DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, } DWRITE_INFORMATIONAL_STRING_ID; typedef enum DWRITE_FONT_SIMULATIONS -- 2.26.2

1 0

[v2 PATCH] include/dwrite_1.idl: Fix typo in DWRITE_PANOSE_STROKE_VARIATION symbol name.
by Nikolay Sivov 13 May '20

13 May '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: with more descriptive subject include/dwrite_1.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite_1.idl b/include/dwrite_1.idl index c00e922076f..902af41a85e 100644 --- a/include/dwrite_1.idl +++ b/include/dwrite_1.idl @@ -114,7 +114,7 @@ typedef enum DWRITE_PANOSE_STROKE_VARIATION DWRITE_PANOSE_STROKE_VARIATION_RAPID_HORIZONTAL, DWRITE_PANOSE_STROKE_VARIATION_INSTANT_VERTICAL, DWRITE_PANOSE_STROKE_VARIATION_INSTANT_HORIZONTAL -} DWRITE_PANOSE_STROKE_VARIANTION; +} DWRITE_PANOSE_STROKE_VARIATION; typedef enum DWRITE_PANOSE_ARM_STYLE { -- 2.26.2

1 0

[PATCH] quartz/tests: Fix a crash in test_allocate_surface_helper().
by Zebediah Figura 13 May '20

13 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index e3efe56e44..57e92ad714 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2622,18 +2622,22 @@ static void test_allocate_surface_helper(void) HRESULT hr; ULONG ref; + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, + rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); + if (!(device = create_device(window))) + { + IBaseFilter_Release(filter); + DestroyWindow(window); + return; + } + IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); count = 2; hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(notify, &info, &count, surfaces); todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); - AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); - window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, - rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - if (!(device = create_device(window))) - goto out; - hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE) { -- 2.26.2

1 0

[PATCH] ntdll: Fix length calculation of generated SMBIOS tables.
by Brendan Shanks 13 May '20

13 May '20

An extra byte for a null-terminator was added for every string, but not used when the string was empty. This resulted in extra bytes at the end of the buffer, causing parse errors in dmidecode. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/nt.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6c95517e79..4dced31641 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2191,19 +2191,21 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG *required_len = sizeof(struct smbios_prologue); +#define L(l) (l + (l ? 1 : 0)) *required_len += sizeof(struct smbios_bios); - *required_len += max(bios_vendor_len + bios_version_len + bios_date_len + 4, 2); + *required_len += max(L(bios_vendor_len) + L(bios_version_len) + L(bios_date_len) + 1, 2); *required_len += sizeof(struct smbios_system); - *required_len += max(system_vendor_len + system_product_len + system_version_len + - system_serial_len + system_sku_len + system_family_len + 7, 2); + *required_len += max(L(system_vendor_len) + L(system_product_len) + L(system_version_len) + + L(system_serial_len) + L(system_sku_len) + L(system_family_len) + 1, 2); *required_len += sizeof(struct smbios_board); - *required_len += max(board_vendor_len + board_product_len + board_version_len + board_serial_len + 5, 2); + *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + L(board_serial_len) + 1, 2); *required_len += sizeof(struct smbios_chassis); - *required_len += max(chassis_vendor_len + chassis_version_len + chassis_serial_len + - chassis_asset_tag_len + 5, 2); + *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + + L(chassis_asset_tag_len) + 1, 2); +#undef L sfti->TableBufferLength = *required_len; -- 2.26.2

1 0

[PATCH] dmusic: Remove an unused function
by Michael Stefaniuc 13 May '20

13 May '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/collection.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 1fddab5c5a..13d5ce868d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -49,11 +49,6 @@ static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDire return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface); } -static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface) -{ - return CONTAINING_RECORD(iface, struct dmobject, IDirectMusicObject_iface); -} - static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, dmobj.IPersistStream_iface); -- 2.26.2

1 0

[PATCH] dmscript: Remove unused function.
by Jacek Caban 13 May '20

13 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dmscript/script.c | 6 ------ 1 file changed, 6 deletions(-)

2 1

[PATCH] setupapi: Correct SetupDiGetActualSectionToInstall[Ex]A/W .spec file entries.
by Gijs Vermeulen 13 May '20

13 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- section_ext is an out pointer. dlls/setupapi/setupapi.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 26b4a6f7fb..ceb4904b18 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -315,10 +315,10 @@ @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) @ stdcall SetupDiEnumDriverInfoA(ptr ptr long long ptr) @ stdcall SetupDiEnumDriverInfoW(ptr ptr long long ptr) -@ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallExA(long str ptr str long ptr ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr wstr long ptr ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallA(long str ptr long ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExA(long str ptr ptr long ptr ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr ptr long ptr ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallW(long wstr ptr long ptr ptr) @ stdcall SetupDiGetClassBitmapIndex(ptr ptr) @ stdcall SetupDiGetClassDescriptionA(ptr str long ptr) @ stdcall SetupDiGetClassDescriptionExA(ptr str long ptr str ptr) -- 2.26.2

1 0

[PATCH 1/2] wined3d: Correct required extension for R8G8B8A8_UINT.
by Chip Davis 13 May '20

13 May '20

GL_ARB_texture_rgb10_a2ui provides support for the GL_RGB10_A2UI format, and nothing else. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3379b7386cfe..c6ae308eb105 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1566,7 +1566,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA8UI, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, - ARB_TEXTURE_RGB10_A2UI, NULL}, + EXT_TEXTURE_INTEGER, NULL}, {WINED3DFMT_R8G8B8A8_SINT, GL_RGBA8I, GL_RGBA8I, 0, GL_RGBA_INTEGER, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, -- 2.24.0

4 6

[PATCH] include/dwrite.idl: fix typo
by Biswapriyo Nath 13 May '20

13 May '20

1 0

[PATCH] include/dwrite_1.idl: fix typo
by Biswapriyo Nath 13 May '20

13 May '20

1 0

[PATCH] include: edit dwrite.idl file
by Biswapriyo Nath 13 May '20

13 May '20

2 1

[PATCH] notepad: Use int for point size value.
by Jacek Caban 13 May '20

13 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/notepad/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

1 0

[PATCH] winemac: Add default case in isMouseMoveEventType.
by Gijs Vermeulen 13 May '20

13 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This fixes a Clang warning. dlls/winemac.drv/cocoa_app.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 87a73b6da9..8e66721da1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1229,9 +1229,9 @@ - (BOOL) isMouseMoveEventType:(CGEventType)type case kCGEventRightMouseDragged: case kCGEventOtherMouseDragged: return TRUE; + default: + return FALSE; } - - return FALSE; } - (int) warpsFinishedByEventTime:(CGEventTimestamp)eventTime location:(CGPoint)eventLocation -- 2.26.2

2 1

[PATCH] dbghelp: Use debuggee environment in search_unix_path.
by Jacek Caban 13 May '20

13 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 6 +++--- dlls/dbghelp/path.c | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 1/4] qcap/tests: Rewrite aggregation and interface tests for video capture filter.
by Jactry Zeng 13 May '20

13 May '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/qcap.c | 145 --------------------------------- dlls/qcap/tests/videocapture.c | 132 ++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 145 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 56eaf77513..d1b2cb810f 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1643,150 +1643,6 @@ static void test_AviMux(char *arg) ok(ref == 0, "IStream was not destroyed (%d)\n", ref); } -/* Outer IUnknown for COM aggregation tests */ -struct unk_impl { - IUnknown IUnknown_iface; - LONG ref; - IUnknown *inner_unk; -}; - -static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); -} - -static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ret_iface) -{ - struct unk_impl *This = impl_from_IUnknown(iface); - - return IUnknown_QueryInterface(This->inner_unk, riid, ret_iface); -} - -static ULONG WINAPI unk_AddRef(IUnknown *iface) -{ - struct unk_impl *This = impl_from_IUnknown(iface); - - return InterlockedIncrement(&This->ref); -} - -static ULONG WINAPI unk_Release(IUnknown *iface) -{ - struct unk_impl *This = impl_from_IUnknown(iface); - - return InterlockedDecrement(&This->ref); -} - -static const IUnknownVtbl unk_vtbl = -{ - unk_QueryInterface, - unk_AddRef, - unk_Release -}; - -static void test_COM_vfwcapture(void) -{ - struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; - IBaseFilter *bf; - IMediaFilter *mf; - IPersist *p; - IPersistPropertyBag *ppb; - IAMVfwCaptureDialogs *amvcd; - IAMFilterMiscFlags *amfmf; - ISpecifyPropertyPages *spp; - IUnknown *unk; - ULONG refcount; - HRESULT hr; - - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_VfwCapture, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&unk_obj.inner_unk); - if ((hr == REGDB_E_CLASSNOTREG) || (hr == CLASS_E_CLASSNOTAVAILABLE)) - { - win_skip("CLSID_VfwCapture not supported (0x%x)\n", hr); - return; - } - ok(hr == S_OK, "VfwCapture create failed: %08x\n", hr); - hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_IBaseFilter, (void**)&bf); - ok(hr == S_OK, "QueryInterface for IID_IBaseFilter failed: %08x\n", hr); - refcount = IBaseFilter_AddRef(bf); - ok(refcount == unk_obj.ref, "VfwCapture just pretends to support COM aggregation\n"); - refcount = IBaseFilter_Release(bf); - ok(refcount == unk_obj.ref, "VfwCapture just pretends to support COM aggregation\n"); - refcount = IBaseFilter_Release(bf); - ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); - IUnknown_Release(unk_obj.inner_unk); - - /* Invalid RIID */ - hr = CoCreateInstance(&CLSID_VfwCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, - (void**)&bf); - ok(hr == E_NOINTERFACE, "VfwCapture create failed: %08x, expected E_NOINTERFACE\n", hr); - - /* Same refcount for all VfwCapture interfaces */ - hr = CoCreateInstance(&CLSID_VfwCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, - (void**)&bf); - ok(hr == S_OK, "VfwCapture create failed: %08x, expected S_OK\n", hr); - refcount = IBaseFilter_AddRef(bf); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); - - hr = IBaseFilter_QueryInterface(bf, &IID_IMediaFilter, (void**)&mf); - ok(hr == S_OK, "QueryInterface for IID_IMediaFilter failed: %08x\n", hr); - refcount = IMediaFilter_AddRef(mf); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IMediaFilter_Release(mf); - - hr = IBaseFilter_QueryInterface(bf, &IID_IPersist, (void**)&p); - ok(hr == S_OK, "QueryInterface for IID_IPersist failed: %08x\n", hr); - refcount = IPersist_AddRef(p); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); - refcount = IPersist_Release(p); - - hr = IBaseFilter_QueryInterface(bf, &IID_IPersistPropertyBag, (void**)&ppb); - ok(hr == S_OK, "QueryInterface for IID_IPersistPropertyBag failed: %08x\n", hr); - refcount = IPersistPropertyBag_AddRef(ppb); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); - refcount = IPersistPropertyBag_Release(ppb); - - hr = IBaseFilter_QueryInterface(bf, &IID_IAMVfwCaptureDialogs, (void**)&amvcd); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IAMVfwCaptureDialogs failed: %08x\n", hr); - if (hr == S_OK) { - refcount = IAMVfwCaptureDialogs_AddRef(amvcd); - ok(refcount == 7, "refcount == %u, expected 7\n", refcount); - refcount = IAMVfwCaptureDialogs_Release(amvcd); - } - - hr = IBaseFilter_QueryInterface(bf, &IID_IAMFilterMiscFlags, (void**)&amfmf); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IAMFilterMiscFlags failed: %08x\n", hr); - if (hr == S_OK) { - refcount = IAMFilterMiscFlags_AddRef(amfmf); - ok(refcount == 8, "refcount == %u, expected 8\n", refcount); - refcount = IAMFilterMiscFlags_Release(amfmf); - } - - hr = IBaseFilter_QueryInterface(bf, &IID_ISpecifyPropertyPages, (void**)&spp); - todo_wine ok(hr == S_OK, "QueryInterface for IID_ISpecifyPropertyPages failed: %08x\n", hr); - if (hr == S_OK) { - refcount = ISpecifyPropertyPages_AddRef(spp); - ok(refcount == 9, "refcount == %u, expected 9\n", refcount); - refcount = ISpecifyPropertyPages_Release(spp); - } - - hr = IBaseFilter_QueryInterface(bf, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); - refcount = IUnknown_AddRef(unk); - todo_wine ok(refcount == 10, "refcount == %u, expected 10\n", refcount); - refcount = IUnknown_Release(unk); - - /* Unsupported interfaces */ - hr = IBaseFilter_QueryInterface(bf, &IID_IAMStreamConfig, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMStreamConfig failed: %08x\n", hr); - hr = IBaseFilter_QueryInterface(bf, &IID_IAMVideoProcAmp, (void**)&unk); - todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMVideoProcAmp failed: %08x\n", hr); - hr = IBaseFilter_QueryInterface(bf, &IID_IOverlayNotify, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IOverlayNotify failed: %08x\n", hr); - - while (IBaseFilter_Release(bf)); -} - START_TEST(qcap) { if (SUCCEEDED(CoInitialize(NULL))) @@ -1797,7 +1653,6 @@ START_TEST(qcap) arg_c = winetest_get_mainargs(&arg_v); test_AviMux(arg_c>2 ? arg_v[2] : NULL); - test_COM_vfwcapture(); CoUninitialize(); } diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index cd613b00e7..a6ce6c565f 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -38,6 +38,13 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_media_types(IPin *pin) { IEnumMediaTypes *enum_media_types; @@ -235,6 +242,127 @@ static void test_capture(IBaseFilter *filter) check_interface(filter, &IID_IOverlayNotify, FALSE); } +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ret_iface) +{ + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IBaseFilter) + || IsEqualGUID(riid, &test_iid)) + { + *ret_iface = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "Unexpected call %s.\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_VfwCapture, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_VfwCapture, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_VfwCapture, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + todo_wine check_interface(filter, &IID_IAMVfwCaptureDialogs, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IPersistPropertyBag, TRUE); + todo_wine check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMStreamConfig, FALSE); + todo_wine check_interface(filter, &IID_IAMVideoProcAmp, FALSE); + check_interface(filter, &IID_IOverlayNotify, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} + START_TEST(videocapture) { ICreateDevEnum *dev_enum; @@ -283,5 +411,9 @@ START_TEST(videocapture) ICreateDevEnum_Release(dev_enum); IEnumMoniker_Release(class_enum); + + test_aggregation(); + test_interfaces(); + CoUninitialize(); } -- 2.26.2

2 1

[PATCH 1/3] qcap/tests: Get rid of the VFW capture filter tests.
by Zebediah Figura 13 May '20

13 May '20

Most video cameras are exposed through WDM on modern Windows, and not supported by the VFW capture filter. No known applications depend on the VFW capture filter, and any such applications would fail to work with modern video cameras. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This supersedes patch 185155. dlls/qcap/tests/qcap.c | 145 ----------------------------------------- 1 file changed, 145 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 56eaf77513..d1b2cb810f 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1643,150 +1643,6 @@ static void test_AviMux(char *arg) ok(ref == 0, "IStream was not destroyed (%d)\n", ref); } -/* Outer IUnknown for COM aggregation tests */ -struct unk_impl { - IUnknown IUnknown_iface; - LONG ref; - IUnknown *inner_unk; -}; - -static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); -} - -static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ret_iface) -{ - struct unk_impl *This = impl_from_IUnknown(iface); - - return IUnknown_QueryInterface(This->inner_unk, riid, ret_iface); -} - -static ULONG WINAPI unk_AddRef(IUnknown *iface) -{ - struct unk_impl *This = impl_from_IUnknown(iface); - - return InterlockedIncrement(&This->ref); -} - -static ULONG WINAPI unk_Release(IUnknown *iface) -{ - struct unk_impl *This = impl_from_IUnknown(iface); - - return InterlockedDecrement(&This->ref); -} - -static const IUnknownVtbl unk_vtbl = -{ - unk_QueryInterface, - unk_AddRef, - unk_Release -}; - -static void test_COM_vfwcapture(void) -{ - struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; - IBaseFilter *bf; - IMediaFilter *mf; - IPersist *p; - IPersistPropertyBag *ppb; - IAMVfwCaptureDialogs *amvcd; - IAMFilterMiscFlags *amfmf; - ISpecifyPropertyPages *spp; - IUnknown *unk; - ULONG refcount; - HRESULT hr; - - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_VfwCapture, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&unk_obj.inner_unk); - if ((hr == REGDB_E_CLASSNOTREG) || (hr == CLASS_E_CLASSNOTAVAILABLE)) - { - win_skip("CLSID_VfwCapture not supported (0x%x)\n", hr); - return; - } - ok(hr == S_OK, "VfwCapture create failed: %08x\n", hr); - hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_IBaseFilter, (void**)&bf); - ok(hr == S_OK, "QueryInterface for IID_IBaseFilter failed: %08x\n", hr); - refcount = IBaseFilter_AddRef(bf); - ok(refcount == unk_obj.ref, "VfwCapture just pretends to support COM aggregation\n"); - refcount = IBaseFilter_Release(bf); - ok(refcount == unk_obj.ref, "VfwCapture just pretends to support COM aggregation\n"); - refcount = IBaseFilter_Release(bf); - ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); - IUnknown_Release(unk_obj.inner_unk); - - /* Invalid RIID */ - hr = CoCreateInstance(&CLSID_VfwCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, - (void**)&bf); - ok(hr == E_NOINTERFACE, "VfwCapture create failed: %08x, expected E_NOINTERFACE\n", hr); - - /* Same refcount for all VfwCapture interfaces */ - hr = CoCreateInstance(&CLSID_VfwCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, - (void**)&bf); - ok(hr == S_OK, "VfwCapture create failed: %08x, expected S_OK\n", hr); - refcount = IBaseFilter_AddRef(bf); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); - - hr = IBaseFilter_QueryInterface(bf, &IID_IMediaFilter, (void**)&mf); - ok(hr == S_OK, "QueryInterface for IID_IMediaFilter failed: %08x\n", hr); - refcount = IMediaFilter_AddRef(mf); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IMediaFilter_Release(mf); - - hr = IBaseFilter_QueryInterface(bf, &IID_IPersist, (void**)&p); - ok(hr == S_OK, "QueryInterface for IID_IPersist failed: %08x\n", hr); - refcount = IPersist_AddRef(p); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); - refcount = IPersist_Release(p); - - hr = IBaseFilter_QueryInterface(bf, &IID_IPersistPropertyBag, (void**)&ppb); - ok(hr == S_OK, "QueryInterface for IID_IPersistPropertyBag failed: %08x\n", hr); - refcount = IPersistPropertyBag_AddRef(ppb); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); - refcount = IPersistPropertyBag_Release(ppb); - - hr = IBaseFilter_QueryInterface(bf, &IID_IAMVfwCaptureDialogs, (void**)&amvcd); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IAMVfwCaptureDialogs failed: %08x\n", hr); - if (hr == S_OK) { - refcount = IAMVfwCaptureDialogs_AddRef(amvcd); - ok(refcount == 7, "refcount == %u, expected 7\n", refcount); - refcount = IAMVfwCaptureDialogs_Release(amvcd); - } - - hr = IBaseFilter_QueryInterface(bf, &IID_IAMFilterMiscFlags, (void**)&amfmf); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IAMFilterMiscFlags failed: %08x\n", hr); - if (hr == S_OK) { - refcount = IAMFilterMiscFlags_AddRef(amfmf); - ok(refcount == 8, "refcount == %u, expected 8\n", refcount); - refcount = IAMFilterMiscFlags_Release(amfmf); - } - - hr = IBaseFilter_QueryInterface(bf, &IID_ISpecifyPropertyPages, (void**)&spp); - todo_wine ok(hr == S_OK, "QueryInterface for IID_ISpecifyPropertyPages failed: %08x\n", hr); - if (hr == S_OK) { - refcount = ISpecifyPropertyPages_AddRef(spp); - ok(refcount == 9, "refcount == %u, expected 9\n", refcount); - refcount = ISpecifyPropertyPages_Release(spp); - } - - hr = IBaseFilter_QueryInterface(bf, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); - refcount = IUnknown_AddRef(unk); - todo_wine ok(refcount == 10, "refcount == %u, expected 10\n", refcount); - refcount = IUnknown_Release(unk); - - /* Unsupported interfaces */ - hr = IBaseFilter_QueryInterface(bf, &IID_IAMStreamConfig, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMStreamConfig failed: %08x\n", hr); - hr = IBaseFilter_QueryInterface(bf, &IID_IAMVideoProcAmp, (void**)&unk); - todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMVideoProcAmp failed: %08x\n", hr); - hr = IBaseFilter_QueryInterface(bf, &IID_IOverlayNotify, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IOverlayNotify failed: %08x\n", hr); - - while (IBaseFilter_Release(bf)); -} - START_TEST(qcap) { if (SUCCEEDED(CoInitialize(NULL))) @@ -1797,7 +1653,6 @@ START_TEST(qcap) arg_c = winetest_get_mainargs(&arg_v); test_AviMux(arg_c>2 ? arg_v[2] : NULL); - test_COM_vfwcapture(); CoUninitialize(); } -- 2.26.2

1 2

[PATCH v5] wined3d: Allow setting user memory for mipmapped texture in wined3d_texture_update_desc().
by Paul Gofman 13 May '20

13 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v5: - use wined3d_texture_get_pitch() for current texture pitch calculation; - also compare slice_pitch. dlls/ddraw/tests/ddraw7.c | 96 ++++++++++++++++++++++++++++++--- dlls/wined3d/texture.c | 109 ++++++++++++++++++++++---------------- 2 files changed, 153 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ebf2fd7ba7..b678dbbaeb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7126,6 +7126,64 @@ static void test_set_surface_desc(void) IDirectDrawSurface7_Release(surface); + /* Test mipmap texture. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U2(ddsd).dwMipMapCount = 3; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + if (FAILED(hr)) + { + skip("Mipmaps are not supported.\n"); + } + else + { + /* Changing surface desc for mipmap fails even without changing any + * parameters. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDSURFACETYPE, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + } + + /* Test surface created with DDSD_LPSURFACE. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + /* Cannot reset lpSurface. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + /* Can change the parameters of surface created with DDSD_LPSURFACE. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface); + /* SetSurfaceDesc needs systemmemory surfaces. * * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing @@ -13347,14 +13405,14 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); width = surface_desc.dwWidth; height = surface_desc.dwHeight; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, width, height, NULL, NULL, NULL, NULL); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); bpp = 0; if (SUCCEEDED(IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0))) @@ -13367,7 +13425,7 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", @@ -13379,9 +13437,9 @@ static void test_display_mode_surface_pixel_format(void) U5(surface_desc).dwBackBufferCount = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", @@ -13397,15 +13455,39 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwHeight = height; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, bpp); IDirectDrawSurface7_Release(surface); + /* Test compatibility mode mipmap texture creation. */ + hr = IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0); + ok(hr == DD_OK || hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + win_skip("SetDisplayMode failed, skipping test."); + goto done; + } + bpp = 16; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT | DDSD_PITCH; + U2(surface_desc).dwMipMapCount = 2; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + U1(surface_desc).lPitch = surface_desc.dwWidth * bpp / 8; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_VIDEOMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW, "Got unexpected hr %#x.\n", hr); + if (surface) + IDirectDrawSurface7_Release(surface); + +done: refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d5e3dcf0d1..72b79332e7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1767,9 +1767,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; - const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; + const struct wined3d *d3d; + BOOL set_user_memory_only; + unsigned int slice_pitch; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1784,10 +1786,27 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + set_user_memory_only = width == texture->resource.width && height == texture->resource.height + && format_id == texture->resource.format->id && multisample_type == texture->resource.multisample_type + && multisample_quality == texture->resource.multisample_quality; + + if (pitch) + slice_pitch = height * pitch; + else + wined3d_format_calculate_pitch(format, 1, width, height, &pitch, &slice_pitch); + + if (set_user_memory_only) + { + if (!texture->row_pitch) + wined3d_texture_get_pitch(texture, 0, &texture->row_pitch, &texture->slice_pitch); + + set_user_memory_only = pitch == texture->row_pitch && slice_pitch == texture->slice_pitch; + } + if (!resource_size) return WINED3DERR_INVALIDCALL; - if (texture->level_count * texture->layer_count > 1) + if (texture->level_count * texture->layer_count > 1 && !set_user_memory_only) { WARN("Texture has multiple sub-resources, not supported.\n"); return WINED3DERR_INVALIDCALL; @@ -1822,7 +1841,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_cs_emit_unload_resource(device->cs, &texture->resource); wined3d_resource_wait_idle(&texture->resource); - sub_resource = &texture->sub_resources[0]; if (texture->dc_info && texture->dc_info[0].dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; @@ -1834,55 +1852,56 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_free_sysmem(&texture->resource); - if ((texture->row_pitch = pitch)) - texture->slice_pitch = height * pitch; - else - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(format, 1, width, height, - &texture->row_pitch, &texture->slice_pitch); - - texture->resource.format = format; - texture->resource.multisample_type = multisample_type; - texture->resource.multisample_quality = multisample_quality; - texture->resource.width = width; - texture->resource.height = height; - if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) - adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); - texture->resource.size = texture->slice_pitch; - sub_resource->size = texture->slice_pitch; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - - if (texture->texture_ops == &texture_gl_ops) - { - if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + if (!set_user_memory_only) + { + sub_resource = &texture->sub_resources[0]; + + texture->row_pitch = pitch; + texture->slice_pitch = slice_pitch; + + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); + texture->resource.size = texture->slice_pitch; + sub_resource->size = texture->slice_pitch; + sub_resource->locations = WINED3D_LOCATION_DISCARDED; + + if (texture->texture_ops == &texture_gl_ops) { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; - texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } + else + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } + } + + if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot + && !d3d_info->texture_npot_conditional) + { + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = width; + texture->pow2_height = height; } } - if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot - && !d3d_info->texture_npot_conditional) - { - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = texture->pow2_height = 1; - while (texture->pow2_width < width) - texture->pow2_width <<= 1; - while (texture->pow2_height < height) - texture->pow2_height <<= 1; - } - else - { - texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = width; - texture->pow2_height = height; - } - if ((texture->user_memory = mem)) { texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; -- 2.26.2

1 0

[PATCH 4/4] qcap/tests: Correct CLSID in aggregation tests of smart tee filter.
by Jactry Zeng 13 May '20

13 May '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/smartteefilter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 134b8ed964..2f8fa6c4b5 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -185,12 +185,12 @@ static void test_aggregation(void) ULONG ref; filter = (IBaseFilter *)0xdeadbeef; - hr = CoCreateInstance(&CLSID_AviDest, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_SmartTee, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!filter, "Got interface %p.\n", filter); - hr = CoCreateInstance(&CLSID_AviDest, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_SmartTee, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); -- 2.26.2

2 1

[PATCH] mf: Attach markers to previously queued sample, not the next.
by Derek Lesho 13 May '20

13 May '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 59 +++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 7d9fa78732a..da6fee4506c 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -708,61 +708,44 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_GetParameters(IMFAsyn return E_NOTIMPL; } -static struct scheduled_item *stream_get_next_item(struct sample_grabber *grabber) -{ - struct scheduled_item *item = NULL; - struct list *e; - - if ((e = list_head(&grabber->items))) - item = LIST_ENTRY(e, struct scheduled_item, entry); - - return item; -} - static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct sample_grabber *grabber = impl_from_IMFAsyncCallback(iface); - struct scheduled_item *item; - BOOL sample_delivered; + struct scheduled_item *item, *cursor2; + BOOL sample_reported = FALSE, sample_delivered; HRESULT hr; EnterCriticalSection(&grabber->cs); /* Report and schedule next. */ - if (!grabber->is_shut_down && (item = stream_get_next_item(grabber))) + if (!grabber->is_shut_down) { - while (item) + LIST_FOR_EACH_ENTRY_SAFE(item, cursor2, &grabber->items, struct scheduled_item, entry) { - switch (item->type) + if (item->type == ITEM_TYPE_MARKER) + { + sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK); + stream_release_pending_item(item); + } + if (item->type == ITEM_TYPE_SAMPLE) { - case ITEM_TYPE_SAMPLE: + if (!sample_reported) + { if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) WARN("Failed to report a sample, hr %#x.\n", hr); stream_release_pending_item(item); - - /* Schedule next sample, skipping markers. */ - LIST_FOR_EACH_ENTRY(item, &grabber->items, struct scheduled_item, entry) - { - if (item->type == ITEM_TYPE_SAMPLE) - { - if (FAILED(hr = stream_schedule_sample(grabber, item))) - WARN("Failed to schedule a sample, hr %#x.\n", hr); - break; - } - } - - if (sample_delivered) - sample_grabber_stream_request_sample(grabber); - - item = NULL; - break; - case ITEM_TYPE_MARKER: - sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK); - stream_release_pending_item(item); - item = stream_get_next_item(grabber); + sample_reported = TRUE; + } + else + { + if (FAILED(hr = stream_schedule_sample(grabber, item))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); break; + } } } + if (sample_delivered) + sample_grabber_stream_request_sample(grabber); } LeaveCriticalSection(&grabber->cs); -- 2.26.2

1 0

[PATCH rebase 0/3] IPv6 address parser
by Alex Henrie 13 May '20

13 May '20

These patches have been in Wine Staging for 3 months and no problems have been reported. At minimum, the implementation of RtlIpv6StringToAddress in ntdll is needed to enable further work to reimplement inet_pton and WSAStringToAddress in ws2_32 without depending on the host system's inet_pton function. That would make those Wine functions behave consistently like their corresponding Windows functions regardless of the particular Unix platform that Wine is running on, and furthermore would remove an obstacle to converting ws2_32 to a PE library. Alex Henrie (3): ntdll: Implement RtlIpv6StringToAddress(Ex)[AW] include: Add RtlIpv6StringToAddress(Ex)[AW] iphlpapi: Implement ParseNetworkString for IPv6 addresses and services dlls/iphlpapi/iphlpapi_main.c | 38 ++++- dlls/ntdll/ntdll.spec | 6 +- dlls/ntdll/rtl.c | 220 ++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +- include/ip2string.h | 7 + 5 files changed, 259 insertions(+), 18 deletions(-) -- 2.26.2

1 3

[PATCH v4] wined3d: Allow setting user memory for mipmapped texture in wined3d_texture_update_desc().
by Paul Gofman 13 May '20

13 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - calculate pitches if necessary before comparision; - Add _SetSurfaceDesc tests for mipmap and DDSD_LPSURFACE. v4: - fix test failure on testbot Win8-10. dlls/ddraw/tests/ddraw7.c | 96 ++++++++++++++++++++++++++++++--- dlls/wined3d/texture.c | 108 ++++++++++++++++++++++---------------- 2 files changed, 152 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ddd3cdb0e..6ffdd8ba5a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7126,6 +7126,64 @@ static void test_set_surface_desc(void) IDirectDrawSurface7_Release(surface); + /* Test mipmap texture. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U2(ddsd).dwMipMapCount = 3; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + if (FAILED(hr)) + { + skip("Mipmaps are not supported.\n"); + } + else + { + /* Changing surface desc for mipmap fails even without changing any + * parameters. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDSURFACETYPE, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + } + + /* Test surface created with DDSD_LPSURFACE. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + /* Cannot reset lpSurface. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + /* Can change the parameters of surface created with DDSD_LPSURFACE. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface); + /* SetSurfaceDesc needs systemmemory surfaces. * * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing @@ -13347,14 +13405,14 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); width = surface_desc.dwWidth; height = surface_desc.dwHeight; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, width, height, NULL, NULL, NULL, NULL); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); bpp = 0; if (SUCCEEDED(IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0))) @@ -13367,7 +13425,7 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", @@ -13379,9 +13437,9 @@ static void test_display_mode_surface_pixel_format(void) U5(surface_desc).dwBackBufferCount = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", @@ -13397,15 +13455,39 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwHeight = height; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, bpp); IDirectDrawSurface7_Release(surface); + /* Test compatibility mode mipmap texture creation. */ + hr = IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0); + ok(hr == DD_OK || hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + win_skip("SetDisplayMode failed, skipping test."); + goto done; + } + bpp = 16; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT | DDSD_PITCH; + U2(surface_desc).dwMipMapCount = 2; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + U1(surface_desc).lPitch = surface_desc.dwWidth * bpp / 8; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_VIDEOMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW, "Got unexpected hr %#x.\n", hr); + if (surface) + IDirectDrawSurface7_Release(surface); + +done: refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 49373eb58a..89ec1998f4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1748,9 +1748,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; - const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; + const struct wined3d *d3d; + BOOL set_user_memory_only; + unsigned int slice_pitch; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1765,10 +1767,26 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + set_user_memory_only = width == texture->resource.width && height == texture->resource.height + && format_id == texture->resource.format->id && multisample_type == texture->resource.multisample_type + && multisample_quality == texture->resource.multisample_quality; + + if (!pitch) + wined3d_format_calculate_pitch(format, 1, width, height, &pitch, &slice_pitch); + + if (set_user_memory_only) + { + if (!texture->row_pitch) + wined3d_format_calculate_pitch(texture->resource.format, 1, texture->resource.width, + texture->resource.height, &texture->row_pitch, &texture->slice_pitch); + + set_user_memory_only = pitch == texture->row_pitch; + } + if (!resource_size) return WINED3DERR_INVALIDCALL; - if (texture->level_count * texture->layer_count > 1) + if (texture->level_count * texture->layer_count > 1 && !set_user_memory_only) { WARN("Texture has multiple sub-resources, not supported.\n"); return WINED3DERR_INVALIDCALL; @@ -1803,7 +1821,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_cs_emit_unload_resource(device->cs, &texture->resource); wined3d_resource_wait_idle(&texture->resource); - sub_resource = &texture->sub_resources[0]; if (texture->dc_info && texture->dc_info[0].dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; @@ -1815,55 +1832,56 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_free_sysmem(&texture->resource); - if ((texture->row_pitch = pitch)) - texture->slice_pitch = height * pitch; - else - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(format, 1, width, height, - &texture->row_pitch, &texture->slice_pitch); - - texture->resource.format = format; - texture->resource.multisample_type = multisample_type; - texture->resource.multisample_quality = multisample_quality; - texture->resource.width = width; - texture->resource.height = height; - if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) - adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); - texture->resource.size = texture->slice_pitch; - sub_resource->size = texture->slice_pitch; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - - if (texture->texture_ops == &texture_gl_ops) - { - if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + if (!set_user_memory_only) + { + sub_resource = &texture->sub_resources[0]; + + texture->row_pitch = pitch; + texture->slice_pitch = slice_pitch; + + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); + texture->resource.size = texture->slice_pitch; + sub_resource->size = texture->slice_pitch; + sub_resource->locations = WINED3D_LOCATION_DISCARDED; + + if (texture->texture_ops == &texture_gl_ops) { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; - texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } + else + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } + } + + if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot + && !d3d_info->texture_npot_conditional) + { + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = width; + texture->pow2_height = height; } } - if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot - && !d3d_info->texture_npot_conditional) - { - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = texture->pow2_height = 1; - while (texture->pow2_width < width) - texture->pow2_width <<= 1; - while (texture->pow2_height < height) - texture->pow2_height <<= 1; - } - else - { - texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = width; - texture->pow2_height = height; - } - if ((texture->user_memory = mem)) { texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; -- 2.26.2

2 1

[PATCH 5/5] wined3d: Get output from swapchain state.
by Zhiyi Zhang 13 May '20

13 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 5 +--- dlls/wined3d/swapchain.c | 62 ++++++--------------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 12 insertions(+), 59 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5351c69cdd0..e16eb86a701 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2924,7 +2924,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI struct wined3d_swapchain_desc wined3d_desc; VkWin32SurfaceCreateInfoKHR surface_desc; VkPhysicalDevice vk_physical_device; - struct dxgi_adapter *dxgi_adapter; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkSurfaceKHR vk_surface; @@ -2973,7 +2972,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI device_parent = vkd3d_get_device_parent(device); if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) return hr; - dxgi_adapter = unsafe_impl_from_IDXGIAdapter(adapter); if (FAILED(hr = dxgi_get_output_from_window((IDXGIFactory *)factory, window, &output))) { @@ -2998,8 +2996,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IDXGIOutput_Release(output); if (FAILED(hr)) return hr; - if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, - dxgi_adapter->factory->wined3d, &swapchain->state))) + if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, &swapchain->state))) return hr; if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3e303789f6e..dbbfc8e72cd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -259,49 +259,11 @@ struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wi return swapchain->back_buffers[back_buffer_idx]; } -static struct wined3d_output * get_output_from_window(const struct wined3d *wined3d, HWND hwnd) -{ - unsigned int adapter_idx, output_idx; - struct wined3d_adapter *adapter; - MONITORINFOEXW monitor_info; - HMONITOR monitor; - - TRACE("wined3d %p, hwnd %p.\n", wined3d, hwnd); - - monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); - monitor_info.cbSize = sizeof(monitor_info); - if (!GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info)) - { - ERR("Failed to get monitor information.\n"); - return NULL; - } - - for (adapter_idx = 0; adapter_idx < wined3d->adapter_count; ++adapter_idx) - { - adapter = wined3d->adapters[adapter_idx]; - for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) - { - if (!lstrcmpiW(adapter->outputs[output_idx].device_name, monitor_info.szDevice)) - return &adapter->outputs[output_idx]; - } - } - - /* Because wined3d only supports one output right now. A window can be on non-primary outputs - * and thus fails to get its correct output. In this case, return the primary output for now */ - return &wined3d->adapters[0]->outputs[0]; -} - struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapchain *swapchain) { - HWND hwnd; - TRACE("swapchain %p.\n", swapchain); - hwnd = swapchain->state.device_window; - if (!hwnd) - hwnd = swapchain->win_handle; - - return get_output_from_window(swapchain->device->wined3d, hwnd); + return swapchain->state.desc.output; } HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, @@ -825,20 +787,13 @@ static enum wined3d_format_id adapter_format_from_backbuffer_format(const struct } static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d) + const struct wined3d_swapchain_desc *desc, HWND window) { - struct wined3d_output *output; HRESULT hr; state->desc = *desc; - if (!(output = get_output_from_window(wined3d, window))) - { - WARN("Failed to get output from window %p.\n", window); - return E_FAIL; - } - - if (FAILED(hr = wined3d_output_get_display_mode(output, &state->original_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(desc->output, &state->original_mode, NULL))) { ERR("Failed to get current display mode, hr %#x.\n", hr); return hr; @@ -850,7 +805,7 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat { state->d3d_mode.width = desc->backbuffer_width; state->d3d_mode.height = desc->backbuffer_height; - state->d3d_mode.format_id = adapter_format_from_backbuffer_format(output->adapter, + state->d3d_mode.format_id = adapter_format_from_backbuffer_format(desc->output->adapter, desc->backbuffer_format); state->d3d_mode.refresh_rate = desc->refresh_rate; state->d3d_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; @@ -894,7 +849,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); window = desc->device_window ? desc->device_window : device->create_parms.focus_window; - if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); goto err; @@ -1739,6 +1694,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st wined3d_swapchain_state_restore_from_fullscreen(state, state->device_window, window_rect); } + state->desc.output = output; state->desc.windowed = swapchain_desc->windowed; return WINED3D_OK; @@ -1750,17 +1706,17 @@ void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state } HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state) + HWND window, struct wined3d_swapchain_state **state) { struct wined3d_swapchain_state *s; HRESULT hr; - TRACE("desc %p, window %p, wined3d %p, state %p.\n", desc, window, wined3d, state); + TRACE("desc %p, window %p, state %p.\n", desc, window, state); if (!(s = heap_alloc_zero(sizeof(*s)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d))) + if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window))) { heap_free(s); return hr; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 22a9a9dd740..a240aba555a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -281,7 +281,7 @@ @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) -@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) +@ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cfec8f10c8c..381a823cfbf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2769,7 +2769,7 @@ void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state); + HWND window, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, struct wined3d_output *output, const struct wined3d_display_mode *mode); -- 2.25.1

2 1

[PATCH 4/5] wined3d: Determine output from window position in wined3d_hook_proc().
by Zhiyi Zhang 13 May '20

13 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 39 +++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index e681ac1b61b..a1fe4ac28db 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -459,6 +459,39 @@ static void wined3d_wndproc_mutex_unlock(void) LeaveCriticalSection(&wined3d_wndproc_cs); } +static struct wined3d_output * wined3d_get_output_from_window(const struct wined3d *wined3d, + HWND hwnd) +{ + unsigned int adapter_idx, output_idx; + struct wined3d_adapter *adapter; + MONITORINFOEXW monitor_info; + HMONITOR monitor; + + TRACE("wined3d %p, hwnd %p.\n", wined3d, hwnd); + + monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + monitor_info.cbSize = sizeof(monitor_info); + if (!GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info)) + { + ERR("GetMonitorInfoW failed, error %#x.\n", GetLastError()); + return NULL; + } + + for (adapter_idx = 0; adapter_idx < wined3d->adapter_count; ++adapter_idx) + { + adapter = wined3d->adapters[adapter_idx]; + for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) + { + if (!lstrcmpiW(adapter->outputs[output_idx].device_name, monitor_info.szDevice)) + return &adapter->outputs[output_idx]; + } + } + + /* Because wined3d only supports one output right now. A window can be on non-primary outputs + * and thus fails to get its correct output. In this case, return the primary output for now */ + return &wined3d->adapters[0]->outputs[0]; +} + static struct wined3d_wndproc *wined3d_find_wndproc(HWND window, struct wined3d *wined3d) { unsigned int i; @@ -565,11 +598,13 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam wined3d_swapchain_get_desc(swapchain, &swapchain_desc); swapchain_desc.windowed = !swapchain_desc.windowed; - if (!(output = wined3d_swapchain_get_output(swapchain))) + if (!(output = wined3d_get_output_from_window(swapchain->device->wined3d, + swapchain->state.device_window))) { - ERR("Failed to get output from swapchain %p.\n", swapchain); + ERR("Failed to get output from window %p.\n", swapchain->state.device_window); break; } + swapchain_desc.output = output; wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, output, NULL); -- 2.25.1

2 1

[PATCH 3/5] wined3d: Specify a wined3d output for swapchain creation.
by Zhiyi Zhang 13 May '20

13 May '20

As tests showed, DirectDraw, Direct3D 8 and 9 always use the adapter specified in the device creation parameters regardless of the device window position when creating a swapchain. Whereas DXGI uses the device window position to determine which DXGI output to use. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/device.c | 21 +++++++++++++------ dlls/d3d9/device.c | 21 ++++++++++++------- dlls/ddraw/ddraw.c | 1 + dlls/dxgi/device.c | 45 ++++++++++++++++++++++++++++++++++++++-- dlls/dxgi/dxgi_private.h | 4 +++- dlls/dxgi/swapchain.c | 33 +++++++++++++++++++++++++---- dlls/dxgi/utils.c | 8 +++++-- dlls/wined3d/device.c | 1 + dlls/wined3d/swapchain.c | 14 +++---------- include/wine/wined3d.h | 1 + 10 files changed, 116 insertions(+), 33 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d3a88acc35d..f4bdb748275 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -262,8 +262,8 @@ static enum wined3d_multisample_type wined3d_multisample_type_from_d3d(D3DMULTIS return (enum wined3d_multisample_type)type; } -static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, - const D3DPRESENT_PARAMETERS *present_parameters) +static BOOL wined3d_swapchain_desc_from_d3d8(struct wined3d_swapchain_desc *swapchain_desc, + struct wined3d_output *output, const D3DPRESENT_PARAMETERS *present_parameters) { if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY_VSYNC) { @@ -293,6 +293,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return FALSE; } + swapchain_desc->output = output; swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); @@ -846,6 +847,7 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; unsigned int swap_interval; + unsigned int output_idx; unsigned int i, count; HRESULT hr; @@ -876,7 +878,9 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if } wined3d_mutex_unlock(); - if (!wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters)) + output_idx = device->adapter_ordinal; + if (!wined3d_swapchain_desc_from_d3d8(&desc, device->d3d_parent->wined3d_outputs[output_idx], + present_parameters)) return D3DERR_INVALIDCALL; swap_interval = wined3dswapinterval_from_d3d(present_parameters->FullScreen_PresentationInterval); if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, swap_interval, &object))) @@ -941,6 +945,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc swapchain_desc; struct d3d8_swapchain *implicit_swapchain; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); @@ -950,7 +955,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, WARN("App not active, returning D3DERR_DEVICELOST.\n"); return D3DERR_DEVICELOST; } - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters)) + output_idx = device->adapter_ordinal; + if (!wined3d_swapchain_desc_from_d3d8(&swapchain_desc, + device->d3d_parent->wined3d_outputs[output_idx], present_parameters)) return D3DERR_INVALIDCALL; swapchain_desc.flags |= WINED3D_SWAPCHAIN_IMPLICIT; @@ -3718,6 +3725,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; struct wined3d_adapter *wined3d_adapter; + struct wined3d_output *wined3d_output; struct d3d8_swapchain *d3d_swapchain; struct wined3d_caps caps; unsigned int output_idx; @@ -3750,7 +3758,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + wined3d_output = parent->wined3d_outputs[output_idx]; + wined3d_adapter = wined3d_output_get_adapter(wined3d_output); if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, wined3d_device_type_from_d3d(device_type), focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) @@ -3792,7 +3801,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, parameters)) + if (!wined3d_swapchain_desc_from_d3d8(&swapchain_desc, wined3d_output, parameters)) { wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 61aee971a1d..2ee582b4c54 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -300,8 +300,9 @@ static enum wined3d_swap_interval wined3dswapinterval_from_d3d(DWORD interval) } } -static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, - const D3DPRESENT_PARAMETERS *present_parameters, BOOL extended) +static BOOL wined3d_swapchain_desc_from_d3d9(struct wined3d_swapchain_desc *swapchain_desc, + struct wined3d_output *output, const D3DPRESENT_PARAMETERS *present_parameters, + BOOL extended) { D3DSWAPEFFECT highest_swapeffect = extended ? D3DSWAPEFFECT_FLIPEX : D3DSWAPEFFECT_COPY; UINT highest_bb_count = extended ? 30 : 3; @@ -332,6 +333,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return FALSE; } + swapchain_desc->output = output; swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); @@ -887,6 +889,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID struct wined3d_swapchain_desc desc; struct d3d9_swapchain *object; unsigned int swap_interval; + unsigned int output_idx; unsigned int i, count; HRESULT hr; @@ -917,8 +920,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID } wined3d_mutex_unlock(); - if (!wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters, - device->d3d_parent->extended)) + output_idx = device->adapter_ordinal; + if (!wined3d_swapchain_desc_from_d3d9(&desc, device->d3d_parent->wined3d_outputs[output_idx], + present_parameters, device->d3d_parent->extended)) return D3DERR_INVALIDCALL; swap_interval = wined3dswapinterval_from_d3d(present_parameters->PresentationInterval); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, swap_interval, &object))) @@ -1042,6 +1046,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, struct wined3d_display_mode wined3d_mode; struct wined3d_rendertarget_view *rtv; struct d3d9_swapchain *d3d9_swapchain; + unsigned int output_idx; unsigned int i; HRESULT hr; @@ -1060,7 +1065,9 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mode.scanline_ordering = wined3d_scanline_ordering_from_d3d(mode->ScanLineOrdering); } - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, extended)) + output_idx = device->adapter_ordinal; + if (!wined3d_swapchain_desc_from_d3d9(&swapchain_desc, + device->d3d_parent->wined3d_outputs[output_idx], present_parameters, extended)) return D3DERR_INVALIDCALL; swapchain_desc.flags |= WINED3D_SWAPCHAIN_IMPLICIT; @@ -4763,8 +4770,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine for (i = 0; i < count; ++i) { - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc[i], &parameters[i], - parent->extended)) + if (!wined3d_swapchain_desc_from_d3d9(&swapchain_desc[i], + parent->wined3d_outputs[output_idx + i], &parameters[i], parent->extended)) { wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 866b7089080..6f640ef422a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -563,6 +563,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, } memset(&swapchain_desc, 0, sizeof(swapchain_desc)); + swapchain_desc.output = ddraw->wined3d_output; swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5edd431199a..5f0c40f2e47 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -427,13 +427,37 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX { struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); struct wined3d_swapchain_desc wined3d_desc; + struct IDXGIOutput *containing_output; struct d3d11_swapchain *object; + struct IDXGIAdapter *adapter; HRESULT hr; TRACE("iface %p, factory %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", iface, factory, window, desc, fullscreen_desc, output, swapchain); - if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, window, desc, fullscreen_desc))) + if (FAILED(hr = dxgi_get_output_from_window(factory, window, &containing_output))) + { + WARN("Failed to get output from window %p, hr %#x.\n", window, hr); + + /* FIXME: As wined3d only supports one output currently, even if a window is on a + * non-primary output, the swapchain will use the primary output. Keep this behaviour + * until all outputs are correctly enumerated. Otherwise it will create a regression + * for applications that specify a device window on a non-primary output */ + if (FAILED(hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter))) + return hr; + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &containing_output); + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) + return hr; + + FIXME("Using the primary output for the device window that is on a non-primary output.\n"); + } + + hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, containing_output, window, desc, + fullscreen_desc); + IDXGIOutput_Release(containing_output); + if (FAILED(hr)) return hr; if (!(object = heap_alloc_zero(sizeof(*object)))) @@ -474,7 +498,10 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l struct d3d11_swapchain *swapchain; struct dxgi_adapter *dxgi_adapter; struct dxgi_factory *dxgi_factory; + struct dxgi_output *dxgi_output; + struct IDXGIOutput *output; void *layer_base; + HWND window; HRESULT hr; if (!(dxgi_factory = unsafe_impl_from_IDXGIFactory(factory))) @@ -530,11 +557,25 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return hr; } + window = dxgi_factory_get_device_window(dxgi_factory); + if (FAILED(hr = dxgi_get_output_from_window(factory, window, &output))) + { + ERR("Failed to get output from window %p.\n", window); + wined3d_device_decref(device->wined3d_device); + IUnknown_Release(device->child_layer); + wined3d_private_store_cleanup(&device->private_store); + wined3d_mutex_unlock(); + return hr; + } + dxgi_output = unsafe_impl_from_IDXGIOutput(output); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); + swapchain_desc.device_window = window; swapchain_desc.windowed = TRUE; swapchain_desc.flags = WINED3D_SWAPCHAIN_IMPLICIT; + swapchain_desc.output = dxgi_output->wined3d_output; + IDXGIOutput_Release(output); if (!(swapchain = heap_alloc_zero(sizeof(*swapchain)))) { diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 117fe5e692c..a125a7667d9 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -96,8 +96,10 @@ void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; +HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) + DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, - HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, + IDXGIOutput *dxgi_containing_output, HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 81ba50942ad..5351c69cdd0 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -111,8 +111,7 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } -static HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, - IDXGIOutput **dxgi_output) +HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) { unsigned int adapter_idx, output_idx; DXGI_OUTPUT_DESC desc; @@ -415,6 +414,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain_state *state; + struct dxgi_output *dxgi_output; HRESULT hr; TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); @@ -434,10 +434,12 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen WARN("Failed to get target output for swapchain, hr %#x.\n", hr); return hr; } + dxgi_output = unsafe_impl_from_IDXGIOutput(target); wined3d_mutex_lock(); state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; hr = dxgi_swapchain_set_fullscreen_state(state, &swapchain_desc, target); wined3d_mutex_unlock(); @@ -2261,7 +2263,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen return hr; } - if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, window, swapchain_desc, fullscreen_desc))) + if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, target, window, swapchain_desc, + fullscreen_desc))) goto fail; wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; @@ -2928,6 +2931,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IUnknown *device_parent; VkInstance vk_instance; IDXGIAdapter *adapter; + IDXGIOutput *output; VkBool32 supported; VkDevice vk_device; VkFence vk_fence; @@ -2970,8 +2974,29 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) return hr; dxgi_adapter = unsafe_impl_from_IDXGIAdapter(adapter); + + if (FAILED(hr = dxgi_get_output_from_window((IDXGIFactory *)factory, window, &output))) + { + WARN("Failed to get output from window %p, hr %#x.\n", window, hr); + + /* FIXME: As wined3d only supports one output currently, even if a window is on a + * non-primary output, the swapchain will use the primary output. Keep this behaviour + * until all outputs are correctly enumerated. Otherwise it will create a regression + * for applications that specify a device window on a non-primary output */ + if (FAILED(hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output))) + { + IDXGIAdapter_Release(adapter); + return hr; + } + + FIXME("Using the primary output for the device window that is on a non-primary output.\n"); + } IDXGIAdapter_Release(adapter); - if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, window, swapchain_desc, fullscreen_desc))) + + hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, output, window, swapchain_desc, + fullscreen_desc); + IDXGIOutput_Release(output); + if (FAILED(hr)) return hr; if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, dxgi_adapter->factory->wined3d, &swapchain->state))) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index a32c7ee1294..ca87e3c1942 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -561,9 +561,12 @@ static unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) return wined3d_flags; } -HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, HWND window, - const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) +HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, + IDXGIOutput *dxgi_containing_output, HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) { + struct dxgi_output *dxgi_output = unsafe_impl_from_IDXGIOutput(dxgi_containing_output); + if (dxgi_desc->Scaling != DXGI_SCALING_STRETCH) FIXME("Ignoring scaling %#x.\n", dxgi_desc->Scaling); if (dxgi_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) @@ -592,6 +595,7 @@ HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_ return DXGI_ERROR_INVALID_CALL; } + wined3d_desc->output = dxgi_output->wined3d_output; wined3d_desc->backbuffer_width = dxgi_desc->Width; wined3d_desc->backbuffer_height = dxgi_desc->Height; wined3d_desc->backbuffer_format = wined3dformat_from_dxgi_format(dxgi_desc->Format); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1711014c8d2..cc13ab4863e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4910,6 +4910,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } TRACE("New params:\n"); + TRACE("output %p\n", swapchain_desc->output); TRACE("backbuffer_width %u\n", swapchain_desc->backbuffer_width); TRACE("backbuffer_height %u\n", swapchain_desc->backbuffer_height); TRACE("backbuffer_format %s\n", debug_d3dformat(swapchain_desc->backbuffer_format)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 466bcd95cae..3e303789f6e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -873,7 +873,6 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc { struct wined3d_resource_desc texture_desc; struct wined3d_output_desc output_desc; - struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; HRESULT hr = E_FAIL; @@ -934,13 +933,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc } else { - if (!(output = wined3d_swapchain_get_output(swapchain))) - { - ERR("Failed to get output from swapchain %p.\n", swapchain); - goto err; - } - - if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + if (FAILED(hr = wined3d_output_get_desc(desc->output, &output_desc))) { ERR("Failed to get output description, hr %#x.\n", hr); goto err; @@ -996,8 +989,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (!desc->windowed && desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { /* Change the display settings */ - output = wined3d_swapchain_get_output(swapchain); - if (!output || FAILED(hr = wined3d_output_set_display_mode(output, + if (FAILED(hr = wined3d_output_set_display_mode(desc->output, &swapchain->state.d3d_mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); @@ -1081,7 +1073,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc err: if (displaymode_set) { - if (!output || FAILED(wined3d_output_set_display_mode(output, + if (FAILED(wined3d_output_set_display_mode(desc->output, &swapchain->state.original_mode))) ERR("Failed to restore display mode.\n"); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d3eb8100cd8..cfec8f10c8c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1756,6 +1756,7 @@ struct wined3d_adapter_identifier struct wined3d_swapchain_desc { + struct wined3d_output *output; unsigned int backbuffer_width; unsigned int backbuffer_height; enum wined3d_format_id backbuffer_format; -- 2.25.1

2 1

[PATCH 2/5] d3d8: Store a struct d3d8 in struct d3d8_device.
by Zhiyi Zhang 13 May '20

13 May '20

So that d3d_parent->wined3d_outputs can be directly accessed in device. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 04bca7ddfa0..e98746a13bd 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -115,7 +115,7 @@ struct d3d8_device LONG ref; struct wined3d_device *wined3d_device; unsigned int adapter_ordinal; - IDirect3D8 *d3d_parent; + struct d3d8 *d3d_parent; struct d3d8_handle_table handle_table; /* FVF management */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e123502dab6..d3a88acc35d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -609,7 +609,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) if (!ref) { - IDirect3D8 *parent = device->d3d_parent; + IDirect3D8 *parent = &device->d3d_parent->IDirect3D8_iface; unsigned i; TRACE("Releasing wined3d device %p.\n", device->wined3d_device); @@ -705,7 +705,8 @@ static HRESULT WINAPI d3d8_device_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D if (!d3d8) return D3DERR_INVALIDCALL; - return IDirect3D8_QueryInterface(device->d3d_parent, &IID_IDirect3D8, (void **)d3d8); + return IDirect3D8_QueryInterface(&device->d3d_parent->IDirect3D8_iface, &IID_IDirect3D8, + (void **)d3d8); } static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS8 *caps) @@ -791,8 +792,8 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, return hr; } - if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(device->d3d_parent, device->adapter_ordinal, - &mode))) + if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(&device->d3d_parent->IDirect3D8_iface, + device->adapter_ordinal, &mode))) { WARN("Failed to get device display mode, hr %#x.\n", hr); return hr; @@ -3835,8 +3836,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->implicit_swapchain = wined3d_swapchain; - device->d3d_parent = &parent->IDirect3D8_iface; - IDirect3D8_AddRef(device->d3d_parent); + device->d3d_parent = parent; + IDirect3D8_AddRef(&parent->IDirect3D8_iface); return D3D_OK; -- 2.25.1

2 1

[PATCH 1/5] dxgi/tests: Test IDXGISwapChain_GetContainingOutput() after Alt+Enter.
by Zhiyi Zhang 13 May '20

13 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 89 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index dd00be1e8cf..e8dfa036e08 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2095,9 +2095,9 @@ static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *outp static void test_get_containing_output(void) { unsigned int adapter_idx, output_idx, output_count; + DXGI_OUTPUT_DESC output_desc, output_desc2; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGIOutput *output, *output2; - DXGI_OUTPUT_DESC output_desc; MONITORINFOEXW monitor_info; IDXGISwapChain *swapchain; IDXGIFactory *factory; @@ -2369,6 +2369,93 @@ static void test_get_containing_output(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + /* Test GetContainingOutput after a full screen swapchain is made windowed by pressing + * Alt+Enter, then move it to another output and use Alt+Enter to enter full screen */ + output = NULL; + output2 = NULL; + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) + { + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, + output ? &output2 : &output)); ++output_idx) + { + if (output2) + break; + } + + IDXGIAdapter_Release(adapter); + if (output2) + break; + } + + if (output && output2) + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + IDXGIOutput_Release(output); + if (FAILED(hr)) + { + skip("SetFullscreenState failed, hr %#x.\n", hr); + IDXGIOutput_Release(output2); + goto done; + } + + /* Post an Alt + VK_RETURN WM_SYSKEYDOWN to leave full screen on the first output */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(!fullscreen, "Expect swapchain not full screen.\n"); + + /* Move the swapchain output window to the second output */ + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc2.DesktopCoordinates.left, + output_desc2.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed.\n"); + + /* Post an Alt + VK_RETURN WM_SYSKEYDOWN to enter full screen on the second output */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + output = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(fullscreen, "Expect swapchain full screen.\n"); + ok(!!output, "Expect output not NULL.\n"); + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), + wine_dbgstr_w(output_desc.DeviceName)); + IDXGIOutput_Release(output); + + output = NULL; + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(hr == S_OK, "GetContainingOutput failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), + wine_dbgstr_w(output_desc.DeviceName)); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + } + else + { + skip("This test requires two outputs.\n"); + } + + if (output) + IDXGIOutput_Release(output); + if (output2) + IDXGIOutput_Release(output2); + done: refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); -- 2.25.1

3 2

[PATCH 9/9] dxgi: Add stubs for IDXGIFactory7.
by Henri Verbeet 13 May '20

13 May '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185154. Unmodified resend. dlls/dxgi/factory.c | 20 ++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index c6acbaaf671..6acce516de9 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -36,6 +36,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIFactory7) || IsEqualGUID(iid, &IID_IDXGIFactory6) || IsEqualGUID(iid, &IID_IDXGIFactory5) || IsEqualGUID(iid, &IID_IDXGIFactory4) @@ -483,6 +484,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByGpuPreference(IWineDX return hr; } +static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterAdaptersChangedEvent(IWineDXGIFactory *iface, + HANDLE event, DWORD *cookie) +{ + FIXME("iface %p, event %p, cookie %p stub!\n", iface, event, cookie); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_UnregisterAdaptersChangedEvent(IWineDXGIFactory *iface, + DWORD cookie) +{ + FIXME("iface %p, cookie %#x stub!\n", iface, cookie); + + return E_NOTIMPL; +} + static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = { dxgi_factory_QueryInterface, @@ -521,6 +538,9 @@ static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = dxgi_factory_CheckFeatureSupport, /* IDXGIFactory6 methods */ dxgi_factory_EnumAdapterByGpuPreference, + /* IDXGIFactory7 methods */ + dxgi_factory_RegisterAdaptersChangedEvent, + dxgi_factory_UnregisterAdaptersChangedEvent, }; struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 95c99b25355..83012047ea7 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -89,6 +89,6 @@ interface IWineDXGIAdapter : IDXGIAdapter4 local, uuid(ea02a0d1-4c95-488a-a82c-6034621e8c4f) ] -interface IWineDXGIFactory : IDXGIFactory6 +interface IWineDXGIFactory : IDXGIFactory7 { } -- 2.20.1

1 0

[PATCH 8/9] include: Add IDXGIFactory7.
by Henri Verbeet 13 May '20

13 May '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185153. Unmodified resend. include/dxgi1_6.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl index fba72d57604..e24dd4b367a 100644 --- a/include/dxgi1_6.idl +++ b/include/dxgi1_6.idl @@ -119,3 +119,20 @@ interface IDXGIFactory6 : IDXGIFactory5 [out] void **adapter ); } + +[ + object, + uuid(a4966eed-76db-44da-84c1-ee9a7afb20a8), + local, + pointer_default(unique) +] +interface IDXGIFactory7 : IDXGIFactory6 +{ + HRESULT RegisterAdaptersChangedEvent( + [in] HANDLE event, + [out] DWORD *cookie + ); + HRESULT UnregisterAdaptersChangedEvent( + [in] DWORD cookie + ); +} -- 2.20.1

1 0

[PATCH 7/9] dxgi: Implement IDXGIFactory6.
by Henri Verbeet 13 May '20

13 May '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Required by the d3d12 game "Delores: A Thimbleweed Park Mini-Adventure". Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185152. Add the TRACE requested by Zhiyi. dlls/dxgi/factory.c | 23 +++++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 39c9e10f7a4..c6acbaaf671 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -36,6 +36,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIFactory6) || IsEqualGUID(iid, &IID_IDXGIFactory5) || IsEqualGUID(iid, &IID_IDXGIFactory4) || IsEqualGUID(iid, &IID_IDXGIFactory3) @@ -462,6 +463,26 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CheckFeatureSupport(IWineDXGIFacto } } +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByGpuPreference(IWineDXGIFactory *iface, + UINT adapter_idx, DXGI_GPU_PREFERENCE gpu_preference, REFIID iid, void **adapter) +{ + IDXGIAdapter1 *adapter_object; + HRESULT hr; + + TRACE("iface %p, adapter_idx %u, gpu_preference %#x, iid %s, adapter %p.\n", + iface, adapter_idx, gpu_preference, debugstr_guid(iid), adapter); + + if (gpu_preference != DXGI_GPU_PREFERENCE_UNSPECIFIED) + FIXME("Ignoring GPU preference %#x.\n", gpu_preference); + + if (FAILED(hr = dxgi_factory_EnumAdapters1(iface, adapter_idx, &adapter_object))) + return hr; + + hr = IDXGIAdapter1_QueryInterface(adapter_object, iid, adapter); + IDXGIAdapter1_Release(adapter_object); + return hr; +} + static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = { dxgi_factory_QueryInterface, @@ -498,6 +519,8 @@ static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = dxgi_factory_EnumWarpAdapter, /* IDXIGFactory5 methods */ dxgi_factory_CheckFeatureSupport, + /* IDXGIFactory6 methods */ + dxgi_factory_EnumAdapterByGpuPreference, }; struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 070ac2fddaa..95c99b25355 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -89,6 +89,6 @@ interface IWineDXGIAdapter : IDXGIAdapter4 local, uuid(ea02a0d1-4c95-488a-a82c-6034621e8c4f) ] -interface IWineDXGIFactory : IDXGIFactory5 +interface IWineDXGIFactory : IDXGIFactory6 { } -- 2.20.1

1 0

[PATCH 6/9] include: Add IDXGIFactory6.
by Henri Verbeet 13 May '20

13 May '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185151. Fix the "adapter" parameter name, as pointed out by Zhiyi. include/dxgi1_6.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl index 9dcf9f26b46..fba72d57604 100644 --- a/include/dxgi1_6.idl +++ b/include/dxgi1_6.idl @@ -34,6 +34,13 @@ typedef enum DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_CURSOR_STRETCHED = 0x4, } DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS; +typedef enum DXGI_GPU_PREFERENCE +{ + DXGI_GPU_PREFERENCE_UNSPECIFIED = 0x0, + DXGI_GPU_PREFERENCE_MINIMUM_POWER = 0x1, + DXGI_GPU_PREFERENCE_HIGH_PERFORMANCE = 0x2, +} DXGI_GPU_PREFERENCE; + typedef struct DXGI_ADAPTER_DESC3 { WCHAR Description[128]; @@ -96,3 +103,19 @@ interface IDXGIOutput6 : IDXGIOutput5 [out] UINT *flags ); } + +[ + object, + uuid(c1b6694f-ff09-44a9-b03c-77900a0a1d17), + local, + pointer_default(unique) +] +interface IDXGIFactory6 : IDXGIFactory5 +{ + HRESULT EnumAdapterByGpuPreference( + [in] UINT adapter_idx, + [in] DXGI_GPU_PREFERENCE gpu_preference, + [in] REFIID iid, + [out] void **adapter + ); +} -- 2.20.1

1 0

[PATCH 5/9] wined3d: Implement Vulkan image unordered access view descriptors.
by Henri Verbeet 13 May '20

13 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index e31527f8be6..e37cbc787fc 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1419,8 +1419,14 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con } else { - FIXME("Image UAVs not implemented.\n"); - return false; + struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (view_vk->u.vk_image_info.imageView) + image_info = &view_vk->u.vk_image_info; + else + image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); + buffer_view = NULL; + type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; } if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, @@ -1602,6 +1608,11 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * wined3d_buffer_load(buffer_from_resource(uav->resource), &context_vk->c, state); wined3d_unordered_access_view_invalidate_location(uav, ~WINED3D_LOCATION_BUFFER); } + else + { + wined3d_texture_load(texture_from_resource(uav->resource), &context_vk->c, FALSE); + wined3d_unordered_access_view_invalidate_location(uav, ~WINED3D_LOCATION_TEXTURE_RGB); + } wined3d_context_vk_reference_unordered_access_view(context_vk, uav_vk); break; -- 2.20.1

1 0

[PATCH 4/9] wined3d: Implement Vulkan buffer unordered access view descriptors.
by Henri Verbeet 13 May '20

13 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/context_vk.c | 49 +++++++++++++++++++++++++++++++++- dlls/wined3d/view.c | 28 +++++++++++++++++-- dlls/wined3d/wined3d_private.h | 14 ++++++++++ 4 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8758627cb19..4dbbb0b80ef 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1438,6 +1438,7 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac vk_buffer_view = &view_vk->u.vk_buffer_view; else vk_image_view = &view_vk->u.vk_image_info.imageView; + list_remove(&view_vk->bo_user.entry); wined3d_unordered_access_view_cleanup(&uav_vk->v); wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &uav_vk->counter_bo, &uav_vk->vk_counter_view, &view_vk->command_buffer_id, uav_vk); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ba1f6bb9261..e31527f8be6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1329,6 +1329,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; + struct wined3d_unordered_access_view *uav; const VkDescriptorBufferInfo *buffer_info; struct wined3d_shader_resource_view *srv; const VkDescriptorImageInfo *image_info; @@ -1401,6 +1402,32 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV: + if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx])) + { + FIXME("NULL unordered access views not implemented.\n"); + return false; + } + resource = uav->resource; + + view_vk = &wined3d_unordered_access_view_vk(uav)->view_vk; + if (resource->type == WINED3D_RTYPE_BUFFER) + { + image_info = NULL; + buffer_view = &view_vk->u.vk_buffer_view; + type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + } + else + { + FIXME("Image UAVs not implemented.\n"); + return false; + } + + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, type, NULL, image_info, buffer_view)) + return false; + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) sampler = context_vk->c.device->null_sampler; @@ -1512,7 +1539,9 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; const struct wined3d_shader_resource_binding *binding; + struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_shader_resource_view_vk *srv_vk; + struct wined3d_unordered_access_view *uav; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; struct wined3d_sampler *sampler; @@ -1558,6 +1587,24 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * wined3d_context_vk_reference_shader_resource_view(context_vk, srv_vk); break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV: + if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx])) + break; + + uav_vk = wined3d_unordered_access_view_vk(uav); + if (uav->resource->type == WINED3D_RTYPE_BUFFER) + { + if (!uav_vk->view_vk.bo_user.valid) + { + wined3d_unordered_access_view_vk_update(uav_vk, context_vk); + context_invalidate_compute_state(&context_vk->c, STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING); + } + wined3d_buffer_load(buffer_from_resource(uav->resource), &context_vk->c, state); + wined3d_unordered_access_view_invalidate_location(uav, ~WINED3D_LOCATION_BUFFER); + } + wined3d_context_vk_reference_unordered_access_view(context_vk, uav_vk); + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; @@ -1568,7 +1615,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * break; default: - FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); + ERR("Invalid descriptor type %#x.\n", binding->shader_descriptor_type); break; } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4a75c696578..10fcd695135 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1478,6 +1478,25 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi return hr; } +void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *uav_vk, + struct wined3d_context_vk *context_vk) +{ + const struct wined3d_format_vk *view_format_vk = wined3d_format_vk(uav_vk->v.format); + const struct wined3d_view_desc *desc = &uav_vk->v.desc; + struct wined3d_resource *resource = uav_vk->v.resource; + struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + struct wined3d_buffer_vk *buffer_vk; + VkBufferView vk_buffer_view; + + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) + { + view_vk->u.vk_buffer_view = vk_buffer_view; + view_vk->bo_user.valid = true; + } +} + static void wined3d_unordered_access_view_vk_cs_init(void *object) { struct wined3d_unordered_access_view_vk *uav_vk = object; @@ -1488,6 +1507,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) struct wined3d_texture_vk *texture_vk; struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; + struct wined3d_buffer_vk *buffer_vk; VkBufferViewCreateInfo create_info; struct wined3d_resource *resource; VkBufferView vk_buffer_view; @@ -1501,15 +1521,18 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); vk_info = context_vk->vk_info; - if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, - desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk))) + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, format_vk))) { TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + uav_vk->view_vk.bo_user.valid = true; + list_add_head(&buffer_vk->bo.users, &view_vk->bo_user.entry); } if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) @@ -1597,6 +1620,7 @@ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_vi if (FAILED(hr = wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops))) return hr; + list_init(&view_vk->view_vk.bo_user.entry); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_vk_cs_init, view_vk); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93852e0de79..d9e8ffa816f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4784,6 +4784,8 @@ static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; struct wined3d_swapchain_state { @@ -5692,6 +5694,18 @@ static inline void wined3d_context_vk_reference_shader_resource_view(const struc srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk, + struct wined3d_unordered_access_view_vk *uav_vk) +{ + struct wined3d_resource *resource = uav_vk->v.resource; + + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; +} + static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { -- 2.20.1

1 0

[PATCH 3/9] wined3d: Implement Vulkan sampler descriptors.
by Henri Verbeet 13 May '20

13 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4e4e0642505..ba1f6bb9261 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1335,6 +1335,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con struct wined3d_resource *resource; VkDescriptorSet vk_descriptor_set; struct wined3d_view_vk *view_vk; + struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; VkBufferView *buffer_view; VkDescriptorType type; @@ -1400,6 +1401,14 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, + VK_DESCRIPTOR_TYPE_SAMPLER, NULL, &wined3d_sampler_vk(sampler)->vk_image_info, NULL)) + return false; + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); return false; @@ -1506,6 +1515,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; + struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; size_t i; @@ -1551,6 +1561,12 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + wined3d_context_vk_reference_sampler(context_vk, wined3d_sampler_vk(sampler)); + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35b0815d959..93852e0de79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5662,6 +5662,12 @@ static inline void wined3d_context_vk_reference_texture(const struct wined3d_con texture_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_sampler(const struct wined3d_context_vk *context_vk, + struct wined3d_sampler_vk *sampler_vk) +{ + sampler_vk->command_buffer_id = context_vk->current_command_buffer.id; +} + static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk, struct wined3d_rendertarget_view_vk *rtv_vk) { -- 2.20.1

1 0

[PATCH 2/9] wined3d: Implement Vulkan buffer shader resource view descriptors.
by Henri Verbeet 13 May '20

13 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/context_vk.c | 26 +++++++++++++++++++++----- dlls/wined3d/view.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +++ 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f3404c5e657..8758627cb19 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1383,6 +1383,7 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour vk_buffer_view = &view_vk->u.vk_buffer_view; else vk_image_view = &view_vk->u.vk_image_info.imageView; + list_remove(&view_vk->bo_user.entry); wined3d_shader_resource_view_cleanup(&srv_vk->v); wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, NULL, NULL, &view_vk->command_buffer_id, srv_vk); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4098ee6cc44..4e4e0642505 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1336,6 +1336,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkDescriptorSet vk_descriptor_set; struct wined3d_view_vk *view_vk; struct wined3d_buffer *buffer; + VkBufferView *buffer_view; VkDescriptorType type; VkResult vr; size_t i; @@ -1378,8 +1379,9 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con view_vk = &wined3d_shader_resource_view_vk(srv)->view_vk; if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer SRV descriptors not implemented.\n"); - return false; + image_info = NULL; + buffer_view = &view_vk->u.vk_buffer_view; + type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; } else { @@ -1389,11 +1391,12 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con image_info = &view_vk->u.vk_image_info; else image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); + buffer_view = NULL; type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; } if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, - binding->binding_idx, type, NULL, image_info, NULL)) + binding->binding_idx, type, NULL, image_info, buffer_view)) return false; break; @@ -1500,6 +1503,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; const struct wined3d_shader_resource_binding *binding; + struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; @@ -1527,9 +1531,21 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) break; - if (srv->resource->type != WINED3D_RTYPE_BUFFER) + srv_vk = wined3d_shader_resource_view_vk(srv); + if (srv->resource->type == WINED3D_RTYPE_BUFFER) + { + if (!srv_vk->view_vk.bo_user.valid) + { + wined3d_shader_resource_view_vk_update(srv_vk, context_vk); + context_invalidate_compute_state(&context_vk->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + } + wined3d_buffer_load(buffer_from_resource(srv->resource), &context_vk->c, state); + } + else + { wined3d_texture_load(texture_from_resource(srv->resource), &context_vk->c, FALSE); - wined3d_context_vk_reference_shader_resource_view(context_vk, wined3d_shader_resource_view_vk(srv)); + } + wined3d_context_vk_reference_shader_resource_view(context_vk, srv_vk); break; case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e7f77f58cd5..4a75c696578 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1011,12 +1011,32 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view return hr; } +void wined3d_shader_resource_view_vk_update(struct wined3d_shader_resource_view_vk *srv_vk, + struct wined3d_context_vk *context_vk) +{ + const struct wined3d_format_vk *view_format_vk = wined3d_format_vk(srv_vk->v.format); + const struct wined3d_view_desc *desc = &srv_vk->v.desc; + struct wined3d_resource *resource = srv_vk->v.resource; + struct wined3d_view_vk *view_vk = &srv_vk->view_vk; + struct wined3d_buffer_vk *buffer_vk; + VkBufferView vk_buffer_view; + + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) + { + view_vk->u.vk_buffer_view = vk_buffer_view; + view_vk->bo_user.valid = true; + } +} + static void wined3d_shader_resource_view_vk_cs_init(void *object) { struct wined3d_shader_resource_view_vk *srv_vk = object; struct wined3d_view_desc *desc = &srv_vk->v.desc; struct wined3d_texture_vk *texture_vk; const struct wined3d_format *format; + struct wined3d_buffer_vk *buffer_vk; struct wined3d_resource *resource; struct wined3d_context *context; VkBufferView vk_buffer_view; @@ -1028,9 +1048,11 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + context = context_acquire(resource->device, NULL, 0); vk_buffer_view = wined3d_view_vk_create_buffer_view(wined3d_context_vk(context), - desc, wined3d_buffer_vk(buffer_from_resource(resource)), wined3d_format_vk(format)); + desc, buffer_vk, wined3d_format_vk(format)); context_release(context); if (!vk_buffer_view) @@ -1039,6 +1061,8 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); srv_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + srv_vk->view_vk.bo_user.valid = true; + list_add_head(&buffer_vk->bo.users, &srv_vk->view_vk.bo_user.entry); return; } @@ -1087,6 +1111,7 @@ HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view if (FAILED(hr = wined3d_shader_resource_view_init(&view_vk->v, desc, resource, parent, parent_ops))) return hr; + list_init(&view_vk->view_vk.bo_user.entry); wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_vk_cs_init, view_vk); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b7fd1205f5..35b0815d959 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4698,6 +4698,7 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view struct wined3d_view_vk { + struct wined3d_bo_user_vk bo_user; union { VkBufferView vk_buffer_view; @@ -4721,6 +4722,8 @@ static inline struct wined3d_shader_resource_view_vk *wined3d_shader_resource_vi HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_shader_resource_view_vk_update(struct wined3d_shader_resource_view_vk *view_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view { -- 2.20.1

1 0

[PATCH 1/9] wined3d: Implement Vulkan image shader resource view descriptors.
by Henri Verbeet 13 May '20

13 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 45 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 +++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4c12cff7d11..4098ee6cc44 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1330,8 +1330,13 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; const VkDescriptorBufferInfo *buffer_info; + struct wined3d_shader_resource_view *srv; + const VkDescriptorImageInfo *image_info; + struct wined3d_resource *resource; VkDescriptorSet vk_descriptor_set; + struct wined3d_view_vk *view_vk; struct wined3d_buffer *buffer; + VkDescriptorType type; VkResult vr; size_t i; @@ -1362,6 +1367,36 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: + if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) + { + FIXME("NULL shader resource views not implemented.\n"); + return false; + } + resource = srv->resource; + + view_vk = &wined3d_shader_resource_view_vk(srv)->view_vk; + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer SRV descriptors not implemented.\n"); + return false; + } + else + { + struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (view_vk->u.vk_image_info.imageView) + image_info = &view_vk->u.vk_image_info; + else + image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); + type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; + } + + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, type, NULL, image_info, NULL)) + return false; + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); return false; @@ -1465,6 +1500,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; const struct wined3d_shader_resource_binding *binding; + struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; size_t i; @@ -1487,6 +1523,15 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: + if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) + break; + + if (srv->resource->type != WINED3D_RTYPE_BUFFER) + wined3d_texture_load(texture_from_resource(srv->resource), &context_vk->c, FALSE); + wined3d_context_vk_reference_shader_resource_view(context_vk, wined3d_shader_resource_view_vk(srv)); + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 321d58b0bf9..8b7fd1205f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5671,6 +5671,18 @@ static inline void wined3d_context_vk_reference_rendertarget_view(const struct w rtv_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk, + struct wined3d_shader_resource_view_vk *srv_vk) +{ + struct wined3d_resource *resource = srv_vk->v.resource; + + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; +} + static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { -- 2.20.1

1 0

mshtml: mark tests that need wine-gecko as todo on arches without it
by Austin English 13 May '20

13 May '20

Resend: (to correct To:/with sign-off) (Sorry for spam, haven't sent from this box in a while) -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

2 1

[PATCH 2/2] kernel32: Use RtlAnsiStringToUnicodeString() in OpenMutexA.
by Akihiro Sagawa 13 May '20

13 May '20

This commit makes consistent with the commit 2db497e89e8e4a37a8bd569b8691b9b87ae63606, which introduces RtlAnsiStringToUnicodeString() into CreateMutexA(). In multi-byte locale, suppose there is an odd ANSI string which ends with leading-byte. MultiByteToWideChar() translates the last leading-byte to the default character in Unicode nowadays (Vista+). However, RtlAnsiStringToUnicodeString() remains old behavior which drops the last leading-byte character when converting it to Unicode. This difference confuses a certain application which uses binary string, i.e. ill-formed multi-byte string, as a mutex name in Japanese locale. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/sync.c | 9 ++++++--- dlls/kernel32/tests/sync.c | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-)

1 0

[PATCH 1/2] kernel32/tests: Add mutex name identity tests with partial multi-byte string.
by Akihiro Sagawa 13 May '20

13 May '20

Although the mutex name is ill-formed multi-byte string, we should be able to open the mutex with the same name after creation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/sync.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)

1 0

[PATCH 4/4] makedep: Support split debug for cross compiled modules.
by Jacek Caban 13 May '20

13 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch adds debug symbol makefile targets and takes care of things like .gitignore or clean target. Debug files are generated in linking step, so they will be generated as part of that. They are, however, not part of all target (as that would cause all modules to be linked twice). It should be good enough for use by developers. One thing I'm not sure about (and would require debug files to be a part of larger target) is if we should be installing debug files. And if yes, then would it be make install, install-dev or some new install-debug. I'd welcome opinions on that. tools/makedep.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-)

1 0

[PATCH 3/4] makedep: Use explicit output file name in linker rules for cross compiled files.
by Jacek Caban 13 May '20

13 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)

1 0

[PATCH 1/4] winegcc: Introduce --debug-file option for generating separated symbol files.
by Jacek Caban 13 May '20

13 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It exposes a new command line option that is similar to how PDBs are handled, but also allows a convenient way to generate split DWARF symbols with GNU debug link. tools/winegcc/winegcc.c | 58 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-)

1 0

[v2 PATCH 1/5] mf: Add flags field for additional SAR state.
by Nikolay Sivov 13 May '20

13 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: hopefully should help with exclusive mode problems with tests, on some bot machines. dlls/mf/sar.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index f883163bde5..d5dc0b4f382 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -38,6 +38,11 @@ enum stream_state STREAM_STATE_PAUSED, }; +enum audio_renderer_flags +{ + SAR_SHUT_DOWN = 0x1, +}; + struct audio_renderer { IMFMediaSink IMFMediaSink_iface; @@ -62,7 +67,7 @@ struct audio_renderer ISimpleAudioVolume *audio_volume; HANDLE buffer_ready_event; enum stream_state state; - BOOL is_shut_down; + unsigned int flags; CRITICAL_SECTION cs; }; @@ -212,7 +217,7 @@ static HRESULT WINAPI audio_renderer_sink_GetCharacteristics(IMFMediaSink *iface TRACE("%p, %p.\n", iface, flags); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; *flags = MEDIASINK_FIXED_STREAMS | MEDIASINK_CAN_PREROLL; @@ -227,7 +232,7 @@ static HRESULT WINAPI audio_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWO TRACE("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); - return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; + return renderer->flags & SAR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, DWORD stream_sink_id) @@ -236,7 +241,7 @@ static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, TRACE("%p, %#x.\n", iface, stream_sink_id); - return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; + return renderer->flags & SAR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface, DWORD *count) @@ -248,7 +253,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface if (!count) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; *count = 1; @@ -264,12 +269,9 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *ifa TRACE("%p, %u, %p.\n", iface, index, stream); - if (renderer->is_shut_down) - return MF_E_SHUTDOWN; - EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (index > 0) hr = MF_E_INVALIDINDEX; @@ -294,7 +296,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (stream_sink_id > 0) hr = MF_E_INVALIDSTREAMNUMBER; @@ -333,7 +335,7 @@ static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else audio_renderer_set_presentation_clock(renderer, clock); @@ -355,7 +357,7 @@ static HRESULT WINAPI audio_renderer_sink_GetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (renderer->clock) { @@ -376,11 +378,11 @@ static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) TRACE("%p.\n", iface); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; EnterCriticalSection(&renderer->cs); - renderer->is_shut_down = TRUE; + renderer->flags |= SAR_SHUT_DOWN; IMFMediaEventQueue_Shutdown(renderer->event_queue); IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); audio_renderer_set_presentation_clock(renderer, NULL); @@ -437,7 +439,7 @@ static HRESULT WINAPI audio_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll * TRACE("%p, %s.\n", iface, debugstr_time(start_time)); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; audio_renderer_preroll(renderer); @@ -1145,7 +1147,7 @@ static HRESULT WINAPI audio_renderer_stream_GetEvent(IMFStreamSink *iface, DWORD TRACE("%p, %#x, %p.\n", iface, flags, event); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_GetEvent(renderer->stream_event_queue, flags, event); @@ -1158,7 +1160,7 @@ static HRESULT WINAPI audio_renderer_stream_BeginGetEvent(IMFStreamSink *iface, TRACE("%p, %p, %p.\n", iface, callback, state); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_BeginGetEvent(renderer->stream_event_queue, callback, state); @@ -1171,7 +1173,7 @@ static HRESULT WINAPI audio_renderer_stream_EndGetEvent(IMFStreamSink *iface, IM TRACE("%p, %p, %p.\n", iface, result, event); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_EndGetEvent(renderer->stream_event_queue, result, event); @@ -1184,7 +1186,7 @@ static HRESULT WINAPI audio_renderer_stream_QueueEvent(IMFStreamSink *iface, Med TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, event_type, ext_type, hr, value); @@ -1196,7 +1198,7 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaSink(IMFStreamSink *iface, I TRACE("%p, %p.\n", iface, sink); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *sink = &renderer->IMFMediaSink_iface; @@ -1211,7 +1213,7 @@ static HRESULT WINAPI audio_renderer_stream_GetIdentifier(IMFStreamSink *iface, TRACE("%p, %p.\n", iface, identifier); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *identifier = 0; @@ -1228,7 +1230,7 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *i if (!handler) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *handler = &renderer->IMFMediaTypeHandler_iface; @@ -1462,7 +1464,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMajorType(IMFMediaTy if (!type) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; memcpy(type, &MFMediaType_Audio, sizeof(*type)); -- 2.26.2

1 4

[PATCH 1/5] mf/sar: Add flags field to keep additional state.
by Nikolay Sivov 13 May '20

13 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index f883163bde5..d5dc0b4f382 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -38,6 +38,11 @@ enum stream_state STREAM_STATE_PAUSED, }; +enum audio_renderer_flags +{ + SAR_SHUT_DOWN = 0x1, +}; + struct audio_renderer { IMFMediaSink IMFMediaSink_iface; @@ -62,7 +67,7 @@ struct audio_renderer ISimpleAudioVolume *audio_volume; HANDLE buffer_ready_event; enum stream_state state; - BOOL is_shut_down; + unsigned int flags; CRITICAL_SECTION cs; }; @@ -212,7 +217,7 @@ static HRESULT WINAPI audio_renderer_sink_GetCharacteristics(IMFMediaSink *iface TRACE("%p, %p.\n", iface, flags); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; *flags = MEDIASINK_FIXED_STREAMS | MEDIASINK_CAN_PREROLL; @@ -227,7 +232,7 @@ static HRESULT WINAPI audio_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWO TRACE("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); - return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; + return renderer->flags & SAR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, DWORD stream_sink_id) @@ -236,7 +241,7 @@ static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, TRACE("%p, %#x.\n", iface, stream_sink_id); - return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; + return renderer->flags & SAR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface, DWORD *count) @@ -248,7 +253,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface if (!count) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; *count = 1; @@ -264,12 +269,9 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *ifa TRACE("%p, %u, %p.\n", iface, index, stream); - if (renderer->is_shut_down) - return MF_E_SHUTDOWN; - EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (index > 0) hr = MF_E_INVALIDINDEX; @@ -294,7 +296,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (stream_sink_id > 0) hr = MF_E_INVALIDSTREAMNUMBER; @@ -333,7 +335,7 @@ static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else audio_renderer_set_presentation_clock(renderer, clock); @@ -355,7 +357,7 @@ static HRESULT WINAPI audio_renderer_sink_GetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&renderer->cs); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; else if (renderer->clock) { @@ -376,11 +378,11 @@ static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) TRACE("%p.\n", iface); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; EnterCriticalSection(&renderer->cs); - renderer->is_shut_down = TRUE; + renderer->flags |= SAR_SHUT_DOWN; IMFMediaEventQueue_Shutdown(renderer->event_queue); IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); audio_renderer_set_presentation_clock(renderer, NULL); @@ -437,7 +439,7 @@ static HRESULT WINAPI audio_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll * TRACE("%p, %s.\n", iface, debugstr_time(start_time)); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; audio_renderer_preroll(renderer); @@ -1145,7 +1147,7 @@ static HRESULT WINAPI audio_renderer_stream_GetEvent(IMFStreamSink *iface, DWORD TRACE("%p, %#x, %p.\n", iface, flags, event); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_GetEvent(renderer->stream_event_queue, flags, event); @@ -1158,7 +1160,7 @@ static HRESULT WINAPI audio_renderer_stream_BeginGetEvent(IMFStreamSink *iface, TRACE("%p, %p, %p.\n", iface, callback, state); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_BeginGetEvent(renderer->stream_event_queue, callback, state); @@ -1171,7 +1173,7 @@ static HRESULT WINAPI audio_renderer_stream_EndGetEvent(IMFStreamSink *iface, IM TRACE("%p, %p, %p.\n", iface, result, event); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_EndGetEvent(renderer->stream_event_queue, result, event); @@ -1184,7 +1186,7 @@ static HRESULT WINAPI audio_renderer_stream_QueueEvent(IMFStreamSink *iface, Med TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; return IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, event_type, ext_type, hr, value); @@ -1196,7 +1198,7 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaSink(IMFStreamSink *iface, I TRACE("%p, %p.\n", iface, sink); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *sink = &renderer->IMFMediaSink_iface; @@ -1211,7 +1213,7 @@ static HRESULT WINAPI audio_renderer_stream_GetIdentifier(IMFStreamSink *iface, TRACE("%p, %p.\n", iface, identifier); - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *identifier = 0; @@ -1228,7 +1230,7 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *i if (!handler) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; *handler = &renderer->IMFMediaTypeHandler_iface; @@ -1462,7 +1464,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMajorType(IMFMediaTy if (!type) return E_POINTER; - if (renderer->is_shut_down) + if (renderer->flags & SAR_SHUT_DOWN) return MF_E_STREAMSINK_REMOVED; memcpy(type, &MFMediaType_Audio, sizeof(*type)); -- 2.26.2

2 6

[PATCH 3/4] qcap/videocapture: Implement IAMVideoControl interface.
by Jactry Zeng 13 May '20

13 May '20

Superseded patch 71606. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/videocapture.c | 2 +- dlls/qcap/vfwcapture.c | 99 ++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index b4d555fdcf..f767c76735 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -223,7 +223,7 @@ static void test_capture(IBaseFilter *filter) IEnumPins_Release(enum_pins); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); - todo_wine check_interface(filter, &IID_IAMVideoControl, TRUE); + check_interface(filter, &IID_IAMVideoControl, TRUE); check_interface(filter, &IID_IAMVideoProcAmp, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 602ffc9a90..9430533ea1 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -48,6 +48,7 @@ typedef struct VfwCapture { struct strmbase_filter filter; IAMStreamConfig IAMStreamConfig_iface; + IAMVideoControl IAMVideoControl_iface; IAMVideoProcAmp IAMVideoProcAmp_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; IPersistPropertyBag IPersistPropertyBag_iface; @@ -68,6 +69,11 @@ static inline VfwCapture *impl_from_IAMStreamConfig(IAMStreamConfig *iface) return CONTAINING_RECORD(iface, VfwCapture, IAMStreamConfig_iface); } +static inline VfwCapture *impl_from_IAMVideoControl(IAMVideoControl *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, IAMVideoControl_iface); +} + static inline VfwCapture *impl_from_IAMVideoProcAmp(IAMVideoProcAmp *iface) { return CONTAINING_RECORD(iface, VfwCapture, IAMVideoProcAmp_iface); @@ -121,6 +127,8 @@ static HRESULT vfw_capture_query_interface(struct strmbase_filter *iface, REFIID if (IsEqualGUID(iid, &IID_IPersistPropertyBag)) *out = &filter->IPersistPropertyBag_iface; + else if (IsEqualGUID(iid, &IID_IAMVideoControl)) + *out = &filter->IAMVideoControl_iface; else if (IsEqualGUID(iid, &IID_IAMVideoProcAmp)) *out = &filter->IAMVideoProcAmp_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) @@ -613,6 +621,96 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_VTable = misc_flags_GetMiscFlags }; +static HRESULT WINAPI video_control_QueryInterface(IAMVideoControl *iface, REFIID riid, void **ppv) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, riid, ppv); +} + +static ULONG WINAPI video_control_AddRef(IAMVideoControl *iface) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI video_control_Release(IAMVideoControl *iface) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI video_control_GetCaps(IAMVideoControl *iface, IPin *pin, LONG *flags) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, flags %p: stub.\n", filter, pin, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_SetMode(IAMVideoControl *iface, IPin *pin, LONG mode) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, mode %d: stub.\n", filter, pin, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_GetMode(IAMVideoControl *iface, IPin *pin, LONG *mode) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, mode %p: stub.\n", filter, pin, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_GetCurrentActualFrameRate(IAMVideoControl *iface, IPin *pin, + LONGLONG *frame_rate) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, frame rate %p: stub.\n", filter, pin, frame_rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_GetMaxAvailableFrameRate(IAMVideoControl *iface, IPin *pin, + LONG index, SIZE dimensions, LONGLONG *frame_rate) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, index %d, dimensions (%dx%d), frame rate %p: stub.\n", + filter, pin, index, dimensions.cx, dimensions.cy, frame_rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_GetFrameRateList(IAMVideoControl *iface, IPin *pin, LONG index, + SIZE dimensions, LONG *list_size, LONGLONG **frame_rate) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, index %d, dimensions (%dx%d), list size %p, frame rate: %p: stub.\n", + filter, pin, index, dimensions.cx, dimensions.cy, list_size, frame_rate); + + return E_NOTIMPL; +} + +static const IAMVideoControlVtbl IAMVideoControl_VTable = +{ + video_control_QueryInterface, + video_control_AddRef, + video_control_Release, + video_control_GetCaps, + video_control_SetMode, + video_control_GetMode, + video_control_GetCurrentActualFrameRate, + video_control_GetMaxAvailableFrameRate, + video_control_GetFrameRateList +}; + HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) { static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; @@ -624,6 +722,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_VfwCapture, &filter_ops); object->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable; + object->IAMVideoControl_iface.lpVtbl = &IAMVideoControl_VTable; object->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable; object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_VTable; object->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; -- 2.26.2

1 0

[PATCH 2/4] qcap/videocapture: Implement IAMFilterMiscFlags interface.
by Jactry Zeng 13 May '20

13 May '20

Superseded patch 71605. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/videocapture.c | 21 ++++++++++++++++-- dlls/qcap/vfwcapture.c | 40 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index a6ce6c565f..b4d555fdcf 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -222,7 +222,7 @@ static void test_capture(IBaseFilter *filter) IEnumPins_Release(enum_pins); - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); todo_wine check_interface(filter, &IID_IAMVideoControl, TRUE); check_interface(filter, &IID_IAMVideoProcAmp, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); @@ -346,7 +346,7 @@ static void test_interfaces(void) &IID_IBaseFilter, (void **)&filter); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); todo_wine check_interface(filter, &IID_IAMVfwCaptureDialogs, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -363,6 +363,22 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_misc_flags(IBaseFilter *filter) +{ + IAMFilterMiscFlags *misc_flags; + ULONG flags; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IAMFilterMiscFlags, (void **)&misc_flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + flags = IAMFilterMiscFlags_GetMiscFlags(misc_flags); + ok(flags == AM_FILTER_MISC_FLAGS_IS_SOURCE + || broken(!flags) /* win7 */, "Got wrong flags: %#x.\n", flags); + + IAMFilterMiscFlags_Release(misc_flags); +} + START_TEST(videocapture) { ICreateDevEnum *dev_enum; @@ -400,6 +416,7 @@ START_TEST(videocapture) if (hr == S_OK) { test_capture(filter); + test_misc_flags(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7b759f0173..602ffc9a90 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -49,6 +49,7 @@ typedef struct VfwCapture struct strmbase_filter filter; IAMStreamConfig IAMStreamConfig_iface; IAMVideoProcAmp IAMVideoProcAmp_iface; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; IPersistPropertyBag IPersistPropertyBag_iface; BOOL init; Capture *driver_info; @@ -72,6 +73,11 @@ static inline VfwCapture *impl_from_IAMVideoProcAmp(IAMVideoProcAmp *iface) return CONTAINING_RECORD(iface, VfwCapture, IAMVideoProcAmp_iface); } +static inline VfwCapture *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, IAMFilterMiscFlags_iface); +} + static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) { return CONTAINING_RECORD(iface, VfwCapture, IPersistPropertyBag_iface); @@ -117,6 +123,8 @@ static HRESULT vfw_capture_query_interface(struct strmbase_filter *iface, REFIID *out = &filter->IPersistPropertyBag_iface; else if (IsEqualGUID(iid, &IID_IAMVideoProcAmp)) *out = &filter->IAMVideoProcAmp_iface; + else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) + *out = &filter->IAMFilterMiscFlags_iface; else return E_NOINTERFACE; @@ -574,6 +582,37 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; +static HRESULT WINAPI misc_flags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) +{ + VfwCapture *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, riid, ppv); +} + +static ULONG WINAPI misc_flags_AddRef(IAMFilterMiscFlags *iface) +{ + VfwCapture *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI misc_flags_Release(IAMFilterMiscFlags *iface) +{ + VfwCapture *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static ULONG WINAPI misc_flags_GetMiscFlags(IAMFilterMiscFlags *iface) +{ + return AM_FILTER_MISC_FLAGS_IS_SOURCE; +} + +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_VTable = +{ + misc_flags_QueryInterface, + misc_flags_AddRef, + misc_flags_Release, + misc_flags_GetMiscFlags +}; + HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) { static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; @@ -586,6 +625,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) object->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable; object->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable; + object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_VTable; object->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; object->init = FALSE; -- 2.26.2

1 0

[PATCH v2 1/4] include/dxgi1_6.idl: Add IDXGIFactory6.
by Philip Rebohle 13 May '20

13 May '20

Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- include/dxgi1_6.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl index 9dcf9f26b46..1f876916b0f 100644 --- a/include/dxgi1_6.idl +++ b/include/dxgi1_6.idl @@ -34,6 +34,13 @@ typedef enum DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_CURSOR_STRETCHED = 0x4, } DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS; +typedef enum DXGI_GPU_PREFERENCE +{ + DXGI_GPU_PREFERENCE_UNSPECIFIED = 0, + DXGI_GPU_PREFERENCE_MINIMUM_POWER = 1, + DXGI_GPU_PREFERENCE_HIGH_PERFORMANCE = 2, +} DXGI_GPU_PREFERENCE; + typedef struct DXGI_ADAPTER_DESC3 { WCHAR Description[128]; @@ -96,3 +103,19 @@ interface IDXGIOutput6 : IDXGIOutput5 [out] UINT *flags ); } + +[ + object, + uuid(c1b6694f-ff09-44a9-b03c-77900a0a1d17), + local, + pointer_default(unique) +] +interface IDXGIFactory6 : IDXGIFactory5 +{ + HRESULT EnumAdapterByGpuPreference( + [in] UINT adapter_idx, + [in] DXGI_GPU_PREFERENCE gpu_preference, + [in] REFIID iid, + [out] void** idx + ); +} -- 2.26.2

1 3

[PATCH] setupapi: add stub for CM_Get_Device_Interface_Alias{A,W}
by Louis Lenders 13 May '20

13 May '20

https://bugs.winehq.org/show_bug.cgi?id=49147 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 43b837ca9e..83d9c598d9 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -89,8 +89,8 @@ @ stub CM_Get_Device_ID_List_Size_ExW @ stdcall CM_Get_Device_ID_Size(ptr ptr long) @ stub CM_Get_Device_ID_Size_Ex -@ stub CM_Get_Device_Interface_AliasA -@ stub CM_Get_Device_Interface_AliasW +@ stdcall CM_Get_Device_Interface_AliasA(str ptr ptr ptr long) +@ stdcall CM_Get_Device_Interface_AliasW(wstr ptr ptr ptr long) @ stub CM_Get_Device_Interface_Alias_ExA @ stub CM_Get_Device_Interface_Alias_ExW @ stub CM_Get_Device_Interface_ListA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 47dca6c150..920dc670b7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -391,6 +391,26 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, return CR_FAILURE; } +/*********************************************************************** + * CM_Get_Device_Interface_AliasA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_AliasA(const CHAR *interface, GUID *class, + CHAR *name, ULONG *len, ULONG flags) +{ + FIXME("%s %p %p %p 0x%08x: stub\n", debugstr_a(interface), class, name, len, flags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_Device_Interface_AliasW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_AliasW(const WCHAR *interface, GUID *class, + WCHAR *name, ULONG *len, ULONG flags) +{ + FIXME("%s %p %p %p 0x%08x: stub\n", debugstr_w(interface), class, name, len, flags); + return CR_FAILURE; +} + /*********************************************************************** * CM_Get_DevNode_Registry_Property_ExA (SETUPAPI.@) */ -- 2.26.2

1 0

[PATCH 1/2] include/dxgi1_6.idl: Add IDXGIFactory6 and IDXGIFactory7.
by Philip Rebohle 13 May '20

13 May '20

Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- include/dxgi1_6.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl index 9dcf9f26b46..9f6d947da28 100644 --- a/include/dxgi1_6.idl +++ b/include/dxgi1_6.idl @@ -34,6 +34,13 @@ typedef enum DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_CURSOR_STRETCHED = 0x4, } DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS; +typedef enum DXGI_GPU_PREFERENCE +{ + DXGI_GPU_PREFERENCE_UNSPECIFIED = 0, + DXGI_GPU_PREFERENCE_MINIMUM_POWER = 1, + DXGI_GPU_PREFERENCE_HIGH_PERFORMANCE = 2, +} DXGI_GPU_PREFERENCE; + typedef struct DXGI_ADAPTER_DESC3 { WCHAR Description[128]; @@ -96,3 +103,36 @@ interface IDXGIOutput6 : IDXGIOutput5 [out] UINT *flags ); } + +[ + object, + uuid(c1b6694f-ff09-44a9-b03c-77900a0a1d17), + local, + pointer_default(unique) +] +interface IDXGIFactory6 : IDXGIFactory5 +{ + HRESULT EnumAdapterByGpuPreference( + [in] UINT adapter_idx, + [in] DXGI_GPU_PREFERENCE gpu_preference, + [in] REFIID iid, + [out] void** idx + ); +} + +[ + object, + uuid(a4966eed-76db-44da-84c1-ee9a7afb20a8), + local, + pointer_default(unique) +] +interface IDXGIFactory7 : IDXGIFactory6 +{ + HRESULT RegisterAdaptersChangedEvent( + [in] HANDLE event, + [out] DWORD *cookie + ); + HRESULT UnregisterAdaptersChangedEvent( + [in] DWORD cookie + ); +} -- 2.26.2

2 3

[PATCH v2 1/5] quartz/vmr9: Partially implement IVMRFilterConfig9::SetNumberOfStreams().
by Zebediah Figura 13 May '20

13 May '20

Devil May Cry 3 expects this to succeed, although it only uses one stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 130 ++++++++++++++++++++------------------- dlls/quartz/vmr9.c | 27 +++++++- 2 files changed, 90 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 6fe2a9bab10..2129429bfba 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -59,7 +59,7 @@ static HRESULT set_mixing_mode(IBaseFilter *filter, DWORD count) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetNumberOfStreams(config, count); - todo_wine_if (count != 1) ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); IVMRFilterConfig9_Release(config); return hr; @@ -173,7 +173,7 @@ static void test_filter_config(void) todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 3); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); todo_wine { @@ -332,24 +332,22 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); filter = create_vmr9(VMR9Mode_Windowed); - if (SUCCEEDED(set_mixing_mode(filter, 1))) - { - test_common_interfaces(filter); + set_mixing_mode(filter, 1); + test_common_interfaces(filter); - check_interface(filter, &IID_IBasicVideo, TRUE); - todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); - check_interface(filter, &IID_IVideoWindow, TRUE); - todo_wine check_interface(filter, &IID_IVMRMixerControl9, TRUE); - /* IVMRMonitorConfig9 may not be available if the d3d9 device has - * insufficient support. */ - check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + todo_wine check_interface(filter, &IID_IVMRMixerControl9, TRUE); + /* IVMRMonitorConfig9 may not be available if the d3d9 device has + * insufficient support. */ + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); - check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); - } + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static const GUID test_iid = {0x33333333}; @@ -532,43 +530,42 @@ static void test_enum_pins(void) IEnumPins_Release(enum2); - if (SUCCEEDED(set_mixing_mode(filter, 2))) - { - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + set_mixing_mode(filter, 2); - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - IPin_Release(pins[0]); + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - IPin_Release(pins[0]); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) IPin_Release(pins[0]); - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum1, 2, pins, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); - IPin_Release(pins[0]); - IPin_Release(pins[1]); + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum1, 2, pins, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + if (count > 1) IPin_Release(pins[1]); - hr = IEnumPins_Next(enum1, 3, pins, &count); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); - IPin_Release(pins[0]); - IPin_Release(pins[1]); - } + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + if (count > 1) IPin_Release(pins[1]); IEnumPins_Release(enum1); ref = IBaseFilter_Release(filter); @@ -602,30 +599,32 @@ static void test_find_pin(void) hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); - if (SUCCEEDED(set_mixing_mode(filter, 2))) - { - IEnumPins_Reset(enum_pins); + set_mixing_mode(filter, 2); - hr = IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(pin == pin2, "Pins did not match.\n"); - IPin_Release(pin); - IPin_Release(pin2); + IEnumPins_Reset(enum_pins); - hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(pin == pin2, "Pins did not match.\n"); IPin_Release(pin); IPin_Release(pin2); - - hr = IBaseFilter_FindPin(filter, L"VMR Input2", &pin); - ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); } + hr = IBaseFilter_FindPin(filter, L"VMR Input2", &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + IEnumPins_Release(enum_pins); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -662,9 +661,12 @@ static void test_pin_info(void) IPin_Release(pin); - if (SUCCEEDED(set_mixing_mode(filter, 2))) + set_mixing_mode(filter, 2); + + hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) { - IBaseFilter_FindPin(filter, L"VMR Input1", &pin); hr = IPin_QueryPinInfo(pin, &info); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); @@ -3160,7 +3162,7 @@ static void test_mixing_mode(void) IVMRMixerControl9_Release(mixer_control); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5ff63467338..ef306a546b3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -82,6 +82,8 @@ struct quartz_vmr IVMRImagePresenter9 *presenter; BOOL allocator_is_ex; + DWORD stream_count; + /* * The Video Mixing Renderer supports 3 modes, renderless, windowless and windowed * What I do is implement windowless as a special case of renderless, and then @@ -1274,10 +1276,29 @@ static HRESULT WINAPI VMR9FilterConfig_SetImageCompositor(IVMRFilterConfig9 *ifa static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD count) { + struct quartz_vmr *filter = impl_from_IVMRFilterConfig9(iface); + FIXME("iface %p, count %u, stub!\n", iface, count); - if (count == 1) - return S_OK; - return E_NOTIMPL; + + if (!count) + { + WARN("Application requested zero streams; returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + + EnterCriticalSection(&filter->renderer.filter.csFilter); + + if (filter->stream_count) + { + LeaveCriticalSection(&filter->renderer.filter.csFilter); + WARN("Stream count is already set; returning VFW_E_WRONG_STATE.\n"); + return VFW_E_WRONG_STATE; + } + + filter->stream_count = count; + + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; } static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD *max) -- 2.26.2

2 5

[PATCH 1/5] quartz/vmr9: Partially implement IVMRFilterConfig9::SetNumberOfStreams().
by Zebediah Figura 13 May '20

13 May '20

Needed by Devil May Cry 3, which however only uses one stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 129 ++++++++++++++++++++------------------- dlls/quartz/vmr9.c | 27 +++++++- 2 files changed, 89 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 6fe2a9bab10..d67e3b6fdc7 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -59,7 +59,7 @@ static HRESULT set_mixing_mode(IBaseFilter *filter, DWORD count) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetNumberOfStreams(config, count); - todo_wine_if (count != 1) ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); IVMRFilterConfig9_Release(config); return hr; @@ -173,7 +173,7 @@ static void test_filter_config(void) todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 3); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); todo_wine { @@ -332,24 +332,21 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); filter = create_vmr9(VMR9Mode_Windowed); - if (SUCCEEDED(set_mixing_mode(filter, 1))) - { - test_common_interfaces(filter); + test_common_interfaces(filter); - check_interface(filter, &IID_IBasicVideo, TRUE); - todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); - check_interface(filter, &IID_IVideoWindow, TRUE); - todo_wine check_interface(filter, &IID_IVMRMixerControl9, TRUE); - /* IVMRMonitorConfig9 may not be available if the d3d9 device has - * insufficient support. */ - check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + todo_wine check_interface(filter, &IID_IVMRMixerControl9, TRUE); + /* IVMRMonitorConfig9 may not be available if the d3d9 device has + * insufficient support. */ + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); - check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); - } + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static const GUID test_iid = {0x33333333}; @@ -532,43 +529,42 @@ static void test_enum_pins(void) IEnumPins_Release(enum2); - if (SUCCEEDED(set_mixing_mode(filter, 2))) - { - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + set_mixing_mode(filter, 2); - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - IPin_Release(pins[0]); + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - IPin_Release(pins[0]); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); - hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) IPin_Release(pins[0]); - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum1, 2, pins, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); - IPin_Release(pins[0]); - IPin_Release(pins[1]); + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Reset(enum1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum1, 2, pins, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + if (count > 1) IPin_Release(pins[1]); - hr = IEnumPins_Next(enum1, 3, pins, &count); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); - IPin_Release(pins[0]); - IPin_Release(pins[1]); - } + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + if (count > 1) IPin_Release(pins[1]); IEnumPins_Release(enum1); ref = IBaseFilter_Release(filter); @@ -602,30 +598,32 @@ static void test_find_pin(void) hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); - if (SUCCEEDED(set_mixing_mode(filter, 2))) - { - IEnumPins_Reset(enum_pins); + set_mixing_mode(filter, 2); - hr = IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(pin == pin2, "Pins did not match.\n"); - IPin_Release(pin); - IPin_Release(pin2); + IEnumPins_Reset(enum_pins); - hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(pin == pin2, "Pins did not match.\n"); IPin_Release(pin); IPin_Release(pin2); - - hr = IBaseFilter_FindPin(filter, L"VMR Input2", &pin); - ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); } + hr = IBaseFilter_FindPin(filter, L"VMR Input2", &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + IEnumPins_Release(enum_pins); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -662,9 +660,12 @@ static void test_pin_info(void) IPin_Release(pin); - if (SUCCEEDED(set_mixing_mode(filter, 2))) + set_mixing_mode(filter, 2); + + hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) { - IBaseFilter_FindPin(filter, L"VMR Input1", &pin); hr = IPin_QueryPinInfo(pin, &info); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); @@ -3160,7 +3161,7 @@ static void test_mixing_mode(void) IVMRMixerControl9_Release(mixer_control); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5ff63467338..ef306a546b3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -82,6 +82,8 @@ struct quartz_vmr IVMRImagePresenter9 *presenter; BOOL allocator_is_ex; + DWORD stream_count; + /* * The Video Mixing Renderer supports 3 modes, renderless, windowless and windowed * What I do is implement windowless as a special case of renderless, and then @@ -1274,10 +1276,29 @@ static HRESULT WINAPI VMR9FilterConfig_SetImageCompositor(IVMRFilterConfig9 *ifa static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD count) { + struct quartz_vmr *filter = impl_from_IVMRFilterConfig9(iface); + FIXME("iface %p, count %u, stub!\n", iface, count); - if (count == 1) - return S_OK; - return E_NOTIMPL; + + if (!count) + { + WARN("Application requested zero streams; returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + + EnterCriticalSection(&filter->renderer.filter.csFilter); + + if (filter->stream_count) + { + LeaveCriticalSection(&filter->renderer.filter.csFilter); + WARN("Stream count is already set; returning VFW_E_WRONG_STATE.\n"); + return VFW_E_WRONG_STATE; + } + + filter->stream_count = count; + + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; } static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD *max) -- 2.26.2

2 8

[PATCH v2 2/2] windowsccodecs: Implement DdsDecoder_Dds_GetParameters().
by Ziqing Hui 13 May '20

13 May '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 110 ++++++++++++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 5 -- 2 files changed, 108 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/2] windowscodecs/tests: Add tests for IWICDdsDecoder_GetParameters().
by Ziqing Hui 13 May '20

13 May '20

v2: Merge the tests for IWICDdsDecoder_GetParameters() and IWICBitmapDecoder_GetFrameCount() in a single function. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 63 ++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 9 deletions(-)

2 1

[PATCH 5/5] wined3d: Implement Vulkan constant buffer descriptors.
by Henri Verbeet 12 May '20

12 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 8 ++ dlls/wined3d/buffer.c | 17 +++ dlls/wined3d/context_vk.c | 236 +++++++++++++++++++++++++++++++-- dlls/wined3d/shader_spirv.c | 54 +++----- dlls/wined3d/wined3d_private.h | 39 +++++- 5 files changed, 304 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a9d3e5eb255..f3404c5e657 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -810,6 +810,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, { struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_vk_info *vk_info; + struct wined3d_bo_user_vk *bo_user_vk; struct wined3d_device_vk *device_vk; VkCommandBuffer vk_command_buffer; VkBufferMemoryBarrier vk_barrier; @@ -830,8 +831,15 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, { if (wined3d_context_vk_create_bo(context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) { + list_move_head(&tmp.users, &bo->users); wined3d_context_vk_destroy_bo(context_vk, bo); *bo = tmp; + list_init(&bo->users); + list_move_head(&bo->users, &tmp.users); + LIST_FOR_EACH_ENTRY(bo_user_vk, &bo->users, struct wined3d_bo_user_vk, entry) + { + bo_user_vk->valid = false; + } goto map; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4d1db98b884..b32d0160cc1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1593,12 +1593,27 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf return FALSE; } + list_init(&buffer_vk->bo_user.entry); + list_add_head(&buffer_vk->bo.users, &buffer_vk->bo_user.entry); buffer_vk->b.buffer_object = (uintptr_t)&buffer_vk->bo; buffer_invalidate_bo_range(&buffer_vk->b, 0, 0); return TRUE; } +const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) +{ + if (buffer_vk->bo_user.valid) + return &buffer_vk->buffer_info; + + buffer_vk->buffer_info.buffer = buffer_vk->bo.vk_buffer; + buffer_vk->buffer_info.offset = buffer_vk->bo.buffer_offset; + buffer_vk->buffer_info.range = buffer_vk->b.resource.size; + buffer_vk->bo_user.valid = true; + + return &buffer_vk->buffer_info; +} + static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { @@ -1630,6 +1645,8 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_BUFFER: + buffer_vk->bo_user.valid = false; + list_remove(&buffer_vk->bo_user.entry); wined3d_context_vk_destroy_bo(context_vk, &buffer_vk->bo); buffer_vk->bo.vk_buffer = VK_NULL_HANDLE; buffer_vk->bo.memory = NULL; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b623b7db847..4c12cff7d11 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -243,6 +243,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context bo->buffer_offset = idx * object_size; bo->memory_offset = slab->bo.memory_offset + bo->buffer_offset; bo->size = size; + list_init(&bo->users); bo->command_buffer_id = 0; TRACE("Using buffer 0x%s, memory 0x%s, offset 0x%s for bo %p.\n", @@ -319,6 +320,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic bo->size = size; bo->usage = usage; bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; + list_init(&bo->users); bo->command_buffer_id = 0; bo->slab = NULL; @@ -770,6 +772,23 @@ static void wined3d_context_vk_destroy_bo_slab(struct wine_rb_entry *entry, void } } +static void wined3d_context_vk_destroy_pipeline_layout(struct wine_rb_entry *entry, void *ctx) +{ + struct wined3d_pipeline_layout_vk *layout = WINE_RB_ENTRY_VALUE(entry, + struct wined3d_pipeline_layout_vk, entry); + struct wined3d_context_vk *context_vk = ctx; + const struct wined3d_vk_info *vk_info; + struct wined3d_device_vk *device_vk; + + vk_info = context_vk->vk_info; + device_vk = wined3d_device_vk(context_vk->c.device); + + VK_CALL(vkDestroyPipelineLayout(device_vk->vk_device, layout->vk_pipeline_layout, NULL)); + VK_CALL(vkDestroyDescriptorSetLayout(device_vk->vk_device, layout->vk_set_layout, NULL)); + heap_free(layout->key.bindings); + heap_free(layout); +} + static void wined3d_render_pass_key_vk_init(struct wined3d_render_pass_key_vk *key, const struct wined3d_fb_state *fb, unsigned int rt_count, bool depth_stencil, uint32_t clear_flags) { @@ -966,6 +985,11 @@ static void wined3d_context_vk_destroy_render_pass(struct wine_rb_entry *entry, heap_free(pass); } +static void wined3d_shader_descriptor_writes_vk_cleanup(struct wined3d_shader_descriptor_writes_vk *writes) +{ + heap_free(writes->writes); +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) { struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; @@ -983,11 +1007,6 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); context_vk->completed_command_buffer_id = buffer->id; - if (context_vk->vk_pipeline_layout) - { - VK_CALL(vkDestroyPipelineLayout(device_vk->vk_device, context_vk->vk_pipeline_layout, NULL)); - VK_CALL(vkDestroyDescriptorSetLayout(device_vk->vk_device, context_vk->vk_set_layout, NULL)); - } heap_free(context_vk->compute.bindings.bindings); if (context_vk->vk_descriptor_pool) VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, context_vk->vk_descriptor_pool, NULL)); @@ -996,6 +1015,8 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) heap_free(context_vk->submitted.buffers); heap_free(context_vk->retired.objects); + wined3d_shader_descriptor_writes_vk_cleanup(&context_vk->descriptor_writes); + wine_rb_destroy(&context_vk->pipeline_layouts, wined3d_context_vk_destroy_pipeline_layout, context_vk); wine_rb_destroy(&context_vk->render_passes, wined3d_context_vk_destroy_render_pass, context_vk); wined3d_context_cleanup(&context_vk->c); @@ -1175,6 +1196,17 @@ static int wined3d_render_pass_vk_compare(const void *key, const struct wine_rb_ return memcmp(k, &pass->key, sizeof(*k)); } +static int wined3d_pipeline_layout_vk_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct wined3d_pipeline_layout_key_vk *a = key; + const struct wined3d_pipeline_layout_key_vk *b = &WINE_RB_ENTRY_VALUE(entry, + const struct wined3d_pipeline_layout_vk, entry)->key; + + if (a->binding_count != b->binding_count) + return a->binding_count - b->binding_count; + return memcmp(a->bindings, b->bindings, a->binding_count * sizeof(*a->bindings)); +} + static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entry *entry) { const struct wined3d_bo_slab_vk *slab = WINE_RB_ENTRY_VALUE(entry, const struct wined3d_bo_slab_vk, entry); @@ -1260,36 +1292,211 @@ static VkResult wined3d_context_vk_create_descriptor_set(struct wined3d_context_ return vr; } +static bool wined3d_shader_descriptor_writes_vk_add_write(struct wined3d_shader_descriptor_writes_vk *writes, + VkDescriptorSet vk_descriptor_set, size_t binding_idx, VkDescriptorType type, + const VkDescriptorBufferInfo *buffer_info, const VkDescriptorImageInfo *image_info, + const VkBufferView *buffer_view) +{ + SIZE_T write_count = writes->count; + VkWriteDescriptorSet *write; + + if (!wined3d_array_reserve((void **)&writes->writes, &writes->size, + write_count + 1, sizeof(*writes->writes))) + return false; + + write = &writes->writes[write_count]; + write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + write->pNext = NULL; + write->dstSet = vk_descriptor_set; + write->dstBinding = binding_idx; + write->dstArrayElement = 0; + write->descriptorCount = 1; + write->descriptorType = type; + write->pImageInfo = image_info; + write->pBufferInfo = buffer_info; + write->pTexelBufferView = buffer_view; + + ++writes->count; + + return true; +} + static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *context_vk, - VkCommandBuffer vk_command_buffer) + VkCommandBuffer vk_command_buffer, const struct wined3d_state *state) { + struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; + const VkDescriptorBufferInfo *buffer_info; VkDescriptorSet vk_descriptor_set; + struct wined3d_buffer *buffer; VkResult vr; + size_t i; bindings = &context_vk->compute.bindings; if ((vr = wined3d_context_vk_create_descriptor_set(context_vk, - context_vk->vk_set_layout, &vk_descriptor_set))) + context_vk->compute.vk_set_layout, &vk_descriptor_set))) { WARN("Failed to create descriptor set, vr %s.\n", wined3d_debug_vkresult(vr)); return false; } - if (bindings->count) + writes->count = 0; + for (i = 0; i < bindings->count; ++i) { - binding = bindings->bindings; - FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); - return false; + binding = &bindings->bindings[i]; + + switch (binding->shader_descriptor_type) + { + case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: + if (!(buffer = state->cb[binding->shader_type][binding->resource_idx])) + { + FIXME("NULL constant buffer views not implemented.\n"); + return false; + } + buffer_info = wined3d_buffer_vk_get_buffer_info(wined3d_buffer_vk(buffer)); + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, buffer_info, NULL, NULL)) + return false; + break; + + default: + FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); + return false; + } } + VK_CALL(vkUpdateDescriptorSets(device_vk->vk_device, writes->count, writes->writes, 0, NULL)); VK_CALL(vkCmdBindDescriptorSets(vk_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, - context_vk->vk_pipeline_layout, 0, 1, &vk_descriptor_set, 0, NULL)); + context_vk->compute.vk_pipeline_layout, 0, 1, &vk_descriptor_set, 0, NULL)); return true; } +static VkResult wined3d_context_vk_create_descriptor_set_layout(struct wined3d_device_vk *device_vk, + const struct wined3d_vk_info *vk_info, const struct wined3d_pipeline_layout_key_vk *key, + VkDescriptorSetLayout *vk_set_layout) +{ + VkDescriptorSetLayoutCreateInfo layout_desc; + VkResult vr; + + layout_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; + layout_desc.pNext = NULL; + layout_desc.flags = 0; + layout_desc.bindingCount = key->binding_count; + layout_desc.pBindings = key->bindings; + + if ((vr = VK_CALL(vkCreateDescriptorSetLayout(device_vk->vk_device, &layout_desc, NULL, vk_set_layout))) < 0) + WARN("Failed to create Vulkan descriptor set layout, vr %s.\n", wined3d_debug_vkresult(vr)); + + return vr; +} + +struct wined3d_pipeline_layout_vk *wined3d_context_vk_get_pipeline_layout( + struct wined3d_context_vk *context_vk, VkDescriptorSetLayoutBinding *bindings, SIZE_T binding_count) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_pipeline_layout_key_vk key; + struct wined3d_pipeline_layout_vk *layout; + VkPipelineLayoutCreateInfo layout_desc; + struct wine_rb_entry *entry; + VkResult vr; + + key.bindings = bindings; + key.binding_count = binding_count; + if ((entry = wine_rb_get(&context_vk->pipeline_layouts, &key))) + return WINE_RB_ENTRY_VALUE(entry, struct wined3d_pipeline_layout_vk, entry); + + if (!(layout = heap_alloc(sizeof(*layout)))) + return NULL; + + if (!(layout->key.bindings = heap_alloc(sizeof(*layout->key.bindings) * key.binding_count))) + { + heap_free(layout); + return NULL; + } + memcpy(layout->key.bindings, key.bindings, sizeof(*layout->key.bindings) * key.binding_count); + layout->key.binding_count = key.binding_count; + + if ((vr = wined3d_context_vk_create_descriptor_set_layout(device_vk, vk_info, &key, &layout->vk_set_layout))) + { + WARN("Failed to create descriptor set layout, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + + layout_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; + layout_desc.pNext = NULL; + layout_desc.flags = 0; + layout_desc.setLayoutCount = 1; + layout_desc.pSetLayouts = &layout->vk_set_layout; + layout_desc.pushConstantRangeCount = 0; + layout_desc.pPushConstantRanges = NULL; + + if ((vr = VK_CALL(vkCreatePipelineLayout(device_vk->vk_device, + &layout_desc, NULL, &layout->vk_pipeline_layout))) < 0) + { + WARN("Failed to create Vulkan pipeline layout, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyDescriptorSetLayout(device_vk->vk_device, layout->vk_set_layout, NULL)); + goto fail; + } + + if (wine_rb_put(&context_vk->pipeline_layouts, &layout->key, &layout->entry) == -1) + { + ERR("Failed to insert pipeline layout.\n"); + VK_CALL(vkDestroyPipelineLayout(device_vk->vk_device, layout->vk_pipeline_layout, NULL)); + VK_CALL(vkDestroyDescriptorSetLayout(device_vk->vk_device, layout->vk_set_layout, NULL)); + goto fail; + } + + return layout; + +fail: + heap_free(layout->key.bindings); + heap_free(layout); + return NULL; +} + +static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk *context_vk, + const struct wined3d_state *state) +{ + const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; + struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; + const struct wined3d_shader_resource_binding *binding; + struct wined3d_buffer_vk *buffer_vk; + struct wined3d_buffer *buffer; + size_t i; + + writes->count = 0; + for (i = 0; i < bindings->count; ++i) + { + binding = &bindings->bindings[i]; + + switch (binding->shader_descriptor_type) + { + case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: + if (!(buffer = state->cb[binding->shader_type][binding->resource_idx])) + break; + + buffer_vk = wined3d_buffer_vk(buffer); + wined3d_buffer_load(buffer, &context_vk->c, state); + if (!buffer_vk->bo_user.valid) + context_invalidate_compute_state(&context_vk->c, STATE_COMPUTE_CONSTANT_BUFFER); + wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + break; + + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: + break; + + default: + FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); + break; + } + } +} + VkCommandBuffer wined3d_context_vk_apply_compute_state(struct wined3d_context_vk *context_vk, const struct wined3d_state *state, struct wined3d_buffer_vk *indirect_vk) { @@ -1314,6 +1521,8 @@ VkCommandBuffer wined3d_context_vk_apply_compute_state(struct wined3d_context_vk context_vk->update_compute_pipeline = 1; } + wined3d_context_vk_load_shader_resources(context_vk, state); + if (indirect_vk) wined3d_buffer_load_location(&indirect_vk->b, &context_vk->c, WINED3D_LOCATION_BUFFER); @@ -1339,7 +1548,7 @@ VkCommandBuffer wined3d_context_vk_apply_compute_state(struct wined3d_context_vk if (context_vk->c.update_compute_shader_resource_bindings || context_vk->c.update_compute_unordered_access_view_bindings) { - if (!wined3d_context_vk_update_descriptors(context_vk, vk_command_buffer)) + if (!wined3d_context_vk_update_descriptors(context_vk, vk_command_buffer, state)) { ERR("Failed to update shader descriptors.\n"); return VK_NULL_HANDLE; @@ -1383,6 +1592,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi context_vk->current_command_buffer.id = 1; wine_rb_init(&context_vk->render_passes, wined3d_render_pass_vk_compare); + wine_rb_init(&context_vk->pipeline_layouts, wined3d_pipeline_layout_vk_compare); wine_rb_init(&context_vk->bo_slab_available, wined3d_bo_slab_vk_compare); return WINED3D_OK; diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 4b6c8886907..28add47c7e5 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -44,6 +44,8 @@ struct shader_spirv_compute_program_vk { VkShaderModule vk_module; VkPipeline vk_pipeline; + VkPipelineLayout vk_pipeline_layout; + VkDescriptorSetLayout vk_set_layout; }; static void shader_spirv_handle_instruction(const struct wined3d_shader_instruction *ins) @@ -65,8 +67,7 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct shader_spirv_compute_program_vk *program; - VkDescriptorSetLayoutCreateInfo set_layout_desc; - VkPipelineLayoutCreateInfo pipeline_layout_desc; + struct wined3d_pipeline_layout_vk *layout; VkComputePipelineCreateInfo pipeline_info; VkResult vr; @@ -82,40 +83,15 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program return NULL; } - if (!context_vk->vk_pipeline_layout) + if (!(layout = wined3d_context_vk_get_pipeline_layout(context_vk, + bindings->vk_bindings, bindings->vk_binding_count))) { - set_layout_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; - set_layout_desc.pNext = NULL; - set_layout_desc.flags = 0; - set_layout_desc.bindingCount = 0; - set_layout_desc.pBindings = NULL; - if ((vr = VK_CALL(vkCreateDescriptorSetLayout(device_vk->vk_device, - &set_layout_desc, NULL, &context_vk->vk_set_layout))) < 0) - { - WARN("Failed to create Vulkan descriptor set layout, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkDestroyShaderModule(device_vk->vk_device, program->vk_module, NULL)); - heap_free(program); - return NULL; - } - - pipeline_layout_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; - pipeline_layout_desc.pNext = NULL; - pipeline_layout_desc.flags = 0; - pipeline_layout_desc.setLayoutCount = 1; - pipeline_layout_desc.pSetLayouts = &context_vk->vk_set_layout; - pipeline_layout_desc.pushConstantRangeCount = 0; - pipeline_layout_desc.pPushConstantRanges = NULL; - - if ((vr = VK_CALL(vkCreatePipelineLayout(device_vk->vk_device, - &pipeline_layout_desc, NULL, &context_vk->vk_pipeline_layout))) < 0) - { - WARN("Failed to create Vulkan pipeline layout, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkDestroyDescriptorSetLayout(device_vk->vk_device, context_vk->vk_set_layout, NULL)); - VK_CALL(vkDestroyShaderModule(device_vk->vk_device, program->vk_module, NULL)); - heap_free(program); - return NULL; - } + VK_CALL(vkDestroyShaderModule(device_vk->vk_device, program->vk_module, NULL)); + heap_free(program); + return NULL; } + program->vk_set_layout = layout->vk_set_layout; + program->vk_pipeline_layout = layout->vk_pipeline_layout; pipeline_info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO; pipeline_info.pNext = NULL; @@ -127,7 +103,7 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program pipeline_info.stage.pName = "main"; pipeline_info.stage.pSpecializationInfo = NULL; pipeline_info.stage.module = program->vk_module; - pipeline_info.layout = context_vk->vk_pipeline_layout; + pipeline_info.layout = program->vk_pipeline_layout; pipeline_info.basePipelineHandle = VK_NULL_HANDLE; pipeline_info.basePipelineIndex = -1; if ((vr = VK_CALL(vkCreateComputePipelines(device_vk->vk_device, @@ -342,9 +318,17 @@ static void shader_spirv_select_compute(void *shader_priv, program = NULL; if (program) + { context_vk->compute.vk_pipeline = program->vk_pipeline; + context_vk->compute.vk_set_layout = program->vk_set_layout; + context_vk->compute.vk_pipeline_layout = program->vk_pipeline_layout; + } else + { context_vk->compute.vk_pipeline = VK_NULL_HANDLE; + context_vk->compute.vk_set_layout = VK_NULL_HANDLE; + context_vk->compute.vk_pipeline_layout = VK_NULL_HANDLE; + } } static void shader_spirv_disable(void *shader_priv, struct wined3d_context *context) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8dc1b9dcbb..321d58b0bf9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1540,6 +1540,12 @@ static inline GLuint wined3d_bo_gl_id(uintptr_t bo) return bo ? ((struct wined3d_bo_gl *)bo)->id : 0; } +struct wined3d_bo_user_vk +{ + struct list entry; + bool valid; +}; + struct wined3d_bo_vk { VkBuffer vk_buffer; @@ -1554,6 +1560,7 @@ struct wined3d_bo_vk VkBufferUsageFlags usage; VkMemoryPropertyFlags memory_type; + struct list users; uint64_t command_buffer_id; }; @@ -2299,6 +2306,20 @@ struct wined3d_render_pass_vk VkRenderPass vk_render_pass; }; +struct wined3d_pipeline_layout_key_vk +{ + VkDescriptorSetLayoutBinding *bindings; + SIZE_T binding_count; +}; + +struct wined3d_pipeline_layout_vk +{ + struct wine_rb_entry entry; + struct wined3d_pipeline_layout_key_vk key; + VkPipelineLayout vk_pipeline_layout; + VkDescriptorSetLayout vk_set_layout; +}; + enum wined3d_shader_descriptor_type { WINED3D_SHADER_DESCRIPTOR_TYPE_CBV, @@ -2324,6 +2345,12 @@ struct wined3d_shader_resource_bindings SIZE_T size, count; }; +struct wined3d_shader_descriptor_writes_vk +{ + VkWriteDescriptorSet *writes; + SIZE_T size, count; +}; + struct wined3d_context_vk { struct wined3d_context c; @@ -2336,6 +2363,8 @@ struct wined3d_context_vk struct { VkPipeline vk_pipeline; + VkPipelineLayout vk_pipeline_layout; + VkDescriptorSetLayout vk_set_layout; struct wined3d_shader_resource_bindings bindings; } compute; @@ -2350,12 +2379,13 @@ struct wined3d_context_vk SIZE_T buffer_count; } submitted; + struct wined3d_shader_descriptor_writes_vk descriptor_writes; + VkDescriptorPool vk_descriptor_pool; - VkPipelineLayout vk_pipeline_layout; - VkDescriptorSetLayout vk_set_layout; struct wined3d_retired_objects_vk retired; struct wine_rb_tree render_passes; + struct wine_rb_tree pipeline_layouts; struct wine_rb_tree bo_slab_available; }; @@ -2390,6 +2420,8 @@ void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk, VkSampler vk_sampler, uint64_t command_buffer_id) DECLSPEC_HIDDEN; VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +struct wined3d_pipeline_layout_vk *wined3d_context_vk_get_pipeline_layout(struct wined3d_context_vk *context_vk, + VkDescriptorSetLayoutBinding *bindings, SIZE_T binding_count) DECLSPEC_HIDDEN; VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *context_vk, const struct wined3d_fb_state *fb, unsigned int rt_count, bool depth_stencil, uint32_t clear_flags) DECLSPEC_HIDDEN; @@ -4547,6 +4579,8 @@ struct wined3d_buffer_vk struct wined3d_buffer b; struct wined3d_bo_vk bo; + struct wined3d_bo_user_vk bo_user; + VkDescriptorBufferInfo buffer_info; }; static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer) @@ -4554,6 +4588,7 @@ static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer return CONTAINING_RECORD(buffer, struct wined3d_buffer_vk, b); } +const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 4/5] wined3d: Implement adapter_vk_dispatch_compute().
by Henri Verbeet 12 May '20

12 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 40 +++- dlls/wined3d/context_vk.c | 232 +++++++++++++++++++++++ dlls/wined3d/shader.c | 9 + dlls/wined3d/shader_spirv.c | 330 ++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 73 +++++++- 5 files changed, 675 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3732d7dffce..a9d3e5eb255 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1509,7 +1509,45 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, static void adapter_vk_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { - FIXME("device %p, state %p, parameters %p.\n", device, state, parameters); + struct wined3d_buffer_vk *indirect_vk = NULL; + const struct wined3d_vk_info *vk_info; + struct wined3d_context_vk *context_vk; + VkCommandBuffer vk_command_buffer; + + TRACE("device %p, state %p, parameters %p.\n", device, state, parameters); + + context_vk = wined3d_context_vk(context_acquire(device, NULL, 0)); + vk_info = context_vk->vk_info; + + if (parameters->indirect) + indirect_vk = wined3d_buffer_vk(parameters->u.indirect.buffer); + + if (!(vk_command_buffer = wined3d_context_vk_apply_compute_state(context_vk, state, indirect_vk))) + { + ERR("Failed to apply compute state.\n"); + context_release(&context_vk->c); + return; + } + + if (parameters->indirect) + { + struct wined3d_bo_vk *bo = &indirect_vk->bo; + + wined3d_context_vk_reference_bo(context_vk, bo); + VK_CALL(vkCmdDispatchIndirect(vk_command_buffer, bo->vk_buffer, + bo->buffer_offset + parameters->u.indirect.offset)); + } + else + { + const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; + + VK_CALL(vkCmdDispatch(vk_command_buffer, direct->group_count_x, direct->group_count_y, direct->group_count_z)); + } + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, + VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, 0, 0, NULL, 0, NULL, 0, NULL)); + + context_release(&context_vk->c); } void adapter_vk_clear_uav(struct wined3d_context *context, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 20a0df181ca..b623b7db847 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -58,6 +58,28 @@ VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) } } +VkShaderStageFlagBits vk_shader_stage_from_wined3d(enum wined3d_shader_type shader_type) +{ + switch (shader_type) + { + case WINED3D_SHADER_TYPE_VERTEX: + return VK_SHADER_STAGE_VERTEX_BIT; + case WINED3D_SHADER_TYPE_HULL: + return VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT; + case WINED3D_SHADER_TYPE_DOMAIN: + return VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT; + case WINED3D_SHADER_TYPE_GEOMETRY: + return VK_SHADER_STAGE_GEOMETRY_BIT; + case WINED3D_SHADER_TYPE_PIXEL: + return VK_SHADER_STAGE_FRAGMENT_BIT; + case WINED3D_SHADER_TYPE_COMPUTE: + return VK_SHADER_STAGE_COMPUTE_BIT; + default: + ERR("Unhandled shader type %s.\n", debug_shader_type(shader_type)); + return 0; + } +} + void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, struct wined3d_context_vk *context_vk) { @@ -350,6 +372,31 @@ void wined3d_context_vk_destroy_framebuffer(struct wined3d_context_vk *context_v o->command_buffer_id = command_buffer_id; } +static void wined3d_context_vk_destroy_descriptor_pool(struct wined3d_context_vk *context_vk, + VkDescriptorPool vk_descriptor_pool, uint64_t command_buffer_id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, vk_descriptor_pool, NULL)); + TRACE("Destroyed descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); + return; + } + + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); + return; + } + + o->type = WINED3D_RETIRED_DESCRIPTOR_POOL_VK; + o->u.vk_descriptor_pool = vk_descriptor_pool; + o->command_buffer_id = command_buffer_id; +} + void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) { @@ -647,6 +694,11 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont TRACE("Destroyed framebuffer 0x%s.\n", wine_dbgstr_longlong(o->u.vk_framebuffer)); break; + case WINED3D_RETIRED_DESCRIPTOR_POOL_VK: + VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, o->u.vk_descriptor_pool, NULL)); + TRACE("Destroyed descriptor pool 0x%s.\n", wine_dbgstr_longlong(o->u.vk_descriptor_pool)); + break; + case WINED3D_RETIRED_MEMORY_VK: VK_CALL(vkFreeMemory(device_vk->vk_device, o->u.vk_memory, NULL)); TRACE("Freed memory 0x%s.\n", wine_dbgstr_longlong(o->u.vk_memory)); @@ -930,6 +982,15 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); context_vk->completed_command_buffer_id = buffer->id; + + if (context_vk->vk_pipeline_layout) + { + VK_CALL(vkDestroyPipelineLayout(device_vk->vk_device, context_vk->vk_pipeline_layout, NULL)); + VK_CALL(vkDestroyDescriptorSetLayout(device_vk->vk_device, context_vk->vk_set_layout, NULL)); + } + heap_free(context_vk->compute.bindings.bindings); + if (context_vk->vk_descriptor_pool) + VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, context_vk->vk_descriptor_pool, NULL)); wined3d_context_vk_cleanup_resources(context_vk); wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); heap_free(context_vk->submitted.buffers); @@ -1012,6 +1073,10 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context TRACE("Submitting command buffer %p with id 0x%s.\n", buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + context_vk->update_compute_pipeline = 1; + context_vk->c.update_compute_shader_resource_bindings = 1; + context_vk->c.update_compute_unordered_access_view_bindings = 1; + VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; @@ -1122,6 +1187,173 @@ static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entr return k->size - slab->bo.size; } +static VkResult wined3d_context_vk_create_descriptor_pool(struct wined3d_device_vk *device_vk, + const struct wined3d_vk_info *vk_info, VkDescriptorPool *vk_pool) +{ + struct VkDescriptorPoolCreateInfo pool_desc; + VkResult vr; + + static const VkDescriptorPoolSize pool_sizes[] = + { + {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1024}, + {VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1024}, + {VK_DESCRIPTOR_TYPE_SAMPLER, 1024}, + }; + + pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; + pool_desc.pNext = NULL; + pool_desc.flags = 0; + pool_desc.maxSets = 512; + pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); + pool_desc.pPoolSizes = pool_sizes; + + if ((vr = VK_CALL(vkCreateDescriptorPool(device_vk->vk_device, &pool_desc, NULL, vk_pool))) < 0) + ERR("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); + + return vr; +} + +static VkResult wined3d_context_vk_create_descriptor_set(struct wined3d_context_vk *context_vk, + VkDescriptorSetLayout vk_set_layout, VkDescriptorSet *vk_descriptor_set) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct VkDescriptorSetAllocateInfo set_desc; + VkResult vr; + + if (!context_vk->vk_descriptor_pool && (vr = wined3d_context_vk_create_descriptor_pool(device_vk, + vk_info, &context_vk->vk_descriptor_pool))) + { + WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); + return vr; + } + + set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; + set_desc.pNext = NULL; + set_desc.descriptorPool = context_vk->vk_descriptor_pool; + set_desc.descriptorSetCount = 1; + set_desc.pSetLayouts = &vk_set_layout; + if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, vk_descriptor_set))) >= 0) + return vr; + + if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY) + { + wined3d_context_vk_destroy_descriptor_pool(context_vk, + context_vk->vk_descriptor_pool, context_vk->current_command_buffer.id); + context_vk->vk_descriptor_pool = VK_NULL_HANDLE; + if ((vr = wined3d_context_vk_create_descriptor_pool(device_vk, vk_info, &context_vk->vk_descriptor_pool))) + { + WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); + return vr; + } + + set_desc.descriptorPool = context_vk->vk_descriptor_pool; + if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, vk_descriptor_set))) >= 0) + return vr; + } + + WARN("Failed to allocate descriptor set, vr %s.\n", wined3d_debug_vkresult(vr)); + + return vr; +} + +static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer) +{ + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + const struct wined3d_shader_resource_binding *binding; + struct wined3d_shader_resource_bindings *bindings; + VkDescriptorSet vk_descriptor_set; + VkResult vr; + + bindings = &context_vk->compute.bindings; + if ((vr = wined3d_context_vk_create_descriptor_set(context_vk, + context_vk->vk_set_layout, &vk_descriptor_set))) + { + WARN("Failed to create descriptor set, vr %s.\n", wined3d_debug_vkresult(vr)); + return false; + } + + if (bindings->count) + { + binding = bindings->bindings; + FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); + return false; + } + + VK_CALL(vkCmdBindDescriptorSets(vk_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, + context_vk->vk_pipeline_layout, 0, 1, &vk_descriptor_set, 0, NULL)); + + return true; +} + +VkCommandBuffer wined3d_context_vk_apply_compute_state(struct wined3d_context_vk *context_vk, + const struct wined3d_state *state, struct wined3d_buffer_vk *indirect_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkCommandBuffer vk_command_buffer; + + if (wined3d_context_is_compute_state_dirty(&context_vk->c, STATE_COMPUTE_SHADER)) + context_vk->c.shader_update_mask |= 1u << WINED3D_SHADER_TYPE_COMPUTE; + + if (context_vk->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) + { + device_vk->d.shader_backend->shader_select_compute(device_vk->d.shader_priv, &context_vk->c, state); + if (!context_vk->compute.vk_pipeline) + { + ERR("No compute pipeline set.\n"); + return VK_NULL_HANDLE; + } + context_vk->c.shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); + context_vk->c.update_compute_shader_resource_bindings = 1; + context_vk->c.update_compute_unordered_access_view_bindings = 1; + context_vk->update_compute_pipeline = 1; + } + + if (indirect_vk) + wined3d_buffer_load_location(&indirect_vk->b, &context_vk->c, WINED3D_LOCATION_BUFFER); + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return VK_NULL_HANDLE; + } + + if (context_vk->update_compute_pipeline) + { + VK_CALL(vkCmdBindPipeline(vk_command_buffer, + VK_PIPELINE_BIND_POINT_COMPUTE, context_vk->compute.vk_pipeline)); + context_vk->update_compute_pipeline = 0; + } + + if (wined3d_context_is_compute_state_dirty(&context_vk->c, STATE_COMPUTE_CONSTANT_BUFFER) + || wined3d_context_is_compute_state_dirty(&context_vk->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING)) + context_vk->c.update_compute_shader_resource_bindings = 1; + if (wined3d_context_is_compute_state_dirty(&context_vk->c, STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING)) + context_vk->c.update_compute_unordered_access_view_bindings = 1; + + if (context_vk->c.update_compute_shader_resource_bindings + || context_vk->c.update_compute_unordered_access_view_bindings) + { + if (!wined3d_context_vk_update_descriptors(context_vk, vk_command_buffer)) + { + ERR("Failed to update shader descriptors.\n"); + return VK_NULL_HANDLE; + } + + context_vk->c.update_compute_shader_resource_bindings = 0; + context_vk->c.update_compute_unordered_access_view_bindings = 0; + } + + memset(context_vk->c.dirty_compute_states, 0, sizeof(context_vk->c.dirty_compute_states)); + + return vk_command_buffer; +} + HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { VkCommandPoolCreateInfo command_pool_info; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 41c48c0468b..dbc889411d3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1123,6 +1123,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co } reg_maps->resource_info[reg_idx].type = semantic->resource_type; reg_maps->resource_info[reg_idx].data_type = semantic->resource_data_type; + wined3d_bitmap_set(reg_maps->resource_map, reg_idx); break; case WINED3DSPR_UAV: @@ -1146,9 +1147,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co { struct wined3d_shader_register *reg = &ins.declaration.src.reg; if (reg->idx[0].offset >= WINED3D_MAX_CBS) + { ERR("Invalid CB index %u.\n", reg->idx[0].offset); + } else + { reg_maps->cb_sizes[reg->idx[0].offset] = reg->idx[1].offset; + wined3d_bitmap_set(&reg_maps->cb_map, reg->idx[0].offset); + } } else if (ins.handler_idx == WINED3DSIH_DCL_GLOBAL_FLAGS) { @@ -1266,6 +1272,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; reg_maps->resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; + wined3d_bitmap_set(reg_maps->resource_map, reg_idx); } else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_STRUCTURED) { @@ -1279,6 +1286,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; reg_maps->resource_info[reg_idx].flags = 0; reg_maps->resource_info[reg_idx].stride = ins.declaration.structured_resource.byte_stride / 4; + wined3d_bitmap_set(reg_maps->resource_map, reg_idx); } else if (ins.handler_idx == WINED3DSIH_DCL_SAMPLER) { @@ -1605,6 +1613,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_FLOAT; shader_record_sample(reg_maps, reg_idx, reg_idx, reg_idx); + wined3d_bitmap_set(reg_maps->resource_map, reg_idx); /* texbem is only valid with < 1.4 pixel shaders */ if (ins.handler_idx == WINED3DSIH_TEXBEM diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index b9194f32f2f..4b6c8886907 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -25,17 +25,291 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); static const struct wined3d_shader_backend_ops spirv_shader_backend_vk; +struct shader_spirv_resource_bindings +{ + VkDescriptorSetLayoutBinding *vk_bindings; + SIZE_T vk_bindings_size, vk_binding_count; +}; + struct shader_spirv_priv { const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct wined3d_fragment_pipe_ops *fragment_pipe; bool ffp_proj_control; + + struct shader_spirv_resource_bindings bindings; +}; + +struct shader_spirv_compute_program_vk +{ + VkShaderModule vk_module; + VkPipeline vk_pipeline; }; static void shader_spirv_handle_instruction(const struct wined3d_shader_instruction *ins) { } +static VkShaderModule shader_spirv_compile(struct wined3d_context_vk *context_vk, + struct wined3d_shader *shader, const struct shader_spirv_resource_bindings *bindings) +{ + FIXME("Not implemented.\n"); + + return VK_NULL_HANDLE; +} + +static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program_vk(struct shader_spirv_priv *priv, + struct wined3d_context_vk *context_vk, struct wined3d_shader *shader, + const struct shader_spirv_resource_bindings *bindings) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct shader_spirv_compute_program_vk *program; + VkDescriptorSetLayoutCreateInfo set_layout_desc; + VkPipelineLayoutCreateInfo pipeline_layout_desc; + VkComputePipelineCreateInfo pipeline_info; + VkResult vr; + + if ((program = shader->backend_data)) + return program; + + if (!(program = heap_alloc(sizeof(*program)))) + return NULL; + + if (!(program->vk_module = shader_spirv_compile(context_vk, shader, bindings))) + { + heap_free(program); + return NULL; + } + + if (!context_vk->vk_pipeline_layout) + { + set_layout_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; + set_layout_desc.pNext = NULL; + set_layout_desc.flags = 0; + set_layout_desc.bindingCount = 0; + set_layout_desc.pBindings = NULL; + if ((vr = VK_CALL(vkCreateDescriptorSetLayout(device_vk->vk_device, + &set_layout_desc, NULL, &context_vk->vk_set_layout))) < 0) + { + WARN("Failed to create Vulkan descriptor set layout, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyShaderModule(device_vk->vk_device, program->vk_module, NULL)); + heap_free(program); + return NULL; + } + + pipeline_layout_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; + pipeline_layout_desc.pNext = NULL; + pipeline_layout_desc.flags = 0; + pipeline_layout_desc.setLayoutCount = 1; + pipeline_layout_desc.pSetLayouts = &context_vk->vk_set_layout; + pipeline_layout_desc.pushConstantRangeCount = 0; + pipeline_layout_desc.pPushConstantRanges = NULL; + + if ((vr = VK_CALL(vkCreatePipelineLayout(device_vk->vk_device, + &pipeline_layout_desc, NULL, &context_vk->vk_pipeline_layout))) < 0) + { + WARN("Failed to create Vulkan pipeline layout, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyDescriptorSetLayout(device_vk->vk_device, context_vk->vk_set_layout, NULL)); + VK_CALL(vkDestroyShaderModule(device_vk->vk_device, program->vk_module, NULL)); + heap_free(program); + return NULL; + } + } + + pipeline_info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO; + pipeline_info.pNext = NULL; + pipeline_info.flags = 0; + pipeline_info.stage.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; + pipeline_info.stage.pNext = NULL; + pipeline_info.stage.flags = 0; + pipeline_info.stage.stage = VK_SHADER_STAGE_COMPUTE_BIT; + pipeline_info.stage.pName = "main"; + pipeline_info.stage.pSpecializationInfo = NULL; + pipeline_info.stage.module = program->vk_module; + pipeline_info.layout = context_vk->vk_pipeline_layout; + pipeline_info.basePipelineHandle = VK_NULL_HANDLE; + pipeline_info.basePipelineIndex = -1; + if ((vr = VK_CALL(vkCreateComputePipelines(device_vk->vk_device, + VK_NULL_HANDLE, 1, &pipeline_info, NULL, &program->vk_pipeline))) < 0) + { + ERR("Failed to create Vulkan compute pipeline, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyShaderModule(device_vk->vk_device, program->vk_module, NULL)); + heap_free(program); + return NULL; + } + + shader->backend_data = program; + + return program; +} + +static void shader_spirv_resource_bindings_cleanup(struct shader_spirv_resource_bindings *bindings) +{ + heap_free(bindings->vk_bindings); +} + +static bool shader_spirv_resource_bindings_add_binding(struct shader_spirv_resource_bindings *bindings, + VkDescriptorType vk_type, VkShaderStageFlagBits vk_stage, size_t *binding_idx) +{ + SIZE_T binding_count = bindings->vk_binding_count; + VkDescriptorSetLayoutBinding *binding; + + if (!wined3d_array_reserve((void **)&bindings->vk_bindings, &bindings->vk_bindings_size, + binding_count + 1, sizeof(*bindings->vk_bindings))) + return false; + + *binding_idx = binding_count; + binding = &bindings->vk_bindings[binding_count]; + binding->binding = binding_count; + binding->descriptorType = vk_type; + binding->descriptorCount = 1; + binding->stageFlags = vk_stage; + binding->pImmutableSamplers = NULL; + ++bindings->vk_binding_count; + + return true; +} + +static bool wined3d_shader_resource_bindings_add_binding(struct wined3d_shader_resource_bindings *bindings, + enum wined3d_shader_type shader_type, enum wined3d_shader_descriptor_type shader_descriptor_type, + size_t resource_idx, enum wined3d_shader_resource_type resource_type, + enum wined3d_data_type resource_data_type, size_t binding_idx) +{ + struct wined3d_shader_resource_binding *binding; + SIZE_T binding_count = bindings->count; + + if (!wined3d_array_reserve((void **)&bindings->bindings, &bindings->size, + binding_count + 1, sizeof(*bindings->bindings))) + return false; + + binding = &bindings->bindings[binding_count]; + binding->shader_type = shader_type; + binding->shader_descriptor_type = shader_descriptor_type; + binding->resource_idx = resource_idx; + binding->resource_type = resource_type; + binding->resource_data_type = resource_data_type; + binding->binding_idx = binding_idx; + ++bindings->count; + + return true; +} + +static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bindings *bindings, + struct wined3d_shader_resource_bindings *wined3d_bindings, + const struct wined3d_state *state, uint32_t shader_mask) +{ + const struct wined3d_shader_resource_info *resource_info; + const struct wined3d_shader_reg_maps *reg_maps; + enum wined3d_shader_type shader_type; + VkDescriptorType vk_descriptor_type; + size_t binding_idx, register_idx; + VkShaderStageFlagBits vk_stage; + struct wined3d_shader *shader; + unsigned int i; + uint32_t map; + + bindings->vk_binding_count = 0; + wined3d_bindings->count = 0; + + for (shader_type = 0; shader_type < WINED3D_SHADER_TYPE_COUNT; ++shader_type) + { + if (!(shader_mask & (1u << shader_type)) || !(shader = state->shader[shader_type])) + continue; + + reg_maps = &shader->reg_maps; + vk_stage = vk_shader_stage_from_wined3d(shader_type); + + map = reg_maps->cb_map; + while (map) + { + register_idx = wined3d_bit_scan(&map); + + if (!shader_spirv_resource_bindings_add_binding(bindings, + VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, vk_stage, &binding_idx)) + return false; + if (!wined3d_shader_resource_bindings_add_binding(wined3d_bindings, + shader_type, WINED3D_SHADER_DESCRIPTOR_TYPE_CBV, register_idx, + WINED3D_SHADER_RESOURCE_BUFFER, WINED3D_DATA_UINT, binding_idx)) + return false; + } + + for (i = 0; i < ARRAY_SIZE(reg_maps->resource_map); ++i) + { + map = reg_maps->resource_map[i]; + while (map) + { + register_idx = (i << 5) + wined3d_bit_scan(&map); + resource_info = &reg_maps->resource_info[register_idx]; + if (resource_info->type == WINED3D_SHADER_RESOURCE_BUFFER) + vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + else + vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; + + if (!shader_spirv_resource_bindings_add_binding(bindings, + vk_descriptor_type, vk_stage, &binding_idx)) + return false; + if (!wined3d_shader_resource_bindings_add_binding(wined3d_bindings, + shader_type, WINED3D_SHADER_DESCRIPTOR_TYPE_SRV, register_idx, + resource_info->type, resource_info->data_type, binding_idx)) + return false; + } + } + + for (register_idx = 0; register_idx < ARRAY_SIZE(reg_maps->uav_resource_info); ++register_idx) + { + resource_info = &reg_maps->uav_resource_info[register_idx]; + if (resource_info->type == WINED3D_SHADER_RESOURCE_NONE) + continue; + if (resource_info->type == WINED3D_SHADER_RESOURCE_BUFFER) + vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + else + vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + + if (!shader_spirv_resource_bindings_add_binding(bindings, + vk_descriptor_type, vk_stage, &binding_idx)) + return false; + if (!wined3d_shader_resource_bindings_add_binding(wined3d_bindings, + shader_type, WINED3D_SHADER_DESCRIPTOR_TYPE_UAV, register_idx, + resource_info->type, resource_info->data_type, binding_idx)) + return false; + + if (reg_maps->uav_counter_mask & (1u << register_idx)) + { + if (!shader_spirv_resource_bindings_add_binding(bindings, + VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, vk_stage, &binding_idx)) + return false; + if (!wined3d_shader_resource_bindings_add_binding(wined3d_bindings, + shader_type, WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER, register_idx, + WINED3D_SHADER_RESOURCE_BUFFER, WINED3D_DATA_UINT, binding_idx)) + return false; + } + } + + map = 0; + for (i = 0; i < reg_maps->sampler_map.count; ++i) + { + if (reg_maps->sampler_map.entries[i].sampler_idx != WINED3D_SAMPLER_DEFAULT) + map |= 1u << reg_maps->sampler_map.entries[i].sampler_idx; + } + + while (map) + { + register_idx = wined3d_bit_scan(&map); + + if (!shader_spirv_resource_bindings_add_binding(bindings, + VK_DESCRIPTOR_TYPE_SAMPLER, vk_stage, &binding_idx)) + return false; + if (!wined3d_shader_resource_bindings_add_binding(wined3d_bindings, + shader_type, WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, register_idx, + WINED3D_SHADER_RESOURCE_NONE, WINED3D_DATA_SAMPLER, binding_idx)) + return false; + } + } + + return true; +} + static void shader_spirv_precompile(void *shader_priv, struct wined3d_shader *shader) { WARN("Not implemented.\n"); @@ -53,16 +327,35 @@ static void shader_spirv_select(void *shader_priv, struct wined3d_context *conte static void shader_spirv_select_compute(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { - FIXME("Not implemented.\n"); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + struct shader_spirv_compute_program_vk *program; + struct shader_spirv_priv *priv = shader_priv; + struct wined3d_shader *shader; + + if (!shader_spirv_resource_bindings_init(&priv->bindings, + &context_vk->compute.bindings, state, 1u << WINED3D_SHADER_TYPE_COMPUTE)) + ERR("Failed to initialise shader resource bindings.\n"); + + if ((shader = state->shader[WINED3D_SHADER_TYPE_COMPUTE])) + program = shader_spirv_find_compute_program_vk(priv, context_vk, shader, &priv->bindings); + else + program = NULL; + + if (program) + context_vk->compute.vk_pipeline = program->vk_pipeline; + else + context_vk->compute.vk_pipeline = VK_NULL_HANDLE; } static void shader_spirv_disable(void *shader_priv, struct wined3d_context *context) { + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); struct shader_spirv_priv *priv = shader_priv; priv->vertex_pipe->vp_enable(context, false); priv->fragment_pipe->fp_enable(context, false); + context_vk->compute.vk_pipeline = VK_NULL_HANDLE; context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) | (1u << WINED3D_SHADER_TYPE_VERTEX) | (1u << WINED3D_SHADER_TYPE_GEOMETRY) @@ -87,8 +380,41 @@ static void shader_spirv_load_constants(void *shader_priv, struct wined3d_contex WARN("Not implemented.\n"); } +static void shader_spirv_invalidate_compute_program(struct wined3d_context_vk *context_vk, + const struct shader_spirv_compute_program_vk *program) +{ + if (context_vk->compute.vk_pipeline == program->vk_pipeline) + { + context_vk->c.shader_update_mask |= (1u << WINED3D_SHADER_TYPE_COMPUTE); + context_vk->compute.vk_pipeline = VK_NULL_HANDLE; + } +} + +static void shader_spirv_invalidate_contexts_compute_program(struct wined3d_device *device, + const struct shader_spirv_compute_program_vk *program) +{ + unsigned int i; + + for (i = 0; i < device->context_count; ++i) + { + shader_spirv_invalidate_compute_program(wined3d_context_vk(device->contexts[i]), program); + } +} + static void shader_spirv_destroy(struct wined3d_shader *shader) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(shader->device); + struct wined3d_vk_info *vk_info = &device_vk->vk_info; + struct shader_spirv_compute_program_vk *program; + + if (!(program = shader->backend_data)) + return; + + shader_spirv_invalidate_contexts_compute_program(&device_vk->d, program); + VK_CALL(vkDestroyPipeline(device_vk->vk_device, program->vk_pipeline, NULL)); + VK_CALL(vkDestroyShaderModule(device_vk->vk_device, program->vk_module, NULL)); + shader->backend_data = NULL; + heap_free(program); } static HRESULT shader_spirv_alloc(struct wined3d_device *device, @@ -120,6 +446,7 @@ static HRESULT shader_spirv_alloc(struct wined3d_device *device, priv->fragment_pipe = fragment_pipe; fragment_pipe->get_caps(device->adapter, &fragment_caps); priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + memset(&priv->bindings, 0, sizeof(priv->bindings)); device->vertex_priv = vertex_priv; device->fragment_priv = fragment_priv; @@ -132,6 +459,7 @@ static void shader_spirv_free(struct wined3d_device *device, struct wined3d_cont { struct shader_spirv_priv *priv = device->shader_priv; + shader_spirv_resource_bindings_cleanup(&priv->bindings); priv->fragment_pipe->free_private(device, context); priv->vertex_pipe->vp_free(device, context); heap_free(priv); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 145c39b7920..c8dc1b9dcbb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -84,6 +84,7 @@ struct wined3d_fragment_pipe_ops; struct wined3d_adapter; +struct wined3d_buffer_vk; struct wined3d_context; struct wined3d_gl_info; struct wined3d_state; @@ -304,6 +305,7 @@ GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) DECLSPEC_HIDDEN; VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, uint32_t flags) DECLSPEC_HIDDEN; +VkShaderStageFlagBits vk_shader_stage_from_wined3d(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) { @@ -1034,8 +1036,10 @@ struct wined3d_shader_reg_maps WORD local_int_consts; /* WINED3D_MAX_CONSTS_I, 16 */ WORD local_bool_consts; /* WINED3D_MAX_CONSTS_B, 16 */ UINT cb_sizes[WINED3D_MAX_CBS]; + uint32_t cb_map; /* WINED3D_MAX_CBS, 15 */ struct wined3d_shader_resource_info resource_info[MAX_SHADER_RESOURCE_VIEWS]; + uint32_t resource_map[WINED3D_BITMAP_SIZE(MAX_SHADER_RESOURCE_VIEWS)]; struct wined3d_shader_sampler_map sampler_map; DWORD sampler_comparison_mode; BYTE bumpmat; /* WINED3D_MAX_TEXTURES, 8 */ @@ -2230,6 +2234,7 @@ enum wined3d_retired_object_type_vk { WINED3D_RETIRED_FREE_VK, WINED3D_RETIRED_FRAMEBUFFER_VK, + WINED3D_RETIRED_DESCRIPTOR_POOL_VK, WINED3D_RETIRED_MEMORY_VK, WINED3D_RETIRED_ALLOCATOR_BLOCK_VK, WINED3D_RETIRED_BO_SLAB_SLICE_VK, @@ -2247,6 +2252,7 @@ struct wined3d_retired_object_vk { struct wined3d_retired_object_vk *next; VkFramebuffer vk_framebuffer; + VkDescriptorPool vk_descriptor_pool; VkDeviceMemory vk_memory; struct wined3d_allocator_block *block; struct @@ -2293,12 +2299,46 @@ struct wined3d_render_pass_vk VkRenderPass vk_render_pass; }; +enum wined3d_shader_descriptor_type +{ + WINED3D_SHADER_DESCRIPTOR_TYPE_CBV, + WINED3D_SHADER_DESCRIPTOR_TYPE_SRV, + WINED3D_SHADER_DESCRIPTOR_TYPE_UAV, + WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER, + WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, +}; + +struct wined3d_shader_resource_binding +{ + enum wined3d_shader_type shader_type; + enum wined3d_shader_descriptor_type shader_descriptor_type; + size_t resource_idx; + enum wined3d_shader_resource_type resource_type; + enum wined3d_data_type resource_data_type; + size_t binding_idx; +}; + +struct wined3d_shader_resource_bindings +{ + struct wined3d_shader_resource_binding *bindings; + SIZE_T size, count; +}; + struct wined3d_context_vk { struct wined3d_context c; const struct wined3d_vk_info *vk_info; + uint32_t update_compute_pipeline : 1; + uint32_t padding : 31; + + struct + { + VkPipeline vk_pipeline; + struct wined3d_shader_resource_bindings bindings; + } compute; + VkCommandPool vk_command_pool; struct wined3d_command_buffer_vk current_command_buffer; uint64_t completed_command_buffer_id; @@ -2310,6 +2350,10 @@ struct wined3d_context_vk SIZE_T buffer_count; } submitted; + VkDescriptorPool vk_descriptor_pool; + VkPipelineLayout vk_pipeline_layout; + VkDescriptorSetLayout vk_set_layout; + struct wined3d_retired_objects_vk retired; struct wine_rb_tree render_passes; struct wine_rb_tree bo_slab_available; @@ -2324,6 +2368,8 @@ struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3 unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) DECLSPEC_HIDDEN; VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, unsigned int pool, size_t size) DECLSPEC_HIDDEN; +VkCommandBuffer wined3d_context_vk_apply_compute_state(struct wined3d_context_vk *context_vk, + const struct wined3d_state *state, struct wined3d_buffer_vk *indirect_vk) DECLSPEC_HIDDEN; void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; @@ -3621,13 +3667,6 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } -static inline BOOL isStateDirty(const struct wined3d_context *context, unsigned int state_id) -{ - unsigned int idx = state_id / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); - unsigned int shift = state_id & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); - return context->dirty_graphics_states[idx] & (1u << shift); -} - static inline float wined3d_alpha_ref(const struct wined3d_state *state) { return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f; @@ -5634,6 +5673,11 @@ static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *v *max_z = max(vp->max_z, vp->min_z + 0.001f); } +static inline BOOL wined3d_bitmap_set(uint32_t *map, unsigned int idx) +{ + return map[idx >> 5] |= (1u << (idx & 0x1f)); +} + static inline BOOL wined3d_bitmap_is_set(const uint32_t *map, unsigned int idx) { return map[idx >> 5] & (1u << (idx & 0x1f)); @@ -5693,6 +5737,21 @@ static inline BOOL wined3d_bitmap_get_range(const DWORD *bitmap, unsigned int bi return TRUE; } +static inline bool wined3d_context_is_graphics_state_dirty(const struct wined3d_context *context, unsigned int state_id) +{ + return wined3d_bitmap_is_set(context->dirty_graphics_states, state_id); +} + +static inline bool wined3d_context_is_compute_state_dirty(const struct wined3d_context *context, unsigned int state_id) +{ + return wined3d_bitmap_is_set(context->dirty_compute_states, state_id - STATE_COMPUTE_OFFSET); +} + +static inline bool isStateDirty(const struct wined3d_context *context, unsigned int state_id) +{ + return wined3d_context_is_graphics_state_dirty(context, state_id); +} + static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d_format *format) { VkImageAspectFlags mask = 0; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Introduce a SPIR-V shader backend for the Vulkan adapter.
by Henri Verbeet 12 May '20

12 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/shader_spirv.c | 194 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 + 4 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 dlls/wined3d/shader_spirv.c diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 35f329120b3..d0ddd3acf3e 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -24,6 +24,7 @@ C_SRCS = \ shader.c \ shader_sm1.c \ shader_sm4.c \ + shader_spirv.c \ state.c \ stateblock.c \ surface.c \ diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f06cf30f273..3732d7dffce 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1886,7 +1886,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->misc_state_template = misc_state_template_vk; - adapter->shader_backend = &none_shader_backend; + adapter->shader_backend = wined3d_spirv_shader_backend_init_vk(); wined3d_adapter_vk_init_d3d_info(adapter, wined3d_creation_flags); diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c new file mode 100644 index 00000000000..b9194f32f2f --- /dev/null +++ b/dlls/wined3d/shader_spirv.c @@ -0,0 +1,194 @@ +/* + * Copyright 2018 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 "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); + +static const struct wined3d_shader_backend_ops spirv_shader_backend_vk; + +struct shader_spirv_priv +{ + const struct wined3d_vertex_pipe_ops *vertex_pipe; + const struct wined3d_fragment_pipe_ops *fragment_pipe; + bool ffp_proj_control; +}; + +static void shader_spirv_handle_instruction(const struct wined3d_shader_instruction *ins) +{ +} + +static void shader_spirv_precompile(void *shader_priv, struct wined3d_shader *shader) +{ + WARN("Not implemented.\n"); +} + +static void shader_spirv_select(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) +{ + struct shader_spirv_priv *priv = shader_priv; + + priv->vertex_pipe->vp_enable(context, !use_vs(state)); + priv->fragment_pipe->fp_enable(context, !use_ps(state)); +} + +static void shader_spirv_select_compute(void *shader_priv, + struct wined3d_context *context, const struct wined3d_state *state) +{ + FIXME("Not implemented.\n"); +} + +static void shader_spirv_disable(void *shader_priv, struct wined3d_context *context) +{ + struct shader_spirv_priv *priv = shader_priv; + + priv->vertex_pipe->vp_enable(context, false); + priv->fragment_pipe->fp_enable(context, false); + + context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) + | (1u << WINED3D_SHADER_TYPE_VERTEX) + | (1u << WINED3D_SHADER_TYPE_GEOMETRY) + | (1u << WINED3D_SHADER_TYPE_HULL) + | (1u << WINED3D_SHADER_TYPE_DOMAIN) + | (1u << WINED3D_SHADER_TYPE_COMPUTE); +} + +static void shader_spirv_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) +{ + WARN("Not implemented.\n"); +} + +static void shader_spirv_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) +{ + WARN("Not implemented.\n"); +} + +static void shader_spirv_load_constants(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) +{ + WARN("Not implemented.\n"); +} + +static void shader_spirv_destroy(struct wined3d_shader *shader) +{ +} + +static HRESULT shader_spirv_alloc(struct wined3d_device *device, + const struct wined3d_vertex_pipe_ops *vertex_pipe, const struct wined3d_fragment_pipe_ops *fragment_pipe) +{ + struct fragment_caps fragment_caps; + void *vertex_priv, *fragment_priv; + struct shader_spirv_priv *priv; + + if (!(priv = heap_alloc(sizeof(*priv)))) + return E_OUTOFMEMORY; + + if (!(vertex_priv = vertex_pipe->vp_alloc(&spirv_shader_backend_vk, priv))) + { + ERR("Failed to initialise vertex pipe.\n"); + heap_free(priv); + return E_FAIL; + } + + if (!(fragment_priv = fragment_pipe->alloc_private(&spirv_shader_backend_vk, priv))) + { + ERR("Failed to initialise fragment pipe.\n"); + vertex_pipe->vp_free(device, NULL); + heap_free(priv); + return E_FAIL; + } + + priv->vertex_pipe = vertex_pipe; + priv->fragment_pipe = fragment_pipe; + fragment_pipe->get_caps(device->adapter, &fragment_caps); + priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + + device->vertex_priv = vertex_priv; + device->fragment_priv = fragment_priv; + device->shader_priv = priv; + + return WINED3D_OK; +} + +static void shader_spirv_free(struct wined3d_device *device, struct wined3d_context *context) +{ + struct shader_spirv_priv *priv = device->shader_priv; + + priv->fragment_pipe->free_private(device, context); + priv->vertex_pipe->vp_free(device, context); + heap_free(priv); +} + +static BOOL shader_spirv_allocate_context_data(struct wined3d_context *context) +{ + return TRUE; +} + +static void shader_spirv_free_context_data(struct wined3d_context *context) +{ +} + +static void shader_spirv_init_context_state(struct wined3d_context *context) +{ +} + +static void shader_spirv_get_caps(const struct wined3d_adapter *adapter, struct shader_caps *caps) +{ + memset(caps, 0, sizeof(*caps)); +} + +static BOOL shader_spirv_color_fixup_supported(struct color_fixup_desc fixup) +{ + return is_identity_fixup(fixup); +} + +static BOOL shader_spirv_has_ffp_proj_control(void *shader_priv) +{ + struct shader_spirv_priv *priv = shader_priv; + + return priv->ffp_proj_control; +} + +static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = +{ + .shader_handle_instruction = shader_spirv_handle_instruction, + .shader_precompile = shader_spirv_precompile, + .shader_select = shader_spirv_select, + .shader_select_compute = shader_spirv_select_compute, + .shader_disable = shader_spirv_disable, + .shader_update_float_vertex_constants = shader_spirv_update_float_vertex_constants, + .shader_update_float_pixel_constants = shader_spirv_update_float_pixel_constants, + .shader_load_constants = shader_spirv_load_constants, + .shader_destroy = shader_spirv_destroy, + .shader_alloc_private = shader_spirv_alloc, + .shader_free_private = shader_spirv_free, + .shader_allocate_context_data = shader_spirv_allocate_context_data, + .shader_free_context_data = shader_spirv_free_context_data, + .shader_init_context_state = shader_spirv_init_context_state, + .shader_get_caps = shader_spirv_get_caps, + .shader_color_fixup_supported = shader_spirv_color_fixup_supported, + .shader_has_ffp_proj_control = shader_spirv_has_ffp_proj_control, +}; + +const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void) +{ + return &spirv_shader_backend_vk; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e198e9b692c..145c39b7920 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1470,6 +1470,8 @@ extern const struct wined3d_shader_backend_ops glsl_shader_backend DECLSPEC_HIDD extern const struct wined3d_shader_backend_ops arb_program_shader_backend DECLSPEC_HIDDEN; extern const struct wined3d_shader_backend_ops none_shader_backend DECLSPEC_HIDDEN; +const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void) DECLSPEC_HIDDEN; + #define GL_EXTCALL(f) (gl_info->gl_ops.ext.p_##f) #define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff) -- 2.20.1

1 0

[PATCH 2/5] wined3d: Check for a bound compute shader in wined3d_cs_exec_dispatch().
by Henri Verbeet 12 May '20

12 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 7 ------- dlls/wined3d/cs.c | 5 ++++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c21ecfd5c32..b168e6026a6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3901,13 +3901,6 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state wined3d_context_gl_apply_compute_state(context_gl, device, state); - if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) - { - context_release(&context_gl->c); - WARN("No compute shader bound, skipping dispatch.\n"); - return; - } - if (parameters->indirect) { const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 85e696d4d19..c704daaf57e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -785,7 +785,10 @@ static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_dispatch *op = data; struct wined3d_state *state = &cs->state; - cs->device->adapter->adapter_ops->adapter_dispatch_compute(cs->device, state, &op->parameters); + if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) + WARN("No compute shader bound, skipping dispatch.\n"); + else + cs->device->adapter->adapter_ops->adapter_dispatch_compute(cs->device, state, &op->parameters); if (op->parameters.indirect) wined3d_resource_release(&op->parameters.u.indirect.buffer->resource); -- 2.20.1

1 0

[PATCH 1/5] wined3d: Introduce WINED3D_BITMAP_SIZE.
by Henri Verbeet 12 May '20

12 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e20d1fc9b0..e198e9b692c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -80,6 +80,8 @@ #define WINED3D_ALPHA_TO_COVERAGE_ENABLE MAKEFOURCC('A','2','M','1') #define WINED3D_ALPHA_TO_COVERAGE_DISABLE MAKEFOURCC('A','2','M','0') +#define WINED3D_BITMAP_SIZE(x) (((x) + 31) >> 5) + struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; @@ -1969,8 +1971,8 @@ struct wined3d_context { const struct wined3d_d3d_info *d3d_info; const struct wined3d_state_entry *state_table; - uint32_t dirty_graphics_states[STATE_HIGHEST / (sizeof(uint32_t) * CHAR_BIT) + 1]; - uint32_t dirty_compute_states[STATE_COMPUTE_COUNT / (sizeof(uint32_t) * CHAR_BIT) + 1]; + uint32_t dirty_graphics_states[WINED3D_BITMAP_SIZE(STATE_HIGHEST)]; + uint32_t dirty_compute_states[WINED3D_BITMAP_SIZE(STATE_COMPUTE_COUNT)]; struct wined3d_device *device; struct wined3d_swapchain *swapchain; @@ -4164,16 +4166,16 @@ struct wined3d_vertex_declaration struct wined3d_saved_states { - DWORD vs_consts_f[WINED3D_MAX_VS_CONSTS_F >> 5]; + uint32_t vs_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_VS_CONSTS_F)]; WORD vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ - DWORD ps_consts_f[WINED3D_MAX_PS_CONSTS_F >> 5]; + uint32_t ps_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_PS_CONSTS_F)]; WORD pixelShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ WORD pixelShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ - DWORD transform[(WINED3D_HIGHEST_TRANSFORM_STATE >> 5) + 1]; + uint32_t transform[WINED3D_BITMAP_SIZE(WINED3D_HIGHEST_TRANSFORM_STATE + 1)]; WORD streamSource; /* WINED3D_MAX_STREAMS, 16 */ WORD streamFreq; /* WINED3D_MAX_STREAMS, 16 */ - DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; + uint32_t renderState[WINED3D_BITMAP_SIZE(WINEHIGHEST_RENDER_STATE + 1)]; DWORD textureState[WINED3D_MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[WINED3D_MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ DWORD clipplane; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ -- 2.20.1

1 0

[PATCH 1/4] shlwapi: Forward SHQueryInfoKey() to shcore.dll.
by Nikolay Sivov 12 May '20

12 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/reg.c | 31 ------------------------------- dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index f33047ab38..83d83d3cb2 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -120,37 +120,6 @@ DWORD WINAPI SHSetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, return dwRet; } -/************************************************************************* - * SHQueryInfoKeyA [SHLWAPI.@] - * - * Get information about a registry key. See RegQueryInfoKeyA(). - * - * RETURNS - * The result of calling RegQueryInfoKeyA(). - */ -LONG WINAPI SHQueryInfoKeyA(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax, - LPDWORD pwValues, LPDWORD pwValueMax) -{ - TRACE("(hkey=%p,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax, - pwValues, pwValueMax); - return RegQueryInfoKeyA(hKey, NULL, NULL, NULL, pwSubKeys, pwSubKeyMax, - NULL, pwValues, pwValueMax, NULL, NULL, NULL); -} - -/************************************************************************* - * SHQueryInfoKeyW [SHLWAPI.@] - * - * See SHQueryInfoKeyA. - */ -LONG WINAPI SHQueryInfoKeyW(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax, - LPDWORD pwValues, LPDWORD pwValueMax) -{ - TRACE("(hkey=%p,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax, - pwValues, pwValueMax); - return RegQueryInfoKeyW(hKey, NULL, NULL, NULL, pwSubKeys, pwSubKeyMax, - NULL, pwValues, pwValueMax, NULL, NULL, NULL); -} - /************************************************************************* * SHQueryValueExA [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a0782607a7..98a3ab7d99 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -709,8 +709,8 @@ @ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W @ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA @ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW -@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) -@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) +@ stdcall -import SHQueryInfoKeyA(long ptr ptr ptr ptr) +@ stdcall -import SHQueryInfoKeyW(long ptr ptr ptr ptr) @ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) @ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) @ stdcall SHRegCloseUSKey(ptr) -- 2.26.2

1 3

[PATCH v2 5/6] quartz/vmr9: Destroy the window when set to windowless or renderless mode.
by Zebediah Figura 12 May '20

12 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: mark now succeeding test. This supersedes <https://source.winehq.org/patches/data/185092>; the other patches in that series shouldn't need to be modified. dlls/quartz/tests/vmr9.c | 10 +++++----- dlls/quartz/vmr9.c | 34 ++++++++++++---------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 93c2e504a07..6fe2a9bab10 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1734,8 +1734,8 @@ static void test_overlay(void) hwnd = (HWND)0xdeadbeef; hr = IOverlay_GetWindowHandle(overlay, &hwnd); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); - todo_wine ok(hwnd == (HWND)0xdeadbeef, "Got invalid window %p.\n", hwnd); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hwnd == (HWND)0xdeadbeef, "Got window %p.\n", hwnd); IOverlay_Release(overlay); IPin_Release(pin); @@ -1750,8 +1750,8 @@ static void test_overlay(void) hwnd = (HWND)0xdeadbeef; hr = IOverlay_GetWindowHandle(overlay, &hwnd); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); - todo_wine ok(hwnd == (HWND)0xdeadbeef, "Got invalid window %p.\n", hwnd); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hwnd == (HWND)0xdeadbeef, "Got window %p.\n", hwnd); IOverlay_Release(overlay); IPin_Release(pin); @@ -3854,7 +3854,7 @@ static void test_windowless_size(void) SetRect(&expect, 4, 6, 16, 12); ok(EqualRect(&src, &expect), "Got source rect %s.\n", wine_dbgstr_rect(&src)); SetRect(&expect, 40, 60, 120, 160); - todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); GetWindowRect(window, &src); SetRect(&expect, 0, 0, 640, 480); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d3e75f21ede..32af06e5fac 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -458,13 +458,12 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE static void vmr_start_stream(struct strmbase_renderer *iface) { - struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - - TRACE("(%p)\n", This); + struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - IVMRImagePresenter9_StartPresenting(This->presenter, This->cookie); - ShowWindow(This->window.hwnd, SW_SHOW); - SetEvent(This->run_event); + IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); + if (filter->window.hwnd) + ShowWindow(filter->window.hwnd, SW_SHOW); + SetEvent(filter->run_event); } static void vmr_stop_stream(struct strmbase_renderer *iface) @@ -1354,6 +1353,9 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface return E_INVALIDARG; } + if (mode != VMR9Mode_Windowed) + video_window_cleanup(&This->window); + This->mode = mode; LeaveCriticalSection(&This->renderer.filter.csFilter); return hr; @@ -1459,13 +1461,7 @@ static HRESULT WINAPI VMR7WindowlessControl_SetVideoPosition(IVMRWindowlessContr if (source) This->window.src = *source; if (dest) - { This->window.dst = *dest; - FIXME("Output rectangle: %s.\n", wine_dbgstr_rect(dest)); - SetWindowPos(This->window.hwnd, NULL, - dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, - SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | SWP_NOREDRAW); - } LeaveCriticalSection(&This->renderer.filter.csFilter); @@ -1662,13 +1658,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr if (source) This->window.src = *source; if (dest) - { This->window.dst = *dest; - FIXME("Output rectangle: %s.\n", wine_dbgstr_rect(dest)); - SetWindowPos(This->window.hwnd, NULL, - dest->left, dest->top, dest->right - dest->left, dest->bottom - dest->top, - SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | SWP_NOREDRAW); - } LeaveCriticalSection(&This->renderer.filter.csFilter); @@ -1740,7 +1730,7 @@ static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 FIXME("(%p/%p)->(...) semi-stub\n", iface, This); EnterCriticalSection(&This->renderer.filter.csFilter); - if (hwnd != This->clipping_window && hwnd != This->window.hwnd) + if (hwnd != This->clipping_window) { ERR("Not handling changing windows yet!!!\n"); LeaveCriticalSection(&This->renderer.filter.csFilter); @@ -2214,6 +2204,9 @@ static HRESULT WINAPI overlay_GetWindowHandle(IOverlay *iface, HWND *window) TRACE("filter %p, window %p.\n", filter, window); + if (!filter->window.hwnd) + return VFW_E_WRONG_STATE; + *window = filter->window.hwnd; return S_OK; } @@ -2424,12 +2417,9 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac { struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); HRESULT hr; - RECT output; BOOL render = FALSE; TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9); - GetWindowRect(This->pVMR9->window.hwnd, &output); - TRACE("Output rectangle: %s\n", wine_dbgstr_rect(&output)); /* This might happen if we don't have active focus (eg on a different virtual desktop) */ if (!This->d3d9_dev) -- 2.26.2

1 0

[PATCH 5/5] qcap/videocapture: Initialize caps struct.
by Jactry Zeng 12 May '20

12 May '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/v4l.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index afc9bf2c93..449951ad53 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -442,6 +442,7 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, { LONG depth = 24; + memset(caps, 0, sizeof(*caps)); caps->video_info.dwBitRate = width * height * depth * max_fps; caps->video_info.bmiHeader.biSize = sizeof(caps->video_info.bmiHeader); caps->video_info.bmiHeader.biWidth = width; -- 2.26.2

3 2

[PATCH 2/5] qcap/tests: Add interface tests for video capture filter.
by Jactry Zeng 12 May '20

12 May '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/videocapture.c | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 448136791b..cd613b00e7 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -23,6 +23,21 @@ #include "wine/test.h" #include "wine/strmbase.h" +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static void test_media_types(IPin *pin) { IEnumMediaTypes *enum_media_types; @@ -176,11 +191,48 @@ static void test_capture(IBaseFilter *filter) { test_media_types(pin); test_stream_config(pin); + + todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); + check_interface(pin, &IID_IAMStreamConfig, TRUE); + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IKsPropertySet, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); + + check_interface(pin, &IID_IAMCrossbar, FALSE); + check_interface(pin, &IID_IAMDroppedFrames, FALSE); + check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); + check_interface(pin, &IID_IAMPushSource, FALSE); + check_interface(pin, &IID_IAMTVTuner, FALSE); + check_interface(pin, &IID_IAMVideoCompression, FALSE); + check_interface(pin, &IID_IAMVideoProcAmp, FALSE); + check_interface(pin, &IID_IPersistPropertyBag, FALSE); } IPin_Release(pin); } IEnumPins_Release(enum_pins); + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + todo_wine check_interface(filter, &IID_IAMVideoControl, TRUE); + check_interface(filter, &IID_IAMVideoProcAmp, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); + todo_wine check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersistPropertyBag, TRUE); + todo_wine check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); + + check_interface(filter, &IID_IAMCrossbar, FALSE); + check_interface(filter, &IID_IAMPushSource, FALSE); + check_interface(filter, &IID_IAMStreamConfig, FALSE); + check_interface(filter, &IID_IAMTVTuner, FALSE); + check_interface(filter, &IID_IAMVideoCompression, FALSE); + check_interface(filter, &IID_IAMVfwCaptureDialogs, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IOverlayNotify, FALSE); } START_TEST(videocapture) -- 2.26.2

2 1

[PATCH 1/5] include: Add some interface definitions for axextend.idl.
by Jactry Zeng 12 May '20

12 May '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/Makefile.in | 3 + include/axextend.idl | 183 ++++++++++++++++++++++++++++++++ include/axextendenums.h | 32 ++++++ include/exposeenums2managed.h | 29 +++++ include/unexposeenums2managed.h | 20 ++++ 5 files changed, 267 insertions(+) create mode 100644 include/axextendenums.h create mode 100644 include/exposeenums2managed.h create mode 100644 include/unexposeenums2managed.h diff --git a/include/Makefile.in b/include/Makefile.in index 07ab7b7e8f..9c64ca293d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -36,6 +36,7 @@ SOURCES = \ avrt.h \ axcore.idl \ axextend.idl \ + axextendenums.h \ basetsd.h \ basetyps.h \ bcrypt.h \ @@ -268,6 +269,7 @@ SOURCES = \ errorrep.h \ errors.h \ errrec.idl \ + exposeenums2managed.h \ evcode.h \ evntprov.h \ evntrace.h \ @@ -680,6 +682,7 @@ SOURCES = \ uiautomationcoreapi.h \ uiribbon.idl \ unknwn.idl \ + unexposeenums2managed.h \ urlhist.idl \ urlmon.idl \ userenv.h \ diff --git a/include/axextend.idl b/include/axextend.idl index 6efe659fda..8b46d665b5 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -20,6 +20,8 @@ #pragma makedep install #endif +#include <axextendenums.h> + interface IAMAnalogVideoDecoder; interface IAMAnalogVideoEncoder; interface IAMAudioInputMixer; @@ -1288,3 +1290,184 @@ interface IAMVfwCaptureDialogs : IUnknown [in] long data1, [in] long data2); } + +[ + local, + object, + uuid(6a2e0670-28e4-11d0-a18c-00a0c9118956), + pointer_default(unique) +] +interface IAMVideoControl : IUnknown +{ + HRESULT GetCaps([in] IPin *pin, [out] long *flags); + HRESULT SetMode([in] IPin *pin, long mode); + HRESULT GetMode([in] IPin *pin, [out] long *mode); + HRESULT GetCurrentActualFrameRate([in] IPin *pin, [out] LONGLONG *frame_rate); + HRESULT GetMaxAvailableFrameRate([in] IPin *pin, [in] long index, + [in] SIZE dimensions, [out] LONGLONG *frame_rate); + HRESULT GetFrameRateList([in] IPin *pin, [in] long index, [in] SIZE dimensions, + [out] long *list_size, [out] LONGLONG **frame_rate); +} + +[ + local, + object, + uuid(56ed71a0-af5f-11d0-b3f0-00aa003761c5), + pointer_default(unique) +] +interface IAMBufferNegotiation : IUnknown +{ + HRESULT SuggestAllocatorProperties([in] const ALLOCATOR_PROPERTIES *prop); + HRESULT GetAllocatorProperties([out] ALLOCATOR_PROPERTIES *prop); +} + +[ + local, + object, + uuid(c6e13344-30ac-11d0-a18c-00a0c9118956), + pointer_default(unique) +] +interface IAMDroppedFrames : IUnknown +{ + HRESULT GetNumDropped([out] long *number); + HRESULT GetNumNotDropped([out] long *number); + HRESULT GetDroppedInfo([in] long size, [out] long *array, [out] long *copied); + HRESULT GetAverageFrameSize([out] long *size); +} + +[ + local, + object, + uuid(62ea93ba-ec62-11d2-b770-00c04fb6bd3d), + pointer_default(unique) +] +interface IAMLatency : IUnknown +{ + HRESULT GetLatency([in, out] REFERENCE_TIME *latency); +} + +[ + local, + object, + uuid(f185fe76-e64e-11d2-b76e-00c04fb6bd3d), + pointer_default(unique) +] +interface IAMPushSource : IAMLatency +{ + HRESULT GetPushSourceFlags([out] ULONG *flags); + HRESULT SetPushSourceFlags([in] ULONG flags); + HRESULT SetStreamOffset([in] REFERENCE_TIME offset); + HRESULT GetStreamOffset([out] REFERENCE_TIME *offset); + HRESULT GetMaxStreamOffset([out] REFERENCE_TIME *offset); + HRESULT SetMaxStreamOffset([in] REFERENCE_TIME offset); +}; + +[ + local, + object, + uuid(c6e13343-30ac-11d0-a18c-00a0c9118956), + pointer_default(unique) +] +interface IAMVideoCompression : IUnknown +{ + HRESULT put_KeyFrameRate([in] long frame_rate); + HRESULT get_KeyFrameRate([out] long *frame_rate); + HRESULT put_PFramesPerKeyFrame([in] long frame); + HRESULT get_PFramesPerKeyFrame([out] long *frame); + HRESULT put_Quality([in] double quality); + HRESULT get_Quality([out] double *quality); + HRESULT put_WindowSize([in] DWORDLONG size); + HRESULT get_WindowSize([out] DWORDLONG *size); + HRESULT GetInfo([out, size_is(*version_size)] LPWSTR version, [in, out] int *version_size, + [out, size_is(*description_size)] LPWSTR description, [in, out] int *description_size, + [out] long *frame_rate, [out] long *key, [out] double *quality, [out] long *capabilities); + HRESULT OverrideKeyFrame([in] long number); + HRESULT OverrideFrameSize([in] long number, [in] long size); +} + +[ + local, + object, + uuid(c6e13380-30ac-11d0-a18c-00a0c9118956), + pointer_default(unique) +] +interface IAMCrossbar : IUnknown +{ + HRESULT get_PinCounts([out] long *output, [out] long *intput); + HRESULT CanRoute([in] long output, [in] long input); + HRESULT Route([in] long output, [in] long input); + HRESULT get_IsRoutedTo([in] long output, [out] long *input); + HRESULT get_CrossbarPinInfo([in] BOOL is_input, [in] long index, + [out] long *related, [out] long *type); +} + +typedef enum tagAMTunerEventType +{ + AMTUNER_EVENT_CHANGED = 0x0001, +} AMTunerEventType; + +[ + local, + object, + uuid(211a8760-03ac-11d1-8d13-00aa00bd8339), + pointer_default(unique) +] +interface IAMTunerNotification : IUnknown +{ + HRESULT OnEvent([in] AMTunerEventType event); +} + +typedef enum tagAMTunerModeType +{ + AMTUNER_MODE_DEFAULT = 0x0000, + AMTUNER_MODE_TV = 0x0001, + AMTUNER_MODE_FM_RADIO = 0x0002, + AMTUNER_MODE_AM_RADIO = 0x0004, + AMTUNER_MODE_DSS = 0x0008, +} AMTunerModeType; + +[ + local, + object, + uuid(211a8761-03ac-11d1-8d13-00aa00bd8339), + pointer_default(unique) +] +interface IAMTuner : IUnknown +{ + HRESULT put_Channel([in] long channel, [in] long video, [in] long audio); + HRESULT get_Channel([out] long *channel, [out] long *video, [out] long *audio); + HRESULT ChannelMinMax([out] long *min, [out] long *max); + HRESULT put_CountryCode([in] long country); + HRESULT get_CountryCode([out] long *country); + HRESULT put_TuningSpace([in] long tuning_space); + HRESULT get_TuningSpace([out] long *tuning_space); + [local] HRESULT Logon([in] HANDLE user); + HRESULT Logout(); + HRESULT SignalPresent([out] long *signal_strength); + HRESULT put_Mode([in] AMTunerModeType mode); + HRESULT get_Mode([out] AMTunerModeType *mode); + HRESULT GetAvailableModes([out] long *modes); + HRESULT RegisterNotificationCallBack([in] IAMTunerNotification *notify, [in] long events); + HRESULT UnRegisterNotificationCallBack([in] IAMTunerNotification *notify); +} + +[ + local, + object, + uuid(211a8766-03ac-11d1-8d13-00aa00bd8339), + pointer_default(unique) +] +interface IAMTVTuner : IAMTuner +{ + HRESULT get_AvailableTVFormats([out] long *standard); + HRESULT get_TVFormat([out] long *standard); + HRESULT AutoTune([in] long channel, [out] long *signal); + HRESULT StoreAutoTune(); + HRESULT get_NumInputConnections([out] long *number); + HRESULT put_InputType([in] long index, [in] TunerInputType type); + HRESULT get_InputType([in] long index, [out] TunerInputType *type); + HRESULT put_ConnectInput([in] long index); + HRESULT get_ConnectInput([out] long *index); + HRESULT get_VideoFrequency([out] long *freq); + HRESULT get_AudioFrequency([out] long *freq); +} diff --git a/include/axextendenums.h b/include/axextendenums.h new file mode 100644 index 0000000000..add145a37b --- /dev/null +++ b/include/axextendenums.h @@ -0,0 +1,32 @@ +/* + * Copyright 2020 Jactry Zeng 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 + */ + +#ifndef AXEXTEND_ENUM_H +#define AXEXTEND_ENUM_H + +#include <exposeenums2managed.h> + +ENUM16 TAG(TunerInputType) +{ + TunerInputCable, + TunerInputAntenna +} TunerInputType; + +#include <unexposeenums2managed.h> + +#endif /* AXEXTEND_ENUM_H */ diff --git a/include/exposeenums2managed.h b/include/exposeenums2managed.h new file mode 100644 index 0000000000..3f2e17cfc5 --- /dev/null +++ b/include/exposeenums2managed.h @@ -0,0 +1,29 @@ +/* + * Copyright 2020 Jactry Zeng 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 + */ + +#ifdef MANAGED_ENUMS + +#define TAG(x) x +#define ENUM16 ENUM + +#else /* MANAGED_ENUMS */ + +#define TAG(x) tag##x +#define ENUM16 typedef enum + +#endif /* MANAGED_ENUMS */ diff --git a/include/unexposeenums2managed.h b/include/unexposeenums2managed.h new file mode 100644 index 0000000000..e38149c5ea --- /dev/null +++ b/include/unexposeenums2managed.h @@ -0,0 +1,20 @@ +/* + * Copyright 2020 Jactry Zeng 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 + */ + +#undef ENUM16 +#undef TAG -- 2.26.2

2 1

[PATCH v2] winegstreamer: Unref the GstCaps object in init_new_decoded_pad().
by Akihiro Sagawa 12 May '20

12 May '20

In v2, call gst_caps_unref() before returning. Zebediah, thanks for reviewing. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)

2 1

[PATCH 4/5] qcap/videocapture: Implement IAMVideoControl interface.
by Jactry Zeng 12 May '20

12 May '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/videocapture.c | 2 +- dlls/qcap/vfwcapture.c | 99 ++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 5699b2e3cc..80d4899410 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -216,7 +216,7 @@ static void test_capture(IBaseFilter *filter) IEnumPins_Release(enum_pins); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); - todo_wine check_interface(filter, &IID_IAMVideoControl, TRUE); + check_interface(filter, &IID_IAMVideoControl, TRUE); check_interface(filter, &IID_IAMVideoProcAmp, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 602ffc9a90..9430533ea1 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -48,6 +48,7 @@ typedef struct VfwCapture { struct strmbase_filter filter; IAMStreamConfig IAMStreamConfig_iface; + IAMVideoControl IAMVideoControl_iface; IAMVideoProcAmp IAMVideoProcAmp_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; IPersistPropertyBag IPersistPropertyBag_iface; @@ -68,6 +69,11 @@ static inline VfwCapture *impl_from_IAMStreamConfig(IAMStreamConfig *iface) return CONTAINING_RECORD(iface, VfwCapture, IAMStreamConfig_iface); } +static inline VfwCapture *impl_from_IAMVideoControl(IAMVideoControl *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, IAMVideoControl_iface); +} + static inline VfwCapture *impl_from_IAMVideoProcAmp(IAMVideoProcAmp *iface) { return CONTAINING_RECORD(iface, VfwCapture, IAMVideoProcAmp_iface); @@ -121,6 +127,8 @@ static HRESULT vfw_capture_query_interface(struct strmbase_filter *iface, REFIID if (IsEqualGUID(iid, &IID_IPersistPropertyBag)) *out = &filter->IPersistPropertyBag_iface; + else if (IsEqualGUID(iid, &IID_IAMVideoControl)) + *out = &filter->IAMVideoControl_iface; else if (IsEqualGUID(iid, &IID_IAMVideoProcAmp)) *out = &filter->IAMVideoProcAmp_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) @@ -613,6 +621,96 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_VTable = misc_flags_GetMiscFlags }; +static HRESULT WINAPI video_control_QueryInterface(IAMVideoControl *iface, REFIID riid, void **ppv) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, riid, ppv); +} + +static ULONG WINAPI video_control_AddRef(IAMVideoControl *iface) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI video_control_Release(IAMVideoControl *iface) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI video_control_GetCaps(IAMVideoControl *iface, IPin *pin, LONG *flags) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, flags %p: stub.\n", filter, pin, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_SetMode(IAMVideoControl *iface, IPin *pin, LONG mode) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, mode %d: stub.\n", filter, pin, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_GetMode(IAMVideoControl *iface, IPin *pin, LONG *mode) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, mode %p: stub.\n", filter, pin, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_GetCurrentActualFrameRate(IAMVideoControl *iface, IPin *pin, + LONGLONG *frame_rate) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, frame rate %p: stub.\n", filter, pin, frame_rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_GetMaxAvailableFrameRate(IAMVideoControl *iface, IPin *pin, + LONG index, SIZE dimensions, LONGLONG *frame_rate) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, index %d, dimensions (%dx%d), frame rate %p: stub.\n", + filter, pin, index, dimensions.cx, dimensions.cy, frame_rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_control_GetFrameRateList(IAMVideoControl *iface, IPin *pin, LONG index, + SIZE dimensions, LONG *list_size, LONGLONG **frame_rate) +{ + VfwCapture *filter = impl_from_IAMVideoControl(iface); + + FIXME("filter %p, pin %p, index %d, dimensions (%dx%d), list size %p, frame rate: %p: stub.\n", + filter, pin, index, dimensions.cx, dimensions.cy, list_size, frame_rate); + + return E_NOTIMPL; +} + +static const IAMVideoControlVtbl IAMVideoControl_VTable = +{ + video_control_QueryInterface, + video_control_AddRef, + video_control_Release, + video_control_GetCaps, + video_control_SetMode, + video_control_GetMode, + video_control_GetCurrentActualFrameRate, + video_control_GetMaxAvailableFrameRate, + video_control_GetFrameRateList +}; + HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) { static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; @@ -624,6 +722,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_VfwCapture, &filter_ops); object->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable; + object->IAMVideoControl_iface.lpVtbl = &IAMVideoControl_VTable; object->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable; object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_VTable; object->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; -- 2.26.2

2 1

[PATCH 3/5] qcap/videocapture: Implement IAMFilterMiscFlags interface.
by Jactry Zeng 12 May '20

12 May '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/videocapture.c | 19 +++++++++++++++- dlls/qcap/vfwcapture.c | 40 ++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index cd613b00e7..5699b2e3cc 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -215,7 +215,7 @@ static void test_capture(IBaseFilter *filter) IEnumPins_Release(enum_pins); - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); todo_wine check_interface(filter, &IID_IAMVideoControl, TRUE); check_interface(filter, &IID_IAMVideoProcAmp, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); @@ -235,6 +235,22 @@ static void test_capture(IBaseFilter *filter) check_interface(filter, &IID_IOverlayNotify, FALSE); } +static void test_misc_flags(IBaseFilter *filter) +{ + IAMFilterMiscFlags *misc_flags; + ULONG flags; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IAMFilterMiscFlags, (void **)&misc_flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + flags = IAMFilterMiscFlags_GetMiscFlags(misc_flags); + ok(flags == AM_FILTER_MISC_FLAGS_IS_SOURCE + || broken(!flags) /* win7 */, "Got wrong flags: %#x.\n", flags); + + IAMFilterMiscFlags_Release(misc_flags); +} + START_TEST(videocapture) { ICreateDevEnum *dev_enum; @@ -272,6 +288,7 @@ START_TEST(videocapture) if (hr == S_OK) { test_capture(filter); + test_misc_flags(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7b759f0173..602ffc9a90 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -49,6 +49,7 @@ typedef struct VfwCapture struct strmbase_filter filter; IAMStreamConfig IAMStreamConfig_iface; IAMVideoProcAmp IAMVideoProcAmp_iface; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; IPersistPropertyBag IPersistPropertyBag_iface; BOOL init; Capture *driver_info; @@ -72,6 +73,11 @@ static inline VfwCapture *impl_from_IAMVideoProcAmp(IAMVideoProcAmp *iface) return CONTAINING_RECORD(iface, VfwCapture, IAMVideoProcAmp_iface); } +static inline VfwCapture *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, IAMFilterMiscFlags_iface); +} + static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) { return CONTAINING_RECORD(iface, VfwCapture, IPersistPropertyBag_iface); @@ -117,6 +123,8 @@ static HRESULT vfw_capture_query_interface(struct strmbase_filter *iface, REFIID *out = &filter->IPersistPropertyBag_iface; else if (IsEqualGUID(iid, &IID_IAMVideoProcAmp)) *out = &filter->IAMVideoProcAmp_iface; + else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) + *out = &filter->IAMFilterMiscFlags_iface; else return E_NOINTERFACE; @@ -574,6 +582,37 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; +static HRESULT WINAPI misc_flags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) +{ + VfwCapture *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, riid, ppv); +} + +static ULONG WINAPI misc_flags_AddRef(IAMFilterMiscFlags *iface) +{ + VfwCapture *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI misc_flags_Release(IAMFilterMiscFlags *iface) +{ + VfwCapture *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static ULONG WINAPI misc_flags_GetMiscFlags(IAMFilterMiscFlags *iface) +{ + return AM_FILTER_MISC_FLAGS_IS_SOURCE; +} + +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_VTable = +{ + misc_flags_QueryInterface, + misc_flags_AddRef, + misc_flags_Release, + misc_flags_GetMiscFlags +}; + HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) { static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; @@ -586,6 +625,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) object->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable; object->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable; + object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_VTable; object->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; object->init = FALSE; -- 2.26.2

2 1

[PATCH 1/6] quartz/vmr9: Allow the aspect ratio parameters to be NULL in IVMRWindowlessControl9::GetNativeVideoSize().
by Zebediah Figura 12 May '20

12 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 6 +++--- dlls/quartz/vmr9.c | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index fc2794c5cb7..93c2e504a07 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3808,9 +3808,9 @@ static void test_windowless_size(void) width = height = 0xdeadbeef; hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(width == 32, "Got width %d.\n", width); - todo_wine ok(height == 16, "Got height %d.\n", height); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(width == 32, "Got width %d.\n", width); + ok(height == 16, "Got height %d.\n", height); aspect_width = aspect_height = 0xdeadbeef; hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, &aspect_width, &aspect_height); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c7ebdc6c573..44ad2965122 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1615,21 +1615,23 @@ static ULONG WINAPI VMR9WindowlessControl_Release(IVMRWindowlessControl9 *iface) return IUnknown_Release(This->renderer.filter.outer_unk); } -static HRESULT WINAPI VMR9WindowlessControl_GetNativeVideoSize(IVMRWindowlessControl9 *iface, LONG *width, LONG *height, LONG *arwidth, LONG *arheight) +static HRESULT WINAPI VMR9WindowlessControl_GetNativeVideoSize(IVMRWindowlessControl9 *iface, + LONG *width, LONG *height, LONG *aspect_width, LONG *aspect_height) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); - TRACE("(%p/%p)->(%p, %p, %p, %p)\n", iface, This, width, height, arwidth, arheight); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - if (!width || !height || !arwidth || !arheight) - { - ERR("Got no pointer\n"); + TRACE("filter %p, width %p, height %p, aspect_width %p, aspect_height %p.\n", + filter, width, height, aspect_width, aspect_height); + + if (!width || !height) return E_POINTER; - } - *width = This->bmiheader.biWidth; - *height = This->bmiheader.biHeight; - *arwidth = This->bmiheader.biWidth; - *arheight = This->bmiheader.biHeight; + *width = filter->bmiheader.biWidth; + *height = filter->bmiheader.biHeight; + if (aspect_width) + *aspect_width = filter->bmiheader.biWidth; + if (aspect_height) + *aspect_height = filter->bmiheader.biHeight; return S_OK; } -- 2.26.2

2 7

[PATCH] winex11.drv: Interpret mouse 6/7 as horiz scroll
by Murray Colpman 11 May '20

11 May '20

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 11 May '20

11 May '20

2 1

[PATCH v2] configure: Provide configure option for 64-bit installations.
by Adhir Ramjiawan 11 May '20

11 May '20

configure should provide hints of checking dependencies where possible when running on 64-bit platforms. Signed-off-by: Adhir Ramjiawan <adhirramjiawan0(a)gmail.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3e05113..4229578 100644 --- a/configure.ac +++ b/configure.ac @@ -147,7 +147,7 @@ case $host in CXX="$CXX -m32" AC_CACHE_CHECK([whether $CC works], wine_cv_cc_m32, [AC_LINK_IFELSE([AC_LANG_PROGRAM()],[wine_cv_cc_m32=yes],[wine_cv_cc_m32=no])]) - test $wine_cv_cc_m32 != no || AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.]) + test $wine_cv_cc_m32 != no || AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries. For 64-bit installation run with --enable-win64.]) host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") -- 2.17.1

1 0

[PATCH] configure: Provide option hint for 64-bit installations
by Adhir Ramjiawan 11 May '20

11 May '20

configure should provide hints of checking dependencies where possible when running on 64-bit platforms. Signed-off-by: Adhir Ramjiawan <adhirramjiawan0(a)gmail.com> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 27fb2fd..1a6d36f 100755 --- a/configure +++ b/configure @@ -5620,7 +5620,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_cc_m32" >&5 $as_echo "$wine_cv_cc_m32" >&6; } - test $wine_cv_cc_m32 != no || as_fn_error $? "Cannot build a 32-bit program, you need to install 32-bit development libraries." "$LINENO" 5 + test $wine_cv_cc_m32 != no || as_fn_error $? "Cannot build a 32-bit program, you need to install 32-bit development libraries. For 64-bit installation run with --enable-win64." "$LINENO" 5 host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="-m32" -- 2.17.1

2 2

[PATCH] msasn1: Add stub for ASN1_Decode function
by Vijay Kiran Kamuju 11 May '20

11 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2 1/6] quartz/tests: Fix a test failure on 32-bit Windows.
by Zebediah Figura 11 May '20

11 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 656f943ca35..3a3863ff508 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdint.h> #define COBJMACROS #include "ocidl.h" #include "olectl.h" @@ -70,6 +71,22 @@ static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TY && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); } +static BOOL compare_double(double f, double g, unsigned int ulps) +{ + int64_t x = *(int64_t *)&f; + int64_t y = *(int64_t *)&g; + + if (x < 0) + x = INT64_MIN - x; + if (y < 0) + y = INT64_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + static IFilterGraph2 *create_graph(void) { IFilterGraph2 *ret; @@ -3693,7 +3710,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + todo_wine ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); -- 2.26.2

2 6

[PATCH v5] wined3d: Allow setting user memory for mipmapped texture in wined3d_texture_update_desc().
by Paul Gofman 11 May '20

11 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - calculate pitches if necessary before comparision; - Add _SetSurfaceDesc tests for mipmap and DDSD_LPSURFACE. v4: - fix test failure on testbot Win8-10. v5: - fix unitialized slice_pitch usage. dlls/ddraw/tests/ddraw7.c | 96 ++++++++++++++++++++++++++++++--- dlls/wined3d/texture.c | 110 ++++++++++++++++++++++---------------- 2 files changed, 154 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ddd3cdb0e..6ffdd8ba5a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7126,6 +7126,64 @@ static void test_set_surface_desc(void) IDirectDrawSurface7_Release(surface); + /* Test mipmap texture. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U2(ddsd).dwMipMapCount = 3; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + if (FAILED(hr)) + { + skip("Mipmaps are not supported.\n"); + } + else + { + /* Changing surface desc for mipmap fails even without changing any + * parameters. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDSURFACETYPE, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + } + + /* Test surface created with DDSD_LPSURFACE. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + /* Cannot reset lpSurface. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + /* Can change the parameters of surface created with DDSD_LPSURFACE. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface); + /* SetSurfaceDesc needs systemmemory surfaces. * * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing @@ -13347,14 +13405,14 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); width = surface_desc.dwWidth; height = surface_desc.dwHeight; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, width, height, NULL, NULL, NULL, NULL); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); bpp = 0; if (SUCCEEDED(IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0))) @@ -13367,7 +13425,7 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", @@ -13379,9 +13437,9 @@ static void test_display_mode_surface_pixel_format(void) U5(surface_desc).dwBackBufferCount = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", @@ -13397,15 +13455,39 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwHeight = height; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, bpp); IDirectDrawSurface7_Release(surface); + /* Test compatibility mode mipmap texture creation. */ + hr = IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0); + ok(hr == DD_OK || hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + win_skip("SetDisplayMode failed, skipping test."); + goto done; + } + bpp = 16; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT | DDSD_PITCH; + U2(surface_desc).dwMipMapCount = 2; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + U1(surface_desc).lPitch = surface_desc.dwWidth * bpp / 8; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_VIDEOMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW, "Got unexpected hr %#x.\n", hr); + if (surface) + IDirectDrawSurface7_Release(surface); + +done: refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 49373eb58a..66e1678a06 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1748,9 +1748,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; - const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; + const struct wined3d *d3d; + BOOL set_user_memory_only; + unsigned int slice_pitch; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1765,10 +1767,28 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + set_user_memory_only = width == texture->resource.width && height == texture->resource.height + && format_id == texture->resource.format->id && multisample_type == texture->resource.multisample_type + && multisample_quality == texture->resource.multisample_quality; + + if (pitch) + slice_pitch = height * pitch; + else + wined3d_format_calculate_pitch(format, 1, width, height, &pitch, &slice_pitch); + + if (set_user_memory_only) + { + if (!texture->row_pitch) + wined3d_format_calculate_pitch(texture->resource.format, 1, texture->resource.width, + texture->resource.height, &texture->row_pitch, &texture->slice_pitch); + + set_user_memory_only = pitch == texture->row_pitch; + } + if (!resource_size) return WINED3DERR_INVALIDCALL; - if (texture->level_count * texture->layer_count > 1) + if (texture->level_count * texture->layer_count > 1 && !set_user_memory_only) { WARN("Texture has multiple sub-resources, not supported.\n"); return WINED3DERR_INVALIDCALL; @@ -1803,7 +1823,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_cs_emit_unload_resource(device->cs, &texture->resource); wined3d_resource_wait_idle(&texture->resource); - sub_resource = &texture->sub_resources[0]; if (texture->dc_info && texture->dc_info[0].dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; @@ -1815,55 +1834,56 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_free_sysmem(&texture->resource); - if ((texture->row_pitch = pitch)) - texture->slice_pitch = height * pitch; - else - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(format, 1, width, height, - &texture->row_pitch, &texture->slice_pitch); - - texture->resource.format = format; - texture->resource.multisample_type = multisample_type; - texture->resource.multisample_quality = multisample_quality; - texture->resource.width = width; - texture->resource.height = height; - if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) - adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); - texture->resource.size = texture->slice_pitch; - sub_resource->size = texture->slice_pitch; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - - if (texture->texture_ops == &texture_gl_ops) - { - if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + if (!set_user_memory_only) + { + sub_resource = &texture->sub_resources[0]; + + texture->row_pitch = pitch; + texture->slice_pitch = slice_pitch; + + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); + texture->resource.size = texture->slice_pitch; + sub_resource->size = texture->slice_pitch; + sub_resource->locations = WINED3D_LOCATION_DISCARDED; + + if (texture->texture_ops == &texture_gl_ops) { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; - texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } + else + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } + } + + if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot + && !d3d_info->texture_npot_conditional) + { + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = width; + texture->pow2_height = height; } } - if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot - && !d3d_info->texture_npot_conditional) - { - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = texture->pow2_height = 1; - while (texture->pow2_width < width) - texture->pow2_width <<= 1; - while (texture->pow2_height < height) - texture->pow2_height <<= 1; - } - else - { - texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = width; - texture->pow2_height = height; - } - if ((texture->user_memory = mem)) { texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; -- 2.26.2

1 0

[PATCH v2 2/2] setupapi: Add SetupDiGetActualSectionToInstallExA/W.
by Gijs Vermeulen 11 May '20

11 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49130 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- v2: fix TRACE, sorry for the noise. dlls/setupapi/devinst.c | 115 +++++++++++++++++++++--------------- dlls/setupapi/setupapi.spec | 2 + 2 files changed, 70 insertions(+), 47 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5bd2b88a02..777bd68f53 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1845,18 +1845,18 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO devinfo, SP_DEVINFO_DATA *devic } /*********************************************************************** - * SetupDiGetActualSectionToInstallA (SETUPAPI.@) + * SetupDiGetActualSectionToInstallExA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF hinf, const char *section, - char *section_ext, DWORD size, DWORD *needed, char **extptr) +BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF hinf, const char *section, SP_ALTPLATFORM_INFO *altplatform, + char *section_ext, DWORD size, DWORD *needed, char **extptr, void *reserved) { WCHAR sectionW[LINE_LEN], section_extW[LINE_LEN], *extptrW; BOOL ret; MultiByteToWideChar(CP_ACP, 0, section, -1, sectionW, ARRAY_SIZE(sectionW)); - ret = SetupDiGetActualSectionToInstallW(hinf, sectionW, section_extW, - ARRAY_SIZE(section_extW), NULL, &extptrW); + ret = SetupDiGetActualSectionToInstallExW(hinf, sectionW, altplatform, section_extW, + ARRAY_SIZE(section_extW), NULL, &extptrW, reserved); if (ret) { if (needed) @@ -1879,72 +1879,93 @@ BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF hinf, const char *section, } /*********************************************************************** - * SetupDiGetActualSectionToInstallW (SETUPAPI.@) + * SetupDiGetActualSectionToInstallA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetActualSectionToInstallW( - HINF InfHandle, - PCWSTR InfSectionName, - PWSTR InfSectionWithExt, - DWORD InfSectionWithExtSize, - PDWORD RequiredSize, - PWSTR *Extension) +BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF hinf, const char *section, char *section_ext, + DWORD size, DWORD *needed, char **extptr) { - WCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - DWORD dwFullLength; - LONG lLineCount = -1; + return SetupDiGetActualSectionToInstallExA(hinf, section, NULL, section_ext, size, + needed, extptr, NULL); +} + +/*********************************************************************** + * SetupDiGetActualSectionToInstallExW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF hinf, const WCHAR *section, SP_ALTPLATFORM_INFO *altplatform, + WCHAR *section_ext, DWORD size, DWORD *needed, WCHAR **extptr, void *reserved) +{ + WCHAR buffer[MAX_PATH]; + DWORD len; + DWORD full_len; + LONG line_count = -1; + + TRACE("hinf %p, section %s, altplatform %p, ext %p, size %d, needed %p, extptr %p, reserved %p.\n", + hinf, debugstr_w(section), altplatform, section_ext, size, needed, extptr, reserved); + + if (altplatform) + FIXME("SP_ALTPLATFORM_INFO unsupported\n"); - lstrcpyW(szBuffer, InfSectionName); - dwLength = lstrlenW(szBuffer); + lstrcpyW(buffer, section); + len = lstrlenW(buffer); if (OsVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) { - /* Test section name with '.NTx86' extension */ - lstrcpyW(&szBuffer[dwLength], NtPlatformExtension); - lLineCount = SetupGetLineCountW(InfHandle, szBuffer); + /* Test section name with '.NTx86' extension */ + lstrcpyW(&buffer[len], NtPlatformExtension); + line_count = SetupGetLineCountW(hinf, buffer); - if (lLineCount == -1) - { - /* Test section name with '.NT' extension */ - lstrcpyW(&szBuffer[dwLength], NtExtension); - lLineCount = SetupGetLineCountW(InfHandle, szBuffer); - } + if (line_count == -1) + { + /* Test section name with '.NT' extension */ + lstrcpyW(&buffer[len], NtExtension); + line_count = SetupGetLineCountW(hinf, buffer); + } } else { - /* Test section name with '.Win' extension */ - lstrcpyW(&szBuffer[dwLength], WinExtension); - lLineCount = SetupGetLineCountW(InfHandle, szBuffer); + /* Test section name with '.Win' extension */ + lstrcpyW(&buffer[len], WinExtension); + line_count = SetupGetLineCountW(hinf, buffer); } - if (lLineCount == -1) - szBuffer[dwLength] = 0; + if (line_count == -1) + buffer[len] = 0; - dwFullLength = lstrlenW(szBuffer); + full_len = lstrlenW(buffer); - if (InfSectionWithExt != NULL && InfSectionWithExtSize != 0) + if (section_ext != NULL && size != 0) { - if (InfSectionWithExtSize < (dwFullLength + 1)) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } + if (size < (full_len + 1)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } - lstrcpyW(InfSectionWithExt, szBuffer); - if (Extension != NULL) - { - *Extension = (dwLength == dwFullLength) ? NULL : &InfSectionWithExt[dwLength]; - } + lstrcpyW(section_ext, buffer); + if (extptr != NULL) + { + *extptr = (len == full_len) ? NULL : &section_ext[len]; + } } - if (RequiredSize != NULL) + if (needed != NULL) { - *RequiredSize = dwFullLength + 1; + *needed = full_len + 1; } return TRUE; } +/*********************************************************************** + * SetupDiGetActualSectionToInstallW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetActualSectionToInstallW(HINF hinf, const WCHAR *section, WCHAR *section_ext, + DWORD size, DWORD *needed, WCHAR **extptr) +{ + return SetupDiGetActualSectionToInstallExW(hinf, section, NULL, section_ext, size, + needed, extptr, NULL); +} + /*********************************************************************** * SetupDiGetClassDescriptionA (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 43b837ca9e..26b4a6f7fb 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -316,6 +316,8 @@ @ stdcall SetupDiEnumDriverInfoA(ptr ptr long long ptr) @ stdcall SetupDiEnumDriverInfoW(ptr ptr long long ptr) @ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExA(long str ptr str long ptr ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr wstr long ptr ptr ptr) @ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr) @ stdcall SetupDiGetClassBitmapIndex(ptr ptr) @ stdcall SetupDiGetClassDescriptionA(ptr str long ptr) -- 2.26.2

1 0

[PATCH] wbemprox: Fix allocation size.
by Hans Leidekker 11 May '20

11 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49128 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5d39984d4ce..5af47a0ddc4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3761,7 +3761,7 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { - static const WCHAR *fmtW = L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\0&DEADBEEF&0&DEAD"; + static const WCHAR fmtW[] = L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\0&DEADBEEF&0&DEAD"; UINT len = sizeof(fmtW) + 2; WCHAR *ret; -- 2.20.1

1 0

[PATCH 1/5] quartz/tests: Add some tests for windowless video size.
by Zebediah Figura 11 May '20

11 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 116 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 656f943ca35..2416d2c0d19 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3729,6 +3729,121 @@ out: ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_windowless_size(void) +{ + VIDEOINFOHEADER vih = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 32, + .bmiHeader.biHeight = 16, + .bmiHeader.biBitCount = 32, + .bmiHeader.biPlanes = 1, + }; + AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB32, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(vih), + .pbFormat = (BYTE *)&vih, + }; + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowless); + LONG width, height, aspect_width, aspect_height; + IVMRWindowlessControl9 *windowless_control; + IFilterGraph2 *graph = create_graph(); + struct testfilter source; + RECT src, dst, expect; + IMemInputPin *input; + HWND window; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); + testfilter_init(&source); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"vmr9"); + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + test_allocator(input); + + hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, NULL, &height, &aspect_width, &aspect_height); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, NULL, &aspect_width, &aspect_height); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + width = height = 0xdeadbeef; + hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, NULL, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(width == 32, "Got width %d.\n", width); + todo_wine ok(height == 16, "Got height %d.\n", height); + + aspect_width = aspect_height = 0xdeadbeef; + hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, &aspect_width, &aspect_height); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(aspect_width == 32, "Got width %d.\n", aspect_width); + ok(aspect_height == 16, "Got height %d.\n", aspect_height); + + memset(&src, 0xcc, sizeof(src)); + hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, &src, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SetRect(&expect, 0, 0, 32, 16); + ok(EqualRect(&src, &expect), "Got source rect %s.\n", wine_dbgstr_rect(&src)); + + memset(&dst, 0xcc, sizeof(dst)); + hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, NULL, &dst); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SetRect(&expect, 0, 0, 0, 0); + todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + + SetRect(&src, 4, 6, 16, 12); + hr = IVMRWindowlessControl9_SetVideoPosition(windowless_control, &src, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&src, 0xcc, sizeof(src)); + memset(&dst, 0xcc, sizeof(dst)); + hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, &src, &dst); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SetRect(&expect, 4, 6, 16, 12); + ok(EqualRect(&src, &expect), "Got source rect %s.\n", wine_dbgstr_rect(&src)); + SetRect(&expect, 0, 0, 0, 0); + todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + + SetRect(&dst, 40, 60, 120, 160); + hr = IVMRWindowlessControl9_SetVideoPosition(windowless_control, NULL, &dst); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&src, 0xcc, sizeof(src)); + memset(&dst, 0xcc, sizeof(dst)); + hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, &src, &dst); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SetRect(&expect, 4, 6, 16, 12); + ok(EqualRect(&src, &expect), "Got source rect %s.\n", wine_dbgstr_rect(&src)); + SetRect(&expect, 40, 60, 120, 160); + todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + + GetWindowRect(window, &src); + SetRect(&expect, 0, 0, 640, 480); + ok(EqualRect(&src, &expect), "Got window rect %s.\n", wine_dbgstr_rect(&src)); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMemInputPin_Release(input); + IPin_Release(pin); + IVMRWindowlessControl9_Release(windowless_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + DestroyWindow(window); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3762,6 +3877,7 @@ START_TEST(vmr9) test_clipping_window(); test_surface_allocator_notify_refcount(); test_basic_video(); + test_windowless_size(); CoUninitialize(); } -- 2.26.2

4 8

[PATCH v3] wined3d: Allow setting user memory for mipmapped texture in wined3d_texture_update_desc().
by Paul Gofman 11 May '20

11 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - calculate pitches if necessary before comparision; - Add _SetSurfaceDesc tests for mipmap and DDSD_LPSURFACE. dlls/ddraw/tests/ddraw7.c | 96 ++++++++++++++++++++++++++++++--- dlls/wined3d/texture.c | 108 ++++++++++++++++++++++---------------- 2 files changed, 152 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ddd3cdb0e..a25dd0dd1d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7126,6 +7126,64 @@ static void test_set_surface_desc(void) IDirectDrawSurface7_Release(surface); + /* Test mipmap texture. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U2(ddsd).dwMipMapCount = 3; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW, "Got unexpected hr %#x.\n", hr); + + if (hr == DDERR_NODIRECTDRAWHW) + { + skip("Mipmaps are not supported.\n"); + } + else + { + /* Changing surface desc for mipmap fails even without changing any + * parameters. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDSURFACETYPE, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + } + + /* Test surface created with DDSD_LPSURFACE. */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + /* Cannot reset lpSurface. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE | DDSD_PITCH; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + ddsd.lpSurface = data; + U1(ddsd).lPitch = 8 * 4; + /* Can change the parameters of surface created with DDSD_LPSURFACE. */ + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface); + /* SetSurfaceDesc needs systemmemory surfaces. * * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing @@ -13347,14 +13405,14 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); width = surface_desc.dwWidth; height = surface_desc.dwHeight; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, width, height, NULL, NULL, NULL, NULL); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); bpp = 0; if (SUCCEEDED(IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0))) @@ -13367,7 +13425,7 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", @@ -13379,9 +13437,9 @@ static void test_display_mode_surface_pixel_format(void) U5(surface_desc).dwBackBufferCount = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", @@ -13397,15 +13455,39 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwHeight = height; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, bpp); IDirectDrawSurface7_Release(surface); + /* Test compatibility mode mipmap texture creation. */ + hr = IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0); + ok(hr == DD_OK || hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + win_skip("SetDisplayMode failed, skipping test."); + goto done; + } + bpp = 16; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT | DDSD_PITCH; + U2(surface_desc).dwMipMapCount = 2; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + U1(surface_desc).lPitch = surface_desc.dwWidth * bpp / 8; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_VIDEOMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW, "Got unexpected hr %#x.\n", hr); + if (surface) + IDirectDrawSurface7_Release(surface); + +done: refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 49373eb58a..89ec1998f4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1748,9 +1748,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; - const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; + const struct wined3d *d3d; + BOOL set_user_memory_only; + unsigned int slice_pitch; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1765,10 +1767,26 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + set_user_memory_only = width == texture->resource.width && height == texture->resource.height + && format_id == texture->resource.format->id && multisample_type == texture->resource.multisample_type + && multisample_quality == texture->resource.multisample_quality; + + if (!pitch) + wined3d_format_calculate_pitch(format, 1, width, height, &pitch, &slice_pitch); + + if (set_user_memory_only) + { + if (!texture->row_pitch) + wined3d_format_calculate_pitch(texture->resource.format, 1, texture->resource.width, + texture->resource.height, &texture->row_pitch, &texture->slice_pitch); + + set_user_memory_only = pitch == texture->row_pitch; + } + if (!resource_size) return WINED3DERR_INVALIDCALL; - if (texture->level_count * texture->layer_count > 1) + if (texture->level_count * texture->layer_count > 1 && !set_user_memory_only) { WARN("Texture has multiple sub-resources, not supported.\n"); return WINED3DERR_INVALIDCALL; @@ -1803,7 +1821,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_cs_emit_unload_resource(device->cs, &texture->resource); wined3d_resource_wait_idle(&texture->resource); - sub_resource = &texture->sub_resources[0]; if (texture->dc_info && texture->dc_info[0].dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; @@ -1815,55 +1832,56 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_free_sysmem(&texture->resource); - if ((texture->row_pitch = pitch)) - texture->slice_pitch = height * pitch; - else - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(format, 1, width, height, - &texture->row_pitch, &texture->slice_pitch); - - texture->resource.format = format; - texture->resource.multisample_type = multisample_type; - texture->resource.multisample_quality = multisample_quality; - texture->resource.width = width; - texture->resource.height = height; - if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) - adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); - texture->resource.size = texture->slice_pitch; - sub_resource->size = texture->slice_pitch; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - - if (texture->texture_ops == &texture_gl_ops) - { - if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + if (!set_user_memory_only) + { + sub_resource = &texture->sub_resources[0]; + + texture->row_pitch = pitch; + texture->slice_pitch = slice_pitch; + + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); + texture->resource.size = texture->slice_pitch; + sub_resource->size = texture->slice_pitch; + sub_resource->locations = WINED3D_LOCATION_DISCARDED; + + if (texture->texture_ops == &texture_gl_ops) { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; - texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } + else + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } + } + + if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot + && !d3d_info->texture_npot_conditional) + { + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = width; + texture->pow2_height = height; } } - if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot - && !d3d_info->texture_npot_conditional) - { - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = texture->pow2_height = 1; - while (texture->pow2_width < width) - texture->pow2_width <<= 1; - while (texture->pow2_height < height) - texture->pow2_height <<= 1; - } - else - { - texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = width; - texture->pow2_height = height; - } - if ((texture->user_memory = mem)) { texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; -- 2.26.2

2 1

[PATCH] winegstreamer: Unref the GstCaps object in init_new_decoded_pad().
by Akihiro Sagawa 11 May '20

11 May '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH v2] oleaut32: improve the icon size selection logic in OleLoadPictureEx
by Damjan Jovanovic 11 May '20

11 May '20

Currently OleLoadPictureEx() ignores the caller-desired icon size and always loads the 32x32 icon, which sometimes has to be scaled down to 16x16, resulting in quality loss. VB6 apps are especially affected, due to their heavy use of that API at a framework level. Change this to load the icon having the desired size, or the 32x32 one if no desired size is requested, and use the first icon in the file if nothing is found. Try 2 adds thorough unit tests and improves the icon selection logic to match what Windows does. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20732 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/oleaut32/olepicture.c | 29 ++++-- dlls/oleaut32/tests/olepicture.c | 147 +++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 6 deletions(-)

1 0

[PATCH 1/4] shlwapi: Forward SHRegDuplicateHKey() to shcore.dll.
by Nikolay Sivov 11 May '20

11 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/reg.c | 20 -------------------- dlls/shlwapi/shlwapi.spec | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 179fcad765..e94028bced 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SHLWAPI_ MODULE = shlwapi.dll IMPORTLIB = shlwapi -IMPORTS = uuid user32 gdi32 advapi32 kernelbase +IMPORTS = uuid user32 gdi32 advapi32 kernelbase shcore DELAYIMPORTS = userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index f89636b12a..fb57f1fa16 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -932,26 +932,6 @@ BOOL WINAPI UnregisterExtensionForMIMETypeW(LPCWSTR lpszType) return TRUE; } -/************************************************************************* - * SHRegDuplicateHKey [SHLWAPI.@] - * - * Create a duplicate of a registry handle. - * - * PARAMS - * hKey [I] key to duplicate. - * - * RETURNS - * A new handle pointing to the same key as hKey. - */ -HKEY WINAPI SHRegDuplicateHKey(HKEY hKey) -{ - HKEY newKey = 0; - - RegOpenKeyExA(hKey, 0, 0, MAXIMUM_ALLOWED, &newKey); - TRACE("new key is %p\n", newKey); - return newKey; -} - /* * The following functions are ORDINAL ONLY: */ diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index f47f41aea4..2991a532e1 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -720,7 +720,7 @@ @ stdcall SHRegDeleteEmptyUSKeyW(long wstr long) @ stdcall SHRegDeleteUSValueA(long str long) @ stdcall SHRegDeleteUSValueW(long wstr long) -@ stdcall SHRegDuplicateHKey (long) +@ stdcall -import SHRegDuplicateHKey (long) @ stdcall SHRegEnumUSKeyA(long long str ptr long) @ stdcall SHRegEnumUSKeyW(long long wstr ptr long) @ stdcall SHRegEnumUSValueA(long long ptr ptr ptr ptr ptr long) -- 2.26.2

1 3

[PATCH v2] dwrite: Set ret on unimplemented lookup in opentype_layout_apply_gsub_lookup.
by Gijs Vermeulen 11 May '20

11 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/dwrite/opentype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0feb2feadc..f22cd7469b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4478,6 +4478,7 @@ static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: + ret = FALSE; WARN("Unimplemented lookup %d.\n", lookup_type); break; default: -- 2.26.2

2 1

[PATCH 1/6] mf: Add a helper for session commands without parameters.
by Nikolay Sivov 11 May '20

11 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 53 +++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 25832afdbb..375dd8e196 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -536,6 +536,19 @@ static HRESULT session_submit_command(struct media_session *session, struct sess return hr; } +static HRESULT session_submit_simple_command(struct media_session *session, enum session_command command) +{ + struct session_op *op; + HRESULT hr; + + if (FAILED(hr = create_session_op(command, &op))) + return hr; + + hr = session_submit_command(session, op); + IUnknown_Release(&op->IUnknown_iface); + return hr; +} + static void session_clear_topologies(struct media_session *session) { struct queued_topology *ptr, *next; @@ -1499,18 +1512,10 @@ static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) { struct media_session *session = impl_from_IMFMediaSession(iface); - struct session_op *op; - HRESULT hr; TRACE("%p.\n", iface); - if (FAILED(hr = create_session_op(SESSION_CMD_CLEAR_TOPOLOGIES, &op))) - return hr; - - hr = session_submit_command(session, op); - IUnknown_Release(&op->IUnknown_iface); - - return hr; + return session_submit_simple_command(session, SESSION_CMD_CLEAR_TOPOLOGIES); } static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format, const PROPVARIANT *start_position) @@ -1541,52 +1546,28 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) { struct media_session *session = impl_from_IMFMediaSession(iface); - struct session_op *op; - HRESULT hr; TRACE("%p.\n", iface); - if (FAILED(hr = create_session_op(SESSION_CMD_PAUSE, &op))) - return hr; - - hr = session_submit_command(session, op); - IUnknown_Release(&op->IUnknown_iface); - - return hr; + return session_submit_simple_command(session, SESSION_CMD_PAUSE); } static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) { struct media_session *session = impl_from_IMFMediaSession(iface); - struct session_op *op; - HRESULT hr; TRACE("%p.\n", iface); - if (FAILED(hr = create_session_op(SESSION_CMD_STOP, &op))) - return hr; - - hr = session_submit_command(session, op); - IUnknown_Release(&op->IUnknown_iface); - - return hr; + return session_submit_simple_command(session, SESSION_CMD_STOP); } static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) { struct media_session *session = impl_from_IMFMediaSession(iface); - struct session_op *op; - HRESULT hr; TRACE("%p.\n", iface); - if (FAILED(hr = create_session_op(SESSION_CMD_CLOSE, &op))) - return hr; - - hr = session_submit_command(session, op); - IUnknown_Release(&op->IUnknown_iface); - - return hr; + return session_submit_simple_command(session, SESSION_CMD_CLOSE); } static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) -- 2.26.2

1 5

[website] German translation for release 5.8
by Julian Rüger 11 May '20

11 May '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 6/6] d3d9/tests: Add more get display mode tests.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 115 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 620ee8e8d6f..41cfc1519c1 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13549,14 +13549,21 @@ static void test_vertex_buffer_read_write(void) static void test_get_display_mode(void) { + static const DWORD creation_flags[] = {0, CREATE_DEVICE_FULLSCREEN}; + unsigned int adapter_idx, adapter_count, mode_idx, test_idx; IDirect3DSwapChain9 *swapchain; + RECT previous_monitor_rect; + unsigned int width, height; IDirect3DDevice9 *device; + MONITORINFO monitor_info; struct device_desc desc; D3DDISPLAYMODE mode; + HMONITOR monitor; IDirect3D9 *d3d; ULONG refcount; HWND window; HRESULT hr; + BOOL ret; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -13620,8 +13627,114 @@ static void test_get_display_mode(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d); DestroyWindow(window); + + /* D3D9 uses adapter indices to determine which adapter to use to get the display mode */ + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + if (!adapter_idx) + { + desc.width = 640; + desc.height = 480; + } + else + { + /* Find a mode different than that of the previous adapter, so that tests can be sure + * that they are comparing to the current adapter display mode */ + monitor = IDirect3D9_GetAdapterMonitor(d3d, adapter_idx - 1); + ok(!!monitor, "Adapter %u: GetAdapterMonitor failed.\n", adapter_idx - 1); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx - 1, + GetLastError()); + previous_monitor_rect = monitor_info.rcMonitor; + + desc.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + desc.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + for (mode_idx = 0; SUCCEEDED(IDirect3D9_EnumAdapterModes(d3d, adapter_idx, + D3DFMT_X8R8G8B8, mode_idx, &mode)); ++mode_idx) + { + if (mode.Width < 640 || mode.Height < 480) + continue; + if (mode.Width != desc.width && mode.Height != desc.height) + break; + } + ok(mode.Width != desc.width && mode.Height != desc.height, + "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, + desc.width, desc.height); + desc.width = mode.Width; + desc.height = mode.Height; + } + + for (test_idx = 0; test_idx < ARRAY_SIZE(creation_flags); ++test_idx) + { + window = create_window(); + desc.adapter_ordinal = adapter_idx; + desc.device_window = window; + desc.flags = creation_flags[test_idx]; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Adapter %u test %u: Failed to create a D3D device.\n", adapter_idx, test_idx); + DestroyWindow(window); + continue; + } + + monitor = IDirect3D9_GetAdapterMonitor(d3d, adapter_idx); + ok(!!monitor, "Adapter %u test %u: GetAdapterMonitor failed.\n", adapter_idx, test_idx); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u test %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx, + test_idx, GetLastError()); + width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + + if (adapter_idx) + { + /* Move the device window to the previous monitor to test that the device window + * position doesn't affect which adapter to use to get the display mode */ + ret = SetWindowPos(window, 0, previous_monitor_rect.left, previous_monitor_rect.top, + 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u test %u: SetWindowPos failed, error %#x.\n", adapter_idx, + test_idx, GetLastError()); + } + + hr = IDirect3D9_GetAdapterDisplayMode(d3d, adapter_idx, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetAdapterDisplayMode failed, hr %#x.\n", + adapter_idx, test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + + hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetDisplayMode failed, hr %#x.\n", adapter_idx, + test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Adapter %u test %u: GetSwapChain failed, hr %#x.\n", adapter_idx, + test_idx, hr); + hr = IDirect3DSwapChain9_GetDisplayMode(swapchain, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetDisplayMode failed, hr %#x.\n", adapter_idx, + test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + IDirect3DSwapChain9_Release(swapchain); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Adapter %u test %u: Device has %u references left.\n", adapter_idx, + test_idx, refcount); + DestroyWindow(window); + } + } + + IDirect3D9_Release(d3d); } static void test_multi_adapter(void) -- 2.25.1

2 1

[PATCH 5/6] d3d8/tests: Add more get display mode tests.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 105 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fdec30c681f..4c567a47603 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9881,13 +9881,20 @@ static void test_draw_primitive(void) static void test_get_display_mode(void) { + static const DWORD creation_flags[] = {0, CREATE_DEVICE_FULLSCREEN}; + unsigned int adapter_idx, adapter_count, mode_idx, test_idx; + RECT previous_monitor_rect; + unsigned int width, height; IDirect3DDevice8 *device; + MONITORINFO monitor_info; struct device_desc desc; D3DDISPLAYMODE mode; + HMONITOR monitor; IDirect3D8 *d3d; ULONG refcount; HWND window; HRESULT hr; + BOOL ret; window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); @@ -9937,8 +9944,104 @@ static void test_get_display_mode(void) refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D8_Release(d3d); DestroyWindow(window); + + /* D3D8 uses adapter indices to determine which adapter to use to get the display mode */ + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + if (!adapter_idx) + { + desc.width = 640; + desc.height = 480; + } + else + { + /* Find a mode different than that of the previous adapter, so that tests can be sure + * that they are comparing to the current adapter display mode */ + monitor = IDirect3D8_GetAdapterMonitor(d3d, adapter_idx - 1); + ok(!!monitor, "Adapter %u: GetAdapterMonitor failed.\n", adapter_idx - 1); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx - 1, + GetLastError()); + previous_monitor_rect = monitor_info.rcMonitor; + + desc.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + desc.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + for (mode_idx = 0; SUCCEEDED(IDirect3D8_EnumAdapterModes(d3d, adapter_idx, mode_idx, + &mode)); ++mode_idx) + { + if (mode.Format != D3DFMT_X8R8G8B8) + continue; + if (mode.Width < 640 || mode.Height < 480) + continue; + if (mode.Width != desc.width && mode.Height != desc.height) + break; + } + ok(mode.Width != desc.width && mode.Height != desc.height, + "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, + desc.width, desc.height); + desc.width = mode.Width; + desc.height = mode.Height; + } + + for (test_idx = 0; test_idx < ARRAY_SIZE(creation_flags); ++test_idx) + { + window = create_window(); + desc.adapter_ordinal = adapter_idx; + desc.device_window = window; + desc.flags = creation_flags[test_idx]; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Adapter %u test %u: Failed to create a D3D device.\n", adapter_idx, test_idx); + DestroyWindow(window); + continue; + } + + monitor = IDirect3D8_GetAdapterMonitor(d3d, adapter_idx); + ok(!!monitor, "Adapter %u test %u: GetAdapterMonitor failed.\n", adapter_idx, test_idx); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u test %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx, + test_idx, GetLastError()); + width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + + if (adapter_idx) + { + /* Move the device window to the previous monitor to test that the device window + * position doesn't affect which adapter to use to get the display mode */ + ret = SetWindowPos(window, 0, previous_monitor_rect.left, previous_monitor_rect.top, + 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u test %u: SetWindowPos failed, error %#x.\n", adapter_idx, + test_idx, GetLastError()); + } + + hr = IDirect3D8_GetAdapterDisplayMode(d3d, adapter_idx, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetAdapterDisplayMode failed, hr %#x.\n", + adapter_idx, test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + + hr = IDirect3DDevice8_GetDisplayMode(device, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetDisplayMode failed, hr %#x.\n", adapter_idx, + test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Adapter %u test %u: Device has %u references left.\n", adapter_idx, + test_idx, refcount); + DestroyWindow(window); + } + } + + IDirect3D8_Release(d3d); } static void test_multi_adapter(void) -- 2.25.1

3 2

[PATCH 4/6] ddraw/tests: Add get display mode tests.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 49223cde289..82d8e94b5fc 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13694,6 +13694,43 @@ static void test_window_position(void) EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); } +static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + DDSURFACEDESC surface_desc; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + /* Test that DirectDraw doesn't use the device window to determine which monitor to use */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Expect width %d, got %d.\n", + GetSystemMetrics(SM_CXSCREEN), surface_desc.dwWidth); + ok(surface_desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Expect height %d, got %d.\n", + GetSystemMetrics(SM_CYSCREEN), surface_desc.dwHeight); + + DestroyWindow(window); + IDirectDraw_Release(ddraw); + return TRUE; +} + +static void test_get_display_mode(void) +{ + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -13809,4 +13846,5 @@ START_TEST(ddraw1) test_cursor_clipping(); test_vtbl_protection(); test_window_position(); + test_get_display_mode(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index c4549d95e7c..25cbe8fa921 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14466,6 +14466,43 @@ static void test_window_position(void) EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); } +static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + DDSURFACEDESC surface_desc; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + /* Test that DirectDraw doesn't use the device window to determine which monitor to use */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Expect width %d, got %d.\n", + GetSystemMetrics(SM_CXSCREEN), surface_desc.dwWidth); + ok(surface_desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Expect height %d, got %d.\n", + GetSystemMetrics(SM_CYSCREEN), surface_desc.dwHeight); + + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return TRUE; +} + +static void test_get_display_mode(void) +{ + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -14587,4 +14624,5 @@ START_TEST(ddraw2) test_d32_support(); test_cursor_clipping(); test_window_position(); + test_get_display_mode(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 09fe7e1e92b..5dc2b4e7e52 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17493,6 +17493,43 @@ static void test_window_position(void) EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); } +static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + DDSURFACEDESC2 surface_desc; + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + /* Test that DirectDraw doesn't use the device window to determine which monitor to use */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Expect width %d, got %d.\n", + GetSystemMetrics(SM_CXSCREEN), surface_desc.dwWidth); + ok(surface_desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Expect height %d, got %d.\n", + GetSystemMetrics(SM_CYSCREEN), surface_desc.dwHeight); + + DestroyWindow(window); + IDirectDraw4_Release(ddraw); + return TRUE; +} + +static void test_get_display_mode(void) +{ + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -17630,4 +17667,5 @@ START_TEST(ddraw4) test_surface_format_conversion_alpha(); test_cursor_clipping(); test_window_position(); + test_get_display_mode(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5cf197998eb..53e47250e3d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17728,6 +17728,43 @@ static void test_window_position(void) EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); } +static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + /* Test that DirectDraw doesn't use the device window to determine which monitor to use */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Expect width %d, got %d.\n", + GetSystemMetrics(SM_CXSCREEN), surface_desc.dwWidth); + ok(surface_desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Expect height %d, got %d.\n", + GetSystemMetrics(SM_CYSCREEN), surface_desc.dwHeight); + + DestroyWindow(window); + IDirectDraw7_Release(ddraw); + return TRUE; +} + +static void test_get_display_mode(void) +{ + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -17880,4 +17917,5 @@ START_TEST(ddraw7) test_compressed_surface_stretch(); test_cursor_clipping(); test_window_position(); + test_get_display_mode(); } -- 2.25.1

3 2

[PATCH 3/6] d3d9/tests: Test window position.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 82 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c65f0cd04da..620ee8e8d6f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13909,6 +13909,87 @@ static void test_cursor_clipping(void) DestroyWindow(window); } +static void test_window_position(void) +{ + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; + IDirect3DDevice9 *device; + MONITORINFO monitor_info; + HMONITOR monitor; + RECT window_rect; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + BOOL ret; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + monitor = IDirect3D9_GetAdapterMonitor(d3d, adapter_idx); + ok(!!monitor, "Adapter %u: GetAdapterMonitor failed.\n", adapter_idx); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx, GetLastError()); + + window = create_window(); + device_desc.adapter_ordinal = adapter_idx; + device_desc.device_window = window; + device_desc.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + device_desc.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device, skipping tests.\n", adapter_idx); + DestroyWindow(window); + continue; + } + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + /* Device resets should restore the window rectangle to fit the whole monitor */ + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Adapter %u: Failed to reset device, hr %#x.\n", adapter_idx, hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window rectangle to fit the whole monitor */ + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Adapter %u: SetForegroundWindow failed, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Adapter %u: Failed to restore window, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "Adapter %u: SetForegroundWindow failed, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + IDirect3DDevice9_Release(device); + DestroyWindow(window); + } + + IDirect3D9_Release(d3d); +} + START_TEST(device) { HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); @@ -14043,6 +14124,7 @@ START_TEST(device) test_shader_validator(); test_creation_parameters(); test_cursor_clipping(); + test_window_position(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.25.1

2 1

[PATCH 2/6] d3d8/tests: Test window position.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 82 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b9d838e5cd4..fdec30c681f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10168,6 +10168,87 @@ static void test_cursor_clipping(void) DestroyWindow(window); } +static void test_window_position(void) +{ + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; + IDirect3DDevice8 *device; + MONITORINFO monitor_info; + HMONITOR monitor; + RECT window_rect; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + BOOL ret; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + monitor = IDirect3D8_GetAdapterMonitor(d3d, adapter_idx); + ok(!!monitor, "Adapter %u: GetAdapterMonitor failed.\n", adapter_idx); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx, GetLastError()); + + window = create_window(); + device_desc.adapter_ordinal = adapter_idx; + device_desc.device_window = window; + device_desc.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + device_desc.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device, skipping tests.\n", adapter_idx); + DestroyWindow(window); + continue; + } + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + /* Device resets should restore the window rectangle to fit the whole monitor */ + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Adapter %u: Failed to reset device, hr %#x.\n", adapter_idx, hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window rectangle to fit the whole monitor */ + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Adapter %u: SetForegroundWindow failed, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Adapter %u: Failed to restore window, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "Adapter %u: SetForegroundWindow failed, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + IDirect3DDevice8_Release(device); + DestroyWindow(window); + } + + IDirect3D8_Release(d3d); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -10287,6 +10368,7 @@ START_TEST(device) test_multi_adapter(); test_creation_parameters(); test_cursor_clipping(); + test_window_position(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.25.1

2 1

[PATCH 1/6] ddraw/tests: Test window position.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 62 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 248 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index f74d12d9fda..49223cde289 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13633,6 +13633,67 @@ static void test_vtbl_protection(void) DestroyWindow(window); } +static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + RECT primary_rect, window_rect; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left, + monitor_rect->top, monitor_rect->right - monitor_rect->left, + monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + flush_events(); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window to fit the whole primary monitor */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window, error %#x.\n", GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "SetForegroundWindow failed, error %#x.\n", GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + DestroyWindow(window); + IDirectDraw_Release(ddraw); + return TRUE; +} + +static void test_window_position(void) +{ + EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -13747,4 +13808,5 @@ START_TEST(ddraw1) test_d32_support(); test_cursor_clipping(); test_vtbl_protection(); + test_window_position(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d4e681c0164..c4549d95e7c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14405,6 +14405,67 @@ done: DestroyWindow(window); } +static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + RECT primary_rect, window_rect; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left, + monitor_rect->top, monitor_rect->right - monitor_rect->left, + monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + flush_events(); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window to fit the whole primary monitor */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window, error %#x.\n", GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "SetForegroundWindow failed, error %#x.\n", GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return TRUE; +} + +static void test_window_position(void) +{ + EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -14525,4 +14586,5 @@ START_TEST(ddraw2) test_caps(); test_d32_support(); test_cursor_clipping(); + test_window_position(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f50fc1cb53b..09fe7e1e92b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17432,6 +17432,67 @@ done: DestroyWindow(window); } +static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + RECT primary_rect, window_rect; + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left, + monitor_rect->top, monitor_rect->right - monitor_rect->left, + monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + flush_events(); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window to fit the whole primary monitor */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window, error %#x.\n", GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "SetForegroundWindow failed, error %#x.\n", GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + DestroyWindow(window); + IDirectDraw4_Release(ddraw); + return TRUE; +} + +static void test_window_position(void) +{ + EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -17568,4 +17629,5 @@ START_TEST(ddraw4) test_d32_support(); test_surface_format_conversion_alpha(); test_cursor_clipping(); + test_window_position(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ddd3cdb0e2..5cf197998eb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17667,6 +17667,67 @@ done: DestroyWindow(window); } +static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + RECT primary_rect, window_rect; + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left, + monitor_rect->top, monitor_rect->right - monitor_rect->left, + monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + flush_events(); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window to fit the whole primary monitor */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window, error %#x.\n", GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "SetForegroundWindow failed, error %#x.\n", GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + DestroyWindow(window); + IDirectDraw7_Release(ddraw); + return TRUE; +} + +static void test_window_position(void) +{ + EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -17818,4 +17879,5 @@ START_TEST(ddraw7) test_surface_format_conversion_alpha(); test_compressed_surface_stretch(); test_cursor_clipping(); + test_window_position(); } -- 2.25.1

3 2

[PATCH] dxgi: Introduce helper to convert between dxgi and wined3d scanline ordering types.
by Gijs Vermeulen 11 May '20

11 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This fixes a Clang warning. dlls/dxgi/output.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 85bfed0598..5d31a0093c 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline DXGI_MODE_SCANLINE_ORDER dxgi_mode_scanline_order_from_wined3d(enum wined3d_scanline_ordering ordering) +{ + return (DXGI_MODE_SCANLINE_ORDER)ordering; +} + static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_display_mode *wined3d_mode) { mode->Width = wined3d_mode->width; @@ -30,7 +35,7 @@ static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_di mode->RefreshRate.Numerator = wined3d_mode->refresh_rate; mode->RefreshRate.Denominator = 1; mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id); - mode->ScanlineOrdering = wined3d_mode->scanline_ordering; + mode->ScanlineOrdering = dxgi_mode_scanline_order_from_wined3d(wined3d_mode->scanline_ordering); mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ } @@ -41,7 +46,7 @@ static void dxgi_mode1_from_wined3d(DXGI_MODE_DESC1 *mode, const struct wined3d_ mode->RefreshRate.Numerator = wined3d_mode->refresh_rate; mode->RefreshRate.Denominator = 1; mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id); - mode->ScanlineOrdering = wined3d_mode->scanline_ordering; + mode->ScanlineOrdering = dxgi_mode_scanline_order_from_wined3d(wined3d_mode->scanline_ordering); mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ mode->Stereo = FALSE; /* FIXME */ } -- 2.21.1 (Apple Git-122.3)

2 1

[PATCH v2] dxgi: Search all adapters for the containing output of a swapchain.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix a d3d12 test failure. Supersede 184920 dlls/dxgi/swapchain.c | 84 ++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f57183879d4..81ba50942ad 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -111,11 +111,13 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } -static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, IDXGIOutput **dxgi_output) +static HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, + IDXGIOutput **dxgi_output) { + unsigned int adapter_idx, output_idx; DXGI_OUTPUT_DESC desc; + IDXGIAdapter *adapter; IDXGIOutput *output; - unsigned int index; HMONITOR monitor; HRESULT hr; @@ -125,25 +127,32 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_INVALID_CALL; } - index = 0; - while ((hr = IDXGIAdapter_EnumOutputs(adapter, index, &output)) == S_OK) + for (adapter_idx = 0; SUCCEEDED(hr = IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + for (output_idx = 0; SUCCEEDED(hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, + &output)); ++output_idx) { - WARN("Failed to get output desc %u, hr %#x.\n", index, hr); - ++index; - continue; - } + if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + { + WARN("Adapter %u output %u: Failed to get output desc, hr %#x.\n", adapter_idx, + output_idx, hr); + IDXGIOutput_Release(output); + continue; + } - if (desc.Monitor == monitor) - { - *dxgi_output = output; - return S_OK; - } + if (desc.Monitor == monitor) + { + *dxgi_output = output; + IDXGIAdapter_Release(adapter); + return S_OK; + } - IDXGIOutput_Release(output); - ++index; + IDXGIOutput_Release(output); + } + IDXGIAdapter_Release(adapter); } + if (hr != DXGI_ERROR_NOT_FOUND) WARN("Failed to enumerate outputs, hr %#x.\n", hr); @@ -582,9 +591,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - IDXGIAdapter *adapter; - IDXGIDevice *device; - HRESULT hr; + HWND window; TRACE("iface %p, output %p.\n", iface, output); @@ -594,24 +601,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - if (SUCCEEDED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) + if (!swapchain->factory) { - hr = IDXGIDevice_GetAdapter(device, &adapter); - IDXGIDevice_Release(device); + ERR("Implicit swapchain does not store a reference to factory.\n"); + return E_NOINTERFACE; } - if (SUCCEEDED(hr)) - { - HWND hwnd = d3d11_swapchain_get_hwnd(swapchain); - hr = dxgi_get_output_from_window(adapter, hwnd, output); - IDXGIAdapter_Release(adapter); - } - else - { - WARN("Failed to get adapter, hr %#x.\n", hr); - } - - return hr; + window = d3d11_swapchain_get_hwnd(swapchain); + return dxgi_get_output_from_window(swapchain->factory, window, output); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapChain1 *iface, @@ -2423,6 +2420,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); IUnknown *device_parent; + IDXGIFactory *factory; IDXGIAdapter *adapter; HRESULT hr; @@ -2436,16 +2434,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh device_parent = vkd3d_get_device_parent(swapchain->device); - if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) - { - hr = dxgi_get_output_from_window(adapter, swapchain->window, output); - IDXGIAdapter_Release(adapter); - } - else + if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) { WARN("Failed to get adapter, hr %#x.\n", hr); + return hr; } + if (FAILED(hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory))) + { + WARN("Failed to get factory, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + return hr; + } + + hr = dxgi_get_output_from_window(factory, swapchain->window, output); + IDXGIFactory_Release(factory); + IDXGIAdapter_Release(adapter); return hr; } -- 2.25.1

2 1

[v4 PATCH] dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag.
by Nikolay Sivov 11 May '20

11 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: added missing ok() test v3: using strictly level 11 device. dlls/dxgi/tests/dxgi.c | 77 +++++++++++++++++++++++++++++++++++++++++- dlls/dxgi/utils.c | 4 ++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a9f9b71570..dd00be1e8c 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -44,6 +44,10 @@ static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECK static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *desc); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -624,6 +628,39 @@ success: return dxgi_device; } +static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + IDXGIDevice *device = NULL; + ID3D11Device *d3d_device; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice.\n"); + ID3D11Device_Release(d3d_device); + } + + return device; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -1079,6 +1116,7 @@ static void test_check_interface_support(void) static void test_create_surface(void) { + ID3D11Texture2D *texture2d; DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; @@ -1109,6 +1147,40 @@ static void test_create_surface(void) IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* DXGI_USAGE_UNORDERED_ACCESS */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create D3D11 device.\n"); + return; + } + + surface = NULL; + hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + + if (surface) + { + ID3D11UnorderedAccessView *uav; + ID3D11Device *d3d_device; + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + + ID3D11Texture2D_GetDevice(texture2d, &d3d_device); + + hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + + ID3D11Device_Release(d3d_device); + ID3D11Texture2D_Release(texture2d); + + IDXGISurface_Release(surface); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } static void test_parents(void) @@ -6624,7 +6696,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module, gdi32_module; + HMODULE dxgi_module, d3d11_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -6639,6 +6711,9 @@ START_TEST(dxgi) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + d3d11_module = LoadLibraryA("d3d11.dll"); + pD3D11CreateDevice = (void *)GetProcAddress(d3d11_module, "D3D11CreateDevice"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aece3a6af1..a32c7ee129 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -503,8 +503,10 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) wined3d_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) wined3d_bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (dxgi_usage & DXGI_USAGE_UNORDERED_ACCESS) + wined3d_bind_flags |= WINED3D_BIND_UNORDERED_ACCESS; - dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_UNORDERED_ACCESS); if (dxgi_usage) FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); return wined3d_bind_flags; -- 2.26.2

2 1

[PATCH] dwrite: Set ret on unimplemented lookup in opentype_layout_apply_gsub_lookup.
by Gijs Vermeulen 11 May '20

11 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This fixes a Clang warning. dlls/dwrite/opentype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0feb2feadc..4fe3c32ff5 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4478,6 +4478,7 @@ static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: + ret = TRUE; WARN("Unimplemented lookup %d.\n", lookup_type); break; default: -- 2.26.2

2 1

[PATCH 1/2] include: Fix SetupDiGetActualSectionToInstallExA/W definitions.
by Gijs Vermeulen 11 May '20

11 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/setupapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index 48060edf91..ac789ae215 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1516,8 +1516,8 @@ BOOL WINAPI SetupDiGetActualModelsSectionW(PINFCONTEXT, PSP_ALTPLATFORM_INFO BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF, PCSTR, PSTR, DWORD, PDWORD, PSTR *); BOOL WINAPI SetupDiGetActualSectionToInstallW(HINF, PCWSTR, PWSTR, DWORD, PDWORD, PWSTR *); #define SetupDiGetActualSectionToInstall WINELIB_NAME_AW(SetupDiGetActualSectionToInstall) -BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF, PCSTR, PSTR, DWORD, PDWORD, PSTR *, PVOID); -BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF, PCWSTR, PWSTR, DWORD, PDWORD, PWSTR *, PVOID); +BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF, PCSTR, PSP_ALTPLATFORM_INFO, PSTR, DWORD, PDWORD, PSTR *, PVOID); +BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF, PCWSTR, PSP_ALTPLATFORM_INFO, PWSTR, DWORD, PDWORD, PWSTR *, PVOID); #define SetupDiGetActualSectionToInstallEx WINELIB_NAME_AW(SetupDiGetActualSectionToInstallEx) BOOL WINAPI SetupDiGetClassBitmapIndex(const GUID *, PINT); BOOL WINAPI SetupDiGetClassDescriptionA(const GUID*, PSTR, DWORD, PDWORD); -- 2.26.2

1 1

[PATCH v6 1/4] ntdll/tests: Add tests for USD timestamp updates.
by Rémi Bernon 11 May '20

11 May '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v6: * Add some tests for USD memory basic info. * Open or create a __wine_user_shared_data section from client side, initialize it on creation (when wineboot completes), then pass the handle to the server which will then map it and start updating it. * Use atomic builtins only when on non-x86 archs. * Add a size reduction patch. dlls/ntdll/tests/time.c | 78 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8d8..d11093a243da 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)( ULONGLONG *time ); static const int MonthLengths[2][12] = { @@ -153,6 +156,79 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static ULONGLONG read_ksystem_time(volatile KSYSTEM_TIME *time) +{ + ULONGLONG high, low; + do + { + high = time->High1Time; + low = time->LowPart; + } + while (high != time->High2Time); + return high << 32 | low; +} + +static void test_user_shared_data_time(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + ULONGLONG t1, t2, t3; + int i = 0; + + i = 0; + do + { + t1 = GetTickCount(); + if (user_shared_data->NtMajorVersion <= 5 && user_shared_data->NtMinorVersion <= 1) + t2 = (*(volatile ULONG*)&user_shared_data->TickCountLowDeprecated * (ULONG64)user_shared_data->TickCountMultiplier) >> 24; + else + t2 = (read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24; + t3 = GetTickCount(); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + ok(t1 <= t2, "USD TickCount / GetTickCount are out of order: %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + todo_wine + ok(t2 <= t3, "USD TickCount / GetTickCount are out of order: %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + + i = 0; + do + { + LARGE_INTEGER system_time; + NtQuerySystemTime(&system_time); + t1 = system_time.QuadPart; + t2 = read_ksystem_time(&user_shared_data->SystemTime); + NtQuerySystemTime(&system_time); + t3 = system_time.QuadPart; + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + todo_wine + ok(t1 <= t2, "USD SystemTime / NtQuerySystemTime are out of order %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + ok(t2 <= t3, "USD SystemTime / NtQuerySystemTime are out of order %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + + if (!pRtlQueryUnbiasedInterruptTime) + win_skip("skipping RtlQueryUnbiasedInterruptTime tests\n"); + else + { + i = 0; + do + { + pRtlQueryUnbiasedInterruptTime(&t1); + t2 = read_ksystem_time(&user_shared_data->InterruptTime); + pRtlQueryUnbiasedInterruptTime(&t3); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + todo_wine + ok(t1 <= t2, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + ok(t2 <= t3 || broken(t2 == t3 + 82410089070) /* w864 has some weird offset on testbot */, + "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -163,6 +239,7 @@ START_TEST(time) (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryDynamicTimeZoneInformation"); + pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(mod, "RtlQueryUnbiasedInterruptTime"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); @@ -170,4 +247,5 @@ START_TEST(time) win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); test_RtlQueryTimeZoneInformation(); + test_user_shared_data_time(); } -- 2.26.1

2 5

[PATCH] shlwapi: Sync SHRegSetPath() from shcore.
by Serge Gautherie 11 May '20

11 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://jira.reactos.org/browse/CORE-8880 Remove useless code, especially potentially unsafe lstrcpy(). NB: There is another potentially unsafe lstrcpy() in SHRegGetCLSIDKeyW, which I am not fixing. --- dlls/shlwapi/reg.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index f89636b..c150128 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -111,17 +111,12 @@ DWORD WINAPI SHRegGetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, DWORD WINAPI SHRegSetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, LPCSTR lpszPath, DWORD dwFlags) { - char szBuff[MAX_PATH]; + FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hKey, debugstr_a(lpszSubKey), + debugstr_a(lpszValue), debugstr_a(lpszPath), dwFlags); - FIXME("(hkey=%p,%s,%s,%p,%d) - semi-stub\n",hKey, debugstr_a(lpszSubKey), - debugstr_a(lpszValue), lpszPath, dwFlags); - - lstrcpyA(szBuff, lpszPath); - - /* FIXME: PathUnExpandEnvStringsA(szBuff); */ + /* FIXME: PathUnExpandEnvStringsA(); */ - return SHSetValueA(hKey,lpszSubKey, lpszValue, REG_SZ, szBuff, - lstrlenA(szBuff)); + return SHSetValueA(hKey,lpszSubKey, lpszValue, REG_SZ, lpszPath, lstrlenA(lpszPath)); } /************************************************************************* @@ -132,17 +127,12 @@ DWORD WINAPI SHRegSetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, DWORD WINAPI SHRegSetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, LPCWSTR lpszPath, DWORD dwFlags) { - WCHAR szBuff[MAX_PATH]; - - FIXME("(hkey=%p,%s,%s,%p,%d) - semi-stub\n",hKey, debugstr_w(lpszSubKey), - debugstr_w(lpszValue), lpszPath, dwFlags); - - lstrcpyW(szBuff, lpszPath); + FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hKey, debugstr_w(lpszSubKey), + debugstr_w(lpszValue), debugstr_w(lpszPath), dwFlags); - /* FIXME: PathUnExpandEnvStringsW(szBuff); */ + /* FIXME: PathUnExpandEnvStringsW(); */ - return SHSetValueW(hKey,lpszSubKey, lpszValue, REG_SZ, szBuff, - lstrlenW(szBuff)); + return SHSetValueW(hKey,lpszSubKey, lpszValue, REG_SZ, lpszPath, lstrlenW(lpszPath)); } /************************************************************************* -- 2.10.0.windows.1

2 1

[PATCH] ws2_32/tests: Fix acceptex typo, in error strings.
by Serge Gautherie 11 May '20

11 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ws2_32/tests/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b17f076..92337e1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8484,7 +8484,7 @@ todo_wine iret = connect(acceptor, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); todo_wine ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, - "connecting to acceptex acceptor succeeded? return %d + errno %d\n", iret, WSAGetLastError()); + "connecting to AcceptEx acceptor succeeded? return %d + errno %d\n", iret, WSAGetLastError()); if (!iret || (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)) { /* We need to cancel this call, otherwise things fail */ closesocket(acceptor); @@ -8646,7 +8646,7 @@ todo_wine fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, - "acceptex test(%d): could not select on socket, errno %d\n" ); + "AcceptEx test(%d): could not select on socket, errno %d\n" ); /* check for incoming requests */ if ( FD_ISSET ( listener, &fds_openaccept ) ) { @@ -8703,7 +8703,7 @@ todo_wine iret = recv( acceptor, buffer, 2, 0); ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); - ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); + ok(buffer[0] == '1', "The wrong first client was accepted by AcceptEx: %c != 1\n", buffer[0]); closesocket(connector); connector = INVALID_SOCKET; -- 2.10.0.windows.1

1 0

[PATCH 2/2] winex11.drv: Move update_windows_on_desktop_resize().
by Zhiyi Zhang 11 May '20

11 May '20

Move update_windows_on_desktop_resize() to be in X11DRV_DisplayDevices_Update() and rename it to update_windows_on_display_change(), which is a more appropriate name because the desktop is unnecessarily resized when display devices change. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 29 ++--------------------------- dlls/winex11.drv/display.c | 28 +++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 9011f50c20c..5a9e0f59ae8 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -324,29 +324,6 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) return TRUE; } -static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) -{ - struct x11drv_win_data *data; - UINT mask = (UINT)lparam; - - if (!(data = get_win_data( hwnd ))) return TRUE; - - /* update the full screen state */ - update_net_wm_states( data ); - - if (mask && data->whole_window) - { - POINT pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); - XWindowChanges changes; - changes.x = pos.x; - changes.y = pos.y; - XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); - } - release_win_data( data ); - if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, TRUE ); - return TRUE; -} - BOOL is_desktop_fullscreen(void) { RECT primary_rect = get_primary_monitor_rect(); @@ -390,7 +367,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) /*********************************************************************** * X11DRV_resize_desktop */ -void X11DRV_resize_desktop( UINT mask, BOOL send_display_change ) +void X11DRV_resize_desktop( BOOL send_display_change ) { RECT primary_rect, virtual_rect; HWND hwnd = GetDesktopWindow(); @@ -403,7 +380,7 @@ void X11DRV_resize_desktop( UINT mask, BOOL send_display_change ) if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) { - SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, (WPARAM)mask, (LPARAM)send_display_change ); + SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, (LPARAM)send_display_change ); } else { @@ -420,6 +397,4 @@ void X11DRV_resize_desktop( UINT mask, BOOL send_display_change ) SMTO_ABORTIFHUNG, 2000, NULL ); } } - - EnumWindows( update_windows_on_desktop_resize, (LPARAM)mask ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 503f8c96877..daea434dabf 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -273,6 +273,31 @@ void X11DRV_DisplayDevices_RegisterEventHandlers(void) handler->register_event_handlers(); } +static BOOL CALLBACK update_windows_on_display_change(HWND hwnd, LPARAM lparam) +{ + struct x11drv_win_data *data; + UINT mask = (UINT)lparam; + + if (!(data = get_win_data(hwnd))) + return TRUE; + + /* update the full screen state */ + update_net_wm_states(data); + + if (mask && data->whole_window) + { + POINT pos = virtual_screen_to_root(data->whole_rect.left, data->whole_rect.top); + XWindowChanges changes; + changes.x = pos.x; + changes.y = pos.y; + XReconfigureWMWindow(data->display, data->whole_window, data->vis.screen, mask, &changes); + } + release_win_data(data); + if (hwnd == GetForegroundWindow()) + clip_fullscreen_window(hwnd, TRUE); + return TRUE; +} + void X11DRV_DisplayDevices_Update(BOOL send_display_change) { RECT old_virtual_rect, new_virtual_rect; @@ -288,7 +313,8 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) if (old_virtual_rect.top != new_virtual_rect.top) mask |= CWY; - X11DRV_resize_desktop(mask, send_display_change); + X11DRV_resize_desktop(send_display_change); + EnumWindows(update_windows_on_display_change, (LPARAM)mask); } /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ca40005d729..d6873ce4290 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2729,7 +2729,7 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) } return 0; case WM_X11DRV_RESIZE_DESKTOP: - X11DRV_resize_desktop( (UINT)wp, (BOOL)lp ); + X11DRV_resize_desktop( (BOOL)lp ); return 0; case WM_X11DRV_SET_CURSOR: if ((data = get_win_data( hwnd ))) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1f8af184808..ff0aeb7dab2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -657,7 +657,7 @@ struct x11drv_mode_info }; extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; -extern void X11DRV_resize_desktop(UINT, BOOL) DECLSPEC_HIDDEN; +extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH 1/2] winex11.drv: Resize desktop upon display change events.
by Zhiyi Zhang 11 May '20

11 May '20

Otherwise, Wine still has the old desktop size after a user changed display resolution using host system utilities. X11DRV_DisplayDevices_Update() is introduced so that display devices reinitialization is separated from desktop resizing. Otherwise, X11DRV_DisplayDevices_Init() would have to be called twice to resize the desktop with up-to-date primary monitor dimensions, wasting resources. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48441 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 37 ++++++++++++++++++++----------------- dlls/winex11.drv/display.c | 18 ++++++++++++++++++ dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 3 ++- dlls/winex11.drv/xrandr.c | 11 ++++++++--- dlls/winex11.drv/xvidmode.c | 2 +- 6 files changed, 50 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index bde4841ed42..9011f50c20c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -145,7 +145,10 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) */ } TRACE("Resizing Wine desktop window to %dx%d\n", dd_modes[mode].width, dd_modes[mode].height); - X11DRV_resize_desktop(dd_modes[mode].width, dd_modes[mode].height); + + desktop_width = dd_modes[mode].width; + desktop_height = dd_modes[mode].height; + X11DRV_DisplayDevices_Update( TRUE ); return DISP_CHANGE_SUCCESSFUL; } @@ -387,35 +390,35 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) /*********************************************************************** * X11DRV_resize_desktop */ -void X11DRV_resize_desktop( unsigned int width, unsigned int height ) +void X11DRV_resize_desktop( UINT mask, BOOL send_display_change ) { - RECT old_virtual_rect, new_virtual_rect; + RECT primary_rect, virtual_rect; HWND hwnd = GetDesktopWindow(); - UINT mask = 0; + INT width, height; - old_virtual_rect = get_virtual_screen_rect(); - desktop_width = width; - desktop_height = height; - X11DRV_DisplayDevices_Init( TRUE ); - new_virtual_rect = get_virtual_screen_rect(); - - if (old_virtual_rect.left != new_virtual_rect.left) mask |= CWX; - if (old_virtual_rect.top != new_virtual_rect.top) mask |= CWY; + virtual_rect = get_virtual_screen_rect(); + primary_rect = get_primary_monitor_rect(); + width = primary_rect.right; + height = primary_rect.bottom; if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) { - SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, MAKELPARAM( width, height ) ); + SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, (WPARAM)mask, (LPARAM)send_display_change ); } else { TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); update_desktop_fullscreen( width, height ); - SetWindowPos( hwnd, 0, new_virtual_rect.left, new_virtual_rect.top, - new_virtual_rect.right - new_virtual_rect.left, new_virtual_rect.bottom - new_virtual_rect.top, + SetWindowPos( hwnd, 0, virtual_rect.left, virtual_rect.top, + virtual_rect.right - virtual_rect.left, virtual_rect.bottom - virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); ungrab_clipping_window(); - SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, - MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); + + if (send_display_change) + { + SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, MAKELPARAM( width, height ), + SMTO_ABORTIFHUNG, 2000, NULL ); + } } EnumWindows( update_windows_on_desktop_resize, (LPARAM)mask ); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 4429cb89224..503f8c96877 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -273,6 +273,24 @@ void X11DRV_DisplayDevices_RegisterEventHandlers(void) handler->register_event_handlers(); } +void X11DRV_DisplayDevices_Update(BOOL send_display_change) +{ + RECT old_virtual_rect, new_virtual_rect; + UINT mask = 0; + + old_virtual_rect = get_virtual_screen_rect(); + X11DRV_DisplayDevices_Init(TRUE); + new_virtual_rect = get_virtual_screen_rect(); + + /* Calculate XReconfigureWMWindow() mask */ + if (old_virtual_rect.left != new_virtual_rect.left) + mask |= CWX; + if (old_virtual_rect.top != new_virtual_rect.top) + mask |= CWY; + + X11DRV_resize_desktop(mask, send_display_change); +} + /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c773c278b72..ca40005d729 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2729,7 +2729,7 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) } return 0; case WM_X11DRV_RESIZE_DESKTOP: - X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); + X11DRV_resize_desktop( (UINT)wp, (BOOL)lp ); return 0; case WM_X11DRV_SET_CURSOR: if ((data = get_win_data( hwnd ))) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..1f8af184808 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -657,7 +657,7 @@ struct x11drv_mode_info }; extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; -extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +extern void X11DRV_resize_desktop(UINT, BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; @@ -755,6 +755,7 @@ struct x11drv_display_device_handler extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Update(BOOL) DECLSPEC_HIDDEN; /* Display device handler used in virtual desktop mode */ extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 95e4a5d6dba..76e76806c55 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -209,7 +209,7 @@ static LONG xrandr10_set_current_mode( int mode ) if (stat == RRSetConfigSuccess) { xrandr_current_mode = mode; - X11DRV_resize_desktop( dd_modes[mode].width, dd_modes[mode].height ); + X11DRV_DisplayDevices_Update( TRUE ); return DISP_CHANGE_SUCCESSFUL; } @@ -457,7 +457,7 @@ static LONG xrandr12_set_current_mode( int mode ) } xrandr_current_mode = mode; - X11DRV_resize_desktop( dd_modes[mode].width, dd_modes[mode].height ); + X11DRV_DisplayDevices_Update( TRUE ); return DISP_CHANGE_SUCCESSFUL; } @@ -1094,7 +1094,12 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) - X11DRV_DisplayDevices_Init( TRUE ); + { + /* Don't send a WM_DISPLAYCHANGE message here because this event may be a result from + * ChangeDisplaySettings(). Otherwise, ChangeDisplaySettings() would send multiple + * WM_DISPLAYCHANGE messages instead of just one */ + X11DRV_DisplayDevices_Update( FALSE ); + } return FALSE; } diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 890dbc46c71..a5884543163 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -145,7 +145,7 @@ static LONG X11DRV_XF86VM_SetCurrentMode(int mode) XWarpPointer(gdi_display, None, DefaultRootWindow(gdi_display), 0, 0, 0, 0, 0, 0); #endif XSync(gdi_display, False); - X11DRV_resize_desktop( real_xf86vm_modes[mode]->hdisplay, real_xf86vm_modes[mode]->vdisplay ); + X11DRV_DisplayDevices_Update( TRUE ); return DISP_CHANGE_SUCCESSFUL; } -- 2.25.1

1 0

[PATCH] include: Add dpfilter.h.
by Zebediah Figura 11 May '20

11 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/dpfilter.h | 188 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 include/dpfilter.h diff --git a/include/dpfilter.h b/include/dpfilter.h new file mode 100644 index 0000000000..5b09dc9c23 --- /dev/null +++ b/include/dpfilter.h @@ -0,0 +1,188 @@ +/* + * Copyright (C) 2020 Zebediah Figura + * + * 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 + */ + +#ifndef __WINE_DPFILTER_H +#define __WINE_DPFILTER_H + +#define DPFLTR_ERROR_LEVEL 0 +#define DPFLTR_WARNING_LEVEL 1 +#define DPFLTR_TRACE_LEVEL 2 +#define DPFLTR_INFO_LEVEL 3 +#define DPFLTR_MASK 0x8000000 + +typedef enum _DPFLTR_TYPE +{ + DPFLTR_SYSTEM_ID = 0, + DPFLTR_SMSS_ID = 1, + DPFLTR_SETUP_ID = 2, + DPFLTR_NTFS_ID = 3, + DPFLTR_FSTUB_ID = 4, + DPFLTR_CRASHDUMP_ID = 5, + DPFLTR_CDAUDIO_ID = 6, + DPFLTR_CDROM_ID = 7, + DPFLTR_CLASSPNP_ID = 8, + DPFLTR_DISK_ID = 9, + DPFLTR_REDBOOK_ID = 10, + DPFLTR_STORPROP_ID = 11, + DPFLTR_SCSIPORT_ID = 12, + DPFLTR_SCSIMINIPORT_ID = 13, + DPFLTR_CONFIG_ID = 14, + DPFLTR_I8042PRT_ID = 15, + DPFLTR_SERMOUSE_ID = 16, + DPFLTR_LSERMOUS_ID = 17, + DPFLTR_KBDHID_ID = 18, + DPFLTR_MOUHID_ID = 19, + DPFLTR_KBDCLASS_ID = 20, + DPFLTR_MOUCLASS_ID = 21, + DPFLTR_TWOTRACK_ID = 22, + DPFLTR_WMILIB_ID = 23, + DPFLTR_ACPI_ID = 24, + DPFLTR_AMLI_ID = 25, + DPFLTR_HALIA64_ID = 26, + DPFLTR_VIDEO_ID = 27, + DPFLTR_SVCHOST_ID = 28, + DPFLTR_VIDEOPRT_ID = 29, + DPFLTR_TCPIP_ID = 30, + DPFLTR_DMSYNTH_ID = 31, + DPFLTR_NTOSPNP_ID = 32, + DPFLTR_FASTFAT_ID = 33, + DPFLTR_SAMSS_ID = 34, + DPFLTR_PNPMGR_ID = 35, + DPFLTR_NETAPI_ID = 36, + DPFLTR_SCSERVER_ID = 37, + DPFLTR_SCCLIENT_ID = 38, + DPFLTR_SERIAL_ID = 39, + DPFLTR_SERENUM_ID = 40, + DPFLTR_UHCD_ID = 41, + DPFLTR_RPCPROXY_ID = 42, + DPFLTR_AUTOCHK_ID = 43, + DPFLTR_DCOMSS_ID = 44, + DPFLTR_UNIMODEM_ID = 45, + DPFLTR_SIS_ID = 46, + DPFLTR_FLTMGR_ID = 47, + DPFLTR_WMICORE_ID = 48, + DPFLTR_BURNENG_ID = 49, + DPFLTR_IMAPI_ID = 50, + DPFLTR_SXS_ID = 51, + DPFLTR_FUSION_ID = 52, + DPFLTR_IDLETASK_ID = 53, + DPFLTR_SOFTPCI_ID = 54, + DPFLTR_TAPE_ID = 55, + DPFLTR_MCHGR_ID = 56, + DPFLTR_IDEP_ID = 57, + DPFLTR_PCIIDE_ID = 58, + DPFLTR_FLOPPY_ID = 59, + DPFLTR_FDC_ID = 60, + DPFLTR_TERMSRV_ID = 61, + DPFLTR_W32TIME_ID = 62, + DPFLTR_PREFETCHER_ID = 63, + DPFLTR_RSFILTER_ID = 64, + DPFLTR_FCPORT_ID = 65, + DPFLTR_PCI_ID = 66, + DPFLTR_DMIO_ID = 67, + DPFLTR_DMCONFIG_ID = 68, + DPFLTR_DMADMIN_ID = 69, + DPFLTR_WSOCKTRANSPORT_ID = 70, + DPFLTR_VSS_ID = 71, + DPFLTR_PNPMEM_ID = 72, + DPFLTR_PROCESSOR_ID = 73, + DPFLTR_DMSERVER_ID = 74, + DPFLTR_SR_ID = 75, + DPFLTR_INFINIBAND_ID = 76, + DPFLTR_IHVDRIVER_ID = 77, + DPFLTR_IHVVIDEO_ID = 78, + DPFLTR_IHVAUDIO_ID = 79, + DPFLTR_IHVNETWORK_ID = 80, + DPFLTR_IHVSTREAMING_ID = 81, + DPFLTR_IHVBUS_ID = 82, + DPFLTR_HPS_ID = 83, + DPFLTR_RTLTHREADPOOL_ID = 84, + DPFLTR_LDR_ID = 85, + DPFLTR_TCPIP6_ID = 86, + DPFLTR_ISAPNP_ID = 87, + DPFLTR_SHPC_ID = 88, + DPFLTR_STORPORT_ID = 89, + DPFLTR_STORMINIPORT_ID = 90, + DPFLTR_PRINTSPOOLER_ID = 91, + DPFLTR_VSSDYNDISK_ID = 92, + DPFLTR_VERIFIER_ID = 93, + DPFLTR_VDS_ID = 94, + DPFLTR_VDSBAS_ID = 95, + DPFLTR_VDSDYN_ID = 96, + DPFLTR_VDSDYNDR_ID = 97, + DPFLTR_VDSLDR_ID = 98, + DPFLTR_VDSUTIL_ID = 99, + DPFLTR_DFRGIFC_ID = 100, + DPFLTR_DEFAULT_ID = 101, + DPFLTR_MM_ID = 102, + DPFLTR_DFSC_ID = 103, + DPFLTR_WOW64_ID = 104, + DPFLTR_ALPC_ID = 105, + DPFLTR_WDI_ID = 106, + DPFLTR_PERFLIB_ID = 107, + DPFLTR_KTM_ID = 108, + DPFLTR_IOSTRESS_ID = 109, + DPFLTR_HEAP_ID = 110, + DPFLTR_WHEA_ID = 111, + DPFLTR_USERGDI_ID = 112, + DPFLTR_MMCSS_ID = 113, + DPFLTR_TPM_ID = 114, + DPFLTR_THREADORDER_ID = 115, + DPFLTR_ENVIRON_ID = 116, + DPFLTR_EMS_ID = 117, + DPFLTR_WDT_ID = 118, + DPFLTR_FVEVOL_ID = 119, + DPFLTR_NDIS_ID = 120, + DPFLTR_NVCTRACE_ID = 121, + DPFLTR_LUAFV_ID = 122, + DPFLTR_APPCOMPAT_ID = 123, + DPFLTR_USBSTOR_ID = 124, + DPFLTR_SBP2PORT_ID = 125, + DPFLTR_COVERAGE_ID = 126, + DPFLTR_CACHEMGR_ID = 127, + DPFLTR_MOUNTMGR_ID = 128, + DPFLTR_CFR_ID = 129, + DPFLTR_TXF_ID = 130, + DPFLTR_KSECDD_ID = 131, + DPFLTR_FLTREGRESS_ID = 132, + DPFLTR_MPIO_ID = 133, + DPFLTR_MSDSM_ID = 134, + DPFLTR_UDFS_ID = 135, + DPFLTR_PSHED_ID = 136, + DPFLTR_STORVSP_ID = 137, + DPFLTR_LSASS_ID = 138, + DPFLTR_SSPICLI_ID = 139, + DPFLTR_CNG_ID = 140, + DPFLTR_EXFAT_ID = 141, + DPFLTR_FILETRACE_ID = 142, + DPFLTR_XSAVE_ID = 143, + DPFLTR_SE_ID = 144, + DPFLTR_DRIVEEXTENDER_ID = 145, + DPFLTR_POWER_ID = 146, + DPFLTR_CRASHDUMPXHCI_ID = 147, + DPFLTR_GPIO_ID = 148, + DPFLTR_REFS_ID = 149, + DPFLTR_WER_ID = 150, + DPFLTR_CAPIMG_ID = 151, + DPFLTR_VPCI_ID = 152, + DPFLTR_STORAGECLASSMEMORY_ID = 153, + DPFLTR_FSLIB_ID = 154, + DPFLTR_ENDOFTABLE_ID +} DPFLTR_TYPE; + +#endif -- 2.26.2

1 0

[PATCH] joy.cpl: Add a description.
by Esme Povirk 11 May '20

11 May '20

From: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/joy.cpl/joy.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index bced24fb21b..a4a780276bb 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -28,6 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_CPL_NAME "Game Controllers" + IDS_CPL_INFO "Test and configure game controllers." END IDD_LIST DIALOG 0, 0, 320, 220 -- 2.17.1

1 0

[PATCH v2] include: add new defines and fix struct WNODE_HEADER
by Vijay Kiran Kamuju 10 May '20

10 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

PATCH] include: add new defines and fix struct WNODE_HEADER
by Vijay Kiran Kamuju 10 May '20

10 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] advpack: Extract inf file before installing in ExecuteCab().
by Gijs Vermeulen 10 May '20

10 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29806 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/advpack/install.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 70dc4d74aa..d82de9c361 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -677,8 +677,15 @@ HRESULT WINAPI ExecuteCabW(HWND hwnd, CABINFOW* pCab, LPVOID pReserved) ZeroMemory(&info, sizeof(ADVInfo)); - if (pCab->pszCab && *pCab->pszCab) - FIXME("Cab archive not extracted!\n"); + if ((pCab->pszCab && *pCab->pszCab) && (pCab->pszInf && *pCab->pszInf) && *pCab->szSrcPath) + { + TRACE("pszCab: %s, pszInf: %s, szSrcPath: %s\n", debugstr_w(pCab->pszCab), debugstr_w(pCab->pszInf), + debugstr_w(pCab->szSrcPath)); + + hr = ExtractFilesW(pCab->pszCab, pCab->szSrcPath, 0, pCab->pszInf, NULL, 0); + if (FAILED(hr)) + ERR("Failed to extract .inf file!\n"); + } hr = install_init(pCab->pszInf, pCab->pszSection, pCab->szSrcPath, pCab->dwFlags, &info); if (hr != S_OK) -- 2.26.2

1 0

[PATCH V2] directmanipulation: New stub dll
by Vijay Kiran Kamuju 10 May '20

10 May '20

V2: Removed class registration Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 10 May '20

10 May '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 178 +++++++++++++++++-------------------------------------- 1 file changed, 53 insertions(+), 125 deletions(-)

1 0

[v3 PATCH] dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag.
by Nikolay Sivov 09 May '20

09 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: use strictly level 11 device. dlls/dxgi/tests/dxgi.c | 76 +++++++++++++++++++++++++++++++++++++++++- dlls/dxgi/utils.c | 4 ++- 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a9f9b71570..189f09c9e0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -44,6 +44,10 @@ static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECK static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *desc); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -624,6 +628,38 @@ success: return dxgi_device; } +static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + IDXGIDevice *device = NULL; + ID3D11Device *d3d_device; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ID3D11Device_Release(d3d_device); + } + + return device; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -1079,6 +1115,7 @@ static void test_check_interface_support(void) static void test_create_surface(void) { + ID3D11Texture2D *texture2d; DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; @@ -1109,6 +1146,40 @@ static void test_create_surface(void) IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* DXGI_USAGE_UNORDERED_ACCESS */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create D3D11 device.\n"); + return; + } + + surface = NULL; + hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + + if (surface) + { + ID3D11UnorderedAccessView *uav; + ID3D11Device *d3d_device; + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d); + ok(hr == S_OK, "Failed to get texture interface, hr %#x.\n", hr); + + ID3D11Texture2D_GetDevice(texture2d, &d3d_device); + + hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + + ID3D11Device_Release(d3d_device); + ID3D11Texture2D_Release(texture2d); + + IDXGISurface_Release(surface); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } static void test_parents(void) @@ -6624,7 +6695,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module, gdi32_module; + HMODULE dxgi_module, d3d11_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -6639,6 +6710,9 @@ START_TEST(dxgi) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + d3d11_module = LoadLibraryA("d3d11.dll"); + pD3D11CreateDevice = (void *)GetProcAddress(d3d11_module, "D3D11CreateDevice"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aece3a6af1..a32c7ee129 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -503,8 +503,10 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) wined3d_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) wined3d_bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (dxgi_usage & DXGI_USAGE_UNORDERED_ACCESS) + wined3d_bind_flags |= WINED3D_BIND_UNORDERED_ACCESS; - dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_UNORDERED_ACCESS); if (dxgi_usage) FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); return wined3d_bind_flags; -- 2.26.2

2 1

[PATCH v5 1/3] ntdll/tests: Test user_shared_data timestamp updates.
by Rémi Bernon 09 May '20

09 May '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/time.c | 78 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8d8..fe71d4458c0f 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)( ULONGLONG *time ); static const int MonthLengths[2][12] = { @@ -153,6 +156,79 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static ULONGLONG read_ksystem_time(volatile KSYSTEM_TIME *time) +{ + ULONGLONG high, low; + do + { + high = time->High1Time; + low = time->LowPart; + } + while (high != time->High2Time); + return high << 32 | low; +} + +static void test_user_shared_data_time(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + ULONGLONG t1, t2, t3; + int i = 0; + + i = 0; + do + { + t1 = GetTickCount(); + if (user_shared_data->NtMajorVersion <= 5 && user_shared_data->NtMinorVersion <= 1) + t2 = ((ULONG64)user_shared_data->TickCountLowDeprecated * user_shared_data->TickCountMultiplier) >> 24; + else + t2 = (read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24; + t3 = GetTickCount(); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + ok(t1 <= t2, "USD TickCount / GetTickCount are out of order: %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + todo_wine + ok(t2 <= t3, "USD TickCount / GetTickCount are out of order: %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + + i = 0; + do + { + LARGE_INTEGER system_time; + NtQuerySystemTime(&system_time); + t1 = system_time.QuadPart; + t2 = read_ksystem_time(&user_shared_data->SystemTime); + NtQuerySystemTime(&system_time); + t3 = system_time.QuadPart; + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + todo_wine + ok(t1 <= t2, "USD SystemTime / NtQuerySystemTime are out of order %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + ok(t2 <= t3, "USD SystemTime / NtQuerySystemTime are out of order %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + + if (!pRtlQueryUnbiasedInterruptTime) + win_skip("skipping RtlQueryUnbiasedInterruptTime tests\n"); + else + { + i = 0; + do + { + pRtlQueryUnbiasedInterruptTime(&t1); + t2 = read_ksystem_time(&user_shared_data->InterruptTime); + pRtlQueryUnbiasedInterruptTime(&t3); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + todo_wine + ok(t1 <= t2, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + ok(t2 <= t3 || broken(t2 == t3 + 82410089070) /* w864 has some weird offset on testbot */, + "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -163,6 +239,7 @@ START_TEST(time) (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryDynamicTimeZoneInformation"); + pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(mod, "RtlQueryUnbiasedInterruptTime"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); @@ -170,4 +247,5 @@ START_TEST(time) win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); test_RtlQueryTimeZoneInformation(); + test_user_shared_data_time(); } -- 2.26.1

3 10

[v2 PATCH] dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag.
by Nikolay Sivov 09 May '20

09 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: handle surface creation failure on some systems. dlls/dxgi/tests/dxgi.c | 78 +++++++++++++++++++++++++++++++++++++++++- dlls/dxgi/utils.c | 4 ++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f04cd2be06..c33b9981f9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -44,6 +44,10 @@ static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECK static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *desc); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -624,6 +628,40 @@ success: return dxgi_device; } +static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + ID3D11Device *d3d_device; + IDXGIDevice *device = NULL; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ID3D11Device_Release(d3d_device); + } + + return device; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -1079,6 +1117,7 @@ static void test_check_interface_support(void) static void test_create_surface(void) { + ID3D11Texture2D *texture2d; DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; @@ -1109,6 +1148,40 @@ static void test_create_surface(void) IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* DXGI_USAGE_UNORDERED_ACCESS */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create D3D11 device.\n"); + return; + } + + surface = NULL; + hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface); + ok(SUCCEEDED(hr) || broken(hr == E_INVALIDARG), "Failed to create a dxgi surface, hr %#x\n", hr); + + if (surface) + { + ID3D11UnorderedAccessView *uav; + ID3D11Device *d3d_device; + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d); + ok(hr == S_OK, "Failed to get texture interface, hr %#x.\n", hr); + + ID3D11Texture2D_GetDevice(texture2d, &d3d_device); + + hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + + ID3D11Device_Release(d3d_device); + ID3D11Texture2D_Release(texture2d); + + IDXGISurface_Release(surface); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } static void test_parents(void) @@ -6483,7 +6556,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module, gdi32_module; + HMODULE dxgi_module, d3d11_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -6498,6 +6571,9 @@ START_TEST(dxgi) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + d3d11_module = LoadLibraryA("d3d11.dll"); + pD3D11CreateDevice = (void *)GetProcAddress(d3d11_module, "D3D11CreateDevice"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aece3a6af1..a32c7ee129 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -503,8 +503,10 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) wined3d_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) wined3d_bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (dxgi_usage & DXGI_USAGE_UNORDERED_ACCESS) + wined3d_bind_flags |= WINED3D_BIND_UNORDERED_ACCESS; - dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_UNORDERED_ACCESS); if (dxgi_usage) FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); return wined3d_bind_flags; -- 2.26.2

4 9

Wine staging 5.8 release
by Alistair Leslie-Hughes 09 May '20

09 May '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.8 (833 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * ddraw: Remove const from ddraw1_vtbl and ddraw_surface1_vtbl. * ddraw: Allow writing to vtable for surface and palette * windowscodecs: Add initial implementation of the GIF encoder. * windowscodecs: Initialize empty property bag in GIF encoder's CreateNewFrame implementation. * windowscodecs: Add registration of the GIF encoder. * windowscodecs: Fix IWICBitmapDecoder::CopyPalette for a not initialized case in the GIF decoder. * windowscodecs: Better follow the GIF spec and don't specify the local color table size if there is no local palette. * windowscodecs/tests: Add the tests for GIF encoder and decoder. * windowscodecs: Correctly indicate that the global info was written even without the global palette. * d3dx9_36/tests: Remove useless \n within some ok messages. * ddraw/tests: Add more tests for IDirectDraw7::EnumSurfaces. * ddraw: Implement DDENUMSURFACES_CANBECREATED flag in ddraw7_EnumSurfaces. Added: * None Updated: * ntdll-WRITECOPY * wined3d-Indexed_Vertex_Blending * ntdll-NtSetLdtEntries * winebuild-Fake_Dlls Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[RFC PATCH 0/8] Updated cubic-bezier patches.
by Connor McAdams 08 May '20

08 May '20

Looking for feedback on my current methods of storing the control points of cubic beziers, and the new bezier flattening method. Also, any suggestions on more tests to write would be helpful. Thanks. Connor McAdams (8): d2d1: Store cubic bezier control points. d2d1: Implement new bezier flattening method. d2d1: Add cubic bezier bounds functions. d2d1: Implement cubic bezier-bezier intersection. d2d1: Implement cubic bezier-line intersection. d2d1: Add cubic bezier overlap splitting limit. d2d1: Add tests for cubic-bezier path geometry. d2d1: Cubic bezier-line intersection tests. dlls/d2d1/geometry.c | 1094 ++++++++++++++++++++++++++++++++++------ dlls/d2d1/tests/d2d1.c | 429 ++++++++++++++++ 2 files changed, 1381 insertions(+), 142 deletions(-) -- 2.20.1

3 12

[PATCH v2] wined3d: Allow setting user memory for mipmapped texture in wined3d_texture_update_desc().
by Paul Gofman 08 May '20

08 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix test failure on some testbot machines. dlls/ddraw/tests/ddraw7.c | 38 ++++++++++++--- dlls/wined3d/texture.c | 100 +++++++++++++++++++++----------------- 2 files changed, 86 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ddd3cdb0e..240438d098 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13347,14 +13347,14 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); width = surface_desc.dwWidth; height = surface_desc.dwHeight; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, width, height, NULL, NULL, NULL, NULL); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); bpp = 0; if (SUCCEEDED(IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0))) @@ -13367,7 +13367,7 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", @@ -13379,9 +13379,9 @@ static void test_display_mode_surface_pixel_format(void) U5(surface_desc).dwBackBufferCount = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", @@ -13397,15 +13397,39 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwHeight = height; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, bpp); IDirectDrawSurface7_Release(surface); + /* Test compatibility mode mipmap texture creation. */ + hr = IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0); + ok(hr == D3D_OK || hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + win_skip("SetDisplayMode failed, skipping test."); + goto done; + } + bpp = 16; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT | DDSD_PITCH; + U2(surface_desc).dwMipMapCount = 2; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + U1(surface_desc).lPitch = surface_desc.dwWidth * bpp / 8; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_VIDEOMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == D3D_OK || hr == DDERR_NODIRECTDRAWHW, "Got unexpected hr %#x.\n", hr); + if (surface) + IDirectDrawSurface7_Release(surface); + +done: refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 49373eb58a..239c089dd8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1748,9 +1748,10 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; - const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; + const struct wined3d *d3d; + BOOL set_user_memory_only; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1765,10 +1766,15 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + set_user_memory_only = width == texture->resource.width && height == texture->resource.height + && format_id == texture->resource.format->id && multisample_type == texture->resource.multisample_type + && multisample_quality == texture->resource.multisample_quality + && (!texture->row_pitch || pitch == texture->row_pitch); + if (!resource_size) return WINED3DERR_INVALIDCALL; - if (texture->level_count * texture->layer_count > 1) + if (texture->level_count * texture->layer_count > 1 && !set_user_memory_only) { WARN("Texture has multiple sub-resources, not supported.\n"); return WINED3DERR_INVALIDCALL; @@ -1803,7 +1809,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_cs_emit_unload_resource(device->cs, &texture->resource); wined3d_resource_wait_idle(&texture->resource); - sub_resource = &texture->sub_resources[0]; if (texture->dc_info && texture->dc_info[0].dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; @@ -1815,55 +1820,60 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_free_sysmem(&texture->resource); - if ((texture->row_pitch = pitch)) - texture->slice_pitch = height * pitch; - else - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(format, 1, width, height, - &texture->row_pitch, &texture->slice_pitch); - - texture->resource.format = format; - texture->resource.multisample_type = multisample_type; - texture->resource.multisample_quality = multisample_quality; - texture->resource.width = width; - texture->resource.height = height; - if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) - adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); - texture->resource.size = texture->slice_pitch; - sub_resource->size = texture->slice_pitch; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - - if (texture->texture_ops == &texture_gl_ops) - { - if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + if (!set_user_memory_only) + { + sub_resource = &texture->sub_resources[0]; + + if ((texture->row_pitch = pitch)) + texture->slice_pitch = height * pitch; + else + /* User memory surfaces don't have the regular surface alignment. */ + wined3d_format_calculate_pitch(format, 1, width, height, + &texture->row_pitch, &texture->slice_pitch); + + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); + texture->resource.size = texture->slice_pitch; + sub_resource->size = texture->slice_pitch; + sub_resource->locations = WINED3D_LOCATION_DISCARDED; + + if (texture->texture_ops == &texture_gl_ops) + { + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } + else + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } + } + + if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot + && !d3d_info->texture_npot_conditional) { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; - texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = width; + texture->pow2_height = height; } } - if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot - && !d3d_info->texture_npot_conditional) - { - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = texture->pow2_height = 1; - while (texture->pow2_width < width) - texture->pow2_width <<= 1; - while (texture->pow2_height < height) - texture->pow2_height <<= 1; - } - else - { - texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = width; - texture->pow2_height = height; - } - if ((texture->user_memory = mem)) { texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; -- 2.26.2

2 3

[PATCH 5/5] dxgi: Search all adapters for the containing output of a swapchain.
by Zhiyi Zhang 08 May '20

08 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 82 +++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 50 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f57183879d4..009ab8c0394 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -111,11 +111,13 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } -static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, IDXGIOutput **dxgi_output) +static HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, + IDXGIOutput **dxgi_output) { + unsigned int adapter_idx, output_idx; DXGI_OUTPUT_DESC desc; + IDXGIAdapter *adapter; IDXGIOutput *output; - unsigned int index; HMONITOR monitor; HRESULT hr; @@ -125,25 +127,32 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_INVALID_CALL; } - index = 0; - while ((hr = IDXGIAdapter_EnumOutputs(adapter, index, &output)) == S_OK) + for (adapter_idx = 0; SUCCEEDED(hr = IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + for (output_idx = 0; SUCCEEDED(hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, + &output)); ++output_idx) { - WARN("Failed to get output desc %u, hr %#x.\n", index, hr); - ++index; - continue; - } + if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + { + WARN("Adapter %u output %u: Failed to get output desc, hr %#x.\n", adapter_idx, + output_idx, hr); + IDXGIOutput_Release(output); + continue; + } - if (desc.Monitor == monitor) - { - *dxgi_output = output; - return S_OK; - } + if (desc.Monitor == monitor) + { + *dxgi_output = output; + IDXGIAdapter_Release(adapter); + return S_OK; + } - IDXGIOutput_Release(output); - ++index; + IDXGIOutput_Release(output); + } + IDXGIAdapter_Release(adapter); } + if (hr != DXGI_ERROR_NOT_FOUND) WARN("Failed to enumerate outputs, hr %#x.\n", hr); @@ -582,9 +591,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - IDXGIAdapter *adapter; - IDXGIDevice *device; - HRESULT hr; + HWND window; TRACE("iface %p, output %p.\n", iface, output); @@ -594,24 +601,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - if (SUCCEEDED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) + if (!swapchain->factory) { - hr = IDXGIDevice_GetAdapter(device, &adapter); - IDXGIDevice_Release(device); + ERR("Implicit swapchain does not store a reference to factory.\n"); + return E_NOINTERFACE; } - if (SUCCEEDED(hr)) - { - HWND hwnd = d3d11_swapchain_get_hwnd(swapchain); - hr = dxgi_get_output_from_window(adapter, hwnd, output); - IDXGIAdapter_Release(adapter); - } - else - { - WARN("Failed to get adapter, hr %#x.\n", hr); - } - - return hr; + window = d3d11_swapchain_get_hwnd(swapchain); + return dxgi_get_output_from_window(swapchain->factory, window, output); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapChain1 *iface, @@ -2422,9 +2419,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh IDXGIOutput **output) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - IUnknown *device_parent; - IDXGIAdapter *adapter; - HRESULT hr; TRACE("iface %p, output %p.\n", iface, output); @@ -2434,19 +2428,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - device_parent = vkd3d_get_device_parent(swapchain->device); - - if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) - { - hr = dxgi_get_output_from_window(adapter, swapchain->window, output); - IDXGIAdapter_Release(adapter); - } - else - { - WARN("Failed to get adapter, hr %#x.\n", hr); - } - - return hr; + return dxgi_get_output_from_window((IDXGIFactory *)swapchain->factory, swapchain->window, output); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFrameStatistics(IDXGISwapChain3 *iface, -- 2.25.1

2 1

[PATCH 4/5] dxgi/tests: Add more get swapchain containing output tests.
by Zhiyi Zhang 08 May '20

08 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 279 ++++++++++++++++++++++++++--------------- 1 file changed, 175 insertions(+), 104 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5af2104bb1a..a9f9b715702 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2022,7 +2022,7 @@ static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *outp static void test_get_containing_output(void) { - unsigned int output_count, output_idx; + unsigned int adapter_idx, output_idx, output_count; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGIOutput *output, *output2; DXGI_OUTPUT_DESC output_desc; @@ -2035,6 +2035,7 @@ static void test_get_containing_output(void) unsigned int i, j; HMONITOR monitor; HMONITOR primary; + BOOL fullscreen; ULONG refcount; HRESULT hr; BOOL ret; @@ -2075,6 +2076,7 @@ static void test_get_containing_output(void) IDXGIOutput_Release(output); ++output_count; } + IDXGIAdapter_Release(adapter); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); @@ -2092,7 +2094,6 @@ static void test_get_containing_output(void) if (hr == DXGI_ERROR_UNSUPPORTED) { win_skip("GetContainingOutput() not supported.\n"); - IDXGISwapChain_Release(swapchain); goto done; } @@ -2119,118 +2120,188 @@ static void test_get_containing_output(void) primary = get_primary_if_right_side_secondary(&output_desc); - output_idx = 0; - while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)) != DXGI_ERROR_NOT_FOUND) + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_idx, hr); - - hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - - /* Move the OutputWindow to the current output. */ - ret = SetWindowPos(swapchain_desc.OutputWindow, 0, - output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, - 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "SetWindowPos failed.\n"); - - hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); - ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); - - check_output_equal(output, output2); - - refcount = IDXGIOutput_Release(output2); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); - refcount = IDXGIOutput_Release(output); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); - ++output_idx; - - /* Move the OutputWindow around the corners of the current output desktop coordinates. */ - for (i = 0; i < 4; ++i) + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) { - static const POINT offsets[] = - { - { 0, 0}, - {-49, 0}, {-50, 0}, {-51, 0}, - { 0, -49}, { 0, -50}, { 0, -51}, - {-49, -49}, {-50, -49}, {-51, -49}, - {-49, -50}, {-50, -50}, {-51, -50}, - {-49, -51}, {-50, -51}, {-51, -51}, - }; - unsigned int x = 0, y = 0; - - switch (i) - { - case 0: - x = output_desc.DesktopCoordinates.left; - y = output_desc.DesktopCoordinates.top; - break; - case 1: - x = output_desc.DesktopCoordinates.right; - y = output_desc.DesktopCoordinates.top; - break; - case 2: - x = output_desc.DesktopCoordinates.right; - y = output_desc.DesktopCoordinates.bottom; - break; - case 3: - x = output_desc.DesktopCoordinates.left; - y = output_desc.DesktopCoordinates.bottom; - break; - } - - for (j = 0; j < ARRAY_SIZE(offsets); ++j) - { - unsigned int idx = ARRAY_SIZE(offsets) * i + j; - assert(idx < ARRAY_SIZE(points)); - points[idx].x = x + offsets[j].x; - points[idx].y = y + offsets[j].y; - } - } - - for (i = 0; i < ARRAY_SIZE(points); ++i) - { - ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, - 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "Failed to set window position.\n"); - - monitor = MonitorFromWindow(swapchain_desc.OutputWindow, MONITOR_DEFAULTTONEAREST); - ok(!!monitor, "Failed to get monitor from window.\n"); - - monitor_info.cbSize = sizeof(monitor_info); - ret = GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info); - ok(ret, "Failed to get monitor info.\n"); - - hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); - /* Hack to prevent test failures with secondary on the right until multi-monitor support is improved. */ - todo_wine_if(primary && monitor != primary) - ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), - "Failed to get containing output, hr %#x.\n", hr); - if (hr != S_OK) - continue; - ok(!!output, "Got unexpected containing output %p.\n", output); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Failed to get output desc, hr %#x.\n", hr); - refcount = IDXGIOutput_Release(output); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); - ok(!lstrcmpW(output_desc.DeviceName, monitor_info.szDevice), - "Got unexpected device name %s, expected %s.\n", - wine_dbgstr_w(output_desc.DeviceName), wine_dbgstr_w(monitor_info.szDevice)); - ok(EqualRect(&output_desc.DesktopCoordinates, &monitor_info.rcMonitor), - "Got unexpected desktop coordinates %s, expected %s.\n", - wine_dbgstr_rect(&output_desc.DesktopCoordinates), - wine_dbgstr_rect(&monitor_info.rcMonitor)); + /* Move the OutputWindow to the current output. */ + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left, + output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u: SetWindowPos failed.\n", adapter_idx, output_idx); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); + if (FAILED(hr)) + { + win_skip("Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, hr); + IDXGIOutput_Release(output); + continue; + } + + check_output_equal(output, output2); + + refcount = IDXGIOutput_Release(output2); + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, refcount); + + /* Move the OutputWindow around the corners of the current output desktop coordinates. */ + for (i = 0; i < 4; ++i) + { + static const POINT offsets[] = + { + { 0, 0}, + {-49, 0}, {-50, 0}, {-51, 0}, + { 0, -49}, { 0, -50}, { 0, -51}, + {-49, -49}, {-50, -49}, {-51, -49}, + {-49, -50}, {-50, -50}, {-51, -50}, + {-49, -51}, {-50, -51}, {-51, -51}, + }; + unsigned int x = 0, y = 0; + + switch (i) + { + case 0: + x = output_desc.DesktopCoordinates.left; + y = output_desc.DesktopCoordinates.top; + break; + case 1: + x = output_desc.DesktopCoordinates.right; + y = output_desc.DesktopCoordinates.top; + break; + case 2: + x = output_desc.DesktopCoordinates.right; + y = output_desc.DesktopCoordinates.bottom; + break; + case 3: + x = output_desc.DesktopCoordinates.left; + y = output_desc.DesktopCoordinates.bottom; + break; + } + + for (j = 0; j < ARRAY_SIZE(offsets); ++j) + { + unsigned int idx = ARRAY_SIZE(offsets) * i + j; + assert(idx < ARRAY_SIZE(points)); + points[idx].x = x + offsets[j].x; + points[idx].y = y + offsets[j].y; + } + } + + for (i = 0; i < ARRAY_SIZE(points); ++i) + { + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, + 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u point %u: Failed to set window position.\n", + adapter_idx, output_idx, i); + + monitor = MonitorFromWindow(swapchain_desc.OutputWindow, MONITOR_DEFAULTTONEAREST); + ok(!!monitor, "Adapter %u output %u point %u: Failed to get monitor from window.\n", + adapter_idx, output_idx, i); + + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info); + ok(ret, "Adapter %u output %u point %u: Failed to get monitor info.\n", adapter_idx, + output_idx, i); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); + /* Hack to prevent test failures with secondary on the right until multi-monitor support is improved. */ + todo_wine_if(primary && monitor != primary) + ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), + "Adapter %u output %u point %u: Failed to get containing output, hr %#x.\n", + adapter_idx, output_idx, i, hr); + if (hr != S_OK) + continue; + ok(!!output2, "Adapter %u output %u point %u: Got unexpected containing output %p.\n", + adapter_idx, output_idx, i, output2); + hr = IDXGIOutput_GetDesc(output2, &output_desc); + ok(hr == S_OK, "Adapter %u output %u point %u: Failed to get output desc, hr %#x.\n", + adapter_idx, output_idx, i, hr); + refcount = IDXGIOutput_Release(output2); + ok(!refcount, "Adapter %u output %u point %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, i, refcount); + + ok(!lstrcmpW(output_desc.DeviceName, monitor_info.szDevice), + "Adapter %u output %u point %u: Got unexpected device name %s, expected %s.\n", + adapter_idx, output_idx, i, wine_dbgstr_w(output_desc.DeviceName), + wine_dbgstr_w(monitor_info.szDevice)); + ok(EqualRect(&output_desc.DesktopCoordinates, &monitor_info.rcMonitor), + "Adapter %u output %u point %u: Expect desktop coordinates %s, got %s.\n", + adapter_idx, output_idx, i, + wine_dbgstr_rect(&output_desc.DesktopCoordinates), + wine_dbgstr_rect(&monitor_info.rcMonitor)); + } + IDXGIOutput_Release(output); } + IDXGIAdapter_Release(adapter); } - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + /* Test GetContainingOutput with a full screen swapchain. The containing output should stay + * the same even if the device window is moved */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + if (FAILED(hr)) + { + skip("SetFullscreenState failed, hr %#x.\n", hr); + goto done; + } + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); + if (FAILED(hr)) + { + win_skip("GetContainingOutput failed, hr %#x.\n", hr); + IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + goto done; + } + + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) + { + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) + { + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); + IDXGIOutput_Release(output); + + /* Move the OutputWindow to the current output. */ + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left, + output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u: SetWindowPos failed.\n", adapter_idx, output_idx); + + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); + ok(hr == S_OK, "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(fullscreen, "Adapter %u output %u: Expect swapchain full screen.\n", adapter_idx, + output_idx); + ok(output == output2, "Adapter %u output %u: Expect output %p, got %p.\n", + adapter_idx, output_idx, output2, output); + IDXGIOutput_Release(output); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(output == output2, "Adapter %u output %u: Expect output %p, got %p.\n", + adapter_idx, output_idx, output2, output); + IDXGIOutput_Release(output); + } + IDXGIAdapter_Release(adapter); + } + + IDXGIOutput_Release(output2); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); done: + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - refcount = IDXGIAdapter_Release(adapter); - ok(!refcount, "Adapter has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); @@ -6594,7 +6665,6 @@ START_TEST(dxgi) queue_test(test_parents); queue_test(test_output); queue_test(test_find_closest_matching_mode); - queue_test(test_get_containing_output); queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); @@ -6610,6 +6680,7 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); + test_get_containing_output(); test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); -- 2.25.1

3 2

[PATCH 3/5] wined3d: Move device window to the correct output when changing swapchain state to full screen.
by Zhiyi Zhang 08 May '20

08 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/device.c | 20 +++++++++++++----- dlls/wined3d/swapchain.c | 38 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e16bd84164a..1711014c8d2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4954,6 +4954,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, || swapchain_desc->backbuffer_height != current_desc->backbuffer_height; windowed = current_desc->windowed; + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + if (!swapchain_desc->windowed != !windowed || swapchain->reapply_mode || mode || (!swapchain_desc->windowed && backbuffer_resized)) { @@ -4971,11 +4977,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } - if (!(output = wined3d_swapchain_get_output(swapchain))) - { - ERR("Failed to get output from swapchain %p.\n", swapchain); - return E_FAIL; - } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, swapchain_desc, output, mode))) return hr; @@ -4988,13 +4989,22 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { DWORD style = swapchain_state->style; DWORD exstyle = swapchain_state->exstyle; + struct wined3d_output_desc output_desc; + /* If we're in fullscreen, and the mode wasn't changed, we have to get * the window back into the right position. Some applications * (Battlefield 2, Guild Wars) move it and then call Reset() to clean * up their mess. Guild Wars also loses the device during that. */ + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + swapchain_state->style = 0; swapchain_state->exstyle = 0; wined3d_swapchain_state_setup_fullscreen(swapchain_state, swapchain_state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height); swapchain_state->style = style; swapchain_state->exstyle = exstyle; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3071afb8aeb..466bcd95cae 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -872,13 +872,14 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc const struct wined3d_swapchain_ops *swapchain_ops) { struct wined3d_resource_desc texture_desc; + struct wined3d_output_desc output_desc; struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; + HRESULT hr = E_FAIL; RECT client_rect; unsigned int i; HWND window; - HRESULT hr; wined3d_mutex_lock(); @@ -933,8 +934,21 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc } else { - wined3d_swapchain_state_setup_fullscreen(&swapchain->state, - window, desc->backbuffer_width, desc->backbuffer_height); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + goto err; + } + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + goto err; + } + + wined3d_swapchain_state_setup_fullscreen(&swapchain->state, window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, desc->backbuffer_width, + desc->backbuffer_height); } swapchain->state.desc = *desc; wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->state.desc.backbuffer_format, @@ -1551,7 +1565,7 @@ static LONG fullscreen_exstyle(LONG exstyle) } HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) + HWND window, int x, int y, int width, int height) { LONG style, exstyle; BOOL filter; @@ -1583,7 +1597,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos(window, HWND_TOPMOST, x, y, width, height, + SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); wined3d_filter_messages(window, filter); @@ -1647,6 +1662,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; HRESULT hr; TRACE("state %p, swapchain_desc %p, output %p, mode %p.\n", @@ -1695,10 +1711,17 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st unsigned int width = actual_mode.width; unsigned int height = actual_mode.height; + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + if (state->desc.windowed) { /* Switch from windowed to fullscreen */ - if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, width, height))) + if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, height))) return hr; } else @@ -1708,7 +1731,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st /* Fullscreen -> fullscreen mode change */ filter = wined3d_filter_messages(window, TRUE); - MoveWindow(window, 0, 0, width, height, TRUE); + MoveWindow(window, output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, + height, TRUE); ShowWindow(window, SW_SHOW); wined3d_filter_messages(window, filter); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a412d7a8e7..0e20d1fc9b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4720,7 +4720,7 @@ struct wined3d_swapchain_state void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) DECLSPEC_HIDDEN; + HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops { -- 2.25.1

2 1

[PATCH 2/5] wined3d: Release wined3d mutex if wined3d_swapchain_state_init() failed in wined3d_swapchain_init().
by Zhiyi Zhang 08 May '20

08 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd0419412af..3071afb8aeb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -895,7 +895,10 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc window = desc->device_window ? desc->device_window : device->create_parms.focus_window; if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) - return hr; + { + ERR("Failed to initialise swapchain state, hr %#x.\n", hr); + goto err; + } swapchain->swapchain_ops = swapchain_ops; swapchain->device = device; -- 2.25.1

2 1

[PATCH 1/5] dxgi/tests: Add more default full screen swapchain target output tests.
by Zhiyi Zhang 08 May '20

08 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 218 +++++++++++++++++++++++++++-------------- 1 file changed, 144 insertions(+), 74 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f04cd2be065..5af2104bb1a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2545,13 +2545,15 @@ done: static void test_default_fullscreen_target_output(void) { IDXGIOutput *output, *containing_output, *target; + unsigned int adapter_idx, output_idx; DXGI_SWAP_CHAIN_DESC swapchain_desc; DXGI_OUTPUT_DESC output_desc; + unsigned int width, height; IDXGISwapChain *swapchain; - unsigned int output_idx; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIDevice *device; + RECT window_rect; ULONG refcount; HRESULT hr; BOOL ret; @@ -2562,14 +2564,8 @@ static void test_default_fullscreen_target_output(void) return; } - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + get_factory((IUnknown *)device, FALSE, &factory); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); - - swapchain_desc.BufferDesc.Width = 640; - swapchain_desc.BufferDesc.Height = 480; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -2579,86 +2575,160 @@ static void test_default_fullscreen_target_output(void) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 1; - swapchain_desc.OutputWindow = create_window(); - swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - - output_idx = 0; - while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)) != DXGI_ERROR_NOT_FOUND) + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_idx, hr); - - hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - - /* Move the OutputWindow to the current output. */ - ret = SetWindowPos(swapchain_desc.OutputWindow, 0, - output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, - 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "SetWindowPos failed.\n"); - - hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "GetContainingOutput failed, hr %#x.\n", hr); - if (hr == DXGI_ERROR_UNSUPPORTED) + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) { - win_skip("GetContainingOutput() not supported.\n"); - IDXGIOutput_Release(output); - goto done; - } + /* Windowed swapchain */ + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; + swapchain_desc.OutputWindow = create_window(); + swapchain_desc.Windowed = TRUE; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, + &swapchain); + ok(SUCCEEDED(hr), "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", + adapter_idx, output_idx, hr); - hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, - "SetFullscreenState failed, hr %#x.\n", hr); - if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) - { - skip("Could not change fullscreen state.\n"); + /* Move the OutputWindow to the current output. */ + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, + output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, + 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, + "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", adapter_idx, + output_idx, hr); + if (hr == DXGI_ERROR_UNSUPPORTED) + { + win_skip("Adapter %u output %u: GetContainingOutput() not supported.\n", + adapter_idx, output_idx); + IDXGISwapChain_Release(swapchain); + IDXGIOutput_Release(output); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, + "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", adapter_idx, + output_idx, hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + skip("Adapter %u output %u: Could not change fullscreen state.\n", adapter_idx, + output_idx); + IDXGIOutput_Release(containing_output); + IDXGISwapChain_Release(swapchain); + IDXGIOutput_Release(output); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + GetWindowRect(swapchain_desc.OutputWindow, &window_rect); + ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), + "Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx, + output_idx, wine_dbgstr_rect(&output_desc.DesktopCoordinates), + wine_dbgstr_rect(&window_rect)); + + target = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(target != containing_output, + "Adapter %u output %u: Got unexpected output %p, expected %p.\n", adapter_idx, + output_idx, target, containing_output); + check_output_equal(target, containing_output); + + refcount = IDXGIOutput_Release(containing_output); + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, refcount); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(containing_output == target, + "Adapter %u output %u: Got unexpected containing output %p, expected %p.\n", + adapter_idx, output_idx, containing_output, target); + refcount = IDXGIOutput_Release(containing_output); + ok(refcount >= 2, "Adapter %u output %u: Got unexpected refcount %u.\n", adapter_idx, + output_idx, refcount); + refcount = IDXGIOutput_Release(target); + ok(refcount >= 1, "Adapter %u output %u: Got unexpected refcount %u.\n", adapter_idx, + output_idx, refcount); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n", + adapter_idx, output_idx, refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + /* Full screen swapchain */ + width = output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left; + height = output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top; + swapchain_desc.BufferDesc.Width = width; + swapchain_desc.BufferDesc.Height = height; + swapchain_desc.OutputWindow = create_window(); + swapchain_desc.Windowed = FALSE; + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left, + output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, + &swapchain); + if (FAILED(hr)) + { + skip("Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx, + output_idx, hr); + IDXGIOutput_Release(output); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + + ret = GetWindowRect(swapchain_desc.OutputWindow, &window_rect); + ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), + "Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx, + output_idx, wine_dbgstr_rect(&output_desc.DesktopCoordinates), + wine_dbgstr_rect(&window_rect)); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); + ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(containing_output != output, + "Adapter %u output %u: Got unexpected output %p, expected %p.\n", adapter_idx, + output_idx, output, containing_output); + check_output_equal(output, containing_output); IDXGIOutput_Release(containing_output); - IDXGIOutput_Release(output); - goto done; + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n", + adapter_idx, output_idx, refcount); + refcount = IDXGIOutput_Release(output); + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, refcount); + DestroyWindow(swapchain_desc.OutputWindow); } - - target = NULL; - hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); - ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); - ok(target != containing_output, "Got unexpected output pointers %p, %p.\n", - target, containing_output); - check_output_equal(target, containing_output); - - refcount = IDXGIOutput_Release(containing_output); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); - - hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); - ok(containing_output == target, "Got unexpected containing output %p, expected %p.\n", - containing_output, target); - refcount = IDXGIOutput_Release(containing_output); - ok(refcount >= 2, "Got unexpected refcount %u.\n", refcount); - refcount = IDXGIOutput_Release(target); - ok(refcount >= 1, "Got unexpected refcount %u.\n", refcount); - - hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - - IDXGIOutput_Release(output); - ++output_idx; + IDXGIAdapter_Release(adapter); } -done: - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - refcount = IDXGIAdapter_Release(adapter); - ok(!refcount, "Adapter has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); - DestroyWindow(swapchain_desc.OutputWindow); } static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, -- 2.25.1

3 2

[PATCH] iphlpapi: add stub for NotifyRouteChange2 (now with "Signed off"...)
by Louis Lenders 08 May '20

08 May '20

Now with "Signed-off"............... https://bugs.winehq.org/show_bug.cgi?id=48775 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ include/netioapi.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index c5857f2831..ded265f571 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -236,7 +236,7 @@ @ stdcall NotifyAddrChange( ptr ptr ) @ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr ) @ stdcall NotifyRouteChange( ptr ptr ) -#@ stub NotifyRouteChange2 +@ stdcall NotifyRouteChange2( long ptr ptr long ptr ) @ stub NotifyRouteChangeEx #@ stub NotifyStableUnicastIpAddressTable #@ stub NotifyTeredoPortChange diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e3ce21c44b..86f495266e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2817,6 +2817,18 @@ DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_ return NO_ERROR; } +/****************************************************************** + * NotifyRouteChange2 (IPHLPAPI.@) + */ +DWORD WINAPI NotifyRouteChange2(ADDRESS_FAMILY family, PIPFORWARD_CHANGE_CALLBACK callback, VOID* context, + BOOLEAN init_notify, HANDLE* handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return NO_ERROR; +} + /****************************************************************** * NotifyRouteChange (IPHLPAPI.@) diff --git a/include/netioapi.h b/include/netioapi.h index a41bae0968..7238d527ad 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -236,6 +236,8 @@ typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, MIB_NOTIFICATION_TYPE); +typedef VOID (WINAPI *PIPFORWARD_CHANGE_CALLBACK)(VOID*,MIB_IPFORWARD_ROW2*,MIB_NOTIFICATION_TYPE); + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); -- 2.26.2

1 0

[PATCH] comdlg32: Improve error handling in get_config_key_string.
by Jacek Caban 08 May '20

08 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/comdlg32/filedlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 2/2 v2] winmm/tests: Test using a device handle in wave{In,Out}GetDevCaps and wave{In,Out}Open
by Andrew Eikum 08 May '20

08 May '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Use HandleToUlong instead of casts. dlls/winmm/tests/capture.c | 17 ++++++++++++++++- dlls/winmm/tests/wave.c | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 4290c358a9f..f60b44b096c 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -130,7 +130,7 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEINCAPSA *pcaps) { - HWAVEIN win; + HWAVEIN win, win2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR frag; MMRESULT rc; @@ -139,6 +139,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; + WAVEINCAPSW capsW; win=NULL; flags |= CALLBACK_EVENT; @@ -181,6 +182,20 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, pwfx->nSamplesPerSec, pwfx->wBitsPerSample, pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels); + /* waveInGetDevCaps allows an open handle instead of a device id */ + rc=waveInGetDevCapsW(HandleToUlong(win),&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveInGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + + /* waveInOpen does not allow an open handle instead of a device id */ + rc=waveInOpen(&win2,HandleToUlong(win),pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveInOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveInClose(win2); + /* Check that the position is 0 at start */ check_position(device, win, 0, pwfx); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index f9fc5c5aad1..eec1ba2a034 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -599,9 +599,10 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEOUTCAPSA *pcaps, BOOL interactive, BOOL sine, BOOL pause) { - HWAVEOUT wout; + HWAVEOUT wout, wout2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR *frags = 0; + WAVEOUTCAPSW capsW; MMRESULT rc; DWORD volume; WORD nChannels = pwfx->nChannels; @@ -705,6 +706,20 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + /* waveOutGetDevCaps allows an open handle instead of a device id */ + rc=waveOutGetDevCapsW(HandleToUlong(wout),&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + + /* waveOutOpen does not allow an open handle instead of a device id */ + rc=waveOutOpen(&wout2,HandleToUlong(wout),pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveOutClose(wout2); + /* make sure fragment length is a multiple of block size */ frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; -- 2.26.2

1 0

[PATCH 2/2] winmm/tests: Test using a device handle in wave{In,Out}GetDevCaps and wave{In,Out}Open
by Andrew Eikum 08 May '20

08 May '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winmm/tests/capture.c | 17 ++++++++++++++++- dlls/winmm/tests/wave.c | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 4290c358a9f..cd28ba867d2 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -130,7 +130,7 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEINCAPSA *pcaps) { - HWAVEIN win; + HWAVEIN win, win2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR frag; MMRESULT rc; @@ -139,6 +139,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; + WAVEINCAPSW capsW; win=NULL; flags |= CALLBACK_EVENT; @@ -181,6 +182,20 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, pwfx->nSamplesPerSec, pwfx->wBitsPerSample, pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels); + /* waveInGetDevCaps allows an open handle instead of a device id */ + rc=waveInGetDevCapsW((UINT)(UINT_PTR)win,&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveInGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + + /* waveInOpen does not allow an open handle instead of a device id */ + rc=waveInOpen(&win2,(UINT)(UINT_PTR)win,pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveInOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveInClose(win2); + /* Check that the position is 0 at start */ check_position(device, win, 0, pwfx); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index f9fc5c5aad1..98d32d9b48f 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -599,9 +599,10 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEOUTCAPSA *pcaps, BOOL interactive, BOOL sine, BOOL pause) { - HWAVEOUT wout; + HWAVEOUT wout, wout2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR *frags = 0; + WAVEOUTCAPSW capsW; MMRESULT rc; DWORD volume; WORD nChannels = pwfx->nChannels; @@ -705,6 +706,20 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + /* waveOutGetDevCaps allows an open handle instead of a device id */ + rc=waveOutGetDevCapsW((UINT)(UINT_PTR)wout,&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + + /* waveOutOpen does not allow an open handle instead of a device id */ + rc=waveOutOpen(&wout2,(UINT)(UINT_PTR)wout,pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveOutClose(wout2); + /* make sure fragment length is a multiple of block size */ frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; -- 2.26.2

1 0

[PATCH 1/2] winmm: Accept open handles in wave{In,Out}GetDevCaps
by Andrew Eikum 08 May '20

08 May '20

Based on a patch by Changping Yu <dead.ash(a)hotmail.com>. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winmm/waveform.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index b08768577bb..39461743c4a 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2669,10 +2669,18 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, caps = &mapper_caps; }else{ - if(uDeviceID >= g_outmmdevices_count) - return MMSYSERR_BADDEVICEID; + if(uDeviceID >= g_outmmdevices_count){ + WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID); - caps = &read_map(g_out_map, uDeviceID)->out_caps; + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_BADDEVICEID; + + caps = &device->parent->out_caps; + + LeaveCriticalSection(&device->lock); + }else{ + caps = &read_map(g_out_map, uDeviceID)->out_caps; + } } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -3336,10 +3344,18 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi caps = &mapper_caps; }else{ - if(uDeviceID >= g_inmmdevices_count) - return MMSYSERR_BADDEVICEID; + if(uDeviceID >= g_inmmdevices_count){ + WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID); - caps = &read_map(g_in_map, uDeviceID)->in_caps; + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_BADDEVICEID; + + caps = &device->parent->in_caps; + + LeaveCriticalSection(&device->lock); + }else{ + caps = &read_map(g_in_map, uDeviceID)->in_caps; + } } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); -- 2.26.2

1 0

[PATCH] iphlpapi: add stub for NotifyRouteChange2
by Louis Lenders 08 May '20

08 May '20

https://bugs.winehq.org/show_bug.cgi?id=48775 --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ include/netioapi.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index c5857f2831..ded265f571 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -236,7 +236,7 @@ @ stdcall NotifyAddrChange( ptr ptr ) @ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr ) @ stdcall NotifyRouteChange( ptr ptr ) -#@ stub NotifyRouteChange2 +@ stdcall NotifyRouteChange2( long ptr ptr long ptr ) @ stub NotifyRouteChangeEx #@ stub NotifyStableUnicastIpAddressTable #@ stub NotifyTeredoPortChange diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e3ce21c44b..86f495266e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2817,6 +2817,18 @@ DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_ return NO_ERROR; } +/****************************************************************** + * NotifyRouteChange2 (IPHLPAPI.@) + */ +DWORD WINAPI NotifyRouteChange2(ADDRESS_FAMILY family, PIPFORWARD_CHANGE_CALLBACK callback, VOID* context, + BOOLEAN init_notify, HANDLE* handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return NO_ERROR; +} + /****************************************************************** * NotifyRouteChange (IPHLPAPI.@) diff --git a/include/netioapi.h b/include/netioapi.h index a41bae0968..7238d527ad 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -236,6 +236,8 @@ typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, MIB_NOTIFICATION_TYPE); +typedef VOID (WINAPI *PIPFORWARD_CHANGE_CALLBACK)(VOID*,MIB_IPFORWARD_ROW2*,MIB_NOTIFICATION_TYPE); + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); -- 2.26.2

1 0

[PATCH 1/2] qmgr: Update to IBackgroundCopyJob4.
by Nikolay Sivov 08 May '20

08 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/qmgr/enum_jobs.c | 14 +- dlls/qmgr/file.c | 4 +- dlls/qmgr/job.c | 629 +++++++++++++++++++----------------------- dlls/qmgr/qmgr.c | 10 +- dlls/qmgr/qmgr.h | 2 +- 5 files changed, 300 insertions(+), 359 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 7fae597a4e..5a79825954 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -27,7 +27,7 @@ typedef struct { IEnumBackgroundCopyJobs IEnumBackgroundCopyJobs_iface; LONG ref; - IBackgroundCopyJob3 **jobs; + IBackgroundCopyJob4 **jobs; ULONG numJobs; ULONG indexJobs; } EnumBackgroundCopyJobsImpl; @@ -75,7 +75,7 @@ static ULONG WINAPI EnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs *ifac if (ref == 0) { for(i = 0; i < This->numJobs; i++) - IBackgroundCopyJob3_Release(This->jobs[i]); + IBackgroundCopyJob4_Release(This->jobs[i]); HeapFree(GetProcessHeap(), 0, This->jobs); HeapFree(GetProcessHeap(), 0, This); } @@ -89,7 +89,6 @@ static HRESULT WINAPI EnumBackgroundCopyJobs_Next(IEnumBackgroundCopyJobs *iface EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); ULONG fetched; ULONG i; - IBackgroundCopyJob3 *job; TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); @@ -111,9 +110,8 @@ static HRESULT WINAPI EnumBackgroundCopyJobs_Next(IEnumBackgroundCopyJobs *iface /* Fill in the array of objects */ for (i = 0; i < fetched; ++i) { - job = This->jobs[This->indexJobs++]; - IBackgroundCopyJob3_AddRef(job); - rgelt[i] = (IBackgroundCopyJob *)job; + rgelt[i] = (IBackgroundCopyJob *)This->jobs[This->indexJobs++]; + IBackgroundCopyJob_AddRef(rgelt[i]); } return fetched == celt ? S_OK : S_FALSE; @@ -213,8 +211,8 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop i = 0; LIST_FOR_EACH_ENTRY(job, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) { - IBackgroundCopyJob3_AddRef(&job->IBackgroundCopyJob3_iface); - This->jobs[i++] = &job->IBackgroundCopyJob3_iface; + IBackgroundCopyJob4_AddRef(&job->IBackgroundCopyJob4_iface); + This->jobs[i++] = &job->IBackgroundCopyJob4_iface; } LeaveCriticalSection(&qmgr->cs); diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 6621b23694..e0aeebf7ce 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -81,7 +81,7 @@ static ULONG WINAPI BackgroundCopyFile_Release( if (ref == 0) { - IBackgroundCopyJob3_Release(&file->owner->IBackgroundCopyJob3_iface); + IBackgroundCopyJob4_Release(&file->owner->IBackgroundCopyJob4_iface); HeapFree(GetProcessHeap(), 0, file->info.LocalName); HeapFree(GetProcessHeap(), 0, file->info.RemoteName); HeapFree(GetProcessHeap(), 0, file); @@ -195,7 +195,7 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, This->owner = owner; This->read_size = 0; This->tempFileName[0] = 0; - IBackgroundCopyJob3_AddRef(&owner->IBackgroundCopyJob3_iface); + IBackgroundCopyJob4_AddRef(&owner->IBackgroundCopyJob4_iface); *file = This; return S_OK; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index c33389574e..6f2c4d61ca 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -207,76 +207,77 @@ static inline BOOL is_job_done(const BackgroundCopyJobImpl *job) return job->state == BG_JOB_STATE_CANCELLED || job->state == BG_JOB_STATE_ACKNOWLEDGED; } -static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob3(IBackgroundCopyJob3 *iface) +static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob4(IBackgroundCopyJob4 *iface) { - return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob3_iface); + return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob4_iface); } -static HRESULT WINAPI BackgroundCopyJob_QueryInterface( - IBackgroundCopyJob3 *iface, REFIID riid, void **obj) +static HRESULT WINAPI BackgroundCopyJob_QueryInterface(IBackgroundCopyJob4 *iface, REFIID riid, void **obj) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyJob) || IsEqualGUID(riid, &IID_IBackgroundCopyJob2) || - IsEqualGUID(riid, &IID_IBackgroundCopyJob3)) + IsEqualGUID(riid, &IID_IBackgroundCopyJob3) || + IsEqualGUID(riid, &IID_IBackgroundCopyJob4)) { - *obj = &This->IBackgroundCopyJob3_iface; + *obj = &job->IBackgroundCopyJob4_iface; } else if (IsEqualGUID(riid, &IID_IBackgroundCopyJobHttpOptions)) { - *obj = &This->IBackgroundCopyJobHttpOptions_iface; + *obj = &job->IBackgroundCopyJobHttpOptions_iface; } else { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); *obj = NULL; return E_NOINTERFACE; } - IBackgroundCopyJob3_AddRef(iface); + IBackgroundCopyJob4_AddRef(iface); return S_OK; } -static ULONG WINAPI BackgroundCopyJob_AddRef(IBackgroundCopyJob3 *iface) +static ULONG WINAPI BackgroundCopyJob_AddRef(IBackgroundCopyJob4 *iface) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); + ULONG refcount = InterlockedIncrement(&job->ref); + TRACE("%p, refcount %d.\n", iface, refcount); + return refcount; } -static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob3 *iface) +static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob4 *iface) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - ULONG i, j, ref = InterlockedDecrement(&This->ref); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); + ULONG i, j, ref = InterlockedDecrement(&job->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %d.\n", iface, ref); - if (ref == 0) + if (!ref) { - This->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->cs); - if (This->callback) - IBackgroundCopyCallback2_Release(This->callback); - HeapFree(GetProcessHeap(), 0, This->displayName); - HeapFree(GetProcessHeap(), 0, This->description); - HeapFree(GetProcessHeap(), 0, This->http_options.headers); + job->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&job->cs); + if (job->callback) + IBackgroundCopyCallback2_Release(job->callback); + HeapFree(GetProcessHeap(), 0, job->displayName); + HeapFree(GetProcessHeap(), 0, job->description); + HeapFree(GetProcessHeap(), 0, job->http_options.headers); for (i = 0; i < BG_AUTH_TARGET_PROXY; i++) { for (j = 0; j < BG_AUTH_SCHEME_PASSPORT; j++) { - BG_AUTH_CREDENTIALS *cred = &This->http_options.creds[i][j]; + BG_AUTH_CREDENTIALS *cred = &job->http_options.creds[i][j]; HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.UserName); HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.Password); } } - CloseHandle(This->wait); - CloseHandle(This->cancel); - CloseHandle(This->done); - HeapFree(GetProcessHeap(), 0, This); + CloseHandle(job->wait); + CloseHandle(job->cancel); + CloseHandle(job->done); + HeapFree(GetProcessHeap(), 0, job); } return ref; @@ -284,18 +285,15 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob3 *iface) /*** IBackgroundCopyJob methods ***/ -static HRESULT WINAPI BackgroundCopyJob_AddFileSet( - IBackgroundCopyJob3 *iface, - ULONG cFileCount, - BG_FILE_INFO *pFileSet) +static HRESULT WINAPI BackgroundCopyJob_AddFileSet(IBackgroundCopyJob4 *iface, ULONG cFileCount, BG_FILE_INFO *pFileSet) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); HRESULT hr = S_OK; ULONG i; - TRACE("(%p)->(%d %p)\n", This, cFileCount, pFileSet); + TRACE("%p, %u, %p.\n", iface, cFileCount, pFileSet); - EnterCriticalSection(&This->cs); + EnterCriticalSection(&job->cs); for (i = 0; i < cFileCount; ++i) { @@ -304,153 +302,142 @@ static HRESULT WINAPI BackgroundCopyJob_AddFileSet( /* We should return E_INVALIDARG in these cases. */ FIXME("Check for valid filenames and supported protocols\n"); - hr = BackgroundCopyFileConstructor(This, pFileSet[i].RemoteName, pFileSet[i].LocalName, &file); + hr = BackgroundCopyFileConstructor(job, pFileSet[i].RemoteName, pFileSet[i].LocalName, &file); if (hr != S_OK) break; /* Add a reference to the file to file list */ - list_add_head(&This->files, &file->entryFromJob); - This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; - ++This->jobProgress.FilesTotal; + list_add_head(&job->files, &file->entryFromJob); + job->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; + ++job->jobProgress.FilesTotal; } - LeaveCriticalSection(&This->cs); + LeaveCriticalSection(&job->cs); return hr; } -static HRESULT WINAPI BackgroundCopyJob_AddFile( - IBackgroundCopyJob3 *iface, - LPCWSTR RemoteUrl, - LPCWSTR LocalName) +static HRESULT WINAPI BackgroundCopyJob_AddFile(IBackgroundCopyJob4 *iface, LPCWSTR RemoteUrl, LPCWSTR LocalName) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); BG_FILE_INFO file; - TRACE("(%p)->(%s %s)\n", This, debugstr_w(RemoteUrl), debugstr_w(LocalName)); + TRACE("%p, %s, %s.\n", iface, debugstr_w(RemoteUrl), debugstr_w(LocalName)); file.RemoteName = (LPWSTR)RemoteUrl; file.LocalName = (LPWSTR)LocalName; - return IBackgroundCopyJob3_AddFileSet(iface, 1, &file); + return IBackgroundCopyJob4_AddFileSet(iface, 1, &file); } -static HRESULT WINAPI BackgroundCopyJob_EnumFiles( - IBackgroundCopyJob3 *iface, - IEnumBackgroundCopyFiles **enum_files) +static HRESULT WINAPI BackgroundCopyJob_EnumFiles(IBackgroundCopyJob4 *iface, IEnumBackgroundCopyFiles **enum_files) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - TRACE("(%p)->(%p)\n", This, enum_files); - return EnumBackgroundCopyFilesConstructor(This, enum_files); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); + TRACE("%p, %p.\n", iface, enum_files); + return EnumBackgroundCopyFilesConstructor(job, enum_files); } -static HRESULT WINAPI BackgroundCopyJob_Suspend( - IBackgroundCopyJob3 *iface) +static HRESULT WINAPI BackgroundCopyJob_Suspend(IBackgroundCopyJob4 *iface) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p): stub\n", This); + FIXME("(%p): stub\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_Resume( - IBackgroundCopyJob3 *iface) +static HRESULT WINAPI BackgroundCopyJob_Resume(IBackgroundCopyJob4 *iface) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - HRESULT rv = S_OK; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); + HRESULT hr = S_OK; - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); EnterCriticalSection(&globalMgr.cs); - if (is_job_done(This)) + if (is_job_done(job)) { - rv = BG_E_INVALID_STATE; + hr = BG_E_INVALID_STATE; } - else if (This->jobProgress.FilesTransferred == This->jobProgress.FilesTotal) + else if (job->jobProgress.FilesTransferred == job->jobProgress.FilesTotal) { - rv = BG_E_EMPTY; + hr = BG_E_EMPTY; } - else if (This->state != BG_JOB_STATE_CONNECTING - && This->state != BG_JOB_STATE_TRANSFERRING) + else if (job->state != BG_JOB_STATE_CONNECTING + && job->state != BG_JOB_STATE_TRANSFERRING) { - This->state = BG_JOB_STATE_QUEUED; - This->error.context = 0; - This->error.code = S_OK; - if (This->error.file) + job->state = BG_JOB_STATE_QUEUED; + job->error.context = 0; + job->error.code = S_OK; + if (job->error.file) { - IBackgroundCopyFile2_Release(This->error.file); - This->error.file = NULL; + IBackgroundCopyFile2_Release(job->error.file); + job->error.file = NULL; } SetEvent(globalMgr.jobEvent); } LeaveCriticalSection(&globalMgr.cs); - return rv; + return hr; } -static HRESULT WINAPI BackgroundCopyJob_Cancel( - IBackgroundCopyJob3 *iface) +static HRESULT WINAPI BackgroundCopyJob_Cancel(IBackgroundCopyJob4 *iface) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - HRESULT rv = S_OK; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); + HRESULT hr = S_OK; - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - EnterCriticalSection(&This->cs); + EnterCriticalSection(&job->cs); - if (is_job_done(This)) + if (is_job_done(job)) { - rv = BG_E_INVALID_STATE; + hr = BG_E_INVALID_STATE; } else { BackgroundCopyFileImpl *file; - if (This->state == BG_JOB_STATE_CONNECTING || This->state == BG_JOB_STATE_TRANSFERRING) + if (job->state == BG_JOB_STATE_CONNECTING || job->state == BG_JOB_STATE_TRANSFERRING) { - This->state = BG_JOB_STATE_CANCELLED; - SetEvent(This->cancel); + job->state = BG_JOB_STATE_CANCELLED; + SetEvent(job->cancel); - LeaveCriticalSection(&This->cs); - WaitForSingleObject(This->done, INFINITE); - EnterCriticalSection(&This->cs); + LeaveCriticalSection(&job->cs); + WaitForSingleObject(job->done, INFINITE); + EnterCriticalSection(&job->cs); } - LIST_FOR_EACH_ENTRY(file, &This->files, BackgroundCopyFileImpl, entryFromJob) + LIST_FOR_EACH_ENTRY(file, &job->files, BackgroundCopyFileImpl, entryFromJob) { if (file->tempFileName[0] && !DeleteFileW(file->tempFileName)) { WARN("Couldn't delete %s (%u)\n", debugstr_w(file->tempFileName), GetLastError()); - rv = BG_S_UNABLE_TO_DELETE_FILES; + hr = BG_S_UNABLE_TO_DELETE_FILES; } if (file->info.LocalName && !DeleteFileW(file->info.LocalName)) { WARN("Couldn't delete %s (%u)\n", debugstr_w(file->info.LocalName), GetLastError()); - rv = BG_S_UNABLE_TO_DELETE_FILES; + hr = BG_S_UNABLE_TO_DELETE_FILES; } } - This->state = BG_JOB_STATE_CANCELLED; + job->state = BG_JOB_STATE_CANCELLED; } - LeaveCriticalSection(&This->cs); - return rv; + LeaveCriticalSection(&job->cs); + return hr; } -static HRESULT WINAPI BackgroundCopyJob_Complete( - IBackgroundCopyJob3 *iface) +static HRESULT WINAPI BackgroundCopyJob_Complete(IBackgroundCopyJob4 *iface) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - HRESULT rv = S_OK; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); + HRESULT hr = S_OK; - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - EnterCriticalSection(&This->cs); + EnterCriticalSection(&job->cs); - if (is_job_done(This)) + if (is_job_done(job)) { - rv = BG_E_INVALID_STATE; + hr = BG_E_INVALID_STATE; } else { BackgroundCopyFileImpl *file; - LIST_FOR_EACH_ENTRY(file, &This->files, BackgroundCopyFileImpl, entryFromJob) + LIST_FOR_EACH_ENTRY(file, &job->files, BackgroundCopyFileImpl, entryFromJob) { if (file->fileProgress.Completed) { @@ -462,406 +449,326 @@ static HRESULT WINAPI BackgroundCopyJob_Complete( ERR("Couldn't rename file %s -> %s\n", debugstr_w(file->tempFileName), debugstr_w(file->info.LocalName)); - rv = BG_S_PARTIAL_COMPLETE; + hr = BG_S_PARTIAL_COMPLETE; } } else - rv = BG_S_PARTIAL_COMPLETE; + hr = BG_S_PARTIAL_COMPLETE; } } - This->state = BG_JOB_STATE_ACKNOWLEDGED; - LeaveCriticalSection(&This->cs); + job->state = BG_JOB_STATE_ACKNOWLEDGED; + LeaveCriticalSection(&job->cs); - return rv; + return hr; } -static HRESULT WINAPI BackgroundCopyJob_GetId( - IBackgroundCopyJob3 *iface, - GUID *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetId(IBackgroundCopyJob4 *iface, GUID *id) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - TRACE("(%p)->(%p)\n", This, pVal); - *pVal = This->jobId; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); + + TRACE("%p, %p.\n", iface, id); + + *id = job->jobId; + return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetType( - IBackgroundCopyJob3 *iface, - BG_JOB_TYPE *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetType(IBackgroundCopyJob4 *iface, BG_JOB_TYPE *job_type) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%p)\n", This, pVal); + TRACE("%p, %p.\n", iface, job_type); - if (!pVal) + if (!job_type) return E_INVALIDARG; - *pVal = This->type; + *job_type = job->type; return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetProgress( - IBackgroundCopyJob3 *iface, - BG_JOB_PROGRESS *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetProgress(IBackgroundCopyJob4 *iface, BG_JOB_PROGRESS *progress) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%p)\n", This, pVal); + TRACE("%p, %p.\n", iface, progress); - if (!pVal) + if (!progress) return E_INVALIDARG; - EnterCriticalSection(&This->cs); - *pVal = This->jobProgress; - LeaveCriticalSection(&This->cs); + EnterCriticalSection(&job->cs); + *progress = job->jobProgress; + LeaveCriticalSection(&job->cs); return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetTimes( - IBackgroundCopyJob3 *iface, - BG_JOB_TIMES *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetTimes(IBackgroundCopyJob4 *iface, BG_JOB_TIMES *pVal) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, pVal); + FIXME("%p, %p: stub\n", iface, pVal); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_GetState( - IBackgroundCopyJob3 *iface, - BG_JOB_STATE *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetState(IBackgroundCopyJob4 *iface, BG_JOB_STATE *state) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%p)\n", This, pVal); + TRACE("%p, %p.\n", iface, state); - if (!pVal) + if (!state) return E_INVALIDARG; /* Don't think we need a critical section for this */ - *pVal = This->state; + *state = job->state; return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetError( - IBackgroundCopyJob3 *iface, - IBackgroundCopyError **ppError) +static HRESULT WINAPI BackgroundCopyJob_GetError(IBackgroundCopyJob4 *iface, IBackgroundCopyError **ppError) { - BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%p)\n", job, ppError); + TRACE("%p, %p.\n", iface, ppError); if (!job->error.context) return BG_E_ERROR_INFORMATION_UNAVAILABLE; return create_copy_error(job->error.context, job->error.code, job->error.file, ppError); } -static HRESULT WINAPI BackgroundCopyJob_GetOwner( - IBackgroundCopyJob3 *iface, - LPWSTR *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetOwner(IBackgroundCopyJob4 *iface, LPWSTR *owner) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, pVal); + FIXME("%p, %p: stub\n", iface, owner); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_SetDisplayName( - IBackgroundCopyJob3 *iface, - LPCWSTR Val) +static HRESULT WINAPI BackgroundCopyJob_SetDisplayName(IBackgroundCopyJob4 *iface, LPCWSTR name) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(Val)); + FIXME("%p, %s: stub\n", iface, debugstr_w(name)); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_GetDisplayName( - IBackgroundCopyJob3 *iface, - LPWSTR *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetDisplayName(IBackgroundCopyJob4 *iface, LPWSTR *name) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%p)\n", This, pVal); + TRACE("%p, %p.\n", iface, name); - return return_strval(This->displayName, pVal); + return return_strval(job->displayName, name); } -static HRESULT WINAPI BackgroundCopyJob_SetDescription( - IBackgroundCopyJob3 *iface, - LPCWSTR Val) +static HRESULT WINAPI BackgroundCopyJob_SetDescription(IBackgroundCopyJob4 *iface, LPCWSTR desc) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); static const int max_description_len = 1024; HRESULT hr = S_OK; int len; - TRACE("(%p)->(%s)\n", This, debugstr_w(Val)); + TRACE("%p, %s.\n", iface, debugstr_w(desc)); - if (!Val) return E_INVALIDARG; + if (!desc) + return E_INVALIDARG; - len = lstrlenW(Val); + len = lstrlenW(desc); if (len > max_description_len) return BG_E_STRING_TOO_LONG; - EnterCriticalSection(&This->cs); + EnterCriticalSection(&job->cs); - if (is_job_done(This)) + if (is_job_done(job)) { hr = BG_E_INVALID_STATE; } else { - HeapFree(GetProcessHeap(), 0, This->description); - if ((This->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) - lstrcpyW(This->description, Val); + HeapFree(GetProcessHeap(), 0, job->description); + if ((job->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) + lstrcpyW(job->description, desc); else hr = E_OUTOFMEMORY; } - LeaveCriticalSection(&This->cs); + LeaveCriticalSection(&job->cs); return hr; } -static HRESULT WINAPI BackgroundCopyJob_GetDescription( - IBackgroundCopyJob3 *iface, - LPWSTR *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetDescription(IBackgroundCopyJob4 *iface, LPWSTR *desc) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%p)\n", This, pVal); + TRACE("%p, %p.\n", iface, desc); - return return_strval(This->description, pVal); + return return_strval(job->description, desc); } -static HRESULT WINAPI BackgroundCopyJob_SetPriority( - IBackgroundCopyJob3 *iface, - BG_JOB_PRIORITY Val) +static HRESULT WINAPI BackgroundCopyJob_SetPriority(IBackgroundCopyJob4 *iface, BG_JOB_PRIORITY priority) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%d): stub\n", This, Val); + FIXME("%p, %d: stub\n", iface, priority); return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetPriority( - IBackgroundCopyJob3 *iface, - BG_JOB_PRIORITY *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetPriority(IBackgroundCopyJob4 *iface, BG_JOB_PRIORITY *priority) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, pVal); + FIXME("%p, %p: stub\n", iface, priority); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_SetNotifyFlags( - IBackgroundCopyJob3 *iface, - ULONG Val) +static HRESULT WINAPI BackgroundCopyJob_SetNotifyFlags(IBackgroundCopyJob4 *iface, ULONG flags) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); static const ULONG valid_flags = BG_NOTIFY_JOB_TRANSFERRED | BG_NOTIFY_JOB_ERROR | BG_NOTIFY_DISABLE | BG_NOTIFY_JOB_MODIFICATION | BG_NOTIFY_FILE_TRANSFERRED; - TRACE("(%p)->(0x%x)\n", This, Val); + TRACE("%p, %#x.\n", iface, flags); - if (is_job_done(This)) return BG_E_INVALID_STATE; - if (Val & ~valid_flags) return E_NOTIMPL; - This->notify_flags = Val; + if (is_job_done(job)) return BG_E_INVALID_STATE; + if (flags & ~valid_flags) return E_NOTIMPL; + job->notify_flags = flags; return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetNotifyFlags( - IBackgroundCopyJob3 *iface, - ULONG *pVal) +static HRESULT WINAPI BackgroundCopyJob_GetNotifyFlags(IBackgroundCopyJob4 *iface, ULONG *flags) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%p)\n", This, pVal); + TRACE("%p, %p.\n", iface, flags); - if (!pVal) return E_INVALIDARG; + if (!flags) return E_INVALIDARG; - *pVal = This->notify_flags; + *flags = job->notify_flags; return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_SetNotifyInterface( - IBackgroundCopyJob3 *iface, - IUnknown *Val) +static HRESULT WINAPI BackgroundCopyJob_SetNotifyInterface(IBackgroundCopyJob4 *iface, IUnknown *callback) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); HRESULT hr = S_OK; - TRACE("(%p)->(%p)\n", This, Val); + TRACE("%p, %p.\n", iface, callback); - if (is_job_done(This)) return BG_E_INVALID_STATE; + if (is_job_done(job)) return BG_E_INVALID_STATE; - if (This->callback) + if (job->callback) { - IBackgroundCopyCallback2_Release(This->callback); - This->callback = NULL; - This->callback2 = FALSE; + IBackgroundCopyCallback2_Release(job->callback); + job->callback = NULL; + job->callback2 = FALSE; } - if (Val) + if (callback) { - hr = IUnknown_QueryInterface(Val, &IID_IBackgroundCopyCallback2, (void**)&This->callback); + hr = IUnknown_QueryInterface(callback, &IID_IBackgroundCopyCallback2, (void **)&job->callback); if (FAILED(hr)) - hr = IUnknown_QueryInterface(Val, &IID_IBackgroundCopyCallback, (void**)&This->callback); + hr = IUnknown_QueryInterface(callback, &IID_IBackgroundCopyCallback, (void**)&job->callback); else - This->callback2 = TRUE; + job->callback2 = TRUE; } return hr; } -static HRESULT WINAPI BackgroundCopyJob_GetNotifyInterface( - IBackgroundCopyJob3 *iface, - IUnknown **pVal) +static HRESULT WINAPI BackgroundCopyJob_GetNotifyInterface(IBackgroundCopyJob4 *iface, IUnknown **callback) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); - TRACE("(%p)->(%p)\n", This, pVal); + TRACE("%p, %p.\n", iface, callback); - if (!pVal) return E_INVALIDARG; + if (!callback) return E_INVALIDARG; - *pVal = (IUnknown*)This->callback; - if (*pVal) - IUnknown_AddRef(*pVal); + *callback = (IUnknown *)job->callback; + if (*callback) + IUnknown_AddRef(*callback); return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_SetMinimumRetryDelay( - IBackgroundCopyJob3 *iface, - ULONG Seconds) +static HRESULT WINAPI BackgroundCopyJob_SetMinimumRetryDelay(IBackgroundCopyJob4 *iface, ULONG delay) { - FIXME("%u\n", Seconds); + FIXME("%p, %u.\n", iface, delay); return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetMinimumRetryDelay( - IBackgroundCopyJob3 *iface, - ULONG *Seconds) +static HRESULT WINAPI BackgroundCopyJob_GetMinimumRetryDelay(IBackgroundCopyJob4 *iface, ULONG *delay) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, Seconds); - *Seconds = 30; + FIXME("%p, %p: stub\n", iface, delay); + *delay = 30; return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_SetNoProgressTimeout( - IBackgroundCopyJob3 *iface, - ULONG Seconds) +static HRESULT WINAPI BackgroundCopyJob_SetNoProgressTimeout(IBackgroundCopyJob4 *iface, ULONG timeout) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%d): stub\n", This, Seconds); + FIXME("%p, %u.: stub\n", iface, timeout); return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetNoProgressTimeout( - IBackgroundCopyJob3 *iface, - ULONG *Seconds) +static HRESULT WINAPI BackgroundCopyJob_GetNoProgressTimeout(IBackgroundCopyJob4 *iface, ULONG *timeout) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, Seconds); - *Seconds = 900; + FIXME("%p, %p: stub\n", iface, timeout); + *timeout = 900; return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetErrorCount( - IBackgroundCopyJob3 *iface, - ULONG *Errors) +static HRESULT WINAPI BackgroundCopyJob_GetErrorCount(IBackgroundCopyJob4 *iface, ULONG *count) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, Errors); + FIXME("%p, %p: stub\n", iface, count); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_SetProxySettings( - IBackgroundCopyJob3 *iface, - BG_JOB_PROXY_USAGE ProxyUsage, - const WCHAR *ProxyList, - const WCHAR *ProxyBypassList) +static HRESULT WINAPI BackgroundCopyJob_SetProxySettings(IBackgroundCopyJob4 *iface, BG_JOB_PROXY_USAGE proxy_usage, + const WCHAR *proxy_list, const WCHAR *proxy_bypass_list) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%d %s %s): stub\n", This, ProxyUsage, debugstr_w(ProxyList), debugstr_w(ProxyBypassList)); + FIXME("%p, %d, %s, %s: stub\n", iface, proxy_usage, debugstr_w(proxy_list), debugstr_w(proxy_bypass_list)); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_GetProxySettings( - IBackgroundCopyJob3 *iface, - BG_JOB_PROXY_USAGE *pProxyUsage, - LPWSTR *pProxyList, - LPWSTR *pProxyBypassList) +static HRESULT WINAPI BackgroundCopyJob_GetProxySettings(IBackgroundCopyJob4 *iface, BG_JOB_PROXY_USAGE *proxy_usage, + LPWSTR *proxy_list, LPWSTR *proxy_bypass_list) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p %p %p): stub\n", This, pProxyUsage, pProxyList, pProxyBypassList); + FIXME("%p, %p, %p, %p: stub\n", iface, proxy_usage, proxy_list, proxy_bypass_list); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_TakeOwnership( - IBackgroundCopyJob3 *iface) +static HRESULT WINAPI BackgroundCopyJob_TakeOwnership(IBackgroundCopyJob4 *iface) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p): stub\n", This); + FIXME("%p: stub\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_SetNotifyCmdLine( - IBackgroundCopyJob3 *iface, - LPCWSTR prog, - LPCWSTR params) +static HRESULT WINAPI BackgroundCopyJob_SetNotifyCmdLine(IBackgroundCopyJob4 *iface, LPCWSTR prog, LPCWSTR params) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(prog), debugstr_w(params)); + FIXME("%p, %s, %s: stub\n", iface, debugstr_w(prog), debugstr_w(params)); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_GetNotifyCmdLine( - IBackgroundCopyJob3 *iface, - LPWSTR *prog, - LPWSTR *params) +static HRESULT WINAPI BackgroundCopyJob_GetNotifyCmdLine(IBackgroundCopyJob4 *iface, LPWSTR *prog, LPWSTR *params) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p %p): stub\n", This, prog, params); + FIXME("%p, %p, %p: stub\n", iface, prog, params); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_GetReplyProgress( - IBackgroundCopyJob3 *iface, - BG_JOB_REPLY_PROGRESS *progress) +static HRESULT WINAPI BackgroundCopyJob_GetReplyProgress(IBackgroundCopyJob4 *iface, BG_JOB_REPLY_PROGRESS *progress) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, progress); + FIXME("%p, %p: stub\n", iface, progress); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_GetReplyData( - IBackgroundCopyJob3 *iface, - byte **pBuffer, - UINT64 *pLength) +static HRESULT WINAPI BackgroundCopyJob_GetReplyData(IBackgroundCopyJob4 *iface, byte **buffer, UINT64 *length) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p %p): stub\n", This, pBuffer, pLength); + FIXME("%p, %p, %p: stub\n", iface, buffer, length); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_SetReplyFileName( - IBackgroundCopyJob3 *iface, - LPCWSTR filename) +static HRESULT WINAPI BackgroundCopyJob_SetReplyFileName(IBackgroundCopyJob4 *iface, LPCWSTR filename) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(filename)); + FIXME("%p, %s: stub\n", iface, debugstr_w(filename)); return E_NOTIMPL; } -static HRESULT WINAPI BackgroundCopyJob_GetReplyFileName( - IBackgroundCopyJob3 *iface, - LPWSTR *pFilename) +static HRESULT WINAPI BackgroundCopyJob_GetReplyFileName(IBackgroundCopyJob4 *iface, LPWSTR *filename) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, pFilename); + FIXME("%p, %p: stub\n", iface, filename); return E_NOTIMPL; } @@ -877,15 +784,13 @@ static int index_from_scheme(BG_AUTH_SCHEME scheme) return scheme - 1; } -static HRESULT WINAPI BackgroundCopyJob_SetCredentials( - IBackgroundCopyJob3 *iface, - BG_AUTH_CREDENTIALS *cred) +static HRESULT WINAPI BackgroundCopyJob_SetCredentials(IBackgroundCopyJob4 *iface, BG_AUTH_CREDENTIALS *cred) { - BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); BG_AUTH_CREDENTIALS *new_cred; int idx_target, idx_scheme; - TRACE("(%p)->(%p)\n", job, cred); + TRACE("%p, %p.\n", iface, cred); if ((idx_target = index_from_target(cred->Target)) < 0) return BG_E_INVALID_AUTH_TARGET; if ((idx_scheme = index_from_scheme(cred->Scheme)) < 0) return BG_E_INVALID_AUTH_SCHEME; @@ -912,15 +817,15 @@ static HRESULT WINAPI BackgroundCopyJob_SetCredentials( } static HRESULT WINAPI BackgroundCopyJob_RemoveCredentials( - IBackgroundCopyJob3 *iface, + IBackgroundCopyJob4 *iface, BG_AUTH_TARGET target, BG_AUTH_SCHEME scheme) { - BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob3(iface); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); BG_AUTH_CREDENTIALS *new_cred; int idx_target, idx_scheme; - TRACE("(%p)->(%u %u)\n", job, target, scheme); + TRACE("%p, %u, %u.\n", iface, target, scheme); if ((idx_target = index_from_target(target)) < 0) return BG_E_INVALID_AUTH_TARGET; if ((idx_scheme = index_from_scheme(scheme)) < 0) return BG_E_INVALID_AUTH_SCHEME; @@ -939,46 +844,74 @@ static HRESULT WINAPI BackgroundCopyJob_RemoveCredentials( } static HRESULT WINAPI BackgroundCopyJob_ReplaceRemotePrefix( - IBackgroundCopyJob3 *iface, + IBackgroundCopyJob4 *iface, LPCWSTR OldPrefix, LPCWSTR NewPrefix) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(OldPrefix), debugstr_w(NewPrefix)); + FIXME("%p, %s, %s: stub\n", iface, debugstr_w(OldPrefix), debugstr_w(NewPrefix)); return S_OK; } static HRESULT WINAPI BackgroundCopyJob_AddFileWithRanges( - IBackgroundCopyJob3 *iface, + IBackgroundCopyJob4 *iface, LPCWSTR RemoteUrl, LPCWSTR LocalName, DWORD RangeCount, BG_FILE_RANGE Ranges[]) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%s %s %u %p): stub\n", This, debugstr_w(RemoteUrl), debugstr_w(LocalName), RangeCount, Ranges); + FIXME("%p, %s, %s, %u, %p: stub\n", iface, debugstr_w(RemoteUrl), debugstr_w(LocalName), RangeCount, Ranges); + return S_OK; +} + +static HRESULT WINAPI BackgroundCopyJob_SetFileACLFlags(IBackgroundCopyJob4 *iface, DWORD flags) +{ + FIXME("%p, %#x: stub\n", iface, flags); return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_SetFileACLFlags( - IBackgroundCopyJob3 *iface, - DWORD Flags) +static HRESULT WINAPI BackgroundCopyJob_GetFileACLFlags(IBackgroundCopyJob4 *iface, DWORD *flags) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%x): stub\n", This, Flags); + FIXME("%p, %p: stub\n", iface, flags); return S_OK; } -static HRESULT WINAPI BackgroundCopyJob_GetFileACLFlags( - IBackgroundCopyJob3 *iface, - DWORD *Flags) +static HRESULT WINAPI BackgroundCopyJob_SetPeerCachingFlags(IBackgroundCopyJob4 *iface, DWORD flags) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, Flags); + FIXME("%p, %#x.\n", iface, flags); return S_OK; } -static const IBackgroundCopyJob3Vtbl BackgroundCopyJob3Vtbl = +static HRESULT WINAPI BackgroundCopyJob_GetPeerCachingFlags(IBackgroundCopyJob4 *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI BackgroundCopyJob_GetOwnerIntegrityLevel(IBackgroundCopyJob4 *iface, ULONG *level) +{ + FIXME("%p, %p.\n", iface, level); + return E_NOTIMPL; +} + +static HRESULT WINAPI BackgroundCopyJob_GetOwnerElevationState(IBackgroundCopyJob4 *iface, BOOL *elevated) +{ + FIXME("%p, %p.\n", iface, elevated); + return E_NOTIMPL; +} + +static HRESULT WINAPI BackgroundCopyJob_SetMaximumDownloadTime(IBackgroundCopyJob4 *iface, ULONG timeout) +{ + FIXME("%p, %u.\n", iface, timeout); + return E_NOTIMPL; +} + +static HRESULT WINAPI BackgroundCopyJob_GetMaximumDownloadTime(IBackgroundCopyJob4 *iface, ULONG *timeout) +{ + FIXME("%p, %p.\n", iface, timeout); + return E_NOTIMPL; +} + +static const IBackgroundCopyJob4Vtbl BackgroundCopyJobVtbl = { BackgroundCopyJob_QueryInterface, BackgroundCopyJob_AddRef, @@ -1026,7 +959,13 @@ static const IBackgroundCopyJob3Vtbl BackgroundCopyJob3Vtbl = BackgroundCopyJob_ReplaceRemotePrefix, BackgroundCopyJob_AddFileWithRanges, BackgroundCopyJob_SetFileACLFlags, - BackgroundCopyJob_GetFileACLFlags + BackgroundCopyJob_GetFileACLFlags, + BackgroundCopyJob_SetPeerCachingFlags, + BackgroundCopyJob_GetPeerCachingFlags, + BackgroundCopyJob_GetOwnerIntegrityLevel, + BackgroundCopyJob_GetOwnerElevationState, + BackgroundCopyJob_SetMaximumDownloadTime, + BackgroundCopyJob_GetMaximumDownloadTime, }; static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJobHttpOptions( @@ -1041,21 +980,21 @@ static HRESULT WINAPI http_options_QueryInterface( void **ppvObject) { BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); - return IBackgroundCopyJob3_QueryInterface(&job->IBackgroundCopyJob3_iface, riid, ppvObject); + return IBackgroundCopyJob4_QueryInterface(&job->IBackgroundCopyJob4_iface, riid, ppvObject); } static ULONG WINAPI http_options_AddRef( IBackgroundCopyJobHttpOptions *iface) { BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); - return IBackgroundCopyJob3_AddRef(&job->IBackgroundCopyJob3_iface); + return IBackgroundCopyJob4_AddRef(&job->IBackgroundCopyJob4_iface); } static ULONG WINAPI http_options_Release( IBackgroundCopyJobHttpOptions *iface) { BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); - return IBackgroundCopyJob3_Release(&job->IBackgroundCopyJob3_iface); + return IBackgroundCopyJob4_Release(&job->IBackgroundCopyJob4_iface); } static HRESULT WINAPI http_options_SetClientCertificateByID( @@ -1205,7 +1144,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID if (!This) return E_OUTOFMEMORY; - This->IBackgroundCopyJob3_iface.lpVtbl = &BackgroundCopyJob3Vtbl; + This->IBackgroundCopyJob4_iface.lpVtbl = &BackgroundCopyJobVtbl; This->IBackgroundCopyJobHttpOptions_iface.lpVtbl = &http_options_vtbl; InitializeCriticalSection(&This->cs); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BackgroundCopyJobImpl.cs"); @@ -1281,7 +1220,11 @@ void processJob(BackgroundCopyJobImpl *job) { transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRED); if (job->callback && (job->notify_flags & BG_NOTIFY_JOB_TRANSFERRED)) - IBackgroundCopyCallback2_JobTransferred(job->callback, (IBackgroundCopyJob*)&job->IBackgroundCopyJob3_iface); + { + TRACE("Calling JobTransferred -->\n"); + IBackgroundCopyCallback2_JobTransferred(job->callback, (IBackgroundCopyJob*)&job->IBackgroundCopyJob4_iface); + TRACE("Called JobTransferred <--\n"); + } return; } diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 110b87bf7f..5b16e86caf 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -66,7 +66,7 @@ static HRESULT WINAPI BackgroundCopyManager_CreateJob(IBackgroundCopyManager *if return hres; /* Add a reference to the job to job list */ - *ppJob = (IBackgroundCopyJob *)&job->IBackgroundCopyJob3_iface; + *ppJob = (IBackgroundCopyJob *)&job->IBackgroundCopyJob4_iface; IBackgroundCopyJob_AddRef(*ppJob); EnterCriticalSection(&globalMgr.cs); list_add_head(&globalMgr.jobs, &job->entryFromQmgr); @@ -93,8 +93,8 @@ static HRESULT WINAPI BackgroundCopyManager_GetJob(IBackgroundCopyManager *iface { if (IsEqualGUID(&cur->jobId, jobID)) { - *job = (IBackgroundCopyJob *)&cur->IBackgroundCopyJob3_iface; - IBackgroundCopyJob3_AddRef(&cur->IBackgroundCopyJob3_iface); + *job = (IBackgroundCopyJob *)&cur->IBackgroundCopyJob4_iface; + IBackgroundCopyJob_AddRef(*job); hr = S_OK; break; } @@ -164,7 +164,7 @@ DWORD WINAPI fileTransfer(void *param) LIST_FOR_EACH_ENTRY_SAFE(job, jobCur, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) { list_remove(&job->entryFromQmgr); - IBackgroundCopyJob3_Release(&job->IBackgroundCopyJob3_iface); + IBackgroundCopyJob4_Release(&job->IBackgroundCopyJob4_iface); } return 0; } @@ -179,7 +179,7 @@ DWORD WINAPI fileTransfer(void *param) if (job->state == BG_JOB_STATE_ACKNOWLEDGED || job->state == BG_JOB_STATE_CANCELLED) { list_remove(&job->entryFromQmgr); - IBackgroundCopyJob3_Release(&job->IBackgroundCopyJob3_iface); + IBackgroundCopyJob4_Release(&job->IBackgroundCopyJob4_iface); } else if (job->state == BG_JOB_STATE_QUEUED) { diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 87f8307a42..de808049ea 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -35,7 +35,7 @@ /* Background copy job vtbl and related data */ typedef struct { - IBackgroundCopyJob3 IBackgroundCopyJob3_iface; + IBackgroundCopyJob4 IBackgroundCopyJob4_iface; IBackgroundCopyJobHttpOptions IBackgroundCopyJobHttpOptions_iface; LONG ref; LPWSTR displayName; -- 2.26.2

1 1

[PATCH 4/4] msasn1: Add stub for ASN1_CloseDecoder function
by Vijay Kiran Kamuju 08 May '20

08 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/4] msasn1: Add partial implementation of ASN1_CreateDecoder
by Vijay Kiran Kamuju 08 May '20

08 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] cmd: Save whole input history line again.
by Bernhard Übelacker 08 May '20

08 May '20

Since wine-5.5 cmd shows on cursor up just the half of the last entered command. A bisect points here: commit ffe6548d6c55f81918e1aa63228b724cbe72e567 Date: Sat Mar 21 11:57:39 2020 +0100 server: Store length of console history lines instead of null-terminating them. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 5feb1c2ba7a..302be6a1c1a 100644 --- a/server/console.c +++ b/server/console.c @@ -1680,7 +1680,7 @@ DECL_HANDLER(append_console_input_history) struct console_input *console; if (!(console = console_input_get( req->handle, FILE_WRITE_PROPERTIES ))) return; - console_input_append_hist( console, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); + console_input_append_hist( console, get_req_data(), get_req_data_size() ); release_object( console ); } -- 2.20.1

1 1

[PATCH 2/4] msasn1: Add stub for ASN1_CloseEncoder function
by Vijay Kiran Kamuju 08 May '20

08 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/4] msasn1: Add partial implementation of ASN1_CreateEncoder
by Vijay Kiran Kamuju 08 May '20

08 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 2/2] dmime: Parse Wave track stream
by Alistair Leslie-Hughes 08 May '20

08 May '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/dmime_private.h | 7 ++ dlls/dmime/wavetrack.c | 196 ++++++++++++++++++++++++++++++++++++- 2 files changed, 201 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 9759039a03e9..f7431e882f42 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,6 +86,13 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; +struct wave_item { + struct list entry; /* for listing elements */ + DMUS_IO_WAVE_TRACK_HEADER header; + + IDirectMusicObject *object; +}; + typedef struct _DMUS_PRIVATE_SEGMENT_ITEM { struct list entry; /* for listing elements */ DMUS_IO_SEGMENT_ITEM_HEADER header; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 1c6b08b52355..23406e0794d0 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -20,6 +20,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** @@ -32,6 +34,8 @@ typedef struct IDirectMusicWaveTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + struct list items; } IDirectMusicWaveTrack; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ @@ -40,6 +44,11 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicWaveTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -81,6 +90,19 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + struct list *cursor, *cursor2; + struct wave_item *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { + item = LIST_ENTRY(cursor, struct wave_item, entry); + list_remove(cursor); + + if (item->object) + IDirectMusicObject_Release(item->object); + + heap_free(item); + } + HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -280,10 +302,179 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { wave_track_Join }; +static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave, struct wave_item *item) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) + { + struct chunk_entry child = {.parent = &chunk}; + DMUS_IO_WAVE_ITEM_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - rtTime %d\n", header.rtTime); + TRACE(" - rtStartOffset %d\n", header.rtStartOffset); + TRACE(" - rtReserved %d\n", header.rtReserved); + TRACE(" - rtDuration %d\n", header.rtDuration); + TRACE(" - dwLoopStart %d\n", header.dwLoopStart); + TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - wVolumeRange %d\n", header.wVolumeRange); + TRACE(" - wPitchRange %d\n", header.wPitchRange); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id == FOURCC_LIST && child.type == DMUS_FOURCC_REF_LIST) + { + struct chunk_entry dmrf = {.parent = &child}; + IDirectMusicGetLoader *getloader; + IDirectMusicLoader *loader; + DMUS_IO_REFERENCE reference; + + if (FAILED(hr = stream_next_chunk(stream, &dmrf))) + return hr; + + if(dmrf.id != DMUS_FOURCC_REF_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &dmrf, &reference, dmrf.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&dmrf)); + return hr; + } + + TRACE("REFERENCE guidClassID %s, dwValidData 0x%08x\n", debugstr_dmguid(&reference.guidClassID), + reference.dwValidData); + + This->dmobj.desc.guidClass = reference.guidClassID; + This->dmobj.desc.dwValidData = DMUS_OBJ_CLASS; + + hr = dmobj_parsedescriptor(stream, &child, &This->dmobj.desc, reference.dwValidData); + if (FAILED(hr)) + return hr; + + dump_DMUS_OBJECTDESC(&This->dmobj.desc); + + hr = IStream_QueryInterface (stream, &IID_IDirectMusicGetLoader, (void**)&getloader); + if (FAILED(hr)) + return hr; + + hr = IDirectMusicGetLoader_GetLoader (getloader, &loader); + if (FAILED(hr)) + return hr; + IDirectMusicGetLoader_Release (getloader); + + hr = IDirectMusicLoader_GetObject (loader, &This->dmobj.desc, &IID_IDirectMusicObject, + (void**)&item->object); + IDirectMusicLoader_Release (loader); + } + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_wavetrack_list(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + struct wave_item *item = NULL; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(wave)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id != DMUS_FOURCC_WAVETRACK_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct wave_item)); + if (!item) + return E_OUTOFMEMORY; + + list_add_tail (&This->items, &item->entry); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVEPART_LIST) + { + struct chunk_entry child = {.parent = wave}; + DMUS_IO_WAVE_PART_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - dwPChannel %d\n", header.dwPChannel); + TRACE(" - dwLockToPart %d\n", header.dwLockToPart); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwIndex %d\n", header.dwIndex); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = parse_wave_item(This, stream, &child, item); + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) + hr = parse_wavetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -313,6 +504,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init(&track->items); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); -- 2.26.2

2 2

[PATCH 1/5] quartz: Get rid of the SetDefault*Rect callbacks.
by Zebediah Figura 08 May '20

08 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/quartz_private.h | 2 -- dlls/quartz/videorenderer.c | 24 ------------------------ dlls/quartz/vmr9.c | 24 ------------------------ dlls/quartz/window.c | 7 +++++-- 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7e49367a932..d3f3a8915ae 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -112,8 +112,6 @@ struct video_window_ops BOOL (*resize)(struct video_window *window, LONG height, LONG width); HRESULT (*get_current_image)(struct video_window *window, LONG *size, LONG *image); - HRESULT (WINAPI *pfnSetDefaultSourceRect)(struct video_window *window); - HRESULT (WINAPI *pfnSetDefaultTargetRect)(struct video_window *window); }; void video_window_cleanup(struct video_window *window) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ea5142e3213..8504a51d747 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -314,35 +314,11 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG return S_OK; } -static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(struct video_window *iface) -{ - struct video_renderer *This = impl_from_video_window(iface); - - SetRect(&This->window.src, 0, 0, This->VideoWidth, This->VideoHeight); - - return S_OK; -} - -static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(struct video_window *iface) -{ - struct video_renderer *This = impl_from_video_window(iface); - RECT rect; - - if (!GetClientRect(This->window.hwnd, &rect)) - return E_FAIL; - - SetRect(&This->window.dst, 0, 0, rect.right, rect.bottom); - - return S_OK; -} - static const struct video_window_ops window_ops = { .get_default_rect = video_renderer_get_default_rect, .resize = video_renderer_resize, .get_current_image = video_renderer_get_current_image, - .pfnSetDefaultSourceRect = VideoRenderer_SetDefaultSourceRect, - .pfnSetDefaultTargetRect = VideoRenderer_SetDefaultTargetRect, }; static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4fb8ddc32f4..64ef4a53e3e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -734,35 +734,11 @@ out: return hr; } -static HRESULT WINAPI VMR9_SetDefaultSourceRect(struct video_window *iface) -{ - struct quartz_vmr *filter = impl_from_video_window(iface); - - SetRect(&filter->window.src, 0, 0, filter->VideoWidth, filter->VideoHeight); - - return S_OK; -} - -static HRESULT WINAPI VMR9_SetDefaultTargetRect(struct video_window *iface) -{ - RECT rect; - struct quartz_vmr *filter = impl_from_video_window(iface); - - if (!GetClientRect(filter->window.hwnd, &rect)) - return E_FAIL; - - SetRect(&filter->window.dst, 0, 0, rect.right, rect.bottom); - - return S_OK; -} - static const struct video_window_ops window_ops = { .get_default_rect = vmr_get_default_rect, .resize = vmr_resize, .get_current_image = vmr_get_current_image, - .pfnSetDefaultSourceRect = VMR9_SetDefaultSourceRect, - .pfnSetDefaultTargetRect = VMR9_SetDefaultTargetRect, }; static const IVideoWindowVtbl IVideoWindow_VTable = diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index ebd3ffe3024..d383370e5d8 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -1055,10 +1055,12 @@ static HRESULT WINAPI basic_video_GetSourcePosition(IBasicVideo *iface, static HRESULT WINAPI basic_video_SetDefaultSourcePosition(IBasicVideo *iface) { struct video_window *window = impl_from_IBasicVideo(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(window); TRACE("window %p.\n", window); - return window->ops->pfnSetDefaultSourceRect(window); + SetRect(&window->src, 0, 0, bitmap_header->biWidth, bitmap_header->biHeight); + return S_OK; } static HRESULT WINAPI basic_video_SetDestinationPosition(IBasicVideo *iface, @@ -1098,7 +1100,8 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa TRACE("window %p.\n", window); - return window->ops->pfnSetDefaultTargetRect(window); + GetClientRect(window->hwnd, &window->dst); + return S_OK; } static HRESULT WINAPI basic_video_GetVideoSize(IBasicVideo *iface, LONG *width, LONG *height) -- 2.26.2

2 5

[PATCH] gdiplus: Support character offsets in GDI32_GdipDrawDriverString.
by Esme Povirk 08 May '20

08 May '20

From: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 66 ++++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 04c5501deb6..72075e02fbb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2242,7 +2242,7 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, HFONT *hfont, - GDIPCONST GpMatrix *matrix) + LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix) { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; @@ -2300,6 +2300,9 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, *hfont = CreateFontIndirectW(&lfw); + if (lfw_return) + *lfw_return = lfw; + DeleteDC(hdc); DeleteObject(unscaled_font); } @@ -5371,7 +5374,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; - get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); + get_font_hfont(graphics, font, stringFormat, &gdifont, NULL, NULL); oldfont = SelectObject(hdc, gdifont); for (i=0; i<stringFormat->range_count; i++) @@ -5505,7 +5508,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; - get_font_hfont(graphics, font, format, &gdifont, NULL); + get_font_hfont(graphics, font, format, &gdifont, NULL, NULL); oldfont = SelectObject(hdc, gdifont); bounds->X = rect->X; @@ -5692,7 +5695,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SelectClipRgn(hdc, rgn); } - get_font_hfont(graphics, font, format, &gdifont, NULL); + get_font_hfont(graphics, font, format, &gdifont, NULL, NULL); SelectObject(hdc, gdifont); args.graphics = graphics; @@ -6990,7 +6993,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - get_font_hfont(graphics, font, NULL, &hfont, matrix); + get_font_hfont(graphics, font, NULL, &hfont, NULL, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -7075,20 +7078,30 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix) { - static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance|DriverStringOptionsCmapLookup); INT save_state; - GpPointF pt; + GpPointF pt, *real_positions=NULL; + INT *eto_positions=NULL; HFONT hfont; + LOGFONTW lfw; UINT eto_flags=0; GpStatus status; HRGN hrgn; - if (flags & unsupported_flags) - FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (!(flags & DriverStringOptionsCmapLookup)) eto_flags |= ETO_GLYPH_INDEX; + if (!(flags & DriverStringOptionsRealizedAdvance) && length > 1) + { + real_positions = heap_alloc(sizeof(*real_positions) * length); + eto_positions = heap_alloc(sizeof(*eto_positions) * 2 * (length - 1)); + if (!real_positions || !eto_positions) + { + heap_free(real_positions); + heap_free(eto_positions); + return OutOfMemory; + } + } + save_state = SaveDC(graphics->hdc); SetBkMode(graphics->hdc, TRANSPARENT); SetTextColor(graphics->hdc, get_gdi_brush_color(brush)); @@ -7104,14 +7117,37 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 pt = positions[0]; gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &pt, 1); - get_font_hfont(graphics, font, format, &hfont, matrix); + get_font_hfont(graphics, font, format, &hfont, &lfw, matrix); + + if (!(flags & DriverStringOptionsRealizedAdvance) && length > 1) + { + GpMatrix rotation; + INT i; + + eto_flags |= ETO_PDY; + + memcpy(real_positions, positions, sizeof(PointF) * length); + + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, real_positions, length); + + GdipSetMatrixElements(&rotation, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + GdipRotateMatrix(&rotation, lfw.lfEscapement / 10.0, MatrixOrderAppend); + GdipTransformMatrixPoints(&rotation, real_positions, length); + + for (i = 0; i < (length - 1); i++) + { + eto_positions[i*2] = gdip_round(real_positions[i+1].X) - gdip_round(real_positions[i].X); + eto_positions[i*2+1] = gdip_round(real_positions[i].Y) - gdip_round(real_positions[i+1].Y); + } + } + SelectObject(graphics->hdc, hfont); SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); gdi_transform_acquire(graphics); - ExtTextOutW(graphics->hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, NULL); + ExtTextOutW(graphics->hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, eto_positions); gdi_transform_release(graphics); @@ -7119,6 +7155,9 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 DeleteObject(hfont); + heap_free(real_positions); + heap_free(eto_positions); + return Ok; } @@ -7182,7 +7221,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI heap_free(real_positions); } - get_font_hfont(graphics, font, format, &hfont, matrix); + get_font_hfont(graphics, font, format, &hfont, NULL, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -7346,7 +7385,6 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, length = lstrlenW(text); if (graphics->hdc && !graphics->alpha_hdc && - ((flags & DriverStringOptionsRealizedAdvance) || length <= 1) && brush->bt == BrushTypeSolidColor && (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000) stat = GDI32_GdipDrawDriverString(graphics, text, length, font, format, -- 2.17.1

1 0

[PATCH] http.sys: Use a separate file and preprocessor directives to avoid duplication.
by Zebediah Figura 07 May '20

07 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 531 ++-------------------------------------- dlls/http.sys/request.h | 310 +++++++++++++++++++++++ 2 files changed, 336 insertions(+), 505 deletions(-) create mode 100644 dlls/http.sys/request.h diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 46590f972f..31c7fc0971 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -33,164 +33,6 @@ static DEVICE_OBJECT *device_obj; WINE_DEFAULT_DEBUG_CHANNEL(http); -/* We have to return the HTTP_REQUEST structure to userspace exactly as it will - * be consumed; httpapi has no opportunity to massage it. Since it contains - * pointers, this is somewhat nontrivial. */ - -struct http_unknown_header_32 -{ - USHORT NameLength; - USHORT RawValueLength; - ULONG pName; /* char string */ - ULONG pRawValue; /* char string */ -}; - -struct http_data_chunk_32 -{ - HTTP_DATA_CHUNK_TYPE DataChunkType; - union - { - struct - { - ULONG pBuffer; /* char string */ - ULONG BufferLength; - } FromMemory; - /* for the struct size */ - struct - { - ULARGE_INTEGER StartingOffset; - ULARGE_INTEGER Length; - HANDLE FileHandle; - } FromFileHandle; - }; -}; - -struct http_request_32 -{ - ULONG Flags; - HTTP_CONNECTION_ID ConnectionId; - HTTP_REQUEST_ID RequestId; - HTTP_URL_CONTEXT UrlContext; - HTTP_VERSION Version; - HTTP_VERB Verb; - USHORT UnknownVerbLength; - USHORT RawUrlLength; - ULONG pUnknownVerb; /* char string */ - ULONG pRawUrl; /* char string */ - struct - { - USHORT FullUrlLength; - USHORT HostLength; - USHORT AbsPathLength; - USHORT QueryStringLength; - ULONG pFullUrl; /* WCHAR string */ - ULONG pHost; /* pointer to above */ - ULONG pAbsPath; /* pointer to above */ - ULONG pQueryString; /* pointer to above */ - } CookedUrl; - struct - { - ULONG pRemoteAddress; /* SOCKADDR */ - ULONG pLocalAddress; /* SOCKADDR */ - } Address; - struct - { - USHORT UnknownHeaderCount; - ULONG pUnknownHeaders; /* struct http_unknown_header_32 */ - USHORT TrailerCount; - ULONG pTrailers; /* NULL */ - struct - { - USHORT RawValueLength; - ULONG pRawValue; /* char string */ - } KnownHeaders[HttpHeaderRequestMaximum]; - } Headers; - ULONGLONG BytesReceived; - USHORT EntityChunkCount; - ULONG pEntityChunks; /* struct http_data_chunk_32 */ - HTTP_RAW_CONNECTION_ID RawConnectionId; - ULONG pSslInfo; /* NULL (FIXME) */ - USHORT RequestInfoCount; - ULONG pRequestInfo; /* NULL (FIXME) */ -}; - -struct http_unknown_header_64 -{ - USHORT NameLength; - USHORT RawValueLength; - ULONGLONG pName; /* char string */ - ULONGLONG pRawValue; /* char string */ -}; - -struct http_data_chunk_64 -{ - HTTP_DATA_CHUNK_TYPE DataChunkType; - union - { - struct - { - ULONGLONG pBuffer; /* char string */ - ULONG BufferLength; - } FromMemory; - /* for the struct size */ - struct - { - ULARGE_INTEGER StartingOffset; - ULARGE_INTEGER Length; - HANDLE FileHandle; - } FromFileHandle; - }; -}; - -struct http_request_64 -{ - ULONG Flags; - HTTP_CONNECTION_ID ConnectionId; - HTTP_REQUEST_ID RequestId; - HTTP_URL_CONTEXT UrlContext; - HTTP_VERSION Version; - HTTP_VERB Verb; - USHORT UnknownVerbLength; - USHORT RawUrlLength; - ULONGLONG pUnknownVerb; /* char string */ - ULONGLONG pRawUrl; /* char string */ - struct - { - USHORT FullUrlLength; - USHORT HostLength; - USHORT AbsPathLength; - USHORT QueryStringLength; - ULONGLONG pFullUrl; /* WCHAR string */ - ULONGLONG pHost; /* pointer to above */ - ULONGLONG pAbsPath; /* pointer to above */ - ULONGLONG pQueryString; /* pointer to above */ - } CookedUrl; - struct - { - ULONGLONG pRemoteAddress; /* SOCKADDR */ - ULONGLONG pLocalAddress; /* SOCKADDR */ - } Address; - struct - { - USHORT UnknownHeaderCount; - ULONGLONG pUnknownHeaders; /* struct http_unknown_header_32 */ - USHORT TrailerCount; - ULONGLONG pTrailers; /* NULL */ - struct - { - USHORT RawValueLength; - ULONGLONG pRawValue; /* char string */ - } KnownHeaders[HttpHeaderRequestMaximum]; - } Headers; - ULONGLONG BytesReceived; - USHORT EntityChunkCount; - ULONGLONG pEntityChunks; /* struct http_data_chunk_32 */ - HTTP_RAW_CONNECTION_ID RawConnectionId; - ULONGLONG pSslInfo; /* NULL (FIXME) */ - USHORT RequestInfoCount; - ULONGLONG pRequestInfo; /* NULL (FIXME) */ -}; - #define DECLARE_CRITICAL_SECTION(cs) \ static CRITICAL_SECTION cs; \ static CRITICAL_SECTION_DEBUG cs##_debug = \ @@ -405,365 +247,44 @@ static void parse_header(const char *name, int *name_len, const char **value, in *value_len = p - *value + 1; } +#define http_unknown_header http_unknown_header_64 +#define http_data_chunk http_data_chunk_64 +#define http_request http_request_64 +#define complete_irp complete_irp_64 +#define POINTER ULONGLONG +#include "request.h" +#undef http_unknown_header +#undef http_data_chunk +#undef http_request +#undef complete_irp +#undef POINTER + +#define http_unknown_header http_unknown_header_32 +#define http_data_chunk http_data_chunk_32 +#define http_request http_request_32 +#define complete_irp complete_irp_32 +#define POINTER ULONG +#include "request.h" +#undef http_unknown_header +#undef http_data_chunk +#undef http_request +#undef complete_irp +#undef POINTER + static NTSTATUS complete_irp(struct connection *conn, IRP *irp) { - static const WCHAR httpW[] = {'h','t','t','p',':','/','/'}; const struct http_receive_request_params params = *(struct http_receive_request_params *)irp->AssociatedIrp.SystemBuffer; - DWORD irp_size = (params.bits == 32) ? sizeof(struct http_request_32) : sizeof(struct http_request_64); - ULONG cooked_len, host_len, abs_path_len, query_len, chunk_len = 0, offset, processed; - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); - const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - const char *p, *name, *value, *host, *abs_path, *query; - USHORT unk_headers_count = 0, unk_header_idx; - int name_len, value_len, len; - struct sockaddr_in addr; TRACE("Completing IRP %p.\n", irp); if (!conn->req_id) conn->req_id = ++req_id_counter; - /* First calculate the total buffer size needed for this IRP. */ - - if (conn->unk_verb_len) - irp_size += conn->unk_verb_len + 1; - irp_size += conn->url_len + 1; - - /* cooked URL */ - if (conn->url[0] == '/') - { - p = host = conn->host; - while (isgraph(*p)) ++p; - host_len = p - conn->host; - abs_path = conn->url; - abs_path_len = conn->url_len; - } - else - { - host = conn->url + 7; - abs_path = strchr(host, '/'); - host_len = abs_path - host; - abs_path_len = (conn->url + conn->url_len) - abs_path; - } - if ((query = memchr(abs_path, '?', abs_path_len))) - { - query_len = (abs_path + abs_path_len) - query; - abs_path_len = query - abs_path; - } - else - query_len = 0; - cooked_len = (7 /* scheme */ + host_len + abs_path_len + query_len) * sizeof(WCHAR); - irp_size += cooked_len + sizeof(WCHAR); - - /* addresses */ - irp_size += 2 * sizeof(addr); - - /* headers */ - p = strstr(conn->buffer, "\r\n") + 2; - while (memcmp(p, "\r\n", 2)) - { - name = p; - parse_header(name, &name_len, &value, &value_len); - if (parse_header_name(name, name_len) == HttpHeaderRequestMaximum) - { - irp_size += name_len + 1; - ++unk_headers_count; - } - irp_size += value_len + 1; - p = strstr(p, "\r\n") + 2; - } - p += 2; - if (params.bits == 32) - irp_size += unk_headers_count * sizeof(struct http_unknown_header_32); + return complete_irp_32(conn, irp); else - irp_size += unk_headers_count * sizeof(struct http_unknown_header_64); - - TRACE("Need %u bytes, have %u.\n", irp_size, output_len); - irp->IoStatus.Information = irp_size; - - memset(irp->AssociatedIrp.SystemBuffer, 0, output_len); - - if (output_len < irp_size) - { - if (params.bits == 32) - { - struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; - req->ConnectionId = (ULONG_PTR)conn; - req->RequestId = conn->req_id; - } - else - { - struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; - req->ConnectionId = (ULONG_PTR)conn; - req->RequestId = conn->req_id; - } - return STATUS_BUFFER_OVERFLOW; - } - - if (params.bits == 32) - { - struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; - struct http_unknown_header_32 *unk_headers = NULL; - char *buffer = irp->AssociatedIrp.SystemBuffer; - struct http_data_chunk_32 *chunk = NULL; - - offset = sizeof(*req); - - req->ConnectionId = (ULONG_PTR)conn; - req->RequestId = conn->req_id; - req->UrlContext = conn->queue->context; - req->Version = conn->version; - req->Verb = conn->verb; - req->UnknownVerbLength = conn->unk_verb_len; - req->RawUrlLength = conn->url_len; - - if (conn->unk_verb_len) - { - req->pUnknownVerb = params.addr + offset; - memcpy(buffer + offset, conn->buffer, conn->unk_verb_len); - offset += conn->unk_verb_len; - buffer[offset++] = 0; - } - - req->pRawUrl = params.addr + offset; - memcpy(buffer + offset, conn->url, conn->url_len); - offset += conn->url_len; - buffer[offset++] = 0; - - req->CookedUrl.FullUrlLength = cooked_len; - req->CookedUrl.HostLength = host_len * sizeof(WCHAR); - req->CookedUrl.AbsPathLength = abs_path_len * sizeof(WCHAR); - req->CookedUrl.QueryStringLength = query_len * sizeof(WCHAR); - req->CookedUrl.pFullUrl = params.addr + offset; - req->CookedUrl.pHost = req->CookedUrl.pFullUrl + 7 * sizeof(WCHAR); - req->CookedUrl.pAbsPath = req->CookedUrl.pHost + host_len * sizeof(WCHAR); - if (query) - req->CookedUrl.pQueryString = req->CookedUrl.pAbsPath + abs_path_len * sizeof(WCHAR); - - memcpy(buffer + offset, httpW, sizeof(httpW)); - offset += 7 * sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, host, host_len, (WCHAR *)(buffer + offset), host_len * sizeof(WCHAR)); - offset += host_len * sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, abs_path, abs_path_len + query_len, - (WCHAR *)(buffer + offset), (abs_path_len + query_len) * sizeof(WCHAR)); - offset += (abs_path_len + query_len) * sizeof(WCHAR); - buffer[offset++] = 0; - buffer[offset++] = 0; - - req->Address.pRemoteAddress = params.addr + offset; - len = sizeof(addr); - getpeername(conn->socket, (struct sockaddr *)&addr, &len); - memcpy(buffer + offset, &addr, sizeof(addr)); - offset += sizeof(addr); - - req->Address.pLocalAddress = params.addr + offset; - len = sizeof(addr); - getsockname(conn->socket, (struct sockaddr *)&addr, &len); - memcpy(buffer + offset, &addr, sizeof(addr)); - offset += sizeof(addr); - - req->Headers.UnknownHeaderCount = unk_headers_count; - if (unk_headers_count) - { - req->Headers.pUnknownHeaders = params.addr + offset; - unk_headers = (struct http_unknown_header_32 *)(buffer + offset); - offset += unk_headers_count * sizeof(*unk_headers); - } - - unk_header_idx = 0; - p = strstr(conn->buffer, "\r\n") + 2; - while (memcmp(p, "\r\n", 2)) - { - HTTP_HEADER_ID id; - - name = p; - parse_header(name, &name_len, &value, &value_len); - if ((id = parse_header_name(name, name_len)) == HttpHeaderRequestMaximum) - { - unk_headers[unk_header_idx].NameLength = name_len; - unk_headers[unk_header_idx].RawValueLength = value_len; - unk_headers[unk_header_idx].pName = params.addr + offset; - memcpy(buffer + offset, name, name_len); - offset += name_len; - buffer[offset++] = 0; - unk_headers[unk_header_idx].pRawValue = params.addr + offset; - memcpy(buffer + offset, value, value_len); - offset += value_len; - buffer[offset++] = 0; - ++unk_header_idx; - } - else - { - req->Headers.KnownHeaders[id].RawValueLength = value_len; - req->Headers.KnownHeaders[id].pRawValue = params.addr + offset; - memcpy(buffer + offset, value, value_len); - offset += value_len; - buffer[offset++] = 0; - } - p = strstr(p, "\r\n") + 2; - } - p += 2; - - if (irp_size + sizeof(*chunk) < output_len && (params.flags & HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY)) - chunk_len = min(conn->content_len, output_len - (irp_size + sizeof(*chunk))); - if (chunk_len) - { - req->EntityChunkCount = 1; - req->pEntityChunks = params.addr + offset; - chunk = (struct http_data_chunk_32 *)(buffer + offset); - offset += sizeof(*chunk); - chunk->DataChunkType = HttpDataChunkFromMemory; - chunk->FromMemory.BufferLength = chunk_len; - chunk->FromMemory.pBuffer = params.addr + offset; - memcpy(buffer + offset, p, chunk_len); - offset += chunk_len; - - irp->IoStatus.Information = irp_size + sizeof(*chunk) + chunk_len; - } - - if (chunk_len < conn->content_len) - req->Flags |= HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS; - - req->BytesReceived = conn->req_len; - } - else - { - struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; - struct http_unknown_header_64 *unk_headers = NULL; - char *buffer = irp->AssociatedIrp.SystemBuffer; - struct http_data_chunk_64 *chunk = NULL; - - offset = sizeof(*req); - - req->ConnectionId = (ULONG_PTR)conn; - req->RequestId = conn->req_id; - req->UrlContext = conn->queue->context; - req->Version = conn->version; - req->Verb = conn->verb; - req->UnknownVerbLength = conn->unk_verb_len; - req->RawUrlLength = conn->url_len; - - if (conn->unk_verb_len) - { - req->pUnknownVerb = params.addr + offset; - memcpy(buffer + offset, conn->buffer, conn->unk_verb_len); - offset += conn->unk_verb_len; - buffer[offset++] = 0; - } - - req->pRawUrl = params.addr + offset; - memcpy(buffer + offset, conn->url, conn->url_len); - offset += conn->url_len; - buffer[offset++] = 0; - - req->CookedUrl.FullUrlLength = cooked_len; - req->CookedUrl.HostLength = host_len * sizeof(WCHAR); - req->CookedUrl.AbsPathLength = abs_path_len * sizeof(WCHAR); - req->CookedUrl.QueryStringLength = query_len * sizeof(WCHAR); - req->CookedUrl.pFullUrl = params.addr + offset; - req->CookedUrl.pHost = req->CookedUrl.pFullUrl + 7 * sizeof(WCHAR); - req->CookedUrl.pAbsPath = req->CookedUrl.pHost + host_len * sizeof(WCHAR); - if (query) - req->CookedUrl.pQueryString = req->CookedUrl.pAbsPath + abs_path_len * sizeof(WCHAR); - - memcpy(buffer + offset, httpW, sizeof(httpW)); - offset += 7 * sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, host, host_len, (WCHAR *)(buffer + offset), host_len * sizeof(WCHAR)); - offset += host_len * sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, abs_path, abs_path_len + query_len, - (WCHAR *)(buffer + offset), (abs_path_len + query_len) * sizeof(WCHAR)); - offset += (abs_path_len + query_len) * sizeof(WCHAR); - buffer[offset++] = 0; - buffer[offset++] = 0; - - req->Address.pRemoteAddress = params.addr + offset; - len = sizeof(addr); - getpeername(conn->socket, (struct sockaddr *)&addr, &len); - memcpy(buffer + offset, &addr, sizeof(addr)); - offset += sizeof(addr); - - req->Address.pLocalAddress = params.addr + offset; - len = sizeof(addr); - getsockname(conn->socket, (struct sockaddr *)&addr, &len); - memcpy(buffer + offset, &addr, sizeof(addr)); - offset += sizeof(addr); - - req->Headers.UnknownHeaderCount = unk_headers_count; - if (unk_headers_count) - { - req->Headers.pUnknownHeaders = params.addr + offset; - unk_headers = (struct http_unknown_header_64 *)(buffer + offset); - offset += unk_headers_count * sizeof(*unk_headers); - } - - unk_header_idx = 0; - p = strstr(conn->buffer, "\r\n") + 2; - while (memcmp(p, "\r\n", 2)) - { - HTTP_HEADER_ID id; - - name = p; - parse_header(name, &name_len, &value, &value_len); - if ((id = parse_header_name(name, name_len)) == HttpHeaderRequestMaximum) - { - unk_headers[unk_header_idx].NameLength = name_len; - unk_headers[unk_header_idx].RawValueLength = value_len; - unk_headers[unk_header_idx].pName = params.addr + offset; - memcpy(buffer + offset, name, name_len); - offset += name_len; - buffer[offset++] = 0; - unk_headers[unk_header_idx].pRawValue = params.addr + offset; - memcpy(buffer + offset, value, value_len); - offset += value_len; - buffer[offset++] = 0; - ++unk_header_idx; - } - else - { - req->Headers.KnownHeaders[id].RawValueLength = value_len; - req->Headers.KnownHeaders[id].pRawValue = params.addr + offset; - memcpy(buffer + offset, value, value_len); - offset += value_len; - buffer[offset++] = 0; - } - p = strstr(p, "\r\n") + 2; - } - p += 2; - - if (irp_size + sizeof(*chunk) < output_len && (params.flags & HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY)) - chunk_len = min(conn->content_len, output_len - (irp_size + sizeof(*chunk))); - if (chunk_len) - { - req->EntityChunkCount = 1; - req->pEntityChunks = params.addr + offset; - chunk = (struct http_data_chunk_64 *)(buffer + offset); - offset += sizeof(*chunk); - chunk->DataChunkType = HttpDataChunkFromMemory; - chunk->FromMemory.BufferLength = chunk_len; - chunk->FromMemory.pBuffer = params.addr + offset; - memcpy(buffer + offset, p, chunk_len); - offset += chunk_len; - - irp->IoStatus.Information = irp_size + sizeof(*chunk) + chunk_len; - } - - if (chunk_len < conn->content_len) - req->Flags |= HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS; - - req->BytesReceived = conn->req_len; - } - - assert(offset == irp->IoStatus.Information); - - conn->available = FALSE; - processed = conn->req_len - (conn->content_len - chunk_len); - memmove(conn->buffer, conn->buffer + processed, conn->len - processed); - conn->content_len -= chunk_len; - conn->len -= processed; - - return STATUS_SUCCESS; + return complete_irp_64(conn, irp); } /* Complete an IOCTL_HTTP_RECEIVE_REQUEST IRP if there is one to complete. */ diff --git a/dlls/http.sys/request.h b/dlls/http.sys/request.h new file mode 100644 index 0000000000..a1b77b67dc --- /dev/null +++ b/dlls/http.sys/request.h @@ -0,0 +1,310 @@ +/* + * Copyright 2019 Zebediah Figura + * + * 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 + */ + +/* We have to return the HTTP_REQUEST structure to userspace exactly as it will + * be consumed; httpapi has no opportunity to massage it. Since it contains + * pointers, this is somewhat nontrivial. */ + +struct http_unknown_header +{ + USHORT NameLength; + USHORT RawValueLength; + POINTER pName; /* char string */ + POINTER pRawValue; /* char string */ +}; + +struct http_data_chunk +{ + HTTP_DATA_CHUNK_TYPE DataChunkType; + union + { + struct + { + POINTER pBuffer; /* char string */ + ULONG BufferLength; + } FromMemory; + /* for the struct size */ + struct + { + ULARGE_INTEGER StartingOffset; + ULARGE_INTEGER Length; + POINTER FileHandle; + } FromFileHandle; + }; +}; + +struct http_request +{ + ULONG Flags; + HTTP_CONNECTION_ID ConnectionId; + HTTP_REQUEST_ID RequestId; + HTTP_URL_CONTEXT UrlContext; + HTTP_VERSION Version; + HTTP_VERB Verb; + USHORT UnknownVerbLength; + USHORT RawUrlLength; + POINTER pUnknownVerb; /* char string */ + POINTER pRawUrl; /* char string */ + struct + { + USHORT FullUrlLength; + USHORT HostLength; + USHORT AbsPathLength; + USHORT QueryStringLength; + POINTER pFullUrl; /* WCHAR string */ + POINTER pHost; /* pointer to above */ + POINTER pAbsPath; /* pointer to above */ + POINTER pQueryString; /* pointer to above */ + } CookedUrl; + struct + { + POINTER pRemoteAddress; /* SOCKADDR */ + POINTER pLocalAddress; /* SOCKADDR */ + } Address; + struct + { + USHORT UnknownHeaderCount; + POINTER pUnknownHeaders; /* struct http_unknown_header */ + USHORT TrailerCount; + POINTER pTrailers; /* NULL */ + struct + { + USHORT RawValueLength; + POINTER pRawValue; /* char string */ + } KnownHeaders[HttpHeaderRequestMaximum]; + } Headers; + ULONGLONG BytesReceived; + USHORT EntityChunkCount; + POINTER pEntityChunks; /* struct http_data_chunk */ + HTTP_RAW_CONNECTION_ID RawConnectionId; + POINTER pSslInfo; /* NULL (FIXME) */ + USHORT RequestInfoCount; + POINTER pRequestInfo; /* NULL (FIXME) */ +}; + +static NTSTATUS complete_irp(struct connection *conn, IRP *irp) +{ + const struct http_receive_request_params params + = *(struct http_receive_request_params *)irp->AssociatedIrp.SystemBuffer; + ULONG cooked_len, host_len, abs_path_len, query_len, chunk_len = 0, offset, processed; + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + struct http_request *req = irp->AssociatedIrp.SystemBuffer; + const char *p, *name, *value, *host, *abs_path, *query; + struct http_unknown_header *unk_headers = NULL; + char *buffer = irp->AssociatedIrp.SystemBuffer; + DWORD irp_size = sizeof(struct http_request); + USHORT unk_headers_count = 0, unk_header_idx; + struct http_data_chunk *chunk = NULL; + int name_len, value_len, len; + struct sockaddr_in addr; + + /* First calculate the total buffer size needed for this IRP. */ + + if (conn->unk_verb_len) + irp_size += conn->unk_verb_len + 1; + irp_size += conn->url_len + 1; + + /* cooked URL */ + if (conn->url[0] == '/') + { + p = host = conn->host; + while (isgraph(*p)) ++p; + host_len = p - conn->host; + abs_path = conn->url; + abs_path_len = conn->url_len; + } + else + { + host = conn->url + 7; + abs_path = strchr(host, '/'); + host_len = abs_path - host; + abs_path_len = (conn->url + conn->url_len) - abs_path; + } + if ((query = memchr(abs_path, '?', abs_path_len))) + { + query_len = (abs_path + abs_path_len) - query; + abs_path_len = query - abs_path; + } + else + query_len = 0; + cooked_len = (7 /* scheme */ + host_len + abs_path_len + query_len) * sizeof(WCHAR); + irp_size += cooked_len + sizeof(WCHAR); + + /* addresses */ + irp_size += 2 * sizeof(addr); + + /* headers */ + p = strstr(conn->buffer, "\r\n") + 2; + while (memcmp(p, "\r\n", 2)) + { + name = p; + parse_header(name, &name_len, &value, &value_len); + if (parse_header_name(name, name_len) == HttpHeaderRequestMaximum) + { + irp_size += name_len + 1; + ++unk_headers_count; + } + irp_size += value_len + 1; + p = strstr(p, "\r\n") + 2; + } + p += 2; + + irp_size += unk_headers_count * sizeof(struct http_unknown_header); + + TRACE("Need %u bytes, have %u.\n", irp_size, output_len); + irp->IoStatus.Information = irp_size; + + memset(irp->AssociatedIrp.SystemBuffer, 0, output_len); + + if (output_len < irp_size) + { + req->ConnectionId = (ULONG_PTR)conn; + req->RequestId = conn->req_id; + return STATUS_BUFFER_OVERFLOW; + } + + offset = sizeof(*req); + + req->ConnectionId = (ULONG_PTR)conn; + req->RequestId = conn->req_id; + req->UrlContext = conn->queue->context; + req->Version = conn->version; + req->Verb = conn->verb; + req->UnknownVerbLength = conn->unk_verb_len; + req->RawUrlLength = conn->url_len; + + if (conn->unk_verb_len) + { + req->pUnknownVerb = params.addr + offset; + memcpy(buffer + offset, conn->buffer, conn->unk_verb_len); + offset += conn->unk_verb_len; + buffer[offset++] = 0; + } + + req->pRawUrl = params.addr + offset; + memcpy(buffer + offset, conn->url, conn->url_len); + offset += conn->url_len; + buffer[offset++] = 0; + + req->CookedUrl.FullUrlLength = cooked_len; + req->CookedUrl.HostLength = host_len * sizeof(WCHAR); + req->CookedUrl.AbsPathLength = abs_path_len * sizeof(WCHAR); + req->CookedUrl.QueryStringLength = query_len * sizeof(WCHAR); + req->CookedUrl.pFullUrl = params.addr + offset; + req->CookedUrl.pHost = req->CookedUrl.pFullUrl + 7 * sizeof(WCHAR); + req->CookedUrl.pAbsPath = req->CookedUrl.pHost + host_len * sizeof(WCHAR); + if (query) + req->CookedUrl.pQueryString = req->CookedUrl.pAbsPath + abs_path_len * sizeof(WCHAR); + + memcpy(buffer + offset, L"http://", sizeof(L"http://")); + offset += 7 * sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, host, host_len, (WCHAR *)(buffer + offset), host_len * sizeof(WCHAR)); + offset += host_len * sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, abs_path, abs_path_len + query_len, + (WCHAR *)(buffer + offset), (abs_path_len + query_len) * sizeof(WCHAR)); + offset += (abs_path_len + query_len) * sizeof(WCHAR); + buffer[offset++] = 0; + buffer[offset++] = 0; + + req->Address.pRemoteAddress = params.addr + offset; + len = sizeof(addr); + getpeername(conn->socket, (struct sockaddr *)&addr, &len); + memcpy(buffer + offset, &addr, sizeof(addr)); + offset += sizeof(addr); + + req->Address.pLocalAddress = params.addr + offset; + len = sizeof(addr); + getsockname(conn->socket, (struct sockaddr *)&addr, &len); + memcpy(buffer + offset, &addr, sizeof(addr)); + offset += sizeof(addr); + + req->Headers.UnknownHeaderCount = unk_headers_count; + if (unk_headers_count) + { + req->Headers.pUnknownHeaders = params.addr + offset; + unk_headers = (struct http_unknown_header *)(buffer + offset); + offset += unk_headers_count * sizeof(*unk_headers); + } + + unk_header_idx = 0; + p = strstr(conn->buffer, "\r\n") + 2; + while (memcmp(p, "\r\n", 2)) + { + HTTP_HEADER_ID id; + + name = p; + parse_header(name, &name_len, &value, &value_len); + if ((id = parse_header_name(name, name_len)) == HttpHeaderRequestMaximum) + { + unk_headers[unk_header_idx].NameLength = name_len; + unk_headers[unk_header_idx].RawValueLength = value_len; + unk_headers[unk_header_idx].pName = params.addr + offset; + memcpy(buffer + offset, name, name_len); + offset += name_len; + buffer[offset++] = 0; + unk_headers[unk_header_idx].pRawValue = params.addr + offset; + memcpy(buffer + offset, value, value_len); + offset += value_len; + buffer[offset++] = 0; + ++unk_header_idx; + } + else + { + req->Headers.KnownHeaders[id].RawValueLength = value_len; + req->Headers.KnownHeaders[id].pRawValue = params.addr + offset; + memcpy(buffer + offset, value, value_len); + offset += value_len; + buffer[offset++] = 0; + } + p = strstr(p, "\r\n") + 2; + } + p += 2; + + if (irp_size + sizeof(*chunk) < output_len && (params.flags & HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY)) + chunk_len = min(conn->content_len, output_len - (irp_size + sizeof(*chunk))); + if (chunk_len) + { + req->EntityChunkCount = 1; + req->pEntityChunks = params.addr + offset; + chunk = (struct http_data_chunk *)(buffer + offset); + offset += sizeof(*chunk); + chunk->DataChunkType = HttpDataChunkFromMemory; + chunk->FromMemory.BufferLength = chunk_len; + chunk->FromMemory.pBuffer = params.addr + offset; + memcpy(buffer + offset, p, chunk_len); + offset += chunk_len; + + irp->IoStatus.Information = irp_size + sizeof(*chunk) + chunk_len; + } + + if (chunk_len < conn->content_len) + req->Flags |= HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS; + + req->BytesReceived = conn->req_len; + + assert(offset == irp->IoStatus.Information); + + conn->available = FALSE; + processed = conn->req_len - (conn->content_len - chunk_len); + memmove(conn->buffer, conn->buffer + processed, conn->len - processed); + conn->content_len -= chunk_len; + conn->len -= processed; + + return STATUS_SUCCESS; +} -- 2.26.2

1 0

[RFC] cmd/tests: Print the last lines before timeout is reached.
by Bernhard Übelacker 07 May '20

07 May '20

Looking at the last cmd tests it shows multiple, flaky timeouts at syswow64 at windows 10 with some non-english locales. Unfortunately these timeouts seem to appear just on the daily batch run of testbot. Therefore would a change like this be acceptable to get a few of the last lines written to stdout and stderr by the cmd tests? --- programs/cmd/tests/batch.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 2fae0a37edd..e1a2e2efdd4 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -74,6 +74,34 @@ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_s return new_data; } +static void timeout_helper(HANDLE file, const char* description) +{ + char buf[255] = {}; + DWORD size = 0; + DWORD start = 0; + int i; + + size = GetFileSize(file, NULL); + if (size > sizeof(buf)) + start = size - sizeof(buf); + + if (SetFilePointer(file, start, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { + ok(0, "timeout_helper: SetFilePointer failed\n"); + return; + } + + if (ReadFile(file, buf, sizeof(buf)-1, &size, NULL) == 0) { + ok(0, "timeout_helper: ReadFile failed\n"); + return; + } + + for (i = 0; i < sizeof(buf); i++) { + if (buf[i] == '\n') buf[i] = '#'; + if (buf[i] == '\r') buf[i] = '#'; + } + ok(0, "timeout reaching, last lines of %s: ...%s\n", description, buf); +} + static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) { SECURITY_ATTRIBUTES sa = {sizeof(sa), 0, TRUE}; @@ -96,13 +124,13 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) if(!bres) return FALSE; - file = CreateFileA("test.out", GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, + file = CreateFileA("test.out", GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); if(file == INVALID_HANDLE_VALUE) return FALSE; - fileerr = CreateFileA("test.err", GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, + fileerr = CreateFileA("test.err", GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(fileerr != INVALID_HANDLE_VALUE, "CreateFile stderr failed\n"); if(fileerr == INVALID_HANDLE_VALUE) @@ -118,6 +146,12 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) return FALSE; } + /* Short before reaching the 120 seconds timeout in testbot, + * make the last lines from stdout and stderr visible. */ + if (WaitForSingleObject(pi.hProcess, 115000) == WAIT_TIMEOUT) { + timeout_helper(file, "stdout"); + timeout_helper(fileerr, "stderr"); + } WaitForSingleObject(pi.hProcess, INFINITE); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); -- 2.20.1

1 0

[PATCH v2] dmime: Support more common chunks
by Michael Stefaniuc 07 May '20

07 May '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: - Use stream_chunk_get_wstr() to read the WCHAR strings - Now that we have more switch cases lets add some sort order to them dlls/dmime/dmobject.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 9ea31ab32a..1c9c1020ba 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -529,15 +529,30 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { switch (chunk.id) { + case DMUS_FOURCC_CATEGORY_CHUNK: + if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk, + desc->wszCategory, sizeof(desc->wszCategory)) == S_OK) + desc->dwValidData |= DMUS_OBJ_CATEGORY; + break; + case DMUS_FOURCC_DATE_CHUNK: + if ((supported & DMUS_OBJ_DATE) && stream_chunk_get_data(stream, &chunk, + &desc->ftDate, sizeof(desc->ftDate)) == S_OK) + desc->dwValidData |= DMUS_OBJ_DATE; + break; + case DMUS_FOURCC_FILE_CHUNK: + if ((supported & DMUS_OBJ_FILENAME) && stream_chunk_get_wstr(stream, &chunk, + desc->wszFileName, sizeof(desc->wszFileName)) == S_OK) + desc->dwValidData |= DMUS_OBJ_FILENAME; + break; case DMUS_FOURCC_GUID_CHUNK: if ((supported & DMUS_OBJ_OBJECT) && stream_chunk_get_data(stream, &chunk, &desc->guidObject, sizeof(desc->guidObject)) == S_OK) desc->dwValidData |= DMUS_OBJ_OBJECT; break; - case DMUS_FOURCC_CATEGORY_CHUNK: - if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk, - desc->wszCategory, sizeof(desc->wszCategory)) == S_OK) - desc->dwValidData |= DMUS_OBJ_CATEGORY; + case DMUS_FOURCC_NAME_CHUNK: + if ((supported & DMUS_OBJ_NAME) && stream_chunk_get_wstr(stream, &chunk, + desc->wszName, sizeof(desc->wszName)) == S_OK) + desc->dwValidData |= DMUS_OBJ_NAME; break; case DMUS_FOURCC_VERSION_CHUNK: if ((supported & DMUS_OBJ_VERSION) && stream_chunk_get_data(stream, &chunk, -- 2.26.2

1 0

[PATCH] dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag.
by Nikolay Sivov 07 May '20

07 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49115 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 73 +++++++++++++++++++++++++++++++++++++++++- dlls/dxgi/utils.c | 4 ++- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f04cd2be06..be0fecb043 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -44,6 +44,10 @@ static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECK static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *desc); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -624,6 +628,40 @@ success: return dxgi_device; } +static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + ID3D11Device *d3d_device; + IDXGIDevice *device = NULL; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ID3D11Device_Release(d3d_device); + } + + return device; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -1079,6 +1117,7 @@ static void test_check_interface_support(void) static void test_create_surface(void) { + ID3D11Texture2D *texture2d; DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; @@ -1109,6 +1148,35 @@ static void test_create_surface(void) IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* DXGI_USAGE_UNORDERED_ACCESS */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create D3D11 device.\n"); + return; + } + + hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + + if (SUCCEEDED(IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d))) + { + ID3D11UnorderedAccessView *uav; + ID3D11Device *d3d_device; + + ID3D11Texture2D_GetDevice(texture2d, &d3d_device); + + hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + + ID3D11Device_Release(d3d_device); + ID3D11Texture2D_Release(texture2d); + } + + IDXGISurface_Release(surface); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } static void test_parents(void) @@ -6483,7 +6551,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module, gdi32_module; + HMODULE dxgi_module, d3d11_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -6498,6 +6566,9 @@ START_TEST(dxgi) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + d3d11_module = LoadLibraryA("d3d11.dll"); + pD3D11CreateDevice = (void *)GetProcAddress(d3d11_module, "D3D11CreateDevice"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aece3a6af1..a32c7ee129 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -503,8 +503,10 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) wined3d_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) wined3d_bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (dxgi_usage & DXGI_USAGE_UNORDERED_ACCESS) + wined3d_bind_flags |= WINED3D_BIND_UNORDERED_ACCESS; - dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_UNORDERED_ACCESS); if (dxgi_usage) FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); return wined3d_bind_flags; -- 2.26.2

2 1

[PATCH] configure: Try -lgnutls as gnutls default lib.
by Stefan Dösinger 07 May '20

07 May '20

This allows configure on MacOS to pick up a homebrew installed gnutls without PKGCONFIG and manually added GNUTLS_LIBS var. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 27db99f304..60a8d210f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1446,7 +1446,7 @@ fi dnl **** Check for libgnutls **** if test "x$with_gnutls" != "xno" then - WINE_PACKAGE_FLAGS(GNUTLS,[gnutls],,,, + WINE_PACKAGE_FLAGS(GNUTLS,[gnutls],[-lgnutls],,, [AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], -- 2.24.2 (Apple Git-127)

1 0

[PATCH] rtworkq: Invoke cancelled waiting item with RTWQ_E_OPERATION_CANCELLED.
by Nikolay Sivov 07 May '20

07 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rtworkq/queue.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index ce06df1c8c..07d124cfb7 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -866,7 +866,11 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) { key >>= 32; if ((key & WAIT_ITEM_KEY_MASK) == WAIT_ITEM_KEY_MASK) + { + IRtwqAsyncResult_SetStatus(item->result, RTWQ_E_OPERATION_CANCELLED); + invoke_async_callback(item->result); CloseThreadpoolWait(item->u.wait_object); + } else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) CloseThreadpoolTimer(item->u.timer_object); else -- 2.26.2

1 0

[PATCH v2] msasn1: Add partial implementation of ASN1_CreateEncoder
by Vijay Kiran Kamuju 07 May '20

07 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] msasn1: Add partial implementation of ASN1_CreateEncoder
by Vijay Kiran Kamuju 07 May '20

07 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] winuser.h: Add touch event flags.
by Jacek Caban 07 May '20

07 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winuser.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[PATCH] msdmo: Use proper buffer types in IEnumDMO::Next.
by Jacek Caban 07 May '20

07 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msdmo/dmoreg.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-)

1 0

[PATCH resend 2/2] winex11.drv: Update _NET_WM_STATE before resizing windows.
by Zhiyi Zhang 07 May '20

07 May '20

According to the Extended Window Manager Hints (EWMH) spec 1.3 regarding _NET_WM_STATE_FULLSCREEN, "the Window Manager is responsible for restoring the original geometry after a switch from fullscreen back to normal window.", which means that removing _NET_WM_STATE_FULLSCREEN from a window may cause the window to receive a ConfigureNotify event to restore the window size, thus causing a application resize action to be overwritten by the window managers. Fix a game called Mugsters becomes maximized after exiting full screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 --- dlls/winex11.drv/window.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9845f9830d5..700e60db17e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8452,10 +8452,7 @@ static void test_fullscreen(void) if (rc.right - rc.left == 100 && rc.bottom - rc.top == 100) break; } - /* FVWM used by TestBots are not EWMH compliant. So this bug doesn't appear. */ - todo_wine_if(rc.right - rc.left != 100) ok(rc.right - rc.left == 100, "Expect width %d, got %d.\n", 100, rc.right - rc.left); - todo_wine_if(rc.bottom - rc.top != 100) ok(rc.bottom - rc.top == 100, "Expect height %d, got %d.\n", 100, rc.bottom - rc.top); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 52e345ceb61..c773c278b72 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1262,6 +1262,7 @@ static void sync_window_position( struct x11drv_win_data *data, set_size_hints( data, style ); set_mwm_hints( data, style, ex_style ); + update_net_wm_states( data ); data->configure_serial = NextRequest( data->display ); XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); #ifdef HAVE_LIBXSHAPE -- 2.25.1

2 1

[PATCH resend 1/2] user32/tests: Test restoring a full screen window with WS_THICKFRAME style.
by Zhiyi Zhang 07 May '20

07 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 25d643f54a6..9845f9830d5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8306,6 +8306,7 @@ static void test_fullscreen(void) 0, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW }; WNDCLASSA cls; + int timeout; HWND hwnd; int i, j; POINT pt; @@ -8429,6 +8430,35 @@ static void test_fullscreen(void) } } + /* Test restoring a full screen window with WS_THICKFRAME style to normal */ + /* Add WS_THICKFRAME style later so that the window can cover the entire monitor */ + hwnd = CreateWindowA("fullscreen_class", NULL, WS_POPUP | WS_VISIBLE, 0, 0, mi.rcMonitor.right, + mi.rcMonitor.bottom, NULL, NULL, GetModuleHandleA(NULL), NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + /* Add WS_THICKFRAME and exit full screen */ + SetWindowLongA(hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE) | WS_THICKFRAME); + SetWindowPos(hwnd, 0, 0, 0, 100, 100, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS); + flush_events(TRUE); + + /* TestBots need about 1000ms to exit full screen */ + timeout = 1000; + while (timeout > 0) + { + timeout -= 200; + flush_events(TRUE); + GetWindowRect(hwnd, &rc); + if (rc.right - rc.left == 100 && rc.bottom - rc.top == 100) + break; + } + /* FVWM used by TestBots are not EWMH compliant. So this bug doesn't appear. */ + todo_wine_if(rc.right - rc.left != 100) + ok(rc.right - rc.left == 100, "Expect width %d, got %d.\n", 100, rc.right - rc.left); + todo_wine_if(rc.bottom - rc.top != 100) + ok(rc.bottom - rc.top == 100, "Expect height %d, got %d.\n", 100, rc.bottom - rc.top); + DestroyWindow(hwnd); + UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); } -- 2.25.1

2 1

[PATCH] msvcp120: Avoid type conversion warnings in test_tr2_sys__dir_operation.
by Gerald Pfeifer 07 May '20

07 May '20

GCC 10 warns msvcp120.c:1777:11: warning: overflow in conversion from 'enum file_type' to 'int' changes value from 'type = 3735928559' to '-559038737' msvcp120.c:1807:11: warning: overflow in conversion from 'enum file_type' to 'int' changes value from 'type = 3735928559' to '-559038737' msvcp120.c:1817:11: warning: overflow in conversion from 'enum file_type' to 'int' changes value from 'type = 3735928559' to '-559038737' where 3735928559 is 0xdeadbeef. This happens since first this variable is assigned to an enum and that then to an int, and GCC diagnoses the latter as an overflow (from signed to unsigned). Assigning a hex constant does not trigger, so simply break out those two assignments. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/msvcp120/tests/msvcp120.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 7a382ac6fa..3cfabaa7ca 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1774,7 +1774,8 @@ static void test_tr2_sys__dir_operation(void) memset(first_file_name, 0xff, MAX_PATH); memset(dest, 0, MAX_PATH); - err = type = 0xdeadbeef; + err = 0xdeadbeef; + type = 0xdeadbeef; result_handle = NULL; result_handle = p_tr2_sys__Open_dir(first_file_name, "tr2_test_dir", &err, &type); ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); @@ -1804,7 +1805,8 @@ static void test_tr2_sys__dir_operation(void) ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); memset(first_file_name, 0xff, MAX_PATH); - err = type = 0xdeadbeef; + err = 0xdeadbeef; + type = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); @@ -1814,7 +1816,8 @@ static void test_tr2_sys__dir_operation(void) CreateDirectoryA("empty_dir", NULL); memset(first_file_name, 0xff, MAX_PATH); - err = type = 0xdeadbeef; + err = 0xdeadbeef; + type = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); -- 2.25.0

2 3

Use of virtual_check_buffer_for_write / IsBadWritePtr
by Andrew Wesie 07 May '20

07 May '20

While trying to solve bug 48665 by fixing the ntdll-WRITE_COPY staging patches, I think I am now faced with a fundamental problem with Wine that has been noted in the past but I'm hoping for some resolution. In ntdll, most functions that indirectly modify a buffer will call virtual_check_buffer_for_write or use one of the virtual_locked_* functions. This is required to support write watches, and, with the staging patchset above, WRITECOPY. There is a race condition with virtual_check_buffer_for_write but it generally works. However, not all Wine functions do this; e.g. NtReadFileScatter does not. And if a buffer gets passed to a third party library, then that third party library definitely won't call these functions even if it is appropriate, so, theoretically, the Wine interface should be calling IsBadReadPtr / IsBadWritePtr for any buffers that may be touched by a third party library. The current situation is one where some APIs in ntdll do the correct thing but most Wine functions do not. My question is then: do we continue the practice of adding calls to IsBadReadPtr / IsBadWritePtr / virtual_check_buffer_for_write when things break, or should these be added more proactively? It feels a little inconsistent at the moment. (As a side note, I investigated using userfaultfd-wp to solve this problem more generally, but it is Linux-specific and not quite ready for prime time.) -Andrew

1 0

[PATCH 1/5] quartz: Rename "baseControlWindow" to "window".
by Zebediah Figura 07 May '20

07 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/videorenderer.c | 57 +++++++++++++++++++------------------ dlls/quartz/vmr9.c | 46 +++++++++++++++--------------- 2 files changed, 52 insertions(+), 51 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 15e05f48a89..6e31e196951 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct video_renderer { struct strmbase_renderer renderer; - struct video_window baseControlWindow; + struct video_window window; BaseControlVideo baseControlVideo; IOverlay IOverlay_iface; @@ -58,7 +58,7 @@ struct video_renderer static inline struct video_renderer *impl_from_video_window(struct video_window *iface) { - return CONTAINING_RECORD(iface, struct video_renderer, baseControlWindow); + return CONTAINING_RECORD(iface, struct video_renderer, window); } static inline struct video_renderer *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -68,7 +68,7 @@ static inline struct video_renderer *impl_from_strmbase_renderer(struct strmbase static inline struct video_renderer *impl_from_IVideoWindow(IVideoWindow *iface) { - return CONTAINING_RECORD(iface, struct video_renderer, baseControlWindow.IVideoWindow_iface); + return CONTAINING_RECORD(iface, struct video_renderer, window.IVideoWindow_iface); } static inline struct video_renderer *impl_from_BaseControlVideo(BaseControlVideo *iface) @@ -86,8 +86,8 @@ static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) static void VideoRenderer_AutoShowWindow(struct video_renderer *This) { - if (This->baseControlWindow.AutoShow) - ShowWindow(This->baseControlWindow.hwnd, SW_SHOW); + if (This->window.AutoShow) + ShowWindow(This->window.hwnd, SW_SHOW); } static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, @@ -115,7 +115,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - dc = GetDC(filter->baseControlWindow.hwnd); + dc = GetDC(filter->window.hwnd); StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, filter->DestRect.right - filter->DestRect.left, filter->DestRect.bottom - filter->DestRect.top, @@ -123,7 +123,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->SourceRect.right - filter->SourceRect.left, filter->SourceRect.bottom - filter->SourceRect.top, pbSrcStream, (BITMAPINFO *)get_bitmap_header(&filter->renderer.sink.pin.mt), DIB_RGB_COLORS, SRCCOPY); - ReleaseDC(filter->baseControlWindow.hwnd, dc); + ReleaseDC(filter->window.hwnd, dc); if (filter->renderer.filter.state == State_Paused) { @@ -163,7 +163,7 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); - video_window_cleanup(&filter->baseControlWindow); + video_window_cleanup(&filter->window); CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter); @@ -178,7 +178,7 @@ static HRESULT video_renderer_query_interface(struct strmbase_renderer *iface, R if (IsEqualGUID(iid, &IID_IBasicVideo)) *out = &filter->baseControlVideo.IBasicVideo_iface; else if (IsEqualGUID(iid, &IID_IVideoWindow)) - *out = &filter->baseControlWindow.IVideoWindow_iface; + *out = &filter->window.IVideoWindow_iface; else return E_NOINTERFACE; @@ -212,9 +212,9 @@ static void video_renderer_stop_stream(struct strmbase_renderer *iface) TRACE("(%p)->()\n", This); - if (This->baseControlWindow.AutoShow) + if (This->window.AutoShow) /* Black it out */ - RedrawWindow(This->baseControlWindow.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE); + RedrawWindow(This->window.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE); ResetEvent(This->run_event); } @@ -230,7 +230,7 @@ static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_ { struct video_renderer *filter = impl_from_strmbase_renderer(iface); const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(mt); - HWND window = filter->baseControlWindow.hwnd; + HWND window = filter->window.hwnd; RECT rect; filter->VideoWidth = bitmap_header->biWidth; @@ -404,7 +404,7 @@ static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface struct video_renderer *This = impl_from_BaseControlVideo(iface); RECT rect; - if (!GetClientRect(This->baseControlWindow.hwnd, &rect)) + if (!GetClientRect(This->window.hwnd, &rect)) return E_FAIL; SetRect(&This->DestRect, 0, 0, rect.right, rect.bottom); @@ -457,26 +457,27 @@ static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG fullscreen) { struct video_renderer *filter = impl_from_IVideoWindow(iface); + HWND window = filter->window.hwnd; FIXME("filter %p, fullscreen %d.\n", filter, fullscreen); if (fullscreen) { - filter->saved_style = GetWindowLongW(filter->baseControlWindow.hwnd, GWL_STYLE); - ShowWindow(filter->baseControlWindow.hwnd, SW_HIDE); - SetParent(filter->baseControlWindow.hwnd, NULL); - SetWindowLongW(filter->baseControlWindow.hwnd, GWL_STYLE, WS_POPUP); - SetWindowPos(filter->baseControlWindow.hwnd, HWND_TOP, 0, 0, + filter->saved_style = GetWindowLongW(window, GWL_STYLE); + ShowWindow(window, SW_HIDE); + SetParent(window, NULL); + SetWindowLongW(window, GWL_STYLE, WS_POPUP); + SetWindowPos(window, HWND_TOP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), SWP_SHOWWINDOW); - GetWindowRect(filter->baseControlWindow.hwnd, &filter->DestRect); + GetWindowRect(window, &filter->DestRect); } else { - ShowWindow(filter->baseControlWindow.hwnd, SW_HIDE); - SetParent(filter->baseControlWindow.hwnd, filter->baseControlWindow.hwndOwner); - SetWindowLongW(filter->baseControlWindow.hwnd, GWL_STYLE, filter->saved_style); - GetClientRect(filter->baseControlWindow.hwnd, &filter->DestRect); - SetWindowPos(filter->baseControlWindow.hwnd, 0, filter->DestRect.left, filter->DestRect.top, + ShowWindow(window, SW_HIDE); + SetParent(window, filter->window.hwndOwner); + SetWindowLongW(window, GWL_STYLE, filter->saved_style); + GetClientRect(window, &filter->DestRect); + SetWindowPos(window, 0, filter->DestRect.left, filter->DestRect.top, filter->DestRect.right, filter->DestRect.bottom, SWP_NOZORDER | SWP_SHOWWINDOW); } filter->FullScreenMode = fullscreen; @@ -593,7 +594,7 @@ static HRESULT WINAPI overlay_GetWindowHandle(IOverlay *iface, HWND *window) TRACE("filter %p, window %p.\n", filter, window); - *window = filter->baseControlWindow.hwnd; + *window = filter->window.hwnd; return S_OK; } @@ -649,14 +650,14 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) strmbase_renderer_init(&object->renderer, outer, &CLSID_VideoRenderer, L"In", &renderer_ops); object->IOverlay_iface.lpVtbl = &overlay_vtbl; - video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, + video_window_init(&object->window, &IVideoWindow_VTable, &object->renderer.filter, &object->renderer.sink.pin, &window_ops); basic_video_init(&object->baseControlVideo, &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); - if (FAILED(hr = video_window_create_window(&object->baseControlWindow))) + if (FAILED(hr = video_window_create_window(&object->window))) { - video_window_cleanup(&object->baseControlWindow); + video_window_cleanup(&object->window); strmbase_renderer_cleanup(&object->renderer); free(object); return hr; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2cec590545c..8fdcb3809be 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -56,7 +56,7 @@ static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) struct quartz_vmr { struct strmbase_renderer renderer; - struct video_window baseControlWindow; + struct video_window window; BaseControlVideo baseControlVideo; IAMCertifiedOutputProtection IAMCertifiedOutputProtection_iface; @@ -119,7 +119,7 @@ static inline BOOL is_vmr9(const struct quartz_vmr *filter) static inline struct quartz_vmr *impl_from_video_window(struct video_window *iface) { - return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlWindow); + return CONTAINING_RECORD(iface, struct quartz_vmr, window); } static inline struct quartz_vmr *impl_from_BaseControlVideo(BaseControlVideo *cvid) @@ -415,7 +415,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE }; TRACE("Initializing in mode %u, our window %p, clipping window %p.\n", - filter->mode, filter->baseControlWindow.hwnd, filter->hWndClippingWindow); + filter->mode, filter->window.hwnd, filter->hWndClippingWindow); if (filter->mode == VMR9Mode_Windowless && !filter->hWndClippingWindow) return S_OK; @@ -481,7 +481,7 @@ static void vmr_start_stream(struct strmbase_renderer *iface) TRACE("(%p)\n", This); IVMRImagePresenter9_StartPresenting(This->presenter, This->cookie); - ShowWindow(This->baseControlWindow.hwnd, SW_SHOW); + ShowWindow(This->window.hwnd, SW_SHOW); SetEvent(This->run_event); } @@ -509,7 +509,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(mt); - HWND window = filter->baseControlWindow.hwnd; + HWND window = filter->window.hwnd; HRESULT hr; RECT rect; @@ -567,7 +567,7 @@ static void vmr_destroy(struct strmbase_renderer *iface) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - video_window_cleanup(&filter->baseControlWindow); + video_window_cleanup(&filter->window); /* Devil May Cry 3 releases the IVMRSurfaceAllocatorNotify9 interface from * TerminateDevice(). Artificially increase the reference count so that we @@ -601,7 +601,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); if (IsEqualGUID(iid, &IID_IVideoWindow)) - *out = &filter->baseControlWindow.IVideoWindow_iface; + *out = &filter->window.IVideoWindow_iface; else if (IsEqualGUID(iid, &IID_IBasicVideo)) *out = &filter->baseControlVideo.IBasicVideo_iface; else if (IsEqualGUID(iid, &IID_IAMCertifiedOutputProtection)) @@ -824,7 +824,7 @@ static HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) RECT rect; struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - if (!GetClientRect(pVMR9->baseControlWindow.hwnd, &rect)) + if (!GetClientRect(pVMR9->window.hwnd, &rect)) return E_FAIL; SetRect(&pVMR9->target_rect, 0, 0, rect.right, rect.bottom); @@ -1598,7 +1598,7 @@ static HRESULT WINAPI VMR7WindowlessControl_SetVideoPosition(IVMRWindowlessContr { This->target_rect = *dest; FIXME("Output rectangle: %s.\n", wine_dbgstr_rect(dest)); - SetWindowPos(This->baseControlWindow.hwnd, NULL, + SetWindowPos(This->window.hwnd, NULL, dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | SWP_NOREDRAW); } @@ -1799,7 +1799,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr { This->target_rect = *dest; FIXME("Output rectangle: %s.\n", wine_dbgstr_rect(dest)); - SetWindowPos(This->baseControlWindow.hwnd, NULL, + SetWindowPos(This->window.hwnd, NULL, dest->left, dest->top, dest->right - dest->left, dest->bottom - dest->top, SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | SWP_NOREDRAW); } @@ -1874,7 +1874,7 @@ static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 FIXME("(%p/%p)->(...) semi-stub\n", iface, This); EnterCriticalSection(&This->renderer.filter.csFilter); - if (hwnd != This->hWndClippingWindow && hwnd != This->baseControlWindow.hwnd) + if (hwnd != This->hWndClippingWindow && hwnd != This->window.hwnd) { ERR("Not handling changing windows yet!!!\n"); LeaveCriticalSection(&This->renderer.filter.csFilter); @@ -1889,7 +1889,7 @@ static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 } /* Windowless extension */ - hr = IDirect3DDevice9_Present(This->allocator_d3d9_dev, NULL, NULL, This->baseControlWindow.hwnd, NULL); + hr = IDirect3DDevice9_Present(This->allocator_d3d9_dev, NULL, NULL, This->window.hwnd, NULL); LeaveCriticalSection(&This->renderer.filter.csFilter); return hr; @@ -2348,7 +2348,7 @@ static HRESULT WINAPI overlay_GetWindowHandle(IOverlay *iface, HWND *window) TRACE("filter %p, window %p.\n", filter, window); - *window = filter->baseControlWindow.hwnd; + *window = filter->window.hwnd; return S_OK; } @@ -2423,12 +2423,12 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; object->IOverlay_iface.lpVtbl = &overlay_vtbl; - video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, + video_window_init(&object->window, &IVideoWindow_VTable, &object->renderer.filter, &object->renderer.sink.pin, &window_ops); - if (FAILED(hr = video_window_create_window(&object->baseControlWindow))) + if (FAILED(hr = video_window_create_window(&object->window))) { - video_window_cleanup(&object->baseControlWindow); + video_window_cleanup(&object->window); strmbase_renderer_cleanup(&object->renderer); FreeLibrary(object->hD3d9); free(object); @@ -2621,7 +2621,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac BOOL render = FALSE; TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9); - GetWindowRect(This->pVMR9->baseControlWindow.hwnd, &output); + GetWindowRect(This->pVMR9->window.hwnd, &output); TRACE("Output rectangle: %s\n", wine_dbgstr_rect(&output)); /* This might happen if we don't have active focus (eg on a different virtual desktop) */ @@ -2646,7 +2646,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac hr = IDirect3DDevice9_EndScene(This->d3d9_dev); if (render && SUCCEEDED(hr)) { - hr = IDirect3DDevice9_Present(This->d3d9_dev, NULL, NULL, This->pVMR9->baseControlWindow.hwnd, NULL); + hr = IDirect3DDevice9_Present(This->d3d9_dev, NULL, NULL, This->pVMR9->window.hwnd, NULL); if (FAILED(hr)) FIXME("Presenting image: %08x\n", hr); } @@ -2770,12 +2770,12 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation TRACE("(%p)->()\n", This); /* Obtain a monitor and d3d9 device */ - d3d9_adapter = d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->baseControlWindow.hwnd, &This->hMon); + d3d9_adapter = d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->window.hwnd, &This->hMon); /* Now try to create the d3d9 device */ ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; - d3dpp.hDeviceWindow = This->pVMR9->baseControlWindow.hwnd; + d3dpp.hDeviceWindow = This->pVMR9->window.hwnd; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferHeight = This->pVMR9->target_rect.bottom - This->pVMR9->target_rect.top; d3dpp.BackBufferWidth = This->pVMR9->target_rect.right - This->pVMR9->target_rect.left; @@ -2874,19 +2874,19 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(struct default_presenter /* Now try to create the d3d9 device */ ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; - d3dpp.hDeviceWindow = This->pVMR9->baseControlWindow.hwnd; + d3dpp.hDeviceWindow = This->pVMR9->window.hwnd; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; if (This->d3d9_dev) IDirect3DDevice9_Release(This->d3d9_dev); This->d3d9_dev = NULL; hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter_from_hwnd(This->d3d9_ptr, - This->pVMR9->baseControlWindow.hwnd, &This->hMon), D3DDEVTYPE_HAL, NULL, + This->pVMR9->window.hwnd, &This->hMon), D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); if (FAILED(hr)) { hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter_from_hwnd(This->d3d9_ptr, - This->pVMR9->baseControlWindow.hwnd, &This->hMon), D3DDEVTYPE_HAL, NULL, + This->pVMR9->window.hwnd, &This->hMon), D3DDEVTYPE_HAL, NULL, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); if (FAILED(hr)) { -- 2.26.2

1 4

[PATCH v2] kernelbase: Add SetEnvironmentStringsW().
by Frank Uhlig 06 May '20

06 May '20

Signed-off-by: Frank Uhlig <uhlig.frank(a)gmail.com> --- ...ms-win-core-processenvironment-l1-1-0.spec | 2 +- ...ms-win-core-processenvironment-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/environ.c | 82 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 50 +++++++++++ include/winbase.h | 1 + 7 files changed, 137 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec b/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec index e3698d6efd..7a62b74390 100644 --- a/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec +++ b/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) kernel32.SetEnvironmentStringsW @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW @ stdcall SetStdHandle(long long) kernel32.SetStdHandle diff --git a/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec b/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec index 2c25ee1a07..c93d221c5e 100644 --- a/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec +++ b/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec @@ -17,7 +17,7 @@ @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) kernel32.SetEnvironmentStringsW @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW @ stdcall SetStdHandle(long long) kernel32.SetStdHandle diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0dd3813987..a27098fa42 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1389,7 +1389,7 @@ # @ stub SetDynamicTimeZoneInformation @ stdcall -import SetEndOfFile(long) # @ stub SetEnvironmentStringsA -# @ stub SetEnvironmentStringsW +@ stdcall -import SetEnvironmentStringsW (ptr) @ stdcall -import SetEnvironmentVariableA(str str) @ stdcall -import SetEnvironmentVariableW(wstr wstr) @ stdcall -import SetErrorMode(long) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 128a5fdbe5..fff31cd80e 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -602,6 +602,87 @@ static void test_GetEnvironmentStringsW(void) FreeEnvironmentStringsW(env2); } +static void test_SetEnvironmentStringsW(void) +{ + DWORD buf_len; + BOOL ret; + DWORD ret_size; + + WCHAR buf[256]; + + WCHAR name[] = {'N','a','m','e',0}; + WCHAR value[] = {'V','a','l','u','e',0}; + WCHAR env[] = {'N','a','m','e','=','V','a','l','u','e',0,0}; + + WCHAR eman[] = {'e','m','a','N',0}; + WCHAR eulav[] = {'e','u','l','a','V',0}; + WCHAR vne[] = {'e','m','a','N','=','e','u','l','a','V',0,0}; + + WCHAR var[] = {'V','a','r',0}; + WCHAR val[] = {'V','a','l',0}; + WCHAR rav[] = {'r','a','V',0}; + WCHAR lav[] = {'l','a','V',0}; + WCHAR mul[] = {'V','a','r','=','V','a','l',0,'r','a','V','=','l','a','V',0,0}; + + WCHAR empty[] = {'V','a','r','=',0,0}; + + WCHAR fwlt1[] = {'V','a','r',0,0}; + WCHAR fwlt2[] = {'=','V','a','l',0,0}; + WCHAR fwlt3[] = {'V','a','r','=','V','a','l',0,'r','a','V',0,0}; + + buf_len = ARRAY_SIZE(buf); + + ret = SetEnvironmentStringsW(env); + ok( ret, "Setting environment strings failed with ret=%d\n", ret ); + + ret_size = GetEnvironmentVariableW(name, buf, buf_len); + ok( ret_size && ((ARRAY_SIZE(value)-1 == ret_size) && (0 == wcscmp(buf, value))), + "Difference in env, expected (%s) gotten (%s)\n", + debugstr_w(value), debugstr_w(buf)); + memset(buf, 0, buf_len * sizeof(WCHAR)); + + ret = SetEnvironmentStringsW(vne); + ok( ret, "Setting environment strings failed with ret=%d\n", ret ); + + ret_size = GetEnvironmentVariableW(eman, buf, buf_len); + ok( ret_size && ((ARRAY_SIZE(eulav)-1 == ret_size) && (0 == wcscmp(buf, eulav))), + "Difference in env, expected (%s) gotten (%s)\n", + debugstr_w(eulav), debugstr_w(buf)); + memset(buf, 0, buf_len * sizeof(WCHAR)); + + ret = SetEnvironmentStringsW(mul); + ok( ret, "Setting environment strings failed with ret=%d\n", ret); + + ret_size = GetEnvironmentVariableW(var, buf, buf_len); + ok( ret_size && ((ARRAY_SIZE(val)-1 == ret_size) && (0 == wcscmp(buf, val))), + "Difference in env, expected (%s) gotten (%s)\n", + debugstr_w(val), debugstr_w(buf)); + memset(buf, 0, buf_len * sizeof(WCHAR)); + + ret_size = GetEnvironmentVariableW(rav, buf, buf_len); + ok( ret_size && ((ARRAY_SIZE(lav)-1 == ret_size) && (0 == wcscmp(buf, lav))), + "Difference in env, expected (%s) gotten (%s)\n", + debugstr_w(lav), debugstr_w(buf)); + memset(buf, 0, buf_len * sizeof(WCHAR)); + + ret = SetEnvironmentStringsW(empty); + ok( ret, "Setting empty environment failed with ret=%d\n", ret); + + ret_size = GetEnvironmentVariableW(var, buf, buf_len); + ok( (0 == ret_size), + "Difference in env, should have been null, is (%s)\n", debugstr_w(buf)); + memset(buf, 0, buf_len * sizeof(WCHAR)); + + ret = SetEnvironmentStringsW(fwlt1); + ok( FALSE == ret, "Non-environment string did not fail as expected, ret=%d\n", ret); + + ret = SetEnvironmentStringsW(fwlt2); + ok( FALSE == ret, "Non-environment string did not fail as expected, ret=%d\n", ret); + + ret = SetEnvironmentStringsW(fwlt3); + ok( FALSE == ret, "Non-environment string did not fail as expected, ret=%d\n", ret); +} + START_TEST(environ) { init_functionpointers(); @@ -614,4 +695,5 @@ START_TEST(environ) test_GetComputerNameExA(); test_GetComputerNameExW(); test_GetEnvironmentStringsW(); + test_SetEnvironmentStringsW(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e73682af0f..c252d1ebd4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1422,7 +1422,7 @@ @ stdcall SetDefaultDllDirectories(long) # @ stub SetDynamicTimeZoneInformation @ stdcall SetEndOfFile(long) -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) @ stdcall SetEnvironmentVariableA(str str) @ stdcall SetEnvironmentVariableW(wstr wstr) @ stdcall SetErrorMode(long) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index acef2c55a1..7e9b44aa15 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1392,6 +1392,56 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentVariableW( LPCWSTR name, LPCWSTR val } +/*********************************************************************** + * SetEnvironmentStringsW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentStringsW( WCHAR *env ) +{ + BOOL rc = FALSE; + WCHAR *var, *val, *buff, *end, *tmp, *cur; + size_t bufflen = 0, len; + + TRACE( "(%p)\n", env); + + if (!env) + return rc; + + RtlAcquirePebLock(); + len = get_env_length( NtCurrentTeb()->Peb->ProcessParameters->Environment ) * sizeof(WCHAR); + if ((cur = HeapAlloc( GetProcessHeap(), 0, len ))) + memset( NtCurrentTeb()->Peb->ProcessParameters->Environment, 0, len ); + RtlReleasePebLock(); + + if ( !(bufflen = get_env_length(env)) ) + return rc; + + if (NULL == (buff = HeapAlloc(GetProcessHeap(), 0, bufflen * sizeof(WCHAR)))) + return rc; + + memcpy(buff, env, bufflen * sizeof(WCHAR)); + end = buff +bufflen -1; + var = buff; + + while (var < end) { + if (NULL == (val = wcschr(var, L'='))) + return FALSE; + *val++ = L'\0'; + + if ( !(rc = SetEnvironmentVariableW(var, val)) ) + return rc; + + if (NULL == (var = wcschr(val, L'\0'))) + return FALSE; + + ++var; + } + + HeapFree(GetProcessHeap(), 0, buff); + + return rc; +} + + /*********************************************************************** * Process/thread attribute lists ***********************************************************************/ diff --git a/include/winbase.h b/include/winbase.h index f92d864c78..043bd3269f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2622,6 +2622,7 @@ WINBASEAPI BOOL WINAPI SetEndOfFile(HANDLE); WINBASEAPI BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR); #define SetEnvironmentVariable WINELIB_NAME_AW(SetEnvironmentVariable) +WINBASEAPI BOOL WINAPI SetEnvironmentStringsW(WCHAR *); WINBASEAPI UINT WINAPI SetErrorMode(UINT); WINBASEAPI BOOL WINAPI SetEvent(HANDLE); WINBASEAPI VOID WINAPI SetFileApisToANSI(void); -- 2.26.2

2 1

[PATCH] wined3d: Allow setting user memory for mipmapped texture in wined3d_texture_update_desc().
by Paul Gofman 06 May '20

06 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/tests/ddraw7.c | 32 +++++++++--- dlls/wined3d/texture.c | 100 +++++++++++++++++++++----------------- 2 files changed, 80 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ddd3cdb0e..ccb8e2a952 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13347,14 +13347,14 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); width = surface_desc.dwWidth; height = surface_desc.dwHeight; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, width, height, NULL, NULL, NULL, NULL); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); bpp = 0; if (SUCCEEDED(IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0))) @@ -13367,7 +13367,7 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", @@ -13379,9 +13379,9 @@ static void test_display_mode_surface_pixel_format(void) U5(surface_desc).dwBackBufferCount = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(surface_desc.dwWidth == width, "Got width %u, expected %u.\n", surface_desc.dwWidth, width); ok(surface_desc.dwHeight == height, "Got height %u, expected %u.\n", surface_desc.dwHeight, height); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", @@ -13397,15 +13397,33 @@ static void test_display_mode_surface_pixel_format(void) surface_desc.dwHeight = height; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(U4(surface_desc).ddpfPixelFormat.dwFlags == DDPF_RGB, "Got unexpected pixel format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); ok(U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount == bpp, "Got bpp %u, expected %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, bpp); IDirectDrawSurface7_Release(surface); + /* Test compatibility mode mipmap texture creation. */ + hr = IDirectDraw7_SetDisplayMode(ddraw, width, height, 16, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + bpp = 16; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT | DDSD_PITCH; + U2(surface_desc).dwMipMapCount = 2; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + U1(surface_desc).lPitch = surface_desc.dwWidth * bpp / 8; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_VIDEOMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == D3D_OK || hr == DDERR_NODIRECTDRAWHW, "Got unexpected hr %#x.\n", hr); + if (surface) + IDirectDrawSurface7_Release(surface); + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 49373eb58a..239c089dd8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1748,9 +1748,10 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; - const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; + const struct wined3d *d3d; + BOOL set_user_memory_only; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1765,10 +1766,15 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + set_user_memory_only = width == texture->resource.width && height == texture->resource.height + && format_id == texture->resource.format->id && multisample_type == texture->resource.multisample_type + && multisample_quality == texture->resource.multisample_quality + && (!texture->row_pitch || pitch == texture->row_pitch); + if (!resource_size) return WINED3DERR_INVALIDCALL; - if (texture->level_count * texture->layer_count > 1) + if (texture->level_count * texture->layer_count > 1 && !set_user_memory_only) { WARN("Texture has multiple sub-resources, not supported.\n"); return WINED3DERR_INVALIDCALL; @@ -1803,7 +1809,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_cs_emit_unload_resource(device->cs, &texture->resource); wined3d_resource_wait_idle(&texture->resource); - sub_resource = &texture->sub_resources[0]; if (texture->dc_info && texture->dc_info[0].dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; @@ -1815,55 +1820,60 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_free_sysmem(&texture->resource); - if ((texture->row_pitch = pitch)) - texture->slice_pitch = height * pitch; - else - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(format, 1, width, height, - &texture->row_pitch, &texture->slice_pitch); - - texture->resource.format = format; - texture->resource.multisample_type = multisample_type; - texture->resource.multisample_quality = multisample_quality; - texture->resource.width = width; - texture->resource.height = height; - if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) - adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); - texture->resource.size = texture->slice_pitch; - sub_resource->size = texture->slice_pitch; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - - if (texture->texture_ops == &texture_gl_ops) - { - if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + if (!set_user_memory_only) + { + sub_resource = &texture->sub_resources[0]; + + if ((texture->row_pitch = pitch)) + texture->slice_pitch = height * pitch; + else + /* User memory surfaces don't have the regular surface alignment. */ + wined3d_format_calculate_pitch(format, 1, width, height, + &texture->row_pitch, &texture->slice_pitch); + + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); + texture->resource.size = texture->slice_pitch; + sub_resource->size = texture->slice_pitch; + sub_resource->locations = WINED3D_LOCATION_DISCARDED; + + if (texture->texture_ops == &texture_gl_ops) + { + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } + else + { + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } + } + + if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot + && !d3d_info->texture_npot_conditional) { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; - texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->pow2_width = width; + texture->pow2_height = height; } } - if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot - && !d3d_info->texture_npot_conditional) - { - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = texture->pow2_height = 1; - while (texture->pow2_width < width) - texture->pow2_width <<= 1; - while (texture->pow2_height < height) - texture->pow2_height <<= 1; - } - else - { - texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - texture->pow2_width = width; - texture->pow2_height = height; - } - if ((texture->user_memory = mem)) { texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; -- 2.26.2

2 1

Re: [PATCH] add: SetEnvironmentStringsW
by Zebediah Figura 06 May '20

06 May '20

On 3/17/20 3:13 PM, Frank Uhlig wrote: > On Thu, Mar 12, 2020 at 3:25 AM Zebediah Figura <zfigura(a)codeweavers.com> wrote: >> >> On 3/11/20 4:50 PM, Frank Uhlig wrote: >>> Sorry for the late reply, but have finally gotten back to this patch. >>> >>> On Thu, Feb 20, 2020 at 10:35 PM Zebediah Figura <z.figura12(a)gmail.com> wrote: >>>> >>>> On 2/20/20 3:12 PM, Frank Uhlig wrote: >>>>> Hi Zebediah, thanks for looking into this. Please find my responses >>>>> inline below. I've already incorporated many things, but still have >>>>> some remaining questions and comments. >>>>> >>>>> I would re-submit it soon, and include a "versioning" in the mail tag >>>>> as I've seen on other submissions (i.e., [PATCH v2]). >>>>> >>>>> On Mon, Feb 10, 2020 at 4:38 AM Zebediah Figura <z.figura12(a)gmail.com> wrote: >>>>>> >>>>>> Hello Frank, thanks for the patch. >>>>>> >>>>>> With regard to the title, convention is to put the name of the component >>>>>> first, followed by a colon, then a verb describing what the patch does, >>>>>> so e.g. "kernelbase: Add SetEnvironmentStringsW()." >>>>>> >>>>> >>>>> done. >>>>> >>>>>> I have a few more comments inlined below which might help improve the patch: >>>>>> >>>>>> On 1/22/20 3:33 PM, Frank Uhlig wrote: >>>>>>> From: Frank Uhlig <fuulish(a)users.noreply.github.com> >>>>>>> >>>>>>> Signed-off-by: Frank Uhlig <uhlig.frank(a)gmail.com> >>>>>>> --- >>>>>>> ...ms-win-core-processenvironment-l1-1-0.spec | 2 +- >>>>>>> ...ms-win-core-processenvironment-l1-2-0.spec | 2 +- >>>>>>> dlls/kernel32/kernel32.spec | 2 +- >>>>>>> dlls/kernel32/tests/environ.c | 61 +++++++++++++++++++ >>>>>>> dlls/kernelbase/kernelbase.spec | 2 +- >>>>>>> dlls/kernelbase/process.c | 29 +++++++++ >>>>>>> include/winbase.h | 1 + >>>>>>> 7 files changed, 95 insertions(+), 4 deletions(-) >>>>>>> >>>>>>> diff --git a/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec b/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec >>>>>>> index e3698d6efd..7a62b74390 100644 >>>>>>> --- a/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec >>>>>>> +++ b/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec >>>>>>> @@ -15,7 +15,7 @@ >>>>>>> @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW >>>>>>> @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA >>>>>>> @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW >>>>>>> -@ stub SetEnvironmentStringsW >>>>>>> +@ stdcall SetEnvironmentStringsW(ptr) kernel32.SetEnvironmentStringsW >>>>>>> @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA >>>>>>> @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW >>>>>>> @ stdcall SetStdHandle(long long) kernel32.SetStdHandle >>>>>>> diff --git a/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec b/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec >>>>>>> index 2c25ee1a07..c93d221c5e 100644 >>>>>>> --- a/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec >>>>>>> +++ b/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec >>>>>>> @@ -17,7 +17,7 @@ >>>>>>> @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW >>>>>>> @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA >>>>>>> @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW >>>>>>> -@ stub SetEnvironmentStringsW >>>>>>> +@ stdcall SetEnvironmentStringsW(ptr) kernel32.SetEnvironmentStringsW >>>>>>> @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA >>>>>>> @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW >>>>>>> @ stdcall SetStdHandle(long long) kernel32.SetStdHandle >>>>>>> diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec >>>>>>> index be48ef1694..2b74a4182e 100644 >>>>>>> --- a/dlls/kernel32/kernel32.spec >>>>>>> +++ b/dlls/kernel32/kernel32.spec >>>>>>> @@ -1387,7 +1387,7 @@ >>>>>>> # @ stub SetDynamicTimeZoneInformation >>>>>>> @ stdcall -import SetEndOfFile(long) >>>>>>> # @ stub SetEnvironmentStringsA >>>>>>> -# @ stub SetEnvironmentStringsW >>>>>>> +@ stdcall -import SetEnvironmentStringsW (ptr) >>>>>>> @ stdcall -import SetEnvironmentVariableA(str str) >>>>>>> @ stdcall -import SetEnvironmentVariableW(wstr wstr) >>>>>>> @ stdcall -import SetErrorMode(long) >>>>>>> diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c >>>>>>> index 44a6a0cff0..53b2803e77 100644 >>>>>>> --- a/dlls/kernel32/tests/environ.c >>>>>>> +++ b/dlls/kernel32/tests/environ.c >>>>>>> @@ -579,6 +579,66 @@ static void test_GetEnvironmentStringsW(void) >>>>>>> FreeEnvironmentStringsW(env2); >>>>>>> } >>>>>>> >>>>>>> +static void test_SetEnvironmentStringsW(void) >>>>>>> +{ >>>>>>> + DWORD buf_len; >>>>>>> + BOOL ret; >>>>>>> + DWORD ret_size; >>>>>>> + >>>>>>> + static WCHAR buf[256]; >>>>>>> + >>>>>>> + static WCHAR name[] = {'N','a','m','e',0}; >>>>>>> + static WCHAR value[] = {'V','a','l','u','e',0}; >>>>>>> + static WCHAR env[] = {'N','a','m','e','=','V','a','l','u','e',0}; >>>>>>> + >>>>>>> + static WCHAR eman[] = {'e','m','a','N',0}; >>>>>>> + static WCHAR eulav[] = {'e','u','l','a','V',0}; >>>>>>> + static WCHAR vne[] = {'e','m','a','N','=','e','u','l','a','V',0}; >>>>>>> + >>>>>>> + static WCHAR var[] = {'V','a','r',0}; >>>>>>> + static WCHAR val[] = {'V','a','l',0}; >>>>>>> + static WCHAR rav[] = {'r','a','V',0}; >>>>>>> + static WCHAR lav[] = {'l','a','V',0}; >>>>>>> + static WCHAR mul[] = {'V','a','r','=','V','a','l',' ','r','a','V','=','l','a','V',0}; >>>>>>> + >>>>>>> + static WCHAR empty[] = {'V','a','r','=',0}; >>>>>> >>>>>> You can use wide character string literals in tests (which should also >>>>>> allow you to get rid of some of these declarations). >>>>>> >>>>> >>>>> Didn't change this, b/c I was trying to keep the same style as already >>>>> there and described on the website >>>>> (https://wiki.winehq.org/Developer_Hints#Using_only_C89-compliant_code). >>>> >>>> The wiki is out of date on this particular topic. Someone™ should >>>> probably update it. >>>> >>>>> >>>>>> I suspect that you also want either local variables or (when applicable) >>>>>> "static const". There's no point declaring non-constant variables as static. >>>>>> >>>>> >>>>> Agreed, but kept as is to be consistent; and my test code is now not >>>>> changing the input anymore. >>>> >>>> To be consistent with what? There may be existing code that uses bad >>>> style, but that's not really a good reason to emulate it. >>>> >>> >>> consistent style is less prone to errors. but further, I prefer the >>> array initialization b/c of the visible double-0 termination of the >>> strings. >>> and yes, the static was a remnant of a previous static const, and got removed. >>> >>>>> >>>>>>> + >>>>>>> + buf_len = sizeof(buf) / 2; >>>>>> >>>>>> I personally think using an extra variable is redundant here. I also >>>>>> think "ARRAY_SIZE(buf)" would be more expressive. >>>>>> >>>>> >>>>> Changed to ARRAY_SIZE(buf) >>>>> >>>>>>> + >>>>>>> + ret = SetEnvironmentStringsW(env); >>>>>>> + ok( ret, "Setting environment strings failed\n" ); >>>>>>> + >>>>>>> + ret_size = GetEnvironmentVariableW(name, buf, buf_len); >>>>>>> + ok( ((0 != ret_size) && (0 == wcscmp(buf, value))), >>>>>>> + "Environment String settings resulted in different value\n"); >>>>>> >>>>>> With all of these tests I think it would be helpful to print the actual >>>>>> value of "ret_size" and contents of "buf" in the case the test fails. I >>>>>> would also recommend testing "ret_size" against the exact expected >>>>>> length, and perhaps splitting the two tests into two separate ok() calls. >>>>>> >>>>> >>>>> Made the checks more specific, and included more info in the output >>>>> >>>>>>> + >>>>>>> + ret = SetEnvironmentStringsW(vne); >>>>>>> + ok( ret, "Setting environment strings failed\n" ); >>>>>>> + >>>>>>> + ret_size = GetEnvironmentVariableW(eman, buf, buf_len); >>>>>>> + ok( ((0 != ret_size) && (0 == wcscmp(buf, eulav))), >>>>>>> + "Environment String settings resulted in different value\n"); >>>>>>> + >>>>>>> + ret = SetEnvironmentStringsW(mul); >>>>>>> + ok( ret, "Setting environment strings failed\n" ); >>>>>>> + >>>>>>> + ret_size = GetEnvironmentVariableW(var, buf, buf_len); >>>>>>> + ok( ((0 != ret_size) && (0 == wcscmp(buf, val))), >>>>>>> + "Environment String settings resulted in different value\n"); >>>>>>> + >>>>>>> + ret_size = GetEnvironmentVariableW(rav, buf, buf_len); >>>>>>> + ok( ((0 != ret_size) && (0 == wcscmp(buf, lav))), >>>>>>> + "Environment String settings resulted in different value\n"); >>>>>>> + >>>>>>> + ret = SetEnvironmentStringsW(empty); >>>>>>> + ok( ret, "Setting environment strings failed\n" ); >>>>>>> + >>>>>>> + ret_size = GetEnvironmentVariableW(var, buf, buf_len); >>>>>>> + ok( (0 == ret_size), >>>>>>> + "Environment String settings resulted in different value\n"); >>>>>>> + >>>>>>> +} >>>>>>> + >>>>>>> START_TEST(environ) >>>>>>> { >>>>>>> init_functionpointers(); >>>>>>> @@ -591,4 +651,5 @@ START_TEST(environ) >>>>>>> test_GetComputerNameExA(); >>>>>>> test_GetComputerNameExW(); >>>>>>> test_GetEnvironmentStringsW(); >>>>>>> + test_SetEnvironmentStringsW(); >>>>>>> } >>>>>>> diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec >>>>>>> index f36d4d525c..a5e30b938f 100644 >>>>>>> --- a/dlls/kernelbase/kernelbase.spec >>>>>>> +++ b/dlls/kernelbase/kernelbase.spec >>>>>>> @@ -1422,7 +1422,7 @@ >>>>>>> @ stdcall SetDefaultDllDirectories(long) >>>>>>> # @ stub SetDynamicTimeZoneInformation >>>>>>> @ stdcall SetEndOfFile(long) >>>>>>> -@ stub SetEnvironmentStringsW >>>>>>> +@ stdcall SetEnvironmentStringsW(ptr) >>>>>>> @ stdcall SetEnvironmentVariableA(str str) >>>>>>> @ stdcall SetEnvironmentVariableW(wstr wstr) >>>>>>> @ stdcall SetErrorMode(long) >>>>>>> diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c >>>>>>> index a07dddb1fc..97b59b9548 100644 >>>>>>> --- a/dlls/kernelbase/process.c >>>>>>> +++ b/dlls/kernelbase/process.c >>>>>>> @@ -1345,6 +1345,35 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentVariableW( LPCWSTR name, LPCWSTR val >>>>>>> } >>>>>>> >>>>>>> >>>>>>> +/*********************************************************************** >>>>>>> + * SetEnvironmentStringsW (kernelbase.@) >>>>>>> + */ >>>>>>> +BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentStringsW( LPWCH NewEnvironment ) >>>>>> >>>>>> "WCHAR *" would probably be preferred. >>>>>> >>>>> >>>>> Any particular reason for this? That's exactly what LPWCH is defined as. >>>> >>>> Broadly, use of pointer typedefs tends to be dispreferred in new code. I >>>> also suspect that "env" would be nicer than "NewEnvironment". >>>> >>> >>> OK, fine by me. >>> >>> >>>>>>> +{ >>>>>>> + >>>>>> >>>>>> Stray newline. >>>>>> >>>>> >>>>> Done. >>>>> >>>>>>> + BOOL rc = FALSE; >>>>>>> + WCHAR *var, *val; >>>>>>> + const WCHAR delim[] = {' ','=','\n',0}; >>>>>>> + >>>>>>> + TRACE( "(%s)\n", debugstr_w(NewEnvironment)); >>>>>>> + >>>>>>> + if (NULL == NewEnvironment) >>>>>>> + return rc; >>>>>> >>>>>> This probably deserves a test. >>>>>> >>>>> >>>>> I tried including a simple test by just calling >>>>> SetEnvironmentStrings(NULL) and that lead to an unhandled exception on >>>>> my windows machine (cross-compiled from 64 bit Linux to 64 bit Windows >>>>> using mingw). No clue how and why, but would welcome any suggestions >>>>> on why this simple thing might fail. >>>> >>>> It's possible that Windows doesn't check the pointer against NULL >>>> either, and in that case there's not much point in doing it in Wine. >>>> >>> >>> You're right, but this is such an elementary check that I would not remove it. >>> >>>>> >>>>>>> + >>>>>>> + var = wcstok(NewEnvironment, delim); >>>>>>> + val = wcstok(NULL, delim); >>>>>> >>>>>> This isn't thread-safe. [It's not stated anywhere that >>>>>> SetEnvironmentStrings() itself is thread-safe, but it costs little to >>>>>> assume it is, and moreover this will race with anything else that calls >>>>>> wcstok().] >>>>> >>>>> True, however I had trouble using the reentrant wcstok_s on my system >>>>> (i.e., 'twas unavailable :). Is there an alternative, specific >>>>> include? (I tride the expected #include <wchar.h> but that didn't >>>>> work). >>>> >>>> It should probably be added to the headers. I think it goes in string.h >>>> and wchar.h, but Jacek might correct me on this. >>>> >>> >>> Switched to wcschr which is available and working. >>> Was trying to include wcstok_s from msvcrt, but without success. What >>> would be the proper way to go about this? >> >> I think that Jacek added it in the interim ;-) > > Interesting, wcstok_s is available in the headers, however linking for > the kernelbase.dll.so with undefined reference. Not sure though which > additional library should be included!? Er, yes, I forgot this was kernelbase. Indeed you can't use wcstok_s in that case, since ntdll doesn't export it. > >> >> That said, you probably shouldn't use it, if tests show that >> SetEnvironmentStrings() doesn't modify the argument. (If it does, I >> guess that gives you free license.) >> >>> >>>>> >>>>>> >>>>>>> + >>>>>>> + while (var != NULL) { >>>>>>> + if (FALSE == (rc = SetEnvironmentVariableW(var, val))) >>>>>>> + break; >>>>>>> + var = wcstok(NULL, delim); >>>>>>> + val = wcstok(NULL, delim); >>>>>>> + } >>>>>>> + >>>>>>> + return rc; >>>>>>> +} >>>>>> >>>>>> Broadly, this seems surprising; is this really how the function is >>>>>> supposed to work? >>>>>> >>>>>> I think your patch could use more interesting tests. For example: >>>>>> >>>>>> * Immediately I'd expect GetEnvironmentStrings() to return the exact >>>>>> same pointer that SetEnvironmentStrings() set. Is this in fact the case? >>>>>> If so, how do A and W variants (of both Get/Set) interact? >>>>>> >>>>> >>>>> Confusing. GetEnvironmentStringsW doesn't return a pointer. Haven't >>>>> seen any info on the GetEnvironmentStringsA variant. >>>> >>>> Er, what? GetEnvironmentStringsA() and GetEnvironmentStringsW() return >>>> pointers to char and WCHAR respectively. >>>> >>> >>> Sorry, misread. However, GetEnvironmentStringsW returns a pointer to a >>> new copy of the environment strings with each call. Probably from the >>> same source that gets modified by SetEnvironmentStringsW. >>> Not really checkable from the outside, I gather. >> >> Okay, so part of that comment was based on the mistaken impression that >> GetEnvironmentStrings() returned a pointer to a constant string instead >> of allocating a new set every time. Apologies for the confusion that may >> have caused. >> >>> >>>>> >>>>>> * Are values not present in the call to SetEnvironmentStrings() deleted >>>>>> from the environment? >>>>> >>>>> doc doesn't specify anything about this. I'd expect no. >>>> >>>> The documentation is often less specific than desired, and also often >>>> incorrect; that's why we write tests, and code our implementations >>>> against them. It's not obvious whether SetEnvironmentStrings() means >>>> "add these several strings to the environment" or "replace the entire >>>> environment with these strings", hence the question. >>>> >>> >>> Yes, on a Windows machine a fresh environment is set up and all the >>> previous variables are discarded. In the wine patch now as well. >> >> One thing you'll need to take into consideration, then, is that there >> are several environment variables Wine needs to function correctly. In >> practice I think this means pretty much anything prefixed with WINE, >> though you may want to maintain a manual list. >> >> Are there any others I'm not thinking of? >> >> (Host libraries would presumably need them—and if I'm using e.g. >> GST_DEBUG I'd prefer not to have to jump through hoops to make that >> work, although if SetEnvironmentStrings() is uncommon I can't complain >> too much, and really all I'd need to do is hack >> RtlSetCurrentEnvironment() to set that variable afterward. On the one >> hand, host libraries would use getenv() anyway, but on the other hand, >> if we move to PE files for some of them, this becomes a potential >> problem again. All in all, I'm not sure this is a salient enough concern >> to warrant doing anything about it...) >> > > If you're using getenv, you're getting (as you say) variables from the > host. Those vars are not touched by this function and ought to not get > reset. Or is wine copying the host env into its own internal > Windows-like representation (WinRep)? > Are those WINE-prefixed environment variables within the host or the WinRep? The host environment gets copied into the Win32 environment (with some modifications; see is_special_env_var() in dlls/ntdll/env.c). Wine also adds some variables to the Win32 environment not present in the host environment; see set_additional_environment() and set_wow64_environment(). In particular I'm concerned about environment variables such as WINEDLLDIR, WINECONFIGDIR, i.e. those set by set_wine_path_variable(); certain components (e.g. mscoree, setupapi) need those to be set to function. It's also maybe worth a test to see if even non-Wine-specific variables set by ntdll (e.g. ProgramFilesDir) get stripped from the environment. > >>> >>>>> >>>>>> >>>>>> * The PSDK header suggests that SetEnvironmentStrings() should receive a >>>>>> doubly null-terminated argument. I'd advise testing with an environment >>>>>> containing a null separator (e.g. L"one=two\0three=four\0".) >>>>>> >>>>> >>>>> Done. >>>>> >>>>>> * You treat '\n' as a separator, but have no tests for it. Also, if both >>>>>> space and newline are a separator, what about other whitespace >>>>>> characters (tab, carriage return)? >>>>> >>>>> I have reduced the number of possible separators to just include '=' >>>>> and conform with the doubly-null terminated string expectation. This >>>>> also conforms with the few examples I've found. >>>>> >>>>>> >>>>>> * What about strings that violate the assumptions this implementation >>>>>> makes? For example, "one=", "one", "=two", "one=two=three", "one=two >>>>>> three=four"... >>>>>> >>>>> >>>>> Included a few more tests. >>> >>> Just to note, "one=two=three" is valid and will assign 'two=three' to >>> the variable 'one' (on windows). >>> one= is also not illegal, AFAICT. >>> >>>>> >>>>>> * Is this function really supposed to modify its argument? (Yes, it's >>>>>> not declared constant, but that doesn't always mean that it will.) >>>>>> >>>>> >>>>> Done, included a buffer that's modified instead. >>>>> >>>>> >>>>>>> + >>>>>>> + >>>>>>> /*********************************************************************** >>>>>>> * Process/thread attribute lists >>>>>>> ***********************************************************************/ >>>>>>> diff --git a/include/winbase.h b/include/winbase.h >>>>>>> index 655eb48f0f..0c1aa19b42 100644 >>>>>>> --- a/include/winbase.h >>>>>>> +++ b/include/winbase.h >>>>>>> @@ -2621,6 +2621,7 @@ WINBASEAPI BOOL WINAPI SetEndOfFile(HANDLE); >>>>>>> WINBASEAPI BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR); >>>>>>> WINBASEAPI BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR); >>>>>>> #define SetEnvironmentVariable WINELIB_NAME_AW(SetEnvironmentVariable) >>>>>>> +WINBASEAPI BOOL WINAPI SetEnvironmentStringsW(LPWCH); >>>>>>> WINBASEAPI UINT WINAPI SetErrorMode(UINT); >>>>>>> WINBASEAPI BOOL WINAPI SetEvent(HANDLE); >>>>>>> WINBASEAPI VOID WINAPI SetFileApisToANSI(void); >>>>>>> >>>>>> >>>>> >>>> >>>> >>> >>

2 1

[PATCH] mfplat: Add I420 format support for frame size helpers.
by Nikolay Sivov 06 May '20

06 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 26 +++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 620e144d34..f92577a9cb 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1791,6 +1791,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_RGB8, 1, 3, 1, 0 }, { &MFVideoFormat_L8, 1, 3, 1, 0 }, { &MFVideoFormat_AYUV, 4, 3, 0, 1 }, + { &MFVideoFormat_I420, 1, 0, 0, 1 }, { &MFVideoFormat_IMC1, 2, 3, 0, 1 }, { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, @@ -1876,6 +1877,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('I','M','C','4'): case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -1917,6 +1919,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('I','M','C','4'): case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4bc0813624..8a52279a08 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3553,41 +3553,56 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_NV12, 1, 2, 6, 3 }, { &MFVideoFormat_NV12, 2, 2, 6, 6 }, { &MFVideoFormat_NV12, 3, 2, 12, 9 }, - { &MFVideoFormat_NV12, 4, 2, 12, 12 }, + { &MFVideoFormat_NV12, 4, 2, 12 }, + { &MFVideoFormat_NV12, 320, 240, 115200 }, { &MFVideoFormat_AYUV, 1, 1, 4 }, { &MFVideoFormat_AYUV, 2, 1, 8 }, { &MFVideoFormat_AYUV, 1, 2, 8 }, { &MFVideoFormat_AYUV, 4, 3, 48 }, + { &MFVideoFormat_AYUV, 320, 240, 307200 }, { &MFVideoFormat_IMC1, 1, 1, 4 }, { &MFVideoFormat_IMC1, 2, 1, 4 }, { &MFVideoFormat_IMC1, 1, 2, 8 }, { &MFVideoFormat_IMC1, 4, 3, 24 }, + { &MFVideoFormat_IMC1, 320, 240, 153600 }, { &MFVideoFormat_IMC3, 1, 1, 4 }, { &MFVideoFormat_IMC3, 2, 1, 4 }, { &MFVideoFormat_IMC3, 1, 2, 8 }, { &MFVideoFormat_IMC3, 4, 3, 24 }, + { &MFVideoFormat_IMC3, 320, 240, 153600 }, { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC2, 4, 2, 12, 12 }, + { &MFVideoFormat_IMC2, 4, 2, 12 }, + { &MFVideoFormat_IMC2, 320, 240, 115200 }, { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC4, 4, 2, 12, 12 }, + { &MFVideoFormat_IMC4, 4, 2, 12 }, + { &MFVideoFormat_IMC4, 320, 240, 115200 }, { &MFVideoFormat_YV12, 1, 1, 3, 1 }, { &MFVideoFormat_YV12, 2, 1, 3 }, { &MFVideoFormat_YV12, 1, 2, 6, 3 }, { &MFVideoFormat_YV12, 4, 3, 18 }, + { &MFVideoFormat_YV12, 320, 240, 115200 }, + + { &MFVideoFormat_I420, 1, 1, 3, 1 }, + { &MFVideoFormat_I420, 2, 1, 3 }, + { &MFVideoFormat_I420, 1, 2, 6, 3 }, + { &MFVideoFormat_I420, 4, 3, 18 }, + { &MFVideoFormat_I420, 320, 240, 115200 }, { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, + { &MFVideoFormat_YUY2, 320, 240, 153600 }, { &MFVideoFormat_UYVY, 2, 1, 4 }, { &MFVideoFormat_UYVY, 4, 3, 24 }, { &MFVideoFormat_UYVY, 128, 128, 32768 }, + { &MFVideoFormat_UYVY, 320, 240, 153600 }, }; unsigned int i; UINT32 size; @@ -4716,6 +4731,11 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_YV12, 1, 1 }, { &MFVideoFormat_YV12, 2, 2 }, { &MFVideoFormat_YV12, 3, 3 }, + { &MFVideoFormat_YV12, 320, 320 }, + { &MFVideoFormat_I420, 1, 1 }, + { &MFVideoFormat_I420, 2, 2 }, + { &MFVideoFormat_I420, 3, 3 }, + { &MFVideoFormat_I420, 320, 320 }, }; unsigned int i; LONG stride; -- 2.26.2

1 0

[PATCH 1/3] include: Add additional DISPLAYCONFIG defines.
by Brendan Shanks 06 May '20

06 May '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- include/wingdi.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index de028f5212..d989fb6f71 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3637,10 +3637,30 @@ typedef struct DISPLAYCONFIG_SDR_WHITE_LEVEL { ULONG SDRWhiteLevel; } DISPLAYCONFIG_SDR_WHITE_LEVEL; +#define DISPLAYCONFIG_PATH_MODE_IDX_INVALID 0xffffffff +#define DISPLAYCONFIG_PATH_TARGET_MODE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_DESKTOP_IMAGE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_CLONE_GROUP_INVALID 0xffff + +#define DISPLAYCONFIG_SOURCE_IN_USE 0x00000001 + +#define DISPLAYCONFIG_TARGET_IN_USE 0x00000001 +#define DISPLAYCONFIG_TARGET_FORCIBLE 0x00000002 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_BOOT 0x00000004 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_PATH 0x00000008 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_SYSTEM 0x00000010 +#define DISPLAYCONFIG_TARGET_IS_HMD 0x00000020 + +#define DISPLAYCONFIG_PATH_ACTIVE 0x00000001 +#define DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE 0x00000008 + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002 #define QDC_DATABASE_CURRENT 0x00000004 +#define QDC_VIRTUAL_MODE_AWARE 0x00000010 +#define QDC_INCLUDE_HMD 0x00000020 #define GDI_ERROR (~0u) #define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0) -- 2.26.2

1 2

[PATCH v2 1/4] ntdll/tests: Add tests for RtlSetCurrentEnvironment().
by Zebediah Figura 06 May '20

06 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/env.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e2..98a9f7bb569 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -515,6 +515,72 @@ static void test_process_params(void) } } +static NTSTATUS set_env_var(WCHAR **env, const WCHAR *var, const WCHAR *value) +{ + UNICODE_STRING var_string, value_string; + RtlInitUnicodeString(&var_string, var); + RtlInitUnicodeString(&value_string, value); + return RtlSetEnvironmentVariable(env, &var_string, &value_string); +} + +static void check_env_var_(int line, const char *var, const char *value) +{ + char buffer[20]; + DWORD size = GetEnvironmentVariableA(var, buffer, sizeof(buffer)); + if (value) + { + ok_(__FILE__, line)(size == strlen(value), "wrong size %u\n", size); + ok_(__FILE__, line)(!strcmp(buffer, value), "wrong value %s\n", debugstr_a(buffer)); + } + else + { + ok_(__FILE__, line)(!size, "wrong size %u\n", size); + ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %u\n", GetLastError()); + } +} +#define check_env_var(a, b) check_env_var_(__LINE__, a, b) + +static void test_RtlSetCurrentEnvironment(void) +{ + NTSTATUS status; + WCHAR *old_env, *env, *prev; + BOOL ret; + + status = RtlCreateEnvironment(FALSE, &env); + ok(!status, "got %#x\n", status); + + ret = SetEnvironmentVariableA("testenv1", "heis"); + ok(ret, "got error %u\n", GetLastError()); + ret = SetEnvironmentVariableA("testenv2", "dyo"); + ok(ret, "got error %u\n", GetLastError()); + + status = set_env_var(&env, L"testenv1", L"unus"); + ok(!status, "got %#x\n", status); + status = set_env_var(&env, L"testenv3", L"tres"); + ok(!status, "got %#x\n", status); + + old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + + RtlSetCurrentEnvironment(env, &prev); + ok(prev == old_env, "got wrong previous env %p\n", prev); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n"); + + check_env_var("testenv1", "unus"); + check_env_var("testenv2", NULL); + check_env_var("testenv3", "tres"); + check_env_var("PATH", NULL); + + RtlSetCurrentEnvironment(old_env, NULL); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == old_env, "got wrong current env\n"); + + check_env_var("testenv1", "heis"); + check_env_var("testenv2", "dyo"); + check_env_var("testenv3", NULL); + + SetEnvironmentVariableA("testenv1", NULL); + SetEnvironmentVariableA("testenv2", NULL); +} + START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -535,4 +601,5 @@ START_TEST(env) testSet(); testExpand(); test_process_params(); + test_RtlSetCurrentEnvironment(); } -- 2.26.2

2 4

[RFC PATCH 00/11] Thread-local heap implementation.
by Rémi Bernon 06 May '20

06 May '20

Hi all! This is a heap implementation based on thread-local structures, that I have been keeping locally for quite some time. The goal was to improve Wine's heap performance in multithreaded scenarios and see if it could help performance in some games. The good news is that this implementation is performing well, according to third-party heap micro benchmarks. The bad news is that it doesn't change performance much in general, as allocations are usually scarse during gameplay. I could still see improvements for loading times, and less stalling as well. As I've been tweaking it lately and now that it passes the heap tests I believe it could still be somehow useful for others, or interesting for anyone eager to try. It could also possibly be used for comparison, to determine if the heap is the bottleneck for some use case. The implementation details are in patch #9 for anyone interested. The thread-local heaps are enabled by HeapSetInformation calls, when the call requests LFH heap, but I also added a WINELFH environment variable to guard it so that it can also be disabled globally. There are multiple issues that I am aware of, but for the applications that I tried they didn't seem to cause much trouble: * Block headers are different from the default ones, but then FWIW the default block headers don't seem to match with recent Windows either, which also vary depending on the Windows version. * HeapWalk will not show the blocks allocated from the thread-local heaps. It could be possible to also walk the current thread-local heap but then because of implementation detail, some blocks would stlil not show up (fully used arenas are detached from their heap until a block is freed). * HeapDestroy doesn't automatically free the blocks that were allocated from the thread-local heaps and they can possibly be lost forever for the same reason as above. Although it could be possible to keep track of fully used arenas, the same thread-local heaps are shared between heaps, so there's currently no way to tell which block should be freed on destroy. * The freed blocks are deferred to the thread that allocated them, but in general they are quickly reused. There's some validation being done but it could still cause some issues in case of use after free. It should be easily fixed by adding a buffer, but as I didn't see any game needing it, didn't seem to worth the trouble for now. Cheers, Rémi Bernon (11): kernel32: Catch page faults in GlobalSize. kernel32/tests: Add HeapSetInformation and LFH tests. ntdll: Split standard heap functions. ntdll: Add thread destroy notification function. ntdll: Add extended heap type and LFH stubs. ntdll: Implement RtlSetHeapInformation for LFH. ntdll: Move undocumented flags to ntdll_misc.h. HACK: ntdll: Conditionally enable LFH. ntdll: Implement Low Fragmentation Heap. ntdll: Enable LFH for process heap. msvcrt: Enable LFH for internal heaps. dlls/kernel32/heap.c | 78 +-- dlls/kernel32/tests/heap.c | 66 +++ dlls/msvcrt/heap.c | 4 + dlls/ntdll/Makefile.in | 1 + dlls/ntdll/heap.c | 220 ++++++-- dlls/ntdll/heap_lfh.c | 1057 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 3 + dlls/ntdll/ntdll_misc.h | 28 + dlls/ntdll/thread.c | 1 + 9 files changed, 1379 insertions(+), 79 deletions(-) create mode 100644 dlls/ntdll/heap_lfh.c -- 2.26.1

3 20

[PATCH 2/2] winegcc: Use --safeseh winebuild option on msvc target.
by Jacek Caban 06 May '20

06 May '20

lld-link requires all x86 object files to be SEH compatible unless it's explicitly disabled. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 1/2] winebuild: Introduce --safeseh option that allows marking assembly files as SEH compatible.
by Jacek Caban 06 May '20

06 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 +++++++ tools/winebuild/utils.c | 6 ++++++ tools/winebuild/winebuild.man.in | 3 +++ 4 files changed, 17 insertions(+)

1 0

[PATCH] mf: Fix timer instance leak on error path in SetTimer().
by Nikolay Sivov 06 May '20

06 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d6b881218b..25832afdbb 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4093,15 +4093,19 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, hr = MF_S_CLOCK_STOPPED; if (SUCCEEDED(hr)) + { list_add_tail(&clock->timers, &clock_timer->entry); + if (cancel_key) + { + *cancel_key = &clock_timer->IUnknown_iface; + IUnknown_AddRef(*cancel_key); + } + } LeaveCriticalSection(&clock->cs); - if (SUCCEEDED(hr) && cancel_key) - { - *cancel_key = &clock_timer->IUnknown_iface; - IUnknown_AddRef(*cancel_key); - } + if (FAILED(hr)) + IUnknown_Release(&clock_timer->IUnknown_iface); return hr; } -- 2.26.2

1 0

[PATCH 1/2] dwrite: Update DWRITE_SHAPING_TEXT_PROPERTIES definition.
by Nikolay Sivov 06 May '20

06 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 7 +++---- include/dwrite.idl | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c2fd5c54d3..2cbac7700c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1178,6 +1178,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, method = get_number_substitutes(substitution, digits); + /* FIXME: have the shaping engine set this */ + memset(text_props, 0, length * sizeof(*text_props)); + for (i = 0; i < length; i++) { /* FIXME: set to better values */ glyph_props[i].justification = text[i] == ' ' ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; @@ -1186,10 +1189,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, glyph_props[i].isZeroWidthSpace = 0; glyph_props[i].reserved = 0; - /* FIXME: have the shaping engine set this */ - text_props[i].isShapedAlone = 0; - text_props[i].reserved = 0; - clustermap[i] = i; string[i] = text[i]; diff --git a/include/dwrite.idl b/include/dwrite.idl index b92b1544e0..a8c523edda 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -546,7 +546,9 @@ typedef struct DWRITE_TYPOGRAPHIC_FEATURES typedef struct DWRITE_SHAPING_TEXT_PROPERTIES { UINT16 isShapedAlone : 1; - UINT16 reserved : 15; + UINT16 reserved1 : 1; + UINT16 canBreakShapingAfter : 1; + UINT16 reserved : 13; } DWRITE_SHAPING_TEXT_PROPERTIES; typedef struct DWRITE_SHAPING_GLYPH_PROPERTIES -- 2.26.2

1 1

[PATCH] msi: Return void from init_automation_object.
by Hans Leidekker 06 May '20

06 May '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/automation.c | 72 +++++++++---------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ba3a068a74..87c7815094 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -543,18 +543,15 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = ProvideMultipleClassInfo_GetInfoOfIndex }; -static HRESULT init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, tid_t tid) +static void init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, tid_t tid) { TRACE("(%p, %d, %s)\n", This, msiHandle, debugstr_guid(get_riid_from_tid(tid))); This->IDispatch_iface.lpVtbl = &AutomationObjectVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; This->ref = 1; - This->msiHandle = msiHandle; This->tid = tid; - - return S_OK; } /* @@ -1002,21 +999,15 @@ static HRESULT record_invoke( static HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) { AutomationObject *record; - HRESULT hr; record = msi_alloc(sizeof(*record)); if (!record) return E_OUTOFMEMORY; - hr = init_automation_object(record, msiHandle, Record_tid); - if (hr != S_OK) - { - msi_free(record); - return hr; - } + init_automation_object(record, msiHandle, Record_tid); *disp = &record->IDispatch_iface; - return hr; + return S_OK; } static HRESULT list_invoke( @@ -1123,12 +1114,7 @@ static HRESULT create_list(const WCHAR *product, IDispatch **dispatch) list = msi_alloc_zero(sizeof(ListObject)); if (!list) return E_OUTOFMEMORY; - hr = init_automation_object(&list->autoobj, 0, StringList_tid); - if (hr != S_OK) - { - msi_free(list); - return hr; - } + init_automation_object(&list->autoobj, 0, StringList_tid); *dispatch = &list->autoobj.IDispatch_iface; @@ -2442,7 +2428,6 @@ static HRESULT installer_invoke( HRESULT create_msiserver(IUnknown *outer, void **ppObj) { AutomationObject *installer; - HRESULT hr; TRACE("(%p %p)\n", outer, ppObj); @@ -2452,99 +2437,70 @@ HRESULT create_msiserver(IUnknown *outer, void **ppObj) installer = msi_alloc(sizeof(AutomationObject)); if (!installer) return E_OUTOFMEMORY; - hr = init_automation_object(installer, 0, Installer_tid); - if (hr != S_OK) - { - msi_free(installer); - return hr; - } + init_automation_object(installer, 0, Installer_tid); *ppObj = &installer->IDispatch_iface; - return hr; + return S_OK; } HRESULT create_session(MSIHANDLE msiHandle, IDispatch *installer, IDispatch **disp) { SessionObject *session; - HRESULT hr; session = msi_alloc(sizeof(SessionObject)); if (!session) return E_OUTOFMEMORY; - hr = init_automation_object(&session->autoobj, msiHandle, Session_tid); - if (hr != S_OK) - { - msi_free(session); - return hr; - } + init_automation_object(&session->autoobj, msiHandle, Session_tid); session->installer = installer; *disp = &session->autoobj.IDispatch_iface; - return hr; + return S_OK; } static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch) { AutomationObject *database; - HRESULT hr; TRACE("(%d %p)\n", msiHandle, dispatch); database = msi_alloc(sizeof(AutomationObject)); if (!database) return E_OUTOFMEMORY; - hr = init_automation_object(database, msiHandle, Database_tid); - if (hr != S_OK) - { - msi_free(database); - return hr; - } + init_automation_object(database, msiHandle, Database_tid); *dispatch = &database->IDispatch_iface; - return hr; + return S_OK; } static HRESULT create_view(MSIHANDLE msiHandle, IDispatch **dispatch) { AutomationObject *view; - HRESULT hr; TRACE("(%d %p)\n", msiHandle, dispatch); view = msi_alloc(sizeof(AutomationObject)); if (!view) return E_OUTOFMEMORY; - hr = init_automation_object(view, msiHandle, View_tid); - if (hr != S_OK) - { - msi_free(view); - return hr; - } + init_automation_object(view, msiHandle, View_tid); *dispatch = &view->IDispatch_iface; - return hr; + return S_OK; } static HRESULT create_summaryinfo(MSIHANDLE msiHandle, IDispatch **disp) { AutomationObject *info; - HRESULT hr; info = msi_alloc(sizeof(*info)); if (!info) return E_OUTOFMEMORY; - hr = init_automation_object(info, msiHandle, SummaryInfo_tid); - if (hr != S_OK) - { - msi_free(info); - return hr; - } + init_automation_object(info, msiHandle, SummaryInfo_tid); *disp = &info->IDispatch_iface; - return hr; + return S_OK; } -- 2.20.1

1 0

[PATCH 2/4] user32/tests: Test button styles.
by Zhiyi Zhang 06 May '20

06 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 93ab7b4a27d..f84525a0bf9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -31,6 +31,7 @@ #include "winuser.h" #include "winnls.h" #include "dbt.h" +#include "commctrl.h" #include "wine/test.h" @@ -17881,6 +17882,37 @@ static void test_invalid_window(void) ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError()); } +static void test_button_style(void) +{ + DWORD type, expected_type; + HWND button; + LRESULT ret; + DWORD i, j; + + for (i = BS_PUSHBUTTON; i <= BS_DEFCOMMANDLINK; ++i) + { + button = CreateWindowA(WC_BUTTONA, "test", i, 0, 0, 50, 50, NULL, 0, 0, NULL); + ok(button != NULL, "Expected button not null.\n"); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + expected_type = (i == BS_USERBUTTON ? BS_PUSHBUTTON : i); + ok(type == expected_type, "Expected type %#x, got %#x.\n", expected_type, type); + + for (j = BS_PUSHBUTTON; j <= BS_DEFCOMMANDLINK; ++j) + { + ret = SendMessageA(button, BM_SETSTYLE, j, FALSE); + ok(ret == 0, "Expected %#x, got %#lx.\n", 0, ret); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + expected_type = j; + + ok(type == expected_type, "Original type %#x, expected new type %#x, got %#x.\n", i, + expected_type, type); + } + DestroyWindow(button); + } +} + START_TEST(msg) { char **test_argv; @@ -17964,6 +17996,7 @@ START_TEST(msg) test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image(); + test_button_style(); test_autoradio_BM_CLICK(); test_autoradio_kbd_move(); test_static_messages(); -- 2.25.1

2 1

[PATCH 4/4] comctl32/button: Do not set BS_PUSHBUTTON and BS_DEFPUSHBUTTON style directly to Split Buttons and Command Links.
by Zhiyi Zhang 06 May '20

06 May '20

For Split Buttons and Command Links of common control version 6, setting BS_PUSHBUTTON and BS_DEFPUSHBUTTON style toggles their default bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47621 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 12 +++++++++--- dlls/comctl32/tests/button.c | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b615df4a165..4f7a3052b10 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -847,8 +847,14 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; case BM_SETSTYLE: - btn_type = wParam & BS_TYPEMASK; - style = (style & ~BS_TYPEMASK) | btn_type; + { + DWORD new_btn_type; + + new_btn_type= wParam & BS_TYPEMASK; + if (btn_type >= BS_SPLITBUTTON && new_btn_type <= BS_DEFPUSHBUTTON) + new_btn_type = (btn_type & ~BS_DEFPUSHBUTTON) | new_btn_type; + + style = (style & ~BS_TYPEMASK) | new_btn_type; SetWindowLongW( hWnd, GWL_STYLE, style ); /* Only redraw if lParam flag is set.*/ @@ -856,7 +862,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L InvalidateRect( hWnd, NULL, TRUE ); break; - + } case BM_CLICK: SendMessageW( hWnd, WM_LBUTTONDOWN, 0, 0 ); SendMessageW( hWnd, WM_LBUTTONUP, 0, 0 ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 933db6e9825..716850073ff 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2303,7 +2303,6 @@ static void test_style(void) else expected_type = j; - todo_wine_if(i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) ok(type == expected_type || broken(type == j), /* XP */ "Original type %#x, expected new type %#x, got %#x.\n", i, expected_type, type); } -- 2.25.1

2 1

[PATCH 3/4] comctl32/tests: Test button styles.
by Zhiyi Zhang 06 May '20

06 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 14071b2ecd0..933db6e9825 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2276,6 +2276,41 @@ static void test_bcm_get_ideal_size(void) DeleteObject(hfont); } +static void test_style(void) +{ + DWORD type, expected_type; + HWND button; + LRESULT ret; + DWORD i, j; + + for (i = BS_PUSHBUTTON; i <= BS_DEFCOMMANDLINK; ++i) + { + button = CreateWindowA(WC_BUTTONA, "test", i, 0, 0, 50, 50, NULL, 0, 0, NULL); + ok(button != NULL, "Expected button not null.\n"); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + expected_type = (i == BS_USERBUTTON ? BS_PUSHBUTTON : i); + ok(type == expected_type, "Expected type %#x, got %#x.\n", expected_type, type); + + for (j = BS_PUSHBUTTON; j <= BS_DEFCOMMANDLINK; ++j) + { + ret = SendMessageA(button, BM_SETSTYLE, j, FALSE); + ok(ret == 0, "Expected %#x, got %#lx.\n", 0, ret); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + if (i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) + expected_type = (i & ~BS_DEFPUSHBUTTON) | j; + else + expected_type = j; + + todo_wine_if(i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) + ok(type == expected_type || broken(type == j), /* XP */ + "Original type %#x, expected new type %#x, got %#x.\n", i, expected_type, type); + } + DestroyWindow(button); + } +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -2298,6 +2333,7 @@ START_TEST(button) test_get_set_textmargin(); test_state(); test_bcm_get_ideal_size(); + test_style(); unload_v6_module(ctx_cookie, hCtx); } -- 2.25.1

2 1

[PATCH 1/4] user32/tests: Add a trailing '\n' to some ok() calls.
by Zhiyi Zhang 06 May '20

06 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 5a6a0bf5fb7..3f6fe6cfca1 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -652,8 +652,8 @@ static void test_WM_NEXTDLGCTL(void) * Check whether the style of the button which got the focus, changed to BS_DEFPUSHBUTTON and * the style of default button changed to BS_PUSHBUTTON. */ - ok(get_button_style(g_hwndTestDlgBut1) == BS_DEFPUSHBUTTON, "Button1's style not set to BS_DEFPUSHBUTTON"); - ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_DEFPUSHBUTTON, "Button1's style not set to BS_DEFPUSHBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON\n"); /* Move focus to Button2 using "WM_NEXTDLGCTL" */ DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); @@ -667,8 +667,8 @@ static void test_WM_NEXTDLGCTL(void) * Check whether the style of the button which got the focus, changed to BS_DEFPUSHBUTTON and * the style of button which lost the focus changed to BS_PUSHBUTTON. */ - ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); - ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON\n"); /* Move focus to Edit control using "WM_NEXTDLGCTL" */ DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); -- 2.25.1

1 0

[PATCH 4/4] kernel32/tests: Add a PE test image that resembles format of some of 8k demos.
by Dmitry Timoshkov 06 May '20

06 May '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/loader.c | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 5474d54324..4bafd0f634 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -228,7 +228,7 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, { SetLastError(0xdeadbeef); ret = WriteFile(hfile, &nt_header->OptionalHeader, - min(nt_header->FileHeader.SizeOfOptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER)), + sizeof(IMAGE_OPTIONAL_HEADER), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); if (nt_header->FileHeader.SizeOfOptionalHeader > sizeof(IMAGE_OPTIONAL_HEADER)) @@ -244,6 +244,8 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, assert(nt_header->FileHeader.NumberOfSections <= 1); if (nt_header->FileHeader.NumberOfSections) { + SetFilePointer(hfile, dos_size + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + nt_header->FileHeader.SizeOfOptionalHeader, NULL, FILE_BEGIN); + section.SizeOfRawData = 10; if (nt_header->OptionalHeader.SectionAlignment >= page_size) @@ -268,6 +270,17 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, ret = WriteFile(hfile, section_data, sizeof(section_data), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); } + + /* Minimal PE image that Windows7+ is able to load: 268 bytes */ + size = GetFileSize(hfile, NULL); + if (size < 268) + { + file_align = 268 - size; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, filler, file_align, &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + } + size = GetFileSize(hfile, NULL); CloseHandle(hfile); return size; @@ -417,7 +430,8 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE ok( image.LoaderFlags == (cor_header != NULL), "%u: LoaderFlags wrong %08x\n", id, image.LoaderFlags ); ok( image.ImageFileSize == file_size || broken(!image.ImageFileSize), /* winxpsp1 */ "%u: ImageFileSize wrong %08x / %08x\n", id, image.ImageFileSize, file_size ); - ok( image.CheckSum == nt_header->OptionalHeader.CheckSum, "%u: CheckSum wrong %08x / %08x\n", id, + ok( image.CheckSum == nt_header->OptionalHeader.CheckSum || broken(truncated), + "%u: CheckSum wrong %08x / %08x\n", id, image.CheckSum, nt_header->OptionalHeader.CheckSum ); if (nt_header->OptionalHeader.SizeOfCode || nt_header->OptionalHeader.AddressOfEntryPoint) @@ -768,6 +782,7 @@ static void test_Loader(void) /* Mandatory are all fields up to SizeOfHeaders, everything else * is really optional (at least that's true for XP). */ +#if 0 /* 32-bit Windows 8 crashes inside of LoadLibrary */ { sizeof(dos_header), 1, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, sizeof(dos_header) + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum) + sizeof(IMAGE_SECTION_HEADER) + 0x10, @@ -775,6 +790,7 @@ static void test_Loader(void) { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT, ERROR_INVALID_ADDRESS, ERROR_NOACCESS } }, +#endif { sizeof(dos_header), 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, 0xd0, /* beyond of the end of file */ @@ -843,6 +859,14 @@ static void test_Loader(void) 0x40, /* minimal image size that Windows7 accepts */ 0, { ERROR_SUCCESS } + }, + /* the following data mimics the PE image which 8k demos have */ + { 0x04, + 0, 0x08, + 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, + 0x200000, + 0x40, + { ERROR_SUCCESS } } }; int i; @@ -1077,6 +1101,18 @@ static void test_Loader(void) ok(ret, "FreeLibrary error %d\n", GetLastError()); } + SetLastError(0xdeadbeef); + ret = DeleteFileA(dll_name); + ok(ret, "DeleteFile error %d\n", GetLastError()); + + nt_header.OptionalHeader.AddressOfEntryPoint = 0x12345678; + file_size = create_test_dll( &dos_header, td[i].size_of_dos_header, &nt_header, dll_name ); + if (!file_size) + { + ok(0, "could not create %s\n", dll_name); + break; + } + query_image_section( i, dll_name, &nt_header, NULL ); } else -- 2.26.2

2 1

[PATCH 1/4] ntdll/tests: Add tests for RtlSetCurrentEnvironment().
by Zebediah Figura 06 May '20

06 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/env.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e2..98a9f7bb569 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -515,6 +515,72 @@ static void test_process_params(void) } } +static NTSTATUS set_env_var(WCHAR **env, const WCHAR *var, const WCHAR *value) +{ + UNICODE_STRING var_string, value_string; + RtlInitUnicodeString(&var_string, var); + RtlInitUnicodeString(&value_string, value); + return RtlSetEnvironmentVariable(env, &var_string, &value_string); +} + +static void check_env_var_(int line, const char *var, const char *value) +{ + char buffer[20]; + DWORD size = GetEnvironmentVariableA(var, buffer, sizeof(buffer)); + if (value) + { + ok_(__FILE__, line)(size == strlen(value), "wrong size %u\n", size); + ok_(__FILE__, line)(!strcmp(buffer, value), "wrong value %s\n", debugstr_a(buffer)); + } + else + { + ok_(__FILE__, line)(!size, "wrong size %u\n", size); + ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %u\n", GetLastError()); + } +} +#define check_env_var(a, b) check_env_var_(__LINE__, a, b) + +static void test_RtlSetCurrentEnvironment(void) +{ + NTSTATUS status; + WCHAR *old_env, *env, *prev; + BOOL ret; + + status = RtlCreateEnvironment(FALSE, &env); + ok(!status, "got %#x\n", status); + + ret = SetEnvironmentVariableA("testenv1", "heis"); + ok(ret, "got error %u\n", GetLastError()); + ret = SetEnvironmentVariableA("testenv2", "dyo"); + ok(ret, "got error %u\n", GetLastError()); + + status = set_env_var(&env, L"testenv1", L"unus"); + ok(!status, "got %#x\n", status); + status = set_env_var(&env, L"testenv3", L"tres"); + ok(!status, "got %#x\n", status); + + old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + + RtlSetCurrentEnvironment(env, &prev); + ok(prev == old_env, "got wrong previous env %p\n", prev); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n"); + + check_env_var("testenv1", "unus"); + check_env_var("testenv2", NULL); + check_env_var("testenv3", "tres"); + check_env_var("PATH", NULL); + + RtlSetCurrentEnvironment(old_env, NULL); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == old_env, "got wrong current env\n"); + + check_env_var("testenv1", "heis"); + check_env_var("testenv2", "dyo"); + check_env_var("testenv3", NULL); + + SetEnvironmentVariableA("testenv1", NULL); + SetEnvironmentVariableA("testenv2", NULL); +} + START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -535,4 +601,5 @@ START_TEST(env) testSet(); testExpand(); test_process_params(); + test_RtlSetCurrentEnvironment(); } -- 2.26.2

2 5

[PATCH 3/4] kernel32: On process entry store PEB address in %ebx.
by Dmitry Timoshkov 06 May '20

06 May '20

8k demo custom PE loader depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/process.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6f704c521b..da4cafd343 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -94,12 +94,19 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + "subl $12,%esp\n\t" "pushl 4(%ebp)\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ "pushl 4(%ebp)\n\t" /* Driller expects readable address at this offset */ "pushl 4(%ebp)\n\t" "pushl 8(%ebp)\n\t" + "movl 8(%ebp),%ebx\n\t" "call *12(%ebp)\n\t" - "leave\n\t" + "leal -4(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %ebp\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -- 2.26.2

1 0

[PATCH 2/4] ntdll: If PE image size is larger than the backed file size then treat file as removable.
by Dmitry Timoshkov 06 May '20

06 May '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/virtual.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7700385eb7..e62c133f7f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1588,6 +1588,10 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, int top_ /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ + /* if the image size is larger than the backed file size we can't mmap it */ + if (total_size > ROUND_SIZE( 0, st.st_size )) + removable = TRUE; + if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, removable ) != STATUS_SUCCESS) goto error; -- 2.26.2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel