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

[PATCH 2/2] crypt32: Add support for CMSG_ENCODED_MESSAGE.
by Dmitry Timoshkov 02 Oct '20

02 Oct '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0e50cc13d6..a521e45846 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3190,6 +3190,12 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_ENCODED_MESSAGE: + if (msg->msg_data.pbData) + CRYPT_CopyParam(pvData, pcbData, msg->msg_data.pbData, msg->msg_data.cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_ENCODED_SIGNER: if (msg->u.signed_data.info) { -- 2.26.2

1 0

[PATCH 1/2] crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM.
by Dmitry Timoshkov 02 Oct '20

02 Oct '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 5df03f7c99..0e50cc13d6 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2998,6 +2998,37 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } +static BOOL CRYPT_CopyAuthAttr(void *pvData, DWORD *pcbData, + const CMSG_CMS_SIGNER_INFO *in) +{ + DWORD size; + BOOL ret; + + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + + size = CRYPT_SizeOfAttributes(&in->AuthAttrs); + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CRYPT_ATTRIBUTES *out = pvData; + + CRYPT_ConstructAttributes(out,&in->AuthAttrs); + ret = TRUE; + } + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { @@ -3202,6 +3233,20 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + + case CMSG_SIGNER_AUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyAuthAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_SIGNER_UNAUTH_ATTR_PARAM: if (msg->u.signed_data.info) { -- 2.26.2

1 0

[PATCH] ncrypt: Add NCryptIsKeyHandle stub
by Vitaly Lipatov 02 Oct '20

02 Oct '20

--- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c0cc05c43ca..a8dda3c54a0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -132,6 +132,12 @@ SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const W return NTE_NOT_SUPPORTED; } +BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) +{ + FIXME("(0x%lx): stub\n", hKey); + return FALSE; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 2b5a4fca420..0e92609790c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -78,7 +78,7 @@ @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) @ stub NCryptIsAlgSupported(long wstr long) -@ stub NCryptIsKeyHandle +@ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey @ stdcall NCryptOpenKey(long ptr wstr long long) -- 2.25.4

1 0

[PATCH v2 1/3] wined3d: Move the window resize during swapchain activation to a separate function.
by Gabriel Ivăncescu 02 Oct '20

