March 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_EnumPins().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 43e208e349af408c68954d22c8888b23efdbc9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e208e349af408c68954d22… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 3 20:11:50 2019 -0600 quartz/tests: Add some tests for IBaseFilter_EnumPins(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/waveparser.c | 206 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index 3923c5d..377d33b 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -22,6 +22,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; + static IBaseFilter *create_wave_parser(void) { IBaseFilter *filter = NULL; @@ -31,6 +33,72 @@ static IBaseFilter *create_wave_parser(void) return filter; } +static const WCHAR wavefile[] = {'t','e','s','t','.','w','a','v',0}; + +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); + CloseHandle(file); + + return pathW; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static IFilterGraph2 *connect_input(IBaseFilter *splitter, const WCHAR *filename) +{ + static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; + IFileSourceFilter *filesource; + IFilterGraph2 *graph; + IBaseFilter *reader; + IPin *source, *sink; + HRESULT hr; + + CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&reader); + IBaseFilter_QueryInterface(reader, &IID_IFileSourceFilter, (void **)&filesource); + IFileSourceFilter_Load(filesource, filename, NULL); + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_AddFilter(graph, reader, NULL); + IFilterGraph2_AddFilter(graph, splitter, NULL); + + IBaseFilter_FindPin(splitter, sink_name, &sink); + IBaseFilter_FindPin(reader, outputW, &source); + + hr = IFilterGraph2_ConnectDirect(graph, source, sink, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(source); + IPin_Release(sink); + IBaseFilter_Release(reader); + IFileSourceFilter_Release(filesource); + return graph; +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -71,11 +139,149 @@ static void test_interfaces(void) IBaseFilter_Release(filter); } +static void test_enum_pins(void) +{ + const WCHAR *filename = load_resource(wavefile); + IBaseFilter *filter = create_wave_parser(); + IEnumPins *enum1, *enum2; + IFilterGraph2 *graph; + ULONG count, ref; + IPin *pins[3]; + HRESULT hr; + BOOL ret; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + + graph = connect_input(filter, filename); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + IEnumPins_Release(enum1); + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(waveparser) { CoInitialize(NULL); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/waveparser: Ignore unsupported chunks when connecting.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 0e4acebb7ef3e88a2894711cf1b5e95b4a9549d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4acebb7ef3e88a2894711c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 3 20:11:49 2019 -0600 quartz/waveparser: Ignore unsupported chunks when connecting. In particular, the test file just added contains 'LIST' chunks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 8 ++++++++ dlls/quartz/waveparser.c | 18 ++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index db9c3bd..be31c92 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -30,9 +30,17 @@ #include "wingdi.h" #include "winuser.h" #include "dshow.h" +#include "wine/debug.h" #include "wine/strmbase.h" #include "wine/list.h" +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} + /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define SEC_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 834b634..609f192 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -296,20 +296,14 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, pos += chunk.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); - if (chunk.fcc == mmioFOURCC('f','a','c','t')) + while (chunk.fcc != mmioFOURCC('d','a','t','a')) { - FIXME("'fact' chunk not supported yet\n"); - pos += sizeof(chunk) + chunk.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); + FIXME("Ignoring %s chunk.\n", debugstr_fourcc(chunk.fcc)); + pos += sizeof(chunk) + chunk.cb; + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); + if (hr != S_OK) + return E_FAIL; } - if (chunk.fcc != mmioFOURCC('d','a','t','a')) - { - ERR("Expected 'data' chunk, but got %.04s\n", (LPSTR)&chunk.fcc); - return E_FAIL; - } - - if (hr != S_OK) - return E_FAIL; pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK));

1 0

Michael Stefaniuc : winebus.sys: Remove useless casts to self.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: d64de0e2c1dd2f2390cda3ea2a631e2332c56cc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d64de0e2c1dd2f2390cda3ea… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:27 2019 +0100 winebus.sys: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 64b245e..1f671cf 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1086,7 +1086,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, /* The caller has to free the serial number */ if (*value) { - *serial_number = (WCHAR*)strdupAtoW(value); + *serial_number = strdupAtoW(value); found_serial = 1; } } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 299cec5..fd68833 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -380,7 +380,7 @@ static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) i = 0; LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, struct pnp_device, entry) { - (*devices)->Objects[i] = (DEVICE_OBJECT*)ptr->device; + (*devices)->Objects[i] = ptr->device; i++; } LeaveCriticalSection(&device_list_cs);

1 0

