August 2023 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader/spirv: Handle signature element mask left shift in spirv_compiler_emit_output().
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: vkd3d Branch: master Commit: 61a550017f7d86f6b72306ff5f76b9cdef20deb3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/61a550017f7d86f6b72306ff5f76b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:02:34 2023 +1000 vkd3d-shader/spirv: Handle signature element mask left shift in spirv_compiler_emit_output(). Element masks can have a left shift in DXIL, but these must start at bit 0 in the register info. The SPIR-V declaration will either be a builtin or have SpvDecorationComponent. --- libs/vkd3d-shader/spirv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7232219f..f93960d6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4965,7 +4965,6 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, component_type = builtin->component_type; if (!builtin->spirv_array_size) output_component_count = builtin->component_count; - component_idx = 0; } else { @@ -4979,14 +4978,9 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, || needs_private_io_variable(builtin)) { use_private_variable = true; - reg_write_mask = write_mask; - } - else - { - component_idx = vkd3d_write_mask_get_component_idx(write_mask); - reg_write_mask = write_mask >> component_idx; } + reg_write_mask = write_mask >> component_idx; vkd3d_symbol_make_register(&reg_symbol, reg); if (rb_get(&compiler->symbol_table, &reg_symbol))

1 0

Wonjun Jung : wbemprox: Add Caption property in Win32_SoundDevice.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: b27d1809c798393572aef045d3133a4794084e23 URL: https://gitlab.winehq.org/wine/wine/-/commit/b27d1809c798393572aef045d3133a… Author: Wonjun Jung <kokoseij(a)gmail.com> Date: Wed Aug 30 01:39:44 2023 +0900 wbemprox: Add Caption property in Win32_SoundDevice. --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 346c2a98eed..26750416d74 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -407,6 +407,7 @@ static const struct column col_softwarelicensingproduct[] = }; static const struct column col_sounddevice[] = { + { L"Caption", CIM_STRING }, { L"DeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, @@ -857,6 +858,7 @@ struct record_softwarelicensingproduct }; struct record_sounddevice { + const WCHAR *caption; const WCHAR *deviceid; const WCHAR *manufacturer; const WCHAR *name; @@ -4285,6 +4287,7 @@ static enum fill_status fill_sounddevice( struct table *table, const struct expr get_dxgi_adapter_desc( &desc ); rec = (struct record_sounddevice *)table->data; + rec->caption = L"Wine Audio Device"; rec->deviceid = get_sounddevice_pnpdeviceid( &desc ); rec->manufacturer = L"The Wine Project"; rec->name = L"Wine Audio Device";

1 0

