wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Francois Gouget : dxgi/tests: Mark the test_swapchain_window_styles() tests failing randomly on Windows as flaky.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 5b10cb08a5d0a911be465cba071cb9d2149d336d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b10cb08a5d0a911be465cba071cb9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 11:07:41 2022 +0200 dxgi/tests: Mark the test_swapchain_window_styles() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53228 --- dlls/dxgi/tests/dxgi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 1874bcc0834..8c16cd37d45 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6120,6 +6120,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6136,6 +6137,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6164,6 +6166,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6190,7 +6193,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); - todo_wine + flaky_if(i == 4) todo_wine ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); } @@ -6206,7 +6209,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); - todo_wine + flaky_if(i == 4) todo_wine ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle);

1 0

Paul Gofman : wined3d: Replace NULL device_window with focus window in swapchain desc.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 6b5193558960da860903138e1fdcd099ea364c70 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b5193558960da860903138e1fdcd0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 28 14:01:27 2022 -0500 wined3d: Replace NULL device_window with focus window in swapchain desc. --- dlls/d3d9/tests/device.c | 6 +++--- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/swapchain.c | 8 +++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d42b210b01f..5c4417a2568 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1354,7 +1354,7 @@ static void test_swapchain(void) ok(hr == D3D_OK, "Got hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain2, &d3dpp); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); + ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); d3dpp.BackBufferCount = 2; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain3); @@ -12242,7 +12242,7 @@ static void test_swapchain_parameters(void) hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", present_parameters2.hDeviceWindow, window); ok(present_parameters2.SwapEffect == tests[i].swap_effect, "Swap effect changed from %u to %u, test %u.\n", tests[i].swap_effect, present_parameters2.SwapEffect, i); @@ -12283,7 +12283,7 @@ static void test_swapchain_parameters(void) ok(hr == D3D_OK, "Got hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", present_parameters2.hDeviceWindow, window); IDirect3DSwapChain9_Release(swapchain); IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d1c18177d62..c314292031d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5582,6 +5582,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_view_desc view_desc; BOOL backbuffer_resized, windowed; HRESULT hr = WINED3D_OK; + HWND device_window; unsigned int i; TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", @@ -5658,12 +5659,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, current_desc->refresh_rate = swapchain_desc->refresh_rate; current_desc->auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; - if (swapchain_desc->device_window && swapchain_desc->device_window != current_desc->device_window) + device_window = swapchain_desc->device_window ? swapchain_desc->device_window : device->create_parms.focus_window; + if (device_window && device_window != current_desc->device_window) { TRACE("Changing the device window from %p to %p.\n", - current_desc->device_window, swapchain_desc->device_window); - current_desc->device_window = swapchain_desc->device_window; - swapchain_state->device_window = swapchain_desc->device_window; + current_desc->device_window, device_window); + current_desc->device_window = device_window; + swapchain_state->device_window = device_window; wined3d_swapchain_set_window(swapchain, NULL); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 80e630fd41e..e40707c0e54 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1459,7 +1459,13 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc && desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); - window = desc->device_window ? desc->device_window : device->create_parms.focus_window; + if (!desc->device_window) + { + TRACE("Updating device_window to %p.\n", device->create_parms.focus_window); + desc->device_window = device->create_parms.focus_window; + } + window = desc->device_window; + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr);

1 0

Paul Gofman : d3d9/tests: Add test for NULL hDeviceWindow in presentation parameters.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 832383f5cd329b9187dc73c785dc17a487a3b163 URL: https://gitlab.winehq.org/wine/wine/-/commit/832383f5cd329b9187dc73c785dc17… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 27 18:31:20 2022 -0500 d3d9/tests: Add test for NULL hDeviceWindow in presentation parameters. --- dlls/d3d9/tests/device.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c824edec9df..d42b210b01f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1348,9 +1348,13 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain2); - ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain2, &d3dpp); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); d3dpp.BackBufferCount = 2; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain3); @@ -12208,7 +12212,7 @@ static void test_swapchain_parameters(void) present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters_windowed.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters_windowed.hDeviceWindow = window; + present_parameters_windowed.hDeviceWindow = NULL; present_parameters_windowed.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters_windowed.SwapEffect = D3DSWAPEFFECT_COPY; present_parameters_windowed.Windowed = TRUE; @@ -12219,7 +12223,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect; @@ -12237,7 +12241,9 @@ static void test_swapchain_parameters(void) ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#lx, test %u.\n", hr, i); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); - ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#lx, test %u.\n", hr, i); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + present_parameters2.hDeviceWindow, window); ok(present_parameters2.SwapEffect == tests[i].swap_effect, "Swap effect changed from %u to %u, test %u.\n", tests[i].swap_effect, present_parameters2.SwapEffect, i); ok(present_parameters2.BackBufferCount == bb_count, "Backbuffer count changed from %u to %u, test %u.\n", @@ -12256,7 +12262,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect; @@ -12268,9 +12274,18 @@ static void test_swapchain_parameters(void) if (FAILED(hr)) { + present_parameters_windowed.hDeviceWindow = NULL; hr = IDirect3DDevice9_Reset(device, &present_parameters_windowed); ok(SUCCEEDED(hr), "Failed to reset device, hr %#lx, test %u.\n", hr, i); } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + present_parameters2.hDeviceWindow, window); + IDirect3DSwapChain9_Release(swapchain); IDirect3DDevice9_Release(device); }

