November 2019 - Wine-devel - list.winehq.org

[PATCH] d3d12/tests: Add tests for swapchain buffer heap properties.
by Conor McCarthy 14 Nov '19

14 Nov '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 33f5288a..9634564b 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -601,6 +601,8 @@ static HWND create_window(DWORD style) static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12CommandQueue *queue, HWND window, unsigned int buffer_count, DXGI_FORMAT format, unsigned int width, unsigned int height) { + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_HEAP_FLAGS heap_flags; IDXGISwapChain1 *swapchain1; DXGI_SWAP_CHAIN_DESC1 desc; IDXGISwapChain3 *swapchain; @@ -646,6 +648,13 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12Com { hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]); ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + hr = ID3D12Resource_GetHeapProperties(context->render_target[i], &heap_properties, &heap_flags); + ok(hr == S_OK, "Failed to get swapchain buffer %u heap properties, hr %#x.\n", i, hr); + ok(heap_properties.Type == D3D12_HEAP_TYPE_DEFAULT, "Got unexpected heap type 0x%x.\n", heap_properties.Type); + ok(heap_properties.CPUPageProperty == 0, "Got unexpected cpu page property 0x%x.\n", heap_properties.CPUPageProperty); + ok(heap_properties.MemoryPoolPreference == 0, "Got unexpected memory pool preference 0x%x.\n", heap_properties.MemoryPoolPreference); + ok(heap_properties.CreationNodeMask == 1, "Got unexpected node mask 0x%x.\n", heap_properties.CreationNodeMask); + ok(heap_properties.VisibleNodeMask == 1, "Got unexpected node mask 0x%x.\n", heap_properties.VisibleNodeMask); ID3D12Device_CreateRenderTargetView(context->device, context->render_target[i], NULL, context->rtv[i]); } } -- 2.23.0

1 0

[PATCH 1/4] dmime: SigTrigger track supports parameter GUID_IDirectMusicStyle.
by Alistair Leslie-Hughes 14 Nov '19

14 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/segtriggertrack.c | 13 ++++++++----- dlls/dmime/tests/dmime.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 37d7e46d20..7f81e2e1f4 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -138,12 +138,15 @@ static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) { - IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + if (IsEqualGUID(rguidType, &GUID_IDirectMusicStyle)) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index b7bf542fd8..944a278dbb 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -565,6 +565,16 @@ static void test_track(void) ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %08x\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %08x\n", hr); + + hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); + ok(hr == E_NOTIMPL, "got: %08x\n", hr); + } + else { + hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); + if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) + ok(hr == S_OK, "got: %08x\n", hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr); } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { -- 2.17.1

2 1

[PATCH 4/4] dmime: Free list when Sig trigger track is destroyed.
by Alistair Leslie-Hughes 14 Nov '19

14 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/segtriggertrack.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 7f81e2e1f4..d371ae86e5 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -21,6 +21,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -81,7 +83,19 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct list* cursor, *cursor2; + LPDMUS_PRIVATE_SEGMENT_ITEM item; + + LIST_FOR_EACH_SAFE (cursor, cursor2, &This->Items) { + item = LIST_ENTRY(cursor, DMUS_PRIVATE_SEGMENT_ITEM, entry); + list_remove(cursor); + + if (item->pObject) + IDirectMusicObject_Release(item->pObject); + heap_free(item); + } + + heap_free(This); DMIME_UnlockModule(); } -- 2.17.1

2 1

[PATCH 3/4] dmime: Free list when Tempo track is destroyed.
by Alistair Leslie-Hughes 14 Nov '19

14 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/tempotrack.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 1ee6c5ac78..b0d96d0076 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -21,6 +21,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -82,7 +84,17 @@ static ULONG WINAPI tempo_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct list* cursor, *cursor2; + LPDMUS_PRIVATE_TEMPO_ITEM item; + + LIST_FOR_EACH_SAFE (cursor, cursor2, &This->Items) { + item = LIST_ENTRY(cursor, DMUS_PRIVATE_TEMPO_ITEM, entry); + list_remove(cursor); + + heap_free(item); + } + + heap_free(This); DMIME_UnlockModule(); } -- 2.17.1

2 1

[PATCH 2/4] dmstyle: Free list when Style track is destroyed
by Alistair Leslie-Hughes 14 Nov '19

14 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmstyle/styletrack.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 496e0c5ba7..cbaba0a16a 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -20,6 +20,8 @@ #include "dmstyle_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -80,7 +82,18 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct list* cursor, *cursor2; + LPDMUS_PRIVATE_STYLE_ITEM item; + + LIST_FOR_EACH_SAFE (cursor, cursor2, &This->Items) { + item = LIST_ENTRY(cursor, DMUS_PRIVATE_STYLE_ITEM, entry); + list_remove(cursor); + + IDirectMusicStyle8_Release(item->pObject); + heap_free(item); + } + + heap_free(This); DMSTYLE_UnlockModule(); } -- 2.17.1

2 1

[PATCH v2] winex11: Fix off-by-one errors in color value scaling
by Alex Henrie 14 Nov '19

