- wine-devel - winehq.org

[PATCH 0/5] MR142: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 27 May '22

27 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/142

3 6

[PATCH v2 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 27 May '22

27 May '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v2: ntdll: Cancel asyncs when thread is terminated. ws2_32/tests: Add tests for terminated thread asyncs completion. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

2 3

Re: [PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Hans Leidekker 27 May '22

27 May '22

On Fri, 2022-05-27 at 16:43 +0800, Zhao Yi wrote: > These profiles belong to a specific printer driver and are required for > data conversion during printing. However, these profiles are not available in > the default wine prefix of the Linux system, resulting in the failure of my > test program. Here's a test using the standard RGB color profile which shows our mapping is wrong. I think this is sufficient to show the general problem and we can assume that the CMYK case should be fixed accordingly.

1 0

[PATCH 0/7] MR141: d3d11: Initialize output pointers on failure
by Nikolay Sivov (＠nsivov) 27 May '22

27 May '22

Similar changes were done before for views, that fixed actual issue when object couldn't and shouldn't have been created, but pointer was still used afterwards. These are the same kind of changes for shader objects. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/141

3 12

[PATCH v2 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

-- v2: qasf: Implement ASF Reader filter pin DecideBufferSize. qasf: Implement ASF Reader filter pin_query_accept. winegstreamer: Implement IWMOutputMediaProps_SetMediaType. qasf: Implement ASF Reader filter pin_get_media_type. https://gitlab.winehq.org/wine/wine/-/merge_requests/140

2 4

[PATCH v3 3/3] d2d1: Add some tests for ID2D1Bitmap1::Map()/::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..e34d1070637 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11388,6 +11388,78 @@ static void test_image_bounds(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_map(BOOL d3d11) +{ + struct d2d1_test_context ctx; + D2D1_SIZE_U size; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + D2D1_MAPPED_RECT mapped_rect; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + surface = create_surface(ctx.device, DXGI_FORMAT_B8G8R8A8_UNORM); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + todo_wine + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ID2D1Bitmap1_Release(bitmap); + + IDXGISurface_Release(surface); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11464,6 +11536,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); + queue_test(test_bitmap_map); run_queued_tests(); } -- 2.36.1

2 1

[PATCH v3 2/3] d2d1: Implement ID2D1Bitmap1::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

v3: Don't Unmap on Release. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index a75a9be62be..9d9d980b4c9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -285,9 +285,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (!bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0); + bitmap->staging_resource = NULL; + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = -- 2.36.1

2 1

[PATCH v2 2/3] d2d1: Implement ID2D1Bitmap1::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b48c0bf2384..91594ad58a0 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -66,6 +66,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { + if (bitmap->staging_resource) + ID2D1Bitmap1_Unmap(iface); if (bitmap->srv) ID3D11ShaderResourceView_Release(bitmap->srv); if (bitmap->rtv) @@ -281,9 +283,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (!bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0); + bitmap->staging_resource = NULL; + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = -- 2.36.1

2 2

[PATCH v2 1/3] d2d1: Implement ID2D1Bitmap1::Map().
by Dmitry Timoshkov 27 May '22

27 May '22

v2: Support only D2D1_MAP_OPTIONS_READ and always use staging resource. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 49 ++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 971e3c7ff6b..b48c0bf2384 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -229,9 +229,54 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXG static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OPTIONS options, D2D1_MAPPED_RECT *mapped_rect) { - FIXME("iface %p, options %#x, mapped_rect %p stub!\n", iface, options, mapped_rect); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Texture2D *staging_texture; + D3D11_MAPPED_SUBRESOURCE mapped_subresource; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, options %#x, mapped_rect %p.\n", iface, options, mapped_rect); + + if (options != D2D1_MAP_OPTIONS_READ) + { + FIXME("Unhandled map options %#x.\n", options); + return E_INVALIDARG; + } + + if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CPU_READ)) + return E_INVALIDARG; + + if (bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11Texture2D_GetDesc((ID3D11Texture2D *)bitmap->resource, &texture_desc); + + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &staging_texture); + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)staging_texture, bitmap->resource); + if (SUCCEEDED(hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)staging_texture, 0, + D3D11_MAP_READ, 0, &mapped_subresource))) + { + mapped_rect->pitch = mapped_subresource.RowPitch; + mapped_rect->bits = mapped_subresource.pData; + bitmap->staging_resource = (ID3D11Resource *)staging_texture; + } + else + { + WARN("Failed to map resource, hr %#lx.\n", hr); + ID3D11Texture2D_Release(staging_texture); + } + + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8edfa030ee1..b886ac52dd9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -395,6 +395,7 @@ struct d2d_bitmap ID3D11RenderTargetView *rtv; IDXGISurface *surface; ID3D11Resource *resource; + ID3D11Resource *staging_resource; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; -- 2.36.1

2 2

[PATCH v2 resend] crypt32: CryptAcquireCertificatePrivateKey() should reset last error code on success.
by Dmitry Timoshkov 27 May '22

27 May '22

One of Chrome crypto plugins depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 1 + dlls/crypt32/tests/cert.c | 45 ++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ad39b7d18c7..b57cc685212 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1006,6 +1006,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, CryptMemFree(info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); + if (ret) SetLastError(0); return ret; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 0f8684a5483..ea25826f4ed 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -4305,45 +4305,42 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); /* Use the key prov info's caching (there shouldn't be any) */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); /* Cache it (and check that it's cached) */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); /* Remove the cached provider */ CryptReleaseContext(keyContext.hCryptProv, 0); @@ -4354,17 +4351,17 @@ static void testAcquireCertPrivateKey(void) CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); /* Now use the key prov info's caching */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); -- 2.36.1

