January 2018 - Wine-commits

Henri Verbeet : wined3d: Use the resource access flags in wined3d_device_update_texture().
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 72a2f02486d9cde3da5cfccc33871a82c58af7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a2f02486d9cde3da5cfccc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:12:37 2018 +0330 wined3d: Use the resource access flags in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 67c1855..6a642c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3768,14 +3768,15 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture->resource.pool != WINED3D_POOL_SYSTEM_MEM || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) + if (src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU + || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) { - WARN("Source texture not in WINED3D_POOL_SYSTEM_MEM, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Source resource is GPU accessible or a scratch resource.\n"); return WINED3DERR_INVALIDCALL; } - if (dst_texture->resource.pool != WINED3D_POOL_DEFAULT) + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) { - WARN("Destination texture not in WINED3D_POOL_DEFAULT, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Destination resource is CPU accessible.\n"); return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : wined3d: Use the resource access flags in wined3d_device_evict_managed_resources() .
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 0bf0e0d3ae864dbb5f7a22e30603df912d402be2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf0e0d3ae864dbb5f7a22e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:12:38 2018 +0330 wined3d: Use the resource access flags in wined3d_device_evict_managed_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a642c9..3ad0d97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4651,7 +4651,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); - if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) + if (wined3d_resource_access_is_managed(resource->access) && !resource->map_count) { TRACE("Evicting %p.\n", resource); wined3d_cs_emit_unload_resource(device->cs, resource);

1 0

Henri Verbeet : d2d1: Use the global memory allocation helpers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 6d8ebf1d1a9895b0e43cd0d06d39546d86afe8f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d8ebf1d1a9895b0e43cd0d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:12:39 2018 +0330 d2d1: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 14 +++++----- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/brush.c | 29 ++++++++++---------- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/factory.c | 32 +++++++++++----------- dlls/d2d1/geometry.c | 57 ++++++++++++++++++---------------------- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/layer.c | 4 +-- dlls/d2d1/mesh.c | 4 +-- dlls/d2d1/render_target.c | 20 +++++++------- dlls/d2d1/state_block.c | 2 +- dlls/d2d1/stroke.c | 6 ++--- dlls/d2d1/wic_render_target.c | 2 +- include/wine/heap.h | 2 +- 15 files changed, 88 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d8ebf1d1a9895b0e43c…

1 0

Józef Kucia : wined3d: Simplify code paths in wined3d_cs_exec_update_sub_resource().
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 0735c53138c50fd8d76ece73a7dd9b71e737cf6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0735c53138c50fd8d76ece73… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 30 11:58:22 2018 +0100 wined3d: Simplify code paths in wined3d_cs_exec_update_sub_resource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 78443d1..bb9b915 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2170,31 +2170,31 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_update_sub_resource *op = data; + struct wined3d_resource *resource = op->resource; const struct wined3d_box *box = &op->box; unsigned int width, height, depth, level; struct wined3d_const_bo_address addr; struct wined3d_context *context; struct wined3d_texture *texture; - if (op->resource->type == WINED3D_RTYPE_BUFFER) + context = context_acquire(cs->device, NULL, 0); + + if (resource->type == WINED3D_RTYPE_BUFFER) { - struct wined3d_buffer *buffer = buffer_from_resource(op->resource); + struct wined3d_buffer *buffer = buffer_from_resource(resource); - context = context_acquire(op->resource->device, NULL, 0); if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) { ERR("Failed to load buffer location.\n"); - context_release(context); goto done; } wined3d_buffer_upload_data(buffer, context, box, op->data.data); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - context_release(context); goto done; } - texture = wined3d_texture_from_resource(op->resource); + texture = wined3d_texture_from_resource(resource); level = op->sub_resource_idx % texture->level_count; width = wined3d_texture_get_level_width(texture, level); @@ -2204,8 +2204,6 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi addr.buffer_object = 0; addr.addr = op->data.data; - context = context_acquire(op->resource->device, NULL, 0); - /* Only load the sub-resource for partial updates. */ if (!box->left && !box->top && !box->front && box->right == width && box->bottom == height && box->back == depth) @@ -2217,13 +2215,13 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_upload_data(texture, op->sub_resource_idx, context, box, &addr, op->data.row_pitch, op->data.slice_pitch); - context_release(context); - wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); done: - wined3d_resource_release(op->resource); + context_release(context); + + wined3d_resource_release(resource); } void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource,

1 0