Wonjun Jung : wbemprox: Add NetConnectionID, NetEnabled properties in Win32_NetworkAdapter.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: b4280a486f7308fd1da260cd5b48b7d9e3c747c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4280a486f7308fd1da260cd5b48b7… Author: Wonjun Jung <kokoseij(a)gmail.com> Date: Wed Aug 30 03:26:08 2023 +0900 wbemprox: Add NetConnectionID, NetEnabled properties in Win32_NetworkAdapter. --- dlls/wbemprox/builtin.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 26750416d74..3703fd0cca5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -204,7 +204,9 @@ static const struct column col_networkadapter[] = { L"MACAddress", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"NetConnectionID", CIM_STRING }, { L"NetConnectionStatus", CIM_UINT16 }, + { L"NetEnabled", CIM_BOOLEAN }, { L"PhysicalAdapter", CIM_BOOLEAN }, { L"PNPDeviceID", CIM_STRING }, { L"ServiceName", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -655,7 +657,9 @@ struct record_networkadapter const WCHAR *mac_address; const WCHAR *manufacturer; const WCHAR *name; + const WCHAR *netconnection_id; UINT16 netconnection_status; + int netenabled; int physicaladapter; const WCHAR *pnpdevice_id; const WCHAR *servicename; @@ -2853,6 +2857,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e UINT row = 0, offset = 0, count = 0; DWORD size = 0, ret; int adaptertypeid, physical; + UINT16 connection_status; enum fill_status status = FILL_STATUS_UNFILTERED; ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); @@ -2877,6 +2882,8 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e { if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + connection_status = get_connection_status( aa->OperStatus ); + rec = (struct record_networkadapter *)(table->data + offset); swprintf( device_id, ARRAY_SIZE( device_id ), L"%u", aa->IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical ); @@ -2888,8 +2895,10 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->interface_index = aa->IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = L"The Wine Project"; + rec->netconnection_id = NULL; /* FIXME Windows seems to fill this when it's connected and in use */ rec->name = wcsdup( aa->FriendlyName ); - rec->netconnection_status = get_connection_status( aa->OperStatus ); + rec->netenabled = connection_status ? -1 : 0; + rec->netconnection_status = connection_status; rec->physicaladapter = physical; rec->pnpdevice_id = L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&1&18"; rec->servicename = wcsdup( aa->FriendlyName );

1 0

Wonjun Jung : wbemprox: Add Win32_SoundDevice query test for Caption property.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: fe28e61580e933d5802de52c39f17a51dcabad70 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe28e61580e933d5802de52c39f17a… Author: Wonjun Jung <kokoseij(a)gmail.com> Date: Wed Aug 30 01:47:36 2023 +0900 wbemprox: Add Win32_SoundDevice query test for Caption property. --- dlls/wbemprox/tests/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index beceffe7e69..23b4c86d33a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2122,6 +2122,7 @@ static void test_Win32_SoundDevice( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"Name", VT_BSTR, CIM_STRING );

1 0

Jeff Smith : gdiplus: Fix GdipCreateBitmapFromHICON bitmap data.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: c8171e02b768bb3dbd3369693ad0d16315c6e507 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8171e02b768bb3dbd3369693ad0d1… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 19 18:50:24 2023 -0500 gdiplus: Fix GdipCreateBitmapFromHICON bitmap data. --- dlls/gdiplus/image.c | 78 ++++++++++++++++++++++++---------------------- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7640c934902..9b66edbd22b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1626,12 +1626,13 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) GpRect rect; BitmapData lockeddata; HDC screendc; - BOOL has_alpha; int x, y; BITMAPINFOHEADER bih; DWORD *src; BYTE *dst_row; DWORD *dst; + BYTE *bits; + int mask_scanlines = 0, color_scanlines = 0; TRACE("%p, %p\n", hicon, bitmap); @@ -1682,52 +1683,55 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biClrUsed = 0; bih.biClrImportant = 0; - screendc = CreateCompatibleDC(0); - GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); - - if (bm.bmBitsPixel == 32) + bits = heap_alloc(height * stride); + if (!bits) { - has_alpha = FALSE; - - /* If any pixel has a non-zero alpha, ignore hbmMask */ - src = (DWORD*)lockeddata.Scan0; - for (y=0; y<height && !has_alpha; y++) - for (x=0; x<width && !has_alpha; x++) - if ((*src++ & 0xff000000) != 0) - has_alpha = TRUE; + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); + GdipBitmapUnlockBits(*bitmap, &lockeddata); + GdipDisposeImage(&(*bitmap)->image); + return OutOfMemory; } - else has_alpha = FALSE; - if (!has_alpha) + screendc = CreateCompatibleDC(0); + if (screendc) { - BYTE *bits = heap_alloc(height * stride); - - /* read alpha data from the mask - the mask can safely be assumed to exist */ - GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + color_scanlines = GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, + (BITMAPINFO*)&bih, DIB_RGB_COLORS); + mask_scanlines = GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, + (BITMAPINFO*)&bih, DIB_RGB_COLORS); + DeleteDC(screendc); + } - src = (DWORD*)bits; - dst_row = lockeddata.Scan0; - for (y=0; y<height; y++) - { - dst = (DWORD*)dst_row; - for (x=0; x<width; x++) - { - DWORD src_value = *src++; - if (src_value) - *dst++ = 0; - else - *dst++ |= 0xff000000; - } - dst_row += lockeddata.Stride; - } + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); + if (!screendc || ((color_scanlines == 0 || mask_scanlines == 0) && + GetLastError() == ERROR_INVALID_PARAMETER)) + { heap_free(bits); + GdipBitmapUnlockBits(*bitmap, &lockeddata); + GdipDisposeImage(&(*bitmap)->image); + return GenericError; } - DeleteDC(screendc); + src = (DWORD*)bits; + dst_row = lockeddata.Scan0; + for (y=0; y<height; y++) + { + dst = (DWORD*)dst_row; + for (x=0; x<width; x++) + { + DWORD src_value = *src++; + if (src_value) + *dst++ = 0; + else + *dst++ |= 0xff000000; + } + dst_row += lockeddata.Stride; + } - DeleteObject(iinfo.hbmColor); - DeleteObject(iinfo.hbmMask); + heap_free(bits); GdipBitmapUnlockBits(*bitmap, &lockeddata); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index f90375478e1..6f497e416b0 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -120,7 +120,6 @@ static void expect_bitmap_locked_data(GpBitmap *bitmap, const BYTE *expect_bits, ok_(__FILE__, line)(lockeddata.Stride == stride, "Expected %d, got %d\n", stride, lockeddata.Stride); ok_(__FILE__, line)(lockeddata.PixelFormat == PixelFormat32bppARGB, "Expected %d, got %d\n", PixelFormat32bppARGB, lockeddata.PixelFormat); - todo_wine ok_(__FILE__, line)(!memcmp(expect_bits, lockeddata.Scan0, lockeddata.Height * lockeddata.Stride), "data mismatch\n"); GdipBitmapUnlockBits(bitmap, &lockeddata);

1 0

Jeff Smith : gdiplus/tests: Add test for non-square icon with GdipCreateBitmapFromHICON.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: 375d93a14975b590ea5ce378e8a49804e53b2cfd URL: https://gitlab.winehq.org/wine/wine/-/commit/375d93a14975b590ea5ce378e8a498… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 19 20:29:25 2023 -0500 gdiplus/tests: Add test for non-square icon with GdipCreateBitmapFromHICON. --- dlls/gdiplus/tests/image.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a66be781128..103a0c56a0f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1668,6 +1668,28 @@ static void test_fromhicon(void) GdipDisposeImage((GpImage*)bitmap); } DestroyIcon(hIcon); + + /* non-square 32 bpp icon */ + hbmMask = CreateBitmap(16, 8, 1, 1, bmp_bits); + ok(hbmMask != 0, "CreateBitmap failed\n"); + hbmColor = CreateBitmap(16, 8, 1, 32, bmp_bits); + ok(hbmColor != 0, "CreateBitmap failed\n"); + info = iconinfo_base; + info.hbmMask = hbmMask; + info.hbmColor = hbmColor; + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + DeleteObject(hbmMask); + DeleteObject(hbmColor); + + stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); + expect(Ok, stat); + if(stat == Ok){ + expect_image_properties((GpImage*)bitmap, 16, 8, __LINE__); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); + GdipDisposeImage((GpImage*)bitmap); + } + DestroyIcon(hIcon); } /* 1x1 pixel png */

1 0

Jeff Smith : gdiplus/tests: Add test for bitmap locked data from GdipCreateBitmapFromHICON.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: 9341798c404c606d601ddf9316cf614ced327903 URL: https://gitlab.winehq.org/wine/wine/-/commit/9341798c404c606d601ddf9316cf61… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 19 20:28:55 2023 -0500 gdiplus/tests: Add test for bitmap locked data from GdipCreateBitmapFromHICON. --- dlls/gdiplus/tests/image.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 103a0c56a0f..f90375478e1 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -106,6 +106,26 @@ static void expect_image_properties(GpImage *image, UINT width, UINT height, int ok_(__FILE__, line)(format == PixelFormat32bppARGB, "Expected %d, got %d\n", PixelFormat32bppARGB, format); } +static void expect_bitmap_locked_data(GpBitmap *bitmap, const BYTE *expect_bits, + UINT width, UINT height, UINT stride, int line) +{ + GpStatus stat; + BitmapData lockeddata; + + memset(&lockeddata, 0x55, sizeof(lockeddata)); + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppARGB, &lockeddata); + ok_(__FILE__, line)(stat == Ok, "Expected %d, got %d\n", Ok, stat); + ok_(__FILE__, line)(lockeddata.Width == width, "Expected %d, got %d\n", width, lockeddata.Width); + ok_(__FILE__, line)(lockeddata.Height == height, "Expected %d, got %d\n", height, lockeddata.Height); + ok_(__FILE__, line)(lockeddata.Stride == stride, "Expected %d, got %d\n", stride, lockeddata.Stride); + ok_(__FILE__, line)(lockeddata.PixelFormat == PixelFormat32bppARGB, + "Expected %d, got %d\n", PixelFormat32bppARGB, lockeddata.PixelFormat); + todo_wine + ok_(__FILE__, line)(!memcmp(expect_bits, lockeddata.Scan0, lockeddata.Height * lockeddata.Stride), + "data mismatch\n"); + GdipBitmapUnlockBits(bitmap, &lockeddata); +} + static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid) { GpStatus status; @@ -1560,12 +1580,16 @@ static void test_testcontrol(void) static void test_fromhicon(void) { - static const BYTE bmp_bits[1024]; + BYTE bmp_bits[1024], bmp_bits_masked[1024]; HBITMAP hbmMask, hbmColor; ICONINFO info, iconinfo_base = {TRUE, 0, 0, 0, 0}; HICON hIcon; GpStatus stat; GpBitmap *bitmap = NULL; + UINT i; + + for (i = 0; i < sizeof(bmp_bits); ++i) + bmp_bits[i] = 111 * i; /* NULL */ stat = GdipCreateBitmapFromHICON(NULL, NULL); @@ -1660,11 +1684,18 @@ static void test_fromhicon(void) DeleteObject(hbmMask); DeleteObject(hbmColor); + for (i = 0; i < sizeof(bmp_bits_masked)/sizeof(ARGB); i++) + { + BYTE mask = bmp_bits[i / 8] & (1 << (7 - (i % 8))); + ((ARGB *)bmp_bits_masked)[i] = mask ? 0 : ((ARGB *)bmp_bits)[i] | 0xff000000; + } + stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); expect(Ok, stat); if(stat == Ok){ expect_image_properties((GpImage*)bitmap, 16, 16, __LINE__); expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); + expect_bitmap_locked_data(bitmap, bmp_bits_masked, 16, 16, 64, __LINE__); GdipDisposeImage((GpImage*)bitmap); } DestroyIcon(hIcon); @@ -1687,6 +1718,7 @@ static void test_fromhicon(void) if(stat == Ok){ expect_image_properties((GpImage*)bitmap, 16, 8, __LINE__); expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); + expect_bitmap_locked_data(bitmap, bmp_bits_masked, 16, 8, 64, __LINE__); GdipDisposeImage((GpImage*)bitmap); } DestroyIcon(hIcon);

1 0

Esme Povirk : mscoree/tests: Catch expected exception in loadpaths.exe.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: 909ff728926add8e0c72fb9771d42df2b53e2614 URL: https://gitlab.winehq.org/wine/wine/-/commit/909ff728926add8e0c72fb9771d42d… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 29 10:58:30 2023 -0500 mscoree/tests: Catch expected exception in loadpaths.exe. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54202 --- dlls/mscoree/tests/loadpaths.exe.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/loadpaths.exe.cs b/dlls/mscoree/tests/loadpaths.exe.cs index 22c32603c59..298c05c31a2 100644 --- a/dlls/mscoree/tests/loadpaths.exe.cs +++ b/dlls/mscoree/tests/loadpaths.exe.cs @@ -16,13 +16,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +using System; + namespace LoadPaths { public static class Test + { + public static int RunExternal() + { + return new Test2().Foo(); + } + } + + public static class MainClass { static int Main(string[] args) { - return new Test2().Foo(); + try { + return Test.RunExternal(); + } + catch { + return 1; + } } } }

1 0

Jeff Smith : gdiplus/tests: Add test for 32 bpp icon with GdipCreateBitmapFromHICON.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: c5ae02c6d530148bd9475c9b06081cfbcbf1f68d URL: https://gitlab.winehq.org/wine/wine/-/commit/c5ae02c6d530148bd9475c9b06081c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 19 20:25:52 2023 -0500 gdiplus/tests: Add test for 32 bpp icon with GdipCreateBitmapFromHICON. --- dlls/gdiplus/tests/image.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cbc07b877a9..a66be781128 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1646,6 +1646,28 @@ static void test_fromhicon(void) GdipDisposeImage((GpImage*)bitmap); } DestroyIcon(hIcon); + + /* 32 bpp icon */ + hbmMask = CreateBitmap(16, 16, 1, 1, bmp_bits); + ok(hbmMask != 0, "CreateBitmap failed\n"); + hbmColor = CreateBitmap(16, 16, 1, 32, bmp_bits); + ok(hbmColor != 0, "CreateBitmap failed\n"); + info = iconinfo_base; + info.hbmMask = hbmMask; + info.hbmColor = hbmColor; + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + DeleteObject(hbmMask); + DeleteObject(hbmColor); + + stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); + expect(Ok, stat); + if(stat == Ok){ + expect_image_properties((GpImage*)bitmap, 16, 16, __LINE__); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); + GdipDisposeImage((GpImage*)bitmap); + } + DestroyIcon(hIcon); } /* 1x1 pixel png */

1 0

Rémi Bernon : mf/session: Increase the request count when requests are already queued.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: wine Branch: master Commit: 57bd5b10a11c9b80d0cd2ef48bcab286bceea405 URL: https://gitlab.winehq.org/wine/wine/-/commit/57bd5b10a11c9b80d0cd2ef48bcab2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 4 10:15:18 2023 +0200 mf/session: Increase the request count when requests are already queued. --- dlls/mf/session.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 3f5b9326636..b5b631fb00a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3362,13 +3362,13 @@ static void session_deliver_pending_samples(struct media_session *session, IMFTo static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *node, DWORD output) { - IMFTopologyNode *downstream_node, *upstream_node; - DWORD downstream_input, upstream_output; + IMFTopologyNode *down_node; struct topo_node *topo_node; MF_TOPOLOGY_TYPE node_type; + HRESULT hr = S_OK; IMFSample *sample; TOPOID node_id; - HRESULT hr; + DWORD input; IMFTopologyNode_GetNodeType(node, &node_type); IMFTopologyNode_GetTopoNodeID(node, &node_id); @@ -3385,27 +3385,29 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I { struct transform_stream *stream = &topo_node->u.transform.outputs[output]; - if (FAILED(hr = transform_stream_pop_sample(stream, &sample))) + if (FAILED(hr = IMFTopologyNode_GetOutput(node, output, &down_node, &input))) { - /* Forward request to upstream node. */ - if (SUCCEEDED(hr = IMFTopologyNode_GetInput(node, 0 /* FIXME */, &upstream_node, &upstream_output))) - { - if (SUCCEEDED(hr = session_request_sample_from_node(session, upstream_node, upstream_output))) - stream->requests++; - IMFTopologyNode_Release(upstream_node); - } + WARN("Failed to node %p/%lu output, hr %#lx.\n", node, output, hr); + break; } - else - { - if (SUCCEEDED(hr = IMFTopologyNode_GetOutput(node, output, &downstream_node, &downstream_input))) - { - session_deliver_sample_to_node(session, downstream_node, downstream_input, sample); - IMFTopologyNode_Release(downstream_node); - } + if (SUCCEEDED(transform_stream_pop_sample(stream, &sample))) + { + session_deliver_sample_to_node(session, down_node, input, sample); IMFSample_Release(sample); } + else if (transform_node_has_requests(topo_node)) + { + /* there's already requests pending, just increase the counter */ + stream->requests++; + } + else + { + stream->requests++; + transform_node_deliver_samples(session, topo_node); + } + IMFTopologyNode_Release(down_node); break; } case MF_TOPOLOGY_TEE_NODE:

1 0