February 2023 - Wine-Commits

Alexandre Julliard : makedep: Don't add dependencies for tests of disabled dlls.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 8670876db9b7b918cb7893a16d7edde6b40a607a URL: https://gitlab.winehq.org/wine/wine/-/commit/8670876db9b7b918cb7893a16d7edd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 21:04:35 2023 +0100 makedep: Don't add dependencies for tests of disabled dlls. --- tools/makedep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 532145de292..b94a221854d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3558,6 +3558,11 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output( "\t%secho \"%s_test.exe TESTRES \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), basemodule, obj_dir_path( make, stripped ), tools_path( make, "wrc" )); + if (make->disabled[arch] || (parent && parent->disabled[arch])) + { + make->ok_files = empty_strarray; + return; + } output_filenames_obj_dir( make, make->ok_files ); output( ": %s", obj_dir_path( make, testmodule )); if (parent) @@ -3568,8 +3573,7 @@ static void output_test_module( struct makefile *make, unsigned int arch ) } output( "\n" ); output( "%s %s:", obj_dir_path( make, "check" ), obj_dir_path( make, "test" )); - if (!make->disabled[arch] && parent && !parent->disabled[arch]) - output_filenames_obj_dir( make, make->ok_files ); + output_filenames_obj_dir( make, make->ok_files ); output( "\n" ); strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "check" )); strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "test" ));

1 0

Ziqing Hui : mf/tests: Test output data for WMV decoder DMO.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 13a65b849e07a7f66cc122efa6a8c9aed4a56dc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/13a65b849e07a7f66cc122efa6a8c9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Feb 2 11:13:46 2023 +0800 mf/tests: Test output data for WMV decoder DMO. --- dlls/mf/tests/transform.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 72440051192..7d217dfe8c0 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1617,6 +1617,50 @@ static void check_dmo_set_output_type(IMediaObject *media_object, const GUID *su } } +#define check_dmo_output_data_buffer(a, b, c) check_dmo_output_data_buffer_(__LINE__, a, b, c) +static DWORD check_dmo_output_data_buffer_(int line, DMO_OUTPUT_DATA_BUFFER *output_data_buffer, + const struct sample_desc *sample_desc, const WCHAR *expect_data_filename) +{ + const struct buffer_desc *buffer_desc = &sample_desc->buffers[0]; + DWORD diff, data_length, buffer_length, expect_length; + BYTE *data, *buffer; + HRESULT hr; + + if (output_data_buffer->dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIME) + ok_(__FILE__, line)(output_data_buffer->rtTimestamp == sample_desc->sample_time, + "Unexpected time %I64d, expected %I64d.\n", + output_data_buffer->rtTimestamp, sample_desc->sample_time); + if (output_data_buffer->dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH) + ok_(__FILE__, line)(output_data_buffer->rtTimelength == sample_desc->sample_duration, + "Unexpected duration %I64d, expected %I64d.\n", + output_data_buffer->rtTimelength, sample_desc->sample_duration); + + load_resource(expect_data_filename, (const BYTE **)&data, &data_length); + + expect_length = buffer_desc->length; + if (expect_length == -1) + { + expect_length = *(DWORD *)data; + data += sizeof(DWORD); + data_length = data_length - sizeof(DWORD); + } + + hr = IMediaBuffer_GetBufferAndLength(output_data_buffer->pBuffer, &buffer, &buffer_length); + ok(hr == S_OK, "GetBufferAndLength returned %#lx.\n", hr); + ok_(__FILE__, line)(buffer_length == expect_length, "Unexpected length %#lx, expected %#lx\n", buffer_length, expect_length); + + diff = 0; + if (data_length < buffer_length) + ok_(__FILE__, line)(0, "Missing %#lx bytes\n", buffer_length - data_length); + else if (!buffer_desc->compare) + diff = compare_bytes(buffer, &buffer_length, NULL, data); + else + diff = buffer_desc->compare(buffer, &buffer_length, &buffer_desc->rect, data); + + return diff; +} + + static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -5170,7 +5214,17 @@ static void test_wmv_decoder_media_object(void) }; const DWORD data_width = 96, data_height = 96; const POINT test_size[] = {{16, 16}, {96, 96}, {320, 240}}; - DWORD in_count, out_count, size, expected_size, alignment, wmv_data_length, status; + const struct buffer_desc output_buffer_desc_nv12 = + { + .length = data_width * data_height * 3 / 2, + .compare = compare_nv12, .dump = dump_nv12, .rect = {.right = 82, .bottom = 84}, + }; + const struct sample_desc output_sample_desc_nv12 = + { + .sample_time = 0, .sample_duration = 333333, + .buffer_count = 1, .buffers = &output_buffer_desc_nv12, + }; + DWORD in_count, out_count, size, expected_size, alignment, wmv_data_length, status, expected_status, diff; struct media_buffer *input_media_buffer = NULL, *output_media_buffer = NULL; DMO_OUTPUT_DATA_BUFFER output_data_buffer; DMO_MEDIA_TYPE media_type, *type; @@ -5315,7 +5369,7 @@ static void test_wmv_decoder_media_object(void) hr = IMediaObject_SetOutputType(media_object, 0, type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); - hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 0); + hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 333333); todo_wine ok(hr == S_OK, "ProcessInput returned %#lx.\n", hr); @@ -5331,6 +5385,14 @@ static void test_wmv_decoder_media_object(void) hr = IMediaObject_ProcessOutput(media_object, 0, 1, &output_data_buffer, &status); todo_wine ok(hr == S_OK, "ProcessOutput returned %#lx.\n", hr); + expected_status = DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT | DMO_OUTPUT_DATA_BUFFERF_TIME | DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH; + todo_wine + ok(output_data_buffer.dwStatus == expected_status, "Got unexpected dwStatus %#lx.\n", output_data_buffer.dwStatus); + if (hr == S_OK) + { + diff = check_dmo_output_data_buffer(&output_data_buffer, &output_sample_desc_nv12, L"nv12frame.bmp"); + ok(diff == 0, "Got %lu%% diff.\n", diff); + } ret = IMediaBuffer_Release(&output_media_buffer->IMediaBuffer_iface); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Paul Gofman : win32u: Expose and use ProcessEvents from drivers instead of MsgWaitForMultipleObjectsEx.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: a97fd9f29e7dbeee2dc06415a34a9f7669ea2e0d URL: https://gitlab.winehq.org/wine/wine/-/commit/a97fd9f29e7dbeee2dc06415a34a9f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 21 14:43:39 2023 -0600 win32u: Expose and use ProcessEvents from drivers instead of MsgWaitForMultipleObjectsEx. --- dlls/win32u/dce.c | 3 +-- dlls/win32u/driver.c | 12 ++++-------- dlls/win32u/input.c | 3 +-- dlls/win32u/message.c | 20 +++++++++++++------- dlls/wineandroid.drv/android.h | 4 +--- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/window.c | 11 ++++------- dlls/winemac.drv/event.c | 27 +++++---------------------- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 4 +--- dlls/winex11.drv/event.c | 25 ++++--------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 4 +--- include/wine/gdi_driver.h | 2 +- 14 files changed, 39 insertions(+), 82 deletions(-)