Józef Kucia : dxgi: Add FIXME messages for unhandled DXGI_SWAP_CHAIN_FULLSCREEN_DESC fields.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: e0c76efcbbe79ad9a5b9b4189f42ffaef52bf55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c76efcbbe79ad9a5b9b418… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 30 15:54:54 2018 +0100 dxgi: Add FIXME messages for unhandled DXGI_SWAP_CHAIN_FULLSCREEN_DESC fields. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3f8816b..aa9cdb8 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -254,8 +254,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor IWineDXGIDevice *dxgi_device; HRESULT hr; - FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p partial stub!\n", + TRACE("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " + "output %p, swapchain %p.\n", iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); if (!device || !swapchain_desc || !swapchain) @@ -309,6 +309,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); wined3d_desc.backbuffer_width = swapchain_desc->Width; wined3d_desc.backbuffer_height = swapchain_desc->Height;

1 0

Józef Kucia : dxgi: Require window when creating swapchain.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 7e72c2d4ac8def96cec78114fc6fe292ad68e28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e72c2d4ac8def96cec78114… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 30 15:54:55 2018 +0100 dxgi: Require window when creating swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/dxgi/factory.c | 6 +----- dlls/dxgi/tests/device.c | 14 +++++++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 2b18110..7c2b3ba 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -252,7 +252,7 @@ static void test_create_device(void) swapchain_desc.OutputWindow = NULL; hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, &swapchain, &device); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "D3D10CreateDeviceAndSwapChain1 returned %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "D3D10CreateDeviceAndSwapChain1 returned %#x.\n", hr); ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain); ok(!device, "Got unexpected device pointer %p.\n", device); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ca71718..2625e08 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1616,7 +1616,7 @@ static void test_create_device(void) swapchain_desc.OutputWindow = NULL; hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, &swapchain, &device, &feature_level, &immediate_context); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "D3D11CreateDeviceAndSwapChain returned %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "D3D11CreateDeviceAndSwapChain returned %#x.\n", hr); ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain); ok(!device, "Got unexpected device pointer %p.\n", device); ok(!feature_level, "Got unexpected feature level %#x.\n", feature_level); diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index aa9cdb8..bea116b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -258,7 +258,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor "output %p, swapchain %p.\n", iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); - if (!device || !swapchain_desc || !swapchain) + if (!device || !window || !swapchain_desc || !swapchain) { WARN("Invalid pointer.\n"); return DXGI_ERROR_INVALID_CALL; @@ -292,10 +292,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); return DXGI_ERROR_INVALID_CALL; } - if (!window) - { - FIXME("No output window, should use factory output window.\n"); - } if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 4ad5b9f..c4bf826 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1077,7 +1077,6 @@ static void test_create_swapchain(void) return; } - creation_desc.OutputWindow = 0; creation_desc.BufferDesc.Width = 800; creation_desc.BufferDesc.Height = 600; creation_desc.BufferDesc.RefreshRate.Numerator = 60; @@ -1089,14 +1088,11 @@ static void test_create_swapchain(void) creation_desc.SampleDesc.Quality = 0; creation_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; creation_desc.BufferCount = 1; - creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + creation_desc.OutputWindow = NULL; creation_desc.Windowed = TRUE; creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; creation_desc.Flags = 0; - memset(&initial_state, 0, sizeof(initial_state)); - capture_fullscreen_state(&initial_state.fullscreen_state, creation_desc.OutputWindow); - hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj); ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown.\n"); @@ -1112,6 +1108,14 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + creation_desc.OutputWindow = NULL; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + memset(&initial_state, 0, sizeof(initial_state)); + capture_fullscreen_state(&initial_state.fullscreen_state, creation_desc.OutputWindow); + hr = IDXGIFactory_CreateSwapChain(factory, NULL, &creation_desc, &swapchain); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, NULL, &swapchain);

1 0