02 Oct '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/wined3d/swapchain.c | 49 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6270c36..8741ed2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1763,7 +1763,6 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; - struct wined3d_output_desc output_desc; unsigned int screensaver_active; struct wined3d_output *output; BOOL focus_messages, filter; @@ -1790,22 +1789,7 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if ((device->restore_screensaver = !!screensaver_active)) SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); - if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) - { - /* The d3d versions do not agree on the exact messages here. D3d8 restores - * the window but leaves the size untouched, d3d9 sets the size on an - * invisible window, generates messages but doesn't change the window - * properties. The implementation follows d3d9. - * - * Guild Wars 1 wants a WINDOWPOSCHANGED message on the device window to - * resume drawing after a focus loss. */ - if (SUCCEEDED(hr = wined3d_output_get_desc(output, &output_desc))) - SetWindowPos(window, NULL, output_desc.desktop_rect.left, - output_desc.desktop_rect.top, swapchain->state.desc.backbuffer_width, - swapchain->state.desc.backbuffer_height, SWP_NOACTIVATE | SWP_NOZORDER); - else - ERR("Failed to get output description, hr %#x.\n", hr); - } + wined3d_swapchain_update_window_size(swapchain); if (device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { @@ -1849,6 +1833,37 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa wined3d_filter_messages(window, filter); } +void wined3d_swapchain_update_window_size(struct wined3d_swapchain *swapchain) +{ + struct wined3d_output_desc output_desc; + struct wined3d_output *output; + HRESULT hr; + + if (swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES) + return; + + output = wined3d_swapchain_get_output(swapchain); + if (!output) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return; + } + + /* The d3d versions do not agree on the exact messages here. D3d8 restores + * the window but leaves the size untouched, d3d9 sets the size on an + * invisible window, generates messages but doesn't change the window + * properties. The implementation follows d3d9. + * + * Guild Wars 1 wants a WINDOWPOSCHANGED message on the device window to + * resume drawing after a focus loss. */ + if (SUCCEEDED(hr = wined3d_output_get_desc(output, &output_desc))) + SetWindowPos(swapchain->state.device_window, NULL, output_desc.desktop_rect.left, + output_desc.desktop_rect.top, swapchain->state.desc.backbuffer_width, + swapchain->state.desc.backbuffer_height, SWP_NOACTIVATE | SWP_NOZORDER); + else + ERR("Failed to get output description, hr %#x.\n", hr); +} + HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abc6e0e..2cf4aa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5104,6 +5104,7 @@ struct wined3d_swapchain void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_swapchain_update_window_size(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, -- 2.21.0

3 5

[PATCH] dssenh/tests: Get rid of workarounds for old Windows versions.
by Hans Leidekker 02 Oct '20

02 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/tests/dssenh.c | 204 +++++++++++++++---------------------- 1 file changed, 81 insertions(+), 123 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index aa99acded0..7a16acc679 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -126,11 +126,6 @@ static void test_acquire_context(void) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) - { - win_skip("DSSENH and Schannel provider is broken on WinNT4\n"); - return; - } ok(result, "Expected no errors.\n"); result = CryptReleaseContext(hProv, 0); @@ -189,38 +184,36 @@ struct keylength_test { DWORD flags; BOOL expectedResult; DWORD expectedError; - BOOL brokenResult; DWORD brokenError; - DWORD altError; }; static const struct keylength_test baseDSS_keylength[] = { /* AT_KEYEXCHANGE is not supported by the base DSS provider */ - {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ - {AT_KEYEXCHANGE, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ - {AT_KEYEXCHANGE, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ - {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS},/* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_ALGID}, + {AT_KEYEXCHANGE, 512 << 16, FALSE, NTE_BAD_ALGID}, + {AT_KEYEXCHANGE, 1024 << 16, FALSE, NTE_BAD_ALGID}, + {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_ALGID}, /* min 512 max 1024 increment by 64 */ {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, STATUS_INVALID_PARAMETER, NTE_FAIL}, {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, /* CALG_DH_EPHEM is not supported by the base DSS provider */ - {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ - {CALG_DH_EPHEM, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ - {CALG_DH_EPHEM, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ - {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_ALGID}, + {CALG_DH_EPHEM, 512 << 16, FALSE, NTE_BAD_ALGID}, + {CALG_DH_EPHEM, 1024 << 16, FALSE, NTE_BAD_ALGID}, + {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_ALGID}, /* CALG_DH_SF is not supported by the base DSS provider */ - {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ - {CALG_DH_SF, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ - {CALG_DH_SF, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ - {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_ALGID}, + {CALG_DH_SF, 512 << 16, FALSE, NTE_BAD_ALGID}, + {CALG_DH_SF, 1024 << 16, FALSE, NTE_BAD_ALGID}, + {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_ALGID}, /* min 512 max 1024, increment by 64 */ {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, STATUS_INVALID_PARAMETER, NTE_FAIL}, {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -230,31 +223,31 @@ static const struct keylength_test dssDH_keylength[] = { /* min 512 max 1024, increment by 64 */ {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_KEYEXCHANGE, 512 << 16, TRUE}, - {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_BAD_FLAGS}, {AT_KEYEXCHANGE, 768 << 16, TRUE}, {AT_KEYEXCHANGE, 1024 << 16, TRUE}, {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, STATUS_INVALID_PARAMETER, NTE_FAIL}, {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_EPHEM, 512 << 16, TRUE}, - {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_EPHEM, 768 << 16, TRUE}, {CALG_DH_EPHEM, 1024 << 16, TRUE}, {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 512 << 16, TRUE}, - {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 513 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 768 << 16, TRUE}, {CALG_DH_SF, 1024 << 16, TRUE}, {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, STATUS_INVALID_PARAMETER, NTE_FAIL}, {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -264,7 +257,7 @@ static const struct keylength_test dssENH_keylength[] = { /* min 512 max 1024 (AT_KEYEXCHANGE, CALG_DH_EPHEM, CALG_DH_SF max 4096), increment by 64*/ {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_KEYEXCHANGE, 512 << 16, TRUE}, - {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_BAD_FLAGS}, {AT_KEYEXCHANGE, 768 << 16, TRUE}, {AT_KEYEXCHANGE, 1024 << 16, TRUE}, {AT_KEYEXCHANGE, 1088 << 16, TRUE}, @@ -275,13 +268,13 @@ static const struct keylength_test dssENH_keylength[] = { {AT_KEYEXCHANGE, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, STATUS_INVALID_PARAMETER, NTE_FAIL}, {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1032 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_EPHEM, 512 << 16, TRUE}, - {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_EPHEM, 768 << 16, TRUE}, {CALG_DH_EPHEM, 1024 << 16, TRUE}, {CALG_DH_EPHEM, 1040 << 16, FALSE, NTE_BAD_FLAGS}, @@ -289,7 +282,7 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_EPHEM, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 512 << 16, TRUE}, - {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 513 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 768 << 16, TRUE}, {CALG_DH_SF, 1024 << 16, TRUE}, {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, @@ -297,7 +290,7 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_SF, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, STATUS_INVALID_PARAMETER, NTE_FAIL}, {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -322,26 +315,9 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t ok(result, "Expected no errors.\n"); } else - { /* error but success on older system */ - if(tests[i].brokenResult) - ok((!result && GetLastError() == tests[i].expectedError) || - broken(result), "%d: Didn't really expect a key, got %x, %d\n", - i, GetLastError(), result); - else - { - /* error */ - if(!tests[i].brokenError) - ok(!result && GetLastError() == tests[i].expectedError, - "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); - - /* error but different error on older system */ - else - ok(!result && (GetLastError() == tests[i].expectedError || - GetLastError() == tests[i].altError || - broken(GetLastError() == tests[i].brokenError) ), - "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); - } - } + ok(!result && (GetLastError() == tests[i].expectedError || + broken(GetLastError() == tests[i].brokenError)), + "%d: got %x.\n", i, GetLastError()); } } @@ -381,11 +357,6 @@ static void test_keylength(void) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) - { - win_skip("DSSENH and Schannel provider is broken on WinNT4\n"); - return; - } ok(result, "Expected no errors.\n"); /* perform keylength tests */ @@ -1001,12 +972,6 @@ static void test_verify_signature(void) /* acquire enhanced dss provider */ SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, 0); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) - { - win_skip("DSSENH and Schannel provider is broken on WinNT4, skipping signature " - "verification tests.\n"); - return; - } ok(result, "Failed to acquire CSP.\n"); test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); @@ -1120,94 +1085,94 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); - ok((!result && GetLastError() == NTE_BAD_ALGID) || broken(result), /* WinNT4 */ - "Expected NTE_BAD_ALGID, got %x\n", GetLastError()); + ok(!result && GetLastError() == NTE_BAD_ALGID, + "Expected NTE_BAD_ALGID, got %x\n", GetLastError()); result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey2); - ok((!result && GetLastError() == NTE_BAD_ALGID) || broken(result), /* WinNT4 */ - "Expected NTE_BAD_ALGID, got %x\n", GetLastError()); + ok(!result && GetLastError() == NTE_BAD_ALGID, + "Expected NTE_BAD_ALGID, got %x\n", GetLastError()); /* Set the prime and generator values, which are agreed upon */ result = CryptSetKeyParam(privKey1, KP_P, (BYTE *)&Prime, 0); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptSetKeyParam(privKey2, KP_P, (BYTE *)&Prime, 0); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptSetKeyParam(privKey1, KP_G, (BYTE *)&Generator, 0); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptSetKeyParam(privKey2, KP_G, (BYTE *)&Generator, 0); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* Generate the secret value for user1 and user2 */ result = CryptSetKeyParam(privKey1, KP_X, NULL, 0); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptSetKeyParam(privKey2, KP_X, NULL, 0); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* Acquire required size for the public keys */ result = CryptExportKey(privKey1, 0, PUBLICKEYBLOB, 0, NULL, &pubKeyLen1); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptExportKey(privKey2, 0, PUBLICKEYBLOB, 0, NULL, &pubKeyLen2); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* Export public key which will be calculated into the shared key */ result = CryptExportKey(privKey1, 0, PUBLICKEYBLOB, 0, pubKeyBuffer1, &pubKeyLen1); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptExportKey(privKey2, 0, PUBLICKEYBLOB, 0, pubKeyBuffer2, &pubKeyLen2); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* Import the public key and convert it into a shared key */ result = CryptImportKey(hProv, pubKeyBuffer2, pubKeyLen2, privKey1, 0, &sessionKey1); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || - broken(!result && GetLastError() == NTE_BAD_DATA) || /* Vista.64 */ - broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ - broken(!result && GetLastError() == NTE_BAD_ALGID), /* W7SP164 (32 bit dssenh) */ + ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(!result && GetLastError() == NTE_BAD_DATA) || /* Vista.64 */ + broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ + broken(!result && GetLastError() == NTE_BAD_ALGID), /* W7SP164 (32 bit dssenh) */ "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptImportKey(hProv, pubKeyBuffer1, pubKeyLen1, privKey2, 0, &sessionKey2); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || - broken(!result && GetLastError() == NTE_BAD_DATA) || /* Win 7 */ - broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ - broken(!result && GetLastError() == NTE_BAD_ALGID), /* W7SP164 (32 bit dssenh) */ + ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(!result && GetLastError() == NTE_BAD_DATA) || /* Win 7 */ + broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ + broken(!result && GetLastError() == NTE_BAD_ALGID), /* W7SP164 (32 bit dssenh) */ "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* Set the shared key parameters to matching type */ algid = CALG_RC4; result = CryptSetKeyParam(sessionKey1, KP_ALGID, (BYTE *)&algid, 0); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); algid = CALG_RC4; result = CryptSetKeyParam(sessionKey2, KP_ALGID, (BYTE *)&algid, 0); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* Encrypt some data and verify we are getting the same output */ memcpy(pbData1, plainText, plainLen); dataLen = plainLen; result = CryptEncrypt(sessionKey1, 0, TRUE, 0, pbData1, &dataLen, 36); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptDecrypt(sessionKey2, 0, TRUE, 0, pbData1, &dataLen); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); ok(!memcmp(pbData1, (BYTE *)plainText, sizeof(plainText)), "Incorrect decrypted data.\n"); @@ -1215,31 +1180,31 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ dataLen = plainLen; result = CryptEncrypt(sessionKey2, 0, TRUE, 0, pbData2, &dataLen, 36); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptDecrypt(sessionKey1, 0, TRUE, 0, pbData2, &dataLen); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); ok(!memcmp(pbData1, pbData2, dataLen), "Decrypted data is not identical.\n"); /* Destroy all user keys */ result = CryptDestroyKey(sessionKey1); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptDestroyKey(sessionKey2); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptDestroyKey(privKey1); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptDestroyKey(privKey2); - ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ + ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); } } @@ -1289,12 +1254,10 @@ static void test_keyExchange_dssDH(HCRYPTPROV hProv, const struct keyExchange_te /* Generate the secret value for user1 and user2 */ result = CryptSetKeyParam(privKey1, KP_X, NULL, 0); - ok(result || broken(!result && GetLastError() == ERROR_INVALID_PARAMETER), - "Failed to set secret value for user 1, got %x\n", GetLastError());/* Win2k & WinXP */ + ok(result, "Failed to set secret value for user 1, got %x\n", GetLastError()); result = CryptSetKeyParam(privKey2, KP_X, NULL, 0); - ok(result || broken(!result && GetLastError() == ERROR_INVALID_PARAMETER), - "Failed to set secret value for user 2, got %x\n", GetLastError());/* Win2k & WinXP */ + ok(result, "Failed to set secret value for user 2, got %x\n", GetLastError()); /* Acquire required size for the public keys */ result = CryptExportKey(privKey1, 0, PUBLICKEYBLOB, 0, NULL, &pubKeyLen1); @@ -1396,11 +1359,6 @@ static void test_key_exchange(void) /* acquire enhanced dss provider */ result = CryptAcquireContextA(&hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) - { - win_skip("DSSENH and Schannel provider is broken on WinNT4, skipping shared key tests.\n"); - return; - } ok(result, "Failed to acquire CSP.\n"); test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); -- 2.28.0

1 0

[PATCH] winevdm: Abstract references to /dosbox
by Gerald Pfeifer 02 Oct '20

02 Oct '20

A user has shared the want to go with dosbox-staging instead of classic DOSBox. To make that easier, and our current code easier to maintain, abstract references to /dosbox. On the way use strlen() instead of sizeof(). That is already used earlier in that function, it is more robust, and still computed at compile time if feasible. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- programs/winevdm/winevdm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index bfc47b8853..43019fbd63 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winevdm); +const char DOSBOX[] = "/dosbox"; /*** PIF file structures ***/ #include "pshpack1.h" @@ -118,7 +119,7 @@ static char *find_dosbox(void) envpath_len = strlen( envpath ); path = HeapAlloc( GetProcessHeap(), 0, envpath_len + 1 ); - buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + sizeof("/dosbox") ); + buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + strlen(DOSBOX) + 1 ); strcpy( path, envpath ); p = path; @@ -130,7 +131,7 @@ static char *find_dosbox(void) while (*p && *p != ':') p++; if (*p == ':') *p++ = 0; strcpy( buffer, dir ); - strcat( buffer, "/dosbox" ); + strcat( buffer, DOSBOX ); if (!stat( buffer, &st )) { HeapFree( GetProcessHeap(), 0, path ); -- 2.27.0