1 0

Paul Gofman : d3d8/tests: Add test for NULL hDeviceWindow in presentation parameters.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 4d4a4ff5b978c0ddbd020fea9fd6d8f147fe5579 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d4a4ff5b978c0ddbd020fea9fd6d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 28 13:58:31 2022 -0500 d3d8/tests: Add test for NULL hDeviceWindow in presentation parameters. --- dlls/d3d8/tests/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4f362ad5ea5..12d8aeb89f6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -413,9 +413,10 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1; hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain2); - ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); d3dpp.BackBufferCount = 2; hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain3); @@ -8714,6 +8715,7 @@ static void test_swapchain_parameters(void) present_parameters_windowed.Windowed = TRUE; present_parameters_windowed.BackBufferCount = 1; + for (i = 0; i < ARRAY_SIZE(tests); ++i) { UINT bb_count = tests[i].backbuffer_count ? tests[i].backbuffer_count : 1; @@ -8721,7 +8723,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect; @@ -8752,7 +8754,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect;

1 0

Paul Gofman : wintrust: Support WSS_GET_SECONDARY_SIG_COUNT in Softpub provider.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2c9ab24366907a95f5741c20beaaee7eabc765ff URL: https://gitlab.winehq.org/wine/wine/-/commit/2c9ab24366907a95f5741c20beaaee… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 21:37:51 2022 -0500 wintrust: Support WSS_GET_SECONDARY_SIG_COUNT in Softpub provider. --- dlls/wintrust/softpub.c | 5 +++++ dlls/wintrust/tests/softpub.c | 6 +++--- dlls/wintrust/wintrust_main.c | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d4f0088f620..06b178a98b9 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -909,6 +909,11 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); load_secondary_signatures(data, data->pSigState->hPrimarySig); } + if (data->pSigSettings) + { + if (data->pSigSettings->dwFlags & WSS_GET_SECONDARY_SIG_COUNT) + data->pSigSettings->cSecondarySigs = data->pSigState->cSecondarySigs; + } } if (!err && data->hMsg) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index eb411bc7daf..77e15b2feb4 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1830,7 +1830,7 @@ static void test_multiple_signatures(void) prov = (CRYPT_PROVIDER_DATA *)data.hWVTStateData; ok(prov->cbStruct == sizeof(*prov), "Got size %lu.\n", prov->cbStruct); ok(prov->csSigners == 1, "Got %lu.\n", prov->csSigners); - todo_wine ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); + ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); if (prov->cbStruct == sizeof(*prov) && prov->pSigState) { @@ -1867,7 +1867,7 @@ static void test_multiple_signatures(void) settings.dwVerifiedSigIndex = 0xcccccccc; status = WinVerifyTrust(NULL, &WVTPolicyGUID, &data); todo_wine ok(status == CERT_E_UNTRUSTEDROOT || status == CERT_E_CHAINING, "Failed, ret %#lx\n", status); - todo_wine ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); + ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); todo_wine ok(settings.dwVerifiedSigIndex == 2, "Got %lu.\n", settings.dwVerifiedSigIndex); data.dwStateAction = WTD_STATEACTION_CLOSE; @@ -1881,7 +1881,7 @@ static void test_multiple_signatures(void) settings.dwIndex = 1; status = WinVerifyTrust(NULL, &WVTPolicyGUID, &data); todo_wine ok(status == CERT_E_UNTRUSTEDROOT || status == CERT_E_CHAINING, "Failed, ret %#lx\n", status); - todo_wine ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); + ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); todo_wine ok(settings.dwVerifiedSigIndex == 1, "Got %lu.\n", settings.dwVerifiedSigIndex); settings.dwIndex = 0; diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 33695008b24..925ae7ca85a 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -294,6 +294,10 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, data->hWVTStateData = provData; provData->pWintrustData = data; + + if (WVT_ISINSTRUCT(WINTRUST_DATA, data->cbStruct, pSignatureSettings)) + provData->pSigSettings = data->pSignatureSettings; + if (hwnd == INVALID_HANDLE_VALUE) provData->hWndParent = GetDesktopWindow(); else

1 0

Paul Gofman : wintrust: Load secondary signatures in SoftpubLoadSignature().
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 71f58158c1960a42ab89384ee5640064826fa6a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/71f58158c1960a42ab89384ee56400… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 21:25:18 2022 -0500 wintrust: Load secondary signatures in SoftpubLoadSignature(). --- dlls/wintrust/softpub.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 2 +- include/wintrust.h | 2 ++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 1165f03c075..d4f0088f620 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -830,6 +830,57 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) return err; } +static void load_secondary_signatures(CRYPT_PROVIDER_DATA *data, HCRYPTMSG msg) +{ + CRYPT_PROVIDER_SIGSTATE *s = data->pSigState; + CRYPT_ATTRIBUTES *attrs; + unsigned int i, j; + DWORD size; + + if (!CryptMsgGetParam(msg, CMSG_SIGNER_UNAUTH_ATTR_PARAM, 0, NULL, &size)) + return; + + if (!(attrs = data->psPfns->pfnAlloc(size))) + { + ERR("No memory.\n"); + return; + } + if (!CryptMsgGetParam(msg, CMSG_SIGNER_UNAUTH_ATTR_PARAM, 0, attrs, &size)) + goto done; + + for (i = 0; i < attrs->cAttr; ++i) + { + if (strcmp(attrs->rgAttr[i].pszObjId, szOID_NESTED_SIGNATURE)) + continue; + + if (!(s->rhSecondarySigs = data->psPfns->pfnAlloc(attrs->rgAttr[i].cValue * sizeof(*s->rhSecondarySigs)))) + { + ERR("No memory"); + goto done; + } + s->cSecondarySigs = 0; + for (j = 0; j < attrs->rgAttr[i].cValue; ++j) + { + if (!(msg = CryptMsgOpenToDecode(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL))) + { + ERR("Could not create crypt message.\n"); + goto done; + } + if (!CryptMsgUpdate(msg, attrs->rgAttr[i].rgValue[j].pbData, attrs->rgAttr[i].rgValue[j].cbData, TRUE)) + { + ERR("Could not update crypt message, err %lu.\n", GetLastError()); + CryptMsgClose(msg); + goto done; + } + s->rhSecondarySigs[j] = msg; + ++s->cSecondarySigs; + } + break; + } +done: + data->psPfns->pfnFree(attrs); +} + HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { DWORD err = ERROR_SUCCESS; @@ -854,7 +905,10 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) data->pSigState->fSupportMultiSig = TRUE; data->pSigState->dwCryptoPolicySupport = WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT; if (data->hMsg) + { data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); + load_secondary_signatures(data, data->pSigState->hPrimarySig); + } } if (!err && data->hMsg) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 070e7c52034..eb411bc7daf 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1840,7 +1840,7 @@ static void test_multiple_signatures(void) ok(prov->pSigState->fSupportMultiSig, "Got %d.\n", prov->pSigState->fSupportMultiSig); ok(prov->pSigState->dwCryptoPolicySupport == (WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT), "Got %#lx.\n", prov->pSigState->dwCryptoPolicySupport); - todo_wine ok(prov->pSigState->cSecondarySigs == 2, "Got %lu.\n", prov->pSigState->cSecondarySigs); + ok(prov->pSigState->cSecondarySigs == 2, "Got %lu.\n", prov->pSigState->cSecondarySigs); size = sizeof(buf); bret = CryptMsgGetParam(prov->pSigState->hPrimarySig, CMSG_SIGNER_CERT_INFO_PARAM, 0, buf, &size); diff --git a/include/wintrust.h b/include/wintrust.h index dd85369e322..eeb149822b4 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -475,6 +475,8 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); CRYPT_PROVIDER_PRIVDATA * WINAPI WTHelperGetProvPrivateDataFromChain(CRYPT_PROVIDER_DATA *,GUID *); +#define szOID_NESTED_SIGNATURE "1.3.6.1.4.1.311.2.4.1" + #define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4" #define SPC_SP_AGENCY_INFO_OBJID "1.3.6.1.4.1.311.2.1.10" #define SPC_STATEMENT_TYPE_OBJID "1.3.6.1.4.1.311.2.1.11"

