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

[PATCH 1/3] windowscodecs/tests: Add a test for copying pixels of a 24bpp TIFF format.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 103 ++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 36de69e467..8da843bdcc 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -219,6 +219,46 @@ static struct tiff_resolution_image_data { 72, 1 }, /* value will be filled with test data */ { 0x11, 0x22, 0x33, 0 } }; + +static const struct +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[13]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[3]; +} tiff_24bpp_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_1bpp_data, number_of_entries), + 13, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + }, + 0, + { 900, 3 }, + { 0x11, 0x22, 0x33 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -509,6 +549,68 @@ static void test_tiff_resolution(void) } } +static void test_tiff_24bpp(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT count, width, height, i, stride; + double dpi_x, dpi_y; + GUID format; + WICRect rc; + BYTE data[3]; + static const BYTE expected_data[] = { 0x33,0x22,0x11 }; + + decoder = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data)); + ok(decoder != NULL, "Failed to load TIFF image data\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(count == 1, "got %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %#x\n", hr); + ok(width == 1, "got %u\n", width); + ok(height == 1, "got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "GetResolution error %#x\n", hr); + ok(dpi_x == 300.0, "got %f\n", dpi_x); + ok(dpi_y == 300.0, "got %f\n", dpi_y); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + for (stride = 0; stride <= 32; stride++) + { + memset(data, 0, sizeof(data)); + rc.X = 0; + rc.Y = 0; + rc.Width = 1; + rc.Height = 1; + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, stride, sizeof(data), data); + if (stride < 3) + ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); + else + { +todo_wine_if(stride > 3) + ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); + + for (i = 0; i < sizeof(data); i++) +todo_wine_if(stride > 3) + ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); + } + } + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(tiffformat) { HRESULT hr; @@ -524,6 +626,7 @@ START_TEST(tiffformat) test_QueryCapability(); test_tiff_8bpp_alpha(); test_tiff_resolution(); + test_tiff_24bpp(); IWICImagingFactory_Release(factory); CoUninitialize(); -- 2.20.1

2 1

[PATCH 1/5] user32/tests: Add test for 8 bit image stretch mode in CopyImage().
by Paul Gofman 09 Jan '19

09 Jan '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/cursoricon.c | 49 +++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index c598b232a0..f00d3f2a0c 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2755,17 +2755,19 @@ static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO unsigned int row, unsigned int column) { const BITMAPINFOHEADER *h = &bmi->bmiHeader; + unsigned int stride, shift, mask; const unsigned char *data; - unsigned int stride; RGBQUAD color; - ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + ok(h->biBitCount <= 8 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; data = bits + row * stride + column * h->biBitCount / 8; if (h->biBitCount >= 24) return RGB(data[2], data[1], data[0]); - color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + shift = 8 - h->biBitCount - (column * h->biBitCount) % 8; + mask = ~(~0u << h->biBitCount); + color = bmi->bmiColors[(data[0] >> shift) & mask]; return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); } @@ -2783,6 +2785,18 @@ static void test_CopyImage_StretchMode(void) 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, }; + static const unsigned char test_bits_8[] = + { + 0x00, 0xff, 0x00, 0xff, + 0x00, 0x00, 0x00, 0x00, + 0xff, 0x55, 0x00, 0xff, + 0x00, 0xff, 0xff, 0x00, + }; + static const unsigned char expected_bits_8[] = + { + 0xff, 0xff, 0x00, 0x00, + 0x55, 0xff, 0x00, 0x00, + }; static const unsigned char test_bits_1[] = { 0x30, 0x0, 0x0, 0x0, @@ -2795,6 +2809,12 @@ static void test_CopyImage_StretchMode(void) 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, }; + static const RGBQUAD colors_bits_1[] = + { + {0, 0, 0}, + {0xff, 0xff, 0xff}, + }; + static RGBQUAD colors_bits_8[256]; static const struct { @@ -2802,19 +2822,25 @@ static void test_CopyImage_StretchMode(void) WORD bit_count; const unsigned char *test_bits, *expected_bits; size_t test_bits_size, result_bits_size; + const RGBQUAD *bmi_colors; + size_t bmi_colors_size; BOOL todo; } tests[] = { {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, - sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, TRUE}, {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, - sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + sizeof(test_bits_1), sizeof(expected_bits_1), colors_bits_1, + sizeof(colors_bits_1), FALSE}, + {4, 4, 2, 2, 8, test_bits_8, expected_bits_8, + sizeof(test_bits_8), sizeof(expected_bits_8), colors_bits_8, + sizeof(colors_bits_8), TRUE}, }; HBITMAP bitmap, bitmap_copy; + unsigned int row, column, i; unsigned char *result_bits; - unsigned int row, column; unsigned int test_index; unsigned char *bits; BITMAPINFO *bmi; @@ -2825,14 +2851,19 @@ static void test_CopyImage_StretchMode(void) bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; - bmi->bmiColors[1].rgbRed = 0xff; - bmi->bmiColors[1].rgbGreen = 0xff; - bmi->bmiColors[1].rgbBlue = 0xff; + + for (i = 0; i < 256; ++i) + colors_bits_8[i].rgbRed = colors_bits_8[i].rgbGreen = colors_bits_8[i].rgbBlue = i; hdc = GetDC(NULL); for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) { + if (tests[test_index].bmi_colors) + memcpy(bmi->bmiColors, tests[test_index].bmi_colors, tests[test_index].bmi_colors_size); + else + memset(bmi->bmiColors, 0, 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biWidth = tests[test_index].width; bmi->bmiHeader.biHeight = tests[test_index].height; bmi->bmiHeader.biBitCount = tests[test_index].bit_count; -- 2.20.1

3 7

[PATCH] po: Update German translation.
by Julian Rüger 09 Jan '19

09 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH vkd3d 3/3] tests: Add multithreaded private data test.
by Józef Kucia 09 Jan '19