2 1

[PATCH 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/140

3 8

[PATCH 0/4] MR139: winegstreamer: Implement video plane alignment for the H264 decoder.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/139

3 7

[PATCH 0/2] MR138: d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency
by Alistair Leslie-Hughes (＠alesliehughes) 27 May '22

27 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/138

3 3

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..77165877275 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -97,6 +98,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( UninstallColorProfileW ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); + GETFUNCPTR( TranslateBitmapBits ) return TRUE; } @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = L"\\spool\\drivers\\color\\srgb color space profile.icm"; +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; + static BOOL have_color_profile; static const unsigned char rgbheader[] = @@ -1359,6 +1371,110 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits(void) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents = INTENT_PERCEPTUAL; + + #define DESTBUFSIZE 4 + HANDLE binfile_handle; + UINT uret; + char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; + char *standbinfile1 = NULL; + char *standbinfile2 = NULL; + BYTE srcbits[] = {0,0,0xff}; + BMFORMAT input = BM_BGRTRIPLETS; + DWORD width = 1; + DWORD height = 1; + DWORD inputstride = 3; + PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); + BMFORMAT output = BM_KYMCQUADS; + DWORD outputstride = 4; + PBMCALLBACKFN callback = NULL; + ULONG data = 0; + BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; + BOOL bret = FALSE; + + uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); + lstrcpyA(binfilefile1_ex, binfilefile1); + + uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); + lstrcpyA(binfilefile2_ex, binfilefile2); + + lstrcatA( binfilefile1, binfile1 ); + binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile1_ex, binfile1_ex ); + binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1_ex; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2, binfile2 ); + binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2_ex, binfile2_ex ); + binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2_ex; + CloseHandle( binfile_handle ); + } + + if (standbinfile1 && standbinfile2) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile1; + profile.cbDataSize = strlen(standbinfile1); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile2; + profile.cbDataSize = strlen(standbinfile2); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + ZeroMemory(destbits,DESTBUFSIZE); + bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); + ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); + HeapFree( GetProcessHeap(), 0, destbits ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1470,6 +1586,8 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( ); + if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); FreeLibrary( hmscms ); -- 2.20.1