1 0

Paul Gofman : wintrust: Initialize CRYPT_PROVIDER_SIGSTATE structure in Softpub provider.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2f5ad179e53d8e5d5147f53a2a4578c8d7ab619f URL: https://gitlab.winehq.org/wine/wine/-/commit/2f5ad179e53d8e5d5147f53a2a4578… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 19:44:29 2022 -0500 wintrust: Initialize CRYPT_PROVIDER_SIGSTATE structure in Softpub provider. --- dlls/wintrust/softpub.c | 32 ++++++++++++++++++++++++++++---- dlls/wintrust/tests/softpub.c | 2 +- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 53df5e7fe60..1165f03c075 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -832,14 +832,32 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { - DWORD err; + DWORD err = ERROR_SUCCESS; TRACE("(%p)\n", data); if (!data->padwTrustStepErrors) return S_FALSE; - if (data->hMsg) + if (data->pSigState) + { + /* We did not initialize this, probably an unsupported usage. */ + FIXME("pSigState %p already initialized.\n", data->pSigState); + } + if (!(data->pSigState = data->psPfns->pfnAlloc(sizeof(*data->pSigState)))) + { + err = ERROR_OUTOFMEMORY; + } + else + { + data->pSigState->cbStruct = sizeof(*data->pSigState); + data->pSigState->fSupportMultiSig = TRUE; + data->pSigState->dwCryptoPolicySupport = WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT; + if (data->hMsg) + data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); + } + + if (!err && data->hMsg) { DWORD signerCount, size; @@ -859,8 +877,7 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) else err = TRUST_E_NOSIGNATURE; } - else - err = ERROR_SUCCESS; + if (err) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = err; return !err ? S_OK : S_FALSE; @@ -1375,6 +1392,13 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) data->psPfns->pfnFree(data->u.pPDSip->psIndirectData); } + if (WVT_ISINSTRUCT(CRYPT_PROVIDER_DATA, data->cbStruct, pSigState) && data->pSigState) + { + CryptMsgClose(data->pSigState->hPrimarySig); + for (i = 0; i < data->pSigState->cSecondarySigs; ++i) + CryptMsgClose(data->pSigState->rhSecondarySigs[i]); + data->psPfns->pfnFree(data->pSigState); + } CryptMsgClose(data->hMsg); if (data->fOpenedFile && diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index ab9655ef7e8..070e7c52034 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1831,7 +1831,7 @@ static void test_multiple_signatures(void) ok(prov->cbStruct == sizeof(*prov), "Got size %lu.\n", prov->cbStruct); ok(prov->csSigners == 1, "Got %lu.\n", prov->csSigners); todo_wine ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); - todo_wine ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); + ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); if (prov->cbStruct == sizeof(*prov) && prov->pSigState) { ok(prov->pSigState->cbStruct == sizeof(*prov->pSigState)