09 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8563b32e91e..f34b82c855d7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2832,6 +2832,159 @@ static void test_private_data(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +struct private_data +{ + ID3D12Object *object; + GUID guid; + unsigned int value; +}; + +static void private_data_thread_main(void *untyped_data) +{ + struct private_data *data = untyped_data; + unsigned int i; + HRESULT hr; + + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, 0, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +struct private_data_interface +{ + ID3D12Object *object; + GUID guid; + IUnknown *iface; +}; + +static void private_data_interface_thread_main(void *untyped_data) +{ + struct private_data_interface *data = untyped_data; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +static void test_multithread_private_data(void) +{ + static const GUID guid = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0x00}}; + struct private_data_interface private_data_interface[4]; + HANDLE private_data_interface_thread[4]; + struct private_data private_data[4]; + ID3D12RootSignature *root_signature; + HANDLE private_data_thread[4]; + IUnknown *test_object, *unk; + ID3D12Device *device; + ID3D12Object *object; + unsigned int value; + unsigned int size; + unsigned int id; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature = create_empty_root_signature(device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + hr = ID3D12RootSignature_QueryInterface(root_signature, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12RootSignature_Release(root_signature); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&test_object); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0, id = 1; i < ARRAY_SIZE(private_data_interface); ++i, ++id) + { + private_data_interface[i].object = object; + private_data_interface[i].guid = guid; + private_data_interface[i].guid.Data4[7] = id; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&private_data_interface[i].iface); + ok(hr == S_OK, "Failed to create fence %u, hr %#x.\n", i, hr); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i, ++id) + { + private_data[i].object = object; + private_data[i].guid = guid; + private_data[i].guid.Data4[7] = id; + private_data[i].value = id; + } + + for (i = 0; i < 4; ++i) + { + private_data_interface_thread[i] = create_thread(private_data_interface_thread_main, &private_data_interface[i]); + private_data_thread[i] = create_thread(private_data_thread_main, &private_data[i]); + } + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < 4; ++i) + { + ok(join_thread(private_data_interface_thread[i]), "Failed to join thread %u.\n", i); + ok(join_thread(private_data_thread[i]), "Failed to join thread %u.\n", i); + } + + for (i = 0; i < ARRAY_SIZE(private_data_interface); ++i) + { + size = sizeof(unk); + hr = ID3D12Object_GetPrivateData(object, &private_data_interface[i].guid, &size, &unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(unk == private_data_interface[i].iface, "Got %p, expected %p.\n", unk, private_data_interface[i].iface); + IUnknown_Release(unk); + refcount = IUnknown_Release(private_data_interface[i].iface); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i) + { + size = sizeof(value); + hr = ID3D12Object_GetPrivateData(object, &private_data[i].guid, &size, &value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(value == private_data[i].value, "Got %u, expected %u.\n", value, private_data[i].value); + } + + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IUnknown_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Object_Release(object); + ok(!refcount, "Object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_reset_command_allocator(void) { ID3D12CommandAllocator *command_allocator, *command_allocator2; @@ -22327,6 +22480,7 @@ START_TEST(d3d12) run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_private_data); + run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); -- 2.19.2

1 0

[PATCH v2] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H 09 Jan '19

09 Jan '19

Code is only used for non-page-aligned device drivers. Previously if relocation was happening on page boundary it crashed because only one page had changed protection in load_driver_module. Now code is copied from ntdll and changes protection for all module pages before actual relocation starts. Fixes running MTA: San Andreas game. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28254 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 102 +++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8a87a6ad0..e130fac302 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -25,6 +25,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -3295,6 +3296,84 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } +/* convert PE image VirtualAddress to Real Address */ +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +/* Copied from ntdll with checks for page alignment and characteristics removed */ +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} + /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { @@ -3318,28 +3397,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; - IMAGE_BASE_RELOCATION *rel, *end; - - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) - { - TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) - { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); - if (!rel) goto error; - } - /* make sure we don't try again */ - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; - VirtualProtect( nt, size, PAGE_READWRITE, &old ); - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, &old ); - } + perform_relocations(module, nt->OptionalHeader.SizeOfImage); } /* make sure imports are relocated too */ -- 2.17.1