Michael Stefaniuc : comctl32/tests: Remove redundant not-NULL check ( coccinellery).
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: e0419391d74b595689d450b62f6f02ea538316d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0419391d74b595689d450b6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:23 2019 +0100 comctl32/tests: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 86d0fab..0e62ab9 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1559,8 +1559,7 @@ cleanup: if(hbmDst) DeleteObject(hbmDst); - if(hdcDst) - DeleteDC(hdcDst); + DeleteDC(hdcDst); if(hbmMask) DeleteObject(hbmMask);

1 0

Michael Stefaniuc : progman: Avoid using the comma operator.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 180da392801b2fdf7ae27f2f368de00a694676ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=180da392801b2fdf7ae27f2f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:22 2019 +0100 progman: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/progman/grpfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 4a71ce5..f3a084d 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -667,8 +667,8 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) PUT_SHORT(buffer, 0, 0x8000); PUT_SHORT(buffer, 2, 0xffff); PUT_SHORT(buffer, 4, 0x000a); - buffer[6] = 'P', buffer[7] = 'M'; - buffer[8] = 'C', buffer[9] = 'C'; + buffer[6] = 'P'; buffer[7] = 'M'; + buffer[8] = 'C'; buffer[9] = 'C'; if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 10)) return FALSE;

1 0

Michael Stefaniuc : ntdll/tests: Avoid using the comma operator.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: a4ff7ea2b486bcc5042712fe3e553ca33fe6b06a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ff7ea2b486bcc5042712fe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:19 2019 +0100 ntdll/tests: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index a69b31b..1109f7f 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -619,7 +619,7 @@ static void test_NtQueryDirectoryFile(void) ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(next->FileName, next->FileNameLength/sizeof(WCHAR))); - data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ), + data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ); memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; @@ -636,7 +636,7 @@ static void test_NtQueryDirectoryFile(void) next = (FILE_BOTH_DIRECTORY_INFORMATION *)&fbdi->FileName[1]; ok( next->NextEntryOffset == 0x55555555, "wrong offset %x\n", next->NextEntryOffset ); - data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ), + data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ); memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef;

1 0

Michael Stefaniuc : ieframe/tests: Remove useless cast to self.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: fbc92ec220881ea4061f393a93c3541024a8a385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbc92ec220881ea4061f393a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:24 2019 +0100 ieframe/tests: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d507..0e73117 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4069,7 +4069,7 @@ static void test_SetAdvise(void) ok(!flags, "got %08x\n", aspects); ok(sink == NULL, "got %p\n", sink); - hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, (IAdviseSink *)&test_sink); + hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, &test_sink); ok(hr == S_OK, "got %08x\n", hr); aspects = flags = 0xdeadbeef;

1 0

Józef Kucia : dxgi: Handle VK_ERROR_OUT_OF_DATE_KHR returned from vkAcquireNextImageKHR().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: bfdc07e7d0cc039557139acbfffd54d7669a7ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfdc07e7d0cc039557139acb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:29 2019 +0100 dxgi: Handle VK_ERROR_OUT_OF_DATE_KHR returned from vkAcquireNextImageKHR(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 22feeae..991a505 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1421,7 +1421,7 @@ static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapc if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { - ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); + WARN("Failed to acquire next Vulkan image, vr %d.\n", vr); return vr; } @@ -2136,6 +2136,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface } vr = d3d12_swapchain_acquire_next_image(swapchain); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) + { + TRACE("Recreating Vulkan swapchain.\n"); + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); + } + if (vr < 0) + ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); return hresult_from_vk_result(vr); } @@ -2570,6 +2578,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { + ERR("Failed to acquire Vulkan image, vr %d.\n", vr); d3d12_swapchain_destroy(swapchain); return hresult_from_vk_result(vr); }

1 0

Józef Kucia : maintainers: Add d3d12 to Direct3D section.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: d42fe85f2c2d824e68095570b15c2c4c9ce6cff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d42fe85f2c2d824e68095570… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:26 2019 +0100 maintainers: Add d3d12 to Direct3D section. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e72a9e8..3442827 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -68,6 +68,7 @@ P: Józef Kucia <jkucia(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10*/ F: dlls/d3d11/ +F: dlls/d3d12/ F: dlls/d3d8/ F: dlls/d3d9/ F: dlls/d3drm/

1 0

Józef Kucia : wined3d: Add R8G8_UNORM vertex format.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 8205547f966a60d207dbbbd3375bad2542ad5caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=8205547f966a60d207dbbbd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:25 2019 +0100 wined3d: Add R8G8_UNORM vertex format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/utils.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 90488ed..4a02b3f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16341,6 +16341,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_SINT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8_SINT, }; @@ -16357,7 +16358,7 @@ static void test_create_input_layout(void) layout_desc->Format = vertex_formats[i]; hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); - ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", + ok(hr == S_OK, "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); refcount = get_refcount(device); ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 062f866..469ce1b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -633,6 +633,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R8G8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE},

1 0