1 0

[PATCH v3 1/4] include: Fix undefined char16_t in C11.
by Kevin Puetz 02 Oct '20

02 Oct '20

In c++11 char16_t is a distinct fundamental type, but in c11 it is merely a typedef in <uchar.h>. Explicitly mention char16_t only in c++11 (where it is built-in), otherwise define WCHAR as unsigned short (without naming char16_t) and just hope that on C11 this matches u"..." Remove WINE_UNICODE_CHAR16; it is now the default when supported. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- Per https://www.winehq.org/pipermail/wine-devel/2020-July/170502.html Jacek wants to avoid including <uchar.h>; without that C11 has to make some assumptions the standard doesn't guarantee. But that's far from wine's first foray into implementation-defined behavior... c11 defines char16_t as a typedef to uint_least16_t, which is likely (though not guaranteed) the same as unsigned short (e.g. it could be int if that is a 16-bit type). I do see that basetsd has a comment saying only ILP32, LP64, or P64 typemodels are supported, though, so probably wine would already not work on a platform with 16-bit int. GCC and clang provide a macro __CHAR16_TYPE__, but basetsd.h needs I32 and CHAR8_BIT!=8 is far too exotic, so it's unecessary in practice. It will be `#define __CHAR_TYPE__ unsigned short` anyway; the other C11-compliant possibilities would already break wine. That makes both the pro and con arguments moot, so it's now omitted. --- Removing WINE_UNICODE_CHAR1 changes little for C or C++98/C++03, or anything using -fshort-wchar/WINE_UNICODE_NATIVE, but it has some ABI implications for wineg++ -std=c++11 -fno-short-wchar. On the plus side: * TEXT(), OLESTR() macros just work in UNICODE for c++11 and (usually) c11 * We revert an #ifdef with ABI implications, now there's just -f(no-)short-wchar and -std=c++*, which already mattered * in C++11, WCHAR overloads are no longer ambiguous vs integral types and WCHAR is recognizable as text rather than promoted to int. This is much more like the situation on MSVC where WCHAR == wchar_t; char16_t is also distinct from uint16_t, unsigned short, etc. * We avoid the situation where TEXT("...") -> u"..." is accepted by the compiler and produces char16_t[], but that isn't compatible with TCHAR[] or LPCTSTR. Silently getting the wrong type is obnoxious in C++, since templates can move the type-mismatch compile error far away from the offending TEXT("...") macro, or even compile but use an unexpected overload. Now u"..." either doesn't compile, or it's correct, so we can drop https://www.winehq.org/pipermail/wine-devel/2020-July/170227.html In C11 there's no templates or overloading; it's non-portable UB (strict-aliasing) if an unsigned short * points to unsigned int[], but not a practical issue on any platform basetsd.h supports. On the minus side: * any libraries built with wineg++ -std=c++11 -fno-short-wchar change their mangled names for functions with WCHAR/LPCWSTR parameters because char16_t is a distinct fundamental type. This doesn't affect compatibility of wine itself (which always exports things under their MSVC-ish mangling as-if using wchar_t), but wineg++ could fail to link to a .dll.so built with wine 5.0.x headers. I don't know to what extent wineg++ tries to promise that this works, but IMO we are headed into a major version 6, and binaries are already not fully interchangeable due to winecrt0/__wine_spec_init changes. So I think think it seems preferable to just have good defaults that are MSVC-like, and fewer possible mistakes. But it's certainly possible to keep the WINE_UNICODE_CHAR16 opt-in, (or add a WINE_NO_UNICODE_CHAR16 opt-out), if we must. Or we could follow gcc's lead on the upcoming c++20 -f(no-)char8_t and winegcc could have -f(no-)char16_t, or -fchar16_t-wchar (synthesizing the macro like it does with WINE_UNICODE_NATIVE). But I like the simplicity of "just works if the compiler has support" unless someone objects. --- include/sqltypes.h | 2 +- include/tchar.h | 2 +- include/winnt.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sqltypes.h b/include/sqltypes.h index 0923f6b362..4c45de7e98 100644 --- a/include/sqltypes.h +++ b/include/sqltypes.h @@ -30,7 +30,7 @@ extern "C" { typedef unsigned char SQLCHAR; #if defined(WINE_UNICODE_NATIVE) typedef wchar_t SQLWCHAR; -#elif defined(WINE_UNICODE_CHAR16) +#elif __cpp_unicode_literals >= 200710 typedef char16_t SQLWCHAR; #else typedef unsigned short SQLWCHAR; diff --git a/include/tchar.h b/include/tchar.h index 9fc4c72099..a8e64b4bf6 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -240,7 +240,7 @@ typedef unsigned short wctype_t; #ifndef __TCHAR_DEFINED #if defined(WINE_UNICODE_NATIVE) typedef wchar_t _TCHAR; -#elif defined(WINE_UNICODE_CHAR16) +#elif __cpp_unicode_literals >= 200710 typedef char16_t _TCHAR; #else typedef unsigned short _TCHAR; diff --git a/include/winnt.h b/include/winnt.h index 1eb82876f1..b0736a036d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -462,7 +462,7 @@ typedef int LONG, *PLONG; /* Some systems might have wchar_t, but we really need 16 bit characters */ #if defined(WINE_UNICODE_NATIVE) typedef wchar_t WCHAR; -#elif defined(WINE_UNICODE_CHAR16) +#elif __cpp_unicode_literals >= 200710 typedef char16_t WCHAR; #else typedef unsigned short WCHAR;