1 0

[PATCH] testbot: There is no point unsetting $ENV.
by Francois Gouget 09 Jan '19

09 Jan '19

It is not a special environment variable or perl value and typically does not even exist. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 - testbot/bin/Janitor.pl | 1 - testbot/bin/LibvirtTool.pl | 2 -- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - testbot/bin/WineRunWineTest.pl | 1 - testbot/bin/WineSendLog.pl | 1 - testbot/bin/build/Build.pl | 1 - testbot/bin/build/Reconfig.pl | 1 - testbot/bin/build/WineReconfig.pl | 1 - testbot/bin/build/WineTest.pl | 1 - testbot/scripts/CheckWineTestBot.pl | 1 - 13 files changed, 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 79b25fac..9ffdf968 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -742,7 +742,6 @@ sub main() } $ENV{PATH} = "/usr/bin:/bin"; - delete $ENV{ENV}; $SIG{CHLD} = \&REAPER; $WineTestBot::Engine::Notify::RunningInEngine = 1; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 12084512..e7662852 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -77,7 +77,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; # Grab the command line options my ($Usage, $DryRun); diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e6742f4c..a078fcbd 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -88,8 +88,6 @@ EOF # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; - # Grab the command line options my ($Usage, $Action, $VMKey); diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 68e6be4c..b1349f0d 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -73,7 +73,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9bb402a6..2c8acdd6 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -74,7 +74,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index fea8c03f..e6112fd8 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -104,7 +104,6 @@ sub TakeScreenshot($$) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 5ce1448e..8792be39 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -103,7 +103,6 @@ sub TakeScreenshot($$) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index a651c097..1d13454f 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -407,7 +407,6 @@ EOF # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b50a25ca..894686da 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -115,7 +115,6 @@ sub BuildTestExecutables($$$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $PatchFile, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index b720788e..c43fbda3 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -111,7 +111,6 @@ sub UpdateWineBuilds($$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 77810958..4e03c314 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -143,7 +143,6 @@ sub UpdateWinePrefixes($) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b588b8d3..eb0012db 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -210,7 +210,6 @@ sub TestExe($$$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my $Action = ""; my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index a0c0bda5..9c2e2911 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -39,7 +39,6 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; $ENV{PATH} = "/sbin:/usr/sbin:/usr/bin:/bin"; -delete $ENV{ENV}; my $rc = 0; if (! PingEngine()) -- 2.20.1

1 0