1 0

Paul Gofman : wintrust/tests: Add tests for multiple PE signatures.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 6071205974f7767d5b967fb2d0e46433498c5b3d URL: https://gitlab.winehq.org/wine/wine/-/commit/6071205974f7767d5b967fb2d0e464… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 16:11:33 2022 -0500 wintrust/tests: Add tests for multiple PE signatures. --- dlls/wintrust/tests/softpub.c | 581 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 581 insertions(+)

1 0

Gabriel Ivăncescu : mshtml: Enumerate document elements with name.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 16c6c249a5134de2422fbd3471ead7425c968301 URL: https://gitlab.winehq.org/wine/wine/-/commit/16c6c249a5134de2422fbd3471ead7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:22 2022 +0300 mshtml: Enumerate document elements with name. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 70 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 1 - 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 40d86a170ac..d86ed07e033 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5890,6 +5890,74 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, return S_OK; } +static HRESULT HTMLDocumentNode_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pid) +{ + DWORD idx = (id == DISPID_STARTENUM) ? 0 : id - MSHTML_DISPID_CUSTOM_MIN + 1; + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + nsIDOMNodeList *node_list; + const PRUnichar *name; + nsIDOMElement *nselem; + nsIDOMNode *nsnode; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + UINT32 i; + + if(!This->nsdoc) + return S_FALSE; + + while(idx < This->elem_vars_cnt) { + hres = has_elem_name(This->nsdoc, This->elem_vars[idx]); + if(SUCCEEDED(hres)) { + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; + } + if(hres != DISP_E_UNKNOWNNAME) + return hres; + idx++; + } + + /* Populate possibly missing DISPIDs */ + nsAString_InitDepend(&nsstr, L"[name]"); + nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->nsdoc, &nsstr, &node_list); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + for(i = 0, hres = S_OK; SUCCEEDED(hres); i++) { + nsres = nsIDOMNodeList_Item(node_list, i, &nsnode); + if(NS_FAILED(nsres)) { + hres = map_nsresult(nsres); + break; + } + if(!nsnode) + break; + + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + nsIDOMNode_Release(nsnode); + if(nsres != S_OK) + continue; + + nsres = get_elem_attr_value(nselem, L"name", &nsstr, &name); + nsIDOMElement_Release(nselem); + if(NS_FAILED(nsres)) + hres = map_nsresult(nsres); + else { + hres = dispid_from_elem_name(This, name, &id); + nsAString_Finish(&nsstr); + } + } + nsIDOMNodeList_Release(node_list); + if(FAILED(hres)) + return hres; + + if(idx >= This->elem_vars_cnt) + return S_FALSE; + + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; +} + static compat_mode_t HTMLDocumentNode_get_compat_mode(DispatchEx *dispex) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); @@ -5948,7 +6016,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { HTMLDocumentNode_get_name, HTMLDocumentNode_invoke, NULL, - NULL, + HTMLDocumentNode_next_dispid, HTMLDocumentNode_get_compat_mode, NULL }, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index a3a0e2439cd..ad258b3df2e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -703,7 +703,6 @@ sync_test("elem_by_id", function() { if(id_elem === "testname") found = true; } - todo_wine. ok(found, "testname was not enumerated in document"); });