3 2

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by zhaoyi_uos 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..3d24f5aa62a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( SetStandardColorSpaceProfileW ) GETFUNCPTR( UninstallColorProfileA ) GETFUNCPTR( UninstallColorProfileW ) + GETFUNCPTR( TranslateBitmapBits ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = L"\\spool\\drivers\\color\\srgb color space profile.icm"; +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; + static BOOL have_color_profile; static const unsigned char rgbheader[] = @@ -1359,6 +1371,111 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits() +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents = INTENT_PERCEPTUAL; + + #define DESTBUFSIZE 4 + HANDLE binfile_handle; + UINT uret; + char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; + WCHAR binfilefile1W[MAX_PATH]; + char *standbinfile1 = NULL; + char *standbinfile2 = NULL; + BYTE srcbits[] = {0,0,0xff}; + BMFORMAT input = BM_BGRTRIPLETS; + DWORD width = 1; + DWORD height = 1; + DWORD inputstride = 3; + PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); + BMFORMAT output = BM_KYMCQUADS; + DWORD outputstride = 4; + PBMCALLBACKFN callback = NULL; + ULONG data = 0; + BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; + BOOL bret = FALSE; + + uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); + lstrcpyA(binfilefile1_ex, binfilefile1); + + uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); + lstrcpyA(binfilefile2_ex, binfilefile2); + + lstrcatA( binfilefile1, binfile1 ); + binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile1_ex, binfile1_ex ); + binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1_ex; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2, binfile2 ); + binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2_ex, binfile2_ex ); + binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2_ex; + CloseHandle( binfile_handle ); + } + + if (standbinfile1 && standbinfile2) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile1; + profile.cbDataSize = strlen(standbinfile1); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile2; + profile.cbDataSize = strlen(standbinfile2); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + ZeroMemory(destbits,DESTBUFSIZE); + bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); + ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); + HeapFree( GetProcessHeap(), 0, destbits ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1469,6 +1586,7 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); -- 2.20.1

2 1

[PATCH 2/2]mscms: make the correct value for bmformat.
by zhaoyi_uos 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_ABGR_8; break; + case BM_xBGRQUADS: ret = TYPE_ARGB_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

2 1

[PATCH 1/3] d2d1/tests: Test effect property if register effect multiple times with different xml.
by Ziqing Hui 27 May '22

27 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..29d3780a6e7 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -37,7 +37,7 @@ DEFINE_GUID(GUID_TestPixelShader, 0x53015748,0xfc13,0x4168,0xbd,0x13,0x0f,0xcf, static const WCHAR *effect_xml_a = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectA'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -56,7 +56,7 @@ L"<?xml version='1.0'?> \ static const WCHAR *effect_xml_b = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectB'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -72,7 +72,7 @@ L"<?xml version='1.0'?> \ static const WCHAR *effect_xml_c = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectC'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -10488,8 +10488,11 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, static void test_effect_register(BOOL d3d11) { + ID2D1DeviceContext *device_context; struct d2d1_test_context ctx; ID2D1Factory1 *factory; + WCHAR display_name[64]; + ID2D1Effect *effect; unsigned int i; HRESULT hr; @@ -10529,6 +10532,7 @@ static void test_effect_register(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; + device_context = ctx.context; factory = ctx.factory1; if (!factory) { @@ -10564,9 +10568,31 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_a, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)display_name, sizeof(display_name)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(display_name, L"TestEffectA"), "Got unexpected display name %s.\n", debugstr_w(display_name)); + ID2D1Effect_Release(effect); + } + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_b, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)display_name, sizeof(display_name)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(display_name, L"TestEffectA"), "Got unexpected display name %s.\n", debugstr_w(display_name)); + ID2D1Effect_Release(effect); + } + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); -- 2.25.1

2 5

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_ABGR_8; break; + case BM_xBGRQUADS: ret = TYPE_ARGB_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

2 1

[PATCH 1/6] secur32: Simplify get_session_peer_certificate unixlib interface.
by Nikolay Sivov 27 May '22

27 May '22

Use single buffer for returned certificate blobs, instead of an array of CERT_BLOB that contains pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 18 +++++++++++------- dlls/secur32/schannel_gnutls.c | 14 +++++++------- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6ab5507becf..2e663872f71 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1026,7 +1026,6 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) HCERTSTORE store; PCCERT_CONTEXT cert = NULL; SECURITY_STATUS status; - CERT_BLOB *certs; ULONG count, size = 0; struct get_session_peer_certificate_params params = { ctx->transport.session, NULL, &size, &count }; @@ -1036,28 +1035,33 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) status = GNUTLS_CALL( get_session_peer_certificate, &params ); if (status != SEC_E_BUFFER_TOO_SMALL) goto done; - if (!(certs = malloc( size ))) + if (!(params.buffer = malloc( size ))) { status = SEC_E_INSUFFICIENT_MEMORY; goto done; } - params.certs = certs; status = GNUTLS_CALL( get_session_peer_certificate, &params ); if (status == SEC_E_OK) { unsigned int i; + ULONG *sizes; + BYTE *blob; + + sizes = (ULONG *)params.buffer; + blob = params.buffer + count * sizeof(*sizes); + for (i = 0; i < count; i++) { - if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, certs[i].pbData, - certs[i].cbData, CERT_STORE_ADD_REPLACE_EXISTING, - i ? NULL : &cert)) + if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, blob, sizes[i], + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert)) { if (i) CertFreeCertificateContext(cert); return GetLastError(); } + blob += sizes[i]; } } - free(certs); + free(params.buffer); done: ctx->cert = cert; CertCloseStore(store, 0); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0145c59e0f0..7c6a0bc0cfc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -792,28 +792,28 @@ static NTSTATUS schan_get_session_peer_certificate( void *args ) { const struct get_session_peer_certificate_params *params = args; gnutls_session_t s = (gnutls_session_t)params->session; - CERT_BLOB *certs = params->certs; const gnutls_datum_t *datum; unsigned int i, size; BYTE *ptr; unsigned int count; + ULONG *sizes; if (!(datum = pgnutls_certificate_get_peers(s, &count))) return SEC_E_INTERNAL_ERROR; - size = count * sizeof(certs[0]); + size = count * sizeof(*sizes); for (i = 0; i < count; i++) size += datum[i].size; - if (!certs || *params->bufsize < size) + if (!params->buffer || *params->bufsize < size) { *params->bufsize = size; return SEC_E_BUFFER_TOO_SMALL; } - ptr = (BYTE *)&certs[count]; + sizes = (ULONG *)params->buffer; + ptr = params->buffer + count * sizeof(*sizes); for (i = 0; i < count; i++) { - certs[i].cbData = datum[i].size; - certs[i].pbData = ptr; - memcpy(certs[i].pbData, datum[i].data, datum[i].size); + sizes[i] = datum[i].size; + memcpy(ptr, datum[i].data, datum[i].size); ptr += datum[i].size; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index be375618266..5c35e4244c8 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -145,7 +145,7 @@ struct get_connection_info_params struct get_session_peer_certificate_params { schan_session session; - CERT_BLOB *certs; + BYTE *buffer; /* Starts with array of ULONG sizes, followed by contiguous data blob. */ ULONG *bufsize; ULONG *retcount; }; -- 2.35.1

1 5

[PATCH 0/5] MR137: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/137

2 5

[PATCH 0/1] MR136: kernelbase: Avoid relying on the exception handler to test that handle != NULL.
by Huw Davies (＠huw) 27 May '22

27 May '22

Fixes a regression in SlingPlayer 2 caused by commit a76518c186ac0893ea460cd3b061096f1b05c8cc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52127 Signed-off-by: Huw Davies <huw(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/136

2 1

Fwd: [Mingw-w64-public] [PATCH] Add directory defined by BIN_TO_DLLDIR to dlldirs
by LIU Hao 27 May '22

27 May '22

Hello wine folks. As mingw-w64 imports WIDL from wine, I am forwarding this message here to ask for your comments and opinions. There are more details on GitHub: * https://github.com/msys2/MINGW-packages/issues/11520 * https://github.com/msys2/MINGW-packages/pull/11547

1 0

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_ABGR_8; break; + case BM_xBGRQUADS: ret = TYPE_ARGB_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

2 1

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..3d24f5aa62a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( SetStandardColorSpaceProfileW ) GETFUNCPTR( UninstallColorProfileA ) GETFUNCPTR( UninstallColorProfileW ) + GETFUNCPTR( TranslateBitmapBits ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = L"\\spool\\drivers\\color\\srgb color space profile.icm"; +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; + static BOOL have_color_profile; static const unsigned char rgbheader[] = @@ -1359,6 +1371,111 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits() +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents = INTENT_PERCEPTUAL; + + #define DESTBUFSIZE 4 + HANDLE binfile_handle; + UINT uret; + char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; + WCHAR binfilefile1W[MAX_PATH]; + char *standbinfile1 = NULL; + char *standbinfile2 = NULL; + BYTE srcbits[] = {0,0,0xff}; + BMFORMAT input = BM_BGRTRIPLETS; + DWORD width = 1; + DWORD height = 1; + DWORD inputstride = 3; + PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); + BMFORMAT output = BM_KYMCQUADS; + DWORD outputstride = 4; + PBMCALLBACKFN callback = NULL; + ULONG data = 0; + BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; + BOOL bret = FALSE; + + uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); + lstrcpyA(binfilefile1_ex, binfilefile1); + + uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); + lstrcpyA(binfilefile2_ex, binfilefile2); + + lstrcatA( binfilefile1, binfile1 ); + binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile1_ex, binfile1_ex ); + binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1_ex; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2, binfile2 ); + binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2_ex, binfile2_ex ); + binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2_ex; + CloseHandle( binfile_handle ); + } + + if (standbinfile1 && standbinfile2) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile1; + profile.cbDataSize = strlen(standbinfile1); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile2; + profile.cbDataSize = strlen(standbinfile2); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + ZeroMemory(destbits,DESTBUFSIZE); + bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); + ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); + HeapFree( GetProcessHeap(), 0, destbits ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1469,6 +1586,7 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); -- 2.20.1

2 1

[PATCH v4 0/2] MR76: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Brendan Shanks (＠bshanks) 26 May '22

26 May '22

- signal_alloc_thread() and signal_free_thread() mostly match signal_i386.c, but with the difference that first thread’s FS needs to be allocated in signal_init_process(). signal_alloc_thread() is called too early before the Wow TEB is allocated. - The LDT code is copied from signal_i386.c. Would it be worthwhile to move that into a common file? -- v4: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+. ntdll: Store Wow64 FS selector in thread_data. https://gitlab.winehq.org/wine/wine/-/merge_requests/76

3 3

Re: [PATCH v2 0/1] MR133: wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized. - approved
by Alexandre Julliard (＠julliard) 26 May '22

26 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/133

1 0

[PATCH 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 26 May '22

26 May '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/135

2 2

[PATCH v4 1/3] winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Gabriel Ivăncescu 26 May '22

26 May '22

If the device desc is longer than the limit, we try to obtain product name or alsa name (if product name does not fit in the limit), as otherwise there is no point to do it anyway. Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v4: Forgot to change commit message... dlls/winepulse.drv/pulse.c | 92 +++++++++++++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509..0e504b6 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,81 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +#define MAX_DEVICE_NAME_LEN 62 + +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against truncated buffer after ntdll_umbstowcs ) + */ + WCHAR buf[MAX_DEVICE_NAME_LEN + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len > MAX_DEVICE_NAME_LEN && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + unsigned prop_len, rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) { + prop = pa_proplist_gets(proplist, "alsa.card_name"); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) + prop = NULL; + } + + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +527,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +546,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) -- 2.34.1

2 5

[PATCH v2 5/6] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor implementation.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 61 ++++++++++++++++++++++++++++++++++++-- dlls/d3dx10_43/dxhelpers.h | 2 ++ dlls/d3dx10_43/texture.c | 27 ++++++++++------- 3 files changed, 77 insertions(+), 13 deletions(-)

1 0

[PATCH 5/5] wineoss: Handle MIDI running status.
by Akihiro Sagawa 26 May '22

26 May '22

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/wineoss.drv/ossmidi.c | 70 ++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 11 deletions(-)

2 1

[PATCH 4/5] wineoss: Fix missing break statement.
by Akihiro Sagawa 26 May '22

26 May '22

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

2 1

[PATCH 3/5] winealsa: Handle MIDI running status.
by Akihiro Sagawa 26 May '22

26 May '22

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winealsa.drv/alsamidi.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)

2 1

[PATCH 2/5] winealsa: Use the symbolic name for MIDI_CTL_ALL_SOUNDS_OFF.
by Akihiro Sagawa 26 May '22

26 May '22

MIDI_CTL_ALL_SOUNDS_OFF is channel dependent. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winealsa.drv/alsamidi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

2 1

[PATCH 1/5] midimap: Handle MIDI running status.
by Akihiro Sagawa 26 May '22

26 May '22

Wine's midiOutShortMsg() can't handle the MIDI message if the status byte is omitted. Omitting status byte is valid and called "running status". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53003 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/midimap/midimap.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)

2 1

[PATCH] [RFC] winecoreaudio: Handle MIDI running status.
by Akihiro Sagawa 26 May '22

26 May '22

Not compile tested. Andrew, could you try this patch on Mac? --- dlls/winecoreaudio.drv/coremidi.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)

2 1

[PATCH v3 1/3] winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Gabriel Ivăncescu 26 May '22

26 May '22

If the device desc is longer than the limit, we try to obtain product name or alsa name (whichever is shorter) but only if both fit within the limit, as otherwise there is no point to do it anyway (and avoids another allocation, simplifying the code). Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winepulse.drv/pulse.c | 92 +++++++++++++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509..0e504b6 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,81 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +#define MAX_DEVICE_NAME_LEN 62 + +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against truncated buffer after ntdll_umbstowcs ) + */ + WCHAR buf[MAX_DEVICE_NAME_LEN + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len > MAX_DEVICE_NAME_LEN && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + unsigned prop_len, rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) { + prop = pa_proplist_gets(proplist, "alsa.card_name"); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) + prop = NULL; + } + + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +527,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +546,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) -- 2.34.1

1 2

[PATCH 5/5] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor implementation.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 61 ++++++++++++++++++++++++++++++++++++-- dlls/d3dx10_43/dxhelpers.h | 2 ++ dlls/d3dx10_43/texture.c | 27 ++++++++++------- 3 files changed, 77 insertions(+), 13 deletions(-)

1 0

[PATCH 4/5] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor stub.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 6 ++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10.h | 2 +- include/d3dx10async.h | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-)

1 0

[PATCH 3/5] d3dx10_43: Share code for resource data loading.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 93 ++++++++++++++++++++++++++++---------- dlls/d3dx10_43/compiler.c | 34 ++------------ dlls/d3dx10_43/dxhelpers.h | 4 ++ dlls/d3dx10_43/texture.c | 70 ++++------------------------ 4 files changed, 89 insertions(+), 112 deletions(-)

1 0

[PATCH 2/5] d3dx10_43: Share code for file data loading.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 39 +++++++++++++++--------- dlls/d3dx10_43/dxhelpers.h | 19 ++++++++++++ dlls/d3dx10_43/texture.c | 62 +++++--------------------------------- 3 files changed, 51 insertions(+), 69 deletions(-) create mode 100644 dlls/d3dx10_43/dxhelpers.h

1 0

[PATCH 1/5] d3dx10_43: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tools] winetest/tests: Add CORS page for testing CORS and XDomainRequest.
by Gabriel Ivăncescu 26 May '22

