wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Dmitry Timoshkov : crypt32/tests: Link to BCryptDestroyKey directly.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 67c8ffc8471957ecc573aa723a1b4cebb72f6bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67c8ffc8471957ecc573aa72… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 14 13:15:00 2021 +0300 crypt32/tests: Link to BCryptDestroyKey directly. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 7c72eba1b9b..9597f1dfec1 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -30,7 +30,6 @@ static BOOL (WINAPI *pCryptDecodeObjectEx)(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,PCRYPT_DECODE_PARA,void*,DWORD*); static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); -static DWORD (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); struct encodedInt { @@ -8475,7 +8474,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) ret = CryptImportPublicKeyInfoEx2(X509_ASN_ENCODING, &context->pCertInfo->SubjectPublicKeyInfo, 0, NULL, &key2); ok(ret, "CryptImportPublicKeyInfoEx2 failed: %08x\n", GetLastError()); - if (pBCryptDestroyKey) pBCryptDestroyKey(key2); + BCryptDestroyKey(key2); CertFreeCertificateContext(context); } @@ -8510,7 +8509,7 @@ START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING }; - HMODULE hCrypt32, hBcrypt; + HMODULE hCrypt32; DWORD i; hCrypt32 = GetModuleHandleA("crypt32.dll"); @@ -8522,9 +8521,6 @@ START_TEST(encode) return; } - hBcrypt = GetModuleHandleA("bcrypt.dll"); - pBCryptDestroyKey = (void*)GetProcAddress(hBcrypt, "BCryptDestroyKey"); - for (i = 0; i < ARRAY_SIZE(encodings); i++) { test_encodeInt(encodings[i]);

1 0

Dmitry Timoshkov : crypt32/tests: Link to CryptAcquireContext directly.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 6bc7a65ef9c910757c1badc85c442c1f84f0deeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc7a65ef9c910757c1badc8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 14 13:14:58 2021 +0300 crypt32/tests: Link to CryptAcquireContext directly. encode.c tests already do that. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 40 ++++++++++++--------------- dlls/crypt32/tests/message.c | 23 ++------------- dlls/crypt32/tests/msg.c | 66 ++++++++++++++------------------------------ 3 files changed, 40 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bc7a65ef9c910757c1b…

1 0

Dmitry Timoshkov : crypt32/tests: Add a test to verify certificate signature.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 8601953ebd175db598b9c4aa1589344ef24a786e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8601953ebd175db598b9c4aa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 14 13:14:51 2021 +0300 crypt32/tests: Add a test to verify certificate signature. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/Makefile.in | 2 +- dlls/crypt32/tests/cert.c | 95 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/Makefile.in b/dlls/crypt32/tests/Makefile.in index d96ad1cd6f1..339cff30e0f 100644 --- a/dlls/crypt32/tests/Makefile.in +++ b/dlls/crypt32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = crypt32.dll -IMPORTS = crypt32 advapi32 user32 shlwapi shell32 +IMPORTS = crypt32 advapi32 user32 shlwapi shell32 bcrypt C_SRCS = \ base64.c \ diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 745770f0095..15ed98e0e30 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -28,6 +28,7 @@ #include <winreg.h> #include <winerror.h> #include <wincrypt.h> +#include <bcrypt.h> #include "wine/test.h" @@ -60,7 +61,6 @@ static void init_function_pointers(void) GET_PROC(hCrypt32, CryptVerifyCertificateSignatureEx) GET_PROC(hAdvapi32, CryptAcquireContextA) - #undef GET_PROC } @@ -4237,6 +4237,98 @@ static void testKeyProvInfo(void) CertCloseStore(store, 0); } +static void test_VerifySignature(void) +{ + PCCERT_CONTEXT cert; + PCERT_SIGNED_CONTENT_INFO info; + DWORD size; + BOOL ret; + HCRYPTPROV prov; + HCRYPTKEY key; + HCRYPTHASH hash; + BYTE hash_value[20], *sig_value; + DWORD hash_len, i; + BCRYPT_KEY_HANDLE bkey; + BCRYPT_HASH_HANDLE bhash; + BCRYPT_ALG_HANDLE alg; + BCRYPT_PKCS1_PADDING_INFO pad; + NTSTATUS status; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); + ok(cert != NULL, "CertCreateCertificateContext error %#x\n", GetLastError()); + + /* 1. Verify certificate signature with Crypto API */ + ret = CryptVerifyCertificateSignature(0, cert->dwCertEncodingType, + cert->pbCertEncoded, cert->cbCertEncoded, &cert->pCertInfo->SubjectPublicKeyInfo); + ok(ret, "CryptVerifyCertificateSignature error %#x\n", GetLastError()); + + /* 2. Verify certificate signature with Crypto API manually */ + ret = pCryptAcquireContextA(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %#x\n", GetLastError()); + + ret = CryptImportPublicKeyInfoEx(prov, cert->dwCertEncodingType, &cert->pCertInfo->SubjectPublicKeyInfo, 0, 0, NULL, &key); + ok(ret, "CryptImportPublicKeyInfoEx error %#x\n", GetLastError()); + + ret = CryptDecodeObjectEx(cert->dwCertEncodingType, X509_CERT, + cert->pbCertEncoded, cert->cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "CryptDecodeObjectEx error %#x\n", GetLastError()); + + ret = CryptCreateHash(prov, CALG_SHA1, 0, 0, &hash); + ok(ret, "CryptCreateHash error %#x\n", GetLastError()); + + ret = CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0); + ok(ret, "CryptHashData error %#x\n", GetLastError()); + + ret = CryptVerifySignatureW(hash, info->Signature.pbData, info->Signature.cbData, key, NULL, 0); + ok(ret, "CryptVerifySignature error %#x\n", GetLastError()); + + CryptDestroyHash(hash); + CryptDestroyKey(key); + CryptReleaseContext(prov, 0); + + /* 3. Verify certificate signature with CNG */ + ret = CryptImportPublicKeyInfoEx2(cert->dwCertEncodingType, &cert->pCertInfo->SubjectPublicKeyInfo, 0, NULL, &bkey); + ok(ret, "CryptImportPublicKeyInfoEx error %#x\n", GetLastError()); + + status = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(!status, "got %#x\n", status); + + status = BCryptCreateHash(alg, &bhash, NULL, 0, NULL, 0, 0); + ok(!status || broken(status == STATUS_INVALID_PARAMETER) /* Vista */, "got %#x\n", status); + if (status == STATUS_INVALID_PARAMETER) + { + win_skip("broken BCryptCreateHash\n"); + goto done; + } + + status = BCryptHashData(bhash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0); + ok(!status, "got %#x\n", status); + + status = BCryptFinishHash(bhash, hash_value, sizeof(hash_value), 0); + ok(!status, "got %#x\n", status); + ok(!memcmp(hash_value, selfSignedSignatureHash, sizeof(hash_value)), "got wrong hash value\n"); + + status = BCryptGetProperty(bhash, BCRYPT_HASH_LENGTH, (BYTE *)&hash_len, sizeof(hash_len), &size, 0); + ok(!status, "got %#x\n", status); + ok(hash_len == sizeof(hash_value), "got %u\n", hash_len); + + sig_value = HeapAlloc(GetProcessHeap(), 0, info->Signature.cbData); + for (i = 0; i < info->Signature.cbData; i++) + sig_value[i] = info->Signature.pbData[info->Signature.cbData - i - 1]; + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + status = BCryptVerifySignature(bkey, &pad, hash_value, sizeof(hash_value), sig_value, info->Signature.cbData, BCRYPT_PAD_PKCS1); + ok(!status, "got %#x\n", status); + + HeapFree(GetProcessHeap(), 0, sig_value); + BCryptDestroyHash(bhash); +done: + BCryptCloseAlgorithmProvider(alg, 0); + + LocalFree(info); + CertFreeCertificateContext(cert); +} + START_TEST(cert) { init_function_pointers(); @@ -4270,4 +4362,5 @@ START_TEST(cert) testAcquireCertPrivateKey(); testGetPublicKeyLength(); testIsRDNAttrsInCertificateName(); + test_VerifySignature(); }

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_flush().
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 7699ff8aa4052286b62fdfec4aa909bd88cd4999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7699ff8aa4052286b62fdfec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:05:27 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_flush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7bc9a217f4a..43fc18126ff 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2641,12 +2641,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext1 *iface) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_device_flush(device->wined3d_device); + wined3d_device_context_flush(context->wined3d_context); wined3d_mutex_unlock(); } @@ -5643,7 +5643,7 @@ static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_device_flush(device->wined3d_device); + wined3d_device_context_flush(device->immediate_context.wined3d_context); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f19ea1ff212..e6406c7a04f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5621,11 +5621,11 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } -void CDECL wined3d_device_flush(struct wined3d_device *device) +void CDECL wined3d_device_context_flush(struct wined3d_device_context *context) { - TRACE("device %p.\n", device); + TRACE("context %p.\n", context); - device->cs->c.ops->flush(&device->cs->c); + context->ops->flush(context); } static void update_swapchain_flags(struct wined3d_texture *texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1de62071aa0..34eba025b8a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -54,7 +54,6 @@ @ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) -@ cdecl wined3d_device_flush(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @@ -170,6 +169,7 @@ @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) +@ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b3120017c5..db5f75d7aca 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2564,6 +2564,7 @@ void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context * unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context *context, struct wined3d_buffer *buffer, unsigned int offset, bool indexed); +void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Flush through wined3d_device_context_ops.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: cd704aeee43b8d72550d743dc3aa7d20871f3870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd704aeee43b8d72550d743d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:05:26 2021 -0500 wined3d: Flush through wined3d_device_context_ops. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 19 +++++++++++-------- dlls/wined3d/device.c | 2 +- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ae4d97873a4..b99e3bbac30 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -480,6 +480,11 @@ static inline void wined3d_device_context_finish(struct wined3d_device_context * context->ops->finish(context, queue_id); } +static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_cs, c); +} + static const char *debug_cs_op(enum wined3d_cs_op op) { switch (op) @@ -1110,14 +1115,15 @@ static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) context_release(context); } -void wined3d_cs_emit_flush(struct wined3d_cs *cs) +static void wined3d_cs_flush(struct wined3d_device_context *context) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_flush *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_FLUSH; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = TRUE; } @@ -2073,11 +2079,6 @@ wined3d_cs_push_constant_info[] = {FIELD_OFFSET(struct wined3d_state, ps_consts_b), sizeof(BOOL), WINED3D_SHADER_CONST_PS_B}, }; -static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) -{ - return CONTAINING_RECORD(context, struct wined3d_cs, c); -} - static void wined3d_cs_st_push_constants(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants) { @@ -2799,6 +2800,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_map, wined3d_cs_unmap, wined3d_cs_issue_query, + wined3d_cs_flush, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -2923,6 +2925,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_map, wined3d_cs_unmap, wined3d_cs_issue_query, + wined3d_cs_flush, }; static void poll_queries(struct wined3d_cs *cs) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2e129513501..f19ea1ff212 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5625,7 +5625,7 @@ void CDECL wined3d_device_flush(struct wined3d_device *device) { TRACE("device %p.\n", device); - wined3d_cs_emit_flush(device->cs); + device->cs->c.ops->flush(&device->cs->c); } static void update_swapchain_flags(struct wined3d_texture *texture) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 610a37b9269..81f5ba7d0d7 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -476,7 +476,7 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) { if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) - wined3d_cs_emit_flush(query->device->cs); + query->device->cs->c.ops->flush(&query->device->cs->c); return S_FALSE; } if (query->buffer_object) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0af1258e355..c3e3752ed71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4693,6 +4693,7 @@ struct wined3d_device_context_ops HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx); void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); + void (*flush)(struct wined3d_device_context *context); }; struct wined3d_device_context @@ -4734,7 +4735,6 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_device_context_emit_clear_uav_uint(struct wined3d_device_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_issue_query().
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: e205b691bcfc846fa58cfb9ffba9f76e3a918cad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e205b691bcfc846fa58cfb9f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:05:25 2021 -0500 d3d11: Use wined3d_device_context_issue_query(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 47f865ed14c..7bc9a217f4a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -821,28 +821,26 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_Begin(ID3D11DeviceContext1 *iface, ID3D11Asynchronous *asynchronous) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); - HRESULT hr; TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) - ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_device_context_issue_query(context->wined3d_context, query->wined3d_query, WINED3DISSUE_BEGIN); wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext1 *iface, ID3D11Asynchronous *asynchronous) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); - HRESULT hr; TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_END))) - ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_device_context_issue_query(context->wined3d_context, query->wined3d_query, WINED3DISSUE_END); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_issue_query().
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: effa2a7411701818ac4812e3c67b19520a628e7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=effa2a7411701818ac4812e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:05:24 2021 -0500 wined3d: Introduce wined3d_device_context_issue_query(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++++++++++ dlls/wined3d/query.c | 10 +--------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9240bad9d27..2e129513501 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5324,6 +5324,22 @@ HRESULT CDECL wined3d_device_context_unmap(struct wined3d_device_context *contex return context->ops->unmap(context, resource, sub_resource_idx); } +void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags) +{ + TRACE("context %p, query %p, flags %#x.\n", context, query, flags); + + if (flags & WINED3DISSUE_END) + ++query->counter_main; + + query->device->cs->c.ops->issue_query(context, query, flags); + + if (flags & WINED3DISSUE_BEGIN) + query->state = QUERY_BUILDING; + else + query->state = QUERY_SIGNALLED; +} + struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ed66794c757..610a37b9269 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -504,15 +504,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - if (flags & WINED3DISSUE_END) - ++query->counter_main; - - query->device->cs->c.ops->issue_query(&query->device->cs->c, query, flags); - - if (flags & WINED3DISSUE_BEGIN) - query->state = QUERY_BUILDING; - else - query->state = QUERY_SIGNALLED; + wined3d_device_context_issue_query(&query->device->cs->c, query, flags); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7c81eff1593..1de62071aa0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e0a205f3dad..0b3120017c5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2566,6 +2566,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context struct wined3d_buffer *buffer, unsigned int offset, bool indexed); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags); HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags);