3 8

[PATCH vkd3d 1/5] tests: Import trigonometry tests from Wine.
by Zebediah Figura 02 Oct '20

02 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 6 ++++-- tests/shader_runner_d3d12.c | 23 +++++++++++++++++++++++ tests/trigonometry.shader_test | 24 ++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 tests/trigonometry.shader_test diff --git a/Makefile.am b/Makefile.am index 27bc00b6..2e286bc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,7 +61,8 @@ vkd3d_shader_tests = \ tests/swizzle-4.shader_test \ tests/swizzle-5.shader_test \ tests/swizzle-6.shader_test \ - tests/swizzle-7.shader_test + tests/swizzle-7.shader_test \ + tests/trigonometry.shader_test vkd3d_test_headers = \ tests/d3d12_crosstest.h \ @@ -192,7 +193,8 @@ XFAIL_TESTS = \ tests/swizzle-4.shader_test \ tests/swizzle-5.shader_test \ tests/swizzle-6.shader_test \ - tests/swizzle-7.shader_test + tests/swizzle-7.shader_test \ + tests/trigonometry.shader_test endif if BUILD_DEMOS diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 709fc006..0e9694a4 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -190,6 +190,29 @@ static void parse_test_directive(struct shader_context *context, const char *lin release_resource_readback(&rb); reset_command_list(context->c.list, context->c.allocator); } + else if (match_string(line, "probe rgba", &line)) + { + struct resource_readback rb; + unsigned int x, y, ulps; + struct vec4 v; + RECT rect; + int ret; + + ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); + if (ret < 6) + goto err; + if (ret < 7) + ulps = 0; + + get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); + rect.left = x; + rect.right = x + 1; + rect.top = y; + rect.bottom = y + 1; + check_readback_data_vec4(&rb, &rect, &v, ulps); + release_resource_readback(&rb); + reset_command_list(context->c.list, context->c.allocator); + } else if (match_string(line, "uniform", &line)) { unsigned int offset; diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test new file mode 100644 index 00000000..07a280a0 --- /dev/null +++ b/tests/trigonometry.shader_test @@ -0,0 +1,24 @@ +[pixel shader] +float4 main(float4 pos : SV_POSITION) : SV_TARGET +{ + return float4(sin(pos.x - 0.5), cos(pos.x - 0.5), 0, 0); +} + +[test] +draw quad +probe rgba ( 0, 0) ( 0.00000000, 1.00000000, 0.0, 0.0) +probe rgba ( 1, 0) ( 0.84147098, 0.54030231, 0.0, 0.0) 1024 +probe rgba ( 2, 0) ( 0.90929743, -0.41614684, 0.0, 0.0) 1024 +probe rgba ( 3, 0) ( 0.14112001, -0.98999250, 0.0, 0.0) 1024 +probe rgba ( 4, 0) (-0.75680250, -0.65364362, 0.0, 0.0) 1024 +probe rgba ( 5, 0) (-0.95892427, 0.28366219, 0.0, 0.0) 1024 +probe rgba ( 6, 0) (-0.27941550, 0.96017029, 0.0, 0.0) 1024 +probe rgba ( 7, 0) ( 0.65698660, 0.75390225, 0.0, 0.0) 1024 +probe rgba ( 8, 0) ( 0.98935825, -0.14550003, 0.0, 0.0) 1024 +probe rgba ( 9, 0) ( 0.41211849, -0.91113026, 0.0, 0.0) 1024 +probe rgba (10, 0) (-0.54402111, -0.83907153, 0.0, 0.0) 1024 +probe rgba (11, 0) (-0.99999021, 0.00442570, 0.0, 0.0) 1024 +probe rgba (12, 0) (-0.53657292, 0.84385396, 0.0, 0.0) 1024 +probe rgba (13, 0) ( 0.42016704, 0.90744678, 0.0, 0.0) 1024 +probe rgba (14, 0) ( 0.99060736, 0.13673722, 0.0, 0.0) 1024 +probe rgba (15, 0) ( 0.65028784, -0.75968791, 0.0, 0.0) 1024 -- 2.28.0

2 9

[PATCH 1/5] evr/presenter: Create d3d device on presenter creation.
by Nikolay Sivov 02 Oct '20

02 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/Makefile.in | 2 +- dlls/evr/presenter.c | 47 +++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 55 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 92 insertions(+), 12 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 6d936d65b79..02cdb9b820a 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,6 +1,6 @@ MODULE = evr.dll IMPORTLIB = evr -IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 dxva2 +IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2 DELAYIMPORTS = mfplat EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index b60de4b82a1..04653ff67ad 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -643,11 +643,47 @@ HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFII return CoCreateInstance(&CLSID_MFVideoPresenter9, owner, CLSCTX_INPROC_SERVER, riid, obj); } +static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) +{ + D3DPRESENT_PARAMETERS present_params = { 0 }; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HRESULT hr; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + + present_params.BackBufferCount = 1; + present_params.SwapEffect = D3DSWAPEFFECT_COPY; + present_params.hDeviceWindow = GetDesktopWindow(); + present_params.Windowed = TRUE; + present_params.Flags = D3DPRESENTFLAG_VIDEO; + present_params.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, GetDesktopWindow(), + 0, &present_params, &device); + + IDirect3D9_Release(d3d); + + if (FAILED(hr)) + { + WARN("Failed to create d3d device, hr %#x.\n", hr); + return hr; + } + + hr = IDirect3DDeviceManager9_ResetDevice(presenter->device_manager, device, presenter->reset_token); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + WARN("Failed to set new device for the manager, hr %#x.\n", hr); + + return hr; +} + HRESULT evr_presenter_create(IUnknown *outer, void **out) { struct video_presenter *object; HRESULT hr; + *out = NULL; + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -663,12 +699,13 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) - { IUnknown_Release(&object->IUnknown_inner); - return hr; - } - *out = &object->IUnknown_inner; + if (FAILED(hr = video_presenter_init_d3d(object))) + IUnknown_Release(&object->IUnknown_inner); - return S_OK; + if (SUCCEEDED(hr)) + *out = &object->IUnknown_inner; + + return hr; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 0dff691b59f..c2e17595559 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -39,7 +39,7 @@ static HWND create_window(void) AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); - return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + return CreateWindowA("static", "evr_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } @@ -967,12 +967,16 @@ done: static void test_default_presenter(void) { D3DDEVICE_CREATION_PARAMETERS device_params = { 0 }; + D3DPRESENT_PARAMETERS present_params = { 0 }; + IMFVideoDisplayControl *display_control; + IDirect3DSwapChain9 *swapchain; IMFVideoPresenter *presenter; IMFRateSupport *rate_support; IDirect3DDevice9 *d3d_device; IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; IMFGetService *gs; + HWND hwnd, hwnd2; HANDLE handle; IUnknown *unk; float rate; @@ -1010,33 +1014,70 @@ static void test_default_presenter(void) hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFVideoDisplayControl_Release(display_control); + hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_OpenDeviceHandle(dm, &handle); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(dm, handle, &d3d_device, FALSE); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ hr = IDirect3DDevice9_GetCreationParameters(d3d_device, &device_params); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(device_params.hFocusWindow == GetDesktopWindow(), "Unexpected window %p.\n", device_params.hFocusWindow); + hr = IDirect3DDevice9_GetSwapChain(d3d_device, 0, &swapchain); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_params); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); + ok(present_params.Windowed, "Unexpected windowed mode.\n"); + ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); + ok(present_params.Flags == D3DPRESENTFLAG_VIDEO, "Unexpected flags.\n"); + ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); + IDirect3DDevice9_Release(d3d_device); hr = IDirect3DDeviceManager9_UnlockDevice(dm, handle, FALSE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); + hwnd = create_window(); + ok(!!hwnd, "Failed to create a test window.\n"); + + hwnd2 = hwnd; + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2); +} + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); +todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hwnd2 = NULL; + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2); } + hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDirect3DDeviceManager9_Release(dm); + IMFVideoDisplayControl_Release(display_control); IMFGetService_Release(gs); /* Rate support. */ @@ -1066,6 +1107,8 @@ if (SUCCEEDED(hr)) IMFRateSupport_Release(rate_support); IMFVideoPresenter_Release(presenter); + + DestroyWindow(hwnd); } static void test_MFCreateVideoMixerAndPresenter(void) -- 2.28.0

1 4

[PATCH v4] user32: Implement GetMouseMovePointsEx().
by Rémi Bernon 02 Oct '20

02 Oct '20

From: Arkadiusz Hiler <ahiler(a)codeweavers.com> With this patch we start storing history of last 64 mouse positions on the server side which can be retrieved by the newly introduced get_cursor_history request. The history is kept in reverse chronological order in an array that acts as circular buffer - this makes it easy to iterate over it in GetMouseMovePointsEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36873 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Fix a few remaining white spaces issues, sign it off. Supersedes: 192973 dlls/user32/input.c | 60 ++++++++++++++++++++++---- dlls/user32/tests/input.c | 88 +++++++++++++++++++++++++++++++++++++++ server/protocol.def | 22 ++++++++++ server/queue.c | 29 +++++++++++++ server/trace.c | 28 +++++++++++++ 5 files changed, 219 insertions(+), 8 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 150b7de9704..75905beebce 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1271,22 +1271,66 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) * Success: count of point set in the buffer * Failure: -1 */ -int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOINT ptout, int count, DWORD res) { +int WINAPI GetMouseMovePointsEx( UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOINT ptout, int count, DWORD resolution ) +{ + cursor_history_t history; + cursor_pos_t *pos; + int copied; + unsigned int i; - if((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > 64)) { - SetLastError(ERROR_INVALID_PARAMETER); + C_ASSERT( ARRAY_SIZE( history.positions ) == 64 ); + + TRACE( "%d, %p, %p, %d, %d\n", size, ptin, ptout, count, resolution ); + + if ((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > ARRAY_SIZE( history.positions ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); return -1; } - if(!ptin || (!ptout && count)) { - SetLastError(ERROR_NOACCESS); + if (!ptin || (!ptout && count)) + { + SetLastError( ERROR_NOACCESS ); return -1; } - FIXME("(%d %p %p %d %d) stub\n", size, ptin, ptout, count, res); + if (resolution != GMMP_USE_DISPLAY_POINTS) + { + FIXME( "only GMMP_USE_DISPLAY_POINTS is supported for now\n" ); + SetLastError( ERROR_POINT_NOT_FOUND ); + return -1; + } + + SERVER_START_REQ( get_cursor_history ) + { + wine_server_set_reply( req, &history, sizeof(history) ); + if (wine_server_call_err( req )) return -1; + } + SERVER_END_REQ; + + for (i = 0; i < ARRAY_SIZE( history.positions ); i++) + { + pos = &history.positions[(i + history.newest) % ARRAY_SIZE( history.positions )]; + if (ptin->x == pos->x && ptin->y == pos->y && (!ptin->time || ptin->time == pos->time)) + break; + } + + if (i == ARRAY_SIZE( history.positions )) + { + SetLastError( ERROR_POINT_NOT_FOUND ); + return -1; + } + + for (copied = 0; copied < count && i < ARRAY_SIZE( history.positions ); copied++, i++) + { + pos = &history.positions[(i + history.newest) % ARRAY_SIZE( history.positions )]; + ptout[copied].x = pos->x; + ptout[copied].y = pos->y; + ptout[copied].time = pos->time; + ptout[copied].dwExtraInfo = pos->info; + } - SetLastError(ERROR_POINT_NOT_FOUND); - return -1; + return copied; } /*********************************************************************** diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ef6d6e1d430..c3363877b73 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1481,6 +1481,7 @@ static void test_GetMouseMovePointsEx(void) MOUSEMOVEPOINT in; MOUSEMOVEPOINT out[200]; POINT point; + TEST_INPUT input; /* Get a valid content for the input struct */ if(!GetCursorPos(&point)) { @@ -1605,6 +1606,93 @@ static void test_GetMouseMovePointsEx(void) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* more than 64 to be sure we wrap around */ + for (int i = 0; i < 67; i++) + { + in.x = i; + in.y = i*2; + SetCursorPos( in.x, in.y ); + } + + SetLastError( MYERROR ); + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( GetLastError() == MYERROR, "expected error to stay %x, got %x\n", MYERROR, GetLastError() ); + + for (int i = 0; i < retval; i++) + { + ok( out[i].x == in.x && out[i].y == in.y, "wrong position %d, expected %dx%d got %dx%d\n", i, in.x, in.y, out[i].x, out[i].y ); + in.x--; + in.y -= 2; + } + + in.x = 1500; + in.y = 1500; + SetLastError( MYERROR ); + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == -1, "expected to get -1 but got %d\n", retval ); + ok( GetLastError() == ERROR_POINT_NOT_FOUND, "expected error to be set to %x, got %x\n", ERROR_POINT_NOT_FOUND, GetLastError() ); + + /* make sure there's no deduplication */ + in.x = 6; + in.y = 6; + SetCursorPos( in.x, in.y ); + SetCursorPos( in.x, in.y ); + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( out[0].x == 6 && out[0].y == 6, "expected cursor position to be 6x6 but got %d %d\n", out[0].x, out[0].y ); + ok( out[1].x == 6 && out[1].y == 6, "expected cursor position to be 6x6 but got %d %d\n", out[1].x, out[1].y ); + + /* make sure 2 events are distinguishable by their timestamps */ + in.x = 150; + in.y = 75; + SetCursorPos( 30, 30 ); + SetCursorPos( in.x, in.y ); + SetCursorPos( 150, 150 ); + Sleep( 3 ); + SetCursorPos( in.x, in.y ); + + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( out[0].x == 150 && out[0].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[0].x, out[0].y ); + ok( out[1].x == 150 && out[1].y == 150, "expected cursor position to be 150x150 but got %d %d\n", out[1].x, out[1].y ); + ok( out[2].x == 150 && out[2].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[2].x, out[2].y ); + + in.time = out[2].time; + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 62, "expected to get 62 mouse move points but got %d\n", retval ); + ok( out[0].x == 150 && out[0].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[0].x, out[0].y ); + ok( out[1].x == 30 && out[1].y == 30, "expected cursor position to be 30x30 but got %d %d\n", out[1].x, out[1].y ); + + /* events created through other means should also be on the list with correct extra info */ + mouse_event( MOUSEEVENTF_MOVE, -13, 17, 0, 0xcafecafe ); + ok( GetCursorPos( &point ), "failed to get cursor position\n" ); + ok( in.x != point.x && in.y != point.y, "cursor didn't change position after mouse_event()\n" ); + in.time = 0; + in.x = point.x; + in.y = point.y; + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( out[0].dwExtraInfo == 0xcafecafe, "wrong extra info, got 0x%lx expected 0xcafecafe\n", out[0].dwExtraInfo ); + + input.type = INPUT_MOUSE; + memset( &input, 0, sizeof(input) ); + input.u.mi.dwFlags = MOUSEEVENTF_MOVE; + input.u.mi.dwExtraInfo = 0xdeadbeef; + input.u.mi.dx = -17; + input.u.mi.dy = 13; + SendInput( 1, (INPUT *)&input, sizeof(INPUT) ); + ok( GetCursorPos( &point ), "failed to get cursor position\n" ); + ok( in.x != point.x && in.y != point.y, "cursor didn't change position after mouse_event()\n" ); + in.time = 0; + in.x = point.x; + in.y = point.y; + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( out[0].dwExtraInfo == 0xdeadbeef, "wrong extra info, got 0x%lx expected 0xdeadbeef\n", out[0].dwExtraInfo ); + + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_HIGH_RESOLUTION_POINTS ); + todo_wine ok( retval == 64, "expected to get 64 high resolution mouse move points but got %d\n", retval ); #undef BUFLIM #undef MYERROR } diff --git a/server/protocol.def b/server/protocol.def index 860632ee127..d7d3061c043 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -801,6 +801,22 @@ struct rawinput_device user_handle_t target; }; +typedef struct +{ + int x; + int y; + unsigned int time; + int __pad; + lparam_t info; +} cursor_pos_t; + +typedef struct +{ + unsigned int newest; + int __pad; + cursor_pos_t positions[64]; +} cursor_history_t; + /****************************************************************/ /* Request declarations */ @@ -3640,6 +3656,12 @@ struct handle_info #define SET_CURSOR_CLIP 0x08 #define SET_CURSOR_NOCLIP 0x10 +/* Get the history of the 64 last cursor positions */ +(a)REQ(get_cursor_history) +(a)REPLY + VARARG(history,cursor_history); +(a)END + /* Batch read rawinput message data */ @REQ(get_rawinput_buffer) diff --git a/server/queue.c b/server/queue.c index eba5de0972e..f29e8e45028 100644 --- a/server/queue.c +++ b/server/queue.c @@ -227,6 +227,8 @@ static const struct object_ops thread_input_ops = /* pointer to input structure of foreground thread */ static unsigned int last_input_time; +static cursor_history_t cursor_history; + static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ); static void free_message( struct message *msg ); @@ -1528,14 +1530,32 @@ static void update_rawinput_device(const struct rawinput_device *device) e->device.target = get_user_full_handle( e->device.target ); } +static void prepend_cursor_history( int x, int y, unsigned int time, lparam_t info ) +{ + const size_t positions_len = ARRAY_SIZE( cursor_history.positions ); + cursor_pos_t *pos; + cursor_history.newest = (cursor_history.newest + positions_len - 1) % positions_len; + pos = &cursor_history.positions[cursor_history.newest]; + + pos->x = x; + pos->y = y; + pos->time = time; + pos->info = info; +} + /* queue a hardware message into a given thread input */ static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ) { user_handle_t win; struct thread *thread; struct thread_input *input; + struct hardware_msg_data *msg_data; unsigned int msg_code; + msg_data = msg->data; + if (msg->msg == WM_MOUSEMOVE) + prepend_cursor_history( msg->x, msg->y, msg->time, msg_data->info ); + update_input_key_state( desktop, desktop->keystate, msg->msg, msg->wparam ); last_input_time = get_tick_count(); if (msg->msg != WM_MOUSEMOVE) always_queue = 1; @@ -3313,6 +3333,15 @@ DECL_HANDLER(set_cursor) reply->last_change = input->desktop->cursor.last_change; } +/* Get the history of the 64 last cursor positions */ +DECL_HANDLER(get_cursor_history) +{ + if (sizeof(cursor_history) <= get_reply_max_size()) + set_reply_data( &cursor_history, min( sizeof(cursor_history), get_reply_max_size() ) ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); +} + DECL_HANDLER(get_rawinput_buffer) { struct thread_input *input = current->queue->input; diff --git a/server/trace.c b/server/trace.c index 32ccad16684..b7a242cd41a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -889,6 +889,34 @@ static void dump_varargs_rectangles( const char *prefix, data_size_t size ) remove_data( size ); } +static void dump_varargs_cursor_history( const char *prefix, data_size_t size ) +{ + const cursor_history_t *history = cur_data; + const cursor_pos_t *pos; + data_size_t len; + if (size != sizeof(*history)) + { + fprintf( stderr, "%s{}", prefix ); + return; + } + + fprintf( stderr, "%s{", prefix ); + fprintf( stderr, "newest=%u,", history->newest ); + fprintf( stderr, "positions={" ); + len = ARRAY_SIZE( history->positions ); + pos = history->positions; + while (len > 0) + { + fprintf( stderr, "{x=%d,y=%d,time=%u", pos->x, pos->y, pos->time ); + dump_uint64( ",info=", &pos->info ); + fputc( '}', stderr ); + pos++; + if (--len) fputc( ',', stderr ); + } + fputc( '}', stderr ); + fputc( '}', stderr ); +} + static void dump_varargs_message_data( const char *prefix, data_size_t size ) { /* FIXME: dump the structured data */ -- 2.28.0

4 4