[PATCH] wininet/tests: Add some tests for GetUrlCacheConfigInfo.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/Makefile.in | 2 +- dlls/wininet/tests/urlcache.c | 103 +++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index cf1a86acd8..ae18bb72fa 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wininet.dll -IMPORTS = wininet crypt32 ws2_32 user32 advapi32 +IMPORTS = wininet crypt32 ws2_32 user32 advapi32 shell32 C_SRCS = \ ftp.c \ diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3799500489..acd4ff247c 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -27,6 +30,7 @@ #include "winnls.h" #include "wininet.h" #include "winineti.h" +#include "shlobj.h" #include "wine/test.h" @@ -1100,6 +1104,104 @@ static void test_trailing_slash(void) DeleteFileA(filename); } +static void get_cache_path(DWORD flags, char path[MAX_PATH], char path_win8[MAX_PATH]) +{ + BOOL ret; + int folder = -1; + const char *suffix = ""; + const char *suffix_win8 = ""; + + switch (flags) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + folder = CSIDL_INTERNET_CACHE; + suffix = "\\Content.IE5\\"; + suffix_win8 = "\\IE\\"; + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + folder = CSIDL_COOKIES; + suffix = "\\"; + suffix_win8 = "\\"; + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + folder = CSIDL_HISTORY; + suffix = "\\History.IE5\\"; + suffix_win8 = "\\History.IE5\\"; + break; + + default: + ok(0, "unexpected flags %#x\n", flags); + break; + } + + ret = SHGetSpecialFolderPathA(0, path, folder, FALSE); + ok(ret, "SHGetSpecialFolderPath error %u\n", GetLastError()); + + strcpy(path_win8, path); + strcat(path_win8, suffix_win8); + + strcat(path, suffix); +} + +static void test_GetUrlCacheConfigInfo(void) +{ + INTERNET_CACHE_CONFIG_INFOA info; + struct + { + INTERNET_CACHE_CONFIG_INFOA *info; + DWORD dwStructSize; + DWORD flags; + BOOL ret; + DWORD error; + } td[] = + { +#if 0 /* crashes under Vista */ + { NULL, 0, 0, FALSE, ERROR_INVALID_PARAMETER }, +#endif + { &info, 0, 0, TRUE }, + { &info, sizeof(info) - 1, 0, TRUE }, + { &info, sizeof(info) + 1, 0, TRUE }, + { &info, 0, CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + }; + int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + if (td[i].info) + { + memset(&info, 0, sizeof(*td[i].info)); + info.dwStructSize = td[i].dwStructSize; + } + + SetLastError(0xdeadbeef); + ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); +todo_wine + ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); + if (!ret) +todo_wine + ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); + else + { + char path[MAX_PATH], path_win8[MAX_PATH]; + + get_cache_path(td[i].flags, path, path_win8); + + ok(info.dwStructSize == td[i].dwStructSize, "got %u\n", info.dwStructSize); + ok(!lstrcmpA(info.u.s.CachePath, path) || !lstrcmpA(info.u.s.CachePath, path_win8), + "%d: expected %s or %s, got %s\n", i, path, path_win8, info.u.s.CachePath); + } + } +} + START_TEST(urlcache) { HMODULE hdll; @@ -1124,4 +1226,5 @@ START_TEST(urlcache) test_FindCloseUrlCache(); test_GetDiskInfoA(); test_trailing_slash(); + test_GetUrlCacheConfigInfo(); } -- 2.20.1

1 0

[PATCH] oledb32: Support Milliseconds when converting BSTR -> DBTIMESTAMP
by Alistair Leslie-Hughes 09 Jan '19