1 0

Zebediah Figura : wined3d: Issue queries through wined3d_device_context_ops.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 0bf689352be8a5ff74ea9b0748603ebcc7ce93c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf689352be8a5ff74ea9b07… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:05:23 2021 -0500 wined3d: Issue queries through wined3d_device_context_ops. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 +++++++--- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bb11851c1be..ae4d97873a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2213,16 +2213,18 @@ static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) InterlockedIncrement(&query->counter_retrieved); } -void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) +static void wined3d_cs_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_query_issue *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_QUERY_ISSUE; op->query = query; op->flags = flags; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = FALSE; } @@ -2796,6 +2798,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_st_push_constants, wined3d_cs_map, wined3d_cs_unmap, + wined3d_cs_issue_query, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -2919,6 +2922,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_push_constants, wined3d_cs_map, wined3d_cs_unmap, + wined3d_cs_issue_query, }; static void poll_queries(struct wined3d_cs *cs) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1ef83891ddf..ed66794c757 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -507,7 +507,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) if (flags & WINED3DISSUE_END) ++query->counter_main; - wined3d_cs_emit_query_issue(query->device->cs, query, flags); + query->device->cs->c.ops->issue_query(&query->device->cs->c, query, flags); if (flags & WINED3DISSUE_BEGIN) query->state = QUERY_BUILDING; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4d5f4765f57..0af1258e355 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4692,6 +4692,7 @@ struct wined3d_device_context_ops unsigned int flags); HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx); + void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); }; struct wined3d_device_context @@ -4737,7 +4738,6 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; -void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Always pass object attributes to nt_to_unix_file_name().
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 35cd4115474db86f06ada73708765a4eb79b447a URL: https://source.winehq.org/git/wine.git/?a=commit;h=35cd4115474db86f06ada737… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 16:26:54 2021 +0200 ntdll: Always pass object attributes to nt_to_unix_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 42 ++++++++++++++++------------- dlls/ntdll/unix/loader.c | 6 +++-- dlls/ntdll/unix/process.c | 61 +++++++++++++++++++++--------------------- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 58 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35cd4115474db86f06ad…