14 Nov '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- For 0 to map to 0 and 255 to map to 65535, the value must be multiplied by 257, not 256. The incorrect factor would cause the color #FFFFFF to become #FEFEFE. v2: Also correct reverse mapping --- dlls/winex11.drv/palette.c | 42 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 25bdb5f2bf..06d02c300a 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -293,19 +293,19 @@ static BOOL X11DRV_PALETTE_BuildPrivateMap( const PALETTEENTRY *sys_pal_template { if( i < NB_RESERVED_COLORS/2 ) { - color.red = sys_pal_template[i].peRed * 65535 / 255; - color.green = sys_pal_template[i].peGreen * 65535 / 255; - color.blue = sys_pal_template[i].peBlue * 65535 / 255; - COLOR_sysPal[i] = sys_pal_template[i]; + color.red = sys_pal_template[i].peRed * (65535 / 255); + color.green = sys_pal_template[i].peGreen * (65535 / 255); + color.blue = sys_pal_template[i].peBlue * (65535 / 255); + COLOR_sysPal[i] = sys_pal_template[i]; COLOR_sysPal[i].peFlags |= PC_SYS_USED; } else if( i >= palette_size - NB_RESERVED_COLORS/2 ) { - int j = NB_RESERVED_COLORS + i - palette_size; - color.red = sys_pal_template[j].peRed * 65535 / 255; - color.green = sys_pal_template[j].peGreen * 65535 / 255; - color.blue = sys_pal_template[j].peBlue * 65535 / 255; - COLOR_sysPal[i] = sys_pal_template[j]; + int j = NB_RESERVED_COLORS + i - palette_size; + color.red = sys_pal_template[j].peRed * (65535 / 255); + color.green = sys_pal_template[j].peGreen * (65535 / 255); + color.blue = sys_pal_template[j].peBlue * (65535 / 255); + COLOR_sysPal[i] = sys_pal_template[j]; COLOR_sysPal[i].peFlags |= PC_SYS_USED; } @@ -405,9 +405,9 @@ static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template for( c.pixel = 0, diff = 0x7fffffff; c.pixel < max; c.pixel += step ) { XQueryColor(gdi_display, default_colormap, &c); - r = (c.red - color.red)>>8; - g = (c.green - color.green)>>8; - b = (c.blue - color.blue)>>8; + r = (c.red - color.red) / (65535 / 255); + g = (c.green - color.green) / (65535 / 255); + b = (c.blue - color.blue) / (65535 / 255); r = r*r + g*g + b*b; if( r < diff ) { best = c; diff = r; } } @@ -633,9 +633,9 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa { XColor color; color.pixel = (X11DRV_PALETTE_PaletteToXPixel)? X11DRV_PALETTE_PaletteToXPixel[idx] : idx; - color.red = COLOR_sysPal[idx].peRed << 8; - color.green = COLOR_sysPal[idx].peGreen << 8; - color.blue = COLOR_sysPal[idx].peBlue << 8; + color.red = COLOR_sysPal[idx].peRed * (65535 / 255); + color.green = COLOR_sysPal[idx].peGreen * (65535 / 255); + color.blue = COLOR_sysPal[idx].peBlue * (65535 / 255); color.flags = DoRed | DoGreen | DoBlue; XStoreColor(gdi_display, default_colormap, &color); } @@ -658,7 +658,9 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa xc.pixel = i; XQueryColor(gdi_display, default_colormap, &xc); - r = xc.red>>8; g = xc.green>>8; b = xc.blue>>8; + r = xc.red / (65535 / 255); + g = xc.green / (65535 / 255); + b = xc.blue / (65535 / 255); if( xc.pixel < 256 && X11DRV_PALETTE_CheckSysColor( sys_pal_template, RGB(r, g, b)) && XAllocColor(gdi_display, default_colormap, &xc) ) @@ -753,7 +755,7 @@ COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) color.pixel = pixel; XQueryColor(gdi_display, default_colormap, &color); - return RGB(color.red >> 8, color.green >> 8, color.blue >> 8); + return RGB(color.red / (65535 / 255), color.green / (65535 / 255), color.blue / (65535 / 255)); } @@ -1156,9 +1158,9 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) X11DRV_PALETTE_firstFree = X11DRV_PALETTE_freeList[index]; color.pixel = (X11DRV_PALETTE_PaletteToXPixel) ? X11DRV_PALETTE_PaletteToXPixel[index] : index; - color.red = entries[i].peRed << 8; - color.green = entries[i].peGreen << 8; - color.blue = entries[i].peBlue << 8; + color.red = entries[i].peRed * (65535 / 255); + color.green = entries[i].peGreen * (65535 / 255); + color.blue = entries[i].peBlue * (65535 / 255); color.flags = DoRed | DoGreen | DoBlue; XStoreColor(gdi_display, default_colormap, &color); -- 2.24.0

2 2

[PATCH 4/5 v2] msvcrt: Call invalid parameter handler in strftime.
by Piotr Caban 13 Nov '19

13 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)

2 2

[PATCH 3/5 v2] ucrtbase: Clean up strftime tests.
by Piotr Caban 13 Nov '19

13 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 181 ++++++++++++------------------------- 1 file changed, 57 insertions(+), 124 deletions(-)

2 1

[PATCH 1/5 v2] ucrtbase: Set invalid parameter handler for all misc tests.
by Piotr Caban 13 Nov '19

13 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)

2 1

[PATCH 2/5] ucrtbase: strftime returns 4-digit timezone for %z.
by Piotr Caban 13 Nov '19

13 Nov '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 30 ++++++++++++++++++++++++++++++ dlls/ucrtbase/tests/misc.c | 6 ++++++ 2 files changed, 36 insertions(+)

2 2