1 0

Ziqing Hui : mf/tests: Test ProcessInput and ProcessOutput for WMV decoder DMO.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 9d1b927924062a8485928d0d53709b6af292d637 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d1b927924062a8485928d0d53709b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jan 30 09:46:07 2023 +0800 mf/tests: Test ProcessInput and ProcessOutput for WMV decoder DMO. --- dlls/mf/tests/transform.c | 136 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 7ce68728574..72440051192 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -55,6 +55,97 @@ DEFINE_GUID(MFVideoFormat_WMV_Unknown,0x7ce12ca9,0xbfbf,0x43d9,0x9d,0x00,0x82,0x DEFINE_GUID(mft_output_sample_incomplete,0xffffff,0xffff,0xffff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff); +struct media_buffer +{ + IMediaBuffer IMediaBuffer_iface; + LONG refcount; + DWORD length; + DWORD max_length; + BYTE data[]; +}; + +static inline struct media_buffer *impl_from_IMediaBuffer(IMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct media_buffer, IMediaBuffer_iface); +} + +static HRESULT WINAPI media_buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, void **obj) +{ + if (IsEqualIID(iid, &IID_IMediaBuffer) + || IsEqualIID(iid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI media_buffer_AddRef(IMediaBuffer *iface) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedIncrement(&buffer->refcount); +} + +static ULONG WINAPI media_buffer_Release(IMediaBuffer *iface) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + ULONG ref = InterlockedDecrement(&buffer->refcount); + if (!ref) + free(buffer); + return ref; +} + +static HRESULT WINAPI media_buffer_SetLength(IMediaBuffer *iface, DWORD length) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + if (length > buffer->max_length) + return E_INVALIDARG; + buffer->length = length; + return S_OK; +} + +static HRESULT WINAPI media_buffer_GetMaxLength(IMediaBuffer *iface, DWORD *max_length) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + if (!max_length) + return E_POINTER; + *max_length = buffer->max_length; + return S_OK; +} + +static HRESULT WINAPI media_buffer_GetBufferAndLength(IMediaBuffer *iface, BYTE **data, DWORD *length) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + if (!data || ! length) + return E_POINTER; + *data = buffer->data; + *length = buffer->length; + return S_OK; +} + +static IMediaBufferVtbl media_buffer_vtbl = { + media_buffer_QueryInterface, + media_buffer_AddRef, + media_buffer_Release, + media_buffer_SetLength, + media_buffer_GetMaxLength, + media_buffer_GetBufferAndLength, +}; + +HRESULT media_buffer_create(DWORD max_length, struct media_buffer **ret) +{ + struct media_buffer *buffer; + + if (!(buffer = calloc(1, offsetof(struct media_buffer, data[max_length])))) + return E_OUTOFMEMORY; + buffer->IMediaBuffer_iface.lpVtbl = &media_buffer_vtbl; + buffer->refcount = 1; + buffer->length = 0; + buffer->max_length = max_length; + *ret = buffer; + return S_OK; +} + static BOOL is_compressed_subtype(const GUID *subtype) { if (IsEqualGUID(subtype, &MEDIASUBTYPE_WMV1) @@ -1526,7 +1617,6 @@ static void check_dmo_set_output_type(IMediaObject *media_object, const GUID *su } } - static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -5078,10 +5168,14 @@ static void test_wmv_decoder_media_object(void) {MFMediaType_Video, MEDIASUBTYPE_RGB555, TRUE, FALSE, 512, FORMAT_VideoInfo, NULL, 88, (BYTE *)&expected_output_info[11]}, {MFMediaType_Video, MEDIASUBTYPE_RGB8, TRUE, FALSE, 256, FORMAT_VideoInfo, NULL, 1112, (BYTE *)&expected_output_info[12]}, }; + const DWORD data_width = 96, data_height = 96; const POINT test_size[] = {{16, 16}, {96, 96}, {320, 240}}; - DWORD in_count, out_count, size, expected_size, alignment; + DWORD in_count, out_count, size, expected_size, alignment, wmv_data_length, status; + struct media_buffer *input_media_buffer = NULL, *output_media_buffer = NULL; + DMO_OUTPUT_DATA_BUFFER output_data_buffer; DMO_MEDIA_TYPE media_type, *type; IMediaObject *media_object; + const BYTE *wmv_data; char buffer[1024]; ULONG ret, i, j; HRESULT hr; @@ -5205,6 +5299,44 @@ static void test_wmv_decoder_media_object(void) winetest_pop_context(); } + /* Test ProcessInput. */ + load_resource(L"wmvencdata.bin", &wmv_data, &wmv_data_length); + wmv_data_length = *((DWORD *)wmv_data); + wmv_data += sizeof(DWORD); + hr = media_buffer_create(wmv_data_length, &input_media_buffer); + ok(hr == S_OK, "Failed to create input media buffer.\n"); + memcpy(input_media_buffer->data, wmv_data, wmv_data_length); + input_media_buffer->length = wmv_data_length; + + init_dmo_media_type_video(type, &MEDIASUBTYPE_WMV1, data_width, data_height); + hr = IMediaObject_SetInputType(media_object, 0, type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + init_dmo_media_type_video(type, &MEDIASUBTYPE_NV12, data_width, data_height); + hr = IMediaObject_SetOutputType(media_object, 0, type, 0); + ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); + + hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#lx.\n", hr); + + /* Test ProcessOutput. */ + hr = IMediaObject_GetOutputSizeInfo(media_object, 0, &size, &alignment); + ok(hr == S_OK, "GetOutputSizeInfo returned %#lx.\n", hr); + hr = media_buffer_create(size, &output_media_buffer); + ok(hr == S_OK, "Failed to create output media buffer.\n"); + output_data_buffer.pBuffer = &output_media_buffer->IMediaBuffer_iface; + output_data_buffer.dwStatus = 0xdeadbeef; + output_data_buffer.rtTimestamp = 0xdeadbeef; + output_data_buffer.rtTimelength = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(media_object, 0, 1, &output_data_buffer, &status); + todo_wine + ok(hr == S_OK, "ProcessOutput returned %#lx.\n", hr); + + ret = IMediaBuffer_Release(&output_media_buffer->IMediaBuffer_iface); + ok(ret == 0, "Release returned %lu\n", ret); + ret = IMediaBuffer_Release(&input_media_buffer->IMediaBuffer_iface); + ok(ret == 0, "Release returned %lu\n", ret); + ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret); CoUninitialize();