1 0

Alexandre Julliard : ntdll: Move nt_to_unix_file_name_attr() to avoid forward declarations.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 90024e492dcefd204c6c953a804c0d51544db5b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90024e492dcefd204c6c953a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 16:19:50 2021 +0200 ntdll: Move nt_to_unix_file_name_attr() to avoid forward declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 126 ++++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b87da541f1d..45c220a1d63 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3216,69 +3216,6 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer } -/****************************************************************************** - * nt_to_unix_file_name_attr - */ -static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char **name_ret, - UNICODE_STRING *nt_name, UINT disposition ) -{ - enum server_fd_type type; - int old_cwd, root_fd, needs_close; - const WCHAR *name; - char *unix_name; - int name_len, unix_len; - NTSTATUS status; - - if (!attr->RootDirectory) /* without root dir fall back to normal lookup */ - return nt_to_unix_file_name( attr->ObjectName, name_ret, nt_name, disposition ); - - name = attr->ObjectName->Buffer; - name_len = attr->ObjectName->Length / sizeof(WCHAR); - - if (name_len && name[0] == '\\') return STATUS_INVALID_PARAMETER; - - unix_len = name_len * 3 + MAX_DIR_ENTRY_LEN + 3; - if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY; - unix_name[0] = '.'; - - if (!(status = server_get_unix_fd( attr->RootDirectory, 0, &root_fd, &needs_close, &type, NULL ))) - { - if (type != FD_TYPE_DIR) - { - if (needs_close) close( root_fd ); - status = STATUS_BAD_DEVICE_TYPE; - } - else - { - mutex_lock( &dir_mutex ); - if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) - { - status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, disposition, FALSE ); - if (fchdir( old_cwd ) == -1) chdir( "/" ); - } - else status = errno_to_status( errno ); - mutex_unlock( &dir_mutex ); - if (old_cwd != -1) close( old_cwd ); - if (needs_close) close( root_fd ); - } - } - else if (status == STATUS_OBJECT_TYPE_MISMATCH) status = STATUS_BAD_DEVICE_TYPE; - - if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) - { - TRACE( "%s -> %s\n", debugstr_us(attr->ObjectName), debugstr_a(unix_name) ); - *name_ret = unix_name; - if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); - } - else - { - TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); - free( unix_name ); - } - return status; -} - - /****************************************************************************** * nt_to_unix_file_name * @@ -3393,6 +3330,69 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret } +/****************************************************************************** + * nt_to_unix_file_name_attr + */ +static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char **name_ret, + UNICODE_STRING *nt_name, UINT disposition ) +{ + enum server_fd_type type; + int old_cwd, root_fd, needs_close; + const WCHAR *name; + char *unix_name; + int name_len, unix_len; + NTSTATUS status; + + if (!attr->RootDirectory) /* without root dir fall back to normal lookup */ + return nt_to_unix_file_name( attr->ObjectName, name_ret, nt_name, disposition ); + + name = attr->ObjectName->Buffer; + name_len = attr->ObjectName->Length / sizeof(WCHAR); + + if (name_len && name[0] == '\\') return STATUS_INVALID_PARAMETER; + + unix_len = name_len * 3 + MAX_DIR_ENTRY_LEN + 3; + if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY; + unix_name[0] = '.'; + + if (!(status = server_get_unix_fd( attr->RootDirectory, 0, &root_fd, &needs_close, &type, NULL ))) + { + if (type != FD_TYPE_DIR) + { + if (needs_close) close( root_fd ); + status = STATUS_BAD_DEVICE_TYPE; + } + else + { + mutex_lock( &dir_mutex ); + if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) + { + status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, disposition, FALSE ); + if (fchdir( old_cwd ) == -1) chdir( "/" ); + } + else status = errno_to_status( errno ); + mutex_unlock( &dir_mutex ); + if (old_cwd != -1) close( old_cwd ); + if (needs_close) close( root_fd ); + } + } + else if (status == STATUS_OBJECT_TYPE_MISMATCH) status = STATUS_BAD_DEVICE_TYPE; + + if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) + { + TRACE( "%s -> %s\n", debugstr_us(attr->ObjectName), debugstr_a(unix_name) ); + *name_ret = unix_name; + if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); + } + else + { + TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); + free( unix_name ); + } + return status; +} + + /****************************************************************************** * wine_nt_to_unix_file_name *

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
87
Older →

Jump to page:

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-commits April 2021