- Wine-devel - list.winehq.org

[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

[PATCH 0/5] MR131: wined3d: Introduce wined3d_device_check_format_support().
by Chip Davis (＠cdavis5e) 26 May '22

26 May '22

Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/131

3 7

[PATCH v5 0/3] MR115: ntdll: Fake success for ThreadPowerThrottlingState
by Alistair Leslie-Hughes (＠alesliehughes) 26 May '22

26 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v5: ntdll: Fake success for ThreadPowerThrottlingState. include: Add THREAD_POWER_THROTTLING_STATE type. winex11.drv: Define ControlMask when not available. https://gitlab.winehq.org/wine/wine/-/merge_requests/115

4 6

[PATCH v5 0/8] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon 25 May '22

25 May '22

Compared to last attempt, I moved the format pointer to a dedicated `wg_transform_read_data` parameter instead of a property of the sample. Most of the transforms use `NULL` there as they don't expect or support format change. H264 decoder passes a transform format member where it tracks the current stream format. -- v5: winegstreamer: Expose output media type attributes from the stream format. winegstreamer: Support wg_transform output format change events. winegstreamer: Track caps changes and keep them with the output buffers. winegstreamer: Only filter video caps attributes when format uses 0. winegstreamer: Avoid leaking buffer list in wg_transform_read_data. winegstreamer: Return early if output buffer is too small. winegstreamer: Set wg_transform output sample size on gst_buffer_map failure. winegstreamer: Append a videoconvert element to wg_transform video output. https://gitlab.winehq.org/wine/wine/-/merge_requests/61

3 12

[PATCH v2 0/5] MR125: qasf: Beginnings of an ASF reader implementation.
by Zebediah Figura (＠zfigura) 25 May '22

25 May '22

This supersedes merge request 116. -- v2: qasf: Implement ASF Reader filter stream stubs. qasf: Create and open a WMReader in the ASF Reader filter. qasf: Rename variables and functions. qasf: Constify filter_ops. qasf/tests: Add more ASF Reader filter tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/125

4 9