1 0

Ziqing Hui : mf/tests: Add missing \n.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: a5b5cef355568a59dd8633fc6a608d9f68598df8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5b5cef355568a59dd8633fc6a608d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Feb 9 17:40:25 2023 +0800 mf/tests: Add missing \n. --- dlls/mf/tests/transform.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index f806485df78..0c9f7548d42 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1323,11 +1323,11 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub { flag = flags[i]; hr = IMediaObject_SetInputType(media_object, 1, NULL, flag); - ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); hr = IMediaObject_SetInputType(media_object, 1, &bad_media_type, flag); - ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); hr = IMediaObject_SetInputType(media_object, 1, good_media_type, flag); - ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } /* Test unaccepted type. */ @@ -1337,10 +1337,10 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub if (!(flag & DMO_SET_TYPEF_CLEAR)) { hr = IMediaObject_SetInputType(media_object, 0, NULL, flag); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } hr = IMediaObject_SetInputType(media_object, 0, &bad_media_type, flag); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } /* Test clearing the type. */ @@ -1348,7 +1348,7 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub { flag = DMO_SET_TYPEF_CLEAR | flags[i]; hr = IMediaObject_SetInputType(media_object, 0, NULL, flag); - ok(hr == S_OK, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == S_OK, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } /* Test accepted type. */ @@ -1356,7 +1356,7 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub { flag = flags[i]; hr = IMediaObject_SetInputType(media_object, 0, good_media_type, flag); - ok(hr == S_OK, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == S_OK, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } /* Test unconsidered header member.*/

1 0

Ziqing Hui : mf/tests: Correctly initialize DMO media type.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 41288d0d701f7933538c3e20055f0e6b23935a59 URL: https://gitlab.winehq.org/wine/wine/-/commit/41288d0d701f7933538c3e20055f0e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Feb 22 11:13:29 2023 +0800 mf/tests: Correctly initialize DMO media type. --- dlls/mf/tests/transform.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 0c9f7548d42..7ce68728574 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -327,11 +327,14 @@ static void init_dmo_media_type_video(DMO_MEDIA_TYPE *media_type, { VIDEOINFOHEADER *header = (VIDEOINFOHEADER *)(media_type + 1); BOOL compressed = is_compressed_subtype(subtype); + ULONG codec_data_size = compressed ? 4 : 0; + + memset(media_type, 0, sizeof(*media_type) + sizeof(*header) + codec_data_size); - memset(header, 0, sizeof(*header)); header->bmiHeader.biSize = sizeof(header->bmiHeader); header->bmiHeader.biWidth = width; header->bmiHeader.biHeight = height; + header->bmiHeader.biPlanes = 1; header->bmiHeader.biBitCount = subtype_to_bpp(subtype); header->bmiHeader.biCompression = subtype_to_compression(subtype); @@ -342,7 +345,7 @@ static void init_dmo_media_type_video(DMO_MEDIA_TYPE *media_type, media_type->lSampleSize = 0; media_type->formattype = FORMAT_VideoInfo; media_type->pUnk = NULL; - media_type->cbFormat = sizeof(*header) + 4; /* 4 bytes codec data. */ + media_type->cbFormat = sizeof(*header) + codec_data_size; media_type->pbFormat = (BYTE *)header; }

1 0

Giovanni Mascellani : vkd3d-utils: Generate Doxygen documentation for vkd3d_utils.h.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: vkd3d Branch: master Commit: 5f904e5022e4f8c167415d14bf1eb0f00639427e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5f904e5022e4f8c167415d14bf1eb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 15 15:28:43 2023 +0100 vkd3d-utils: Generate Doxygen documentation for vkd3d_utils.h. --- include/vkd3d_utils.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 6e84b176..e8462563 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -29,6 +29,17 @@ extern "C" { #endif /* __cplusplus */ +/** + * \file vkd3d_utils.h + * + * This file contains definitions for the vkd3d-utils library. + * + * The vkd3d-utils library is a collections of routines to ease the + * porting of a Direct3D 12 application to vkd3d. + * + * \since 1.0 + */ + #define VKD3D_WAIT_OBJECT_0 (0) #define VKD3D_WAIT_TIMEOUT (1) #define VKD3D_WAIT_FAILED (~0u)

1 0

Zebediah Figura : vkd3d-shader: Avoid underflowing the indentation level.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: vkd3d Branch: master Commit: e10e12a10ca0968e5faadef0a9d92435eab73091 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e10e12a10ca0968e5faadef0a9d92… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 18:24:50 2022 -0600 vkd3d-shader: Avoid underflowing the indentation level. Any shader that would underflow is invalid, but it is helpful to allow tracing even invalid shaders. --- libs/vkd3d-shader/trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 8e2cac16..f32f26a7 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1930,7 +1930,8 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, case VKD3DSIH_ENDIF: case VKD3DSIH_ENDLOOP: case VKD3DSIH_ENDSWITCH: - --indent; + if (indent) + --indent; break; default:

1 0

Giovanni Mascellani : vkd3d-shader: Fix the Doxygen documentation for vkd3d_shader.h.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: vkd3d Branch: master Commit: 6bdb0abf680b791134e7e9238cbd0dd20a28c3a4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6bdb0abf680b791134e7e9238cbd0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 15 15:23:32 2023 +0100 vkd3d-shader: Fix the Doxygen documentation for vkd3d_shader.h. The \since field was too early, and prevented Doxygen from really parsing the synopsis for vkd3d_shader.h. --- include/vkd3d_shader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 86ffb9d5..49725ff9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -30,12 +30,12 @@ extern "C" { /** * \file vkd3d_shader.h * - * \since 1.2 - * * This file contains definitions for the vkd3d-shader library. * * The vkd3d-shader library provides multiple utilities related to the * compilation, transformation, and reflection of GPU shaders. + * + * \since 1.2 */ /** \since 1.3 */

1 0

Giovanni Mascellani : vkd3d: Generate Doxygen documentation for vkd3d.h.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: vkd3d Branch: master Commit: e5bbd05c987a932dd25d63289372215204f346ff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e5bbd05c987a932dd25d632893722… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 17 13:32:49 2023 +0100 vkd3d: Generate Doxygen documentation for vkd3d.h. --- include/vkd3d.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index b44f0084..76b1ba65 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -34,6 +34,18 @@ extern "C" { #endif /* __cplusplus */ +/** + * \file vkd3d.h + * + * This file contains definitions for the vkd3d library. + * + * The vkd3d library is a 3D graphics library built on top of + * Vulkan. It has an API very similar, but not identical, to + * Direct3D 12. + * + * \since 1.0 + */ + enum vkd3d_structure_type { /* 1.0 */

1 0