Jacek Caban : crypt32: Added support for szOID_NIST_sha* OIDs.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 86c998e551f25cbd0c04379ce17d4f3ec1161fac URL: https://source.winehq.org/git/wine.git/?a=commit;h=86c998e551f25cbd0c04379c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 29 19:51:21 2018 +0100 crypt32: Added support for szOID_NIST_sha* OIDs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/oid.c | 7 +++++++ dlls/crypt32/tests/oid.c | 25 ++++++++++++++++++++----- include/wincrypt.h | 3 +++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index d5c2953..5a447d0 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1053,6 +1053,9 @@ static const WCHAR rc2[] = { 'r','c','2',0 }; static const WCHAR rc4[] = { 'r','c','4',0 }; static const WCHAR sha[] = { 's','h','a',0 }; static const WCHAR sha1[] = { 's','h','a','1',0 }; +static const WCHAR sha256[] = { 's','h','a','2','5','6',0 }; +static const WCHAR sha384[] = { 's','h','a','3','8','4',0 }; +static const WCHAR sha512[] = { 's','h','a','5','1','2',0 }; static const WCHAR RSA[] = { 'R','S','A',0 }; static const WCHAR RSA_KEYX[] = { 'R','S','A','_','K','E','Y','X',0 }; static const WCHAR RSA_SIGN[] = { 'R','S','A','_','S','I','G','N',0 }; @@ -1157,6 +1160,10 @@ static const struct OIDInfoConstructor { { 1, szOID_RSA_MD5, CALG_MD5, md5, NULL }, { 1, szOID_RSA_MD4, CALG_MD4, md4, NULL }, { 1, szOID_RSA_MD2, CALG_MD2, md2, NULL }, + /* NOTE: Windows Vista+ uses -1 instead of CALG_SHA_* following SHA entries. */ + { 1, szOID_NIST_sha256, CALG_SHA_256, sha256, NULL }, + { 1, szOID_NIST_sha384, CALG_SHA_384, sha384, NULL }, + { 1, szOID_NIST_sha512, CALG_SHA_512, sha512, NULL }, { 2, szOID_OIWSEC_desCBC, CALG_DES, des, NULL }, { 2, szOID_RSA_DES_EDE3_CBC, CALG_3DES, tripledes, NULL }, diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index b661407..8fc67b3 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -36,6 +36,7 @@ struct OIDToAlgID LPCSTR oid; LPCSTR altOid; DWORD algID; + DWORD altAlgID; }; static const struct OIDToAlgID oidToAlgID[] = { @@ -72,6 +73,9 @@ static const struct OIDToAlgID oidToAlgID[] = { { szOID_OIWDIR_md2RSA, NULL, CALG_MD2 }, { szOID_INFOSEC_mosaicUpdatedSig, NULL, CALG_SHA }, { szOID_INFOSEC_mosaicKMandUpdSig, NULL, CALG_DSS_SIGN }, + { szOID_NIST_sha256, NULL, CALG_SHA_256, -1 }, + { szOID_NIST_sha384, NULL, CALG_SHA_384, -1 }, + { szOID_NIST_sha512, NULL, CALG_SHA_512, -1 } }; static const struct OIDToAlgID algIDToOID[] = { @@ -104,10 +108,7 @@ static void testOIDToAlgID(void) for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) { alg = CertOIDToAlgId(oidToAlgID[i].oid); - /* Not all Windows installations support all these, so make sure it's - * at least not the wrong one. - */ - ok(alg == 0 || alg == oidToAlgID[i].algID, + ok(alg == oidToAlgID[i].algID || (oidToAlgID[i].altAlgID && alg == oidToAlgID[i].altAlgID), "Expected %d, got %d\n", oidToAlgID[i].algID, alg); } } @@ -126,6 +127,7 @@ static void testAlgIDToOID(void) { oid = CertAlgIdToOID(algIDToOID[i].algID); /* Allow failure, not every version of Windows supports every algo */ + ok(oid != NULL || broken(!oid), "CertAlgIdToOID failed, expected %s\n", algIDToOID[i].oid); if (oid) { if (strcmp(oid, algIDToOID[i].oid)) @@ -542,11 +544,13 @@ static void test_enumOIDInfo(void) static void test_findOIDInfo(void) { static WCHAR sha1[] = { 's','h','a','1',0 }; - static CHAR oid_rsa_md5[] = szOID_RSA_MD5; + static CHAR oid_rsa_md5[] = szOID_RSA_MD5, oid_sha256[] = szOID_NIST_sha256; ALG_ID alg = CALG_SHA1; ALG_ID algs[2] = { CALG_MD5, CALG_RSA_SIGN }; PCCRYPT_OID_INFO info; + static const WCHAR sha256W[] = {'s','h','a','2','5','6',0}; + info = CryptFindOIDInfo(0, NULL, 0); ok(info == NULL, "Expected NULL\n"); info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, oid_rsa_md5, 0); @@ -585,6 +589,17 @@ static void test_findOIDInfo(void) ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", U(*info).Algid); } + + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, oid_sha256, 0); + ok(info != NULL, "Expected to find szOID_RSA_MD5\n"); + if (info) + { + ok(!strcmp(info->pszOID, szOID_NIST_sha256), "Expected %s, got %s\n", + szOID_NIST_sha256, info->pszOID); + ok(!lstrcmpW(info->pwszName, sha256W), "pwszName = %s\n", wine_dbgstr_w(info->pwszName)); + ok(U(*info).Algid == CALG_SHA_256 || U(*info).Algid == -1, + "Expected CALG_MD5 or -1, got %d\n", U(*info).Algid); + } } START_TEST(oid) diff --git a/include/wincrypt.h b/include/wincrypt.h index 6986bd8..d688567 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2941,6 +2941,9 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_INFOSEC_mosaicUpdatedSig "2.16.840.1.101.2.1.1.19" #define szOID_INFOSEC_mosaicKMandUpdSig "2.16.840.1.101.2.1.1.20" #define szOID_INFOSEC_mosaicUpdateInteg "2.16.840.1.101.2.1.1.21" +#define szOID_NIST_sha256 "2.16.840.1.101.3.4.2.1" +#define szOID_NIST_sha384 "2.16.840.1.101.3.4.2.2" +#define szOID_NIST_sha512 "2.16.840.1.101.3.4.2.3" #define szOID_COMMON_NAME "2.5.4.3" #define szOID_SUR_NAME "2.5.4.4" #define szOID_DEVICE_SERIAL_NUMBER "2.5.4.5"