09 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 8 ++++---- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f18c756..9b909fd 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -527,6 +527,45 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + WCHAR *de = s; + DWORD len = SysStringLen(s); + + TRACE("String with Milliseconds: %s\n", debugstr_w(s)); + + VariantClear(&var); + + while (len && de[len] != '.') + { + len--; + } + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocStringLen(s, len); + if ((hr = VariantChangeType(&var, &var, 0, VT_DATE)) == S_OK) + { + SYSTEMTIME st; + + hr = (VariantTimeToSystemTime( V_DATE(&var), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = 0; + + VariantClear(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(de + (len+1)); + if(VariantChangeType(&var, &var, 0, VT_I4) == S_OK) + { + TRACE("Millseconds: %d\n", V_I4(&var)); + d->fraction = V_I4(&var); + } + } + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 5dab9ff..4a5c05e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3641,10 +3641,10 @@ static void test_converttotimestamp(void) bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); SysFreeString(bstr); V_VT(&var) = VT_NULL; -- 1.9.1

2 2

[PATCH v2 5/5] d3d9/tests: Add test for clearing surfaces with different sizes.
by Józef Kucia 08 Jan '19

08 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: * Use check_rt_color(). * Fix failures on testbot - use other depth stencil format when D16_LOCKABLE is not supported. --- dlls/d3d9/tests/visual.c | 107 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51229f2b8268..00f15d3ef4c8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -214,10 +214,10 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) #define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) { + D3DCOLOR color = 0xdeadbeef; struct surface_readback rb; D3DSURFACE_DESC desc; unsigned int x, y; - D3DCOLOR color; HRESULT hr; hr = IDirect3DSurface9_GetDesc(rt, &desc); @@ -236,7 +236,7 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR e break; } release_surface_readback(&rb); - ok_(__FILE__, line)(color == 0x000000ff, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -1324,6 +1324,108 @@ done: DestroyWindow(window); } +static void test_clear_different_size_surfaces(void) +{ + IDirect3DSurface9 *ds, *rt, *rt2; + IDirect3DDevice9 *device; + D3DFORMAT ds_format; + D3DLOCKED_RECT lr; + unsigned int x, y; + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + D3DCAPS9 caps; + WORD *depth; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 1, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 2, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt2, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + { + ds_format = D3DFMT_D16_LOCKABLE; + } + else + { + ds_format = D3DFMT_D24S8; + } + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, ds_format, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(hr == D3D_OK, "Failed to create depth surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs >= 2) + { + hr = IDirect3DDevice9_SetRenderTarget(device, 1, rt2); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + } + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 640; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.5f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + check_rt_color(rt, 0x00ff0000); + + if (caps.NumSimultaneousRTs >= 2) + check_rt_color(rt2, 0x00ff0000); + + if (ds_format == D3DFMT_D16_LOCKABLE) + { + hr = IDirect3DSurface9_LockRect(ds, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock rect, hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); + for (x = 0; x < 4; ++x) + { + ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + } + } + hr = IDirect3DSurface9_UnlockRect(ds); + ok(hr == D3D_OK, "Failed to unlock rect, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + } + else + { + skip("D3DFMT_D16_LOCKABLE is not supported.\n"); + } + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(rt2); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void color_fill_test(void) { IDirect3DSurface9 *surface; @@ -24420,6 +24522,7 @@ START_TEST(visual) lighting_test(); test_specular_lighting(); clear_test(); + test_clear_different_size_surfaces(); color_fill_test(); fog_test(); test_cube_wrap(); -- 2.19.2

1 0

[PATCH] rpcndr.h: Don't use unnamed struct for NDR_SCONTEXT declaration.
by Jacek Caban 08 Jan '19

08 Jan '19

Fixes C++ warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- mingw-w64 does the same as this patch. PSDK uses an unnamed struct (but cl doesn't emit a warning). The warning is: In file included from /home/jacek/wine/wine-git/include/wtypes.h:8:0, from /home/jacek/wine/wine-git/include/winscard.h:22, from /home/jacek/wine/wine-git/include/windows.h:70, from test.cpp:2: /home/jacek/wine/wine-git/include/rpcndr.h:188:16: warning: ‘_MIDL_STUB_MESSAGE’ has a field ‘_MIDL_STUB_MESSAGE::SavedContextHandles’ whose type depends on the type ‘<unnamed struct>’ which has no linkage [-Wsubobject-linkage] typedef struct _MIDL_STUB_MESSAGE ^~~~~~~~~~~~~~~~~~ /home/jacek/wine/wine-git/include/rpcndr.h:491:16: warning: ‘_SCONTEXT_QUEUE’ has a field ‘_SCONTEXT_QUEUE::ArrayOfObjects’ whose type depends on the type ‘<unnamed struct>’ which has no linkage [-Wsubobject-linkage] typedef struct _SCONTEXT_QUEUE { ^~~~~~~~~~~~~~~ include/rpcndr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0