1 0

Gabriel Ivăncescu : mshtml: Split the lookup for an element with name into a separate helper.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 6420744c57429ab20818adefc4ebdc864584b4ba URL: https://gitlab.winehq.org/wine/wine/-/commit/6420744c57429ab20818adefc4ebdc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:22 2022 +0300 mshtml: Split the lookup for an element with name into a separate helper. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0c96d73eb76..40d86a170ac 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4818,30 +4818,30 @@ static inline HTMLDocument *impl_from_IDispatchEx(IDispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDocument, IDispatchEx_iface); } -static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, BSTR name, DISPID *dispid) +static HRESULT has_elem_name(nsIDOMHTMLDocument *nsdoc, const WCHAR *name) { nsIDOMNodeList *node_list; nsAString name_str; - UINT32 len; - unsigned i; nsresult nsres; - - if(!This->nsdoc) - return DISP_E_UNKNOWNNAME; + UINT32 len; nsAString_InitDepend(&name_str, name); - nsres = nsIDOMHTMLDocument_GetElementsByName(This->nsdoc, &name_str, &node_list); + nsres = nsIDOMHTMLDocument_GetElementsByName(nsdoc, &name_str, &node_list); nsAString_Finish(&name_str); if(NS_FAILED(nsres)) - return E_FAIL; + return map_nsresult(nsres); nsres = nsIDOMNodeList_GetLength(node_list, &len); nsIDOMNodeList_Release(node_list); if(NS_FAILED(nsres)) - return E_FAIL; + return map_nsresult(nsres); + + return len ? S_OK : DISP_E_UNKNOWNNAME; +} - if(!len) - return DISP_E_UNKNOWNNAME; +static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, const WCHAR *name, DISPID *dispid) +{ + unsigned i; for(i=0; i < This->elem_vars_cnt; i++) { if(!wcscmp(name, This->elem_vars[i])) { @@ -4943,7 +4943,12 @@ static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; - return dispid_from_elem_name(This->doc_node, bstrName, pid); + if(This->doc_node->nsdoc) { + hres = has_elem_name(This->doc_node->nsdoc, bstrName); + if(SUCCEEDED(hres)) + hres = dispid_from_elem_name(This->doc_node, bstrName, pid); + } + return hres; } static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp,

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
54
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 October 2022