1 0

Nikolay Sivov : user32/tests: Add more A/W message data conversion tests.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 6ca3ec5be8e55eeea62330170189ac30677bd560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca3ec5be8e55eeea6233017… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 23:42:26 2018 +0300 user32/tests: Add more A/W message data conversion tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 63 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index cbe4b2b..19f220d 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1237,8 +1237,17 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, } static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; + +enum defdlgproc_text +{ + DLGPROCTEXT_CONTEXT = 0, + DLGPROCTEXT_A, + DLGPROCTEXT_W, +}; + static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + int mode = (int)GetPropA(hdlg, "test_mode"); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1251,12 +1260,28 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (IsWindowUnicode(hdlg)) - todo_wine - ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - else - todo_wine + switch (mode) + { + case DLGPROCTEXT_A: + todo_wine_if(!IsWindowUnicode(hdlg)) ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + break; + case DLGPROCTEXT_W: + if (msg == WM_SETTEXT && !IsWindowUnicode(hdlg)) + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + else + todo_wine_if(IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + break; + default: + if (IsWindowUnicode(hdlg)) + todo_wine + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + else + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } break; }; @@ -1265,6 +1290,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + int mode = (int)GetPropA(hdlg, "test_mode"); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1277,10 +1303,22 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (IsWindowUnicode(hdlg)) - ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - else + switch (mode) + { + case DLGPROCTEXT_A: + todo_wine_if(IsWindowUnicode(hdlg)) ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + break; + case DLGPROCTEXT_W: + todo_wine_if(!IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + break; + default: + if (IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + else + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } break; } @@ -1291,11 +1329,20 @@ static void dlg_test_aw_message(HWND hdlg, UINT msg) { LRESULT ret; + SetPropA(hdlg, "test_mode", DLGPROCTEXT_CONTEXT); ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); + + SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_A); + ret = DefDlgProcA(hdlg, msg, 0, (LPARAM)"WndText"); + ok(ret == 0, "Unexpected retval %ld.\n", ret); + + SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_W); + ret = DefDlgProcW(hdlg, msg, 0, (LPARAM)testtextW); + ok(ret == 0, "Unexpected retval %ld.\n", ret); } static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)

1 0

Michael Stefaniuc : advapi32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 56d0cfbabdf7d06a152ad29501a202f8bed9c68d URL: https://source.winehq.org/git/wine.git/?a=commit;h=56d0cfbabdf7d06a152ad295… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 29 22:50:38 2018 +0100 advapi32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 7fc02a4..4ced1e8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -23,6 +23,7 @@ #include "ntsecapi.h" #include "winsvc.h" #include "winnls.h" +#include "wine/heap.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -38,26 +39,6 @@ const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupAW( const char *src ) { WCHAR *dst = NULL;

1 0

Michael Stefaniuc : advpack: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: df2141a4c6961119181af1241c2ae26db245e4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=df2141a4c6961119181af124… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 29 22:50:39 2018 +0100 advpack: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack_private.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 252974f..fc3b26f 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,22 +21,14 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H +#include "wine/heap.h" + HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline char *heap_strdupWtoA(const WCHAR *str) { char *ret = NULL;

1 0