26 May '22

"text/plain" content type is important since native has too many restrictions on XDomainRequest and doesn't support anything else. The fact the file is a html page also enables detection testing instead of it reading the header only. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- winetest/tests/.htaccess | 7 +++++++ winetest/tests/cors.html | 1 + 2 files changed, 8 insertions(+) create mode 100644 winetest/tests/cors.html diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index 73bab30..18c8b24 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -24,3 +24,10 @@ Header set Pragma "no-cache" Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" </ifModule> </FilesMatch> + +<Files cors.html> +<ifModule mod_headers.c> +Header set Access-Control-Allow-Origin "*" +Header set Content-Type "text/plain" +</ifModule> +</Files> diff --git a/winetest/tests/cors.html b/winetest/tests/cors.html new file mode 100644 index 0000000..3a73f89 --- /dev/null +++ b/winetest/tests/cors.html @@ -0,0 +1 @@ +<html><body>test</body></html> -- 2.34.1

1 0

[PATCH v2 1/2] winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Gabriel Ivăncescu 26 May '22

26 May '22

If the device desc is longer than the limit, we try to obtain product name or alsa name (whichever is shorter) but only if both fit within the limit, as otherwise there is no point to do it anyway (and avoids another allocation, simplifying the code). Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I've done some testing with this by hacking the checks. Sometimes, the desc is even shorter than the device name (e.g. for "Built-In Analog Stereo" case), so it's always the first attempt. Note that we have to check the length *after* conversion to WCHAR since it can change. We can't rely on the source string's length (also we can't assume UTF8 if host CP is something else, which ntdll_umbstowcs takes care of). dlls/winepulse.drv/pulse.c | 94 +++++++++++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509..47860fa 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,83 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against full buffer after ntdll_umbstowcs ) + */ + WCHAR buf[62 + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len >= ARRAY_SIZE(buf) && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + const char *product_name, *alsa_name; + unsigned product_len, alsa_len; + unsigned rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + product_name = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!product_name || !product_name[0] || + !(product_len = ntdll_umbstowcs(product_name, strlen(product_name), buf, rem)) || product_len == rem) + product_name = NULL; + + alsa_name = pa_proplist_gets(proplist, "alsa.card_name"); + if (!alsa_name || !alsa_name[0] || + !(alsa_len = ntdll_umbstowcs(alsa_name, strlen(alsa_name), buf, rem)) || alsa_len == rem) + alsa_name = NULL; + + prop = !product_name || (alsa_name && alsa_len < product_len) ? alsa_name : product_name; + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +529,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +548,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) -- 2.34.1

1 1

[PATCH] secur32: Remove unused field from struct schan_transport.
by Nikolay Sivov 26 May '22

26 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 -- dlls/secur32/secur32_priv.h | 1 - 2 files changed, 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bbbac37c6bb..6ab5507becf 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -826,8 +826,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( else ctx->header_size = HEADER_SIZE_TLS; - ctx->transport.ctx = ctx; - if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 64edc0581d6..be375618266 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -102,7 +102,6 @@ struct schan_buffers struct schan_transport { - struct schan_context *ctx; schan_session session; struct schan_buffers in; struct schan_buffers out; -- 2.35.1

1 0

[PATCH 0/6] MR130: user32: Progress toward PE conversion of raw input APIs.
by Zebediah Figura (＠zfigura) 26 May '22

26 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/130

4 8

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 26 May '22

26 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> ---  dlls/mscms/transform.c | 10 +++++-----  1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format )        switch (format)      { -    case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; -    case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break;      case BM_GRAY:        ret = TYPE_GRAY_8; break; -    case BM_xRGBQUADS:   ret = TYPE_ARGB_8; break; -    case BM_xBGRQUADS:   ret = TYPE_ABGR_8; break; -    case BM_KYMCQUADS:   ret = TYPE_KYMC_8; break; +    case BM_xRGBQUADS:   ret = TYPE_ABGR_8; break; +    case BM_xBGRQUADS:   ret = TYPE_ARGB_8; break; +    case BM_KYMCQUADS:   ret = TYPE_CMYK_8; break;      default:          if (!quietfixme)          { --  2.20.1

2 1

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Zhao Yi 26 May '22

26 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> ---  dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++  1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..3d24f5aa62a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL     (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL);  static BOOL     (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL);    static BOOL     (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL     (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG);    #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \      if (!p##func) return FALSE; @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void )      GETFUNCPTR( SetStandardColorSpaceProfileW )      GETFUNCPTR( UninstallColorProfileA )      GETFUNCPTR( UninstallColorProfileW ) +    GETFUNCPTR( TranslateBitmapBits )        pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" );   @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm";  static const WCHAR profile2W[] =  L"\\spool\\drivers\\color\\srgb color space profile.icm";   +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; +  static BOOL have_color_profile;    static const unsigned char rgbheader[] = @@ -1359,6 +1371,111 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp      }  }   +static void test_TranslateBitmapBits() +{ +    PROFILE profile; +    HPROFILE handle[2]; +    HTRANSFORM transform; +    DWORD intents = INTENT_PERCEPTUAL; + +    #define DESTBUFSIZE 4 +    HANDLE binfile_handle; +    UINT uret; +    char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; +    WCHAR binfilefile1W[MAX_PATH]; +    char *standbinfile1 = NULL; +    char *standbinfile2 = NULL; +    BYTE srcbits[] = {0,0,0xff}; +    BMFORMAT input = BM_BGRTRIPLETS; +    DWORD width = 1; +    DWORD height = 1; +    DWORD inputstride = 3; +    PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); +    BMFORMAT output = BM_KYMCQUADS; +    DWORD outputstride = 4; +    PBMCALLBACKFN callback = NULL; +    ULONG data = 0; +    BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; +    BOOL bret = FALSE; + +    uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); +    ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); +    ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, +        "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); +    lstrcpyA(binfilefile1_ex, binfilefile1); + +    uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); +    ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); +    ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, +        "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); +    lstrcpyA(binfilefile2_ex, binfilefile2); + +    lstrcatA( binfilefile1, binfile1 ); +    binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile1 = binfilefile1; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile1_ex, binfile1_ex ); +    binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile1 = binfilefile1_ex; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile2, binfile2 ); +    binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile2 = binfilefile2; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile2_ex, binfile2_ex ); +    binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile2 = binfilefile2_ex; +        CloseHandle( binfile_handle ); +    } +    +    if (standbinfile1 && standbinfile2) +    { +        profile.dwType       = PROFILE_FILENAME; +        profile.pProfileData = standbinfile1; +        profile.cbDataSize   = strlen(standbinfile1); + +        handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); +        ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + +        profile.dwType       = PROFILE_FILENAME; +        profile.pProfileData = standbinfile2; +        profile.cbDataSize   = strlen(standbinfile2); + +        handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); +        ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + +        transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); +        ok( transform != NULL, "got %lu\n", GetLastError() ); + +        ZeroMemory(destbits,DESTBUFSIZE); +        bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); +        ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); +        HeapFree( GetProcessHeap(), 0, destbits ); + +        pDeleteColorTransform( transform ); +        pCloseColorProfile( handle[0] ); +        pCloseColorProfile( handle[1] ); +    } +} +  START_TEST(profile)  {      UINT len; @@ -1469,6 +1586,7 @@ START_TEST(profile)        test_AssociateColorProfileWithDeviceA( testprofile );      test_CreateMultiProfileTransform( standardprofile, testprofile ); +    test_TranslateBitmapBits( );        if (testprofile) DeleteFileA( testprofile );      FreeLibrary( huser32 ); -- 2.20.1

2 1

[PATCH v2 3/3] d2d1: Add some tests for ID2D1Bitmap1::Map()/::Unmap().
by Dmitry Timoshkov 26 May '22

26 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..e34d1070637 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11388,6 +11388,78 @@ static void test_image_bounds(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_map(BOOL d3d11) +{ + struct d2d1_test_context ctx; + D2D1_SIZE_U size; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + D2D1_MAPPED_RECT mapped_rect; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + surface = create_surface(ctx.device, DXGI_FORMAT_B8G8R8A8_UNORM); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + todo_wine + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ID2D1Bitmap1_Release(bitmap); + + IDXGISurface_Release(surface); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11464,6 +11536,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); + queue_test(test_bitmap_map); run_queued_tests(); } -- 2.36.1

1 0

[PATCH 0/1] MR133: wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized.
by Brendan Shanks (＠bshanks) 26 May '22

26 May '22

Fixes exceptions seen in CEF and some advapi32 security tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/133

2 1

[PATCH 0/5] MR129: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 26 May '22

26 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/129

4 8

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel