December 2020 - Wine-Devel - list.winehq.org

Re: [PATCH 5/5] include: Add ID2D1Multithread interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 2/5] include: Add ID2D1GradientStopCollection1 interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 4/5] include: Add ID2D1StrokeStyle1 interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 3/5] include: Add ID2D1ImageBrush interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 1/5] include: Add ID2D1ColorContext interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH] include: Fix broken defines in d3d9 headers

by Henri Verbeet

On Wed, 9 Dec 2020 at 02:54, Rafał Harabień <rafalh92(a)outlook.com> wrote: > > * rename D3DENUM_NO_WHQL_LEVEL to D3DENUM_WHQL_LEVEL > * remove D3DCAPS2_NO2DDURING3DSCENE > * remove D3DCAPS2_CANRENDERWINDOWED > This kind of commit message typically indicates you're doing multiple separate things in a single patch, and the patch should be split. > diff --git a/include/d3d9.h b/include/d3d9.h > index 3ebde4509af..d61461f0833 100644 > --- a/include/d3d9.h > +++ b/include/d3d9.h > @@ -61,7 +61,7 @@ > */ > #define D3D_SDK_VERSION 32 > #define D3DADAPTER_DEFAULT 0 > -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) > +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) Ok, but in that case the interpretation of the flag is probably wrong too; this currently maps to WINED3DENUM_NO_WHQL_LEVEL.

Dec. 10, 2020

[PATCH 3/3] wined3d: Do not request VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for unmappable buffers.

by Henri Verbeet

In particular, some implementations may not support the combination of VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT and VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for all buffer types, or at all. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Reported by Stefan on IRC. dlls/wined3d/buffer.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 11974467984..088697a57d5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1391,11 +1391,13 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + memory_type = 0; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) - memory_type |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) + memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { @@ -1472,9 +1474,11 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) { + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); struct wined3d_resource *resource = &buffer->resource; + struct wined3d_bo_address src, dst; const struct wined3d_range *range; - struct wined3d_bo_address dst; + struct wined3d_bo_vk *dst_bo; unsigned int i = range_count; uint32_t flags; void *map_ptr; @@ -1488,6 +1492,24 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc flags = WINED3D_MAP_WRITE; if (!ranges->offset && ranges->size == resource->size) flags |= WINED3D_MAP_DISCARD; + + dst_bo = &wined3d_buffer_vk(buffer)->bo; + if (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(flags & WINED3D_MAP_DISCARD) + && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id)) + { + src.buffer_object = 0; + while (range_count--) + { + range = &ranges[range_count]; + + src.addr = (uint8_t *)data + range->offset - data_offset; + dst.addr = (void *)(uintptr_t)range->offset; + wined3d_context_copy_bo_address(context, &dst, &src, range->size); + } + + return; + } + if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, flags))) { FIXME("Failed to map buffer.\n"); -- 2.20.1

Dec. 10, 2020

[PATCH 2/3] wined3d: Request VK_MEMORY_PROPERTY_HOST_CACHED_BIT for WINED3D_RESOURCE_ACCESS_MAP_R buffers.

by Henri Verbeet

Unsurprisingly, reading for uncached memory may be very slow. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dc32d97530a..11974467984 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1394,6 +1394,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) + memory_type |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { -- 2.20.1

Dec. 10, 2020

[PATCH 1/3] wined3d: Do not request VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT for dynamic buffers.

by Henri Verbeet

We don't typically need these to be in VRAM, and VRAM may not be mappable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6ff6a5b6cd0..dc32d97530a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1390,8 +1390,11 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT - | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + + memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); -- 2.20.1

Dec. 10, 2020

Re: [PATCH v2 5/5] gdiplus/tests: Use wide-char string literals for test strings.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 4/5] gdiplus/tests: Use wide-char string literal for metafile description.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 1/5] gdiplus/tests: Use wide-char string literals for font names.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 3/5] gdiplus/tests: Use wide-char string literal for mimetype.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 2/5] gdiplus/tests: Use wide-char string literals for file names.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: Wine staging 6.0rc1 release

by Gerald Pfeifer

Alistair Leslie-Hughes wrote: > * Rebased to current wine 6.0rc1 (740 patches are applied to wine vanilla) Thank you. Just a little ask: would you mind using the same version designator as Alexandre does? He's using 6.0-rc1 with a dash as opposed to 6.0rc1 without (cf. https://www.winehq.org/pipermail/wine-announce/2020-December/000504.html ). That kind of consistency makes life for packagers a little easier. Thanks, Gerald

Dec. 9, 2020

Re: [PATCH] ntoskrnl/tests: Use wide-char string literals in locale.c.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83311 Your paranoid android. === w8 (32 bit report) === ntoskrnl.exe: ntoskrnl.c:676: Test failed: Got unexpected ret -1. ntoskrnl.c:677: Test failed: Received unexpected data.

Dec. 9, 2020

[PATCH] ntoskrnl/tests: Use wide-char string literals in locale.c.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 38 ++++++++---------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 +-- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dfc742eec3b..5617342d803 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -50,13 +50,6 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) return 0; } -static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; -static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','U','p','p','e','r',0}; -static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; - static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *lower_device, *upper_device; @@ -183,14 +176,8 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } -static const WCHAR driver2_path[] = { - '\\','R','e','g','i','s','t','r','y', - '\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','S','e','r','v','i','c','e','s', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 -}; +static const WCHAR driver2_path[] = + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\WineTestDriver2"; static IMAGE_INFO test_image_info; static int test_load_image_notify_count; @@ -1163,8 +1150,6 @@ static void test_ob_reference(const WCHAR *test_path) SIZE_T len; NTSTATUS status; - static const WCHAR tmpW[] = {'.','t','m','p',0}; - pObGetObjectType = get_proc_address("ObGetObjectType"); if (!pObGetObjectType) win_skip("ObGetObjectType not found\n"); @@ -1174,9 +1159,9 @@ static void test_ob_reference(const WCHAR *test_path) ok(!status, "ZwCreateEvent failed: %#x\n", status); len = wcslen(test_path); - tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(tmpW)); + tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(L".tmp")); memcpy(tmp_path, test_path, len * sizeof(WCHAR)); - memcpy(tmp_path + len, tmpW, sizeof(tmpW)); + memcpy(tmp_path + len, L".tmp", sizeof(L".tmp")); RtlInitUnicodeString(&pathU, tmp_path); attr.ObjectName = &pathU; @@ -2487,7 +2472,7 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) DbgPrint("unloading driver\n"); - RtlInitUnicodeString(&linkW, driver_link); + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); IoDeleteSymbolicLink(&linkW); IoDeleteDevice(upper_device); @@ -2496,9 +2481,6 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) { - static const WCHAR IoDriverObjectTypeW[] = {'I','o','D','r','i','v','e','r','O','b','j','e','c','t','T','y','p','e',0}; - static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; UNICODE_STRING nameW, linkW; NTSTATUS status; void *obj; @@ -2517,10 +2499,10 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_QUERY_INFORMATION] = driver_QueryInformation; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; - RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); + RtlInitUnicodeString(&nameW, L"IoDriverObjectType"); pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); - RtlInitUnicodeString(&nameW, driver_nameW); + RtlInitUnicodeString(&nameW, L"\\Driver\\WineTestDriver"); if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) return status; if (obj != driver) @@ -2530,8 +2512,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) } ObDereferenceObject(obj); - RtlInitUnicodeString(&nameW, device_name); - RtlInitUnicodeString(&linkW, driver_link); + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestDriver"); + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) @@ -2542,7 +2524,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) if (!status) { - RtlInitUnicodeString(&nameW, upper_name); + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestUpper"); status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c2285aef6fc..2a7ebaa9599 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -156,7 +156,6 @@ static ULONG64 modified_value; static void main_test(void) { - static const WCHAR dokW[] = {'d','o','k',0}; WCHAR temppathW[MAX_PATH], pathW[MAX_PATH]; struct test_input *test_input; DWORD len, written, read; @@ -168,7 +167,7 @@ static void main_test(void) /* Create a temporary file that the driver will write ok/trace output to. */ GetTempPathW(MAX_PATH, temppathW); - GetTempFileNameW(temppathW, dokW, 0, pathW); + GetTempFileNameW(temppathW, L"dok", 0, pathW); pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); len = pathU.Length + sizeof(WCHAR); -- 2.26.2

Dec. 9, 2020

[PATCH] wmvcore/tests: Use wide-char string literals in locale.c.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 2b5a4555a35..fac9948d60e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -321,36 +321,31 @@ static void test_WMCreateWriterPriv(void) static void test_urlextension(void) { HRESULT hr; - const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; - const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; - const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; - const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; hr = WMCheckURLExtension(NULL); ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(mkvfile); + hr = WMCheckURLExtension(L"test.mkv"); ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(mp3file); + hr = WMCheckURLExtension(L"test.mp3"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(urlfile); + hr = WMCheckURLExtension(L"abcd://test/test.wmv"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(testurl); + hr = WMCheckURLExtension(L"http://test/t.asf?alt=t.mkv"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); } static void test_iscontentprotected(void) { HRESULT hr; - const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; BOOL drm; hr = WMIsContentProtected(NULL, NULL); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); hr = WMIsContentProtected(NULL, &drm); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); - hr = WMIsContentProtected(mp3file, NULL); + hr = WMIsContentProtected(L"test.mp3", NULL); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); - hr = WMIsContentProtected(mp3file, &drm); + hr = WMIsContentProtected(L"test.mp3", &drm); ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); ok(drm == FALSE, "got %0dx\n", drm); } -- 2.26.2

Dec. 9, 2020

[PATCH] gdi32: Fix gdi font leak in CreateScalableFontResourceW.

by Rémi Bernon

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50273 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9fa0f45ec4b..e76bb772eea 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6887,6 +6887,7 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD hidden, LPCWSTR resource_file, fontdir.dfReserved = 0; WideCharToMultiByte( CP_ACP, 0, (WCHAR *)font->otm.otmpFamilyName, -1, fontdir.szFaceName, LF_FACESIZE, NULL, NULL ); + free_gdi_font( font ); if (hidden) fontdir.dfType |= 0x80; return create_fot( resource_file, font_file, &fontdir ); -- 2.29.2

Dec. 9, 2020

Re: ntdll:exception crashes some Windows 10

by Francois Gouget

For future reference here is a summary of some additional tests I did with Paul: * Setting all Dr* fields to 0 in dreg_handler() except Dr2 still causes a crash. That's a buggy behavior. * Moving the TestBot's w10pro64 VM to my box and running ntdll:exception also leads to a crash. So that seems to indicate a host issue rather than a guest-side Windows configuration issue. * All hosts are running Debian 10 but combining my results with the TestBot's we have the following matrix: kernel 4.19.0-12-amd64 + QEmu 1:3.1+dfsg-8+deb10u8 -> Works (w1064) kernel 5.8.0-0.bpo.2-amd64 + QEmu 1:5.0-14~bpo10+1 -> Works (w10pro64) kernel 4.19.0-11-amd64 + QEmu 1:5.0-14~bpo10+1 -> Crashes (my w10pro64) So maybe it's a 4.19.0.11 bug or QEmu 5.0 does not like 4.19 kernels. I'll continue the tests when I can reboot. -- Francois Gouget <fgouget(a)codeweavers.com>

Dec. 9, 2020

Re: [PATCH vkd3d v3 5/5] vkd3d-shader: Implement basic support for #if and #endif.

by Henri Verbeet

On Mon, 7 Dec 2020 at 22:27, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > +newline > + : T_NEWLINE > + | YYEOF > + <srcdir>/libs/vkd3d-shader/preproc.y:194.7-11: error: symbol YYEOF is used, but is not defined as a token and has no rules

Dec. 9, 2020

Re: [PATCH vkd3d v3 4/5] vkd3d-shader: Handle preprocessor parsing errors.

by Henri Verbeet

On Mon, 7 Dec 2020 at 22:27, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/preproc.h | 11 +++++++ > libs/vkd3d-shader/preproc.l | 39 +++++++++++++++++++++++- > libs/vkd3d-shader/preproc.y | 39 +++++++++++++++++++++++- > libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ > 4 files changed, 89 insertions(+), 2 deletions(-) > It fails to build here: <srcdir>/libs/vkd3d-shader/preproc.y:82.9-25: error: %define variable 'api.location.type' is not used

Dec. 9, 2020

Re: [PATCH vkd3d] vkd3d: Fix misplaced parenthesis.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 9, 2020

Re: [PATCH vkd3d v3 3/5] vkd3d-shader: Preserve some tokens verbatim for HLSL.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 9, 2020

Re: [PATCH vkd3d v3 2/5] vkd3d-shader: Parse comments in the preprocessor.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 9, 2020