- wine-devel - winehq.org

[PATCH 1/9] windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette. (v2)
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

v2: Fix test failures under Windows. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 343 ++++++++++++++++++++++----- 1 file changed, 287 insertions(+), 56 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1e557a7fb8..8072064b48 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -316,6 +316,20 @@ static const struct bitmap_data testdata_BlackWhite = { static const struct bitmap_data testdata_1bppIndexed = { &GUID_WICPixelFormat1bppIndexed, 1, bits_1bpp, 32, 2, 96.0, 96.0}; +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_2bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_2bppIndexed = { + &GUID_WICPixelFormat2bppIndexed, 2, bits_2bpp, 16, 2, 96.0, 96.0}; + +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_4bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_4bppIndexed = { + &GUID_WICPixelFormat4bppIndexed, 4, bits_4bpp, 8, 2, 96.0, 96.0}; + static const BYTE bits_8bpp[] = { 0,1,2,3, 4,5,6,7}; @@ -632,64 +646,224 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } } -static void check_bmp_format(IStream *stream, const struct bitmap_data *data) +static void load_stream(IUnknown *reader, IStream *stream) +{ + HRESULT hr; + IWICPersistStream *persist; +#ifdef WORDS_BIGENDIAN + DWORD persist_options = WICPersistOptionBigEndian; +#else + DWORD persist_options = WICPersistOptionLittleEndian; +#endif + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + hr = IWICPersistStream_LoadEx(persist, stream, NULL, persist_options); + ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); + + IWICPersistStream_Release(persist); +} + +static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) { - BITMAPFILEHEADER bfh; - BITMAPINFOHEADER bih; HRESULT hr; - ULONG len; + IWICMetadataReader *reader; + PROPVARIANT id, value; + struct + { + USHORT byte_order; + USHORT version; + ULONG dir_offset; + } tiff; + LARGE_INTEGER pos; + UINT count, i; + int width, height, bps, photo, samples, colormap; + struct + { + int id, *value; + } tag[] = + { + { 0x100, &width }, { 0x101, &height }, { 0x102, &bps }, + { 0x106, &photo }, { 0x115, &samples }, { 0x140, &colormap } + }; + + memset(&tiff, 0, sizeof(tiff)); + hr = IStream_Read(stream, &tiff, sizeof(tiff), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + ok(tiff.byte_order == MAKEWORD('I','I') || tiff.byte_order == MAKEWORD('M','M'), + "wrong TIFF byte order mark %02x\n", tiff.byte_order); + ok(tiff.version == 42, "wrong TIFF version %u\n", tiff.version); + + pos.QuadPart = tiff.dir_offset; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + load_stream((IUnknown *)reader, stream); - hr = IStream_Read(stream, &bfh, sizeof(bfh), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count != 0, "wrong count %u\n", count); - hr = IStream_Read(stream, &bih, sizeof(bih), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + for (i = 0; i < sizeof(tag)/sizeof(tag[0]); i++) + { + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_UI2; + U(id).uiVal = tag[i].id; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + ok(hr == S_OK || (tag[i].id == 0x140 && hr == WINCODEC_ERR_PROPERTYNOTFOUND), + "GetValue(%04x) error %#x\n", tag[i].id, hr); + if (hr == S_OK) + { + ok(value.vt == VT_UI2 || value.vt == VT_UI4 || value.vt == (VT_UI2 | VT_VECTOR), "wrong vt: %d\n", value.vt); + tag[i].value[0] = U(value).uiVal; + } + else + tag[i].value[0] = -1; + } - ok(bfh.bfType == 0x4d42, "Unexpected header type, %#x.\n", bfh.bfType); - ok(bfh.bfSize != 0, "Unexpected bitmap size %d.\n", bfh.bfSize); - ok(bfh.bfReserved1 == 0, "Unexpected bfReserved1 field.\n"); - ok(bfh.bfReserved2 == 0, "Unexpected bfReserved2 field.\n"); + IWICMetadataReader_Release(reader); - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed) - || IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) + if (IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite)) { - /* TODO: test with actual palette size */ - ok(bfh.bfOffBits > sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 1, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); } - else - ok(bfh.bfOffBits == sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); - - ok(bih.biSize == sizeof(bih), "Unexpected header size %d.\n", bih.biSize); - ok(bih.biWidth == data->width, "Unexpected bitmap width %d.\n", bih.biWidth); - ok(bih.biHeight == data->height, "Unexpected bitmap height %d.\n", bih.biHeight); - ok(bih.biPlanes == 1, "Unexpected planes count %d.\n", bih.biPlanes); - - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed)) - ok(bih.biBitCount == 1, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) - ok(bih.biBitCount == 8, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat32bppBGR)) - ok(bih.biBitCount == 32, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - - ok(bih.biCompression == BI_RGB, "Unexpected compression mode %u.\n", bih.biCompression); -todo_wine - ok(bih.biSizeImage == 0, "Unexpected image size %d.\n", bih.biSizeImage); - ok(bih.biXPelsPerMeter == 3780 || broken(bih.biXPelsPerMeter == 0) /* XP */, "Unexpected horz resolution %d.\n", - bih.biXPelsPerMeter); - ok(bih.biYPelsPerMeter == 3780 || broken(bih.biYPelsPerMeter == 0) /* XP */, "Unexpected vert resolution %d.\n", - bih.biYPelsPerMeter); + else if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 6, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 6, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(width == 8, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); - /* FIXME: test actual data */ + ok(bps == 4, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 48, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 8, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 768, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat24bppBGR)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 3, "wrong bps %d\n", bps); + ok(photo == 2, "wrong photometric %d\n", photo); + ok(samples == 3, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); + } + else + ok(0, "unknown TIFF pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) +static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) { - /* FIXME */ + HRESULT hr; + BITMAPFILEHEADER bfh; + BITMAPV5HEADER bih; + + memset(&bfh, 0, sizeof(bfh)); + hr = IStream_Read(stream, &bfh, sizeof(bfh), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(bfh.bfType == 0x4d42, "wrong BMP signature %02x\n", bfh.bfType); + ok(bfh.bfReserved1 == 0, "wrong bfReserved1 %02x\n", bfh.bfReserved1); + ok(bfh.bfReserved2 == 0, "wrong bfReserved2 %02x\n", bfh.bfReserved2); + + memset(&bih, 0, sizeof(bih)); + hr = IStream_Read(stream, &bih, sizeof(bih), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 1, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(bih.bV5Width == 16, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 2, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 4, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 8, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 32, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 0, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 0, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else + ok(0, "unknown BMP pixel format %s\n", wine_dbgstr_guid(format)); } static unsigned be_uint(unsigned val) @@ -746,6 +920,28 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(png.filter == 0, "wrong filter %d\n", png.filter); ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(be_uint(png.width) == 16, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 2, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(be_uint(png.width) == 8, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 4, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { ok(be_uint(png.width) == 4, "wrong width %u\n", be_uint(png.width)); @@ -772,7 +968,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_bitmap_format(IStream *stream, const CLSID *encoder, const struct bitmap_data *dst) +static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; LARGE_INTEGER pos; @@ -782,11 +978,11 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const str ok(hr == S_OK, "IStream_Seek error %#x\n", hr); if (IsEqualGUID(encoder, &CLSID_WICPngEncoder)) - check_png_format(stream, dst->format); + check_png_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICBmpEncoder)) - check_bmp_format(stream, dst); + check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) - check_tiff_format(stream, dst->format); + check_tiff_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -979,8 +1175,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls memcpy(&pixelformat, srcs[i]->format, sizeof(GUID)); hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); - ok(IsEqualGUID(&pixelformat, dsts[i]->format), "SetPixelFormat changed the format to %s (%s)\n", - wine_dbgstr_guid(&pixelformat), name); + ok(IsEqualGUID(&pixelformat, dsts[i]->format) || + broken(IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)) || + broken(IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), + "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); @@ -1015,6 +1213,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "WriteSource(%dx%d) failed, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); else ok(hr == S_OK || + broken(hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) || + broken(hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) || broken(hr == E_INVALIDARG && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && IsEqualGUID(srcs[i]->format, &GUID_WICPixelFormatBlackWhite)) /* XP */, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); } @@ -1046,7 +1246,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - check_bitmap_format(stream, clsid_encoder, dsts[0]); + check_bitmap_format(stream, clsid_encoder, dsts[0]->format); } if (SUCCEEDED(hr)) @@ -1106,7 +1306,12 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(ret == count, "expected %u, got %u\n", count, ret); if (IsEqualGUID(clsid_decoder, &CLSID_WICPngDecoder)) { - ok(count == 256 || count == 2 /* newer libpng versions */, "expected 256, got %u (%s)\n", count, name); + /* Newer libpng versions don't accept larger palettes than the declared + * bit depth, so we need to generate the palette of the correct length. + */ + ok(count == 256 || (dsts[i]->bpp == 1 && count == 2) || + (dsts[i]->bpp == 2 && count == 4) || (dsts[i]->bpp == 4 && count == 16), + "expected 256, got %u (%s)\n", count, name); ok(colors[0] == 0x11111111, "got %08x (%s)\n", colors[0], name); ok(colors[1] == 0x22222222, "got %08x (%s)\n", colors[1], name); @@ -1114,8 +1319,11 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls { ok(colors[2] == 0x33333333, "got %08x (%s)\n", colors[2], name); ok(colors[3] == 0x44444444, "got %08x (%s)\n", colors[3], name); - ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); - ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + if (count > 4) + { + ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + } } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || @@ -1133,6 +1341,17 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(count == 16, "expected 16, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); + } else { ok(count == 2, "expected 2, got %u (%s)\n", count, name); @@ -1284,6 +1503,10 @@ START_TEST(converter) &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder, &testdata_1bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICPngEncoder, + &testdata_2bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICPngEncoder, + &testdata_4bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICPngEncoder, &testdata_8bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 8bppIndexed"); test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, @@ -1295,6 +1518,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICBmpEncoder, + &testdata_2bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICBmpEncoder, + &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); } @@ -1307,6 +1534,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in { test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, + &testdata_2bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICTiffEncoder, + &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); } -- 2.17.1

1 0

[PATCH v2] comctl32: Dont set caret position if we dont have focus
by Alistair Leslie-Hughes 05 Dec '18

05 Dec '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comctl32/edit.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 06e1f498dc9..b54aac1f57e 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1707,9 +1707,12 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { - LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); - TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); - SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + if(es->flags & EF_FOCUSED) + { + LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); + TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); + SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + } } @@ -1778,7 +1781,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) } } - if(es->flags & EF_FOCUSED) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } -- 2.19.2

2 1

[v3 PATCH] comctl32/edit: Don't set caret position when we don't have focus.
by Nikolay Sivov 05 Dec '18

05 Dec '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/edit.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 06e1f498dc..1f17276b75 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1707,9 +1707,14 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { - LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); - TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); - SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + LRESULT res; + + if (es->flags & EF_FOCUSED) + { + res = EDIT_EM_PosFromChar(es, pos, after_wrap); + TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); + SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + } } @@ -1778,7 +1783,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) } } - if(es->flags & EF_FOCUSED) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } -- 2.19.2

1 0

[PATCH 1/2] kernelbase/tests: Relax tests for WaitOnAddress().
by Zebediah Figura 05 Dec '18

05 Dec '18

Application should be expected to handle spurious wakeups, which the following implementation will give in WakeByAddressSingle(). Avoid testing that WakeByAddressSingle() only wakes one thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernelbase/tests/sync.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 99cbbc43bc..7a335d1af8 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -31,19 +31,23 @@ static void (WINAPI *pWakeByAddressAll)(void *); static void (WINAPI *pWakeByAddressSingle)(void *); static LONG64 address; -static LONG64 compare; static DWORD WINAPI test_WaitOnAddress_func(void *arg) { BOOL ret = FALSE; - DWORD gle; - while (address == compare) + LONG64 compare; + + do { - SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); - gle = GetLastError(); - ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); - } - ok(ret, "got %d\n", ret); + while (!(compare = address)) + { + SetLastError(0xdeadbeef); + ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); + ok(ret, "wait failed\n"); + ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS) /* Win 8 */, + "got error %d\n", GetLastError()); + } + } while (InterlockedCompareExchange64(&address, compare - 1, compare) != compare); + return 0; } @@ -51,6 +55,7 @@ static void test_WaitOnAddress(void) { DWORD gle, val, nthreads; HANDLE threads[8]; + LONG64 compare; BOOL ret; int i; @@ -135,31 +140,28 @@ static void test_WaitOnAddress(void) /* WakeByAddressAll */ address = 0; - compare = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = ~0; + address = ARRAY_SIZE(threads); pWakeByAddressAll(&address); val = WaitForMultipleObjects(ARRAY_SIZE(threads), threads, TRUE, 5000); ok(val == WAIT_OBJECT_0, "got %d\n", val); for (i = 0; i < ARRAY_SIZE(threads); i++) CloseHandle(threads[i]); + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); /* WakeByAddressSingle */ address = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) - threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); + threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = 1; nthreads = ARRAY_SIZE(threads); + address = ARRAY_SIZE(threads); while (nthreads) { - val = WaitForMultipleObjects(nthreads, threads, FALSE, 0); - ok(val == STATUS_TIMEOUT, "got %u\n", val); - pWakeByAddressSingle(&address); val = WaitForMultipleObjects(nthreads, threads, FALSE, 2000); ok(val < WAIT_OBJECT_0 + nthreads, "got %u\n", val); @@ -167,7 +169,7 @@ static void test_WaitOnAddress(void) memmove(&threads[val], &threads[val+1], (nthreads - val - 1) * sizeof(threads[0])); nthreads--; } - + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); } START_TEST(sync) -- 2.14.1

2 3

[PATCH 1/4] shlwapi: Forward SHUnicodeToUnicode() to shcore.
by Nikolay Sivov 05 Dec '18

05 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/string.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 4c31724b48..c96fcf0be4 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -343,7 +343,7 @@ 343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr) 344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr) 345 stdcall -ordinal SHAnsiToAnsi(str ptr long) -346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) +346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) shcore.SHUnicodeToUnicode 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW 348 stub -noname SHGetFileDescriptionW 349 stub -noname SHGetFileDescriptionA diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index b190ffc9e4..baa9c29a0f 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2773,21 +2773,6 @@ DWORD WINAPI SHAnsiToAnsi(LPCSTR lpszSrc, LPSTR lpszDst, int iLen) return lpszRet - lpszDst + 1; } -/************************************************************************* - * @ [SHLWAPI.346] - * - * Unicode version of SSHAnsiToAnsi. - */ -DWORD WINAPI SHUnicodeToUnicode(LPCWSTR lpszSrc, LPWSTR lpszDst, int iLen) -{ - LPWSTR lpszRet; - - TRACE("(%s,%p,0x%08x)\n", debugstr_w(lpszSrc), lpszDst, iLen); - - lpszRet = StrCpyNXW(lpszDst, lpszSrc, iLen); - return lpszRet - lpszDst + 1; -} - /************************************************************************* * @ [SHLWAPI.364] * -- 2.19.2

1 3

[PATCH] comctl32: Dont set caret position if we dont have focus
by Alistair Leslie-Hughes 05 Dec '18

05 Dec '18

When SetFont is called on an Edit Control which doesn't have focus, it causes the current control to draw the caret in the incorrect location until a key is pressed. EDIT_SetCaretPos (es=0x204439c0, pos=0, after_wrap=0) 0x7eace3be in EDIT_AdjustFormatRect (es=0x204439c0) 0x7eace465 in EDIT_SetRectNP (es=0x204439c0, rc=<optimized out>) 0x7ead180c in EDIT_WM_SetFont (es=0x204439c0, font=<optimized out>, redraw=1) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comctl32/edit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 06e1f498dc9..3ffc2e5c16a 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2238,7 +2238,8 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es) if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); + if (es->flags & EF_FOCUSED) + EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } -- 2.19.2

2 2

[PATCH] loader: Fix building of the preloader on Mac.
by Ken Thomases 04 Dec '18

04 Dec '18

The variables preloader_start and preloader_end are only defined in the Linux- specific code. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- loader/preloader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/preloader.c b/loader/preloader.c index 3b1f5ad..db6bbdc 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1317,6 +1317,7 @@ void preload_reserve( const char *str, struct wine_preload_info *preload_info, s /* sanity checks */ if (end <= start) start = end = NULL; +#ifdef __linux__ else if ((char *)end > preloader_start && (char *)start <= preloader_end) { @@ -1324,6 +1325,7 @@ void preload_reserve( const char *str, struct wine_preload_info *preload_info, s start, end, preloader_start, preloader_end ); start = end = NULL; } +#endif /* check for overlap with low memory areas */ for (i = 0; preload_info[i].size; i++) -- 2.10.2

1 0

[PATCH] d3dcompiler: Add an assert checking for writemask sanity in debug_writemask().
by Matteo Bruni 04 Dec '18

04 Dec '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5499b8ccdb1..b872e34d935 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2142,6 +2142,8 @@ static const char *debug_writemask(DWORD writemask) char string[5]; unsigned int i = 0, pos = 0; + assert(!(writemask & ~BWRITERSP_WRITEMASK_ALL)); + while (writemask) { if (writemask & 1) -- 2.18.1

2 1

[PATCH v2 1/3] tools/make_unicode: Implement full Unicode character decomposition.
by Brendan McGrath 04 Dec '18

04 Dec '18

From: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- Changes since v1: - add output from make_unicode to each patch (was previously added in patch 4) I've resubmitted this patchset so each individual patch will compile. I also thought it might help to add the history of this patchset. It looks like it was original submitted by Sergio back in April. A link to the wine-devel mailing list archive is below: https://www.winehq.org/pipermail/wine-devel/2018-April/125579.html It then appears to have been added to wine-staging for version 3.19 - possibly at the prompting of the following bug report: https://bugs.winehq.org/show_bug.cgi?id=42734 I'm just wondering what's required to see this patchset promoted from wine-staging to wine-devel? It would be great to see it in wine v4.0. libs/port/decompose.c | 3249 +++++++++++++++++++++++++++++++++++------ libs/port/mbtowc.c | 14 +- tools/make_unicode | 333 ++++- 3 files changed, 3060 insertions(+), 536 deletions(-) diff --git a/libs/port/decompose.c b/libs/port/decompose.c index 5e6b2214ec80..311b706901e7 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -1,761 +1,3074 @@ -/* Unicode char composition */ +/* Unicode char decomposition */ /* generated from http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -static const WCHAR table[4704] = +static const UINT last_decomposable = 0xffee; + +static const WCHAR data_decomp[8655] = +{ + 0x0000, 0x0020, 0x0000, 0x0020, 0x0308, 0x0000, 0x0061, 0x0000, + 0x0020, 0x0304, 0x0000, 0x0032, 0x0000, 0x0033, 0x0000, 0x0020, + 0x0301, 0x0000, 0x03bc, 0x0000, 0x0020, 0x0327, 0x0000, 0x0031, + 0x0000, 0x006f, 0x0000, 0x0031, 0x2044, 0x0034, 0x0000, 0x0031, + 0x2044, 0x0032, 0x0000, 0x0033, 0x2044, 0x0034, 0x0000, 0x0041, + 0x0300, 0x0000, 0x0041, 0x0301, 0x0000, 0x0041, 0x0302, 0x0000, + 0x0041, 0x0303, 0x0000, 0x0041, 0x0308, 0x0000, 0x0041, 0x030a, + 0x0000, 0x0043, 0x0327, 0x0000, 0x0045, 0x0300, 0x0000, 0x0045, + 0x0301, 0x0000, 0x0045, 0x0302, 0x0000, 0x0045, 0x0308, 0x0000, + 0x0049, 0x0300, 0x0000, 0x0049, 0x0301, 0x0000, 0x0049, 0x0302, + 0x0000, 0x0049, 0x0308, 0x0000, 0x004e, 0x0303, 0x0000, 0x004f, + 0x0300, 0x0000, 0x004f, 0x0301, 0x0000, 0x004f, 0x0302, 0x0000, + 0x004f, 0x0303, 0x0000, 0x004f, 0x0308, 0x0000, 0x0055, 0x0300, + 0x0000, 0x0055, 0x0301, 0x0000, 0x0055, 0x0302, 0x0000, 0x0055, + 0x0308, 0x0000, 0x0059, 0x0301, 0x0000, 0x0061, 0x0300, 0x0000, + 0x0061, 0x0301, 0x0000, 0x0061, 0x0302, 0x0000, 0x0061, 0x0303, + 0x0000, 0x0061, 0x0308, 0x0000, 0x0061, 0x030a, 0x0000, 0x0063, + 0x0327, 0x0000, 0x0065, 0x0300, 0x0000, 0x0065, 0x0301, 0x0000, + 0x0065, 0x0302, 0x0000, 0x0065, 0x0308, 0x0000, 0x0069, 0x0300, + 0x0000, 0x0069, 0x0301, 0x0000, 0x0069, 0x0302, 0x0000, 0x0069, + 0x0308, 0x0000, 0x006e, 0x0303, 0x0000, 0x006f, 0x0300, 0x0000, + 0x006f, 0x0301, 0x0000, 0x006f, 0x0302, 0x0000, 0x006f, 0x0303, + 0x0000, 0x006f, 0x0308, 0x0000, 0x0075, 0x0300, 0x0000, 0x0075, + 0x0301, 0x0000, 0x0075, 0x0302, 0x0000, 0x0075, 0x0308, 0x0000, + 0x0079, 0x0301, 0x0000, 0x0079, 0x0308, 0x0000, 0x0041, 0x0304, + 0x0000, 0x0061, 0x0304, 0x0000, 0x0041, 0x0306, 0x0000, 0x0061, + 0x0306, 0x0000, 0x0041, 0x0328, 0x0000, 0x0061, 0x0328, 0x0000, + 0x0043, 0x0301, 0x0000, 0x0063, 0x0301, 0x0000, 0x0043, 0x0302, + 0x0000, 0x0063, 0x0302, 0x0000, 0x0043, 0x0307, 0x0000, 0x0063, + 0x0307, 0x0000, 0x0043, 0x030c, 0x0000, 0x0063, 0x030c, 0x0000, + 0x0044, 0x030c, 0x0000, 0x0064, 0x030c, 0x0000, 0x0045, 0x0304, + 0x0000, 0x0065, 0x0304, 0x0000, 0x0045, 0x0306, 0x0000, 0x0065, + 0x0306, 0x0000, 0x0045, 0x0307, 0x0000, 0x0065, 0x0307, 0x0000, + 0x0045, 0x0328, 0x0000, 0x0065, 0x0328, 0x0000, 0x0045, 0x030c, + 0x0000, 0x0065, 0x030c, 0x0000, 0x0047, 0x0302, 0x0000, 0x0067, + 0x0302, 0x0000, 0x0047, 0x0306, 0x0000, 0x0067, 0x0306, 0x0000, + 0x0047, 0x0307, 0x0000, 0x0067, 0x0307, 0x0000, 0x0047, 0x0327, + 0x0000, 0x0067, 0x0327, 0x0000, 0x0048, 0x0302, 0x0000, 0x0068, + 0x0302, 0x0000, 0x0049, 0x0303, 0x0000, 0x0069, 0x0303, 0x0000, + 0x0049, 0x0304, 0x0000, 0x0069, 0x0304, 0x0000, 0x0049, 0x0306, + 0x0000, 0x0069, 0x0306, 0x0000, 0x0049, 0x0328, 0x0000, 0x0069, + 0x0328, 0x0000, 0x0049, 0x0307, 0x0000, 0x0049, 0x004a, 0x0000, + 0x0069, 0x006a, 0x0000, 0x004a, 0x0302, 0x0000, 0x006a, 0x0302, + 0x0000, 0x004b, 0x0327, 0x0000, 0x006b, 0x0327, 0x0000, 0x004c, + 0x0301, 0x0000, 0x006c, 0x0301, 0x0000, 0x004c, 0x0327, 0x0000, + 0x006c, 0x0327, 0x0000, 0x004c, 0x030c, 0x0000, 0x006c, 0x030c, + 0x0000, 0x004c, 0x00b7, 0x0000, 0x006c, 0x00b7, 0x0000, 0x004e, + 0x0301, 0x0000, 0x006e, 0x0301, 0x0000, 0x004e, 0x0327, 0x0000, + 0x006e, 0x0327, 0x0000, 0x004e, 0x030c, 0x0000, 0x006e, 0x030c, + 0x0000, 0x02bc, 0x006e, 0x0000, 0x004f, 0x0304, 0x0000, 0x006f, + 0x0304, 0x0000, 0x004f, 0x0306, 0x0000, 0x006f, 0x0306, 0x0000, + 0x004f, 0x030b, 0x0000, 0x006f, 0x030b, 0x0000, 0x0052, 0x0301, + 0x0000, 0x0072, 0x0301, 0x0000, 0x0052, 0x0327, 0x0000, 0x0072, + 0x0327, 0x0000, 0x0052, 0x030c, 0x0000, 0x0072, 0x030c, 0x0000, + 0x0053, 0x0301, 0x0000, 0x0073, 0x0301, 0x0000, 0x0053, 0x0302, + 0x0000, 0x0073, 0x0302, 0x0000, 0x0053, 0x0327, 0x0000, 0x0073, + 0x0327, 0x0000, 0x0053, 0x030c, 0x0000, 0x0073, 0x030c, 0x0000, + 0x0054, 0x0327, 0x0000, 0x0074, 0x0327, 0x0000, 0x0054, 0x030c, + 0x0000, 0x0074, 0x030c, 0x0000, 0x0055, 0x0303, 0x0000, 0x0075, + 0x0303, 0x0000, 0x0055, 0x0304, 0x0000, 0x0075, 0x0304, 0x0000, + 0x0055, 0x0306, 0x0000, 0x0075, 0x0306, 0x0000, 0x0055, 0x030a, + 0x0000, 0x0075, 0x030a, 0x0000, 0x0055, 0x030b, 0x0000, 0x0075, + 0x030b, 0x0000, 0x0055, 0x0328, 0x0000, 0x0075, 0x0328, 0x0000, + 0x0057, 0x0302, 0x0000, 0x0077, 0x0302, 0x0000, 0x0059, 0x0302, + 0x0000, 0x0079, 0x0302, 0x0000, 0x0059, 0x0308, 0x0000, 0x005a, + 0x0301, 0x0000, 0x007a, 0x0301, 0x0000, 0x005a, 0x0307, 0x0000, + 0x007a, 0x0307, 0x0000, 0x005a, 0x030c, 0x0000, 0x007a, 0x030c, + 0x0000, 0x0073, 0x0000, 0x004f, 0x031b, 0x0000, 0x006f, 0x031b, + 0x0000, 0x0055, 0x031b, 0x0000, 0x0075, 0x031b, 0x0000, 0x0044, + 0x017d, 0x0000, 0x0044, 0x017e, 0x0000, 0x0064, 0x017e, 0x0000, + 0x004c, 0x004a, 0x0000, 0x004c, 0x006a, 0x0000, 0x006c, 0x006a, + 0x0000, 0x004e, 0x004a, 0x0000, 0x004e, 0x006a, 0x0000, 0x006e, + 0x006a, 0x0000, 0x0041, 0x030c, 0x0000, 0x0061, 0x030c, 0x0000, + 0x0049, 0x030c, 0x0000, 0x0069, 0x030c, 0x0000, 0x004f, 0x030c, + 0x0000, 0x006f, 0x030c, 0x0000, 0x0055, 0x030c, 0x0000, 0x0075, + 0x030c, 0x0000, 0x00dc, 0x0304, 0x0000, 0x00fc, 0x0304, 0x0000, + 0x00dc, 0x0301, 0x0000, 0x00fc, 0x0301, 0x0000, 0x00dc, 0x030c, + 0x0000, 0x00fc, 0x030c, 0x0000, 0x00dc, 0x0300, 0x0000, 0x00fc, + 0x0300, 0x0000, 0x00c4, 0x0304, 0x0000, 0x00e4, 0x0304, 0x0000, + 0x0226, 0x0304, 0x0000, 0x0227, 0x0304, 0x0000, 0x00c6, 0x0304, + 0x0000, 0x00e6, 0x0304, 0x0000, 0x0047, 0x030c, 0x0000, 0x0067, + 0x030c, 0x0000, 0x004b, 0x030c, 0x0000, 0x006b, 0x030c, 0x0000, + 0x004f, 0x0328, 0x0000, 0x006f, 0x0328, 0x0000, 0x01ea, 0x0304, + 0x0000, 0x01eb, 0x0304, 0x0000, 0x01b7, 0x030c, 0x0000, 0x0292, + 0x030c, 0x0000, 0x006a, 0x030c, 0x0000, 0x0044, 0x005a, 0x0000, + 0x0044, 0x007a, 0x0000, 0x0064, 0x007a, 0x0000, 0x0047, 0x0301, + 0x0000, 0x0067, 0x0301, 0x0000, 0x004e, 0x0300, 0x0000, 0x006e, + 0x0300, 0x0000, 0x00c5, 0x0301, 0x0000, 0x00e5, 0x0301, 0x0000, + 0x00c6, 0x0301, 0x0000, 0x00e6, 0x0301, 0x0000, 0x00d8, 0x0301, + 0x0000, 0x00f8, 0x0301, 0x0000, 0x0041, 0x030f, 0x0000, 0x0061, + 0x030f, 0x0000, 0x0041, 0x0311, 0x0000, 0x0061, 0x0311, 0x0000, + 0x0045, 0x030f, 0x0000, 0x0065, 0x030f, 0x0000, 0x0045, 0x0311, + 0x0000, 0x0065, 0x0311, 0x0000, 0x0049, 0x030f, 0x0000, 0x0069, + 0x030f, 0x0000, 0x0049, 0x0311, 0x0000, 0x0069, 0x0311, 0x0000, + 0x004f, 0x030f, 0x0000, 0x006f, 0x030f, 0x0000, 0x004f, 0x0311, + 0x0000, 0x006f, 0x0311, 0x0000, 0x0052, 0x030f, 0x0000, 0x0072, + 0x030f, 0x0000, 0x0052, 0x0311, 0x0000, 0x0072, 0x0311, 0x0000, + 0x0055, 0x030f, 0x0000, 0x0075, 0x030f, 0x0000, 0x0055, 0x0311, + 0x0000, 0x0075, 0x0311, 0x0000, 0x0053, 0x0326, 0x0000, 0x0073, + 0x0326, 0x0000, 0x0054, 0x0326, 0x0000, 0x0074, 0x0326, 0x0000, + 0x0048, 0x030c, 0x0000, 0x0068, 0x030c, 0x0000, 0x0041, 0x0307, + 0x0000, 0x0061, 0x0307, 0x0000, 0x0045, 0x0327, 0x0000, 0x0065, + 0x0327, 0x0000, 0x00d6, 0x0304, 0x0000, 0x00f6, 0x0304, 0x0000, + 0x00d5, 0x0304, 0x0000, 0x00f5, 0x0304, 0x0000, 0x004f, 0x0307, + 0x0000, 0x006f, 0x0307, 0x0000, 0x022e, 0x0304, 0x0000, 0x022f, + 0x0304, 0x0000, 0x0059, 0x0304, 0x0000, 0x0079, 0x0304, 0x0000, + 0x0068, 0x0000, 0x0266, 0x0000, 0x006a, 0x0000, 0x0072, 0x0000, + 0x0279, 0x0000, 0x027b, 0x0000, 0x0281, 0x0000, 0x0077, 0x0000, + 0x0079, 0x0000, 0x0020, 0x0306, 0x0000, 0x0020, 0x0307, 0x0000, + 0x0020, 0x030a, 0x0000, 0x0020, 0x0328, 0x0000, 0x0020, 0x0303, + 0x0000, 0x0020, 0x030b, 0x0000, 0x0263, 0x0000, 0x006c, 0x0000, + 0x0078, 0x0000, 0x0295, 0x0000, 0x0300, 0x0000, 0x0301, 0x0000, + 0x0313, 0x0000, 0x0308, 0x0301, 0x0000, 0x02b9, 0x0000, 0x0020, + 0x0345, 0x0000, 0x003b, 0x0000, 0x00a8, 0x0301, 0x0000, 0x0391, + 0x0301, 0x0000, 0x00b7, 0x0000, 0x0395, 0x0301, 0x0000, 0x0397, + 0x0301, 0x0000, 0x0399, 0x0301, 0x0000, 0x039f, 0x0301, 0x0000, + 0x03a5, 0x0301, 0x0000, 0x03a9, 0x0301, 0x0000, 0x03ca, 0x0301, + 0x0000, 0x0399, 0x0308, 0x0000, 0x03a5, 0x0308, 0x0000, 0x03b1, + 0x0301, 0x0000, 0x03b5, 0x0301, 0x0000, 0x03b7, 0x0301, 0x0000, + 0x03b9, 0x0301, 0x0000, 0x03cb, 0x0301, 0x0000, 0x03b9, 0x0308, + 0x0000, 0x03c5, 0x0308, 0x0000, 0x03bf, 0x0301, 0x0000, 0x03c5, + 0x0301, 0x0000, 0x03c9, 0x0301, 0x0000, 0x03b2, 0x0000, 0x03b8, + 0x0000, 0x03a5, 0x0000, 0x03d2, 0x0301, 0x0000, 0x03d2, 0x0308, + 0x0000, 0x03c6, 0x0000, 0x03c0, 0x0000, 0x03ba, 0x0000, 0x03c1, + 0x0000, 0x03c2, 0x0000, 0x0398, 0x0000, 0x03b5, 0x0000, 0x03a3, + 0x0000, 0x0415, 0x0300, 0x0000, 0x0415, 0x0308, 0x0000, 0x0413, + 0x0301, 0x0000, 0x0406, 0x0308, 0x0000, 0x041a, 0x0301, 0x0000, + 0x0418, 0x0300, 0x0000, 0x0423, 0x0306, 0x0000, 0x0418, 0x0306, + 0x0000, 0x0438, 0x0306, 0x0000, 0x0435, 0x0300, 0x0000, 0x0435, + 0x0308, 0x0000, 0x0433, 0x0301, 0x0000, 0x0456, 0x0308, 0x0000, + 0x043a, 0x0301, 0x0000, 0x0438, 0x0300, 0x0000, 0x0443, 0x0306, + 0x0000, 0x0474, 0x030f, 0x0000, 0x0475, 0x030f, 0x0000, 0x0416, + 0x0306, 0x0000, 0x0436, 0x0306, 0x0000, 0x0410, 0x0306, 0x0000, + 0x0430, 0x0306, 0x0000, 0x0410, 0x0308, 0x0000, 0x0430, 0x0308, + 0x0000, 0x0415, 0x0306, 0x0000, 0x0435, 0x0306, 0x0000, 0x04d8, + 0x0308, 0x0000, 0x04d9, 0x0308, 0x0000, 0x0416, 0x0308, 0x0000, + 0x0436, 0x0308, 0x0000, 0x0417, 0x0308, 0x0000, 0x0437, 0x0308, + 0x0000, 0x0418, 0x0304, 0x0000, 0x0438, 0x0304, 0x0000, 0x0418, + 0x0308, 0x0000, 0x0438, 0x0308, 0x0000, 0x041e, 0x0308, 0x0000, + 0x043e, 0x0308, 0x0000, 0x04e8, 0x0308, 0x0000, 0x04e9, 0x0308, + 0x0000, 0x042d, 0x0308, 0x0000, 0x044d, 0x0308, 0x0000, 0x0423, + 0x0304, 0x0000, 0x0443, 0x0304, 0x0000, 0x0423, 0x0308, 0x0000, + 0x0443, 0x0308, 0x0000, 0x0423, 0x030b, 0x0000, 0x0443, 0x030b, + 0x0000, 0x0427, 0x0308, 0x0000, 0x0447, 0x0308, 0x0000, 0x042b, + 0x0308, 0x0000, 0x044b, 0x0308, 0x0000, 0x0565, 0x0582, 0x0000, + 0x0627, 0x0653, 0x0000, 0x0627, 0x0654, 0x0000, 0x0648, 0x0654, + 0x0000, 0x0627, 0x0655, 0x0000, 0x064a, 0x0654, 0x0000, 0x0627, + 0x0674, 0x0000, 0x0648, 0x0674, 0x0000, 0x06c7, 0x0674, 0x0000, + 0x064a, 0x0674, 0x0000, 0x06d5, 0x0654, 0x0000, 0x06c1, 0x0654, + 0x0000, 0x06d2, 0x0654, 0x0000, 0x0928, 0x093c, 0x0000, 0x0930, + 0x093c, 0x0000, 0x0933, 0x093c, 0x0000, 0x0915, 0x093c, 0x0000, + 0x0916, 0x093c, 0x0000, 0x0917, 0x093c, 0x0000, 0x091c, 0x093c, + 0x0000, 0x0921, 0x093c, 0x0000, 0x0922, 0x093c, 0x0000, 0x092b, + 0x093c, 0x0000, 0x092f, 0x093c, 0x0000, 0x09c7, 0x09be, 0x0000, + 0x09c7, 0x09d7, 0x0000, 0x09a1, 0x09bc, 0x0000, 0x09a2, 0x09bc, + 0x0000, 0x09af, 0x09bc, 0x0000, 0x0a32, 0x0a3c, 0x0000, 0x0a38, + 0x0a3c, 0x0000, 0x0a16, 0x0a3c, 0x0000, 0x0a17, 0x0a3c, 0x0000, + 0x0a1c, 0x0a3c, 0x0000, 0x0a2b, 0x0a3c, 0x0000, 0x0b47, 0x0b56, + 0x0000, 0x0b47, 0x0b3e, 0x0000, 0x0b47, 0x0b57, 0x0000, 0x0b21, + 0x0b3c, 0x0000, 0x0b22, 0x0b3c, 0x0000, 0x0b92, 0x0bd7, 0x0000, + 0x0bc6, 0x0bbe, 0x0000, 0x0bc7, 0x0bbe, 0x0000, 0x0bc6, 0x0bd7, + 0x0000, 0x0c46, 0x0c56, 0x0000, 0x0cbf, 0x0cd5, 0x0000, 0x0cc6, + 0x0cd5, 0x0000, 0x0cc6, 0x0cd6, 0x0000, 0x0cc6, 0x0cc2, 0x0000, + 0x0cca, 0x0cd5, 0x0000, 0x0d46, 0x0d3e, 0x0000, 0x0d47, 0x0d3e, + 0x0000, 0x0d46, 0x0d57, 0x0000, 0x0dd9, 0x0dca, 0x0000, 0x0dd9, + 0x0dcf, 0x0000, 0x0ddc, 0x0dca, 0x0000, 0x0dd9, 0x0ddf, 0x0000, + 0x0e4d, 0x0e32, 0x0000, 0x0ecd, 0x0eb2, 0x0000, 0x0eab, 0x0e99, + 0x0000, 0x0eab, 0x0ea1, 0x0000, 0x0f0b, 0x0000, 0x0f42, 0x0fb7, + 0x0000, 0x0f4c, 0x0fb7, 0x0000, 0x0f51, 0x0fb7, 0x0000, 0x0f56, + 0x0fb7, 0x0000, 0x0f5b, 0x0fb7, 0x0000, 0x0f40, 0x0fb5, 0x0000, + 0x0f71, 0x0f72, 0x0000, 0x0f71, 0x0f74, 0x0000, 0x0fb2, 0x0f80, + 0x0000, 0x0fb2, 0x0f81, 0x0000, 0x0fb3, 0x0f80, 0x0000, 0x0fb3, + 0x0f81, 0x0000, 0x0f71, 0x0f80, 0x0000, 0x0f92, 0x0fb7, 0x0000, + 0x0f9c, 0x0fb7, 0x0000, 0x0fa1, 0x0fb7, 0x0000, 0x0fa6, 0x0fb7, + 0x0000, 0x0fab, 0x0fb7, 0x0000, 0x0f90, 0x0fb5, 0x0000, 0x1025, + 0x102e, 0x0000, 0x10dc, 0x0000, 0x1b05, 0x1b35, 0x0000, 0x1b07, + 0x1b35, 0x0000, 0x1b09, 0x1b35, 0x0000, 0x1b0b, 0x1b35, 0x0000, + 0x1b0d, 0x1b35, 0x0000, 0x1b11, 0x1b35, 0x0000, 0x1b3a, 0x1b35, + 0x0000, 0x1b3c, 0x1b35, 0x0000, 0x1b3e, 0x1b35, 0x0000, 0x1b3f, + 0x1b35, 0x0000, 0x1b42, 0x1b35, 0x0000, 0x0041, 0x0000, 0x00c6, + 0x0000, 0x0042, 0x0000, 0x0044, 0x0000, 0x0045, 0x0000, 0x018e, + 0x0000, 0x0047, 0x0000, 0x0048, 0x0000, 0x0049, 0x0000, 0x004a, + 0x0000, 0x004b, 0x0000, 0x004c, 0x0000, 0x004d, 0x0000, 0x004e, + 0x0000, 0x004f, 0x0000, 0x0222, 0x0000, 0x0050, 0x0000, 0x0052, + 0x0000, 0x0054, 0x0000, 0x0055, 0x0000, 0x0057, 0x0000, 0x0250, + 0x0000, 0x0251, 0x0000, 0x1d02, 0x0000, 0x0062, 0x0000, 0x0064, + 0x0000, 0x0065, 0x0000, 0x0259, 0x0000, 0x025b, 0x0000, 0x025c, + 0x0000, 0x0067, 0x0000, 0x006b, 0x0000, 0x006d, 0x0000, 0x014b, + 0x0000, 0x0254, 0x0000, 0x1d16, 0x0000, 0x1d17, 0x0000, 0x0070, + 0x0000, 0x0074, 0x0000, 0x0075, 0x0000, 0x1d1d, 0x0000, 0x026f, + 0x0000, 0x0076, 0x0000, 0x1d25, 0x0000, 0x03b3, 0x0000, 0x03b4, + 0x0000, 0x03c7, 0x0000, 0x0069, 0x0000, 0x043d, 0x0000, 0x0252, + 0x0000, 0x0063, 0x0000, 0x0255, 0x0000, 0x00f0, 0x0000, 0x0066, + 0x0000, 0x025f, 0x0000, 0x0261, 0x0000, 0x0265, 0x0000, 0x0268, + 0x0000, 0x0269, 0x0000, 0x026a, 0x0000, 0x1d7b, 0x0000, 0x029d, + 0x0000, 0x026d, 0x0000, 0x1d85, 0x0000, 0x029f, 0x0000, 0x0271, + 0x0000, 0x0270, 0x0000, 0x0272, 0x0000, 0x0273, 0x0000, 0x0274, + 0x0000, 0x0275, 0x0000, 0x0278, 0x0000, 0x0282, 0x0000, 0x0283, + 0x0000, 0x01ab, 0x0000, 0x0289, 0x0000, 0x028a, 0x0000, 0x1d1c, + 0x0000, 0x028b, 0x0000, 0x028c, 0x0000, 0x007a, 0x0000, 0x0290, + 0x0000, 0x0291, 0x0000, 0x0292, 0x0000, 0x0041, 0x0325, 0x0000, + 0x0061, 0x0325, 0x0000, 0x0042, 0x0307, 0x0000, 0x0062, 0x0307, + 0x0000, 0x0042, 0x0323, 0x0000, 0x0062, 0x0323, 0x0000, 0x0042, + 0x0331, 0x0000, 0x0062, 0x0331, 0x0000, 0x00c7, 0x0301, 0x0000, + 0x00e7, 0x0301, 0x0000, 0x0044, 0x0307, 0x0000, 0x0064, 0x0307, + 0x0000, 0x0044, 0x0323, 0x0000, 0x0064, 0x0323, 0x0000, 0x0044, + 0x0331, 0x0000, 0x0064, 0x0331, 0x0000, 0x0044, 0x0327, 0x0000, + 0x0064, 0x0327, 0x0000, 0x0044, 0x032d, 0x0000, 0x0064, 0x032d, + 0x0000, 0x0112, 0x0300, 0x0000, 0x0113, 0x0300, 0x0000, 0x0112, + 0x0301, 0x0000, 0x0113, 0x0301, 0x0000, 0x0045, 0x032d, 0x0000, + 0x0065, 0x032d, 0x0000, 0x0045, 0x0330, 0x0000, 0x0065, 0x0330, + 0x0000, 0x0228, 0x0306, 0x0000, 0x0229, 0x0306, 0x0000, 0x0046, + 0x0307, 0x0000, 0x0066, 0x0307, 0x0000, 0x0047, 0x0304, 0x0000, + 0x0067, 0x0304, 0x0000, 0x0048, 0x0307, 0x0000, 0x0068, 0x0307, + 0x0000, 0x0048, 0x0323, 0x0000, 0x0068, 0x0323, 0x0000, 0x0048, + 0x0308, 0x0000, 0x0068, 0x0308, 0x0000, 0x0048, 0x0327, 0x0000, + 0x0068, 0x0327, 0x0000, 0x0048, 0x032e, 0x0000, 0x0068, 0x032e, + 0x0000, 0x0049, 0x0330, 0x0000, 0x0069, 0x0330, 0x0000, 0x00cf, + 0x0301, 0x0000, 0x00ef, 0x0301, 0x0000, 0x004b, 0x0301, 0x0000, + 0x006b, 0x0301, 0x0000, 0x004b, 0x0323, 0x0000, 0x006b, 0x0323, + 0x0000, 0x004b, 0x0331, 0x0000, 0x006b, 0x0331, 0x0000, 0x004c, + 0x0323, 0x0000, 0x006c, 0x0323, 0x0000, 0x1e36, 0x0304, 0x0000, + 0x1e37, 0x0304, 0x0000, 0x004c, 0x0331, 0x0000, 0x006c, 0x0331, + 0x0000, 0x004c, 0x032d, 0x0000, 0x006c, 0x032d, 0x0000, 0x004d, + 0x0301, 0x0000, 0x006d, 0x0301, 0x0000, 0x004d, 0x0307, 0x0000, + 0x006d, 0x0307, 0x0000, 0x004d, 0x0323, 0x0000, 0x006d, 0x0323, + 0x0000, 0x004e, 0x0307, 0x0000, 0x006e, 0x0307, 0x0000, 0x004e, + 0x0323, 0x0000, 0x006e, 0x0323, 0x0000, 0x004e, 0x0331, 0x0000, + 0x006e, 0x0331, 0x0000, 0x004e, 0x032d, 0x0000, 0x006e, 0x032d, + 0x0000, 0x00d5, 0x0301, 0x0000, 0x00f5, 0x0301, 0x0000, 0x00d5, + 0x0308, 0x0000, 0x00f5, 0x0308, 0x0000, 0x014c, 0x0300, 0x0000, + 0x014d, 0x0300, 0x0000, 0x014c, 0x0301, 0x0000, 0x014d, 0x0301, + 0x0000, 0x0050, 0x0301, 0x0000, 0x0070, 0x0301, 0x0000, 0x0050, + 0x0307, 0x0000, 0x0070, 0x0307, 0x0000, 0x0052, 0x0307, 0x0000, + 0x0072, 0x0307, 0x0000, 0x0052, 0x0323, 0x0000, 0x0072, 0x0323, + 0x0000, 0x1e5a, 0x0304, 0x0000, 0x1e5b, 0x0304, 0x0000, 0x0052, + 0x0331, 0x0000, 0x0072, 0x0331, 0x0000, 0x0053, 0x0307, 0x0000, + 0x0073, 0x0307, 0x0000, 0x0053, 0x0323, 0x0000, 0x0073, 0x0323, + 0x0000, 0x015a, 0x0307, 0x0000, 0x015b, 0x0307, 0x0000, 0x0160, + 0x0307, 0x0000, 0x0161, 0x0307, 0x0000, 0x1e62, 0x0307, 0x0000, + 0x1e63, 0x0307, 0x0000, 0x0054, 0x0307, 0x0000, 0x0074, 0x0307, + 0x0000, 0x0054, 0x0323, 0x0000, 0x0074, 0x0323, 0x0000, 0x0054, + 0x0331, 0x0000, 0x0074, 0x0331, 0x0000, 0x0054, 0x032d, 0x0000, + 0x0074, 0x032d, 0x0000, 0x0055, 0x0324, 0x0000, 0x0075, 0x0324, + 0x0000, 0x0055, 0x0330, 0x0000, 0x0075, 0x0330, 0x0000, 0x0055, + 0x032d, 0x0000, 0x0075, 0x032d, 0x0000, 0x0168, 0x0301, 0x0000, + 0x0169, 0x0301, 0x0000, 0x016a, 0x0308, 0x0000, 0x016b, 0x0308, + 0x0000, 0x0056, 0x0303, 0x0000, 0x0076, 0x0303, 0x0000, 0x0056, + 0x0323, 0x0000, 0x0076, 0x0323, 0x0000, 0x0057, 0x0300, 0x0000, + 0x0077, 0x0300, 0x0000, 0x0057, 0x0301, 0x0000, 0x0077, 0x0301, + 0x0000, 0x0057, 0x0308, 0x0000, 0x0077, 0x0308, 0x0000, 0x0057, + 0x0307, 0x0000, 0x0077, 0x0307, 0x0000, 0x0057, 0x0323, 0x0000, + 0x0077, 0x0323, 0x0000, 0x0058, 0x0307, 0x0000, 0x0078, 0x0307, + 0x0000, 0x0058, 0x0308, 0x0000, 0x0078, 0x0308, 0x0000, 0x0059, + 0x0307, 0x0000, 0x0079, 0x0307, 0x0000, 0x005a, 0x0302, 0x0000, + 0x007a, 0x0302, 0x0000, 0x005a, 0x0323, 0x0000, 0x007a, 0x0323, + 0x0000, 0x005a, 0x0331, 0x0000, 0x007a, 0x0331, 0x0000, 0x0068, + 0x0331, 0x0000, 0x0074, 0x0308, 0x0000, 0x0077, 0x030a, 0x0000, + 0x0079, 0x030a, 0x0000, 0x0061, 0x02be, 0x0000, 0x017f, 0x0307, + 0x0000, 0x0041, 0x0323, 0x0000, 0x0061, 0x0323, 0x0000, 0x0041, + 0x0309, 0x0000, 0x0061, 0x0309, 0x0000, 0x00c2, 0x0301, 0x0000, + 0x00e2, 0x0301, 0x0000, 0x00c2, 0x0300, 0x0000, 0x00e2, 0x0300, + 0x0000, 0x00c2, 0x0309, 0x0000, 0x00e2, 0x0309, 0x0000, 0x00c2, + 0x0303, 0x0000, 0x00e2, 0x0303, 0x0000, 0x1ea0, 0x0302, 0x0000, + 0x1ea1, 0x0302, 0x0000, 0x0102, 0x0301, 0x0000, 0x0103, 0x0301, + 0x0000, 0x0102, 0x0300, 0x0000, 0x0103, 0x0300, 0x0000, 0x0102, + 0x0309, 0x0000, 0x0103, 0x0309, 0x0000, 0x0102, 0x0303, 0x0000, + 0x0103, 0x0303, 0x0000, 0x1ea0, 0x0306, 0x0000, 0x1ea1, 0x0306, + 0x0000, 0x0045, 0x0323, 0x0000, 0x0065, 0x0323, 0x0000, 0x0045, + 0x0309, 0x0000, 0x0065, 0x0309, 0x0000, 0x0045, 0x0303, 0x0000, + 0x0065, 0x0303, 0x0000, 0x00ca, 0x0301, 0x0000, 0x00ea, 0x0301, + 0x0000, 0x00ca, 0x0300, 0x0000, 0x00ea, 0x0300, 0x0000, 0x00ca, + 0x0309, 0x0000, 0x00ea, 0x0309, 0x0000, 0x00ca, 0x0303, 0x0000, + 0x00ea, 0x0303, 0x0000, 0x1eb8, 0x0302, 0x0000, 0x1eb9, 0x0302, + 0x0000, 0x0049, 0x0309, 0x0000, 0x0069, 0x0309, 0x0000, 0x0049, + 0x0323, 0x0000, 0x0069, 0x0323, 0x0000, 0x004f, 0x0323, 0x0000, + 0x006f, 0x0323, 0x0000, 0x004f, 0x0309, 0x0000, 0x006f, 0x0309, + 0x0000, 0x00d4, 0x0301, 0x0000, 0x00f4, 0x0301, 0x0000, 0x00d4, + 0x0300, 0x0000, 0x00f4, 0x0300, 0x0000, 0x00d4, 0x0309, 0x0000, + 0x00f4, 0x0309, 0x0000, 0x00d4, 0x0303, 0x0000, 0x00f4, 0x0303, + 0x0000, 0x1ecc, 0x0302, 0x0000, 0x1ecd, 0x0302, 0x0000, 0x01a0, + 0x0301, 0x0000, 0x01a1, 0x0301, 0x0000, 0x01a0, 0x0300, 0x0000, + 0x01a1, 0x0300, 0x0000, 0x01a0, 0x0309, 0x0000, 0x01a1, 0x0309, + 0x0000, 0x01a0, 0x0303, 0x0000, 0x01a1, 0x0303, 0x0000, 0x01a0, + 0x0323, 0x0000, 0x01a1, 0x0323, 0x0000, 0x0055, 0x0323, 0x0000, + 0x0075, 0x0323, 0x0000, 0x0055, 0x0309, 0x0000, 0x0075, 0x0309, + 0x0000, 0x01af, 0x0301, 0x0000, 0x01b0, 0x0301, 0x0000, 0x01af, + 0x0300, 0x0000, 0x01b0, 0x0300, 0x0000, 0x01af, 0x0309, 0x0000, + 0x01b0, 0x0309, 0x0000, 0x01af, 0x0303, 0x0000, 0x01b0, 0x0303, + 0x0000, 0x01af, 0x0323, 0x0000, 0x01b0, 0x0323, 0x0000, 0x0059, + 0x0300, 0x0000, 0x0079, 0x0300, 0x0000, 0x0059, 0x0323, 0x0000, + 0x0079, 0x0323, 0x0000, 0x0059, 0x0309, 0x0000, 0x0079, 0x0309, + 0x0000, 0x0059, 0x0303, 0x0000, 0x0079, 0x0303, 0x0000, 0x03b1, + 0x0313, 0x0000, 0x03b1, 0x0314, 0x0000, 0x1f00, 0x0300, 0x0000, + 0x1f01, 0x0300, 0x0000, 0x1f00, 0x0301, 0x0000, 0x1f01, 0x0301, + 0x0000, 0x1f00, 0x0342, 0x0000, 0x1f01, 0x0342, 0x0000, 0x0391, + 0x0313, 0x0000, 0x0391, 0x0314, 0x0000, 0x1f08, 0x0300, 0x0000, + 0x1f09, 0x0300, 0x0000, 0x1f08, 0x0301, 0x0000, 0x1f09, 0x0301, + 0x0000, 0x1f08, 0x0342, 0x0000, 0x1f09, 0x0342, 0x0000, 0x03b5, + 0x0313, 0x0000, 0x03b5, 0x0314, 0x0000, 0x1f10, 0x0300, 0x0000, + 0x1f11, 0x0300, 0x0000, 0x1f10, 0x0301, 0x0000, 0x1f11, 0x0301, + 0x0000, 0x0395, 0x0313, 0x0000, 0x0395, 0x0314, 0x0000, 0x1f18, + 0x0300, 0x0000, 0x1f19, 0x0300, 0x0000, 0x1f18, 0x0301, 0x0000, + 0x1f19, 0x0301, 0x0000, 0x03b7, 0x0313, 0x0000, 0x03b7, 0x0314, + 0x0000, 0x1f20, 0x0300, 0x0000, 0x1f21, 0x0300, 0x0000, 0x1f20, + 0x0301, 0x0000, 0x1f21, 0x0301, 0x0000, 0x1f20, 0x0342, 0x0000, + 0x1f21, 0x0342, 0x0000, 0x0397, 0x0313, 0x0000, 0x0397, 0x0314, + 0x0000, 0x1f28, 0x0300, 0x0000, 0x1f29, 0x0300, 0x0000, 0x1f28, + 0x0301, 0x0000, 0x1f29, 0x0301, 0x0000, 0x1f28, 0x0342, 0x0000, + 0x1f29, 0x0342, 0x0000, 0x03b9, 0x0313, 0x0000, 0x03b9, 0x0314, + 0x0000, 0x1f30, 0x0300, 0x0000, 0x1f31, 0x0300, 0x0000, 0x1f30, + 0x0301, 0x0000, 0x1f31, 0x0301, 0x0000, 0x1f30, 0x0342, 0x0000, + 0x1f31, 0x0342, 0x0000, 0x0399, 0x0313, 0x0000, 0x0399, 0x0314, + 0x0000, 0x1f38, 0x0300, 0x0000, 0x1f39, 0x0300, 0x0000, 0x1f38, + 0x0301, 0x0000, 0x1f39, 0x0301, 0x0000, 0x1f38, 0x0342, 0x0000, + 0x1f39, 0x0342, 0x0000, 0x03bf, 0x0313, 0x0000, 0x03bf, 0x0314, + 0x0000, 0x1f40, 0x0300, 0x0000, 0x1f41, 0x0300, 0x0000, 0x1f40, + 0x0301, 0x0000, 0x1f41, 0x0301, 0x0000, 0x039f, 0x0313, 0x0000, + 0x039f, 0x0314, 0x0000, 0x1f48, 0x0300, 0x0000, 0x1f49, 0x0300, + 0x0000, 0x1f48, 0x0301, 0x0000, 0x1f49, 0x0301, 0x0000, 0x03c5, + 0x0313, 0x0000, 0x03c5, 0x0314, 0x0000, 0x1f50, 0x0300, 0x0000, + 0x1f51, 0x0300, 0x0000, 0x1f50, 0x0301, 0x0000, 0x1f51, 0x0301, + 0x0000, 0x1f50, 0x0342, 0x0000, 0x1f51, 0x0342, 0x0000, 0x03a5, + 0x0314, 0x0000, 0x1f59, 0x0300, 0x0000, 0x1f59, 0x0301, 0x0000, + 0x1f59, 0x0342, 0x0000, 0x03c9, 0x0313, 0x0000, 0x03c9, 0x0314, + 0x0000, 0x1f60, 0x0300, 0x0000, 0x1f61, 0x0300, 0x0000, 0x1f60, + 0x0301, 0x0000, 0x1f61, 0x0301, 0x0000, 0x1f60, 0x0342, 0x0000, + 0x1f61, 0x0342, 0x0000, 0x03a9, 0x0313, 0x0000, 0x03a9, 0x0314, + 0x0000, 0x1f68, 0x0300, 0x0000, 0x1f69, 0x0300, 0x0000, 0x1f68, + 0x0301, 0x0000, 0x1f69, 0x0301, 0x0000, 0x1f68, 0x0342, 0x0000, + 0x1f69, 0x0342, 0x0000, 0x03b1, 0x0300, 0x0000, 0x03ac, 0x0000, + 0x03b5, 0x0300, 0x0000, 0x03ad, 0x0000, 0x03b7, 0x0300, 0x0000, + 0x03ae, 0x0000, 0x03b9, 0x0300, 0x0000, 0x03af, 0x0000, 0x03bf, + 0x0300, 0x0000, 0x03cc, 0x0000, 0x03c5, 0x0300, 0x0000, 0x03cd, + 0x0000, 0x03c9, 0x0300, 0x0000, 0x03ce, 0x0000, 0x1f00, 0x0345, + 0x0000, 0x1f01, 0x0345, 0x0000, 0x1f02, 0x0345, 0x0000, 0x1f03, + 0x0345, 0x0000, 0x1f04, 0x0345, 0x0000, 0x1f05, 0x0345, 0x0000, + 0x1f06, 0x0345, 0x0000, 0x1f07, 0x0345, 0x0000, 0x1f08, 0x0345, + 0x0000, 0x1f09, 0x0345, 0x0000, 0x1f0a, 0x0345, 0x0000, 0x1f0b, + 0x0345, 0x0000, 0x1f0c, 0x0345, 0x0000, 0x1f0d, 0x0345, 0x0000, + 0x1f0e, 0x0345, 0x0000, 0x1f0f, 0x0345, 0x0000, 0x1f20, 0x0345, + 0x0000, 0x1f21, 0x0345, 0x0000, 0x1f22, 0x0345, 0x0000, 0x1f23, + 0x0345, 0x0000, 0x1f24, 0x0345, 0x0000, 0x1f25, 0x0345, 0x0000, + 0x1f26, 0x0345, 0x0000, 0x1f27, 0x0345, 0x0000, 0x1f28, 0x0345, + 0x0000, 0x1f29, 0x0345, 0x0000, 0x1f2a, 0x0345, 0x0000, 0x1f2b, + 0x0345, 0x0000, 0x1f2c, 0x0345, 0x0000, 0x1f2d, 0x0345, 0x0000, + 0x1f2e, 0x0345, 0x0000, 0x1f2f, 0x0345, 0x0000, 0x1f60, 0x0345, + 0x0000, 0x1f61, 0x0345, 0x0000, 0x1f62, 0x0345, 0x0000, 0x1f63, + 0x0345, 0x0000, 0x1f64, 0x0345, 0x0000, 0x1f65, 0x0345, 0x0000, + 0x1f66, 0x0345, 0x0000, 0x1f67, 0x0345, 0x0000, 0x1f68, 0x0345, + 0x0000, 0x1f69, 0x0345, 0x0000, 0x1f6a, 0x0345, 0x0000, 0x1f6b, + 0x0345, 0x0000, 0x1f6c, 0x0345, 0x0000, 0x1f6d, 0x0345, 0x0000, + 0x1f6e, 0x0345, 0x0000, 0x1f6f, 0x0345, 0x0000, 0x03b1, 0x0306, + 0x0000, 0x03b1, 0x0304, 0x0000, 0x1f70, 0x0345, 0x0000, 0x03b1, + 0x0345, 0x0000, 0x03ac, 0x0345, 0x0000, 0x03b1, 0x0342, 0x0000, + 0x1fb6, 0x0345, 0x0000, 0x0391, 0x0306, 0x0000, 0x0391, 0x0304, + 0x0000, 0x0391, 0x0300, 0x0000, 0x0386, 0x0000, 0x0391, 0x0345, + 0x0000, 0x0020, 0x0313, 0x0000, 0x03b9, 0x0000, 0x0020, 0x0342, + 0x0000, 0x00a8, 0x0342, 0x0000, 0x1f74, 0x0345, 0x0000, 0x03b7, + 0x0345, 0x0000, 0x03ae, 0x0345, 0x0000, 0x03b7, 0x0342, 0x0000, + 0x1fc6, 0x0345, 0x0000, 0x0395, 0x0300, 0x0000, 0x0388, 0x0000, + 0x0397, 0x0300, 0x0000, 0x0389, 0x0000, 0x0397, 0x0345, 0x0000, + 0x1fbf, 0x0300, 0x0000, 0x1fbf, 0x0301, 0x0000, 0x1fbf, 0x0342, + 0x0000, 0x03b9, 0x0306, 0x0000, 0x03b9, 0x0304, 0x0000, 0x03ca, + 0x0300, 0x0000, 0x0390, 0x0000, 0x03b9, 0x0342, 0x0000, 0x03ca, + 0x0342, 0x0000, 0x0399, 0x0306, 0x0000, 0x0399, 0x0304, 0x0000, + 0x0399, 0x0300, 0x0000, 0x038a, 0x0000, 0x1ffe, 0x0300, 0x0000, + 0x1ffe, 0x0301, 0x0000, 0x1ffe, 0x0342, 0x0000, 0x03c5, 0x0306, + 0x0000, 0x03c5, 0x0304, 0x0000, 0x03cb, 0x0300, 0x0000, 0x03b0, + 0x0000, 0x03c1, 0x0313, 0x0000, 0x03c1, 0x0314, 0x0000, 0x03c5, + 0x0342, 0x0000, 0x03cb, 0x0342, 0x0000, 0x03a5, 0x0306, 0x0000, + 0x03a5, 0x0304, 0x0000, 0x03a5, 0x0300, 0x0000, 0x038e, 0x0000, + 0x03a1, 0x0314, 0x0000, 0x00a8, 0x0300, 0x0000, 0x0385, 0x0000, + 0x0060, 0x0000, 0x1f7c, 0x0345, 0x0000, 0x03c9, 0x0345, 0x0000, + 0x03ce, 0x0345, 0x0000, 0x03c9, 0x0342, 0x0000, 0x1ff6, 0x0345, + 0x0000, 0x039f, 0x0300, 0x0000, 0x038c, 0x0000, 0x03a9, 0x0300, + 0x0000, 0x038f, 0x0000, 0x03a9, 0x0345, 0x0000, 0x00b4, 0x0000, + 0x0020, 0x0314, 0x0000, 0x2002, 0x0000, 0x2003, 0x0000, 0x2010, + 0x0000, 0x0020, 0x0333, 0x0000, 0x002e, 0x0000, 0x002e, 0x002e, + 0x0000, 0x002e, 0x002e, 0x002e, 0x0000, 0x2032, 0x2032, 0x0000, + 0x2032, 0x2032, 0x2032, 0x0000, 0x2035, 0x2035, 0x0000, 0x2035, + 0x2035, 0x2035, 0x0000, 0x0021, 0x0021, 0x0000, 0x0020, 0x0305, + 0x0000, 0x003f, 0x003f, 0x0000, 0x003f, 0x0021, 0x0000, 0x0021, + 0x003f, 0x0000, 0x2032, 0x2032, 0x2032, 0x2032, 0x0000, 0x0030, + 0x0000, 0x0034, 0x0000, 0x0035, 0x0000, 0x0036, 0x0000, 0x0037, + 0x0000, 0x0038, 0x0000, 0x0039, 0x0000, 0x002b, 0x0000, 0x2212, + 0x0000, 0x003d, 0x0000, 0x0028, 0x0000, 0x0029, 0x0000, 0x006e, + 0x0000, 0x0052, 0x0073, 0x0000, 0x0061, 0x002f, 0x0063, 0x0000, + 0x0061, 0x002f, 0x0073, 0x0000, 0x0043, 0x0000, 0x00b0, 0x0043, + 0x0000, 0x0063, 0x002f, 0x006f, 0x0000, 0x0063, 0x002f, 0x0075, + 0x0000, 0x0190, 0x0000, 0x00b0, 0x0046, 0x0000, 0x0127, 0x0000, + 0x004e, 0x006f, 0x0000, 0x0051, 0x0000, 0x0053, 0x004d, 0x0000, + 0x0054, 0x0045, 0x004c, 0x0000, 0x0054, 0x004d, 0x0000, 0x005a, + 0x0000, 0x03a9, 0x0000, 0x00c5, 0x0000, 0x0046, 0x0000, 0x05d0, + 0x0000, 0x05d1, 0x0000, 0x05d2, 0x0000, 0x05d3, 0x0000, 0x0046, + 0x0041, 0x0058, 0x0000, 0x0393, 0x0000, 0x03a0, 0x0000, 0x2211, + 0x0000, 0x0031, 0x2044, 0x0037, 0x0000, 0x0031, 0x2044, 0x0039, + 0x0000, 0x0031, 0x2044, 0x0031, 0x0030, 0x0000, 0x0031, 0x2044, + 0x0033, 0x0000, 0x0032, 0x2044, 0x0033, 0x0000, 0x0031, 0x2044, + 0x0035, 0x0000, 0x0032, 0x2044, 0x0035, 0x0000, 0x0033, 0x2044, + 0x0035, 0x0000, 0x0034, 0x2044, 0x0035, 0x0000, 0x0031, 0x2044, + 0x0036, 0x0000, 0x0035, 0x2044, 0x0036, 0x0000, 0x0031, 0x2044, + 0x0038, 0x0000, 0x0033, 0x2044, 0x0038, 0x0000, 0x0035, 0x2044, + 0x0038, 0x0000, 0x0037, 0x2044, 0x0038, 0x0000, 0x0031, 0x2044, + 0x0000, 0x0049, 0x0049, 0x0000, 0x0049, 0x0049, 0x0049, 0x0000, + 0x0049, 0x0056, 0x0000, 0x0056, 0x0000, 0x0056, 0x0049, 0x0000, + 0x0056, 0x0049, 0x0049, 0x0000, 0x0056, 0x0049, 0x0049, 0x0049, + 0x0000, 0x0049, 0x0058, 0x0000, 0x0058, 0x0000, 0x0058, 0x0049, + 0x0000, 0x0058, 0x0049, 0x0049, 0x0000, 0x0069, 0x0069, 0x0000, + 0x0069, 0x0069, 0x0069, 0x0000, 0x0069, 0x0076, 0x0000, 0x0076, + 0x0069, 0x0000, 0x0076, 0x0069, 0x0069, 0x0000, 0x0076, 0x0069, + 0x0069, 0x0069, 0x0000, 0x0069, 0x0078, 0x0000, 0x0078, 0x0069, + 0x0000, 0x0078, 0x0069, 0x0069, 0x0000, 0x0030, 0x2044, 0x0033, + 0x0000, 0x2190, 0x0338, 0x0000, 0x2192, 0x0338, 0x0000, 0x2194, + 0x0338, 0x0000, 0x21d0, 0x0338, 0x0000, 0x21d4, 0x0338, 0x0000, + 0x21d2, 0x0338, 0x0000, 0x2203, 0x0338, 0x0000, 0x2208, 0x0338, + 0x0000, 0x220b, 0x0338, 0x0000, 0x2223, 0x0338, 0x0000, 0x2225, + 0x0338, 0x0000, 0x222b, 0x222b, 0x0000, 0x222b, 0x222b, 0x222b, + 0x0000, 0x222e, 0x222e, 0x0000, 0x222e, 0x222e, 0x222e, 0x0000, + 0x223c, 0x0338, 0x0000, 0x2243, 0x0338, 0x0000, 0x2245, 0x0338, + 0x0000, 0x2248, 0x0338, 0x0000, 0x003d, 0x0338, 0x0000, 0x2261, + 0x0338, 0x0000, 0x224d, 0x0338, 0x0000, 0x003c, 0x0338, 0x0000, + 0x003e, 0x0338, 0x0000, 0x2264, 0x0338, 0x0000, 0x2265, 0x0338, + 0x0000, 0x2272, 0x0338, 0x0000, 0x2273, 0x0338, 0x0000, 0x2276, + 0x0338, 0x0000, 0x2277, 0x0338, 0x0000, 0x227a, 0x0338, 0x0000, + 0x227b, 0x0338, 0x0000, 0x2282, 0x0338, 0x0000, 0x2283, 0x0338, + 0x0000, 0x2286, 0x0338, 0x0000, 0x2287, 0x0338, 0x0000, 0x22a2, + 0x0338, 0x0000, 0x22a8, 0x0338, 0x0000, 0x22a9, 0x0338, 0x0000, + 0x22ab, 0x0338, 0x0000, 0x227c, 0x0338, 0x0000, 0x227d, 0x0338, + 0x0000, 0x2291, 0x0338, 0x0000, 0x2292, 0x0338, 0x0000, 0x22b2, + 0x0338, 0x0000, 0x22b3, 0x0338, 0x0000, 0x22b4, 0x0338, 0x0000, + 0x22b5, 0x0338, 0x0000, 0x3008, 0x0000, 0x3009, 0x0000, 0x0031, + 0x0030, 0x0000, 0x0031, 0x0031, 0x0000, 0x0031, 0x0032, 0x0000, + 0x0031, 0x0033, 0x0000, 0x0031, 0x0034, 0x0000, 0x0031, 0x0035, + 0x0000, 0x0031, 0x0036, 0x0000, 0x0031, 0x0037, 0x0000, 0x0031, + 0x0038, 0x0000, 0x0031, 0x0039, 0x0000, 0x0032, 0x0030, 0x0000, + 0x0028, 0x0031, 0x0029, 0x0000, 0x0028, 0x0032, 0x0029, 0x0000, + 0x0028, 0x0033, 0x0029, 0x0000, 0x0028, 0x0034, 0x0029, 0x0000, + 0x0028, 0x0035, 0x0029, 0x0000, 0x0028, 0x0036, 0x0029, 0x0000, + 0x0028, 0x0037, 0x0029, 0x0000, 0x0028, 0x0038, 0x0029, 0x0000, + 0x0028, 0x0039, 0x0029, 0x0000, 0x0028, 0x0031, 0x0030, 0x0029, + 0x0000, 0x0028, 0x0031, 0x0031, 0x0029, 0x0000, 0x0028, 0x0031, + 0x0032, 0x0029, 0x0000, 0x0028, 0x0031, 0x0033, 0x0029, 0x0000, + 0x0028, 0x0031, 0x0034, 0x0029, 0x0000, 0x0028, 0x0031, 0x0035, + 0x0029, 0x0000, 0x0028, 0x0031, 0x0036, 0x0029, 0x0000, 0x0028, + 0x0031, 0x0037, 0x0029, 0x0000, 0x0028, 0x0031, 0x0038, 0x0029, + 0x0000, 0x0028, 0x0031, 0x0039, 0x0029, 0x0000, 0x0028, 0x0032, + 0x0030, 0x0029, 0x0000, 0x0031, 0x002e, 0x0000, 0x0032, 0x002e, + 0x0000, 0x0033, 0x002e, 0x0000, 0x0034, 0x002e, 0x0000, 0x0035, + 0x002e, 0x0000, 0x0036, 0x002e, 0x0000, 0x0037, 0x002e, 0x0000, + 0x0038, 0x002e, 0x0000, 0x0039, 0x002e, 0x0000, 0x0031, 0x0030, + 0x002e, 0x0000, 0x0031, 0x0031, 0x002e, 0x0000, 0x0031, 0x0032, + 0x002e, 0x0000, 0x0031, 0x0033, 0x002e, 0x0000, 0x0031, 0x0034, + 0x002e, 0x0000, 0x0031, 0x0035, 0x002e, 0x0000, 0x0031, 0x0036, + 0x002e, 0x0000, 0x0031, 0x0037, 0x002e, 0x0000, 0x0031, 0x0038, + 0x002e, 0x0000, 0x0031, 0x0039, 0x002e, 0x0000, 0x0032, 0x0030, + 0x002e, 0x0000, 0x0028, 0x0061, 0x0029, 0x0000, 0x0028, 0x0062, + 0x0029, 0x0000, 0x0028, 0x0063, 0x0029, 0x0000, 0x0028, 0x0064, + 0x0029, 0x0000, 0x0028, 0x0065, 0x0029, 0x0000, 0x0028, 0x0066, + 0x0029, 0x0000, 0x0028, 0x0067, 0x0029, 0x0000, 0x0028, 0x0068, + 0x0029, 0x0000, 0x0028, 0x0069, 0x0029, 0x0000, 0x0028, 0x006a, + 0x0029, 0x0000, 0x0028, 0x006b, 0x0029, 0x0000, 0x0028, 0x006c, + 0x0029, 0x0000, 0x0028, 0x006d, 0x0029, 0x0000, 0x0028, 0x006e, + 0x0029, 0x0000, 0x0028, 0x006f, 0x0029, 0x0000, 0x0028, 0x0070, + 0x0029, 0x0000, 0x0028, 0x0071, 0x0029, 0x0000, 0x0028, 0x0072, + 0x0029, 0x0000, 0x0028, 0x0073, 0x0029, 0x0000, 0x0028, 0x0074, + 0x0029, 0x0000, 0x0028, 0x0075, 0x0029, 0x0000, 0x0028, 0x0076, + 0x0029, 0x0000, 0x0028, 0x0077, 0x0029, 0x0000, 0x0028, 0x0078, + 0x0029, 0x0000, 0x0028, 0x0079, 0x0029, 0x0000, 0x0028, 0x007a, + 0x0029, 0x0000, 0x0053, 0x0000, 0x0059, 0x0000, 0x0071, 0x0000, + 0x222b, 0x222b, 0x222b, 0x222b, 0x0000, 0x003a, 0x003a, 0x003d, + 0x0000, 0x003d, 0x003d, 0x0000, 0x003d, 0x003d, 0x003d, 0x0000, + 0x2add, 0x0338, 0x0000, 0x2d61, 0x0000, 0x6bcd, 0x0000, 0x9f9f, + 0x0000, 0x4e00, 0x0000, 0x4e28, 0x0000, 0x4e36, 0x0000, 0x4e3f, + 0x0000, 0x4e59, 0x0000, 0x4e85, 0x0000, 0x4e8c, 0x0000, 0x4ea0, + 0x0000, 0x4eba, 0x0000, 0x513f, 0x0000, 0x5165, 0x0000, 0x516b, + 0x0000, 0x5182, 0x0000, 0x5196, 0x0000, 0x51ab, 0x0000, 0x51e0, + 0x0000, 0x51f5, 0x0000, 0x5200, 0x0000, 0x529b, 0x0000, 0x52f9, + 0x0000, 0x5315, 0x0000, 0x531a, 0x0000, 0x5338, 0x0000, 0x5341, + 0x0000, 0x535c, 0x0000, 0x5369, 0x0000, 0x5382, 0x0000, 0x53b6, + 0x0000, 0x53c8, 0x0000, 0x53e3, 0x0000, 0x56d7, 0x0000, 0x571f, + 0x0000, 0x58eb, 0x0000, 0x5902, 0x0000, 0x590a, 0x0000, 0x5915, + 0x0000, 0x5927, 0x0000, 0x5973, 0x0000, 0x5b50, 0x0000, 0x5b80, + 0x0000, 0x5bf8, 0x0000, 0x5c0f, 0x0000, 0x5c22, 0x0000, 0x5c38, + 0x0000, 0x5c6e, 0x0000, 0x5c71, 0x0000, 0x5ddb, 0x0000, 0x5de5, + 0x0000, 0x5df1, 0x0000, 0x5dfe, 0x0000, 0x5e72, 0x0000, 0x5e7a, + 0x0000, 0x5e7f, 0x0000, 0x5ef4, 0x0000, 0x5efe, 0x0000, 0x5f0b, + 0x0000, 0x5f13, 0x0000, 0x5f50, 0x0000, 0x5f61, 0x0000, 0x5f73, + 0x0000, 0x5fc3, 0x0000, 0x6208, 0x0000, 0x6236, 0x0000, 0x624b, + 0x0000, 0x652f, 0x0000, 0x6534, 0x0000, 0x6587, 0x0000, 0x6597, + 0x0000, 0x65a4, 0x0000, 0x65b9, 0x0000, 0x65e0, 0x0000, 0x65e5, + 0x0000, 0x66f0, 0x0000, 0x6708, 0x0000, 0x6728, 0x0000, 0x6b20, + 0x0000, 0x6b62, 0x0000, 0x6b79, 0x0000, 0x6bb3, 0x0000, 0x6bcb, + 0x0000, 0x6bd4, 0x0000, 0x6bdb, 0x0000, 0x6c0f, 0x0000, 0x6c14, + 0x0000, 0x6c34, 0x0000, 0x706b, 0x0000, 0x722a, 0x0000, 0x7236, + 0x0000, 0x723b, 0x0000, 0x723f, 0x0000, 0x7247, 0x0000, 0x7259, + 0x0000, 0x725b, 0x0000, 0x72ac, 0x0000, 0x7384, 0x0000, 0x7389, + 0x0000, 0x74dc, 0x0000, 0x74e6, 0x0000, 0x7518, 0x0000, 0x751f, + 0x0000, 0x7528, 0x0000, 0x7530, 0x0000, 0x758b, 0x0000, 0x7592, + 0x0000, 0x7676, 0x0000, 0x767d, 0x0000, 0x76ae, 0x0000, 0x76bf, + 0x0000, 0x76ee, 0x0000, 0x77db, 0x0000, 0x77e2, 0x0000, 0x77f3, + 0x0000, 0x793a, 0x0000, 0x79b8, 0x0000, 0x79be, 0x0000, 0x7a74, + 0x0000, 0x7acb, 0x0000, 0x7af9, 0x0000, 0x7c73, 0x0000, 0x7cf8, + 0x0000, 0x7f36, 0x0000, 0x7f51, 0x0000, 0x7f8a, 0x0000, 0x7fbd, + 0x0000, 0x8001, 0x0000, 0x800c, 0x0000, 0x8012, 0x0000, 0x8033, + 0x0000, 0x807f, 0x0000, 0x8089, 0x0000, 0x81e3, 0x0000, 0x81ea, + 0x0000, 0x81f3, 0x0000, 0x81fc, 0x0000, 0x820c, 0x0000, 0x821b, + 0x0000, 0x821f, 0x0000, 0x826e, 0x0000, 0x8272, 0x0000, 0x8278, + 0x0000, 0x864d, 0x0000, 0x866b, 0x0000, 0x8840, 0x0000, 0x884c, + 0x0000, 0x8863, 0x0000, 0x897e, 0x0000, 0x898b, 0x0000, 0x89d2, + 0x0000, 0x8a00, 0x0000, 0x8c37, 0x0000, 0x8c46, 0x0000, 0x8c55, + 0x0000, 0x8c78, 0x0000, 0x8c9d, 0x0000, 0x8d64, 0x0000, 0x8d70, + 0x0000, 0x8db3, 0x0000, 0x8eab, 0x0000, 0x8eca, 0x0000, 0x8f9b, + 0x0000, 0x8fb0, 0x0000, 0x8fb5, 0x0000, 0x9091, 0x0000, 0x9149, + 0x0000, 0x91c6, 0x0000, 0x91cc, 0x0000, 0x91d1, 0x0000, 0x9577, + 0x0000, 0x9580, 0x0000, 0x961c, 0x0000, 0x96b6, 0x0000, 0x96b9, + 0x0000, 0x96e8, 0x0000, 0x9751, 0x0000, 0x975e, 0x0000, 0x9762, + 0x0000, 0x9769, 0x0000, 0x97cb, 0x0000, 0x97ed, 0x0000, 0x97f3, + 0x0000, 0x9801, 0x0000, 0x98a8, 0x0000, 0x98db, 0x0000, 0x98df, + 0x0000, 0x9996, 0x0000, 0x9999, 0x0000, 0x99ac, 0x0000, 0x9aa8, + 0x0000, 0x9ad8, 0x0000, 0x9adf, 0x0000, 0x9b25, 0x0000, 0x9b2f, + 0x0000, 0x9b32, 0x0000, 0x9b3c, 0x0000, 0x9b5a, 0x0000, 0x9ce5, + 0x0000, 0x9e75, 0x0000, 0x9e7f, 0x0000, 0x9ea5, 0x0000, 0x9ebb, + 0x0000, 0x9ec3, 0x0000, 0x9ecd, 0x0000, 0x9ed1, 0x0000, 0x9ef9, + 0x0000, 0x9efd, 0x0000, 0x9f0e, 0x0000, 0x9f13, 0x0000, 0x9f20, + 0x0000, 0x9f3b, 0x0000, 0x9f4a, 0x0000, 0x9f52, 0x0000, 0x9f8d, + 0x0000, 0x9f9c, 0x0000, 0x9fa0, 0x0000, 0x3012, 0x0000, 0x5344, + 0x0000, 0x5345, 0x0000, 0x304b, 0x3099, 0x0000, 0x304d, 0x3099, + 0x0000, 0x304f, 0x3099, 0x0000, 0x3051, 0x3099, 0x0000, 0x3053, + 0x3099, 0x0000, 0x3055, 0x3099, 0x0000, 0x3057, 0x3099, 0x0000, + 0x3059, 0x3099, 0x0000, 0x305b, 0x3099, 0x0000, 0x305d, 0x3099, + 0x0000, 0x305f, 0x3099, 0x0000, 0x3061, 0x3099, 0x0000, 0x3064, + 0x3099, 0x0000, 0x3066, 0x3099, 0x0000, 0x3068, 0x3099, 0x0000, + 0x306f, 0x3099, 0x0000, 0x306f, 0x309a, 0x0000, 0x3072, 0x3099, + 0x0000, 0x3072, 0x309a, 0x0000, 0x3075, 0x3099, 0x0000, 0x3075, + 0x309a, 0x0000, 0x3078, 0x3099, 0x0000, 0x3078, 0x309a, 0x0000, + 0x307b, 0x3099, 0x0000, 0x307b, 0x309a, 0x0000, 0x3046, 0x3099, + 0x0000, 0x0020, 0x3099, 0x0000, 0x0020, 0x309a, 0x0000, 0x309d, + 0x3099, 0x0000, 0x3088, 0x308a, 0x0000, 0x30ab, 0x3099, 0x0000, + 0x30ad, 0x3099, 0x0000, 0x30af, 0x3099, 0x0000, 0x30b1, 0x3099, + 0x0000, 0x30b3, 0x3099, 0x0000, 0x30b5, 0x3099, 0x0000, 0x30b7, + 0x3099, 0x0000, 0x30b9, 0x3099, 0x0000, 0x30bb, 0x3099, 0x0000, + 0x30bd, 0x3099, 0x0000, 0x30bf, 0x3099, 0x0000, 0x30c1, 0x3099, + 0x0000, 0x30c4, 0x3099, 0x0000, 0x30c6, 0x3099, 0x0000, 0x30c8, + 0x3099, 0x0000, 0x30cf, 0x3099, 0x0000, 0x30cf, 0x309a, 0x0000, + 0x30d2, 0x3099, 0x0000, 0x30d2, 0x309a, 0x0000, 0x30d5, 0x3099, + 0x0000, 0x30d5, 0x309a, 0x0000, 0x30d8, 0x3099, 0x0000, 0x30d8, + 0x309a, 0x0000, 0x30db, 0x3099, 0x0000, 0x30db, 0x309a, 0x0000, + 0x30a6, 0x3099, 0x0000, 0x30ef, 0x3099, 0x0000, 0x30f0, 0x3099, + 0x0000, 0x30f1, 0x3099, 0x0000, 0x30f2, 0x3099, 0x0000, 0x30fd, + 0x3099, 0x0000, 0x30b3, 0x30c8, 0x0000, 0x1100, 0x0000, 0x1101, + 0x0000, 0x11aa, 0x0000, 0x1102, 0x0000, 0x11ac, 0x0000, 0x11ad, + 0x0000, 0x1103, 0x0000, 0x1104, 0x0000, 0x1105, 0x0000, 0x11b0, + 0x0000, 0x11b1, 0x0000, 0x11b2, 0x0000, 0x11b3, 0x0000, 0x11b4, + 0x0000, 0x11b5, 0x0000, 0x111a, 0x0000, 0x1106, 0x0000, 0x1107, + 0x0000, 0x1108, 0x0000, 0x1121, 0x0000, 0x1109, 0x0000, 0x110a, + 0x0000, 0x110b, 0x0000, 0x110c, 0x0000, 0x110d, 0x0000, 0x110e, + 0x0000, 0x110f, 0x0000, 0x1110, 0x0000, 0x1111, 0x0000, 0x1112, + 0x0000, 0x1161, 0x0000, 0x1162, 0x0000, 0x1163, 0x0000, 0x1164, + 0x0000, 0x1165, 0x0000, 0x1166, 0x0000, 0x1167, 0x0000, 0x1168, + 0x0000, 0x1169, 0x0000, 0x116a, 0x0000, 0x116b, 0x0000, 0x116c, + 0x0000, 0x116d, 0x0000, 0x116e, 0x0000, 0x116f, 0x0000, 0x1170, + 0x0000, 0x1171, 0x0000, 0x1172, 0x0000, 0x1173, 0x0000, 0x1174, + 0x0000, 0x1175, 0x0000, 0x1160, 0x0000, 0x1114, 0x0000, 0x1115, + 0x0000, 0x11c7, 0x0000, 0x11c8, 0x0000, 0x11cc, 0x0000, 0x11ce, + 0x0000, 0x11d3, 0x0000, 0x11d7, 0x0000, 0x11d9, 0x0000, 0x111c, + 0x0000, 0x11dd, 0x0000, 0x11df, 0x0000, 0x111d, 0x0000, 0x111e, + 0x0000, 0x1120, 0x0000, 0x1122, 0x0000, 0x1123, 0x0000, 0x1127, + 0x0000, 0x1129, 0x0000, 0x112b, 0x0000, 0x112c, 0x0000, 0x112d, + 0x0000, 0x112e, 0x0000, 0x112f, 0x0000, 0x1132, 0x0000, 0x1136, + 0x0000, 0x1140, 0x0000, 0x1147, 0x0000, 0x114c, 0x0000, 0x11f1, + 0x0000, 0x11f2, 0x0000, 0x1157, 0x0000, 0x1158, 0x0000, 0x1159, + 0x0000, 0x1184, 0x0000, 0x1185, 0x0000, 0x1188, 0x0000, 0x1191, + 0x0000, 0x1192, 0x0000, 0x1194, 0x0000, 0x119e, 0x0000, 0x11a1, + 0x0000, 0x4e09, 0x0000, 0x56db, 0x0000, 0x4e0a, 0x0000, 0x4e2d, + 0x0000, 0x4e0b, 0x0000, 0x7532, 0x0000, 0x4e19, 0x0000, 0x4e01, + 0x0000, 0x5929, 0x0000, 0x5730, 0x0000, 0x0028, 0x1100, 0x0029, + 0x0000, 0x0028, 0x1102, 0x0029, 0x0000, 0x0028, 0x1103, 0x0029, + 0x0000, 0x0028, 0x1105, 0x0029, 0x0000, 0x0028, 0x1106, 0x0029, + 0x0000, 0x0028, 0x1107, 0x0029, 0x0000, 0x0028, 0x1109, 0x0029, + 0x0000, 0x0028, 0x110b, 0x0029, 0x0000, 0x0028, 0x110c, 0x0029, + 0x0000, 0x0028, 0x110e, 0x0029, 0x0000, 0x0028, 0x110f, 0x0029, + 0x0000, 0x0028, 0x1110, 0x0029, 0x0000, 0x0028, 0x1111, 0x0029, + 0x0000, 0x0028, 0x1112, 0x0029, 0x0000, 0x0028, 0x1100, 0x1161, + 0x0029, 0x0000, 0x0028, 0x1102, 0x1161, 0x0029, 0x0000, 0x0028, + 0x1103, 0x1161, 0x0029, 0x0000, 0x0028, 0x1105, 0x1161, 0x0029, + 0x0000, 0x0028, 0x1106, 0x1161, 0x0029, 0x0000, 0x0028, 0x1107, + 0x1161, 0x0029, 0x0000, 0x0028, 0x1109, 0x1161, 0x0029, 0x0000, + 0x0028, 0x110b, 0x1161, 0x0029, 0x0000, 0x0028, 0x110c, 0x1161, + 0x0029, 0x0000, 0x0028, 0x110e, 0x1161, 0x0029, 0x0000, 0x0028, + 0x110f, 0x1161, 0x0029, 0x0000, 0x0028, 0x1110, 0x1161, 0x0029, + 0x0000, 0x0028, 0x1111, 0x1161, 0x0029, 0x0000, 0x0028, 0x1112, + 0x1161, 0x0029, 0x0000, 0x0028, 0x110c, 0x116e, 0x0029, 0x0000, + 0x0028, 0x110b, 0x1169, 0x110c, 0x1165, 0x11ab, 0x0029, 0x0000, + 0x0028, 0x110b, 0x1169, 0x1112, 0x116e, 0x0029, 0x0000, 0x0028, + 0x4e00, 0x0029, 0x0000, 0x0028, 0x4e8c, 0x0029, 0x0000, 0x0028, + 0x4e09, 0x0029, 0x0000, 0x0028, 0x56db, 0x0029, 0x0000, 0x0028, + 0x4e94, 0x0029, 0x0000, 0x0028, 0x516d, 0x0029, 0x0000, 0x0028, + 0x4e03, 0x0029, 0x0000, 0x0028, 0x516b, 0x0029, 0x0000, 0x0028, + 0x4e5d, 0x0029, 0x0000, 0x0028, 0x5341, 0x0029, 0x0000, 0x0028, + 0x6708, 0x0029, 0x0000, 0x0028, 0x706b, 0x0029, 0x0000, 0x0028, + 0x6c34, 0x0029, 0x0000, 0x0028, 0x6728, 0x0029, 0x0000, 0x0028, + 0x91d1, 0x0029, 0x0000, 0x0028, 0x571f, 0x0029, 0x0000, 0x0028, + 0x65e5, 0x0029, 0x0000, 0x0028, 0x682a, 0x0029, 0x0000, 0x0028, + 0x6709, 0x0029, 0x0000, 0x0028, 0x793e, 0x0029, 0x0000, 0x0028, + 0x540d, 0x0029, 0x0000, 0x0028, 0x7279, 0x0029, 0x0000, 0x0028, + 0x8ca1, 0x0029, 0x0000, 0x0028, 0x795d, 0x0029, 0x0000, 0x0028, + 0x52b4, 0x0029, 0x0000, 0x0028, 0x4ee3, 0x0029, 0x0000, 0x0028, + 0x547c, 0x0029, 0x0000, 0x0028, 0x5b66, 0x0029, 0x0000, 0x0028, + 0x76e3, 0x0029, 0x0000, 0x0028, 0x4f01, 0x0029, 0x0000, 0x0028, + 0x8cc7, 0x0029, 0x0000, 0x0028, 0x5354, 0x0029, 0x0000, 0x0028, + 0x796d, 0x0029, 0x0000, 0x0028, 0x4f11, 0x0029, 0x0000, 0x0028, + 0x81ea, 0x0029, 0x0000, 0x0028, 0x81f3, 0x0029, 0x0000, 0x554f, + 0x0000, 0x5e7c, 0x0000, 0x7b8f, 0x0000, 0x0050, 0x0054, 0x0045, + 0x0000, 0x0032, 0x0031, 0x0000, 0x0032, 0x0032, 0x0000, 0x0032, + 0x0033, 0x0000, 0x0032, 0x0034, 0x0000, 0x0032, 0x0035, 0x0000, + 0x0032, 0x0036, 0x0000, 0x0032, 0x0037, 0x0000, 0x0032, 0x0038, + 0x0000, 0x0032, 0x0039, 0x0000, 0x0033, 0x0030, 0x0000, 0x0033, + 0x0031, 0x0000, 0x0033, 0x0032, 0x0000, 0x0033, 0x0033, 0x0000, + 0x0033, 0x0034, 0x0000, 0x0033, 0x0035, 0x0000, 0x1100, 0x1161, + 0x0000, 0x1102, 0x1161, 0x0000, 0x1103, 0x1161, 0x0000, 0x1105, + 0x1161, 0x0000, 0x1106, 0x1161, 0x0000, 0x1107, 0x1161, 0x0000, + 0x1109, 0x1161, 0x0000, 0x110b, 0x1161, 0x0000, 0x110c, 0x1161, + 0x0000, 0x110e, 0x1161, 0x0000, 0x110f, 0x1161, 0x0000, 0x1110, + 0x1161, 0x0000, 0x1111, 0x1161, 0x0000, 0x1112, 0x1161, 0x0000, + 0x110e, 0x1161, 0x11b7, 0x1100, 0x1169, 0x0000, 0x110c, 0x116e, + 0x110b, 0x1174, 0x0000, 0x110b, 0x116e, 0x0000, 0x4e94, 0x0000, + 0x516d, 0x0000, 0x4e03, 0x0000, 0x4e5d, 0x0000, 0x682a, 0x0000, + 0x6709, 0x0000, 0x793e, 0x0000, 0x540d, 0x0000, 0x7279, 0x0000, + 0x8ca1, 0x0000, 0x795d, 0x0000, 0x52b4, 0x0000, 0x79d8, 0x0000, + 0x7537, 0x0000, 0x9069, 0x0000, 0x512a, 0x0000, 0x5370, 0x0000, + 0x6ce8, 0x0000, 0x9805, 0x0000, 0x4f11, 0x0000, 0x5199, 0x0000, + 0x6b63, 0x0000, 0x5de6, 0x0000, 0x53f3, 0x0000, 0x533b, 0x0000, + 0x5b97, 0x0000, 0x5b66, 0x0000, 0x76e3, 0x0000, 0x4f01, 0x0000, + 0x8cc7, 0x0000, 0x5354, 0x0000, 0x591c, 0x0000, 0x0033, 0x0036, + 0x0000, 0x0033, 0x0037, 0x0000, 0x0033, 0x0038, 0x0000, 0x0033, + 0x0039, 0x0000, 0x0034, 0x0030, 0x0000, 0x0034, 0x0031, 0x0000, + 0x0034, 0x0032, 0x0000, 0x0034, 0x0033, 0x0000, 0x0034, 0x0034, + 0x0000, 0x0034, 0x0035, 0x0000, 0x0034, 0x0036, 0x0000, 0x0034, + 0x0037, 0x0000, 0x0034, 0x0038, 0x0000, 0x0034, 0x0039, 0x0000, + 0x0035, 0x0030, 0x0000, 0x0031, 0x6708, 0x0000, 0x0032, 0x6708, + 0x0000, 0x0033, 0x6708, 0x0000, 0x0034, 0x6708, 0x0000, 0x0035, + 0x6708, 0x0000, 0x0036, 0x6708, 0x0000, 0x0037, 0x6708, 0x0000, + 0x0038, 0x6708, 0x0000, 0x0039, 0x6708, 0x0000, 0x0031, 0x0030, + 0x6708, 0x0000, 0x0031, 0x0031, 0x6708, 0x0000, 0x0031, 0x0032, + 0x6708, 0x0000, 0x0048, 0x0067, 0x0000, 0x0065, 0x0072, 0x0067, + 0x0000, 0x0065, 0x0056, 0x0000, 0x004c, 0x0054, 0x0044, 0x0000, + 0x30a2, 0x0000, 0x30a4, 0x0000, 0x30a6, 0x0000, 0x30a8, 0x0000, + 0x30aa, 0x0000, 0x30ab, 0x0000, 0x30ad, 0x0000, 0x30af, 0x0000, + 0x30b1, 0x0000, 0x30b3, 0x0000, 0x30b5, 0x0000, 0x30b7, 0x0000, + 0x30b9, 0x0000, 0x30bb, 0x0000, 0x30bd, 0x0000, 0x30bf, 0x0000, + 0x30c1, 0x0000, 0x30c4, 0x0000, 0x30c6, 0x0000, 0x30c8, 0x0000, + 0x30ca, 0x0000, 0x30cb, 0x0000, 0x30cc, 0x0000, 0x30cd, 0x0000, + 0x30ce, 0x0000, 0x30cf, 0x0000, 0x30d2, 0x0000, 0x30d5, 0x0000, + 0x30d8, 0x0000, 0x30db, 0x0000, 0x30de, 0x0000, 0x30df, 0x0000, + 0x30e0, 0x0000, 0x30e1, 0x0000, 0x30e2, 0x0000, 0x30e4, 0x0000, + 0x30e6, 0x0000, 0x30e8, 0x0000, 0x30e9, 0x0000, 0x30ea, 0x0000, + 0x30eb, 0x0000, 0x30ec, 0x0000, 0x30ed, 0x0000, 0x30ef, 0x0000, + 0x30f0, 0x0000, 0x30f1, 0x0000, 0x30f2, 0x0000, 0x30a2, 0x30d1, + 0x30fc, 0x30c8, 0x0000, 0x30a2, 0x30eb, 0x30d5, 0x30a1, 0x0000, + 0x30a2, 0x30f3, 0x30da, 0x30a2, 0x0000, 0x30a2, 0x30fc, 0x30eb, + 0x0000, 0x30a4, 0x30cb, 0x30f3, 0x30b0, 0x0000, 0x30a4, 0x30f3, + 0x30c1, 0x0000, 0x30a6, 0x30a9, 0x30f3, 0x0000, 0x30a8, 0x30b9, + 0x30af, 0x30fc, 0x30c9, 0x0000, 0x30a8, 0x30fc, 0x30ab, 0x30fc, + 0x0000, 0x30aa, 0x30f3, 0x30b9, 0x0000, 0x30aa, 0x30fc, 0x30e0, + 0x0000, 0x30ab, 0x30a4, 0x30ea, 0x0000, 0x30ab, 0x30e9, 0x30c3, + 0x30c8, 0x0000, 0x30ab, 0x30ed, 0x30ea, 0x30fc, 0x0000, 0x30ac, + 0x30ed, 0x30f3, 0x0000, 0x30ac, 0x30f3, 0x30de, 0x0000, 0x30ae, + 0x30ac, 0x0000, 0x30ae, 0x30cb, 0x30fc, 0x0000, 0x30ad, 0x30e5, + 0x30ea, 0x30fc, 0x0000, 0x30ae, 0x30eb, 0x30c0, 0x30fc, 0x0000, + 0x30ad, 0x30ed, 0x0000, 0x30ad, 0x30ed, 0x30b0, 0x30e9, 0x30e0, + 0x0000, 0x30ad, 0x30ed, 0x30e1, 0x30fc, 0x30c8, 0x30eb, 0x0000, + 0x30ad, 0x30ed, 0x30ef, 0x30c3, 0x30c8, 0x0000, 0x30b0, 0x30e9, + 0x30e0, 0x0000, 0x30b0, 0x30e9, 0x30e0, 0x30c8, 0x30f3, 0x0000, + 0x30af, 0x30eb, 0x30bc, 0x30a4, 0x30ed, 0x0000, 0x30af, 0x30ed, + 0x30fc, 0x30cd, 0x0000, 0x30b1, 0x30fc, 0x30b9, 0x0000, 0x30b3, + 0x30eb, 0x30ca, 0x0000, 0x30b3, 0x30fc, 0x30dd, 0x0000, 0x30b5, + 0x30a4, 0x30af, 0x30eb, 0x0000, 0x30b5, 0x30f3, 0x30c1, 0x30fc, + 0x30e0, 0x0000, 0x30b7, 0x30ea, 0x30f3, 0x30b0, 0x0000, 0x30bb, + 0x30f3, 0x30c1, 0x0000, 0x30bb, 0x30f3, 0x30c8, 0x0000, 0x30c0, + 0x30fc, 0x30b9, 0x0000, 0x30c7, 0x30b7, 0x0000, 0x30c9, 0x30eb, + 0x0000, 0x30c8, 0x30f3, 0x0000, 0x30ca, 0x30ce, 0x0000, 0x30ce, + 0x30c3, 0x30c8, 0x0000, 0x30cf, 0x30a4, 0x30c4, 0x0000, 0x30d1, + 0x30fc, 0x30bb, 0x30f3, 0x30c8, 0x0000, 0x30d1, 0x30fc, 0x30c4, + 0x0000, 0x30d0, 0x30fc, 0x30ec, 0x30eb, 0x0000, 0x30d4, 0x30a2, + 0x30b9, 0x30c8, 0x30eb, 0x0000, 0x30d4, 0x30af, 0x30eb, 0x0000, + 0x30d4, 0x30b3, 0x0000, 0x30d3, 0x30eb, 0x0000, 0x30d5, 0x30a1, + 0x30e9, 0x30c3, 0x30c9, 0x0000, 0x30d5, 0x30a3, 0x30fc, 0x30c8, + 0x0000, 0x30d6, 0x30c3, 0x30b7, 0x30a7, 0x30eb, 0x0000, 0x30d5, + 0x30e9, 0x30f3, 0x0000, 0x30d8, 0x30af, 0x30bf, 0x30fc, 0x30eb, + 0x0000, 0x30da, 0x30bd, 0x0000, 0x30da, 0x30cb, 0x30d2, 0x0000, + 0x30d8, 0x30eb, 0x30c4, 0x0000, 0x30da, 0x30f3, 0x30b9, 0x0000, + 0x30da, 0x30fc, 0x30b8, 0x0000, 0x30d9, 0x30fc, 0x30bf, 0x0000, + 0x30dd, 0x30a4, 0x30f3, 0x30c8, 0x0000, 0x30dc, 0x30eb, 0x30c8, + 0x0000, 0x30db, 0x30f3, 0x0000, 0x30dd, 0x30f3, 0x30c9, 0x0000, + 0x30db, 0x30fc, 0x30eb, 0x0000, 0x30db, 0x30fc, 0x30f3, 0x0000, + 0x30de, 0x30a4, 0x30af, 0x30ed, 0x0000, 0x30de, 0x30a4, 0x30eb, + 0x0000, 0x30de, 0x30c3, 0x30cf, 0x0000, 0x30de, 0x30eb, 0x30af, + 0x0000, 0x30de, 0x30f3, 0x30b7, 0x30e7, 0x30f3, 0x0000, 0x30df, + 0x30af, 0x30ed, 0x30f3, 0x0000, 0x30df, 0x30ea, 0x0000, 0x30df, + 0x30ea, 0x30d0, 0x30fc, 0x30eb, 0x0000, 0x30e1, 0x30ac, 0x0000, + 0x30e1, 0x30ac, 0x30c8, 0x30f3, 0x0000, 0x30e1, 0x30fc, 0x30c8, + 0x30eb, 0x0000, 0x30e4, 0x30fc, 0x30c9, 0x0000, 0x30e4, 0x30fc, + 0x30eb, 0x0000, 0x30e6, 0x30a2, 0x30f3, 0x0000, 0x30ea, 0x30c3, + 0x30c8, 0x30eb, 0x0000, 0x30ea, 0x30e9, 0x0000, 0x30eb, 0x30d4, + 0x30fc, 0x0000, 0x30eb, 0x30fc, 0x30d6, 0x30eb, 0x0000, 0x30ec, + 0x30e0, 0x0000, 0x30ec, 0x30f3, 0x30c8, 0x30b2, 0x30f3, 0x0000, + 0x30ef, 0x30c3, 0x30c8, 0x0000, 0x0030, 0x70b9, 0x0000, 0x0031, + 0x70b9, 0x0000, 0x0032, 0x70b9, 0x0000, 0x0033, 0x70b9, 0x0000, + 0x0034, 0x70b9, 0x0000, 0x0035, 0x70b9, 0x0000, 0x0036, 0x70b9, + 0x0000, 0x0037, 0x70b9, 0x0000, 0x0038, 0x70b9, 0x0000, 0x0039, + 0x70b9, 0x0000, 0x0031, 0x0030, 0x70b9, 0x0000, 0x0031, 0x0031, + 0x70b9, 0x0000, 0x0031, 0x0032, 0x70b9, 0x0000, 0x0031, 0x0033, + 0x70b9, 0x0000, 0x0031, 0x0034, 0x70b9, 0x0000, 0x0031, 0x0035, + 0x70b9, 0x0000, 0x0031, 0x0036, 0x70b9, 0x0000, 0x0031, 0x0037, + 0x70b9, 0x0000, 0x0031, 0x0038, 0x70b9, 0x0000, 0x0031, 0x0039, + 0x70b9, 0x0000, 0x0032, 0x0030, 0x70b9, 0x0000, 0x0032, 0x0031, + 0x70b9, 0x0000, 0x0032, 0x0032, 0x70b9, 0x0000, 0x0032, 0x0033, + 0x70b9, 0x0000, 0x0032, 0x0034, 0x70b9, 0x0000, 0x0068, 0x0050, + 0x0061, 0x0000, 0x0064, 0x0061, 0x0000, 0x0041, 0x0055, 0x0000, + 0x0062, 0x0061, 0x0072, 0x0000, 0x006f, 0x0056, 0x0000, 0x0070, + 0x0063, 0x0000, 0x0064, 0x006d, 0x0000, 0x0064, 0x006d, 0x00b2, + 0x0000, 0x0064, 0x006d, 0x00b3, 0x0000, 0x0049, 0x0055, 0x0000, + 0x5e73, 0x6210, 0x0000, 0x662d, 0x548c, 0x0000, 0x5927, 0x6b63, + 0x0000, 0x660e, 0x6cbb, 0x0000, 0x682a, 0x5f0f, 0x4f1a, 0x793e, + 0x0000, 0x0070, 0x0041, 0x0000, 0x006e, 0x0041, 0x0000, 0x03bc, + 0x0041, 0x0000, 0x006d, 0x0041, 0x0000, 0x006b, 0x0041, 0x0000, + 0x004b, 0x0042, 0x0000, 0x004d, 0x0042, 0x0000, 0x0047, 0x0042, + 0x0000, 0x0063, 0x0061, 0x006c, 0x0000, 0x006b, 0x0063, 0x0061, + 0x006c, 0x0000, 0x0070, 0x0046, 0x0000, 0x006e, 0x0046, 0x0000, + 0x03bc, 0x0046, 0x0000, 0x03bc, 0x0067, 0x0000, 0x006d, 0x0067, + 0x0000, 0x006b, 0x0067, 0x0000, 0x0048, 0x007a, 0x0000, 0x006b, + 0x0048, 0x007a, 0x0000, 0x004d, 0x0048, 0x007a, 0x0000, 0x0047, + 0x0048, 0x007a, 0x0000, 0x0054, 0x0048, 0x007a, 0x0000, 0x03bc, + 0x2113, 0x0000, 0x006d, 0x2113, 0x0000, 0x0064, 0x2113, 0x0000, + 0x006b, 0x2113, 0x0000, 0x0066, 0x006d, 0x0000, 0x006e, 0x006d, + 0x0000, 0x03bc, 0x006d, 0x0000, 0x006d, 0x006d, 0x0000, 0x0063, + 0x006d, 0x0000, 0x006b, 0x006d, 0x0000, 0x006d, 0x006d, 0x00b2, + 0x0000, 0x0063, 0x006d, 0x00b2, 0x0000, 0x006d, 0x00b2, 0x0000, + 0x006b, 0x006d, 0x00b2, 0x0000, 0x006d, 0x006d, 0x00b3, 0x0000, + 0x0063, 0x006d, 0x00b3, 0x0000, 0x006d, 0x00b3, 0x0000, 0x006b, + 0x006d, 0x00b3, 0x0000, 0x006d, 0x2215, 0x0073, 0x0000, 0x006d, + 0x2215, 0x0073, 0x00b2, 0x0000, 0x0050, 0x0061, 0x0000, 0x006b, + 0x0050, 0x0061, 0x0000, 0x004d, 0x0050, 0x0061, 0x0000, 0x0047, + 0x0050, 0x0061, 0x0000, 0x0072, 0x0061, 0x0064, 0x0000, 0x0072, + 0x0061, 0x0064, 0x2215, 0x0073, 0x0000, 0x0072, 0x0061, 0x0064, + 0x2215, 0x0073, 0x00b2, 0x0000, 0x0070, 0x0073, 0x0000, 0x006e, + 0x0073, 0x0000, 0x03bc, 0x0073, 0x0000, 0x006d, 0x0073, 0x0000, + 0x0070, 0x0056, 0x0000, 0x006e, 0x0056, 0x0000, 0x03bc, 0x0056, + 0x0000, 0x006d, 0x0056, 0x0000, 0x006b, 0x0056, 0x0000, 0x004d, + 0x0056, 0x0000, 0x0070, 0x0057, 0x0000, 0x006e, 0x0057, 0x0000, + 0x03bc, 0x0057, 0x0000, 0x006d, 0x0057, 0x0000, 0x006b, 0x0057, + 0x0000, 0x004d, 0x0057, 0x0000, 0x006b, 0x03a9, 0x0000, 0x004d, + 0x03a9, 0x0000, 0x0061, 0x002e, 0x006d, 0x002e, 0x0000, 0x0042, + 0x0071, 0x0000, 0x0063, 0x0063, 0x0000, 0x0063, 0x0064, 0x0000, + 0x0043, 0x2215, 0x006b, 0x0067, 0x0000, 0x0043, 0x006f, 0x002e, + 0x0000, 0x0064, 0x0042, 0x0000, 0x0047, 0x0079, 0x0000, 0x0068, + 0x0061, 0x0000, 0x0048, 0x0050, 0x0000, 0x0069, 0x006e, 0x0000, + 0x004b, 0x004b, 0x0000, 0x004b, 0x004d, 0x0000, 0x006b, 0x0074, + 0x0000, 0x006c, 0x006d, 0x0000, 0x006c, 0x006e, 0x0000, 0x006c, + 0x006f, 0x0067, 0x0000, 0x006c, 0x0078, 0x0000, 0x006d, 0x0062, + 0x0000, 0x006d, 0x0069, 0x006c, 0x0000, 0x006d, 0x006f, 0x006c, + 0x0000, 0x0050, 0x0048, 0x0000, 0x0070, 0x002e, 0x006d, 0x002e, + 0x0000, 0x0050, 0x0050, 0x004d, 0x0000, 0x0050, 0x0052, 0x0000, + 0x0073, 0x0072, 0x0000, 0x0053, 0x0076, 0x0000, 0x0057, 0x0062, + 0x0000, 0x0056, 0x2215, 0x006d, 0x0000, 0x0041, 0x2215, 0x006d, + 0x0000, 0x0031, 0x65e5, 0x0000, 0x0032, 0x65e5, 0x0000, 0x0033, + 0x65e5, 0x0000, 0x0034, 0x65e5, 0x0000, 0x0035, 0x65e5, 0x0000, + 0x0036, 0x65e5, 0x0000, 0x0037, 0x65e5, 0x0000, 0x0038, 0x65e5, + 0x0000, 0x0039, 0x65e5, 0x0000, 0x0031, 0x0030, 0x65e5, 0x0000, + 0x0031, 0x0031, 0x65e5, 0x0000, 0x0031, 0x0032, 0x65e5, 0x0000, + 0x0031, 0x0033, 0x65e5, 0x0000, 0x0031, 0x0034, 0x65e5, 0x0000, + 0x0031, 0x0035, 0x65e5, 0x0000, 0x0031, 0x0036, 0x65e5, 0x0000, + 0x0031, 0x0037, 0x65e5, 0x0000, 0x0031, 0x0038, 0x65e5, 0x0000, + 0x0031, 0x0039, 0x65e5, 0x0000, 0x0032, 0x0030, 0x65e5, 0x0000, + 0x0032, 0x0031, 0x65e5, 0x0000, 0x0032, 0x0032, 0x65e5, 0x0000, + 0x0032, 0x0033, 0x65e5, 0x0000, 0x0032, 0x0034, 0x65e5, 0x0000, + 0x0032, 0x0035, 0x65e5, 0x0000, 0x0032, 0x0036, 0x65e5, 0x0000, + 0x0032, 0x0037, 0x65e5, 0x0000, 0x0032, 0x0038, 0x65e5, 0x0000, + 0x0032, 0x0039, 0x65e5, 0x0000, 0x0033, 0x0030, 0x65e5, 0x0000, + 0x0033, 0x0031, 0x65e5, 0x0000, 0x0067, 0x0061, 0x006c, 0x0000, + 0x044a, 0x0000, 0x044c, 0x0000, 0xa76f, 0x0000, 0x0126, 0x0000, + 0x0153, 0x0000, 0xa727, 0x0000, 0xab37, 0x0000, 0x026b, 0x0000, + 0xab52, 0x0000, 0x8c48, 0x0000, 0x66f4, 0x0000, 0x8cc8, 0x0000, + 0x6ed1, 0x0000, 0x4e32, 0x0000, 0x53e5, 0x0000, 0x5951, 0x0000, + 0x5587, 0x0000, 0x5948, 0x0000, 0x61f6, 0x0000, 0x7669, 0x0000, + 0x7f85, 0x0000, 0x863f, 0x0000, 0x87ba, 0x0000, 0x88f8, 0x0000, + 0x908f, 0x0000, 0x6a02, 0x0000, 0x6d1b, 0x0000, 0x70d9, 0x0000, + 0x73de, 0x0000, 0x843d, 0x0000, 0x916a, 0x0000, 0x99f1, 0x0000, + 0x4e82, 0x0000, 0x5375, 0x0000, 0x6b04, 0x0000, 0x721b, 0x0000, + 0x862d, 0x0000, 0x9e1e, 0x0000, 0x5d50, 0x0000, 0x6feb, 0x0000, + 0x85cd, 0x0000, 0x8964, 0x0000, 0x62c9, 0x0000, 0x81d8, 0x0000, + 0x881f, 0x0000, 0x5eca, 0x0000, 0x6717, 0x0000, 0x6d6a, 0x0000, + 0x72fc, 0x0000, 0x90ce, 0x0000, 0x4f86, 0x0000, 0x51b7, 0x0000, + 0x52de, 0x0000, 0x64c4, 0x0000, 0x6ad3, 0x0000, 0x7210, 0x0000, + 0x76e7, 0x0000, 0x8606, 0x0000, 0x865c, 0x0000, 0x8def, 0x0000, + 0x9732, 0x0000, 0x9b6f, 0x0000, 0x9dfa, 0x0000, 0x788c, 0x0000, + 0x797f, 0x0000, 0x7da0, 0x0000, 0x83c9, 0x0000, 0x9304, 0x0000, + 0x8ad6, 0x0000, 0x58df, 0x0000, 0x5f04, 0x0000, 0x7c60, 0x0000, + 0x807e, 0x0000, 0x7262, 0x0000, 0x78ca, 0x0000, 0x8cc2, 0x0000, + 0x96f7, 0x0000, 0x58d8, 0x0000, 0x5c62, 0x0000, 0x6a13, 0x0000, + 0x6dda, 0x0000, 0x6f0f, 0x0000, 0x7d2f, 0x0000, 0x7e37, 0x0000, + 0x964b, 0x0000, 0x52d2, 0x0000, 0x808b, 0x0000, 0x51dc, 0x0000, + 0x51cc, 0x0000, 0x7a1c, 0x0000, 0x7dbe, 0x0000, 0x83f1, 0x0000, + 0x9675, 0x0000, 0x8b80, 0x0000, 0x62cf, 0x0000, 0x8afe, 0x0000, + 0x4e39, 0x0000, 0x5be7, 0x0000, 0x6012, 0x0000, 0x7387, 0x0000, + 0x7570, 0x0000, 0x5317, 0x0000, 0x78fb, 0x0000, 0x4fbf, 0x0000, + 0x5fa9, 0x0000, 0x4e0d, 0x0000, 0x6ccc, 0x0000, 0x6578, 0x0000, + 0x7d22, 0x0000, 0x53c3, 0x0000, 0x585e, 0x0000, 0x7701, 0x0000, + 0x8449, 0x0000, 0x8aaa, 0x0000, 0x6bba, 0x0000, 0x6c88, 0x0000, + 0x62fe, 0x0000, 0x82e5, 0x0000, 0x63a0, 0x0000, 0x7565, 0x0000, + 0x4eae, 0x0000, 0x5169, 0x0000, 0x51c9, 0x0000, 0x6881, 0x0000, + 0x7ce7, 0x0000, 0x826f, 0x0000, 0x8ad2, 0x0000, 0x91cf, 0x0000, + 0x52f5, 0x0000, 0x5442, 0x0000, 0x5eec, 0x0000, 0x65c5, 0x0000, + 0x6ffe, 0x0000, 0x792a, 0x0000, 0x95ad, 0x0000, 0x9a6a, 0x0000, + 0x9e97, 0x0000, 0x9ece, 0x0000, 0x66c6, 0x0000, 0x6b77, 0x0000, + 0x8f62, 0x0000, 0x5e74, 0x0000, 0x6190, 0x0000, 0x6200, 0x0000, + 0x649a, 0x0000, 0x6f23, 0x0000, 0x7149, 0x0000, 0x7489, 0x0000, + 0x79ca, 0x0000, 0x7df4, 0x0000, 0x806f, 0x0000, 0x8f26, 0x0000, + 0x84ee, 0x0000, 0x9023, 0x0000, 0x934a, 0x0000, 0x5217, 0x0000, + 0x52a3, 0x0000, 0x54bd, 0x0000, 0x70c8, 0x0000, 0x88c2, 0x0000, + 0x5ec9, 0x0000, 0x5ff5, 0x0000, 0x637b, 0x0000, 0x6bae, 0x0000, + 0x7c3e, 0x0000, 0x7375, 0x0000, 0x4ee4, 0x0000, 0x56f9, 0x0000, + 0x5dba, 0x0000, 0x601c, 0x0000, 0x73b2, 0x0000, 0x7469, 0x0000, + 0x7f9a, 0x0000, 0x8046, 0x0000, 0x9234, 0x0000, 0x96f6, 0x0000, + 0x9748, 0x0000, 0x9818, 0x0000, 0x4f8b, 0x0000, 0x79ae, 0x0000, + 0x91b4, 0x0000, 0x96b8, 0x0000, 0x60e1, 0x0000, 0x4e86, 0x0000, + 0x50da, 0x0000, 0x5bee, 0x0000, 0x5c3f, 0x0000, 0x6599, 0x0000, + 0x71ce, 0x0000, 0x7642, 0x0000, 0x84fc, 0x0000, 0x907c, 0x0000, + 0x6688, 0x0000, 0x962e, 0x0000, 0x5289, 0x0000, 0x677b, 0x0000, + 0x67f3, 0x0000, 0x6d41, 0x0000, 0x6e9c, 0x0000, 0x7409, 0x0000, + 0x7559, 0x0000, 0x786b, 0x0000, 0x7d10, 0x0000, 0x985e, 0x0000, + 0x622e, 0x0000, 0x9678, 0x0000, 0x502b, 0x0000, 0x5d19, 0x0000, + 0x6dea, 0x0000, 0x8f2a, 0x0000, 0x5f8b, 0x0000, 0x6144, 0x0000, + 0x6817, 0x0000, 0x9686, 0x0000, 0x5229, 0x0000, 0x540f, 0x0000, + 0x5c65, 0x0000, 0x6613, 0x0000, 0x674e, 0x0000, 0x68a8, 0x0000, + 0x6ce5, 0x0000, 0x7406, 0x0000, 0x75e2, 0x0000, 0x7f79, 0x0000, + 0x88cf, 0x0000, 0x88e1, 0x0000, 0x96e2, 0x0000, 0x533f, 0x0000, + 0x6eba, 0x0000, 0x541d, 0x0000, 0x71d0, 0x0000, 0x7498, 0x0000, + 0x85fa, 0x0000, 0x96a3, 0x0000, 0x9c57, 0x0000, 0x9e9f, 0x0000, + 0x6797, 0x0000, 0x6dcb, 0x0000, 0x81e8, 0x0000, 0x7b20, 0x0000, + 0x7c92, 0x0000, 0x72c0, 0x0000, 0x7099, 0x0000, 0x8b58, 0x0000, + 0x4ec0, 0x0000, 0x8336, 0x0000, 0x523a, 0x0000, 0x5207, 0x0000, + 0x5ea6, 0x0000, 0x62d3, 0x0000, 0x7cd6, 0x0000, 0x5b85, 0x0000, + 0x6d1e, 0x0000, 0x66b4, 0x0000, 0x8f3b, 0x0000, 0x964d, 0x0000, + 0x5ed3, 0x0000, 0x5140, 0x0000, 0x55c0, 0x0000, 0x585a, 0x0000, + 0x6674, 0x0000, 0x51de, 0x0000, 0x732a, 0x0000, 0x76ca, 0x0000, + 0x793c, 0x0000, 0x795e, 0x0000, 0x7965, 0x0000, 0x798f, 0x0000, + 0x9756, 0x0000, 0x7cbe, 0x0000, 0x8612, 0x0000, 0x8af8, 0x0000, + 0x9038, 0x0000, 0x90fd, 0x0000, 0x98ef, 0x0000, 0x98fc, 0x0000, + 0x9928, 0x0000, 0x9db4, 0x0000, 0x90de, 0x0000, 0x96b7, 0x0000, + 0x4fae, 0x0000, 0x50e7, 0x0000, 0x514d, 0x0000, 0x52c9, 0x0000, + 0x52e4, 0x0000, 0x5351, 0x0000, 0x559d, 0x0000, 0x5606, 0x0000, + 0x5668, 0x0000, 0x5840, 0x0000, 0x58a8, 0x0000, 0x5c64, 0x0000, + 0x6094, 0x0000, 0x6168, 0x0000, 0x618e, 0x0000, 0x61f2, 0x0000, + 0x654f, 0x0000, 0x65e2, 0x0000, 0x6691, 0x0000, 0x6885, 0x0000, + 0x6d77, 0x0000, 0x6e1a, 0x0000, 0x6f22, 0x0000, 0x716e, 0x0000, + 0x722b, 0x0000, 0x7422, 0x0000, 0x7891, 0x0000, 0x7949, 0x0000, + 0x7948, 0x0000, 0x7950, 0x0000, 0x7956, 0x0000, 0x798d, 0x0000, + 0x798e, 0x0000, 0x7a40, 0x0000, 0x7a81, 0x0000, 0x7bc0, 0x0000, + 0x7e09, 0x0000, 0x7e41, 0x0000, 0x7f72, 0x0000, 0x8005, 0x0000, + 0x81ed, 0x0000, 0x8279, 0x0000, 0x8457, 0x0000, 0x8910, 0x0000, + 0x8996, 0x0000, 0x8b01, 0x0000, 0x8b39, 0x0000, 0x8cd3, 0x0000, + 0x8d08, 0x0000, 0x8fb6, 0x0000, 0x96e3, 0x0000, 0x97ff, 0x0000, + 0x983b, 0x0000, 0x6075, 0x0000, 0x0000, 0x8218, 0x0000, 0x4e26, + 0x0000, 0x51b5, 0x0000, 0x5168, 0x0000, 0x4f80, 0x0000, 0x5145, + 0x0000, 0x5180, 0x0000, 0x52c7, 0x0000, 0x52fa, 0x0000, 0x5555, + 0x0000, 0x5599, 0x0000, 0x55e2, 0x0000, 0x58b3, 0x0000, 0x5944, + 0x0000, 0x5954, 0x0000, 0x5a62, 0x0000, 0x5b28, 0x0000, 0x5ed2, + 0x0000, 0x5ed9, 0x0000, 0x5f69, 0x0000, 0x5fad, 0x0000, 0x60d8, + 0x0000, 0x614e, 0x0000, 0x6108, 0x0000, 0x6160, 0x0000, 0x6234, + 0x0000, 0x63c4, 0x0000, 0x641c, 0x0000, 0x6452, 0x0000, 0x6556, + 0x0000, 0x671b, 0x0000, 0x6756, 0x0000, 0x6edb, 0x0000, 0x6ecb, + 0x0000, 0x701e, 0x0000, 0x77a7, 0x0000, 0x7235, 0x0000, 0x72af, + 0x0000, 0x7471, 0x0000, 0x7506, 0x0000, 0x753b, 0x0000, 0x761d, + 0x0000, 0x761f, 0x0000, 0x76db, 0x0000, 0x76f4, 0x0000, 0x774a, + 0x0000, 0x7740, 0x0000, 0x78cc, 0x0000, 0x7ab1, 0x0000, 0x7c7b, + 0x0000, 0x7d5b, 0x0000, 0x7f3e, 0x0000, 0x8352, 0x0000, 0x83ef, + 0x0000, 0x8779, 0x0000, 0x8941, 0x0000, 0x8986, 0x0000, 0x8abf, + 0x0000, 0x8acb, 0x0000, 0x8aed, 0x0000, 0x8b8a, 0x0000, 0x8f38, + 0x0000, 0x9072, 0x0000, 0x9199, 0x0000, 0x9276, 0x0000, 0x967c, + 0x0000, 0x97db, 0x0000, 0x980b, 0x0000, 0x9b12, 0x0000, 0x3b9d, + 0x0000, 0x4018, 0x0000, 0x4039, 0x0000, 0x9f43, 0x0000, 0x9f8e, + 0x0000, 0x0066, 0x0066, 0x0000, 0x0066, 0x0069, 0x0000, 0x0066, + 0x006c, 0x0000, 0x0066, 0x0066, 0x0069, 0x0000, 0x0066, 0x0066, + 0x006c, 0x0000, 0x017f, 0x0074, 0x0000, 0x0073, 0x0074, 0x0000, + 0x0574, 0x0576, 0x0000, 0x0574, 0x0565, 0x0000, 0x0574, 0x056b, + 0x0000, 0x057e, 0x0576, 0x0000, 0x0574, 0x056d, 0x0000, 0x05d9, + 0x05b4, 0x0000, 0x05f2, 0x05b7, 0x0000, 0x05e2, 0x0000, 0x05d4, + 0x0000, 0x05db, 0x0000, 0x05dc, 0x0000, 0x05dd, 0x0000, 0x05e8, + 0x0000, 0x05ea, 0x0000, 0x05e9, 0x05c1, 0x0000, 0x05e9, 0x05c2, + 0x0000, 0xfb49, 0x05c1, 0x0000, 0xfb49, 0x05c2, 0x0000, 0x05d0, + 0x05b7, 0x0000, 0x05d0, 0x05b8, 0x0000, 0x05d0, 0x05bc, 0x0000, + 0x05d1, 0x05bc, 0x0000, 0x05d2, 0x05bc, 0x0000, 0x05d3, 0x05bc, + 0x0000, 0x05d4, 0x05bc, 0x0000, 0x05d5, 0x05bc, 0x0000, 0x05d6, + 0x05bc, 0x0000, 0x05d8, 0x05bc, 0x0000, 0x05d9, 0x05bc, 0x0000, + 0x05da, 0x05bc, 0x0000, 0x05db, 0x05bc, 0x0000, 0x05dc, 0x05bc, + 0x0000, 0x05de, 0x05bc, 0x0000, 0x05e0, 0x05bc, 0x0000, 0x05e1, + 0x05bc, 0x0000, 0x05e3, 0x05bc, 0x0000, 0x05e4, 0x05bc, 0x0000, + 0x05e6, 0x05bc, 0x0000, 0x05e7, 0x05bc, 0x0000, 0x05e8, 0x05bc, + 0x0000, 0x05e9, 0x05bc, 0x0000, 0x05ea, 0x05bc, 0x0000, 0x05d5, + 0x05b9, 0x0000, 0x05d1, 0x05bf, 0x0000, 0x05db, 0x05bf, 0x0000, + 0x05e4, 0x05bf, 0x0000, 0x05d0, 0x05dc, 0x0000, 0x0671, 0x0000, + 0x067b, 0x0000, 0x067e, 0x0000, 0x0680, 0x0000, 0x067a, 0x0000, + 0x067f, 0x0000, 0x0679, 0x0000, 0x06a4, 0x0000, 0x06a6, 0x0000, + 0x0684, 0x0000, 0x0683, 0x0000, 0x0686, 0x0000, 0x0687, 0x0000, + 0x068d, 0x0000, 0x068c, 0x0000, 0x068e, 0x0000, 0x0688, 0x0000, + 0x0698, 0x0000, 0x0691, 0x0000, 0x06a9, 0x0000, 0x06af, 0x0000, + 0x06b3, 0x0000, 0x06b1, 0x0000, 0x06ba, 0x0000, 0x06bb, 0x0000, + 0x06c0, 0x0000, 0x06c1, 0x0000, 0x06be, 0x0000, 0x06d2, 0x0000, + 0x06d3, 0x0000, 0x06ad, 0x0000, 0x06c7, 0x0000, 0x06c6, 0x0000, + 0x06c8, 0x0000, 0x0677, 0x0000, 0x06cb, 0x0000, 0x06c5, 0x0000, + 0x06c9, 0x0000, 0x06d0, 0x0000, 0x0649, 0x0000, 0x0626, 0x0627, + 0x0000, 0x0626, 0x06d5, 0x0000, 0x0626, 0x0648, 0x0000, 0x0626, + 0x06c7, 0x0000, 0x0626, 0x06c6, 0x0000, 0x0626, 0x06c8, 0x0000, + 0x0626, 0x06d0, 0x0000, 0x0626, 0x0649, 0x0000, 0x06cc, 0x0000, + 0x0626, 0x062c, 0x0000, 0x0626, 0x062d, 0x0000, 0x0626, 0x0645, + 0x0000, 0x0626, 0x064a, 0x0000, 0x0628, 0x062c, 0x0000, 0x0628, + 0x062d, 0x0000, 0x0628, 0x062e, 0x0000, 0x0628, 0x0645, 0x0000, + 0x0628, 0x0649, 0x0000, 0x0628, 0x064a, 0x0000, 0x062a, 0x062c, + 0x0000, 0x062a, 0x062d, 0x0000, 0x062a, 0x062e, 0x0000, 0x062a, + 0x0645, 0x0000, 0x062a, 0x0649, 0x0000, 0x062a, 0x064a, 0x0000, + 0x062b, 0x062c, 0x0000, 0x062b, 0x0645, 0x0000, 0x062b, 0x0649, + 0x0000, 0x062b, 0x064a, 0x0000, 0x062c, 0x062d, 0x0000, 0x062c, + 0x0645, 0x0000, 0x062d, 0x062c, 0x0000, 0x062d, 0x0645, 0x0000, + 0x062e, 0x062c, 0x0000, 0x062e, 0x062d, 0x0000, 0x062e, 0x0645, + 0x0000, 0x0633, 0x062c, 0x0000, 0x0633, 0x062d, 0x0000, 0x0633, + 0x062e, 0x0000, 0x0633, 0x0645, 0x0000, 0x0635, 0x062d, 0x0000, + 0x0635, 0x0645, 0x0000, 0x0636, 0x062c, 0x0000, 0x0636, 0x062d, + 0x0000, 0x0636, 0x062e, 0x0000, 0x0636, 0x0645, 0x0000, 0x0637, + 0x062d, 0x0000, 0x0637, 0x0645, 0x0000, 0x0638, 0x0645, 0x0000, + 0x0639, 0x062c, 0x0000, 0x0639, 0x0645, 0x0000, 0x063a, 0x062c, + 0x0000, 0x063a, 0x0645, 0x0000, 0x0641, 0x062c, 0x0000, 0x0641, + 0x062d, 0x0000, 0x0641, 0x062e, 0x0000, 0x0641, 0x0645, 0x0000, + 0x0641, 0x0649, 0x0000, 0x0641, 0x064a, 0x0000, 0x0642, 0x062d, + 0x0000, 0x0642, 0x0645, 0x0000, 0x0642, 0x0649, 0x0000, 0x0642, + 0x064a, 0x0000, 0x0643, 0x0627, 0x0000, 0x0643, 0x062c, 0x0000, + 0x0643, 0x062d, 0x0000, 0x0643, 0x062e, 0x0000, 0x0643, 0x0644, + 0x0000, 0x0643, 0x0645, 0x0000, 0x0643, 0x0649, 0x0000, 0x0643, + 0x064a, 0x0000, 0x0644, 0x062c, 0x0000, 0x0644, 0x062d, 0x0000, + 0x0644, 0x062e, 0x0000, 0x0644, 0x0645, 0x0000, 0x0644, 0x0649, + 0x0000, 0x0644, 0x064a, 0x0000, 0x0645, 0x062c, 0x0000, 0x0645, + 0x062d, 0x0000, 0x0645, 0x062e, 0x0000, 0x0645, 0x0645, 0x0000, + 0x0645, 0x0649, 0x0000, 0x0645, 0x064a, 0x0000, 0x0646, 0x062c, + 0x0000, 0x0646, 0x062d, 0x0000, 0x0646, 0x062e, 0x0000, 0x0646, + 0x0645, 0x0000, 0x0646, 0x0649, 0x0000, 0x0646, 0x064a, 0x0000, + 0x0647, 0x062c, 0x0000, 0x0647, 0x0645, 0x0000, 0x0647, 0x0649, + 0x0000, 0x0647, 0x064a, 0x0000, 0x064a, 0x062c, 0x0000, 0x064a, + 0x062d, 0x0000, 0x064a, 0x062e, 0x0000, 0x064a, 0x0645, 0x0000, + 0x064a, 0x0649, 0x0000, 0x064a, 0x064a, 0x0000, 0x0630, 0x0670, + 0x0000, 0x0631, 0x0670, 0x0000, 0x0649, 0x0670, 0x0000, 0x0020, + 0x064c, 0x0651, 0x0000, 0x0020, 0x064d, 0x0651, 0x0000, 0x0020, + 0x064e, 0x0651, 0x0000, 0x0020, 0x064f, 0x0651, 0x0000, 0x0020, + 0x0650, 0x0651, 0x0000, 0x0020, 0x0651, 0x0670, 0x0000, 0x0626, + 0x0631, 0x0000, 0x0626, 0x0632, 0x0000, 0x0626, 0x0646, 0x0000, + 0x0628, 0x0631, 0x0000, 0x0628, 0x0632, 0x0000, 0x0628, 0x0646, + 0x0000, 0x062a, 0x0631, 0x0000, 0x062a, 0x0632, 0x0000, 0x062a, + 0x0646, 0x0000, 0x062b, 0x0631, 0x0000, 0x062b, 0x0632, 0x0000, + 0x062b, 0x0646, 0x0000, 0x0645, 0x0627, 0x0000, 0x0646, 0x0631, + 0x0000, 0x0646, 0x0632, 0x0000, 0x0646, 0x0646, 0x0000, 0x064a, + 0x0631, 0x0000, 0x064a, 0x0632, 0x0000, 0x064a, 0x0646, 0x0000, + 0x0626, 0x062e, 0x0000, 0x0626, 0x0647, 0x0000, 0x0628, 0x0647, + 0x0000, 0x062a, 0x0647, 0x0000, 0x0635, 0x062e, 0x0000, 0x0644, + 0x0647, 0x0000, 0x0646, 0x0647, 0x0000, 0x0647, 0x0670, 0x0000, + 0x064a, 0x0647, 0x0000, 0x062b, 0x0647, 0x0000, 0x0633, 0x0647, + 0x0000, 0x0634, 0x0645, 0x0000, 0x0634, 0x0647, 0x0000, 0x0640, + 0x064e, 0x0651, 0x0000, 0x0640, 0x064f, 0x0651, 0x0000, 0x0640, + 0x0650, 0x0651, 0x0000, 0x0637, 0x0649, 0x0000, 0x0637, 0x064a, + 0x0000, 0x0639, 0x0649, 0x0000, 0x0639, 0x064a, 0x0000, 0x063a, + 0x0649, 0x0000, 0x063a, 0x064a, 0x0000, 0x0633, 0x0649, 0x0000, + 0x0633, 0x064a, 0x0000, 0x0634, 0x0649, 0x0000, 0x0634, 0x064a, + 0x0000, 0x062d, 0x0649, 0x0000, 0x062d, 0x064a, 0x0000, 0x062c, + 0x0649, 0x0000, 0x062c, 0x064a, 0x0000, 0x062e, 0x0649, 0x0000, + 0x062e, 0x064a, 0x0000, 0x0635, 0x0649, 0x0000, 0x0635, 0x064a, + 0x0000, 0x0636, 0x0649, 0x0000, 0x0636, 0x064a, 0x0000, 0x0634, + 0x062c, 0x0000, 0x0634, 0x062d, 0x0000, 0x0634, 0x062e, 0x0000, + 0x0634, 0x0631, 0x0000, 0x0633, 0x0631, 0x0000, 0x0635, 0x0631, + 0x0000, 0x0636, 0x0631, 0x0000, 0x0627, 0x064b, 0x0000, 0x062a, + 0x062c, 0x0645, 0x0000, 0x062a, 0x062d, 0x062c, 0x0000, 0x062a, + 0x062d, 0x0645, 0x0000, 0x062a, 0x062e, 0x0645, 0x0000, 0x062a, + 0x0645, 0x062c, 0x0000, 0x062a, 0x0645, 0x062d, 0x0000, 0x062a, + 0x0645, 0x062e, 0x0000, 0x062c, 0x0645, 0x062d, 0x0000, 0x062d, + 0x0645, 0x064a, 0x0000, 0x062d, 0x0645, 0x0649, 0x0000, 0x0633, + 0x062d, 0x062c, 0x0000, 0x0633, 0x062c, 0x062d, 0x0000, 0x0633, + 0x062c, 0x0649, 0x0000, 0x0633, 0x0645, 0x062d, 0x0000, 0x0633, + 0x0645, 0x062c, 0x0000, 0x0633, 0x0645, 0x0645, 0x0000, 0x0635, + 0x062d, 0x062d, 0x0000, 0x0635, 0x0645, 0x0645, 0x0000, 0x0634, + 0x062d, 0x0645, 0x0000, 0x0634, 0x062c, 0x064a, 0x0000, 0x0634, + 0x0645, 0x062e, 0x0000, 0x0634, 0x0645, 0x0645, 0x0000, 0x0636, + 0x062d, 0x0649, 0x0000, 0x0636, 0x062e, 0x0645, 0x0000, 0x0637, + 0x0645, 0x062d, 0x0000, 0x0637, 0x0645, 0x0645, 0x0000, 0x0637, + 0x0645, 0x064a, 0x0000, 0x0639, 0x062c, 0x0645, 0x0000, 0x0639, + 0x0645, 0x0645, 0x0000, 0x0639, 0x0645, 0x0649, 0x0000, 0x063a, + 0x0645, 0x0645, 0x0000, 0x063a, 0x0645, 0x064a, 0x0000, 0x063a, + 0x0645, 0x0649, 0x0000, 0x0641, 0x062e, 0x0645, 0x0000, 0x0642, + 0x0645, 0x062d, 0x0000, 0x0642, 0x0645, 0x0645, 0x0000, 0x0644, + 0x062d, 0x0645, 0x0000, 0x0644, 0x062d, 0x064a, 0x0000, 0x0644, + 0x062d, 0x0649, 0x0000, 0x0644, 0x062c, 0x062c, 0x0000, 0x0644, + 0x062e, 0x0645, 0x0000, 0x0644, 0x0645, 0x062d, 0x0000, 0x0645, + 0x062d, 0x062c, 0x0000, 0x0645, 0x062d, 0x0645, 0x0000, 0x0645, + 0x062d, 0x064a, 0x0000, 0x0645, 0x062c, 0x062d, 0x0000, 0x0645, + 0x062c, 0x0645, 0x0000, 0x0645, 0x062e, 0x062c, 0x0000, 0x0645, + 0x062e, 0x0645, 0x0000, 0x0645, 0x062c, 0x062e, 0x0000, 0x0647, + 0x0645, 0x062c, 0x0000, 0x0647, 0x0645, 0x0645, 0x0000, 0x0646, + 0x062d, 0x0645, 0x0000, 0x0646, 0x062d, 0x0649, 0x0000, 0x0646, + 0x062c, 0x0645, 0x0000, 0x0646, 0x062c, 0x0649, 0x0000, 0x0646, + 0x0645, 0x064a, 0x0000, 0x0646, 0x0645, 0x0649, 0x0000, 0x064a, + 0x0645, 0x0645, 0x0000, 0x0628, 0x062e, 0x064a, 0x0000, 0x062a, + 0x062c, 0x064a, 0x0000, 0x062a, 0x062c, 0x0649, 0x0000, 0x062a, + 0x062e, 0x064a, 0x0000, 0x062a, 0x062e, 0x0649, 0x0000, 0x062a, + 0x0645, 0x064a, 0x0000, 0x062a, 0x0645, 0x0649, 0x0000, 0x062c, + 0x0645, 0x064a, 0x0000, 0x062c, 0x062d, 0x0649, 0x0000, 0x062c, + 0x0645, 0x0649, 0x0000, 0x0633, 0x062e, 0x0649, 0x0000, 0x0635, + 0x062d, 0x064a, 0x0000, 0x0634, 0x062d, 0x064a, 0x0000, 0x0636, + 0x062d, 0x064a, 0x0000, 0x0644, 0x062c, 0x064a, 0x0000, 0x0644, + 0x0645, 0x064a, 0x0000, 0x064a, 0x062d, 0x064a, 0x0000, 0x064a, + 0x062c, 0x064a, 0x0000, 0x064a, 0x0645, 0x064a, 0x0000, 0x0645, + 0x0645, 0x064a, 0x0000, 0x0642, 0x0645, 0x064a, 0x0000, 0x0646, + 0x062d, 0x064a, 0x0000, 0x0639, 0x0645, 0x064a, 0x0000, 0x0643, + 0x0645, 0x064a, 0x0000, 0x0646, 0x062c, 0x062d, 0x0000, 0x0645, + 0x062e, 0x064a, 0x0000, 0x0644, 0x062c, 0x0645, 0x0000, 0x0643, + 0x0645, 0x0645, 0x0000, 0x062c, 0x062d, 0x064a, 0x0000, 0x062d, + 0x062c, 0x064a, 0x0000, 0x0645, 0x062c, 0x064a, 0x0000, 0x0641, + 0x0645, 0x064a, 0x0000, 0x0628, 0x062d, 0x064a, 0x0000, 0x0633, + 0x062e, 0x064a, 0x0000, 0x0646, 0x062c, 0x064a, 0x0000, 0x0635, + 0x0644, 0x06d2, 0x0000, 0x0642, 0x0644, 0x06d2, 0x0000, 0x0627, + 0x0644, 0x0644, 0x0647, 0x0000, 0x0627, 0x0643, 0x0628, 0x0631, + 0x0000, 0x0645, 0x062d, 0x0645, 0x062f, 0x0000, 0x0635, 0x0644, + 0x0639, 0x0645, 0x0000, 0x0631, 0x0633, 0x0648, 0x0644, 0x0000, + 0x0639, 0x0644, 0x064a, 0x0647, 0x0000, 0x0648, 0x0633, 0x0644, + 0x0645, 0x0000, 0x0635, 0x0644, 0x0649, 0x0000, 0x0635, 0x0644, + 0x0649, 0x0020, 0x0627, 0x0644, 0x0644, 0x0647, 0x0020, 0x0639, + 0x0644, 0x064a, 0x0647, 0x0020, 0x0648, 0x0633, 0x0644, 0x0645, + 0x0000, 0x062c, 0x0644, 0x0020, 0x062c, 0x0644, 0x0627, 0x0644, + 0x0647, 0x0000, 0x0631, 0x06cc, 0x0627, 0x0644, 0x0000, 0x002c, + 0x0000, 0x3001, 0x0000, 0x3002, 0x0000, 0x003a, 0x0000, 0x0021, + 0x0000, 0x003f, 0x0000, 0x3016, 0x0000, 0x3017, 0x0000, 0x2026, + 0x0000, 0x2025, 0x0000, 0x2014, 0x0000, 0x2013, 0x0000, 0x005f, + 0x0000, 0x007b, 0x0000, 0x007d, 0x0000, 0x3014, 0x0000, 0x3015, + 0x0000, 0x3010, 0x0000, 0x3011, 0x0000, 0x300a, 0x0000, 0x300b, + 0x0000, 0x300c, 0x0000, 0x300d, 0x0000, 0x300e, 0x0000, 0x300f, + 0x0000, 0x005b, 0x0000, 0x005d, 0x0000, 0x203e, 0x0000, 0x0023, + 0x0000, 0x0026, 0x0000, 0x002a, 0x0000, 0x002d, 0x0000, 0x003c, + 0x0000, 0x003e, 0x0000, 0x005c, 0x0000, 0x0024, 0x0000, 0x0025, + 0x0000, 0x0040, 0x0000, 0x0020, 0x064b, 0x0000, 0x0640, 0x064b, + 0x0000, 0x0020, 0x064c, 0x0000, 0x0020, 0x064d, 0x0000, 0x0020, + 0x064e, 0x0000, 0x0640, 0x064e, 0x0000, 0x0020, 0x064f, 0x0000, + 0x0640, 0x064f, 0x0000, 0x0020, 0x0650, 0x0000, 0x0640, 0x0650, + 0x0000, 0x0020, 0x0651, 0x0000, 0x0640, 0x0651, 0x0000, 0x0020, + 0x0652, 0x0000, 0x0640, 0x0652, 0x0000, 0x0621, 0x0000, 0x0622, + 0x0000, 0x0623, 0x0000, 0x0624, 0x0000, 0x0625, 0x0000, 0x0626, + 0x0000, 0x0627, 0x0000, 0x0628, 0x0000, 0x0629, 0x0000, 0x062a, + 0x0000, 0x062b, 0x0000, 0x062c, 0x0000, 0x062d, 0x0000, 0x062e, + 0x0000, 0x062f, 0x0000, 0x0630, 0x0000, 0x0631, 0x0000, 0x0632, + 0x0000, 0x0633, 0x0000, 0x0634, 0x0000, 0x0635, 0x0000, 0x0636, + 0x0000, 0x0637, 0x0000, 0x0638, 0x0000, 0x0639, 0x0000, 0x063a, + 0x0000, 0x0641, 0x0000, 0x0642, 0x0000, 0x0643, 0x0000, 0x0644, + 0x0000, 0x0645, 0x0000, 0x0646, 0x0000, 0x0647, 0x0000, 0x0648, + 0x0000, 0x064a, 0x0000, 0x0644, 0x0622, 0x0000, 0x0644, 0x0623, + 0x0000, 0x0644, 0x0625, 0x0000, 0x0644, 0x0627, 0x0000, 0x0022, + 0x0000, 0x0027, 0x0000, 0x002f, 0x0000, 0x005e, 0x0000, 0x007c, + 0x0000, 0x007e, 0x0000, 0x2985, 0x0000, 0x2986, 0x0000, 0x30fb, + 0x0000, 0x30a1, 0x0000, 0x30a3, 0x0000, 0x30a5, 0x0000, 0x30a7, + 0x0000, 0x30a9, 0x0000, 0x30e3, 0x0000, 0x30e5, 0x0000, 0x30e7, + 0x0000, 0x30c3, 0x0000, 0x30fc, 0x0000, 0x30f3, 0x0000, 0x3099, + 0x0000, 0x309a, 0x0000, 0x3164, 0x0000, 0x3131, 0x0000, 0x3132, + 0x0000, 0x3133, 0x0000, 0x3134, 0x0000, 0x3135, 0x0000, 0x3136, + 0x0000, 0x3137, 0x0000, 0x3138, 0x0000, 0x3139, 0x0000, 0x313a, + 0x0000, 0x313b, 0x0000, 0x313c, 0x0000, 0x313d, 0x0000, 0x313e, + 0x0000, 0x313f, 0x0000, 0x3140, 0x0000, 0x3141, 0x0000, 0x3142, + 0x0000, 0x3143, 0x0000, 0x3144, 0x0000, 0x3145, 0x0000, 0x3146, + 0x0000, 0x3147, 0x0000, 0x3148, 0x0000, 0x3149, 0x0000, 0x314a, + 0x0000, 0x314b, 0x0000, 0x314c, 0x0000, 0x314d, 0x0000, 0x314e, + 0x0000, 0x314f, 0x0000, 0x3150, 0x0000, 0x3151, 0x0000, 0x3152, + 0x0000, 0x3153, 0x0000, 0x3154, 0x0000, 0x3155, 0x0000, 0x3156, + 0x0000, 0x3157, 0x0000, 0x3158, 0x0000, 0x3159, 0x0000, 0x315a, + 0x0000, 0x315b, 0x0000, 0x315c, 0x0000, 0x315d, 0x0000, 0x315e, + 0x0000, 0x315f, 0x0000, 0x3160, 0x0000, 0x3161, 0x0000, 0x3162, + 0x0000, 0x3163, 0x0000, 0x00a2, 0x0000, 0x00a3, 0x0000, 0x00ac, + 0x0000, 0x00af, 0x0000, 0x00a6, 0x0000, 0x00a5, 0x0000, 0x20a9, + 0x0000, 0x2502, 0x0000, 0x2190, 0x0000, 0x2191, 0x0000, 0x2192, + 0x0000, 0x2193, 0x0000, 0x25a0, 0x0000, 0x25cb, 0x0000 +}; + +static const BYTE idx1_decomp[256] = +{ + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, + 0x00, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, + 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x19, 0x00, 0x1a, 0x1b, 0x1c, 0x1d, + 0x1e, 0x1f, 0x20, 0x21, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x23, + 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b +}; + +static const USHORT idx2_decomp[704] = { - /* index */ - 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0100, 0x0160, 0x0100, - 0x0100, 0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x0100, 0x01c0, - 0x01d0, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x01e0, 0x0100, 0x0100, 0x01f0, 0x0200, - 0x0100, 0x0210, 0x0220, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0230, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0240, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0250, 0x0100, 0x0100, 0x0100, 0x0100, /* null sub-index */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 00 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0280, 0x02a0, 0x02c0, 0x02e0, - /* sub-index 01 */ - 0x0300, 0x0320, 0x0340, 0x0360, 0x0380, 0x03a0, 0x03c0, 0x03e0, - 0x0260, 0x0260, 0x0400, 0x0420, 0x0440, 0x0460, 0x0480, 0x04a0, - /* sub-index 02 */ - 0x04c0, 0x04e0, 0x0500, 0x0520, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 03 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0540, 0x0260, 0x0260, 0x0260, - 0x0560, 0x0580, 0x05a0, 0x05c0, 0x05e0, 0x0600, 0x0260, 0x0260, - /* sub-index 04 */ - 0x0620, 0x0640, 0x0260, 0x0660, 0x0260, 0x0680, 0x0260, 0x06a0, - 0x0260, 0x0260, 0x0260, 0x0260, 0x06c0, 0x06e0, 0x0700, 0x0720, - /* sub-index 06 */ - 0x0260, 0x0260, 0x0740, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0760, 0x0780, 0x0260, 0x0260, - /* sub-index 09 */ - 0x0260, 0x0260, 0x07a0, 0x07c0, 0x0260, 0x07e0, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0800, 0x0820, 0x0260, 0x0260, - /* sub-index 0a */ - 0x0260, 0x0260, 0x0260, 0x0840, 0x0260, 0x0860, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 0b */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0880, 0x08a0, 0x0260, 0x0260, - 0x0260, 0x08c0, 0x0260, 0x0260, 0x08e0, 0x0260, 0x0260, 0x0260, - /* sub-index 0c */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0900, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0920, 0x0260, 0x0260, 0x0260, - /* sub-index 0d */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0940, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0960, 0x0260, 0x0260, - /* sub-index 0f */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0980, 0x09a0, 0x09c0, 0x09e0, - 0x0a00, 0x0a20, 0x0a40, 0x0a60, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 10 */ - 0x0260, 0x0260, 0x0a80, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 1b */ - 0x0aa0, 0x0ac0, 0x0260, 0x0ae0, 0x0b00, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 1e */ - 0x0b20, 0x0b40, 0x0b60, 0x0b80, 0x0ba0, 0x0bc0, 0x0be0, 0x0c00, - 0x0c20, 0x0c40, 0x0c60, 0x0c80, 0x0ca0, 0x0cc0, 0x0ce0, 0x0d00, - /* sub-index 1f */ - 0x0d20, 0x0d40, 0x0d60, 0x0d80, 0x0da0, 0x0dc0, 0x0de0, 0x0e00, - 0x0e20, 0x0e40, 0x0e60, 0x0e80, 0x0ea0, 0x0ec0, 0x0ee0, 0x0f00, - /* sub-index 21 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0f20, 0x0f40, 0x0260, 0x0f60, 0x0260, 0x0260, 0x0260, - /* sub-index 22 */ - 0x0f80, 0x0260, 0x0fa0, 0x0260, 0x0fc0, 0x0260, 0x0fe0, 0x1000, - 0x1020, 0x0260, 0x1040, 0x0260, 0x0260, 0x0260, 0x1060, 0x0260, - /* sub-index 2a */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x1080, 0x0260, 0x0260, - /* sub-index 30 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x10a0, 0x10c0, 0x10e0, 0x1100, - 0x0260, 0x1120, 0x1140, 0x1160, 0x1180, 0x11a0, 0x0260, 0x11c0, - /* sub-index fb */ - 0x0260, 0x11e0, 0x1200, 0x1220, 0x1240, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* null mapping */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x01 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, + /* sub-index 0x02 */ + 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, + 0x0000, 0x0000, 0x000f, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, + /* sub-index 0x03 */ + 0x0015, 0x0016, 0x0017, 0x0018, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0019, 0x0000, 0x001a, 0x001b, 0x0000, + /* sub-index 0x04 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x001c, 0x0000, 0x0000, 0x001d, + 0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023, 0x0000, 0x0024, + /* sub-index 0x05 */ + 0x0025, 0x0026, 0x0000, 0x0027, 0x0000, 0x0028, 0x0000, 0x0029, + 0x0000, 0x0000, 0x0000, 0x0000, 0x002a, 0x002b, 0x002c, 0x002d, + /* sub-index 0x06 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x002e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x07 */ + 0x0000, 0x0000, 0x002f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0030, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0032, 0x0000, 0x0000, + /* sub-index 0x08 */ + 0x0000, 0x0000, 0x0033, 0x0034, 0x0000, 0x0035, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0036, 0x0037, 0x0000, 0x0000, + /* sub-index 0x09 */ + 0x0000, 0x0000, 0x0000, 0x0038, 0x0000, 0x0039, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x0a */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x003a, 0x003b, 0x0000, 0x0000, + 0x0000, 0x003c, 0x0000, 0x0000, 0x003d, 0x0000, 0x0000, 0x0000, + /* sub-index 0x0b */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x003e, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x003f, 0x0000, 0x0000, 0x0000, + /* sub-index 0x0c */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0040, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0041, 0x0000, 0x0000, + /* sub-index 0x0d */ + 0x0000, 0x0000, 0x0000, 0x0042, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0044, 0x0000, 0x0000, + /* sub-index 0x0e */ + 0x0045, 0x0000, 0x0000, 0x0000, 0x0046, 0x0047, 0x0048, 0x0049, + 0x004a, 0x004b, 0x004c, 0x004d, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x0f */ + 0x0000, 0x0000, 0x004e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x004f, + /* sub-index 0x10 */ + 0x0050, 0x0051, 0x0000, 0x0052, 0x0053, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x11 */ + 0x0000, 0x0000, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x0000, 0x005a, 0x005b, 0x005c, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x12 */ + 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, + 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, + /* sub-index 0x13 */ + 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, + 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, + /* sub-index 0x14 */ + 0x007d, 0x007e, 0x007f, 0x0080, 0x0081, 0x0082, 0x0000, 0x0083, + 0x0084, 0x0085, 0x0086, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x15 */ + 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, + 0x008f, 0x0090, 0x0091, 0x0000, 0x0092, 0x0000, 0x0000, 0x0000, + /* sub-index 0x16 */ + 0x0093, 0x0000, 0x0094, 0x0095, 0x0096, 0x0000, 0x0097, 0x0098, + 0x0099, 0x0000, 0x009a, 0x0000, 0x0000, 0x0000, 0x009b, 0x0000, + /* sub-index 0x17 */ + 0x0000, 0x0000, 0x009c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x18 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x009d, 0x009e, + 0x009f, 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x0000, + /* sub-index 0x19 */ + 0x00a6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00a7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00a8, 0x0000, 0x0000, + /* sub-index 0x1a */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00a9, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x1b */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00aa, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x1c */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00ab, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00ac, + /* sub-index 0x1d */ + 0x00ad, 0x00ae, 0x00af, 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, + 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x0000, 0x0000, + /* sub-index 0x1e */ + 0x00bb, 0x0000, 0x0000, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0x00c0, + 0x0000, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x0000, 0x00c6, + /* sub-index 0x1f */ + 0x0000, 0x0000, 0x0000, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, + 0x00cc, 0x00cd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x20 */ + 0x00ce, 0x00cf, 0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, + 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, + /* sub-index 0x21 */ + 0x00de, 0x00df, 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, + 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, + /* sub-index 0x22 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00ee, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x23 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00ef, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f0, + /* sub-index 0x24 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f1, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x25 */ + 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, + 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff, 0x0100, 0x0101, + /* sub-index 0x26 */ + 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0109, + 0x010a, 0x010b, 0x010c, 0x010d, 0x010e, 0x010f, 0x0000, 0x0000, + /* sub-index 0x27 */ + 0x0110, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, + 0x0118, 0x0119, 0x011a, 0x011b, 0x0000, 0x011c, 0x011d, 0x011e, + /* sub-index 0x28 */ + 0x011f, 0x0120, 0x0121, 0x0122, 0x0123, 0x0124, 0x0125, 0x0126, + 0x0127, 0x0128, 0x0129, 0x012a, 0x012b, 0x012c, 0x012d, 0x012e, + /* sub-index 0x29 */ + 0x012f, 0x0130, 0x0131, 0x0132, 0x0000, 0x0133, 0x0134, 0x0135, + 0x0136, 0x0137, 0x0138, 0x0139, 0x013a, 0x0000, 0x0000, 0x013b, + /* sub-index 0x2a */ + 0x0000, 0x013c, 0x0000, 0x013d, 0x013e, 0x013f, 0x0140, 0x0141, + 0x0142, 0x0143, 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149, + /* sub-index 0x2b */ + 0x014a, 0x014b, 0x014c, 0x014d, 0x014e, 0x014f, 0x0150, 0x0151, + 0x0152, 0x0153, 0x0154, 0x0155, 0x0156, 0x0157, 0x0158, 0x0000 +}; + +static const USHORT offsets_decomp[11040] = +{ + /* (nfd, nfkd) x 16 */ + /* no decomposition */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x00a0 .. 0x00af */ + 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0003, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0008, + /* 0x00b0 .. 0x00bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000b, 0x0000, 0x000d, + 0x0000, 0x000f, 0x0000, 0x0012, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0014, 0x0000, 0x0017, 0x0000, 0x0019, 0x0000, 0x0000, + 0x0000, 0x001b, 0x0000, 0x001f, 0x0000, 0x0023, 0x0000, 0x0000, /* 0x00c0 .. 0x00cf */ - 0x0041, 0x0300, 0x0041, 0x0301, 0x0041, 0x0302, 0x0041, 0x0303, - 0x0041, 0x0308, 0x0041, 0x030a, 0x0000, 0x0000, 0x0043, 0x0327, - 0x0045, 0x0300, 0x0045, 0x0301, 0x0045, 0x0302, 0x0045, 0x0308, - 0x0049, 0x0300, 0x0049, 0x0301, 0x0049, 0x0302, 0x0049, 0x0308, + 0x0027, 0x0027, 0x002a, 0x002a, 0x002d, 0x002d, 0x0030, 0x0030, + 0x0033, 0x0033, 0x0036, 0x0036, 0x0000, 0x0000, 0x0039, 0x0039, + 0x003c, 0x003c, 0x003f, 0x003f, 0x0042, 0x0042, 0x0045, 0x0045, + 0x0048, 0x0048, 0x004b, 0x004b, 0x004e, 0x004e, 0x0051, 0x0051, /* 0x00d0 .. 0x00df */ - 0x0000, 0x0000, 0x004e, 0x0303, 0x004f, 0x0300, 0x004f, 0x0301, - 0x004f, 0x0302, 0x004f, 0x0303, 0x004f, 0x0308, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0055, 0x0300, 0x0055, 0x0301, 0x0055, 0x0302, - 0x0055, 0x0308, 0x0059, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0054, 0x0054, 0x0057, 0x0057, 0x005a, 0x005a, + 0x005d, 0x005d, 0x0060, 0x0060, 0x0063, 0x0063, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0066, 0x0066, 0x0069, 0x0069, 0x006c, 0x006c, + 0x006f, 0x006f, 0x0072, 0x0072, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x00e0 .. 0x00ef */ - 0x0061, 0x0300, 0x0061, 0x0301, 0x0061, 0x0302, 0x0061, 0x0303, - 0x0061, 0x0308, 0x0061, 0x030a, 0x0000, 0x0000, 0x0063, 0x0327, - 0x0065, 0x0300, 0x0065, 0x0301, 0x0065, 0x0302, 0x0065, 0x0308, - 0x0069, 0x0300, 0x0069, 0x0301, 0x0069, 0x0302, 0x0069, 0x0308, + 0x0075, 0x0075, 0x0078, 0x0078, 0x007b, 0x007b, 0x007e, 0x007e, + 0x0081, 0x0081, 0x0084, 0x0084, 0x0000, 0x0000, 0x0087, 0x0087, + 0x008a, 0x008a, 0x008d, 0x008d, 0x0090, 0x0090, 0x0093, 0x0093, + 0x0096, 0x0096, 0x0099, 0x0099, 0x009c, 0x009c, 0x009f, 0x009f, /* 0x00f0 .. 0x00ff */ - 0x0000, 0x0000, 0x006e, 0x0303, 0x006f, 0x0300, 0x006f, 0x0301, - 0x006f, 0x0302, 0x006f, 0x0303, 0x006f, 0x0308, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0075, 0x0300, 0x0075, 0x0301, 0x0075, 0x0302, - 0x0075, 0x0308, 0x0079, 0x0301, 0x0000, 0x0000, 0x0079, 0x0308, + 0x0000, 0x0000, 0x00a2, 0x00a2, 0x00a5, 0x00a5, 0x00a8, 0x00a8, + 0x00ab, 0x00ab, 0x00ae, 0x00ae, 0x00b1, 0x00b1, 0x0000, 0x0000, + 0x0000, 0x0000, 0x00b4, 0x00b4, 0x00b7, 0x00b7, 0x00ba, 0x00ba, + 0x00bd, 0x00bd, 0x00c0, 0x00c0, 0x0000, 0x0000, 0x00c3, 0x00c3, /* 0x0100 .. 0x010f */ - 0x0041, 0x0304, 0x0061, 0x0304, 0x0041, 0x0306, 0x0061, 0x0306, - 0x0041, 0x0328, 0x0061, 0x0328, 0x0043, 0x0301, 0x0063, 0x0301, - 0x0043, 0x0302, 0x0063, 0x0302, 0x0043, 0x0307, 0x0063, 0x0307, - 0x0043, 0x030c, 0x0063, 0x030c, 0x0044, 0x030c, 0x0064, 0x030c, + 0x00c6, 0x00c6, 0x00c9, 0x00c9, 0x00cc, 0x00cc, 0x00cf, 0x00cf, + 0x00d2, 0x00d2, 0x00d5, 0x00d5, 0x00d8, 0x00d8, 0x00db, 0x00db, + 0x00de, 0x00de, 0x00e1, 0x00e1, 0x00e4, 0x00e4, 0x00e7, 0x00e7, + 0x00ea, 0x00ea, 0x00ed, 0x00ed, 0x00f0, 0x00f0, 0x00f3, 0x00f3, /* 0x0110 .. 0x011f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0045, 0x0304, 0x0065, 0x0304, - 0x0045, 0x0306, 0x0065, 0x0306, 0x0045, 0x0307, 0x0065, 0x0307, - 0x0045, 0x0328, 0x0065, 0x0328, 0x0045, 0x030c, 0x0065, 0x030c, - 0x0047, 0x0302, 0x0067, 0x0302, 0x0047, 0x0306, 0x0067, 0x0306, + 0x0000, 0x0000, 0x0000, 0x0000, 0x00f6, 0x00f6, 0x00f9, 0x00f9, + 0x00fc, 0x00fc, 0x00ff, 0x00ff, 0x0102, 0x0102, 0x0105, 0x0105, + 0x0108, 0x0108, 0x010b, 0x010b, 0x010e, 0x010e, 0x0111, 0x0111, + 0x0114, 0x0114, 0x0117, 0x0117, 0x011a, 0x011a, 0x011d, 0x011d, /* 0x0120 .. 0x012f */ - 0x0047, 0x0307, 0x0067, 0x0307, 0x0047, 0x0327, 0x0067, 0x0327, - 0x0048, 0x0302, 0x0068, 0x0302, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0049, 0x0303, 0x0069, 0x0303, 0x0049, 0x0304, 0x0069, 0x0304, - 0x0049, 0x0306, 0x0069, 0x0306, 0x0049, 0x0328, 0x0069, 0x0328, + 0x0120, 0x0120, 0x0123, 0x0123, 0x0126, 0x0126, 0x0129, 0x0129, + 0x012c, 0x012c, 0x012f, 0x012f, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0132, 0x0132, 0x0135, 0x0135, 0x0138, 0x0138, 0x013b, 0x013b, + 0x013e, 0x013e, 0x0141, 0x0141, 0x0144, 0x0144, 0x0147, 0x0147, /* 0x0130 .. 0x013f */ - 0x0049, 0x0307, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004a, 0x0302, 0x006a, 0x0302, 0x004b, 0x0327, 0x006b, 0x0327, - 0x0000, 0x0000, 0x004c, 0x0301, 0x006c, 0x0301, 0x004c, 0x0327, - 0x006c, 0x0327, 0x004c, 0x030c, 0x006c, 0x030c, 0x0000, 0x0000, + 0x014a, 0x014a, 0x0000, 0x0000, 0x0000, 0x014d, 0x0000, 0x0150, + 0x0153, 0x0153, 0x0156, 0x0156, 0x0159, 0x0159, 0x015c, 0x015c, + 0x0000, 0x0000, 0x015f, 0x015f, 0x0162, 0x0162, 0x0165, 0x0165, + 0x0168, 0x0168, 0x016b, 0x016b, 0x016e, 0x016e, 0x0000, 0x0171, /* 0x0140 .. 0x014f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x004e, 0x0301, - 0x006e, 0x0301, 0x004e, 0x0327, 0x006e, 0x0327, 0x004e, 0x030c, - 0x006e, 0x030c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004f, 0x0304, 0x006f, 0x0304, 0x004f, 0x0306, 0x006f, 0x0306, + 0x0000, 0x0174, 0x0000, 0x0000, 0x0000, 0x0000, 0x0177, 0x0177, + 0x017a, 0x017a, 0x017d, 0x017d, 0x0180, 0x0180, 0x0183, 0x0183, + 0x0186, 0x0186, 0x0000, 0x0189, 0x0000, 0x0000, 0x0000, 0x0000, + 0x018c, 0x018c, 0x018f, 0x018f, 0x0192, 0x0192, 0x0195, 0x0195, /* 0x0150 .. 0x015f */ - 0x004f, 0x030b, 0x006f, 0x030b, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0052, 0x0301, 0x0072, 0x0301, 0x0052, 0x0327, 0x0072, 0x0327, - 0x0052, 0x030c, 0x0072, 0x030c, 0x0053, 0x0301, 0x0073, 0x0301, - 0x0053, 0x0302, 0x0073, 0x0302, 0x0053, 0x0327, 0x0073, 0x0327, + 0x0198, 0x0198, 0x019b, 0x019b, 0x0000, 0x0000, 0x0000, 0x0000, + 0x019e, 0x019e, 0x01a1, 0x01a1, 0x01a4, 0x01a4, 0x01a7, 0x01a7, + 0x01aa, 0x01aa, 0x01ad, 0x01ad, 0x01b0, 0x01b0, 0x01b3, 0x01b3, + 0x01b6, 0x01b6, 0x01b9, 0x01b9, 0x01bc, 0x01bc, 0x01bf, 0x01bf, /* 0x0160 .. 0x016f */ - 0x0053, 0x030c, 0x0073, 0x030c, 0x0054, 0x0327, 0x0074, 0x0327, - 0x0054, 0x030c, 0x0074, 0x030c, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0055, 0x0303, 0x0075, 0x0303, 0x0055, 0x0304, 0x0075, 0x0304, - 0x0055, 0x0306, 0x0075, 0x0306, 0x0055, 0x030a, 0x0075, 0x030a, + 0x01c2, 0x01c2, 0x01c5, 0x01c5, 0x01c8, 0x01c8, 0x01cb, 0x01cb, + 0x01ce, 0x01ce, 0x01d1, 0x01d1, 0x0000, 0x0000, 0x0000, 0x0000, + 0x01d4, 0x01d4, 0x01d7, 0x01d7, 0x01da, 0x01da, 0x01dd, 0x01dd, + 0x01e0, 0x01e0, 0x01e3, 0x01e3, 0x01e6, 0x01e6, 0x01e9, 0x01e9, /* 0x0170 .. 0x017f */ - 0x0055, 0x030b, 0x0075, 0x030b, 0x0055, 0x0328, 0x0075, 0x0328, - 0x0057, 0x0302, 0x0077, 0x0302, 0x0059, 0x0302, 0x0079, 0x0302, - 0x0059, 0x0308, 0x005a, 0x0301, 0x007a, 0x0301, 0x005a, 0x0307, - 0x007a, 0x0307, 0x005a, 0x030c, 0x007a, 0x030c, 0x0000, 0x0000, + 0x01ec, 0x01ec, 0x01ef, 0x01ef, 0x01f2, 0x01f2, 0x01f5, 0x01f5, + 0x01f8, 0x01f8, 0x01fb, 0x01fb, 0x01fe, 0x01fe, 0x0201, 0x0201, + 0x0204, 0x0204, 0x0207, 0x0207, 0x020a, 0x020a, 0x020d, 0x020d, + 0x0210, 0x0210, 0x0213, 0x0213, 0x0216, 0x0216, 0x0000, 0x0219, /* 0x01a0 .. 0x01af */ - 0x004f, 0x031b, 0x006f, 0x031b, 0x0000, 0x0000, 0x0000, 0x0000, + 0x021b, 0x021b, 0x021e, 0x021e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0055, 0x031b, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0221, 0x0221, /* 0x01b0 .. 0x01bf */ - 0x0075, 0x031b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0224, 0x0224, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x01c0 .. 0x01cf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0041, 0x030c, 0x0061, 0x030c, 0x0049, 0x030c, + 0x0000, 0x0227, 0x0000, 0x022a, 0x0000, 0x022d, 0x0000, 0x0230, + 0x0000, 0x0233, 0x0000, 0x0236, 0x0000, 0x0239, 0x0000, 0x023c, + 0x0000, 0x023f, 0x0242, 0x0242, 0x0245, 0x0245, 0x0248, 0x0248, /* 0x01d0 .. 0x01df */ - 0x0069, 0x030c, 0x004f, 0x030c, 0x006f, 0x030c, 0x0055, 0x030c, - 0x0075, 0x030c, 0x00dc, 0x0304, 0x00fc, 0x0304, 0x00dc, 0x0301, - 0x00fc, 0x0301, 0x00dc, 0x030c, 0x00fc, 0x030c, 0x00dc, 0x0300, - 0x00fc, 0x0300, 0x0000, 0x0000, 0x00c4, 0x0304, 0x00e4, 0x0304, + 0x024b, 0x024b, 0x024e, 0x024e, 0x0251, 0x0251, 0x0254, 0x0254, + 0x0257, 0x0257, 0x025a, 0x025a, 0x025d, 0x025d, 0x0260, 0x0260, + 0x0263, 0x0263, 0x0266, 0x0266, 0x0269, 0x0269, 0x026c, 0x026c, + 0x026f, 0x026f, 0x0000, 0x0000, 0x0272, 0x0272, 0x0275, 0x0275, /* 0x01e0 .. 0x01ef */ - 0x0226, 0x0304, 0x0227, 0x0304, 0x00c6, 0x0304, 0x00e6, 0x0304, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0047, 0x030c, 0x0067, 0x030c, - 0x004b, 0x030c, 0x006b, 0x030c, 0x004f, 0x0328, 0x006f, 0x0328, - 0x01ea, 0x0304, 0x01eb, 0x0304, 0x01b7, 0x030c, 0x0292, 0x030c, + 0x0278, 0x0278, 0x027b, 0x027b, 0x027e, 0x027e, 0x0281, 0x0281, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0284, 0x0284, 0x0287, 0x0287, + 0x028a, 0x028a, 0x028d, 0x028d, 0x0290, 0x0290, 0x0293, 0x0293, + 0x0296, 0x0296, 0x0299, 0x0299, 0x029c, 0x029c, 0x029f, 0x029f, /* 0x01f0 .. 0x01ff */ - 0x006a, 0x030c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0047, 0x0301, 0x0067, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004e, 0x0300, 0x006e, 0x0300, 0x00c5, 0x0301, 0x00e5, 0x0301, - 0x00c6, 0x0301, 0x00e6, 0x0301, 0x00d8, 0x0301, 0x00f8, 0x0301, + 0x02a2, 0x02a2, 0x0000, 0x02a5, 0x0000, 0x02a8, 0x0000, 0x02ab, + 0x02ae, 0x02ae, 0x02b1, 0x02b1, 0x0000, 0x0000, 0x0000, 0x0000, + 0x02b4, 0x02b4, 0x02b7, 0x02b7, 0x02ba, 0x02ba, 0x02bd, 0x02bd, + 0x02c0, 0x02c0, 0x02c3, 0x02c3, 0x02c6, 0x02c6, 0x02c9, 0x02c9, /* 0x0200 .. 0x020f */ - 0x0041, 0x030f, 0x0061, 0x030f, 0x0041, 0x0311, 0x0061, 0x0311, - 0x0045, 0x030f, 0x0065, 0x030f, 0x0045, 0x0311, 0x0065, 0x0311, - 0x0049, 0x030f, 0x0069, 0x030f, 0x0049, 0x0311, 0x0069, 0x0311, - 0x004f, 0x030f, 0x006f, 0x030f, 0x004f, 0x0311, 0x006f, 0x0311, + 0x02cc, 0x02cc, 0x02cf, 0x02cf, 0x02d2, 0x02d2, 0x02d5, 0x02d5, + 0x02d8, 0x02d8, 0x02db, 0x02db, 0x02de, 0x02de, 0x02e1, 0x02e1, + 0x02e4, 0x02e4, 0x02e7, 0x02e7, 0x02ea, 0x02ea, 0x02ed, 0x02ed, + 0x02f0, 0x02f0, 0x02f3, 0x02f3, 0x02f6, 0x02f6, 0x02f9, 0x02f9, /* 0x0210 .. 0x021f */ - 0x0052, 0x030f, 0x0072, 0x030f, 0x0052, 0x0311, 0x0072, 0x0311, - 0x0055, 0x030f, 0x0075, 0x030f, 0x0055, 0x0311, 0x0075, 0x0311, - 0x0053, 0x0326, 0x0073, 0x0326, 0x0054, 0x0326, 0x0074, 0x0326, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0048, 0x030c, 0x0068, 0x030c, + 0x02fc, 0x02fc, 0x02ff, 0x02ff, 0x0302, 0x0302, 0x0305, 0x0305, + 0x0308, 0x0308, 0x030b, 0x030b, 0x030e, 0x030e, 0x0311, 0x0311, + 0x0314, 0x0314, 0x0317, 0x0317, 0x031a, 0x031a, 0x031d, 0x031d, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0320, 0x0320, 0x0323, 0x0323, /* 0x0220 .. 0x022f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0041, 0x0307, 0x0061, 0x0307, - 0x0045, 0x0327, 0x0065, 0x0327, 0x00d6, 0x0304, 0x00f6, 0x0304, - 0x00d5, 0x0304, 0x00f5, 0x0304, 0x004f, 0x0307, 0x006f, 0x0307, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0326, 0x0326, 0x0329, 0x0329, + 0x032c, 0x032c, 0x032f, 0x032f, 0x0332, 0x0332, 0x0335, 0x0335, + 0x0338, 0x0338, 0x033b, 0x033b, 0x033e, 0x033e, 0x0341, 0x0341, /* 0x0230 .. 0x023f */ - 0x022e, 0x0304, 0x022f, 0x0304, 0x0059, 0x0304, 0x0079, 0x0304, + 0x0344, 0x0344, 0x0347, 0x0347, 0x034a, 0x034a, 0x034d, 0x034d, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x02b0 .. 0x02bf */ + 0x0000, 0x0350, 0x0000, 0x0352, 0x0000, 0x0354, 0x0000, 0x0356, + 0x0000, 0x0358, 0x0000, 0x035a, 0x0000, 0x035c, 0x0000, 0x035e, + 0x0000, 0x0360, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x02d0 .. 0x02df */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0362, 0x0000, 0x0365, 0x0000, 0x0368, 0x0000, 0x036b, + 0x0000, 0x036e, 0x0000, 0x0371, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x02e0 .. 0x02ef */ + 0x0000, 0x0374, 0x0000, 0x0376, 0x0000, 0x0219, 0x0000, 0x0378, + 0x0000, 0x037a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0340 .. 0x034f */ + 0x037c, 0x037c, 0x037e, 0x037e, 0x0000, 0x0000, 0x0380, 0x0380, + 0x0382, 0x0382, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0308, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0370 .. 0x037f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0385, 0x0385, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0387, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x038a, 0x038a, 0x0000, 0x0000, /* 0x0380 .. 0x038f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x00a8, 0x0301, 0x0391, 0x0301, 0x0000, 0x0000, - 0x0395, 0x0301, 0x0397, 0x0301, 0x0399, 0x0301, 0x0000, 0x0000, - 0x039f, 0x0301, 0x0000, 0x0000, 0x03a5, 0x0301, 0x03a9, 0x0301, + 0x0000, 0x000f, 0x038c, 0x038c, 0x038f, 0x038f, 0x0392, 0x0392, + 0x0394, 0x0394, 0x0397, 0x0397, 0x039a, 0x039a, 0x0000, 0x0000, + 0x039d, 0x039d, 0x0000, 0x0000, 0x03a0, 0x03a0, 0x03a3, 0x03a3, /* 0x0390 .. 0x039f */ - 0x03ca, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x03a6, 0x03a6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03a0 .. 0x03af */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0399, 0x0308, 0x03a5, 0x0308, - 0x03b1, 0x0301, 0x03b5, 0x0301, 0x03b7, 0x0301, 0x03b9, 0x0301, + 0x0000, 0x0000, 0x0000, 0x0000, 0x03a9, 0x03a9, 0x03ac, 0x03ac, + 0x03af, 0x03af, 0x03b2, 0x03b2, 0x03b5, 0x03b5, 0x03b8, 0x03b8, /* 0x03b0 .. 0x03bf */ - 0x03cb, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x03bb, 0x03bb, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03c0 .. 0x03cf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x03b9, 0x0308, 0x03c5, 0x0308, - 0x03bf, 0x0301, 0x03c5, 0x0301, 0x03c9, 0x0301, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x03be, 0x03be, 0x03c1, 0x03c1, + 0x03c4, 0x03c4, 0x03c7, 0x03c7, 0x03ca, 0x03ca, 0x0000, 0x0000, /* 0x03d0 .. 0x03df */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x03d2, 0x0301, - 0x03d2, 0x0308, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x03cd, 0x0000, 0x03cf, 0x0000, 0x03d1, 0x03d3, 0x03d3, + 0x03d6, 0x03d6, 0x0000, 0x03d9, 0x0000, 0x03db, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x03f0 .. 0x03ff */ + 0x0000, 0x03dd, 0x0000, 0x03df, 0x0000, 0x03e1, 0x0000, 0x0000, + 0x0000, 0x03e3, 0x0000, 0x03e5, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x03e7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0400 .. 0x040f */ - 0x0415, 0x0300, 0x0415, 0x0308, 0x0000, 0x0000, 0x0413, 0x0301, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0406, 0x0308, + 0x03e9, 0x03e9, 0x03ec, 0x03ec, 0x0000, 0x0000, 0x03ef, 0x03ef, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x03f2, 0x03f2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x041a, 0x0301, 0x0418, 0x0300, 0x0423, 0x0306, 0x0000, 0x0000, + 0x03f5, 0x03f5, 0x03f8, 0x03f8, 0x03fb, 0x03fb, 0x0000, 0x0000, /* 0x0410 .. 0x041f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0418, 0x0306, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x03fe, 0x03fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0430 .. 0x043f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0438, 0x0306, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0401, 0x0401, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0450 .. 0x045f */ - 0x0435, 0x0300, 0x0435, 0x0308, 0x0000, 0x0000, 0x0433, 0x0301, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0456, 0x0308, + 0x0404, 0x0404, 0x0407, 0x0407, 0x0000, 0x0000, 0x040a, 0x040a, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x040d, 0x040d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x043a, 0x0301, 0x0438, 0x0300, 0x0443, 0x0306, 0x0000, 0x0000, + 0x0410, 0x0410, 0x0413, 0x0413, 0x0416, 0x0416, 0x0000, 0x0000, /* 0x0470 .. 0x047f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0474, 0x030f, 0x0475, 0x030f, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0419, 0x0419, 0x041c, 0x041c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x04c0 .. 0x04cf */ - 0x0000, 0x0000, 0x0416, 0x0306, 0x0436, 0x0306, 0x0000, 0x0000, + 0x0000, 0x0000, 0x041f, 0x041f, 0x0422, 0x0422, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x04d0 .. 0x04df */ - 0x0410, 0x0306, 0x0430, 0x0306, 0x0410, 0x0308, 0x0430, 0x0308, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0415, 0x0306, 0x0435, 0x0306, - 0x0000, 0x0000, 0x0000, 0x0000, 0x04d8, 0x0308, 0x04d9, 0x0308, - 0x0416, 0x0308, 0x0436, 0x0308, 0x0417, 0x0308, 0x0437, 0x0308, + 0x0425, 0x0425, 0x0428, 0x0428, 0x042b, 0x042b, 0x042e, 0x042e, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0431, 0x0431, 0x0434, 0x0434, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0437, 0x0437, 0x043a, 0x043a, + 0x043d, 0x043d, 0x0440, 0x0440, 0x0443, 0x0443, 0x0446, 0x0446, /* 0x04e0 .. 0x04ef */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0418, 0x0304, 0x0438, 0x0304, - 0x0418, 0x0308, 0x0438, 0x0308, 0x041e, 0x0308, 0x043e, 0x0308, - 0x0000, 0x0000, 0x0000, 0x0000, 0x04e8, 0x0308, 0x04e9, 0x0308, - 0x042d, 0x0308, 0x044d, 0x0308, 0x0423, 0x0304, 0x0443, 0x0304, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0449, 0x0449, 0x044c, 0x044c, + 0x044f, 0x044f, 0x0452, 0x0452, 0x0455, 0x0455, 0x0458, 0x0458, + 0x0000, 0x0000, 0x0000, 0x0000, 0x045b, 0x045b, 0x045e, 0x045e, + 0x0461, 0x0461, 0x0464, 0x0464, 0x0467, 0x0467, 0x046a, 0x046a, /* 0x04f0 .. 0x04ff */ - 0x0423, 0x0308, 0x0443, 0x0308, 0x0423, 0x030b, 0x0443, 0x030b, - 0x0427, 0x0308, 0x0447, 0x0308, 0x0000, 0x0000, 0x0000, 0x0000, - 0x042b, 0x0308, 0x044b, 0x0308, 0x0000, 0x0000, 0x0000, 0x0000, + 0x046d, 0x046d, 0x0470, 0x0470, 0x0473, 0x0473, 0x0476, 0x0476, + 0x0479, 0x0479, 0x047c, 0x047c, 0x0000, 0x0000, 0x0000, 0x0000, + 0x047f, 0x047f, 0x0482, 0x0482, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0580 .. 0x058f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0485, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0620 .. 0x062f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0627, 0x0653, 0x0627, 0x0654, - 0x0648, 0x0654, 0x0627, 0x0655, 0x064a, 0x0654, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0488, 0x0488, 0x048b, 0x048b, + 0x048e, 0x048e, 0x0491, 0x0491, 0x0494, 0x0494, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0670 .. 0x067f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0497, 0x0000, 0x049a, 0x0000, 0x049d, + 0x0000, 0x04a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x06c0 .. 0x06cf */ - 0x06d5, 0x0654, 0x0000, 0x0000, 0x06c1, 0x0654, 0x0000, 0x0000, + 0x04a3, 0x04a3, 0x0000, 0x0000, 0x04a6, 0x04a6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x06d0 .. 0x06df */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x06d2, 0x0654, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x04a9, 0x04a9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0920 .. 0x092f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0928, 0x093c, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x04ac, 0x04ac, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0930 .. 0x093f */ - 0x0000, 0x0000, 0x0930, 0x093c, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0933, 0x093c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x04af, 0x04af, 0x0000, 0x0000, 0x0000, 0x0000, + 0x04b2, 0x04b2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0950 .. 0x095f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0915, 0x093c, 0x0916, 0x093c, 0x0917, 0x093c, 0x091c, 0x093c, - 0x0921, 0x093c, 0x0922, 0x093c, 0x092b, 0x093c, 0x092f, 0x093c, + 0x04b5, 0x04b5, 0x04b8, 0x04b8, 0x04bb, 0x04bb, 0x04be, 0x04be, + 0x04c1, 0x04c1, 0x04c4, 0x04c4, 0x04c7, 0x04c7, 0x04ca, 0x04ca, /* 0x09c0 .. 0x09cf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x09c7, 0x09be, - 0x09c7, 0x09d7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x04cd, 0x04cd, + 0x04d0, 0x04d0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x09d0 .. 0x09df */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x09a1, 0x09bc, 0x09a2, 0x09bc, 0x0000, 0x0000, 0x09af, 0x09bc, + 0x04d3, 0x04d3, 0x04d6, 0x04d6, 0x0000, 0x0000, 0x04d9, 0x04d9, /* 0x0a30 .. 0x0a3f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0a32, 0x0a3c, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0a38, 0x0a3c, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x04dc, 0x04dc, + 0x0000, 0x0000, 0x0000, 0x0000, 0x04df, 0x04df, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0a50 .. 0x0a5f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0a16, 0x0a3c, 0x0a17, 0x0a3c, 0x0a1c, 0x0a3c, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0a2b, 0x0a3c, 0x0000, 0x0000, + 0x0000, 0x0000, 0x04e2, 0x04e2, 0x04e5, 0x04e5, 0x04e8, 0x04e8, + 0x0000, 0x0000, 0x0000, 0x0000, 0x04eb, 0x04eb, 0x0000, 0x0000, /* 0x0b40 .. 0x0b4f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0b47, 0x0b56, 0x0000, 0x0000, 0x0000, 0x0000, 0x0b47, 0x0b3e, - 0x0b47, 0x0b57, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x04ee, 0x04ee, 0x0000, 0x0000, 0x0000, 0x0000, 0x04f1, 0x04f1, + 0x04f4, 0x04f4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0b50 .. 0x0b5f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0b21, 0x0b3c, 0x0b22, 0x0b3c, 0x0000, 0x0000, 0x0000, 0x0000, + 0x04f7, 0x04f7, 0x04fa, 0x04fa, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0b90 .. 0x0b9f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0b92, 0x0bd7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x04fd, 0x04fd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0bc0 .. 0x0bcf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0bc6, 0x0bbe, 0x0bc7, 0x0bbe, - 0x0bc6, 0x0bd7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0500, 0x0500, 0x0503, 0x0503, + 0x0506, 0x0506, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0c40 .. 0x0c4f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0c46, 0x0c56, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0509, 0x0509, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0cc0 .. 0x0ccf */ - 0x0cbf, 0x0cd5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0cc6, 0x0cd5, - 0x0cc6, 0x0cd6, 0x0000, 0x0000, 0x0cc6, 0x0cc2, 0x0cca, 0x0cd5, + 0x050c, 0x050c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x050f, 0x050f, + 0x0512, 0x0512, 0x0000, 0x0000, 0x0515, 0x0515, 0x0518, 0x0518, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0d40 .. 0x0d4f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0d46, 0x0d3e, 0x0d47, 0x0d3e, - 0x0d46, 0x0d57, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x051b, 0x051b, 0x051e, 0x051e, + 0x0521, 0x0521, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0dd0 .. 0x0ddf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0dd9, 0x0dca, 0x0000, 0x0000, - 0x0dd9, 0x0dcf, 0x0ddc, 0x0dca, 0x0dd9, 0x0ddf, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0524, 0x0524, 0x0000, 0x0000, + 0x0527, 0x0527, 0x052a, 0x052a, 0x052d, 0x052d, 0x0000, 0x0000, + /* 0x0e30 .. 0x0e3f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0530, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0eb0 .. 0x0ebf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0533, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0ed0 .. 0x0edf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0536, 0x0000, 0x0539, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0f00 .. 0x0f0f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x053c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f40 .. 0x0f4f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f42, 0x0fb7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x053e, 0x053e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0f4c, 0x0fb7, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0541, 0x0541, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f50 .. 0x0f5f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0f51, 0x0fb7, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f56, 0x0fb7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0544, 0x0544, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0547, 0x0547, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0f5b, 0x0fb7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x054a, 0x054a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f60 .. 0x0f6f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0f40, 0x0fb5, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x054d, 0x054d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f70 .. 0x0f7f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f71, 0x0f72, - 0x0000, 0x0000, 0x0f71, 0x0f74, 0x0fb2, 0x0f80, 0x0000, 0x0000, - 0x0fb3, 0x0f80, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0550, 0x0550, + 0x0000, 0x0000, 0x0553, 0x0553, 0x0556, 0x0556, 0x0000, 0x0559, + 0x055c, 0x055c, 0x0000, 0x055f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f80 .. 0x0f8f */ - 0x0000, 0x0000, 0x0f71, 0x0f80, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0562, 0x0562, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f90 .. 0x0f9f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f92, 0x0fb7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0565, 0x0565, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0f9c, 0x0fb7, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0568, 0x0568, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0fa0 .. 0x0faf */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0fa1, 0x0fb7, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0fa6, 0x0fb7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x056b, 0x056b, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x056e, 0x056e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0fab, 0x0fb7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0571, 0x0571, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0fb0 .. 0x0fbf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0f90, 0x0fb5, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0574, 0x0574, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1020 .. 0x102f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x1025, 0x102e, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0577, 0x0577, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x10f0 .. 0x10ff */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x057a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1b00 .. 0x1b0f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x1b05, 0x1b35, 0x0000, 0x0000, - 0x1b07, 0x1b35, 0x0000, 0x0000, 0x1b09, 0x1b35, 0x0000, 0x0000, - 0x1b0b, 0x1b35, 0x0000, 0x0000, 0x1b0d, 0x1b35, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x057c, 0x057c, 0x0000, 0x0000, + 0x057f, 0x057f, 0x0000, 0x0000, 0x0582, 0x0582, 0x0000, 0x0000, + 0x0585, 0x0585, 0x0000, 0x0000, 0x0588, 0x0588, 0x0000, 0x0000, /* 0x1b10 .. 0x1b1f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x1b11, 0x1b35, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x058b, 0x058b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1b30 .. 0x1b3f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1b3a, 0x1b35, - 0x0000, 0x0000, 0x1b3c, 0x1b35, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x058e, 0x058e, + 0x0000, 0x0000, 0x0591, 0x0591, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1b40 .. 0x1b4f */ - 0x1b3e, 0x1b35, 0x1b3f, 0x1b35, 0x0000, 0x0000, 0x1b42, 0x1b35, + 0x0594, 0x0594, 0x0597, 0x0597, 0x0000, 0x0000, 0x059a, 0x059a, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d20 .. 0x1d2f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x059d, 0x0000, 0x059f, 0x0000, 0x05a1, 0x0000, 0x0000, + /* 0x1d30 .. 0x1d3f */ + 0x0000, 0x05a3, 0x0000, 0x05a5, 0x0000, 0x05a7, 0x0000, 0x05a9, + 0x0000, 0x05ab, 0x0000, 0x05ad, 0x0000, 0x05af, 0x0000, 0x05b1, + 0x0000, 0x05b3, 0x0000, 0x05b5, 0x0000, 0x05b7, 0x0000, 0x0000, + 0x0000, 0x05b9, 0x0000, 0x05bb, 0x0000, 0x05bd, 0x0000, 0x05bf, + /* 0x1d40 .. 0x1d4f */ + 0x0000, 0x05c1, 0x0000, 0x05c3, 0x0000, 0x05c5, 0x0000, 0x0006, + 0x0000, 0x05c7, 0x0000, 0x05c9, 0x0000, 0x05cb, 0x0000, 0x05cd, + 0x0000, 0x05cf, 0x0000, 0x05d1, 0x0000, 0x05d3, 0x0000, 0x05d5, + 0x0000, 0x05d7, 0x0000, 0x05d9, 0x0000, 0x0000, 0x0000, 0x05db, + /* 0x1d50 .. 0x1d5f */ + 0x0000, 0x05dd, 0x0000, 0x05df, 0x0000, 0x0019, 0x0000, 0x05e1, + 0x0000, 0x05e3, 0x0000, 0x05e5, 0x0000, 0x05e7, 0x0000, 0x05e9, + 0x0000, 0x05eb, 0x0000, 0x05ed, 0x0000, 0x05ef, 0x0000, 0x05f1, + 0x0000, 0x05f3, 0x0000, 0x03cd, 0x0000, 0x05f5, 0x0000, 0x05f7, + /* 0x1d60 .. 0x1d6f */ + 0x0000, 0x03d9, 0x0000, 0x05f9, 0x0000, 0x05fb, 0x0000, 0x0356, + 0x0000, 0x05eb, 0x0000, 0x05f1, 0x0000, 0x03cd, 0x0000, 0x05f5, + 0x0000, 0x03df, 0x0000, 0x03d9, 0x0000, 0x05f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d70 .. 0x1d7f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x05fd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d90 .. 0x1d9f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x05ff, + 0x0000, 0x0601, 0x0000, 0x0603, 0x0000, 0x0605, 0x0000, 0x05d7, + /* 0x1da0 .. 0x1daf */ + 0x0000, 0x0607, 0x0000, 0x0609, 0x0000, 0x060b, 0x0000, 0x060d, + 0x0000, 0x060f, 0x0000, 0x0611, 0x0000, 0x0613, 0x0000, 0x0615, + 0x0000, 0x0617, 0x0000, 0x0619, 0x0000, 0x061b, 0x0000, 0x061d, + 0x0000, 0x061f, 0x0000, 0x0621, 0x0000, 0x0623, 0x0000, 0x0625, + /* 0x1db0 .. 0x1dbf */ + 0x0000, 0x0627, 0x0000, 0x0629, 0x0000, 0x062b, 0x0000, 0x062d, + 0x0000, 0x062f, 0x0000, 0x0631, 0x0000, 0x0633, 0x0000, 0x0635, + 0x0000, 0x0637, 0x0000, 0x0639, 0x0000, 0x063b, 0x0000, 0x063d, + 0x0000, 0x063f, 0x0000, 0x0641, 0x0000, 0x0643, 0x0000, 0x03cf, /* 0x1e00 .. 0x1e0f */ - 0x0041, 0x0325, 0x0061, 0x0325, 0x0042, 0x0307, 0x0062, 0x0307, - 0x0042, 0x0323, 0x0062, 0x0323, 0x0042, 0x0331, 0x0062, 0x0331, - 0x00c7, 0x0301, 0x00e7, 0x0301, 0x0044, 0x0307, 0x0064, 0x0307, - 0x0044, 0x0323, 0x0064, 0x0323, 0x0044, 0x0331, 0x0064, 0x0331, + 0x0645, 0x0645, 0x0648, 0x0648, 0x064b, 0x064b, 0x064e, 0x064e, + 0x0651, 0x0651, 0x0654, 0x0654, 0x0657, 0x0657, 0x065a, 0x065a, + 0x065d, 0x065d, 0x0660, 0x0660, 0x0663, 0x0663, 0x0666, 0x0666, + 0x0669, 0x0669, 0x066c, 0x066c, 0x066f, 0x066f, 0x0672, 0x0672, /* 0x1e10 .. 0x1e1f */ - 0x0044, 0x0327, 0x0064, 0x0327, 0x0044, 0x032d, 0x0064, 0x032d, - 0x0112, 0x0300, 0x0113, 0x0300, 0x0112, 0x0301, 0x0113, 0x0301, - 0x0045, 0x032d, 0x0065, 0x032d, 0x0045, 0x0330, 0x0065, 0x0330, - 0x0228, 0x0306, 0x0229, 0x0306, 0x0046, 0x0307, 0x0066, 0x0307, + 0x0675, 0x0675, 0x0678, 0x0678, 0x067b, 0x067b, 0x067e, 0x067e, + 0x0681, 0x0681, 0x0684, 0x0684, 0x0687, 0x0687, 0x068a, 0x068a, + 0x068d, 0x068d, 0x0690, 0x0690, 0x0693, 0x0693, 0x0696, 0x0696, + 0x0699, 0x0699, 0x069c, 0x069c, 0x069f, 0x069f, 0x06a2, 0x06a2, /* 0x1e20 .. 0x1e2f */ - 0x0047, 0x0304, 0x0067, 0x0304, 0x0048, 0x0307, 0x0068, 0x0307, - 0x0048, 0x0323, 0x0068, 0x0323, 0x0048, 0x0308, 0x0068, 0x0308, - 0x0048, 0x0327, 0x0068, 0x0327, 0x0048, 0x032e, 0x0068, 0x032e, - 0x0049, 0x0330, 0x0069, 0x0330, 0x00cf, 0x0301, 0x00ef, 0x0301, + 0x06a5, 0x06a5, 0x06a8, 0x06a8, 0x06ab, 0x06ab, 0x06ae, 0x06ae, + 0x06b1, 0x06b1, 0x06b4, 0x06b4, 0x06b7, 0x06b7, 0x06ba, 0x06ba, + 0x06bd, 0x06bd, 0x06c0, 0x06c0, 0x06c3, 0x06c3, 0x06c6, 0x06c6, + 0x06c9, 0x06c9, 0x06cc, 0x06cc, 0x06cf, 0x06cf, 0x06d2, 0x06d2, /* 0x1e30 .. 0x1e3f */ - 0x004b, 0x0301, 0x006b, 0x0301, 0x004b, 0x0323, 0x006b, 0x0323, - 0x004b, 0x0331, 0x006b, 0x0331, 0x004c, 0x0323, 0x006c, 0x0323, - 0x1e36, 0x0304, 0x1e37, 0x0304, 0x004c, 0x0331, 0x006c, 0x0331, - 0x004c, 0x032d, 0x006c, 0x032d, 0x004d, 0x0301, 0x006d, 0x0301, + 0x06d5, 0x06d5, 0x06d8, 0x06d8, 0x06db, 0x06db, 0x06de, 0x06de, + 0x06e1, 0x06e1, 0x06e4, 0x06e4, 0x06e7, 0x06e7, 0x06ea, 0x06ea, + 0x06ed, 0x06ed, 0x06f0, 0x06f0, 0x06f3, 0x06f3, 0x06f6, 0x06f6, + 0x06f9, 0x06f9, 0x06fc, 0x06fc, 0x06ff, 0x06ff, 0x0702, 0x0702, /* 0x1e40 .. 0x1e4f */ - 0x004d, 0x0307, 0x006d, 0x0307, 0x004d, 0x0323, 0x006d, 0x0323, - 0x004e, 0x0307, 0x006e, 0x0307, 0x004e, 0x0323, 0x006e, 0x0323, - 0x004e, 0x0331, 0x006e, 0x0331, 0x004e, 0x032d, 0x006e, 0x032d, - 0x00d5, 0x0301, 0x00f5, 0x0301, 0x00d5, 0x0308, 0x00f5, 0x0308, + 0x0705, 0x0705, 0x0708, 0x0708, 0x070b, 0x070b, 0x070e, 0x070e, + 0x0711, 0x0711, 0x0714, 0x0714, 0x0717, 0x0717, 0x071a, 0x071a, + 0x071d, 0x071d, 0x0720, 0x0720, 0x0723, 0x0723, 0x0726, 0x0726, + 0x0729, 0x0729, 0x072c, 0x072c, 0x072f, 0x072f, 0x0732, 0x0732, /* 0x1e50 .. 0x1e5f */ - 0x014c, 0x0300, 0x014d, 0x0300, 0x014c, 0x0301, 0x014d, 0x0301, - 0x0050, 0x0301, 0x0070, 0x0301, 0x0050, 0x0307, 0x0070, 0x0307, - 0x0052, 0x0307, 0x0072, 0x0307, 0x0052, 0x0323, 0x0072, 0x0323, - 0x1e5a, 0x0304, 0x1e5b, 0x0304, 0x0052, 0x0331, 0x0072, 0x0331, + 0x0735, 0x0735, 0x0738, 0x0738, 0x073b, 0x073b, 0x073e, 0x073e, + 0x0741, 0x0741, 0x0744, 0x0744, 0x0747, 0x0747, 0x074a, 0x074a, + 0x074d, 0x074d, 0x0750, 0x0750, 0x0753, 0x0753, 0x0756, 0x0756, + 0x0759, 0x0759, 0x075c, 0x075c, 0x075f, 0x075f, 0x0762, 0x0762, /* 0x1e60 .. 0x1e6f */ - 0x0053, 0x0307, 0x0073, 0x0307, 0x0053, 0x0323, 0x0073, 0x0323, - 0x015a, 0x0307, 0x015b, 0x0307, 0x0160, 0x0307, 0x0161, 0x0307, - 0x1e62, 0x0307, 0x1e63, 0x0307, 0x0054, 0x0307, 0x0074, 0x0307, - 0x0054, 0x0323, 0x0074, 0x0323, 0x0054, 0x0331, 0x0074, 0x0331, + 0x0765, 0x0765, 0x0768, 0x0768, 0x076b, 0x076b, 0x076e, 0x076e, + 0x0771, 0x0771, 0x0774, 0x0774, 0x0777, 0x0777, 0x077a, 0x077a, + 0x077d, 0x077d, 0x0780, 0x0780, 0x0783, 0x0783, 0x0786, 0x0786, + 0x0789, 0x0789, 0x078c, 0x078c, 0x078f, 0x078f, 0x0792, 0x0792, /* 0x1e70 .. 0x1e7f */ - 0x0054, 0x032d, 0x0074, 0x032d, 0x0055, 0x0324, 0x0075, 0x0324, - 0x0055, 0x0330, 0x0075, 0x0330, 0x0055, 0x032d, 0x0075, 0x032d, - 0x0168, 0x0301, 0x0169, 0x0301, 0x016a, 0x0308, 0x016b, 0x0308, - 0x0056, 0x0303, 0x0076, 0x0303, 0x0056, 0x0323, 0x0076, 0x0323, + 0x0795, 0x0795, 0x0798, 0x0798, 0x079b, 0x079b, 0x079e, 0x079e, + 0x07a1, 0x07a1, 0x07a4, 0x07a4, 0x07a7, 0x07a7, 0x07aa, 0x07aa, + 0x07ad, 0x07ad, 0x07b0, 0x07b0, 0x07b3, 0x07b3, 0x07b6, 0x07b6, + 0x07b9, 0x07b9, 0x07bc, 0x07bc, 0x07bf, 0x07bf, 0x07c2, 0x07c2, /* 0x1e80 .. 0x1e8f */ - 0x0057, 0x0300, 0x0077, 0x0300, 0x0057, 0x0301, 0x0077, 0x0301, - 0x0057, 0x0308, 0x0077, 0x0308, 0x0057, 0x0307, 0x0077, 0x0307, - 0x0057, 0x0323, 0x0077, 0x0323, 0x0058, 0x0307, 0x0078, 0x0307, - 0x0058, 0x0308, 0x0078, 0x0308, 0x0059, 0x0307, 0x0079, 0x0307, + 0x07c5, 0x07c5, 0x07c8, 0x07c8, 0x07cb, 0x07cb, 0x07ce, 0x07ce, + 0x07d1, 0x07d1, 0x07d4, 0x07d4, 0x07d7, 0x07d7, 0x07da, 0x07da, + 0x07dd, 0x07dd, 0x07e0, 0x07e0, 0x07e3, 0x07e3, 0x07e6, 0x07e6, + 0x07e9, 0x07e9, 0x07ec, 0x07ec, 0x07ef, 0x07ef, 0x07f2, 0x07f2, /* 0x1e90 .. 0x1e9f */ - 0x005a, 0x0302, 0x007a, 0x0302, 0x005a, 0x0323, 0x007a, 0x0323, - 0x005a, 0x0331, 0x007a, 0x0331, 0x0068, 0x0331, 0x0074, 0x0308, - 0x0077, 0x030a, 0x0079, 0x030a, 0x0000, 0x0000, 0x017f, 0x0307, + 0x07f5, 0x07f5, 0x07f8, 0x07f8, 0x07fb, 0x07fb, 0x07fe, 0x07fe, + 0x0801, 0x0801, 0x0804, 0x0804, 0x0807, 0x0807, 0x080a, 0x080a, + 0x080d, 0x080d, 0x0810, 0x0810, 0x0000, 0x0813, 0x0816, 0x0816, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1ea0 .. 0x1eaf */ - 0x0041, 0x0323, 0x0061, 0x0323, 0x0041, 0x0309, 0x0061, 0x0309, - 0x00c2, 0x0301, 0x00e2, 0x0301, 0x00c2, 0x0300, 0x00e2, 0x0300, - 0x00c2, 0x0309, 0x00e2, 0x0309, 0x00c2, 0x0303, 0x00e2, 0x0303, - 0x1ea0, 0x0302, 0x1ea1, 0x0302, 0x0102, 0x0301, 0x0103, 0x0301, + 0x0819, 0x0819, 0x081c, 0x081c, 0x081f, 0x081f, 0x0822, 0x0822, + 0x0825, 0x0825, 0x0828, 0x0828, 0x082b, 0x082b, 0x082e, 0x082e, + 0x0831, 0x0831, 0x0834, 0x0834, 0x0837, 0x0837, 0x083a, 0x083a, + 0x083d, 0x083d, 0x0840, 0x0840, 0x0843, 0x0843, 0x0846, 0x0846, /* 0x1eb0 .. 0x1ebf */ - 0x0102, 0x0300, 0x0103, 0x0300, 0x0102, 0x0309, 0x0103, 0x0309, - 0x0102, 0x0303, 0x0103, 0x0303, 0x1ea0, 0x0306, 0x1ea1, 0x0306, - 0x0045, 0x0323, 0x0065, 0x0323, 0x0045, 0x0309, 0x0065, 0x0309, - 0x0045, 0x0303, 0x0065, 0x0303, 0x00ca, 0x0301, 0x00ea, 0x0301, + 0x0849, 0x0849, 0x084c, 0x084c, 0x084f, 0x084f, 0x0852, 0x0852, + 0x0855, 0x0855, 0x0858, 0x0858, 0x085b, 0x085b, 0x085e, 0x085e, + 0x0861, 0x0861, 0x0864, 0x0864, 0x0867, 0x0867, 0x086a, 0x086a, + 0x086d, 0x086d, 0x0870, 0x0870, 0x0873, 0x0873, 0x0876, 0x0876, /* 0x1ec0 .. 0x1ecf */ - 0x00ca, 0x0300, 0x00ea, 0x0300, 0x00ca, 0x0309, 0x00ea, 0x0309, - 0x00ca, 0x0303, 0x00ea, 0x0303, 0x1eb8, 0x0302, 0x1eb9, 0x0302, - 0x0049, 0x0309, 0x0069, 0x0309, 0x0049, 0x0323, 0x0069, 0x0323, - 0x004f, 0x0323, 0x006f, 0x0323, 0x004f, 0x0309, 0x006f, 0x0309, + 0x0879, 0x0879, 0x087c, 0x087c, 0x087f, 0x087f, 0x0882, 0x0882, + 0x0885, 0x0885, 0x0888, 0x0888, 0x088b, 0x088b, 0x088e, 0x088e, + 0x0891, 0x0891, 0x0894, 0x0894, 0x0897, 0x0897, 0x089a, 0x089a, + 0x089d, 0x089d, 0x08a0, 0x08a0, 0x08a3, 0x08a3, 0x08a6, 0x08a6, /* 0x1ed0 .. 0x1edf */ - 0x00d4, 0x0301, 0x00f4, 0x0301, 0x00d4, 0x0300, 0x00f4, 0x0300, - 0x00d4, 0x0309, 0x00f4, 0x0309, 0x00d4, 0x0303, 0x00f4, 0x0303, - 0x1ecc, 0x0302, 0x1ecd, 0x0302, 0x01a0, 0x0301, 0x01a1, 0x0301, - 0x01a0, 0x0300, 0x01a1, 0x0300, 0x01a0, 0x0309, 0x01a1, 0x0309, + 0x08a9, 0x08a9, 0x08ac, 0x08ac, 0x08af, 0x08af, 0x08b2, 0x08b2, + 0x08b5, 0x08b5, 0x08b8, 0x08b8, 0x08bb, 0x08bb, 0x08be, 0x08be, + 0x08c1, 0x08c1, 0x08c4, 0x08c4, 0x08c7, 0x08c7, 0x08ca, 0x08ca, + 0x08cd, 0x08cd, 0x08d0, 0x08d0, 0x08d3, 0x08d3, 0x08d6, 0x08d6, /* 0x1ee0 .. 0x1eef */ - 0x01a0, 0x0303, 0x01a1, 0x0303, 0x01a0, 0x0323, 0x01a1, 0x0323, - 0x0055, 0x0323, 0x0075, 0x0323, 0x0055, 0x0309, 0x0075, 0x0309, - 0x01af, 0x0301, 0x01b0, 0x0301, 0x01af, 0x0300, 0x01b0, 0x0300, - 0x01af, 0x0309, 0x01b0, 0x0309, 0x01af, 0x0303, 0x01b0, 0x0303, + 0x08d9, 0x08d9, 0x08dc, 0x08dc, 0x08df, 0x08df, 0x08e2, 0x08e2, + 0x08e5, 0x08e5, 0x08e8, 0x08e8, 0x08eb, 0x08eb, 0x08ee, 0x08ee, + 0x08f1, 0x08f1, 0x08f4, 0x08f4, 0x08f7, 0x08f7, 0x08fa, 0x08fa, + 0x08fd, 0x08fd, 0x0900, 0x0900, 0x0903, 0x0903, 0x0906, 0x0906, /* 0x1ef0 .. 0x1eff */ - 0x01af, 0x0323, 0x01b0, 0x0323, 0x0059, 0x0300, 0x0079, 0x0300, - 0x0059, 0x0323, 0x0079, 0x0323, 0x0059, 0x0309, 0x0079, 0x0309, - 0x0059, 0x0303, 0x0079, 0x0303, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0909, 0x0909, 0x090c, 0x090c, 0x090f, 0x090f, 0x0912, 0x0912, + 0x0915, 0x0915, 0x0918, 0x0918, 0x091b, 0x091b, 0x091e, 0x091e, + 0x0921, 0x0921, 0x0924, 0x0924, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f00 .. 0x1f0f */ - 0x03b1, 0x0313, 0x03b1, 0x0314, 0x1f00, 0x0300, 0x1f01, 0x0300, - 0x1f00, 0x0301, 0x1f01, 0x0301, 0x1f00, 0x0342, 0x1f01, 0x0342, - 0x0391, 0x0313, 0x0391, 0x0314, 0x1f08, 0x0300, 0x1f09, 0x0300, - 0x1f08, 0x0301, 0x1f09, 0x0301, 0x1f08, 0x0342, 0x1f09, 0x0342, + 0x0927, 0x0927, 0x092a, 0x092a, 0x092d, 0x092d, 0x0930, 0x0930, + 0x0933, 0x0933, 0x0936, 0x0936, 0x0939, 0x0939, 0x093c, 0x093c, + 0x093f, 0x093f, 0x0942, 0x0942, 0x0945, 0x0945, 0x0948, 0x0948, + 0x094b, 0x094b, 0x094e, 0x094e, 0x0951, 0x0951, 0x0954, 0x0954, /* 0x1f10 .. 0x1f1f */ - 0x03b5, 0x0313, 0x03b5, 0x0314, 0x1f10, 0x0300, 0x1f11, 0x0300, - 0x1f10, 0x0301, 0x1f11, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0395, 0x0313, 0x0395, 0x0314, 0x1f18, 0x0300, 0x1f19, 0x0300, - 0x1f18, 0x0301, 0x1f19, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0957, 0x0957, 0x095a, 0x095a, 0x095d, 0x095d, 0x0960, 0x0960, + 0x0963, 0x0963, 0x0966, 0x0966, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0969, 0x0969, 0x096c, 0x096c, 0x096f, 0x096f, 0x0972, 0x0972, + 0x0975, 0x0975, 0x0978, 0x0978, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f20 .. 0x1f2f */ - 0x03b7, 0x0313, 0x03b7, 0x0314, 0x1f20, 0x0300, 0x1f21, 0x0300, - 0x1f20, 0x0301, 0x1f21, 0x0301, 0x1f20, 0x0342, 0x1f21, 0x0342, - 0x0397, 0x0313, 0x0397, 0x0314, 0x1f28, 0x0300, 0x1f29, 0x0300, - 0x1f28, 0x0301, 0x1f29, 0x0301, 0x1f28, 0x0342, 0x1f29, 0x0342, + 0x097b, 0x097b, 0x097e, 0x097e, 0x0981, 0x0981, 0x0984, 0x0984, + 0x0987, 0x0987, 0x098a, 0x098a, 0x098d, 0x098d, 0x0990, 0x0990, + 0x0993, 0x0993, 0x0996, 0x0996, 0x0999, 0x0999, 0x099c, 0x099c, + 0x099f, 0x099f, 0x09a2, 0x09a2, 0x09a5, 0x09a5, 0x09a8, 0x09a8, /* 0x1f30 .. 0x1f3f */ - 0x03b9, 0x0313, 0x03b9, 0x0314, 0x1f30, 0x0300, 0x1f31, 0x0300, - 0x1f30, 0x0301, 0x1f31, 0x0301, 0x1f30, 0x0342, 0x1f31, 0x0342, - 0x0399, 0x0313, 0x0399, 0x0314, 0x1f38, 0x0300, 0x1f39, 0x0300, - 0x1f38, 0x0301, 0x1f39, 0x0301, 0x1f38, 0x0342, 0x1f39, 0x0342, + 0x09ab, 0x09ab, 0x09ae, 0x09ae, 0x09b1, 0x09b1, 0x09b4, 0x09b4, + 0x09b7, 0x09b7, 0x09ba, 0x09ba, 0x09bd, 0x09bd, 0x09c0, 0x09c0, + 0x09c3, 0x09c3, 0x09c6, 0x09c6, 0x09c9, 0x09c9, 0x09cc, 0x09cc, + 0x09cf, 0x09cf, 0x09d2, 0x09d2, 0x09d5, 0x09d5, 0x09d8, 0x09d8, /* 0x1f40 .. 0x1f4f */ - 0x03bf, 0x0313, 0x03bf, 0x0314, 0x1f40, 0x0300, 0x1f41, 0x0300, - 0x1f40, 0x0301, 0x1f41, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, - 0x039f, 0x0313, 0x039f, 0x0314, 0x1f48, 0x0300, 0x1f49, 0x0300, - 0x1f48, 0x0301, 0x1f49, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, + 0x09db, 0x09db, 0x09de, 0x09de, 0x09e1, 0x09e1, 0x09e4, 0x09e4, + 0x09e7, 0x09e7, 0x09ea, 0x09ea, 0x0000, 0x0000, 0x0000, 0x0000, + 0x09ed, 0x09ed, 0x09f0, 0x09f0, 0x09f3, 0x09f3, 0x09f6, 0x09f6, + 0x09f9, 0x09f9, 0x09fc, 0x09fc, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f50 .. 0x1f5f */ - 0x03c5, 0x0313, 0x03c5, 0x0314, 0x1f50, 0x0300, 0x1f51, 0x0300, - 0x1f50, 0x0301, 0x1f51, 0x0301, 0x1f50, 0x0342, 0x1f51, 0x0342, - 0x0000, 0x0000, 0x03a5, 0x0314, 0x0000, 0x0000, 0x1f59, 0x0300, - 0x0000, 0x0000, 0x1f59, 0x0301, 0x0000, 0x0000, 0x1f59, 0x0342, + 0x09ff, 0x09ff, 0x0a02, 0x0a02, 0x0a05, 0x0a05, 0x0a08, 0x0a08, + 0x0a0b, 0x0a0b, 0x0a0e, 0x0a0e, 0x0a11, 0x0a11, 0x0a14, 0x0a14, + 0x0000, 0x0000, 0x0a17, 0x0a17, 0x0000, 0x0000, 0x0a1a, 0x0a1a, + 0x0000, 0x0000, 0x0a1d, 0x0a1d, 0x0000, 0x0000, 0x0a20, 0x0a20, /* 0x1f60 .. 0x1f6f */ - 0x03c9, 0x0313, 0x03c9, 0x0314, 0x1f60, 0x0300, 0x1f61, 0x0300, - 0x1f60, 0x0301, 0x1f61, 0x0301, 0x1f60, 0x0342, 0x1f61, 0x0342, - 0x03a9, 0x0313, 0x03a9, 0x0314, 0x1f68, 0x0300, 0x1f69, 0x0300, - 0x1f68, 0x0301, 0x1f69, 0x0301, 0x1f68, 0x0342, 0x1f69, 0x0342, + 0x0a23, 0x0a23, 0x0a26, 0x0a26, 0x0a29, 0x0a29, 0x0a2c, 0x0a2c, + 0x0a2f, 0x0a2f, 0x0a32, 0x0a32, 0x0a35, 0x0a35, 0x0a38, 0x0a38, + 0x0a3b, 0x0a3b, 0x0a3e, 0x0a3e, 0x0a41, 0x0a41, 0x0a44, 0x0a44, + 0x0a47, 0x0a47, 0x0a4a, 0x0a4a, 0x0a4d, 0x0a4d, 0x0a50, 0x0a50, /* 0x1f70 .. 0x1f7f */ - 0x03b1, 0x0300, 0x0000, 0x0000, 0x03b5, 0x0300, 0x0000, 0x0000, - 0x03b7, 0x0300, 0x0000, 0x0000, 0x03b9, 0x0300, 0x0000, 0x0000, - 0x03bf, 0x0300, 0x0000, 0x0000, 0x03c5, 0x0300, 0x0000, 0x0000, - 0x03c9, 0x0300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0a53, 0x0a53, 0x0a56, 0x0a56, 0x0a58, 0x0a58, 0x0a5b, 0x0a5b, + 0x0a5d, 0x0a5d, 0x0a60, 0x0a60, 0x0a62, 0x0a62, 0x0a65, 0x0a65, + 0x0a67, 0x0a67, 0x0a6a, 0x0a6a, 0x0a6c, 0x0a6c, 0x0a6f, 0x0a6f, + 0x0a71, 0x0a71, 0x0a74, 0x0a74, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f80 .. 0x1f8f */ - 0x1f00, 0x0345, 0x1f01, 0x0345, 0x1f02, 0x0345, 0x1f03, 0x0345, - 0x1f04, 0x0345, 0x1f05, 0x0345, 0x1f06, 0x0345, 0x1f07, 0x0345, - 0x1f08, 0x0345, 0x1f09, 0x0345, 0x1f0a, 0x0345, 0x1f0b, 0x0345, - 0x1f0c, 0x0345, 0x1f0d, 0x0345, 0x1f0e, 0x0345, 0x1f0f, 0x0345, + 0x0a76, 0x0a76, 0x0a79, 0x0a79, 0x0a7c, 0x0a7c, 0x0a7f, 0x0a7f, + 0x0a82, 0x0a82, 0x0a85, 0x0a85, 0x0a88, 0x0a88, 0x0a8b, 0x0a8b, + 0x0a8e, 0x0a8e, 0x0a91, 0x0a91, 0x0a94, 0x0a94, 0x0a97, 0x0a97, + 0x0a9a, 0x0a9a, 0x0a9d, 0x0a9d, 0x0aa0, 0x0aa0, 0x0aa3, 0x0aa3, /* 0x1f90 .. 0x1f9f */ - 0x1f20, 0x0345, 0x1f21, 0x0345, 0x1f22, 0x0345, 0x1f23, 0x0345, - 0x1f24, 0x0345, 0x1f25, 0x0345, 0x1f26, 0x0345, 0x1f27, 0x0345, - 0x1f28, 0x0345, 0x1f29, 0x0345, 0x1f2a, 0x0345, 0x1f2b, 0x0345, - 0x1f2c, 0x0345, 0x1f2d, 0x0345, 0x1f2e, 0x0345, 0x1f2f, 0x0345, + 0x0aa6, 0x0aa6, 0x0aa9, 0x0aa9, 0x0aac, 0x0aac, 0x0aaf, 0x0aaf, + 0x0ab2, 0x0ab2, 0x0ab5, 0x0ab5, 0x0ab8, 0x0ab8, 0x0abb, 0x0abb, + 0x0abe, 0x0abe, 0x0ac1, 0x0ac1, 0x0ac4, 0x0ac4, 0x0ac7, 0x0ac7, + 0x0aca, 0x0aca, 0x0acd, 0x0acd, 0x0ad0, 0x0ad0, 0x0ad3, 0x0ad3, /* 0x1fa0 .. 0x1faf */ - 0x1f60, 0x0345, 0x1f61, 0x0345, 0x1f62, 0x0345, 0x1f63, 0x0345, - 0x1f64, 0x0345, 0x1f65, 0x0345, 0x1f66, 0x0345, 0x1f67, 0x0345, - 0x1f68, 0x0345, 0x1f69, 0x0345, 0x1f6a, 0x0345, 0x1f6b, 0x0345, - 0x1f6c, 0x0345, 0x1f6d, 0x0345, 0x1f6e, 0x0345, 0x1f6f, 0x0345, + 0x0ad6, 0x0ad6, 0x0ad9, 0x0ad9, 0x0adc, 0x0adc, 0x0adf, 0x0adf, + 0x0ae2, 0x0ae2, 0x0ae5, 0x0ae5, 0x0ae8, 0x0ae8, 0x0aeb, 0x0aeb, + 0x0aee, 0x0aee, 0x0af1, 0x0af1, 0x0af4, 0x0af4, 0x0af7, 0x0af7, + 0x0afa, 0x0afa, 0x0afd, 0x0afd, 0x0b00, 0x0b00, 0x0b03, 0x0b03, /* 0x1fb0 .. 0x1fbf */ - 0x03b1, 0x0306, 0x03b1, 0x0304, 0x1f70, 0x0345, 0x03b1, 0x0345, - 0x03ac, 0x0345, 0x0000, 0x0000, 0x03b1, 0x0342, 0x1fb6, 0x0345, - 0x0391, 0x0306, 0x0391, 0x0304, 0x0391, 0x0300, 0x0000, 0x0000, - 0x0391, 0x0345, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0b06, 0x0b06, 0x0b09, 0x0b09, 0x0b0c, 0x0b0c, 0x0b0f, 0x0b0f, + 0x0b12, 0x0b12, 0x0000, 0x0000, 0x0b15, 0x0b15, 0x0b18, 0x0b18, + 0x0b1b, 0x0b1b, 0x0b1e, 0x0b1e, 0x0b21, 0x0b21, 0x0b24, 0x0b24, + 0x0b26, 0x0b26, 0x0000, 0x0b29, 0x0b2c, 0x0b2c, 0x0000, 0x0b29, /* 0x1fc0 .. 0x1fcf */ - 0x0000, 0x0000, 0x00a8, 0x0342, 0x1f74, 0x0345, 0x03b7, 0x0345, - 0x03ae, 0x0345, 0x0000, 0x0000, 0x03b7, 0x0342, 0x1fc6, 0x0345, - 0x0395, 0x0300, 0x0000, 0x0000, 0x0397, 0x0300, 0x0000, 0x0000, - 0x0397, 0x0345, 0x1fbf, 0x0300, 0x1fbf, 0x0301, 0x1fbf, 0x0342, + 0x0000, 0x0b2e, 0x0b31, 0x0b31, 0x0b34, 0x0b34, 0x0b37, 0x0b37, + 0x0b3a, 0x0b3a, 0x0000, 0x0000, 0x0b3d, 0x0b3d, 0x0b40, 0x0b40, + 0x0b43, 0x0b43, 0x0b46, 0x0b46, 0x0b48, 0x0b48, 0x0b4b, 0x0b4b, + 0x0b4d, 0x0b4d, 0x0b50, 0x0b50, 0x0b53, 0x0b53, 0x0b56, 0x0b56, /* 0x1fd0 .. 0x1fdf */ - 0x03b9, 0x0306, 0x03b9, 0x0304, 0x03ca, 0x0300, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x03b9, 0x0342, 0x03ca, 0x0342, - 0x0399, 0x0306, 0x0399, 0x0304, 0x0399, 0x0300, 0x0000, 0x0000, - 0x0000, 0x0000, 0x1ffe, 0x0300, 0x1ffe, 0x0301, 0x1ffe, 0x0342, + 0x0b59, 0x0b59, 0x0b5c, 0x0b5c, 0x0b5f, 0x0b5f, 0x0b62, 0x0b62, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0b64, 0x0b64, 0x0b67, 0x0b67, + 0x0b6a, 0x0b6a, 0x0b6d, 0x0b6d, 0x0b70, 0x0b70, 0x0b73, 0x0b73, + 0x0000, 0x0000, 0x0b75, 0x0b75, 0x0b78, 0x0b78, 0x0b7b, 0x0b7b, /* 0x1fe0 .. 0x1fef */ - 0x03c5, 0x0306, 0x03c5, 0x0304, 0x03cb, 0x0300, 0x0000, 0x0000, - 0x03c1, 0x0313, 0x03c1, 0x0314, 0x03c5, 0x0342, 0x03cb, 0x0342, - 0x03a5, 0x0306, 0x03a5, 0x0304, 0x03a5, 0x0300, 0x0000, 0x0000, - 0x03a1, 0x0314, 0x00a8, 0x0300, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0b7e, 0x0b7e, 0x0b81, 0x0b81, 0x0b84, 0x0b84, 0x0b87, 0x0b87, + 0x0b89, 0x0b89, 0x0b8c, 0x0b8c, 0x0b8f, 0x0b8f, 0x0b92, 0x0b92, + 0x0b95, 0x0b95, 0x0b98, 0x0b98, 0x0b9b, 0x0b9b, 0x0b9e, 0x0b9e, + 0x0ba0, 0x0ba0, 0x0ba3, 0x0ba3, 0x0ba6, 0x0ba6, 0x0ba8, 0x0ba8, /* 0x1ff0 .. 0x1fff */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x1f7c, 0x0345, 0x03c9, 0x0345, - 0x03ce, 0x0345, 0x0000, 0x0000, 0x03c9, 0x0342, 0x1ff6, 0x0345, - 0x039f, 0x0300, 0x0000, 0x0000, 0x03a9, 0x0300, 0x0000, 0x0000, - 0x03a9, 0x0345, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0baa, 0x0baa, 0x0bad, 0x0bad, + 0x0bb0, 0x0bb0, 0x0000, 0x0000, 0x0bb3, 0x0bb3, 0x0bb6, 0x0bb6, + 0x0bb9, 0x0bb9, 0x0bbc, 0x0bbc, 0x0bbe, 0x0bbe, 0x0bc1, 0x0bc1, + 0x0bc3, 0x0bc3, 0x0bc6, 0x0bc6, 0x0000, 0x0bc8, 0x0000, 0x0000, + /* 0x2000 .. 0x200f */ + 0x0bcb, 0x0bcb, 0x0bcd, 0x0bcd, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2010 .. 0x201f */ + 0x0000, 0x0000, 0x0000, 0x0bcf, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0bd1, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2020 .. 0x202f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0bd4, 0x0000, 0x0bd6, 0x0000, 0x0bd9, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + /* 0x2030 .. 0x203f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0bdd, + 0x0000, 0x0be0, 0x0000, 0x0000, 0x0000, 0x0be4, 0x0000, 0x0be7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0beb, 0x0000, 0x0000, 0x0000, 0x0bee, 0x0000, 0x0000, + /* 0x2040 .. 0x204f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0bf1, + 0x0000, 0x0bf4, 0x0000, 0x0bf7, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2050 .. 0x205f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0bfa, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + /* 0x2070 .. 0x207f */ + 0x0000, 0x0bff, 0x0000, 0x05fb, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0c01, 0x0000, 0x0c03, 0x0000, 0x0c05, 0x0000, 0x0c07, + 0x0000, 0x0c09, 0x0000, 0x0c0b, 0x0000, 0x0c0d, 0x0000, 0x0c0f, + 0x0000, 0x0c11, 0x0000, 0x0c13, 0x0000, 0x0c15, 0x0000, 0x0c17, + /* 0x2080 .. 0x208f */ + 0x0000, 0x0bff, 0x0000, 0x0017, 0x0000, 0x000b, 0x0000, 0x000d, + 0x0000, 0x0c01, 0x0000, 0x0c03, 0x0000, 0x0c05, 0x0000, 0x0c07, + 0x0000, 0x0c09, 0x0000, 0x0c0b, 0x0000, 0x0c0d, 0x0000, 0x0c0f, + 0x0000, 0x0c11, 0x0000, 0x0c13, 0x0000, 0x0c15, 0x0000, 0x0000, + /* 0x2090 .. 0x209f */ + 0x0000, 0x0006, 0x0000, 0x05d1, 0x0000, 0x0019, 0x0000, 0x0378, + 0x0000, 0x05d3, 0x0000, 0x0350, 0x0000, 0x05db, 0x0000, 0x0376, + 0x0000, 0x05dd, 0x0000, 0x0c17, 0x0000, 0x05e7, 0x0000, 0x0219, + 0x0000, 0x05e9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x20a0 .. 0x20af */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0c19, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2100 .. 0x210f */ + 0x0000, 0x0c1c, 0x0000, 0x0c20, 0x0000, 0x0c24, 0x0000, 0x0c26, + 0x0000, 0x0000, 0x0000, 0x0c29, 0x0000, 0x0c2d, 0x0000, 0x0c31, + 0x0000, 0x0000, 0x0000, 0x0c33, 0x0000, 0x05d9, 0x0000, 0x05ab, + 0x0000, 0x05ab, 0x0000, 0x05ab, 0x0000, 0x0350, 0x0000, 0x0c36, + /* 0x2110 .. 0x211f */ + 0x0000, 0x05ad, 0x0000, 0x05ad, 0x0000, 0x05b3, 0x0000, 0x0376, + 0x0000, 0x0000, 0x0000, 0x05b7, 0x0000, 0x0c38, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x05bd, 0x0000, 0x0c3b, 0x0000, 0x05bf, + 0x0000, 0x05bf, 0x0000, 0x05bf, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2120 .. 0x212f */ + 0x0000, 0x0c3d, 0x0000, 0x0c40, 0x0000, 0x0c44, 0x0000, 0x0000, + 0x0000, 0x0c47, 0x0000, 0x0000, 0x0c49, 0x0c49, 0x0000, 0x0000, + 0x0000, 0x0c47, 0x0000, 0x0000, 0x05b1, 0x05b1, 0x0c4b, 0x0c4b, + 0x0000, 0x05a1, 0x0000, 0x0c24, 0x0000, 0x0000, 0x0000, 0x05d1, + /* 0x2130 .. 0x213f */ + 0x0000, 0x05a5, 0x0000, 0x0c4d, 0x0000, 0x0000, 0x0000, 0x05b5, + 0x0000, 0x0019, 0x0000, 0x0c4f, 0x0000, 0x0c51, 0x0000, 0x0c53, + 0x0000, 0x0c55, 0x0000, 0x05fb, 0x0000, 0x0000, 0x0000, 0x0c57, + 0x0000, 0x03db, 0x0000, 0x05f5, 0x0000, 0x0c5b, 0x0000, 0x0c5d, + /* 0x2140 .. 0x214f */ + 0x0000, 0x0c5f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x05a3, 0x0000, 0x05cf, 0x0000, 0x05d1, + 0x0000, 0x05fb, 0x0000, 0x0354, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2150 .. 0x215f */ + 0x0000, 0x0c61, 0x0000, 0x0c65, 0x0000, 0x0c69, 0x0000, 0x0c6e, + 0x0000, 0x0c72, 0x0000, 0x0c76, 0x0000, 0x0c7a, 0x0000, 0x0c7e, + 0x0000, 0x0c82, 0x0000, 0x0c86, 0x0000, 0x0c8a, 0x0000, 0x0c8e, + 0x0000, 0x0c92, 0x0000, 0x0c96, 0x0000, 0x0c9a, 0x0000, 0x0c9e, + /* 0x2160 .. 0x216f */ + 0x0000, 0x05ad, 0x0000, 0x0ca1, 0x0000, 0x0ca4, 0x0000, 0x0ca8, + 0x0000, 0x0cab, 0x0000, 0x0cad, 0x0000, 0x0cb0, 0x0000, 0x0cb4, + 0x0000, 0x0cb9, 0x0000, 0x0cbc, 0x0000, 0x0cbe, 0x0000, 0x0cc1, + 0x0000, 0x05b3, 0x0000, 0x0c24, 0x0000, 0x05a3, 0x0000, 0x05b5, + /* 0x2170 .. 0x217f */ + 0x0000, 0x05fb, 0x0000, 0x0cc5, 0x0000, 0x0cc8, 0x0000, 0x0ccc, + 0x0000, 0x05f1, 0x0000, 0x0ccf, 0x0000, 0x0cd2, 0x0000, 0x0cd6, + 0x0000, 0x0cdb, 0x0000, 0x0378, 0x0000, 0x0cde, 0x0000, 0x0ce1, + 0x0000, 0x0376, 0x0000, 0x0601, 0x0000, 0x05cf, 0x0000, 0x05dd, + /* 0x2180 .. 0x218f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0ce5, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2190 .. 0x219f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x2190, 0x0338, 0x2192, 0x0338, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0ce9, 0x0ce9, 0x0cec, 0x0cec, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x21a0 .. 0x21af */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x2194, 0x0338, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0cef, 0x0cef, 0x0000, 0x0000, /* 0x21c0 .. 0x21cf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x21d0, 0x0338, 0x21d4, 0x0338, 0x21d2, 0x0338, + 0x0000, 0x0000, 0x0cf2, 0x0cf2, 0x0cf5, 0x0cf5, 0x0cf8, 0x0cf8, /* 0x2200 .. 0x220f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2203, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x2208, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x220b, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0cfb, 0x0cfb, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0cfe, 0x0cfe, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0d01, 0x0d01, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2220 .. 0x222f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2223, 0x0338, 0x0000, 0x0000, 0x2225, 0x0338, 0x0000, 0x0000, + 0x0d04, 0x0d04, 0x0000, 0x0000, 0x0d07, 0x0d07, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0d0a, 0x0000, 0x0d0d, 0x0000, 0x0000, 0x0000, 0x0d11, + /* 0x2230 .. 0x223f */ + 0x0000, 0x0d14, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2240 .. 0x224f */ - 0x0000, 0x0000, 0x223c, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2243, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, 0x2245, 0x0338, - 0x0000, 0x0000, 0x2248, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0d18, 0x0d18, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0d1b, 0x0d1b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0d1e, 0x0d1e, + 0x0000, 0x0000, 0x0d21, 0x0d21, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2260 .. 0x226f */ - 0x003d, 0x0338, 0x0000, 0x0000, 0x2261, 0x0338, 0x0000, 0x0000, + 0x0d24, 0x0d24, 0x0000, 0x0000, 0x0d27, 0x0d27, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x224d, 0x0338, 0x003c, 0x0338, 0x003e, 0x0338, + 0x0000, 0x0000, 0x0d2a, 0x0d2a, 0x0d2d, 0x0d2d, 0x0d30, 0x0d30, /* 0x2270 .. 0x227f */ - 0x2264, 0x0338, 0x2265, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2272, 0x0338, 0x2273, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2276, 0x0338, 0x2277, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0d33, 0x0d33, 0x0d36, 0x0d36, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0d39, 0x0d39, 0x0d3c, 0x0d3c, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0d3f, 0x0d3f, 0x0d42, 0x0d42, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2280 .. 0x228f */ - 0x227a, 0x0338, 0x227b, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2282, 0x0338, 0x2283, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2286, 0x0338, 0x2287, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0d45, 0x0d45, 0x0d48, 0x0d48, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0d4b, 0x0d4b, 0x0d4e, 0x0d4e, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0d51, 0x0d51, 0x0d54, 0x0d54, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x22a0 .. 0x22af */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x22a2, 0x0338, 0x22a8, 0x0338, 0x22a9, 0x0338, 0x22ab, 0x0338, + 0x0d57, 0x0d57, 0x0d5a, 0x0d5a, 0x0d5d, 0x0d5d, 0x0d60, 0x0d60, /* 0x22e0 .. 0x22ef */ - 0x227c, 0x0338, 0x227d, 0x0338, 0x2291, 0x0338, 0x2292, 0x0338, + 0x0d63, 0x0d63, 0x0d66, 0x0d66, 0x0d69, 0x0d69, 0x0d6c, 0x0d6c, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0d6f, 0x0d6f, 0x0d72, 0x0d72, + 0x0d75, 0x0d75, 0x0d78, 0x0d78, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2320 .. 0x232f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0d7b, 0x0d7b, 0x0d7d, 0x0d7d, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2460 .. 0x246f */ + 0x0000, 0x0017, 0x0000, 0x000b, 0x0000, 0x000d, 0x0000, 0x0c01, + 0x0000, 0x0c03, 0x0000, 0x0c05, 0x0000, 0x0c07, 0x0000, 0x0c09, + 0x0000, 0x0c0b, 0x0000, 0x0d7f, 0x0000, 0x0d82, 0x0000, 0x0d85, + 0x0000, 0x0d88, 0x0000, 0x0d8b, 0x0000, 0x0d8e, 0x0000, 0x0d91, + /* 0x2470 .. 0x247f */ + 0x0000, 0x0d94, 0x0000, 0x0d97, 0x0000, 0x0d9a, 0x0000, 0x0d9d, + 0x0000, 0x0da0, 0x0000, 0x0da4, 0x0000, 0x0da8, 0x0000, 0x0dac, + 0x0000, 0x0db0, 0x0000, 0x0db4, 0x0000, 0x0db8, 0x0000, 0x0dbc, + 0x0000, 0x0dc0, 0x0000, 0x0dc4, 0x0000, 0x0dc9, 0x0000, 0x0dce, + /* 0x2480 .. 0x248f */ + 0x0000, 0x0dd3, 0x0000, 0x0dd8, 0x0000, 0x0ddd, 0x0000, 0x0de2, + 0x0000, 0x0de7, 0x0000, 0x0dec, 0x0000, 0x0df1, 0x0000, 0x0df6, + 0x0000, 0x0dfb, 0x0000, 0x0dfe, 0x0000, 0x0e01, 0x0000, 0x0e04, + 0x0000, 0x0e07, 0x0000, 0x0e0a, 0x0000, 0x0e0d, 0x0000, 0x0e10, + /* 0x2490 .. 0x249f */ + 0x0000, 0x0e13, 0x0000, 0x0e16, 0x0000, 0x0e1a, 0x0000, 0x0e1e, + 0x0000, 0x0e22, 0x0000, 0x0e26, 0x0000, 0x0e2a, 0x0000, 0x0e2e, + 0x0000, 0x0e32, 0x0000, 0x0e36, 0x0000, 0x0e3a, 0x0000, 0x0e3e, + 0x0000, 0x0e42, 0x0000, 0x0e46, 0x0000, 0x0e4a, 0x0000, 0x0e4e, + /* 0x24a0 .. 0x24af */ + 0x0000, 0x0e52, 0x0000, 0x0e56, 0x0000, 0x0e5a, 0x0000, 0x0e5e, + 0x0000, 0x0e62, 0x0000, 0x0e66, 0x0000, 0x0e6a, 0x0000, 0x0e6e, + 0x0000, 0x0e72, 0x0000, 0x0e76, 0x0000, 0x0e7a, 0x0000, 0x0e7e, + 0x0000, 0x0e82, 0x0000, 0x0e86, 0x0000, 0x0e8a, 0x0000, 0x0e8e, + /* 0x24b0 .. 0x24bf */ + 0x0000, 0x0e92, 0x0000, 0x0e96, 0x0000, 0x0e9a, 0x0000, 0x0e9e, + 0x0000, 0x0ea2, 0x0000, 0x0ea6, 0x0000, 0x059d, 0x0000, 0x05a1, + 0x0000, 0x0c24, 0x0000, 0x05a3, 0x0000, 0x05a5, 0x0000, 0x0c4d, + 0x0000, 0x05a9, 0x0000, 0x05ab, 0x0000, 0x05ad, 0x0000, 0x05af, + /* 0x24c0 .. 0x24cf */ + 0x0000, 0x05b1, 0x0000, 0x05b3, 0x0000, 0x05b5, 0x0000, 0x05b7, + 0x0000, 0x05b9, 0x0000, 0x05bd, 0x0000, 0x0c3b, 0x0000, 0x05bf, + 0x0000, 0x0eaa, 0x0000, 0x05c1, 0x0000, 0x05c3, 0x0000, 0x0cab, + 0x0000, 0x05c5, 0x0000, 0x0cbc, 0x0000, 0x0eac, 0x0000, 0x0c47, + /* 0x24d0 .. 0x24df */ + 0x0000, 0x0006, 0x0000, 0x05cd, 0x0000, 0x0601, 0x0000, 0x05cf, + 0x0000, 0x05d1, 0x0000, 0x0607, 0x0000, 0x05d9, 0x0000, 0x0350, + 0x0000, 0x05fb, 0x0000, 0x0354, 0x0000, 0x05db, 0x0000, 0x0376, + 0x0000, 0x05dd, 0x0000, 0x0c17, 0x0000, 0x0019, 0x0000, 0x05e7, + /* 0x24e0 .. 0x24ef */ + 0x0000, 0x0eae, 0x0000, 0x0356, 0x0000, 0x0219, 0x0000, 0x05e9, + 0x0000, 0x05eb, 0x0000, 0x05f1, 0x0000, 0x035e, 0x0000, 0x0378, + 0x0000, 0x0360, 0x0000, 0x063d, 0x0000, 0x0bff, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2a00 .. 0x2a0f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0eb0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2a70 .. 0x2a7f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0eb5, 0x0000, 0x0eb9, 0x0000, 0x0ebc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x22b2, 0x0338, 0x22b3, 0x0338, - 0x22b4, 0x0338, 0x22b5, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2ad0 .. 0x2adf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2add, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0ec0, 0x0ec0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2c70 .. 0x2c7f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0354, 0x0000, 0x0cab, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2d60 .. 0x2d6f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0ec3, + /* 0x2e90 .. 0x2e9f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0ec5, + /* 0x2ef0 .. 0x2eff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0ec7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2f00 .. 0x2f0f */ + 0x0000, 0x0ec9, 0x0000, 0x0ecb, 0x0000, 0x0ecd, 0x0000, 0x0ecf, + 0x0000, 0x0ed1, 0x0000, 0x0ed3, 0x0000, 0x0ed5, 0x0000, 0x0ed7, + 0x0000, 0x0ed9, 0x0000, 0x0edb, 0x0000, 0x0edd, 0x0000, 0x0edf, + 0x0000, 0x0ee1, 0x0000, 0x0ee3, 0x0000, 0x0ee5, 0x0000, 0x0ee7, + /* 0x2f10 .. 0x2f1f */ + 0x0000, 0x0ee9, 0x0000, 0x0eeb, 0x0000, 0x0eed, 0x0000, 0x0eef, + 0x0000, 0x0ef1, 0x0000, 0x0ef3, 0x0000, 0x0ef5, 0x0000, 0x0ef7, + 0x0000, 0x0ef9, 0x0000, 0x0efb, 0x0000, 0x0efd, 0x0000, 0x0eff, + 0x0000, 0x0f01, 0x0000, 0x0f03, 0x0000, 0x0f05, 0x0000, 0x0f07, + /* 0x2f20 .. 0x2f2f */ + 0x0000, 0x0f09, 0x0000, 0x0f0b, 0x0000, 0x0f0d, 0x0000, 0x0f0f, + 0x0000, 0x0f11, 0x0000, 0x0f13, 0x0000, 0x0f15, 0x0000, 0x0f17, + 0x0000, 0x0f19, 0x0000, 0x0f1b, 0x0000, 0x0f1d, 0x0000, 0x0f1f, + 0x0000, 0x0f21, 0x0000, 0x0f23, 0x0000, 0x0f25, 0x0000, 0x0f27, + /* 0x2f30 .. 0x2f3f */ + 0x0000, 0x0f29, 0x0000, 0x0f2b, 0x0000, 0x0f2d, 0x0000, 0x0f2f, + 0x0000, 0x0f31, 0x0000, 0x0f33, 0x0000, 0x0f35, 0x0000, 0x0f37, + 0x0000, 0x0f39, 0x0000, 0x0f3b, 0x0000, 0x0f3d, 0x0000, 0x0f3f, + 0x0000, 0x0f41, 0x0000, 0x0f43, 0x0000, 0x0f45, 0x0000, 0x0f47, + /* 0x2f40 .. 0x2f4f */ + 0x0000, 0x0f49, 0x0000, 0x0f4b, 0x0000, 0x0f4d, 0x0000, 0x0f4f, + 0x0000, 0x0f51, 0x0000, 0x0f53, 0x0000, 0x0f55, 0x0000, 0x0f57, + 0x0000, 0x0f59, 0x0000, 0x0f5b, 0x0000, 0x0f5d, 0x0000, 0x0f5f, + 0x0000, 0x0f61, 0x0000, 0x0f63, 0x0000, 0x0f65, 0x0000, 0x0f67, + /* 0x2f50 .. 0x2f5f */ + 0x0000, 0x0f69, 0x0000, 0x0f6b, 0x0000, 0x0f6d, 0x0000, 0x0f6f, + 0x0000, 0x0f71, 0x0000, 0x0f73, 0x0000, 0x0f75, 0x0000, 0x0f77, + 0x0000, 0x0f79, 0x0000, 0x0f7b, 0x0000, 0x0f7d, 0x0000, 0x0f7f, + 0x0000, 0x0f81, 0x0000, 0x0f83, 0x0000, 0x0f85, 0x0000, 0x0f87, + /* 0x2f60 .. 0x2f6f */ + 0x0000, 0x0f89, 0x0000, 0x0f8b, 0x0000, 0x0f8d, 0x0000, 0x0f8f, + 0x0000, 0x0f91, 0x0000, 0x0f93, 0x0000, 0x0f95, 0x0000, 0x0f97, + 0x0000, 0x0f99, 0x0000, 0x0f9b, 0x0000, 0x0f9d, 0x0000, 0x0f9f, + 0x0000, 0x0fa1, 0x0000, 0x0fa3, 0x0000, 0x0fa5, 0x0000, 0x0fa7, + /* 0x2f70 .. 0x2f7f */ + 0x0000, 0x0fa9, 0x0000, 0x0fab, 0x0000, 0x0fad, 0x0000, 0x0faf, + 0x0000, 0x0fb1, 0x0000, 0x0fb3, 0x0000, 0x0fb5, 0x0000, 0x0fb7, + 0x0000, 0x0fb9, 0x0000, 0x0fbb, 0x0000, 0x0fbd, 0x0000, 0x0fbf, + 0x0000, 0x0fc1, 0x0000, 0x0fc3, 0x0000, 0x0fc5, 0x0000, 0x0fc7, + /* 0x2f80 .. 0x2f8f */ + 0x0000, 0x0fc9, 0x0000, 0x0fcb, 0x0000, 0x0fcd, 0x0000, 0x0fcf, + 0x0000, 0x0fd1, 0x0000, 0x0fd3, 0x0000, 0x0fd5, 0x0000, 0x0fd7, + 0x0000, 0x0fd9, 0x0000, 0x0fdb, 0x0000, 0x0fdd, 0x0000, 0x0fdf, + 0x0000, 0x0fe1, 0x0000, 0x0fe3, 0x0000, 0x0fe5, 0x0000, 0x0fe7, + /* 0x2f90 .. 0x2f9f */ + 0x0000, 0x0fe9, 0x0000, 0x0feb, 0x0000, 0x0fed, 0x0000, 0x0fef, + 0x0000, 0x0ff1, 0x0000, 0x0ff3, 0x0000, 0x0ff5, 0x0000, 0x0ff7, + 0x0000, 0x0ff9, 0x0000, 0x0ffb, 0x0000, 0x0ffd, 0x0000, 0x0fff, + 0x0000, 0x1001, 0x0000, 0x1003, 0x0000, 0x1005, 0x0000, 0x1007, + /* 0x2fa0 .. 0x2faf */ + 0x0000, 0x1009, 0x0000, 0x100b, 0x0000, 0x100d, 0x0000, 0x100f, + 0x0000, 0x1011, 0x0000, 0x1013, 0x0000, 0x1015, 0x0000, 0x1017, + 0x0000, 0x1019, 0x0000, 0x101b, 0x0000, 0x101d, 0x0000, 0x101f, + 0x0000, 0x1021, 0x0000, 0x1023, 0x0000, 0x1025, 0x0000, 0x1027, + /* 0x2fb0 .. 0x2fbf */ + 0x0000, 0x1029, 0x0000, 0x102b, 0x0000, 0x102d, 0x0000, 0x102f, + 0x0000, 0x1031, 0x0000, 0x1033, 0x0000, 0x1035, 0x0000, 0x1037, + 0x0000, 0x1039, 0x0000, 0x103b, 0x0000, 0x103d, 0x0000, 0x103f, + 0x0000, 0x1041, 0x0000, 0x1043, 0x0000, 0x1045, 0x0000, 0x1047, + /* 0x2fc0 .. 0x2fcf */ + 0x0000, 0x1049, 0x0000, 0x104b, 0x0000, 0x104d, 0x0000, 0x104f, + 0x0000, 0x1051, 0x0000, 0x1053, 0x0000, 0x1055, 0x0000, 0x1057, + 0x0000, 0x1059, 0x0000, 0x105b, 0x0000, 0x105d, 0x0000, 0x105f, + 0x0000, 0x1061, 0x0000, 0x1063, 0x0000, 0x1065, 0x0000, 0x1067, + /* 0x2fd0 .. 0x2fdf */ + 0x0000, 0x1069, 0x0000, 0x106b, 0x0000, 0x106d, 0x0000, 0x106f, + 0x0000, 0x1071, 0x0000, 0x1073, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x3000 .. 0x300f */ + 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x3030 .. 0x303f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1075, 0x0000, 0x0000, + 0x0000, 0x0ef7, 0x0000, 0x1077, 0x0000, 0x1079, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x3040 .. 0x304f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x304b, 0x3099, 0x0000, 0x0000, 0x304d, 0x3099, 0x0000, 0x0000, + 0x107b, 0x107b, 0x0000, 0x0000, 0x107e, 0x107e, 0x0000, 0x0000, /* 0x3050 .. 0x305f */ - 0x304f, 0x3099, 0x0000, 0x0000, 0x3051, 0x3099, 0x0000, 0x0000, - 0x3053, 0x3099, 0x0000, 0x0000, 0x3055, 0x3099, 0x0000, 0x0000, - 0x3057, 0x3099, 0x0000, 0x0000, 0x3059, 0x3099, 0x0000, 0x0000, - 0x305b, 0x3099, 0x0000, 0x0000, 0x305d, 0x3099, 0x0000, 0x0000, + 0x1081, 0x1081, 0x0000, 0x0000, 0x1084, 0x1084, 0x0000, 0x0000, + 0x1087, 0x1087, 0x0000, 0x0000, 0x108a, 0x108a, 0x0000, 0x0000, + 0x108d, 0x108d, 0x0000, 0x0000, 0x1090, 0x1090, 0x0000, 0x0000, + 0x1093, 0x1093, 0x0000, 0x0000, 0x1096, 0x1096, 0x0000, 0x0000, /* 0x3060 .. 0x306f */ - 0x305f, 0x3099, 0x0000, 0x0000, 0x3061, 0x3099, 0x0000, 0x0000, - 0x0000, 0x0000, 0x3064, 0x3099, 0x0000, 0x0000, 0x3066, 0x3099, - 0x0000, 0x0000, 0x3068, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1099, 0x1099, 0x0000, 0x0000, 0x109c, 0x109c, 0x0000, 0x0000, + 0x0000, 0x0000, 0x109f, 0x109f, 0x0000, 0x0000, 0x10a2, 0x10a2, + 0x0000, 0x0000, 0x10a5, 0x10a5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x3070 .. 0x307f */ - 0x306f, 0x3099, 0x306f, 0x309a, 0x0000, 0x0000, 0x3072, 0x3099, - 0x3072, 0x309a, 0x0000, 0x0000, 0x3075, 0x3099, 0x3075, 0x309a, - 0x0000, 0x0000, 0x3078, 0x3099, 0x3078, 0x309a, 0x0000, 0x0000, - 0x307b, 0x3099, 0x307b, 0x309a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x10a8, 0x10a8, 0x10ab, 0x10ab, 0x0000, 0x0000, 0x10ae, 0x10ae, + 0x10b1, 0x10b1, 0x0000, 0x0000, 0x10b4, 0x10b4, 0x10b7, 0x10b7, + 0x0000, 0x0000, 0x10ba, 0x10ba, 0x10bd, 0x10bd, 0x0000, 0x0000, + 0x10c0, 0x10c0, 0x10c3, 0x10c3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x3090 .. 0x309f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x3046, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x309d, 0x3099, 0x0000, 0x0000, + 0x10c6, 0x10c6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x10c9, + 0x0000, 0x10cc, 0x0000, 0x0000, 0x10cf, 0x10cf, 0x0000, 0x10d2, /* 0x30a0 .. 0x30af */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x30ab, 0x3099, 0x0000, 0x0000, 0x30ad, 0x3099, 0x0000, 0x0000, + 0x10d5, 0x10d5, 0x0000, 0x0000, 0x10d8, 0x10d8, 0x0000, 0x0000, /* 0x30b0 .. 0x30bf */ - 0x30af, 0x3099, 0x0000, 0x0000, 0x30b1, 0x3099, 0x0000, 0x0000, - 0x30b3, 0x3099, 0x0000, 0x0000, 0x30b5, 0x3099, 0x0000, 0x0000, - 0x30b7, 0x3099, 0x0000, 0x0000, 0x30b9, 0x3099, 0x0000, 0x0000, - 0x30bb, 0x3099, 0x0000, 0x0000, 0x30bd, 0x3099, 0x0000, 0x0000, + 0x10db, 0x10db, 0x0000, 0x0000, 0x10de, 0x10de, 0x0000, 0x0000, + 0x10e1, 0x10e1, 0x0000, 0x0000, 0x10e4, 0x10e4, 0x0000, 0x0000, + 0x10e7, 0x10e7, 0x0000, 0x0000, 0x10ea, 0x10ea, 0x0000, 0x0000, + 0x10ed, 0x10ed, 0x0000, 0x0000, 0x10f0, 0x10f0, 0x0000, 0x0000, /* 0x30c0 .. 0x30cf */ - 0x30bf, 0x3099, 0x0000, 0x0000, 0x30c1, 0x3099, 0x0000, 0x0000, - 0x0000, 0x0000, 0x30c4, 0x3099, 0x0000, 0x0000, 0x30c6, 0x3099, - 0x0000, 0x0000, 0x30c8, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, + 0x10f3, 0x10f3, 0x0000, 0x0000, 0x10f6, 0x10f6, 0x0000, 0x0000, + 0x0000, 0x0000, 0x10f9, 0x10f9, 0x0000, 0x0000, 0x10fc, 0x10fc, + 0x0000, 0x0000, 0x10ff, 0x10ff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x30d0 .. 0x30df */ - 0x30cf, 0x3099, 0x30cf, 0x309a, 0x0000, 0x0000, 0x30d2, 0x3099, - 0x30d2, 0x309a, 0x0000, 0x0000, 0x30d5, 0x3099, 0x30d5, 0x309a, - 0x0000, 0x0000, 0x30d8, 0x3099, 0x30d8, 0x309a, 0x0000, 0x0000, - 0x30db, 0x3099, 0x30db, 0x309a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1102, 0x1102, 0x1105, 0x1105, 0x0000, 0x0000, 0x1108, 0x1108, + 0x110b, 0x110b, 0x0000, 0x0000, 0x110e, 0x110e, 0x1111, 0x1111, + 0x0000, 0x0000, 0x1114, 0x1114, 0x1117, 0x1117, 0x0000, 0x0000, + 0x111a, 0x111a, 0x111d, 0x111d, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x30f0 .. 0x30ff */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x30a6, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, 0x30ef, 0x3099, - 0x30f0, 0x3099, 0x30f1, 0x3099, 0x30f2, 0x3099, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x30fd, 0x3099, 0x0000, 0x0000, - /* 0xfb10 .. 0xfb1f */ + 0x1120, 0x1120, 0x0000, 0x0000, 0x0000, 0x0000, 0x1123, 0x1123, + 0x1126, 0x1126, 0x1129, 0x1129, 0x112c, 0x112c, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x112f, 0x112f, 0x0000, 0x1132, + /* 0x3130 .. 0x313f */ + 0x0000, 0x0000, 0x0000, 0x1135, 0x0000, 0x1137, 0x0000, 0x1139, + 0x0000, 0x113b, 0x0000, 0x113d, 0x0000, 0x113f, 0x0000, 0x1141, + 0x0000, 0x1143, 0x0000, 0x1145, 0x0000, 0x1147, 0x0000, 0x1149, + 0x0000, 0x114b, 0x0000, 0x114d, 0x0000, 0x114f, 0x0000, 0x1151, + /* 0x3140 .. 0x314f */ + 0x0000, 0x1153, 0x0000, 0x1155, 0x0000, 0x1157, 0x0000, 0x1159, + 0x0000, 0x115b, 0x0000, 0x115d, 0x0000, 0x115f, 0x0000, 0x1161, + 0x0000, 0x1163, 0x0000, 0x1165, 0x0000, 0x1167, 0x0000, 0x1169, + 0x0000, 0x116b, 0x0000, 0x116d, 0x0000, 0x116f, 0x0000, 0x1171, + /* 0x3150 .. 0x315f */ + 0x0000, 0x1173, 0x0000, 0x1175, 0x0000, 0x1177, 0x0000, 0x1179, + 0x0000, 0x117b, 0x0000, 0x117d, 0x0000, 0x117f, 0x0000, 0x1181, + 0x0000, 0x1183, 0x0000, 0x1185, 0x0000, 0x1187, 0x0000, 0x1189, + 0x0000, 0x118b, 0x0000, 0x118d, 0x0000, 0x118f, 0x0000, 0x1191, + /* 0x3160 .. 0x316f */ + 0x0000, 0x1193, 0x0000, 0x1195, 0x0000, 0x1197, 0x0000, 0x1199, + 0x0000, 0x119b, 0x0000, 0x119d, 0x0000, 0x119f, 0x0000, 0x11a1, + 0x0000, 0x11a3, 0x0000, 0x11a5, 0x0000, 0x11a7, 0x0000, 0x11a9, + 0x0000, 0x11ab, 0x0000, 0x11ad, 0x0000, 0x11af, 0x0000, 0x11b1, + /* 0x3170 .. 0x317f */ + 0x0000, 0x11b3, 0x0000, 0x11b5, 0x0000, 0x11b7, 0x0000, 0x11b9, + 0x0000, 0x11bb, 0x0000, 0x11bd, 0x0000, 0x11bf, 0x0000, 0x11c1, + 0x0000, 0x11c3, 0x0000, 0x11c5, 0x0000, 0x11c7, 0x0000, 0x11c9, + 0x0000, 0x11cb, 0x0000, 0x11cd, 0x0000, 0x11cf, 0x0000, 0x11d1, + /* 0x3180 .. 0x318f */ + 0x0000, 0x11d3, 0x0000, 0x11d5, 0x0000, 0x11d7, 0x0000, 0x11d9, + 0x0000, 0x11db, 0x0000, 0x11dd, 0x0000, 0x11df, 0x0000, 0x11e1, + 0x0000, 0x11e3, 0x0000, 0x11e5, 0x0000, 0x11e7, 0x0000, 0x11e9, + 0x0000, 0x11eb, 0x0000, 0x11ed, 0x0000, 0x11ef, 0x0000, 0x0000, + /* 0x3190 .. 0x319f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0ec9, 0x0000, 0x0ed5, + 0x0000, 0x11f1, 0x0000, 0x11f3, 0x0000, 0x11f5, 0x0000, 0x11f7, + 0x0000, 0x11f9, 0x0000, 0x11fb, 0x0000, 0x0ed1, 0x0000, 0x11fd, + 0x0000, 0x11ff, 0x0000, 0x1201, 0x0000, 0x1203, 0x0000, 0x0ed9, + /* 0x3200 .. 0x320f */ + 0x0000, 0x1205, 0x0000, 0x1209, 0x0000, 0x120d, 0x0000, 0x1211, + 0x0000, 0x1215, 0x0000, 0x1219, 0x0000, 0x121d, 0x0000, 0x1221, + 0x0000, 0x1225, 0x0000, 0x1229, 0x0000, 0x122d, 0x0000, 0x1231, + 0x0000, 0x1235, 0x0000, 0x1239, 0x0000, 0x123d, 0x0000, 0x1242, + /* 0x3210 .. 0x321f */ + 0x0000, 0x1247, 0x0000, 0x124c, 0x0000, 0x1251, 0x0000, 0x1256, + 0x0000, 0x125b, 0x0000, 0x1260, 0x0000, 0x1265, 0x0000, 0x126a, + 0x0000, 0x126f, 0x0000, 0x1274, 0x0000, 0x1279, 0x0000, 0x127e, + 0x0000, 0x1283, 0x0000, 0x1288, 0x0000, 0x1290, 0x0000, 0x0000, + /* 0x3220 .. 0x322f */ + 0x0000, 0x1297, 0x0000, 0x129b, 0x0000, 0x129f, 0x0000, 0x12a3, + 0x0000, 0x12a7, 0x0000, 0x12ab, 0x0000, 0x12af, 0x0000, 0x12b3, + 0x0000, 0x12b7, 0x0000, 0x12bb, 0x0000, 0x12bf, 0x0000, 0x12c3, + 0x0000, 0x12c7, 0x0000, 0x12cb, 0x0000, 0x12cf, 0x0000, 0x12d3, + /* 0x3230 .. 0x323f */ + 0x0000, 0x12d7, 0x0000, 0x12db, 0x0000, 0x12df, 0x0000, 0x12e3, + 0x0000, 0x12e7, 0x0000, 0x12eb, 0x0000, 0x12ef, 0x0000, 0x12f3, + 0x0000, 0x12f7, 0x0000, 0x12fb, 0x0000, 0x12ff, 0x0000, 0x1303, + 0x0000, 0x1307, 0x0000, 0x130b, 0x0000, 0x130f, 0x0000, 0x1313, + /* 0x3240 .. 0x324f */ + 0x0000, 0x1317, 0x0000, 0x131b, 0x0000, 0x131f, 0x0000, 0x1323, + 0x0000, 0x1327, 0x0000, 0x1329, 0x0000, 0x0f4d, 0x0000, 0x132b, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x3250 .. 0x325f */ + 0x0000, 0x132d, 0x0000, 0x1331, 0x0000, 0x1334, 0x0000, 0x1337, + 0x0000, 0x133a, 0x0000, 0x133d, 0x0000, 0x1340, 0x0000, 0x1343, + 0x0000, 0x1346, 0x0000, 0x1349, 0x0000, 0x134c, 0x0000, 0x134f, + 0x0000, 0x1352, 0x0000, 0x1355, 0x0000, 0x1358, 0x0000, 0x135b, + /* 0x3260 .. 0x326f */ + 0x0000, 0x1135, 0x0000, 0x113b, 0x0000, 0x1141, 0x0000, 0x1145, + 0x0000, 0x1155, 0x0000, 0x1157, 0x0000, 0x115d, 0x0000, 0x1161, + 0x0000, 0x1163, 0x0000, 0x1167, 0x0000, 0x1169, 0x0000, 0x116b, + 0x0000, 0x116d, 0x0000, 0x116f, 0x0000, 0x135e, 0x0000, 0x1361, + /* 0x3270 .. 0x327f */ + 0x0000, 0x1364, 0x0000, 0x1367, 0x0000, 0x136a, 0x0000, 0x136d, + 0x0000, 0x1370, 0x0000, 0x1373, 0x0000, 0x1376, 0x0000, 0x1379, + 0x0000, 0x137c, 0x0000, 0x137f, 0x0000, 0x1382, 0x0000, 0x1385, + 0x0000, 0x1388, 0x0000, 0x138e, 0x0000, 0x1393, 0x0000, 0x0000, + /* 0x3280 .. 0x328f */ + 0x0000, 0x0ec9, 0x0000, 0x0ed5, 0x0000, 0x11f1, 0x0000, 0x11f3, + 0x0000, 0x1396, 0x0000, 0x1398, 0x0000, 0x139a, 0x0000, 0x0edf, + 0x0000, 0x139c, 0x0000, 0x0ef7, 0x0000, 0x0f5b, 0x0000, 0x0f73, + 0x0000, 0x0f71, 0x0000, 0x0f5d, 0x0000, 0x1015, 0x0000, 0x0f07, + /* 0x3290 .. 0x329f */ + 0x0000, 0x0f57, 0x0000, 0x139e, 0x0000, 0x13a0, 0x0000, 0x13a2, + 0x0000, 0x13a4, 0x0000, 0x13a6, 0x0000, 0x13a8, 0x0000, 0x13aa, + 0x0000, 0x13ac, 0x0000, 0x13ae, 0x0000, 0x13b0, 0x0000, 0x0f13, + 0x0000, 0x13b2, 0x0000, 0x13b4, 0x0000, 0x13b6, 0x0000, 0x13b8, + /* 0x32a0 .. 0x32af */ + 0x0000, 0x13ba, 0x0000, 0x13bc, 0x0000, 0x13be, 0x0000, 0x13c0, + 0x0000, 0x11f5, 0x0000, 0x11f7, 0x0000, 0x11f9, 0x0000, 0x13c2, + 0x0000, 0x13c4, 0x0000, 0x13c6, 0x0000, 0x13c8, 0x0000, 0x13ca, + 0x0000, 0x13cc, 0x0000, 0x13ce, 0x0000, 0x13d0, 0x0000, 0x13d2, + /* 0x32b0 .. 0x32bf */ + 0x0000, 0x13d4, 0x0000, 0x13d6, 0x0000, 0x13d9, 0x0000, 0x13dc, + 0x0000, 0x13df, 0x0000, 0x13e2, 0x0000, 0x13e5, 0x0000, 0x13e8, + 0x0000, 0x13eb, 0x0000, 0x13ee, 0x0000, 0x13f1, 0x0000, 0x13f4, + 0x0000, 0x13f7, 0x0000, 0x13fa, 0x0000, 0x13fd, 0x0000, 0x1400, + /* 0x32c0 .. 0x32cf */ + 0x0000, 0x1403, 0x0000, 0x1406, 0x0000, 0x1409, 0x0000, 0x140c, + 0x0000, 0x140f, 0x0000, 0x1412, 0x0000, 0x1415, 0x0000, 0x1418, + 0x0000, 0x141b, 0x0000, 0x141e, 0x0000, 0x1422, 0x0000, 0x1426, + 0x0000, 0x142a, 0x0000, 0x142d, 0x0000, 0x1431, 0x0000, 0x1434, + /* 0x32d0 .. 0x32df */ + 0x0000, 0x1438, 0x0000, 0x143a, 0x0000, 0x143c, 0x0000, 0x143e, + 0x0000, 0x1440, 0x0000, 0x1442, 0x0000, 0x1444, 0x0000, 0x1446, + 0x0000, 0x1448, 0x0000, 0x144a, 0x0000, 0x144c, 0x0000, 0x144e, + 0x0000, 0x1450, 0x0000, 0x1452, 0x0000, 0x1454, 0x0000, 0x1456, + /* 0x32e0 .. 0x32ef */ + 0x0000, 0x1458, 0x0000, 0x145a, 0x0000, 0x145c, 0x0000, 0x145e, + 0x0000, 0x1460, 0x0000, 0x1462, 0x0000, 0x1464, 0x0000, 0x1466, + 0x0000, 0x1468, 0x0000, 0x146a, 0x0000, 0x146c, 0x0000, 0x146e, + 0x0000, 0x1470, 0x0000, 0x1472, 0x0000, 0x1474, 0x0000, 0x1476, + /* 0x32f0 .. 0x32ff */ + 0x0000, 0x1478, 0x0000, 0x147a, 0x0000, 0x147c, 0x0000, 0x147e, + 0x0000, 0x1480, 0x0000, 0x1482, 0x0000, 0x1484, 0x0000, 0x1486, + 0x0000, 0x1488, 0x0000, 0x148a, 0x0000, 0x148c, 0x0000, 0x148e, + 0x0000, 0x1490, 0x0000, 0x1492, 0x0000, 0x1494, 0x0000, 0x0000, + /* 0x3300 .. 0x330f */ + 0x0000, 0x1496, 0x0000, 0x149b, 0x0000, 0x14a0, 0x0000, 0x14a5, + 0x0000, 0x14a9, 0x0000, 0x14ae, 0x0000, 0x14b2, 0x0000, 0x14b6, + 0x0000, 0x14bc, 0x0000, 0x14c1, 0x0000, 0x14c5, 0x0000, 0x14c9, + 0x0000, 0x14cd, 0x0000, 0x14d2, 0x0000, 0x14d7, 0x0000, 0x14db, + /* 0x3310 .. 0x331f */ + 0x0000, 0x14df, 0x0000, 0x14e2, 0x0000, 0x14e6, 0x0000, 0x14eb, + 0x0000, 0x14f0, 0x0000, 0x14f3, 0x0000, 0x14f9, 0x0000, 0x1500, + 0x0000, 0x1506, 0x0000, 0x150a, 0x0000, 0x1510, 0x0000, 0x1516, + 0x0000, 0x151b, 0x0000, 0x151f, 0x0000, 0x1523, 0x0000, 0x1527, + /* 0x3320 .. 0x332f */ + 0x0000, 0x152c, 0x0000, 0x1532, 0x0000, 0x1537, 0x0000, 0x153b, + 0x0000, 0x153f, 0x0000, 0x1543, 0x0000, 0x1546, 0x0000, 0x1549, + 0x0000, 0x154c, 0x0000, 0x154f, 0x0000, 0x1553, 0x0000, 0x1557, + 0x0000, 0x155d, 0x0000, 0x1561, 0x0000, 0x1566, 0x0000, 0x156c, + /* 0x3330 .. 0x333f */ + 0x0000, 0x1570, 0x0000, 0x1573, 0x0000, 0x1576, 0x0000, 0x157c, + 0x0000, 0x1581, 0x0000, 0x1587, 0x0000, 0x158b, 0x0000, 0x1591, + 0x0000, 0x1594, 0x0000, 0x1598, 0x0000, 0x159c, 0x0000, 0x15a0, + 0x0000, 0x15a4, 0x0000, 0x15a8, 0x0000, 0x15ad, 0x0000, 0x15b1, + /* 0x3340 .. 0x334f */ + 0x0000, 0x15b4, 0x0000, 0x15b8, 0x0000, 0x15bc, 0x0000, 0x15c0, + 0x0000, 0x15c5, 0x0000, 0x15c9, 0x0000, 0x15cd, 0x0000, 0x15d1, + 0x0000, 0x15d7, 0x0000, 0x15dc, 0x0000, 0x15df, 0x0000, 0x15e5, + 0x0000, 0x15e8, 0x0000, 0x15ed, 0x0000, 0x15f2, 0x0000, 0x15f6, + /* 0x3350 .. 0x335f */ + 0x0000, 0x15fa, 0x0000, 0x15fe, 0x0000, 0x1603, 0x0000, 0x1606, + 0x0000, 0x160a, 0x0000, 0x160f, 0x0000, 0x1612, 0x0000, 0x1618, + 0x0000, 0x161c, 0x0000, 0x161f, 0x0000, 0x1622, 0x0000, 0x1625, + 0x0000, 0x1628, 0x0000, 0x162b, 0x0000, 0x162e, 0x0000, 0x1631, + /* 0x3360 .. 0x336f */ + 0x0000, 0x1634, 0x0000, 0x1637, 0x0000, 0x163a, 0x0000, 0x163e, + 0x0000, 0x1642, 0x0000, 0x1646, 0x0000, 0x164a, 0x0000, 0x164e, + 0x0000, 0x1652, 0x0000, 0x1656, 0x0000, 0x165a, 0x0000, 0x165e, + 0x0000, 0x1662, 0x0000, 0x1666, 0x0000, 0x166a, 0x0000, 0x166e, + /* 0x3370 .. 0x337f */ + 0x0000, 0x1672, 0x0000, 0x1676, 0x0000, 0x167a, 0x0000, 0x167d, + 0x0000, 0x1680, 0x0000, 0x1684, 0x0000, 0x1687, 0x0000, 0x168a, + 0x0000, 0x168d, 0x0000, 0x1691, 0x0000, 0x1695, 0x0000, 0x1698, + 0x0000, 0x169b, 0x0000, 0x169e, 0x0000, 0x16a1, 0x0000, 0x16a4, + /* 0x3380 .. 0x338f */ + 0x0000, 0x16a9, 0x0000, 0x16ac, 0x0000, 0x16af, 0x0000, 0x16b2, + 0x0000, 0x16b5, 0x0000, 0x16b8, 0x0000, 0x16bb, 0x0000, 0x16be, + 0x0000, 0x16c1, 0x0000, 0x16c5, 0x0000, 0x16ca, 0x0000, 0x16cd, + 0x0000, 0x16d0, 0x0000, 0x16d3, 0x0000, 0x16d6, 0x0000, 0x16d9, + /* 0x3390 .. 0x339f */ + 0x0000, 0x16dc, 0x0000, 0x16df, 0x0000, 0x16e3, 0x0000, 0x16e7, + 0x0000, 0x16eb, 0x0000, 0x16ef, 0x0000, 0x16f2, 0x0000, 0x16f5, + 0x0000, 0x16f8, 0x0000, 0x16fb, 0x0000, 0x16fe, 0x0000, 0x1701, + 0x0000, 0x1704, 0x0000, 0x1707, 0x0000, 0x170a, 0x0000, 0x170d, + /* 0x33a0 .. 0x33af */ + 0x0000, 0x1711, 0x0000, 0x1715, 0x0000, 0x1718, 0x0000, 0x171c, + 0x0000, 0x1720, 0x0000, 0x1724, 0x0000, 0x1727, 0x0000, 0x172b, + 0x0000, 0x172f, 0x0000, 0x1734, 0x0000, 0x1737, 0x0000, 0x173b, + 0x0000, 0x173f, 0x0000, 0x1743, 0x0000, 0x1747, 0x0000, 0x174d, + /* 0x33b0 .. 0x33bf */ + 0x0000, 0x1754, 0x0000, 0x1757, 0x0000, 0x175a, 0x0000, 0x175d, + 0x0000, 0x1760, 0x0000, 0x1763, 0x0000, 0x1766, 0x0000, 0x1769, + 0x0000, 0x176c, 0x0000, 0x176f, 0x0000, 0x1772, 0x0000, 0x1775, + 0x0000, 0x1778, 0x0000, 0x177b, 0x0000, 0x177e, 0x0000, 0x1781, + /* 0x33c0 .. 0x33cf */ + 0x0000, 0x1784, 0x0000, 0x1787, 0x0000, 0x178a, 0x0000, 0x178f, + 0x0000, 0x1792, 0x0000, 0x1795, 0x0000, 0x1798, 0x0000, 0x179d, + 0x0000, 0x17a1, 0x0000, 0x17a4, 0x0000, 0x17a7, 0x0000, 0x17aa, + 0x0000, 0x17ad, 0x0000, 0x17b0, 0x0000, 0x17b3, 0x0000, 0x17b6, + /* 0x33d0 .. 0x33df */ + 0x0000, 0x17b9, 0x0000, 0x17bc, 0x0000, 0x17bf, 0x0000, 0x17c3, + 0x0000, 0x17c6, 0x0000, 0x17c9, 0x0000, 0x17cd, 0x0000, 0x17d1, + 0x0000, 0x17d4, 0x0000, 0x17d9, 0x0000, 0x17dd, 0x0000, 0x17e0, + 0x0000, 0x17e3, 0x0000, 0x17e6, 0x0000, 0x17e9, 0x0000, 0x17ed, + /* 0x33e0 .. 0x33ef */ + 0x0000, 0x17f1, 0x0000, 0x17f4, 0x0000, 0x17f7, 0x0000, 0x17fa, + 0x0000, 0x17fd, 0x0000, 0x1800, 0x0000, 0x1803, 0x0000, 0x1806, + 0x0000, 0x1809, 0x0000, 0x180c, 0x0000, 0x1810, 0x0000, 0x1814, + 0x0000, 0x1818, 0x0000, 0x181c, 0x0000, 0x1820, 0x0000, 0x1824, + /* 0x33f0 .. 0x33ff */ + 0x0000, 0x1828, 0x0000, 0x182c, 0x0000, 0x1830, 0x0000, 0x1834, + 0x0000, 0x1838, 0x0000, 0x183c, 0x0000, 0x1840, 0x0000, 0x1844, + 0x0000, 0x1848, 0x0000, 0x184c, 0x0000, 0x1850, 0x0000, 0x1854, + 0x0000, 0x1858, 0x0000, 0x185c, 0x0000, 0x1860, 0x0000, 0x1864, + /* 0xa690 .. 0xa69f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x1868, 0x0000, 0x186a, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xa770 .. 0xa77f */ + 0x0000, 0x186c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xa7f0 .. 0xa7ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x186e, 0x0000, 0x1870, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xab50 .. 0xab5f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x1872, 0x0000, 0x1874, 0x0000, 0x1876, 0x0000, 0x1878, + /* 0xf900 .. 0xf90f */ + 0x187a, 0x187a, 0x187c, 0x187c, 0x1005, 0x1005, 0x187e, 0x187e, + 0x1880, 0x1880, 0x1882, 0x1882, 0x1884, 0x1884, 0x1071, 0x1071, + 0x1071, 0x1071, 0x1886, 0x1886, 0x1015, 0x1015, 0x1888, 0x1888, + 0x188a, 0x188a, 0x188c, 0x188c, 0x188e, 0x188e, 0x1890, 0x1890, + /* 0xf910 .. 0xf91f */ + 0x1892, 0x1892, 0x1894, 0x1894, 0x1896, 0x1896, 0x1898, 0x1898, + 0x189a, 0x189a, 0x189c, 0x189c, 0x189e, 0x189e, 0x18a0, 0x18a0, + 0x18a2, 0x18a2, 0x18a4, 0x18a4, 0x18a6, 0x18a6, 0x18a8, 0x18a8, + 0x18aa, 0x18aa, 0x18ac, 0x18ac, 0x18ae, 0x18ae, 0x18b0, 0x18b0, + /* 0xf920 .. 0xf92f */ + 0x18b2, 0x18b2, 0x18b4, 0x18b4, 0x18b6, 0x18b6, 0x18b8, 0x18b8, + 0x18ba, 0x18ba, 0x18bc, 0x18bc, 0x18be, 0x18be, 0x18c0, 0x18c0, + 0x18c2, 0x18c2, 0x18c4, 0x18c4, 0x18c6, 0x18c6, 0x18c8, 0x18c8, + 0x18ca, 0x18ca, 0x18cc, 0x18cc, 0x18ce, 0x18ce, 0x18d0, 0x18d0, + /* 0xf930 .. 0xf93f */ + 0x18d2, 0x18d2, 0x18d4, 0x18d4, 0x18d6, 0x18d6, 0x18d8, 0x18d8, + 0x0fc1, 0x0fc1, 0x18da, 0x18da, 0x18dc, 0x18dc, 0x18de, 0x18de, + 0x18e0, 0x18e0, 0x18e2, 0x18e2, 0x18e4, 0x18e4, 0x18e6, 0x18e6, + 0x18e8, 0x18e8, 0x18ea, 0x18ea, 0x18ec, 0x18ec, 0x18ee, 0x18ee, + /* 0xf940 .. 0xf94f */ + 0x1053, 0x1053, 0x18f0, 0x18f0, 0x18f2, 0x18f2, 0x18f4, 0x18f4, + 0x18f6, 0x18f6, 0x18f8, 0x18f8, 0x18fa, 0x18fa, 0x18fc, 0x18fc, + 0x18fe, 0x18fe, 0x1900, 0x1900, 0x1902, 0x1902, 0x1904, 0x1904, + 0x1906, 0x1906, 0x1908, 0x1908, 0x190a, 0x190a, 0x190c, 0x190c, + /* 0xf950 .. 0xf95f */ + 0x190e, 0x190e, 0x1910, 0x1910, 0x1912, 0x1912, 0x1914, 0x1914, + 0x1916, 0x1916, 0x1918, 0x1918, 0x191a, 0x191a, 0x191c, 0x191c, + 0x191e, 0x191e, 0x1920, 0x1920, 0x1922, 0x1922, 0x1924, 0x1924, + 0x189a, 0x189a, 0x1926, 0x1926, 0x1928, 0x1928, 0x192a, 0x192a, + /* 0xf960 .. 0xf96f */ + 0x192c, 0x192c, 0x192e, 0x192e, 0x1930, 0x1930, 0x1932, 0x1932, + 0x1934, 0x1934, 0x1936, 0x1936, 0x1938, 0x1938, 0x193a, 0x193a, + 0x193c, 0x193c, 0x193e, 0x193e, 0x1940, 0x1940, 0x1942, 0x1942, + 0x1944, 0x1944, 0x1946, 0x1946, 0x1948, 0x1948, 0x194a, 0x194a, + /* 0xf970 .. 0xf97f */ + 0x194c, 0x194c, 0x1009, 0x1009, 0x194e, 0x194e, 0x1950, 0x1950, + 0x1952, 0x1952, 0x1954, 0x1954, 0x1956, 0x1956, 0x1958, 0x1958, + 0x195a, 0x195a, 0x195c, 0x195c, 0x195e, 0x195e, 0x1960, 0x1960, + 0x1962, 0x1962, 0x1964, 0x1964, 0x1966, 0x1966, 0x1968, 0x1968, + /* 0xf980 .. 0xf98f */ + 0x196a, 0x196a, 0x0f13, 0x0f13, 0x196c, 0x196c, 0x196e, 0x196e, + 0x1970, 0x1970, 0x1972, 0x1972, 0x1974, 0x1974, 0x1976, 0x1976, + 0x1978, 0x1978, 0x197a, 0x197a, 0x0eed, 0x0eed, 0x197c, 0x197c, + 0x197e, 0x197e, 0x1980, 0x1980, 0x1982, 0x1982, 0x1984, 0x1984, + /* 0xf990 .. 0xf99f */ + 0x1986, 0x1986, 0x1988, 0x1988, 0x198a, 0x198a, 0x198c, 0x198c, + 0x198e, 0x198e, 0x1990, 0x1990, 0x1992, 0x1992, 0x1994, 0x1994, + 0x1996, 0x1996, 0x1998, 0x1998, 0x199a, 0x199a, 0x199c, 0x199c, + 0x199e, 0x199e, 0x19a0, 0x19a0, 0x19a2, 0x19a2, 0x19a4, 0x19a4, + /* 0xf9a0 .. 0xf9af */ + 0x19a6, 0x19a6, 0x194a, 0x194a, 0x19a8, 0x19a8, 0x19aa, 0x19aa, + 0x19ac, 0x19ac, 0x19ae, 0x19ae, 0x19b0, 0x19b0, 0x19b2, 0x19b2, + 0x19b4, 0x19b4, 0x19b6, 0x19b6, 0x192a, 0x192a, 0x19b8, 0x19b8, + 0x19ba, 0x19ba, 0x19bc, 0x19bc, 0x19be, 0x19be, 0x19c0, 0x19c0, + /* 0xf9b0 .. 0xf9bf */ + 0x19c2, 0x19c2, 0x19c4, 0x19c4, 0x19c6, 0x19c6, 0x19c8, 0x19c8, + 0x19ca, 0x19ca, 0x19cc, 0x19cc, 0x19ce, 0x19ce, 0x19d0, 0x19d0, + 0x19d2, 0x19d2, 0x19d4, 0x19d4, 0x19d6, 0x19d6, 0x19d8, 0x19d8, + 0x19da, 0x19da, 0x19dc, 0x19dc, 0x19de, 0x19de, 0x189a, 0x189a, + /* 0xf9c0 .. 0xf9cf */ + 0x19e0, 0x19e0, 0x19e2, 0x19e2, 0x19e4, 0x19e4, 0x19e6, 0x19e6, + 0x106f, 0x106f, 0x19e8, 0x19e8, 0x19ea, 0x19ea, 0x19ec, 0x19ec, + 0x19ee, 0x19ee, 0x19f0, 0x19f0, 0x19f2, 0x19f2, 0x19f4, 0x19f4, + 0x19f6, 0x19f6, 0x19f8, 0x19f8, 0x19fa, 0x19fa, 0x19fc, 0x19fc, + /* 0xf9d0 .. 0xf9df */ + 0x19fe, 0x19fe, 0x1398, 0x1398, 0x1a00, 0x1a00, 0x1a02, 0x1a02, + 0x1a04, 0x1a04, 0x1a06, 0x1a06, 0x1a08, 0x1a08, 0x1a0a, 0x1a0a, + 0x1a0c, 0x1a0c, 0x1a0e, 0x1a0e, 0x1a10, 0x1a10, 0x192e, 0x192e, + 0x1a12, 0x1a12, 0x1a14, 0x1a14, 0x1a16, 0x1a16, 0x1a18, 0x1a18, + /* 0xf9e0 .. 0xf9ef */ + 0x1a1a, 0x1a1a, 0x1a1c, 0x1a1c, 0x1a1e, 0x1a1e, 0x1a20, 0x1a20, + 0x1a22, 0x1a22, 0x1a24, 0x1a24, 0x1a26, 0x1a26, 0x1a28, 0x1a28, + 0x1a2a, 0x1a2a, 0x1013, 0x1013, 0x1a2c, 0x1a2c, 0x1a2e, 0x1a2e, + 0x1a30, 0x1a30, 0x1a32, 0x1a32, 0x1a34, 0x1a34, 0x1a36, 0x1a36, + /* 0xf9f0 .. 0xf9ff */ + 0x1a38, 0x1a38, 0x1a3a, 0x1a3a, 0x1a3c, 0x1a3c, 0x1a3e, 0x1a3e, + 0x1a40, 0x1a40, 0x1a42, 0x1a42, 0x1a44, 0x1a44, 0x0fb1, 0x0fb1, + 0x1a46, 0x1a46, 0x1a48, 0x1a48, 0x1a4a, 0x1a4a, 0x1a4c, 0x1a4c, + 0x1a4e, 0x1a4e, 0x1a50, 0x1a50, 0x1a52, 0x1a52, 0x1a54, 0x1a54, + /* 0xfa00 .. 0xfa0f */ + 0x1a56, 0x1a56, 0x1a58, 0x1a58, 0x1a5a, 0x1a5a, 0x1a5c, 0x1a5c, + 0x1a5e, 0x1a5e, 0x1a60, 0x1a60, 0x1a62, 0x1a62, 0x1a64, 0x1a64, + 0x0fe7, 0x0fe7, 0x1a66, 0x1a66, 0x0fed, 0x0fed, 0x1a68, 0x1a68, + 0x1a6a, 0x1a6a, 0x1a6c, 0x1a6c, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfa10 .. 0xfa1f */ + 0x1a6e, 0x1a6e, 0x0000, 0x0000, 0x1a70, 0x1a70, 0x0000, 0x0000, + 0x0000, 0x0000, 0x1a72, 0x1a72, 0x1a74, 0x1a74, 0x1a76, 0x1a76, + 0x1a78, 0x1a78, 0x1a7a, 0x1a7a, 0x1a7c, 0x1a7c, 0x1a7e, 0x1a7e, + 0x1a80, 0x1a80, 0x1a82, 0x1a82, 0x0fbf, 0x0fbf, 0x0000, 0x0000, + /* 0xfa20 .. 0xfa2f */ + 0x1a84, 0x1a84, 0x0000, 0x0000, 0x1a86, 0x1a86, 0x0000, 0x0000, + 0x0000, 0x0000, 0x1a88, 0x1a88, 0x1a8a, 0x1a8a, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x1a8c, 0x1a8c, 0x1a8e, 0x1a8e, + 0x1a90, 0x1a90, 0x1a92, 0x1a92, 0x1a94, 0x1a94, 0x1a96, 0x1a96, + /* 0xfa30 .. 0xfa3f */ + 0x1a98, 0x1a98, 0x1a9a, 0x1a9a, 0x1a9c, 0x1a9c, 0x1a9e, 0x1a9e, + 0x1aa0, 0x1aa0, 0x1aa2, 0x1aa2, 0x1aa4, 0x1aa4, 0x1aa6, 0x1aa6, + 0x1aa8, 0x1aa8, 0x1aaa, 0x1aaa, 0x1aac, 0x1aac, 0x1aae, 0x1aae, + 0x0f21, 0x0f21, 0x1ab0, 0x1ab0, 0x1ab2, 0x1ab2, 0x1ab4, 0x1ab4, + /* 0xfa40 .. 0xfa4f */ + 0x1ab6, 0x1ab6, 0x1ab8, 0x1ab8, 0x1aba, 0x1aba, 0x1abc, 0x1abc, + 0x1abe, 0x1abe, 0x1ac0, 0x1ac0, 0x1ac2, 0x1ac2, 0x1ac4, 0x1ac4, + 0x1ac6, 0x1ac6, 0x1ac8, 0x1ac8, 0x1aca, 0x1aca, 0x1acc, 0x1acc, + 0x13a2, 0x13a2, 0x1ace, 0x1ace, 0x1ad0, 0x1ad0, 0x1ad2, 0x1ad2, + /* 0xfa50 .. 0xfa5f */ + 0x1ad4, 0x1ad4, 0x13aa, 0x13aa, 0x1ad6, 0x1ad6, 0x1ad8, 0x1ad8, + 0x1ada, 0x1ada, 0x1adc, 0x1adc, 0x1ade, 0x1ade, 0x1992, 0x1992, + 0x1ae0, 0x1ae0, 0x1ae2, 0x1ae2, 0x1ae4, 0x1ae4, 0x1ae6, 0x1ae6, + 0x1ae8, 0x1ae8, 0x1aea, 0x1aea, 0x1aea, 0x1aea, 0x1aec, 0x1aec, + /* 0xfa60 .. 0xfa6f */ + 0x1aee, 0x1aee, 0x1af0, 0x1af0, 0x1af2, 0x1af2, 0x1af4, 0x1af4, + 0x1af6, 0x1af6, 0x1af8, 0x1af8, 0x1afa, 0x1afa, 0x1a88, 0x1a88, + 0x1afc, 0x1afc, 0x1afe, 0x1afe, 0x1b00, 0x1b00, 0x1b02, 0x1b02, + 0x1b04, 0x1b04, 0x1b05, 0x1b05, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfa70 .. 0xfa7f */ + 0x1b07, 0x1b07, 0x1b09, 0x1b09, 0x1b0b, 0x1b0b, 0x1b0d, 0x1b0d, + 0x1b0f, 0x1b0f, 0x1b11, 0x1b11, 0x1b13, 0x1b13, 0x1b15, 0x1b15, + 0x1aa4, 0x1aa4, 0x1b17, 0x1b17, 0x1b19, 0x1b19, 0x1b1b, 0x1b1b, + 0x1a6e, 0x1a6e, 0x1b1d, 0x1b1d, 0x1b1f, 0x1b1f, 0x1b21, 0x1b21, + /* 0xfa80 .. 0xfa8f */ + 0x1b23, 0x1b23, 0x1b25, 0x1b25, 0x1b27, 0x1b27, 0x1b29, 0x1b29, + 0x1b2b, 0x1b2b, 0x1b2d, 0x1b2d, 0x1b2f, 0x1b2f, 0x1b31, 0x1b31, + 0x1b33, 0x1b33, 0x1ab4, 0x1ab4, 0x1b35, 0x1b35, 0x1ab6, 0x1ab6, + 0x1b37, 0x1b37, 0x1b39, 0x1b39, 0x1b3b, 0x1b3b, 0x1b3d, 0x1b3d, + /* 0xfa90 .. 0xfa9f */ + 0x1b3f, 0x1b3f, 0x1a70, 0x1a70, 0x18c4, 0x18c4, 0x1b41, 0x1b41, + 0x1b43, 0x1b43, 0x0f63, 0x0f63, 0x194c, 0x194c, 0x19f2, 0x19f2, + 0x1b45, 0x1b45, 0x1b47, 0x1b47, 0x1ac4, 0x1ac4, 0x1b49, 0x1b49, + 0x1ac6, 0x1ac6, 0x1b4b, 0x1b4b, 0x1b4d, 0x1b4d, 0x1b4f, 0x1b4f, + /* 0xfaa0 .. 0xfaaf */ + 0x1a74, 0x1a74, 0x1b51, 0x1b51, 0x1b53, 0x1b53, 0x1b55, 0x1b55, + 0x1b57, 0x1b57, 0x1b59, 0x1b59, 0x1a76, 0x1a76, 0x1b5b, 0x1b5b, + 0x1b5d, 0x1b5d, 0x1b5f, 0x1b5f, 0x1b61, 0x1b61, 0x1b63, 0x1b63, + 0x1b65, 0x1b65, 0x1ade, 0x1ade, 0x1b67, 0x1b67, 0x1b69, 0x1b69, + /* 0xfab0 .. 0xfabf */ + 0x1992, 0x1992, 0x1b6b, 0x1b6b, 0x1ae6, 0x1ae6, 0x1b6d, 0x1b6d, + 0x1b6f, 0x1b6f, 0x1b71, 0x1b71, 0x1b73, 0x1b73, 0x1b75, 0x1b75, + 0x1af0, 0x1af0, 0x1b77, 0x1b77, 0x1a86, 0x1a86, 0x1b79, 0x1b79, + 0x1af2, 0x1af2, 0x1926, 0x1926, 0x1b7b, 0x1b7b, 0x1af4, 0x1af4, + /* 0xfac0 .. 0xfacf */ + 0x1b7d, 0x1b7d, 0x1af8, 0x1af8, 0x1b7f, 0x1b7f, 0x1b81, 0x1b81, + 0x1b83, 0x1b83, 0x1b85, 0x1b85, 0x1b87, 0x1b87, 0x1afc, 0x1afc, + 0x1a80, 0x1a80, 0x1b89, 0x1b89, 0x1afe, 0x1afe, 0x1b8b, 0x1b8b, + 0x1b00, 0x1b00, 0x1b8d, 0x1b8d, 0x1071, 0x1071, 0x1b04, 0x1b04, + /* 0xfad0 .. 0xfadf */ + 0x1b04, 0x1b04, 0x1b04, 0x1b04, 0x1b8f, 0x1b8f, 0x1b91, 0x1b91, + 0x1b93, 0x1b93, 0x1b04, 0x1b04, 0x1b04, 0x1b04, 0x1b04, 0x1b04, + 0x1b95, 0x1b95, 0x1b97, 0x1b97, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfb00 .. 0xfb0f */ + 0x0000, 0x1b99, 0x0000, 0x1b9c, 0x0000, 0x1b9f, 0x0000, 0x1ba2, + 0x0000, 0x1ba6, 0x0000, 0x1baa, 0x0000, 0x1bad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfb10 .. 0xfb1f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1bb0, + 0x0000, 0x1bb3, 0x0000, 0x1bb6, 0x0000, 0x1bb9, 0x0000, 0x1bbc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x05d9, 0x05b4, 0x0000, 0x0000, 0x05f2, 0x05b7, + 0x0000, 0x0000, 0x1bbf, 0x1bbf, 0x0000, 0x0000, 0x1bc2, 0x1bc2, /* 0xfb20 .. 0xfb2f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x05e9, 0x05c1, 0x05e9, 0x05c2, - 0xfb49, 0x05c1, 0xfb49, 0x05c2, 0x05d0, 0x05b7, 0x05d0, 0x05b8, + 0x0000, 0x1bc5, 0x0000, 0x0c4f, 0x0000, 0x0c55, 0x0000, 0x1bc7, + 0x0000, 0x1bc9, 0x0000, 0x1bcb, 0x0000, 0x1bcd, 0x0000, 0x1bcf, + 0x0000, 0x1bd1, 0x0000, 0x0c0d, 0x1bd3, 0x1bd3, 0x1bd6, 0x1bd6, + 0x1bd9, 0x1bd9, 0x1bdc, 0x1bdc, 0x1bdf, 0x1bdf, 0x1be2, 0x1be2, /* 0xfb30 .. 0xfb3f */ - 0x05d0, 0x05bc, 0x05d1, 0x05bc, 0x05d2, 0x05bc, 0x05d3, 0x05bc, - 0x05d4, 0x05bc, 0x05d5, 0x05bc, 0x05d6, 0x05bc, 0x0000, 0x0000, - 0x05d8, 0x05bc, 0x05d9, 0x05bc, 0x05da, 0x05bc, 0x05db, 0x05bc, - 0x05dc, 0x05bc, 0x0000, 0x0000, 0x05de, 0x05bc, 0x0000, 0x0000, + 0x1be5, 0x1be5, 0x1be8, 0x1be8, 0x1beb, 0x1beb, 0x1bee, 0x1bee, + 0x1bf1, 0x1bf1, 0x1bf4, 0x1bf4, 0x1bf7, 0x1bf7, 0x0000, 0x0000, + 0x1bfa, 0x1bfa, 0x1bfd, 0x1bfd, 0x1c00, 0x1c00, 0x1c03, 0x1c03, + 0x1c06, 0x1c06, 0x0000, 0x0000, 0x1c09, 0x1c09, 0x0000, 0x0000, /* 0xfb40 .. 0xfb4f */ - 0x05e0, 0x05bc, 0x05e1, 0x05bc, 0x0000, 0x0000, 0x05e3, 0x05bc, - 0x05e4, 0x05bc, 0x0000, 0x0000, 0x05e6, 0x05bc, 0x05e7, 0x05bc, - 0x05e8, 0x05bc, 0x05e9, 0x05bc, 0x05ea, 0x05bc, 0x05d5, 0x05b9, - 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf, 0x0000, 0x0000 + 0x1c0c, 0x1c0c, 0x1c0f, 0x1c0f, 0x0000, 0x0000, 0x1c12, 0x1c12, + 0x1c15, 0x1c15, 0x0000, 0x0000, 0x1c18, 0x1c18, 0x1c1b, 0x1c1b, + 0x1c1e, 0x1c1e, 0x1c21, 0x1c21, 0x1c24, 0x1c24, 0x1c27, 0x1c27, + 0x1c2a, 0x1c2a, 0x1c2d, 0x1c2d, 0x1c30, 0x1c30, 0x0000, 0x1c33, + /* 0xfb50 .. 0xfb5f */ + 0x0000, 0x1c36, 0x0000, 0x1c36, 0x0000, 0x1c38, 0x0000, 0x1c38, + 0x0000, 0x1c38, 0x0000, 0x1c38, 0x0000, 0x1c3a, 0x0000, 0x1c3a, + 0x0000, 0x1c3a, 0x0000, 0x1c3a, 0x0000, 0x1c3c, 0x0000, 0x1c3c, + 0x0000, 0x1c3c, 0x0000, 0x1c3c, 0x0000, 0x1c3e, 0x0000, 0x1c3e, + /* 0xfb60 .. 0xfb6f */ + 0x0000, 0x1c3e, 0x0000, 0x1c3e, 0x0000, 0x1c40, 0x0000, 0x1c40, + 0x0000, 0x1c40, 0x0000, 0x1c40, 0x0000, 0x1c42, 0x0000, 0x1c42, + 0x0000, 0x1c42, 0x0000, 0x1c42, 0x0000, 0x1c44, 0x0000, 0x1c44, + 0x0000, 0x1c44, 0x0000, 0x1c44, 0x0000, 0x1c46, 0x0000, 0x1c46, + /* 0xfb70 .. 0xfb7f */ + 0x0000, 0x1c46, 0x0000, 0x1c46, 0x0000, 0x1c48, 0x0000, 0x1c48, + 0x0000, 0x1c48, 0x0000, 0x1c48, 0x0000, 0x1c4a, 0x0000, 0x1c4a, + 0x0000, 0x1c4a, 0x0000, 0x1c4a, 0x0000, 0x1c4c, 0x0000, 0x1c4c, + 0x0000, 0x1c4c, 0x0000, 0x1c4c, 0x0000, 0x1c4e, 0x0000, 0x1c4e, + /* 0xfb80 .. 0xfb8f */ + 0x0000, 0x1c4e, 0x0000, 0x1c4e, 0x0000, 0x1c50, 0x0000, 0x1c50, + 0x0000, 0x1c52, 0x0000, 0x1c52, 0x0000, 0x1c54, 0x0000, 0x1c54, + 0x0000, 0x1c56, 0x0000, 0x1c56, 0x0000, 0x1c58, 0x0000, 0x1c58, + 0x0000, 0x1c5a, 0x0000, 0x1c5a, 0x0000, 0x1c5c, 0x0000, 0x1c5c, + /* 0xfb90 .. 0xfb9f */ + 0x0000, 0x1c5c, 0x0000, 0x1c5c, 0x0000, 0x1c5e, 0x0000, 0x1c5e, + 0x0000, 0x1c5e, 0x0000, 0x1c5e, 0x0000, 0x1c60, 0x0000, 0x1c60, + 0x0000, 0x1c60, 0x0000, 0x1c60, 0x0000, 0x1c62, 0x0000, 0x1c62, + 0x0000, 0x1c62, 0x0000, 0x1c62, 0x0000, 0x1c64, 0x0000, 0x1c64, + /* 0xfba0 .. 0xfbaf */ + 0x0000, 0x1c66, 0x0000, 0x1c66, 0x0000, 0x1c66, 0x0000, 0x1c66, + 0x0000, 0x1c68, 0x0000, 0x1c68, 0x0000, 0x1c6a, 0x0000, 0x1c6a, + 0x0000, 0x1c6a, 0x0000, 0x1c6a, 0x0000, 0x1c6c, 0x0000, 0x1c6c, + 0x0000, 0x1c6c, 0x0000, 0x1c6c, 0x0000, 0x1c6e, 0x0000, 0x1c6e, + /* 0xfbb0 .. 0xfbbf */ + 0x0000, 0x1c70, 0x0000, 0x1c70, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfbd0 .. 0xfbdf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1c72, + 0x0000, 0x1c72, 0x0000, 0x1c72, 0x0000, 0x1c72, 0x0000, 0x1c74, + 0x0000, 0x1c74, 0x0000, 0x1c76, 0x0000, 0x1c76, 0x0000, 0x1c78, + 0x0000, 0x1c78, 0x0000, 0x1c7a, 0x0000, 0x1c7c, 0x0000, 0x1c7c, + /* 0xfbe0 .. 0xfbef */ + 0x0000, 0x1c7e, 0x0000, 0x1c7e, 0x0000, 0x1c80, 0x0000, 0x1c80, + 0x0000, 0x1c82, 0x0000, 0x1c82, 0x0000, 0x1c82, 0x0000, 0x1c82, + 0x0000, 0x1c84, 0x0000, 0x1c84, 0x0000, 0x1c86, 0x0000, 0x1c86, + 0x0000, 0x1c89, 0x0000, 0x1c89, 0x0000, 0x1c8c, 0x0000, 0x1c8c, + /* 0xfbf0 .. 0xfbff */ + 0x0000, 0x1c8f, 0x0000, 0x1c8f, 0x0000, 0x1c92, 0x0000, 0x1c92, + 0x0000, 0x1c95, 0x0000, 0x1c95, 0x0000, 0x1c98, 0x0000, 0x1c98, + 0x0000, 0x1c98, 0x0000, 0x1c9b, 0x0000, 0x1c9b, 0x0000, 0x1c9b, + 0x0000, 0x1c9e, 0x0000, 0x1c9e, 0x0000, 0x1c9e, 0x0000, 0x1c9e, + /* 0xfc00 .. 0xfc0f */ + 0x0000, 0x1ca0, 0x0000, 0x1ca3, 0x0000, 0x1ca6, 0x0000, 0x1c9b, + 0x0000, 0x1ca9, 0x0000, 0x1cac, 0x0000, 0x1caf, 0x0000, 0x1cb2, + 0x0000, 0x1cb5, 0x0000, 0x1cb8, 0x0000, 0x1cbb, 0x0000, 0x1cbe, + 0x0000, 0x1cc1, 0x0000, 0x1cc4, 0x0000, 0x1cc7, 0x0000, 0x1cca, + /* 0xfc10 .. 0xfc1f */ + 0x0000, 0x1ccd, 0x0000, 0x1cd0, 0x0000, 0x1cd3, 0x0000, 0x1cd6, + 0x0000, 0x1cd9, 0x0000, 0x1cdc, 0x0000, 0x1cdf, 0x0000, 0x1ce2, + 0x0000, 0x1ce5, 0x0000, 0x1ce8, 0x0000, 0x1ceb, 0x0000, 0x1cee, + 0x0000, 0x1cf1, 0x0000, 0x1cf4, 0x0000, 0x1cf7, 0x0000, 0x1cfa, + /* 0xfc20 .. 0xfc2f */ + 0x0000, 0x1cfd, 0x0000, 0x1d00, 0x0000, 0x1d03, 0x0000, 0x1d06, + 0x0000, 0x1d09, 0x0000, 0x1d0c, 0x0000, 0x1d0f, 0x0000, 0x1d12, + 0x0000, 0x1d15, 0x0000, 0x1d18, 0x0000, 0x1d1b, 0x0000, 0x1d1e, + 0x0000, 0x1d21, 0x0000, 0x1d24, 0x0000, 0x1d27, 0x0000, 0x1d2a, + /* 0xfc30 .. 0xfc3f */ + 0x0000, 0x1d2d, 0x0000, 0x1d30, 0x0000, 0x1d33, 0x0000, 0x1d36, + 0x0000, 0x1d39, 0x0000, 0x1d3c, 0x0000, 0x1d3f, 0x0000, 0x1d42, + 0x0000, 0x1d45, 0x0000, 0x1d48, 0x0000, 0x1d4b, 0x0000, 0x1d4e, + 0x0000, 0x1d51, 0x0000, 0x1d54, 0x0000, 0x1d57, 0x0000, 0x1d5a, + /* 0xfc40 .. 0xfc4f */ + 0x0000, 0x1d5d, 0x0000, 0x1d60, 0x0000, 0x1d63, 0x0000, 0x1d66, + 0x0000, 0x1d69, 0x0000, 0x1d6c, 0x0000, 0x1d6f, 0x0000, 0x1d72, + 0x0000, 0x1d75, 0x0000, 0x1d78, 0x0000, 0x1d7b, 0x0000, 0x1d7e, + 0x0000, 0x1d81, 0x0000, 0x1d84, 0x0000, 0x1d87, 0x0000, 0x1d8a, + /* 0xfc50 .. 0xfc5f */ + 0x0000, 0x1d8d, 0x0000, 0x1d90, 0x0000, 0x1d93, 0x0000, 0x1d96, + 0x0000, 0x1d99, 0x0000, 0x1d9c, 0x0000, 0x1d9f, 0x0000, 0x1da2, + 0x0000, 0x1da5, 0x0000, 0x1da8, 0x0000, 0x1dab, 0x0000, 0x1dae, + 0x0000, 0x1db1, 0x0000, 0x1db4, 0x0000, 0x1db7, 0x0000, 0x1dbb, + /* 0xfc60 .. 0xfc6f */ + 0x0000, 0x1dbf, 0x0000, 0x1dc3, 0x0000, 0x1dc7, 0x0000, 0x1dcb, + 0x0000, 0x1dcf, 0x0000, 0x1dd2, 0x0000, 0x1ca6, 0x0000, 0x1dd5, + 0x0000, 0x1c9b, 0x0000, 0x1ca9, 0x0000, 0x1dd8, 0x0000, 0x1ddb, + 0x0000, 0x1cb5, 0x0000, 0x1dde, 0x0000, 0x1cb8, 0x0000, 0x1cbb, + /* 0xfc70 .. 0xfc7f */ + 0x0000, 0x1de1, 0x0000, 0x1de4, 0x0000, 0x1cc7, 0x0000, 0x1de7, + 0x0000, 0x1cca, 0x0000, 0x1ccd, 0x0000, 0x1dea, 0x0000, 0x1ded, + 0x0000, 0x1cd3, 0x0000, 0x1df0, 0x0000, 0x1cd6, 0x0000, 0x1cd9, + 0x0000, 0x1d30, 0x0000, 0x1d33, 0x0000, 0x1d3c, 0x0000, 0x1d3f, + /* 0xfc80 .. 0xfc8f */ + 0x0000, 0x1d42, 0x0000, 0x1d4e, 0x0000, 0x1d51, 0x0000, 0x1d54, + 0x0000, 0x1d57, 0x0000, 0x1d63, 0x0000, 0x1d66, 0x0000, 0x1d69, + 0x0000, 0x1df3, 0x0000, 0x1d75, 0x0000, 0x1df6, 0x0000, 0x1df9, + 0x0000, 0x1d87, 0x0000, 0x1dfc, 0x0000, 0x1d8a, 0x0000, 0x1d8d, + /* 0xfc90 .. 0xfc9f */ + 0x0000, 0x1db4, 0x0000, 0x1dff, 0x0000, 0x1e02, 0x0000, 0x1da5, + 0x0000, 0x1e05, 0x0000, 0x1da8, 0x0000, 0x1dab, 0x0000, 0x1ca0, + 0x0000, 0x1ca3, 0x0000, 0x1e08, 0x0000, 0x1ca6, 0x0000, 0x1e0b, + 0x0000, 0x1cac, 0x0000, 0x1caf, 0x0000, 0x1cb2, 0x0000, 0x1cb5, + /* 0xfca0 .. 0xfcaf */ + 0x0000, 0x1e0e, 0x0000, 0x1cbe, 0x0000, 0x1cc1, 0x0000, 0x1cc4, + 0x0000, 0x1cc7, 0x0000, 0x1e11, 0x0000, 0x1cd3, 0x0000, 0x1cdc, + 0x0000, 0x1cdf, 0x0000, 0x1ce2, 0x0000, 0x1ce5, 0x0000, 0x1ce8, + 0x0000, 0x1cee, 0x0000, 0x1cf1, 0x0000, 0x1cf4, 0x0000, 0x1cf7, + /* 0xfcb0 .. 0xfcbf */ + 0x0000, 0x1cfa, 0x0000, 0x1cfd, 0x0000, 0x1e14, 0x0000, 0x1d00, + 0x0000, 0x1d03, 0x0000, 0x1d06, 0x0000, 0x1d09, 0x0000, 0x1d0c, + 0x0000, 0x1d0f, 0x0000, 0x1d15, 0x0000, 0x1d18, 0x0000, 0x1d1b, + 0x0000, 0x1d1e, 0x0000, 0x1d21, 0x0000, 0x1d24, 0x0000, 0x1d27, + /* 0xfcc0 .. 0xfccf */ + 0x0000, 0x1d2a, 0x0000, 0x1d2d, 0x0000, 0x1d36, 0x0000, 0x1d39, + 0x0000, 0x1d45, 0x0000, 0x1d48, 0x0000, 0x1d4b, 0x0000, 0x1d4e, + 0x0000, 0x1d51, 0x0000, 0x1d5a, 0x0000, 0x1d5d, 0x0000, 0x1d60, + 0x0000, 0x1d63, 0x0000, 0x1e17, 0x0000, 0x1d6c, 0x0000, 0x1d6f, + /* 0xfcd0 .. 0xfcdf */ + 0x0000, 0x1d72, 0x0000, 0x1d75, 0x0000, 0x1d7e, 0x0000, 0x1d81, + 0x0000, 0x1d84, 0x0000, 0x1d87, 0x0000, 0x1e1a, 0x0000, 0x1d90, + 0x0000, 0x1d93, 0x0000, 0x1e1d, 0x0000, 0x1d9c, 0x0000, 0x1d9f, + 0x0000, 0x1da2, 0x0000, 0x1da5, 0x0000, 0x1e20, 0x0000, 0x1ca6, + /* 0xfce0 .. 0xfcef */ + 0x0000, 0x1e0b, 0x0000, 0x1cb5, 0x0000, 0x1e0e, 0x0000, 0x1cc7, + 0x0000, 0x1e11, 0x0000, 0x1cd3, 0x0000, 0x1e23, 0x0000, 0x1cfa, + 0x0000, 0x1e26, 0x0000, 0x1e29, 0x0000, 0x1e2c, 0x0000, 0x1d4e, + 0x0000, 0x1d51, 0x0000, 0x1d63, 0x0000, 0x1d87, 0x0000, 0x1e1a, + /* 0xfcf0 .. 0xfcff */ + 0x0000, 0x1da5, 0x0000, 0x1e20, 0x0000, 0x1e2f, 0x0000, 0x1e33, + 0x0000, 0x1e37, 0x0000, 0x1e3b, 0x0000, 0x1e3e, 0x0000, 0x1e41, + 0x0000, 0x1e44, 0x0000, 0x1e47, 0x0000, 0x1e4a, 0x0000, 0x1e4d, + 0x0000, 0x1e50, 0x0000, 0x1e53, 0x0000, 0x1e56, 0x0000, 0x1e59, + /* 0xfd00 .. 0xfd0f */ + 0x0000, 0x1e5c, 0x0000, 0x1e5f, 0x0000, 0x1e62, 0x0000, 0x1e65, + 0x0000, 0x1e68, 0x0000, 0x1e6b, 0x0000, 0x1e6e, 0x0000, 0x1e71, + 0x0000, 0x1e74, 0x0000, 0x1e77, 0x0000, 0x1e7a, 0x0000, 0x1e7d, + 0x0000, 0x1e29, 0x0000, 0x1e80, 0x0000, 0x1e83, 0x0000, 0x1e86, + /* 0xfd10 .. 0xfd1f */ + 0x0000, 0x1e89, 0x0000, 0x1e3b, 0x0000, 0x1e3e, 0x0000, 0x1e41, + 0x0000, 0x1e44, 0x0000, 0x1e47, 0x0000, 0x1e4a, 0x0000, 0x1e4d, + 0x0000, 0x1e50, 0x0000, 0x1e53, 0x0000, 0x1e56, 0x0000, 0x1e59, + 0x0000, 0x1e5c, 0x0000, 0x1e5f, 0x0000, 0x1e62, 0x0000, 0x1e65, + /* 0xfd20 .. 0xfd2f */ + 0x0000, 0x1e68, 0x0000, 0x1e6b, 0x0000, 0x1e6e, 0x0000, 0x1e71, + 0x0000, 0x1e74, 0x0000, 0x1e77, 0x0000, 0x1e7a, 0x0000, 0x1e7d, + 0x0000, 0x1e29, 0x0000, 0x1e80, 0x0000, 0x1e83, 0x0000, 0x1e86, + 0x0000, 0x1e89, 0x0000, 0x1e77, 0x0000, 0x1e7a, 0x0000, 0x1e7d, + /* 0xfd30 .. 0xfd3f */ + 0x0000, 0x1e29, 0x0000, 0x1e26, 0x0000, 0x1e2c, 0x0000, 0x1d12, + 0x0000, 0x1cf1, 0x0000, 0x1cf4, 0x0000, 0x1cf7, 0x0000, 0x1e77, + 0x0000, 0x1e7a, 0x0000, 0x1e7d, 0x0000, 0x1d12, 0x0000, 0x1d15, + 0x0000, 0x1e8c, 0x0000, 0x1e8c, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfd50 .. 0xfd5f */ + 0x0000, 0x1e8f, 0x0000, 0x1e93, 0x0000, 0x1e93, 0x0000, 0x1e97, + 0x0000, 0x1e9b, 0x0000, 0x1e9f, 0x0000, 0x1ea3, 0x0000, 0x1ea7, + 0x0000, 0x1eab, 0x0000, 0x1eab, 0x0000, 0x1eaf, 0x0000, 0x1eb3, + 0x0000, 0x1eb7, 0x0000, 0x1ebb, 0x0000, 0x1ebf, 0x0000, 0x1ec3, + /* 0xfd60 .. 0xfd6f */ + 0x0000, 0x1ec3, 0x0000, 0x1ec7, 0x0000, 0x1ecb, 0x0000, 0x1ecb, + 0x0000, 0x1ecf, 0x0000, 0x1ecf, 0x0000, 0x1ed3, 0x0000, 0x1ed7, + 0x0000, 0x1ed7, 0x0000, 0x1edb, 0x0000, 0x1edf, 0x0000, 0x1edf, + 0x0000, 0x1ee3, 0x0000, 0x1ee3, 0x0000, 0x1ee7, 0x0000, 0x1eeb, + /* 0xfd70 .. 0xfd7f */ + 0x0000, 0x1eeb, 0x0000, 0x1eef, 0x0000, 0x1eef, 0x0000, 0x1ef3, + 0x0000, 0x1ef7, 0x0000, 0x1efb, 0x0000, 0x1eff, 0x0000, 0x1eff, + 0x0000, 0x1f03, 0x0000, 0x1f07, 0x0000, 0x1f0b, 0x0000, 0x1f0f, + 0x0000, 0x1f13, 0x0000, 0x1f13, 0x0000, 0x1f17, 0x0000, 0x1f1b, + /* 0xfd80 .. 0xfd8f */ + 0x0000, 0x1f1f, 0x0000, 0x1f23, 0x0000, 0x1f27, 0x0000, 0x1f2b, + 0x0000, 0x1f2b, 0x0000, 0x1f2f, 0x0000, 0x1f2f, 0x0000, 0x1f33, + 0x0000, 0x1f33, 0x0000, 0x1f37, 0x0000, 0x1f3b, 0x0000, 0x1f3f, + 0x0000, 0x1f43, 0x0000, 0x1f47, 0x0000, 0x1f4b, 0x0000, 0x1f4f, + /* 0xfd90 .. 0xfd9f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1f53, 0x0000, 0x1f57, + 0x0000, 0x1f5b, 0x0000, 0x1f5f, 0x0000, 0x1f63, 0x0000, 0x1f67, + 0x0000, 0x1f67, 0x0000, 0x1f6b, 0x0000, 0x1f6f, 0x0000, 0x1f73, + 0x0000, 0x1f77, 0x0000, 0x1f77, 0x0000, 0x1f7b, 0x0000, 0x1f7f, + /* 0xfda0 .. 0xfdaf */ + 0x0000, 0x1f83, 0x0000, 0x1f87, 0x0000, 0x1f8b, 0x0000, 0x1f8f, + 0x0000, 0x1f93, 0x0000, 0x1f97, 0x0000, 0x1f9b, 0x0000, 0x1f9f, + 0x0000, 0x1fa3, 0x0000, 0x1fa7, 0x0000, 0x1fab, 0x0000, 0x1faf, + 0x0000, 0x1fb3, 0x0000, 0x1fb7, 0x0000, 0x1fbb, 0x0000, 0x1fbf, + /* 0xfdb0 .. 0xfdbf */ + 0x0000, 0x1fc3, 0x0000, 0x1fc7, 0x0000, 0x1fcb, 0x0000, 0x1fcf, + 0x0000, 0x1f17, 0x0000, 0x1f1f, 0x0000, 0x1fd3, 0x0000, 0x1fd7, + 0x0000, 0x1fdb, 0x0000, 0x1fdf, 0x0000, 0x1fe3, 0x0000, 0x1fe7, + 0x0000, 0x1fe3, 0x0000, 0x1fdb, 0x0000, 0x1feb, 0x0000, 0x1fef, + /* 0xfdc0 .. 0xfdcf */ + 0x0000, 0x1ff3, 0x0000, 0x1ff7, 0x0000, 0x1ffb, 0x0000, 0x1fe7, + 0x0000, 0x1efb, 0x0000, 0x1ed3, 0x0000, 0x1fff, 0x0000, 0x2003, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfdf0 .. 0xfdff */ + 0x0000, 0x2007, 0x0000, 0x200b, 0x0000, 0x200f, 0x0000, 0x2014, + 0x0000, 0x2019, 0x0000, 0x201e, 0x0000, 0x2023, 0x0000, 0x2028, + 0x0000, 0x202d, 0x0000, 0x2032, 0x0000, 0x2036, 0x0000, 0x2049, + 0x0000, 0x2052, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfe10 .. 0xfe1f */ + 0x0000, 0x2057, 0x0000, 0x2059, 0x0000, 0x205b, 0x0000, 0x205d, + 0x0000, 0x038a, 0x0000, 0x205f, 0x0000, 0x2061, 0x0000, 0x2063, + 0x0000, 0x2065, 0x0000, 0x2067, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfe30 .. 0xfe3f */ + 0x0000, 0x2069, 0x0000, 0x206b, 0x0000, 0x206d, 0x0000, 0x206f, + 0x0000, 0x206f, 0x0000, 0x0c13, 0x0000, 0x0c15, 0x0000, 0x2071, + 0x0000, 0x2073, 0x0000, 0x2075, 0x0000, 0x2077, 0x0000, 0x2079, + 0x0000, 0x207b, 0x0000, 0x207d, 0x0000, 0x207f, 0x0000, 0x0d7b, + /* 0xfe40 .. 0xfe4f */ + 0x0000, 0x0d7d, 0x0000, 0x2081, 0x0000, 0x2083, 0x0000, 0x2085, + 0x0000, 0x2087, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2089, + 0x0000, 0x208b, 0x0000, 0x208d, 0x0000, 0x208d, 0x0000, 0x208d, + 0x0000, 0x208d, 0x0000, 0x206f, 0x0000, 0x206f, 0x0000, 0x206f, + /* 0xfe50 .. 0xfe5f */ + 0x0000, 0x2057, 0x0000, 0x2059, 0x0000, 0x0bd4, 0x0000, 0x0000, + 0x0000, 0x038a, 0x0000, 0x205d, 0x0000, 0x2061, 0x0000, 0x205f, + 0x0000, 0x206b, 0x0000, 0x0c13, 0x0000, 0x0c15, 0x0000, 0x2071, + 0x0000, 0x2073, 0x0000, 0x2075, 0x0000, 0x2077, 0x0000, 0x208f, + /* 0xfe60 .. 0xfe6f */ + 0x0000, 0x2091, 0x0000, 0x2093, 0x0000, 0x0c0d, 0x0000, 0x2095, + 0x0000, 0x2097, 0x0000, 0x2099, 0x0000, 0x0c11, 0x0000, 0x0000, + 0x0000, 0x209b, 0x0000, 0x209d, 0x0000, 0x209f, 0x0000, 0x20a1, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfe70 .. 0xfe7f */ + 0x0000, 0x20a3, 0x0000, 0x20a6, 0x0000, 0x20a9, 0x0000, 0x0000, + 0x0000, 0x20ac, 0x0000, 0x0000, 0x0000, 0x20af, 0x0000, 0x20b2, + 0x0000, 0x20b5, 0x0000, 0x20b8, 0x0000, 0x20bb, 0x0000, 0x20be, + 0x0000, 0x20c1, 0x0000, 0x20c4, 0x0000, 0x20c7, 0x0000, 0x20ca, + /* 0xfe80 .. 0xfe8f */ + 0x0000, 0x20cd, 0x0000, 0x20cf, 0x0000, 0x20cf, 0x0000, 0x20d1, + 0x0000, 0x20d1, 0x0000, 0x20d3, 0x0000, 0x20d3, 0x0000, 0x20d5, + 0x0000, 0x20d5, 0x0000, 0x20d7, 0x0000, 0x20d7, 0x0000, 0x20d7, + 0x0000, 0x20d7, 0x0000, 0x20d9, 0x0000, 0x20d9, 0x0000, 0x20db, + /* 0xfe90 .. 0xfe9f */ + 0x0000, 0x20db, 0x0000, 0x20db, 0x0000, 0x20db, 0x0000, 0x20dd, + 0x0000, 0x20dd, 0x0000, 0x20df, 0x0000, 0x20df, 0x0000, 0x20df, + 0x0000, 0x20df, 0x0000, 0x20e1, 0x0000, 0x20e1, 0x0000, 0x20e1, + 0x0000, 0x20e1, 0x0000, 0x20e3, 0x0000, 0x20e3, 0x0000, 0x20e3, + /* 0xfea0 .. 0xfeaf */ + 0x0000, 0x20e3, 0x0000, 0x20e5, 0x0000, 0x20e5, 0x0000, 0x20e5, + 0x0000, 0x20e5, 0x0000, 0x20e7, 0x0000, 0x20e7, 0x0000, 0x20e7, + 0x0000, 0x20e7, 0x0000, 0x20e9, 0x0000, 0x20e9, 0x0000, 0x20eb, + 0x0000, 0x20eb, 0x0000, 0x20ed, 0x0000, 0x20ed, 0x0000, 0x20ef, + /* 0xfeb0 .. 0xfebf */ + 0x0000, 0x20ef, 0x0000, 0x20f1, 0x0000, 0x20f1, 0x0000, 0x20f1, + 0x0000, 0x20f1, 0x0000, 0x20f3, 0x0000, 0x20f3, 0x0000, 0x20f3, + 0x0000, 0x20f3, 0x0000, 0x20f5, 0x0000, 0x20f5, 0x0000, 0x20f5, + 0x0000, 0x20f5, 0x0000, 0x20f7, 0x0000, 0x20f7, 0x0000, 0x20f7, + /* 0xfec0 .. 0xfecf */ + 0x0000, 0x20f7, 0x0000, 0x20f9, 0x0000, 0x20f9, 0x0000, 0x20f9, + 0x0000, 0x20f9, 0x0000, 0x20fb, 0x0000, 0x20fb, 0x0000, 0x20fb, + 0x0000, 0x20fb, 0x0000, 0x20fd, 0x0000, 0x20fd, 0x0000, 0x20fd, + 0x0000, 0x20fd, 0x0000, 0x20ff, 0x0000, 0x20ff, 0x0000, 0x20ff, + /* 0xfed0 .. 0xfedf */ + 0x0000, 0x20ff, 0x0000, 0x2101, 0x0000, 0x2101, 0x0000, 0x2101, + 0x0000, 0x2101, 0x0000, 0x2103, 0x0000, 0x2103, 0x0000, 0x2103, + 0x0000, 0x2103, 0x0000, 0x2105, 0x0000, 0x2105, 0x0000, 0x2105, + 0x0000, 0x2105, 0x0000, 0x2107, 0x0000, 0x2107, 0x0000, 0x2107, + /* 0xfee0 .. 0xfeef */ + 0x0000, 0x2107, 0x0000, 0x2109, 0x0000, 0x2109, 0x0000, 0x2109, + 0x0000, 0x2109, 0x0000, 0x210b, 0x0000, 0x210b, 0x0000, 0x210b, + 0x0000, 0x210b, 0x0000, 0x210d, 0x0000, 0x210d, 0x0000, 0x210d, + 0x0000, 0x210d, 0x0000, 0x210f, 0x0000, 0x210f, 0x0000, 0x1c84, + /* 0xfef0 .. 0xfeff */ + 0x0000, 0x1c84, 0x0000, 0x2111, 0x0000, 0x2111, 0x0000, 0x2111, + 0x0000, 0x2111, 0x0000, 0x2113, 0x0000, 0x2113, 0x0000, 0x2116, + 0x0000, 0x2116, 0x0000, 0x2119, 0x0000, 0x2119, 0x0000, 0x211c, + 0x0000, 0x211c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xff00 .. 0xff0f */ + 0x0000, 0x0000, 0x0000, 0x205f, 0x0000, 0x211f, 0x0000, 0x208f, + 0x0000, 0x209d, 0x0000, 0x209f, 0x0000, 0x2091, 0x0000, 0x2121, + 0x0000, 0x0c13, 0x0000, 0x0c15, 0x0000, 0x2093, 0x0000, 0x0c0d, + 0x0000, 0x2057, 0x0000, 0x2095, 0x0000, 0x0bd4, 0x0000, 0x2123, + /* 0xff10 .. 0xff1f */ + 0x0000, 0x0bff, 0x0000, 0x0017, 0x0000, 0x000b, 0x0000, 0x000d, + 0x0000, 0x0c01, 0x0000, 0x0c03, 0x0000, 0x0c05, 0x0000, 0x0c07, + 0x0000, 0x0c09, 0x0000, 0x0c0b, 0x0000, 0x205d, 0x0000, 0x038a, + 0x0000, 0x2097, 0x0000, 0x0c11, 0x0000, 0x2099, 0x0000, 0x2061, + /* 0xff20 .. 0xff2f */ + 0x0000, 0x20a1, 0x0000, 0x059d, 0x0000, 0x05a1, 0x0000, 0x0c24, + 0x0000, 0x05a3, 0x0000, 0x05a5, 0x0000, 0x0c4d, 0x0000, 0x05a9, + 0x0000, 0x05ab, 0x0000, 0x05ad, 0x0000, 0x05af, 0x0000, 0x05b1, + 0x0000, 0x05b3, 0x0000, 0x05b5, 0x0000, 0x05b7, 0x0000, 0x05b9, + /* 0xff30 .. 0xff3f */ + 0x0000, 0x05bd, 0x0000, 0x0c3b, 0x0000, 0x05bf, 0x0000, 0x0eaa, + 0x0000, 0x05c1, 0x0000, 0x05c3, 0x0000, 0x0cab, 0x0000, 0x05c5, + 0x0000, 0x0cbc, 0x0000, 0x0eac, 0x0000, 0x0c47, 0x0000, 0x2089, + 0x0000, 0x209b, 0x0000, 0x208b, 0x0000, 0x2125, 0x0000, 0x206f, + /* 0xff40 .. 0xff4f */ + 0x0000, 0x0ba8, 0x0000, 0x0006, 0x0000, 0x05cd, 0x0000, 0x0601, + 0x0000, 0x05cf, 0x0000, 0x05d1, 0x0000, 0x0607, 0x0000, 0x05d9, + 0x0000, 0x0350, 0x0000, 0x05fb, 0x0000, 0x0354, 0x0000, 0x05db, + 0x0000, 0x0376, 0x0000, 0x05dd, 0x0000, 0x0c17, 0x0000, 0x0019, + /* 0xff50 .. 0xff5f */ + 0x0000, 0x05e7, 0x0000, 0x0eae, 0x0000, 0x0356, 0x0000, 0x0219, + 0x0000, 0x05e9, 0x0000, 0x05eb, 0x0000, 0x05f1, 0x0000, 0x035e, + 0x0000, 0x0378, 0x0000, 0x0360, 0x0000, 0x063d, 0x0000, 0x2071, + 0x0000, 0x2127, 0x0000, 0x2073, 0x0000, 0x2129, 0x0000, 0x212b, + /* 0xff60 .. 0xff6f */ + 0x0000, 0x212d, 0x0000, 0x205b, 0x0000, 0x2081, 0x0000, 0x2083, + 0x0000, 0x2059, 0x0000, 0x212f, 0x0000, 0x1494, 0x0000, 0x2131, + 0x0000, 0x2133, 0x0000, 0x2135, 0x0000, 0x2137, 0x0000, 0x2139, + 0x0000, 0x213b, 0x0000, 0x213d, 0x0000, 0x213f, 0x0000, 0x2141, + /* 0xff70 .. 0xff7f */ + 0x0000, 0x2143, 0x0000, 0x1438, 0x0000, 0x143a, 0x0000, 0x143c, + 0x0000, 0x143e, 0x0000, 0x1440, 0x0000, 0x1442, 0x0000, 0x1444, + 0x0000, 0x1446, 0x0000, 0x1448, 0x0000, 0x144a, 0x0000, 0x144c, + 0x0000, 0x144e, 0x0000, 0x1450, 0x0000, 0x1452, 0x0000, 0x1454, + /* 0xff80 .. 0xff8f */ + 0x0000, 0x1456, 0x0000, 0x1458, 0x0000, 0x145a, 0x0000, 0x145c, + 0x0000, 0x145e, 0x0000, 0x1460, 0x0000, 0x1462, 0x0000, 0x1464, + 0x0000, 0x1466, 0x0000, 0x1468, 0x0000, 0x146a, 0x0000, 0x146c, + 0x0000, 0x146e, 0x0000, 0x1470, 0x0000, 0x1472, 0x0000, 0x1474, + /* 0xff90 .. 0xff9f */ + 0x0000, 0x1476, 0x0000, 0x1478, 0x0000, 0x147a, 0x0000, 0x147c, + 0x0000, 0x147e, 0x0000, 0x1480, 0x0000, 0x1482, 0x0000, 0x1484, + 0x0000, 0x1486, 0x0000, 0x1488, 0x0000, 0x148a, 0x0000, 0x148c, + 0x0000, 0x148e, 0x0000, 0x2145, 0x0000, 0x2147, 0x0000, 0x2149, + /* 0xffa0 .. 0xffaf */ + 0x0000, 0x214b, 0x0000, 0x214d, 0x0000, 0x214f, 0x0000, 0x2151, + 0x0000, 0x2153, 0x0000, 0x2155, 0x0000, 0x2157, 0x0000, 0x2159, + 0x0000, 0x215b, 0x0000, 0x215d, 0x0000, 0x215f, 0x0000, 0x2161, + 0x0000, 0x2163, 0x0000, 0x2165, 0x0000, 0x2167, 0x0000, 0x2169, + /* 0xffb0 .. 0xffbf */ + 0x0000, 0x216b, 0x0000, 0x216d, 0x0000, 0x216f, 0x0000, 0x2171, + 0x0000, 0x2173, 0x0000, 0x2175, 0x0000, 0x2177, 0x0000, 0x2179, + 0x0000, 0x217b, 0x0000, 0x217d, 0x0000, 0x217f, 0x0000, 0x2181, + 0x0000, 0x2183, 0x0000, 0x2185, 0x0000, 0x2187, 0x0000, 0x0000, + /* 0xffc0 .. 0xffcf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2189, 0x0000, 0x218b, + 0x0000, 0x218d, 0x0000, 0x218f, 0x0000, 0x2191, 0x0000, 0x2193, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2195, 0x0000, 0x2197, + 0x0000, 0x2199, 0x0000, 0x219b, 0x0000, 0x219d, 0x0000, 0x219f, + /* 0xffd0 .. 0xffdf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x21a1, 0x0000, 0x21a3, + 0x0000, 0x21a5, 0x0000, 0x21a7, 0x0000, 0x21a9, 0x0000, 0x21ab, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x21ad, 0x0000, 0x21af, + 0x0000, 0x21b1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xffe0 .. 0xffef */ + 0x0000, 0x21b3, 0x0000, 0x21b5, 0x0000, 0x21b7, 0x0000, 0x21b9, + 0x0000, 0x21bb, 0x0000, 0x21bd, 0x0000, 0x21bf, 0x0000, 0x0000, + 0x0000, 0x21c1, 0x0000, 0x21c3, 0x0000, 0x21c5, 0x0000, 0x21c7, + 0x0000, 0x21c9, 0x0000, 0x21cb, 0x0000, 0x21cd, 0x0000, 0x0000 }; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data, UINT scale_data ) +{ + USHORT a, b, c, d; + + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << scale_data); + if (compat) ++c; + d = offsets[c]; + + return &data[d]; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) { - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; + int total_decomp = 0; + int size_decomp; + const WCHAR *map; + + if (ch < 0xa0) /* fast path */ + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup( ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp, 1 ))) + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else { + while (*map) + { + size_decomp = decompose_char_recursive( compat, *map, dst, dstlen ); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} + +int wine_unicode_decompose_string( int compat, const WCHAR *src, + int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0; + int decomp_len; + + if (dstlen < 0) dstlen = 0; + + while (srcpos < srclen) + { + ch = src[srcpos]; + + decomp_len = decompose_char_recursive( compat, ch, dst+dstpos, dstlen ); + dstpos += decomp_len; + + if (dstlen > 0) + { + dstlen -= decomp_len; + while (dstlen < 0) + { + dstpos--; + dstlen++; + } + } + + ++srcpos; + } - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; + return dstpos; } diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82d8b12..6976f89722a7 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ); /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ @@ -101,19 +101,19 @@ static int mbstowcs_sbcs_decompose( const struct sbcs_table *table, int flags, WCHAR *dst, unsigned int dstlen ) { const WCHAR * const cp2uni = (flags & MB_USEGLYPHCHARS) ? table->cp2uni_glyphs : table->cp2uni; - unsigned int len; + int len; if (!dstlen) /* compute length */ { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ for (len = 0; srclen; srclen--, src++) - len += wine_decompose( cp2uni[*src], dummy, 4 ); + len += wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dummy, 4 ); return len; } for (len = dstlen; srclen && len; srclen--, src++) { - unsigned int res = wine_decompose( cp2uni[*src], dst, len ); + int res = wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dst, len ); if (!res) break; len -= res; dst += res; @@ -203,7 +203,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, { const WCHAR * const cp2uni = table->cp2uni; const unsigned char * const cp2uni_lb = table->cp2uni_leadbytes; - unsigned int len, res; + int len, res; WCHAR ch; if (!dstlen) /* compute length */ @@ -219,7 +219,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - len += wine_decompose( ch, dummy, 4 ); + len += wine_unicode_decompose_string( 0, &ch, 1, dummy, 4 ); } return len; } @@ -234,7 +234,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - if (!(res = wine_decompose( ch, dst, len ))) break; + if (!(res = wine_unicode_decompose_string( 0, &ch, 1, dst, len ))) break; dst += res; len -= res; } diff --git a/tools/make_unicode b/tools/make_unicode index 56d190565677..2aa063bff624 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -472,6 +472,28 @@ sub READ_DEFAULTS($) next if $decomp eq ""; # no decomposition, skip it + # store decomposition table + if ($decomp =~ /^<([a-zA-Z]+)>(\s+[0-9a-fA-F]+)+$/) + { + my @seq = (); + for my $ch (split /\s+/, (split /\s+/, $decomp, 2)[1]) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [1, \@seq]; + } + elsif ($decomp =~ /^([0-9a-fA-F]+)(\s+([0-9a-fA-F]+))*$/) + { + my @seq = (); + for my $ch (split /\s+/, $decomp) + { + # we don't support surrogates at the moment + next if hex $ch > 0xffff; + push @seq, (hex $ch); + } + $decomp_table[$src] = [0, \@seq]; + } + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known @@ -506,16 +528,13 @@ sub READ_DEFAULTS($) # decomposition contains only char values without prefix -> use first char $dst = hex $1; $category_table[$src] |= $category_table[$dst] if defined $category_table[$dst]; - # store decomposition if it contains two chars if ($decomp =~ /^([0-9a-fA-F]+)\s+([0-9a-fA-F]+)$/) { - $decomp_table[$src] = [ hex $1, hex $2 ]; push @compose_table, [ hex $1, hex $2, $src ]; } elsif ($decomp =~ /^(<[a-z]+>\s)*([0-9a-fA-F]+)$/ && (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))) { - # Single char decomposition in the compatibility range $compatmap_table[$src] = hex $2; } } @@ -2264,6 +2283,51 @@ EOF save_file($filename); } +sub do_decomp +{ + my ($char, $table_ref, $compat) = @_; + + return ($char) unless defined $table_ref->[$char]; + my $data = $table_ref->[$char]; + return ($char) if $data->[0] && !$compat; + my @mapping = (); + for my $ch (@{$data->[1]}) + { + push @mapping, $ch; + } + return @mapping; +} + +sub expand_pairs +{ + my @data = @_; + my @result = (); + + for my $ch (@data) + { + if ($ch <= 0xFFFF) + { + push @result, $ch; + } + elsif ($ch >= 2097152) # 2**21 + { + die sprintf "Invalid Unicode character %04x\n", $ch; + } + else + { + my $hx = $ch & 0xFFFF; + my $hu = ($ch >> 16) & ((1 << 5) - 1); + my $hw = ($hu - 1) & 0xFFFF; + my $hi = 0xD800 | ($hw << 6) | ($hx >> 10); + my $lx = $ch & 0xFFFF; + my $lo = (0xDC00 | ($lx & ((1 << 10) - 1))) & 0xFFFF; + push @result, $hi; + push @result, $lo; + } + } + return @result; +} + ################################################################ # dump the char decomposition table sub dump_decompose_table($) @@ -2272,98 +2336,245 @@ sub dump_decompose_table($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; - print OUTPUT "/* Unicode char composition */\n"; + print OUTPUT "/* Unicode char decomposition */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - # first determine all the 16-char subsets that contain something + # limit code points to BMP + my $utflim = 65536; + my %nfd_lookup = (); + my %nfkd_lookup = (); + my %decomp_lookup = (); + my @decomp_data = (0); + my $pos = 1; + my $lastchar_decomp; - my @filled = (0) x 4096; - my $pos = 16*2; # for the null subset - for (my $i = 0; $i < 65536; $i++) + for (my $i = 0; $i < $utflim; $i++) { next unless defined $decomp_table[$i]; - $filled[$i >> 4] = $pos; - $pos += 16*2; - $i |= 15; + + if (defined $decomp_table[$i]) + { + $lastchar_decomp = $i; + # fully expand input and mappings + + my @char; + push @char, $i; + push @char, 0; + my $char = pack "n*", @char; + + my @nfd = do_decomp( $i, \@decomp_table, 0 ); + push @nfd, 0; + my $nfd = pack "n*", @nfd; + + my @nfkd = do_decomp( $i, \@decomp_table, 1 ); + push @nfkd, 0; + my $nfkd = pack "n*", @nfkd; + + # lookup or add mappings + + if ($nfd eq $char) + { + $nfd = undef; + } + elsif (exists $decomp_lookup{$nfd}) + { + $nfd_lookup{$i} = $decomp_lookup{$nfd}; + } + else + { + push @decomp_data, @nfd; + $decomp_lookup{$nfd} = $pos; + $nfd_lookup{$i} = $pos; + $pos += @nfd; + } + + if ($nfkd eq $char) + { + $nfkd = undef; + } + elsif (exists $decomp_lookup{$nfkd}) + { + $nfkd_lookup{$i} = $decomp_lookup{$nfkd}; + } + else + { + push @decomp_data, @nfkd; + $decomp_lookup{$nfkd} = $pos; + $nfkd_lookup{$i} = $pos; + $pos += @nfkd; + } + } } - my $total = $pos; - # now count the 256-char subsets that contain something + printf OUTPUT "static const UINT last_decomposable = 0x%x;\n\n", $lastchar_decomp; - my @filled_idx = (256) x 256; - $pos = 256 + 16; - for (my $i = 0; $i < 4096; $i++) + # dump decomposition data + + printf OUTPUT "static const WCHAR data_decomp[%d] =\n", $pos; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @decomp_data ); + print OUTPUT "\n};\n\n"; + + # find 256-char subsets that contain something + + my $filled_pos = 1; + my $filled_lim = ($lastchar_decomp >> 8) + 1; + my @filled = (0) x $filled_lim; + for (my $i = 0; $i < $utflim; $i++) + { + last if $i > $lastchar_decomp; + next unless exists $nfd_lookup{$i} || exists $nfkd_lookup{$i}; + $filled[$i >> 8] = $filled_pos++; + $i |= 255; + } + + # dump index of 256-char subsets + + printf OUTPUT "static const BYTE idx1_decomp[%d] =\n", $filled_lim; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%02x", 0, @filled ); + print OUTPUT "\n};\n\n"; + + # for 256-char subsets, find non-empty 16-char subsets + + my $sub_filled_pos = 1; + my %sub_filled = (); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled_idx[$i >> 4] = $pos; - $pos += 16; - $i |= 15; + for (my $j = 0; $j < 256; $j++) + { + my $idx = ($i << 8) | $j; + next unless exists $nfd_lookup{$idx} || exists $nfkd_lookup{$idx}; + $sub_filled{$idx >> 4} = $sub_filled_pos++; + $j |= 15; + } } - my $null_offset = $pos; # null mapping - $total += $pos; - # add the index offsets to the subsets positions + # dump index of 16-char subsets - for (my $i = 0; $i < 4096; $i++) + printf OUTPUT "static const USHORT idx2_decomp[%d] =\n", $filled_pos * 16; + print OUTPUT "{\n"; + my @null_idx = (0) x 16; + print OUTPUT " /* null sub-index */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_idx ); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled[$i] += $null_offset; + printf OUTPUT ",\n /* sub-index 0x%02x */\n", $filled[$i]; + + my @sub_idx; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($i << 4) | $j; + $sub_idx[$j] = $sub_filled{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_idx ); } + print OUTPUT "\n};\n\n"; - # dump the main index + # dump the 16-char subsets - printf OUTPUT "static const WCHAR table[%d] =\n", $total; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); - printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 ); + printf OUTPUT "static const USHORT offsets_decomp[%d] =\n", 32 * $sub_filled_pos; + print OUTPUT "{\n"; + print OUTPUT " /* (nfd, nfkd) x 16 */\n"; + my @null_table = (0) x 32; + print OUTPUT " /* no decomposition */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_table ); + for my $key (sort {$a <=> $b} keys %sub_filled) + { + printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $key, $key; + my @sub_table; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($key << 4) | $j; + $sub_table[2 * $j] = $nfd_lookup{$idx} || 0; + $sub_table[2 * $j + 1] = $nfkd_lookup{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_table ); + } + print OUTPUT "\n};\n\n"; - # dump the second-level indexes + print OUTPUT <<"EOF"; +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data, UINT scale_data ) +{ + USHORT a, b, c, d; - for (my $i = 0; $i < 256; $i++) + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << scale_data); + if (compat) ++c; + d = offsets[c]; + + return &data[d]; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) +{ + int total_decomp = 0; + int size_decomp; + const WCHAR *map; + + if (ch < 0xa0) /* fast path */ { - next unless ($filled_idx[$i] > 256); - my @table = @filled[($i<<4)..($i<<4)+15]; - for (my $j = 0; $j < 16; $j++) { $table[$j] ||= $null_offset; } - printf OUTPUT ",\n /* sub-index %02x */\n", $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup( ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp, 1 ))) + { + if (dstlen) *dst = (WCHAR)ch; + return 1; } + else { + while (*map) + { + size_decomp = decompose_char_recursive( compat, *map, dst, dstlen ); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} - # dump the 16-char subsets +int wine_unicode_decompose_string( int compat, const WCHAR *src, + int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0; + int decomp_len; - printf OUTPUT ",\n /* null mapping */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, (0) x 32 ); + if (dstlen < 0) dstlen = 0; - for (my $i = 0; $i < 4096; $i++) + while (srcpos < srclen) { - next unless $filled[$i]; - my @table = (0) x 32; - for (my $j = 0; $j < 16; $j++) + ch = src[srcpos]; + + decomp_len = decompose_char_recursive( compat, ch, dst+dstpos, dstlen ); + dstpos += decomp_len; + + if (dstlen > 0) { - if (defined $decomp_table[($i<<4) + $j]) + dstlen -= decomp_len; + while (dstlen < 0) { - $table[2 * $j] = ${$decomp_table[($i << 4) + $j]}[0]; - $table[2 * $j + 1] = ${$decomp_table[($i << 4) + $j]}[1]; + dstpos--; + dstlen++; } } - printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $i, $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + + ++srcpos; } - printf OUTPUT "\n};\n\n"; - print OUTPUT <<"EOF"; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) -{ - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; - - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; + return dstpos; } EOF close OUTPUT; -- 2.17.1

2 3

[PATCH] comctl32/tests: Use SetRect() instead of open coding it
by Michael Stefaniuc 04 Dec '18

04 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/button.c | 5 +---- dlls/comctl32/tests/monthcal.c | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 81461dee44..09ec4a1c0a 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1366,10 +1366,7 @@ static void test_get_set_textmargin(void) BOOL ret; DWORD type; - margin_in.top = 1; - margin_in.left = 2; - margin_in.right = 3; - margin_in.bottom = 4; + SetRect(&margin_in, 2, 1, 3, 4); for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) { hwnd = create_button(type, NULL); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 7c78540333..11a637fb82 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1798,7 +1798,7 @@ static void test_hittest_v6(void) mchit.iOffset = -1; mchit.iCol = mchit.iRow = -1; mchit.uHit = 0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_CALENDARDATE, ret); expect_hex(MCHT_CALENDARDATE, mchit.uHit); @@ -1815,7 +1815,7 @@ static void test_hittest_v6(void) mchit.iOffset = -1; mchit.iCol = mchit.iRow = -1; mchit.uHit = 0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_TITLE, ret); expect_hex(MCHT_TITLE, mchit.uHit); @@ -1834,7 +1834,7 @@ static void test_hittest_v6(void) mchit.iOffset = -2; mchit.iCol = mchit.iRow = -2; mchit.uHit = ~0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); todo_wine expect_hex(MCHT_NOWHERE, ret); todo_wine expect_hex(MCHT_NOWHERE, mchit.uHit); -- 2.14.5

1 0

[PATCH 1/2] dxgi/tests: Add test for enumerating display adapters using SetupAPI.
by Józef Kucia 04 Dec '18

04 Dec '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Shows that display adapter LUIDs are stored in SetupAPI device properties. It might be useful information to fix LUIDs in Wine. We could register display adapters and assign LUIDs to them. DXGI, winevulkan and wined3d could retrieve LUIDs using SetupAPI. --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/dxgi.c | 115 ++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 1c99d70957d5..76f78cc5fd4d 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = d3d10_1 dxgi user32 +IMPORTS = d3d10_1 dxgi setupapi user32 C_SRCS = \ dxgi.c diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 02cf744be358..bf57ea2fb1bc 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -22,6 +22,9 @@ #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" #include "wine/heap.h" #include "wine/test.h" @@ -820,6 +823,117 @@ static void test_adapter_luid(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +DEFINE_DEVPROPKEY(DEVPROPKEY_DISPLAY_ADAPTER_LUID, + 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + +static void test_display_adapters(void) +{ + DXGI_ADAPTER_DESC adapter_desc; + BOOL found_display_adapter; + unsigned int adapter_index; + unsigned int device_index; + DEVPROPTYPE property_type; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + SP_DEVINFO_DATA data; + HDEVINFO dev_info; + DWORD last_error; + ULONG refcount; + void *buffer; + WCHAR *name; + DWORD size; + HRESULT hr; + LUID luid; + BOOL ret; + + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + for (adapter_index = 0; (hr = IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)) == S_OK; ++adapter_index) + { + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "Adapter has %u references left.\n", refcount); + + /* Skip WARP. */ + if ((!adapter_desc.SubSysId && !adapter_desc.Revision && !adapter_desc.VendorId && !adapter_desc.DeviceId) + || (adapter_desc.VendorId == 0x1414 && adapter_desc.DeviceId == 0x008c)) + continue; + + found_display_adapter = FALSE; + + dev_info = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, DIGCF_PRESENT); + ok(dev_info != INVALID_HANDLE_VALUE, "Failed to get device information set.\n"); + + data.cbSize = sizeof(data); + for (device_index = 0; SetupDiEnumDeviceInfo(dev_info, device_index, &data); ++device_index) + { + /* LUID */ + size = 0; + property_type = DEVPROP_TYPE_EMPTY; + ret = SetupDiGetDevicePropertyW(dev_info, &data, &DEVPROPKEY_DISPLAY_ADAPTER_LUID, + &property_type, NULL, 0, &size, 0); + last_error = GetLastError(); + todo_wine + ok(!ret && last_error == ERROR_INSUFFICIENT_BUFFER, + "Failed to get device property size, ret %#x, last_error %#x.\n", ret, last_error); + if (!ret && last_error == ERROR_NOT_FOUND) + break; + ok(property_type == DEVPROP_TYPE_UINT64, "Got unexpected property type %#x.\n", property_type); + ok(size == sizeof(LUID), "Got unexpected size %u.\n", size); + + buffer = heap_alloc(size); + ok(!!buffer, "Failed to allocate memory.\n"); + ret = SetupDiGetDevicePropertyW(dev_info, &data, &DEVPROPKEY_DISPLAY_ADAPTER_LUID, + &property_type, buffer, size, &size, 0); + ok(ret, "Failed to get device property, ret %#x, last_error %#x.\n", ret, GetLastError()); + luid = *(LUID *)buffer; + heap_free(buffer); + + if (equal_luid(luid, adapter_desc.AdapterLuid)) + { + found_display_adapter = TRUE; + + /* name */ + size = 0; + property_type = DEVPROP_TYPE_STRING; + ret = SetupDiGetDevicePropertyW(dev_info, &data, &DEVPKEY_NAME, + &property_type, NULL, 0, &size, 0); + last_error = GetLastError(); + ok(!ret && last_error == ERROR_INSUFFICIENT_BUFFER, + "Failed to get device property size, ret %#x, last_error %#x.\n", ret, last_error); + ok(property_type == DEVPROP_TYPE_STRING, "Got unexpected property type %#x.\n", property_type); + + name = heap_alloc(size); + ok(!!name, "Failed to allocate memory.\n"); + ret = SetupDiGetDevicePropertyW(dev_info, &data, &DEVPKEY_NAME, + &property_type, (void *)name, size, &size, 0); + ok(ret, "Failed to get device property, ret %#x, last_error %#x.\n", ret, GetLastError()); + + ok(!lstrcmpW(adapter_desc.Description, name), + "Adapter names do not match: %s, %s.\n", + wine_dbgstr_w(adapter_desc.Description), wine_dbgstr_w(name)); + + heap_free(name); + break; + } + } + + ret = SetupDiDestroyDeviceInfoList(dev_info); + ok(ret, "Failed to destroy device info list.\n"); + + todo_wine + ok(found_display_adapter, "Failed to find display adapter for IDXGIAdapter %u (%s %04x:%04x).\n", + adapter_index, wine_dbgstr_w(adapter_desc.Description), + adapter_desc.VendorId, adapter_desc.DeviceId); + } + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void test_query_video_memory_info(void) { DXGI_QUERY_VIDEO_MEMORY_INFO memory_info; @@ -5018,6 +5132,7 @@ START_TEST(dxgi) queue_test(test_adapter_desc); queue_test(test_adapter_luid); + queue_test(test_display_adapters); queue_test(test_query_video_memory_info); queue_test(test_check_interface_support); queue_test(test_create_surface); -- 2.18.1

5 6

[PATCH] explorer: unload graphics driver and delete registry
by Daniel Wendt 04 Dec '18

04 Dec '18

2 1

[PATCH 2/2] wininet: fix fd_set redefinition on NetBSD
by Frédéric Fauberteau 04 Dec '18

04 Dec '18

On NetBSD, time.h includes sys/time.h that includes sys/select.h. It must be included before winsock2.h that redefines fd_set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46230 Signed-off-by: Frédéric Fauberteau <triaxx(a)NetBSD.org> --- dlls/wininet/http.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4122067e41..131d3ac612 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -35,12 +35,13 @@ # include <zlib.h> #endif +#include <time.h> + #include "winsock2.h" #include "ws2ipdef.h" #include <stdarg.h> #include <stdio.h> -#include <time.h> #include <assert.h> #include "windef.h" -- 2.19.2

2 2

[PATCH vkd3d 05/10] tests: Introduce common header for d3d12 crosstests.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 41 +------------------------- tests/d3d12_crosstest.h | 63 ++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 6 ++-- 3 files changed, 67 insertions(+), 43 deletions(-) create mode 100644 tests/d3d12_crosstest.h diff --git a/tests/d3d12.c b/tests/d3d12.c index 6f45ac99fd5d..8f9e2c6ce061 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16,46 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Hack for MinGW-w64 headers. - * - * We want to use WIDL C inline wrappers because some methods - * in D3D12 interfaces return aggregate objects. Unfortunately, - * WIDL C inline wrappers are broken when used with MinGW-w64 - * headers because FORCEINLINE expands to extern inline - * which leads to the "multiple storage classes in declaration - * specifiers" compiler error. - */ -#ifdef __MINGW32__ -# include <_mingw.h> -# ifdef __MINGW64_VERSION_MAJOR -# undef __forceinline -# define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) -# endif - -# define _HRESULT_DEFINED -typedef int HRESULT; -#endif - -#define COBJMACROS -#define INITGUID -#include "vkd3d_test.h" -#include "vkd3d_windows.h" -#define WIDL_C_INLINE_WRAPPERS -#include "vkd3d_d3d12.h" - -#include <inttypes.h> -#include <limits.h> -#include <math.h> -#include <time.h> - -#ifdef _WIN32 -# include "vkd3d_dxgi1_4.h" -#else -# include <pthread.h> -# include "vkd3d_utils.h" -#endif - -#include "d3d12_test_utils.h" +#include "d3d12_crosstest.h" struct vec2 { diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h new file mode 100644 index 000000000000..daf156b15b4a --- /dev/null +++ b/tests/d3d12_crosstest.h @@ -0,0 +1,63 @@ +/* + * Copyright 2016-2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __VKD3D_D3D12_CROSSTEST_H +#define __VKD3D_D3D12_CROSSTEST_H + +/* Hack for MinGW-w64 headers. + * + * We want to use WIDL C inline wrappers because some methods + * in D3D12 interfaces return aggregate objects. Unfortunately, + * WIDL C inline wrappers are broken when used with MinGW-w64 + * headers because FORCEINLINE expands to extern inline + * which leads to the "multiple storage classes in declaration + * specifiers" compiler error. + */ +#ifdef __MINGW32__ +# include <_mingw.h> +# ifdef __MINGW64_VERSION_MAJOR +# undef __forceinline +# define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) +# endif + +# define _HRESULT_DEFINED +typedef int HRESULT; +#endif + +#define COBJMACROS +#define INITGUID +#include "vkd3d_test.h" +#include "vkd3d_windows.h" +#define WIDL_C_INLINE_WRAPPERS +#include "vkd3d_d3d12.h" + +#include <inttypes.h> +#include <limits.h> +#include <math.h> +#include <time.h> + +#ifdef _WIN32 +# include "vkd3d_dxgi1_4.h" +#else +# include <pthread.h> +# include "vkd3d_utils.h" +#endif + +#include "d3d12_test_utils.h" + +#endif /* __VKD3D_D3D12_CROSSTEST_H */ diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index c2e7a3d50458..02c5a74e1ac9 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __VKD3D_D3D12_TEST_H -#define __VKD3D_D3D12_TEST_H +#ifndef __VKD3D_D3D12_TEST_UTILS_H +#define __VKD3D_D3D12_TEST_UTILS_H #define wait_queue_idle(a, b) wait_queue_idle_(__LINE__, a, b) static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue); @@ -769,4 +769,4 @@ static inline D3D12_GPU_DESCRIPTOR_HANDLE get_gpu_sampler_handle(struct test_con return get_gpu_handle(context->device, heap, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, offset); } -#endif /* __VKD3D_D3D12_TEST_H */ +#endif /* __VKD3D_D3D12_TEST_UTILS_H */ -- 2.19.2

2 1

[PATCH vkd3d 06/10] tests: Move more helpers to d3d12_test_utils.h.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> We should move the implementation to a C file. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 40 ---------------------------------- tests/d3d12_test_utils.h | 46 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8f9e2c6ce061..e48750b9cba6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -173,18 +173,6 @@ static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resourc ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); } -#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) -static void reset_command_list_(unsigned int line, - ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) -{ - HRESULT hr; - - hr = ID3D12CommandAllocator_Reset(allocator); - ok_(line)(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); - hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); - ok_(line)(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr); -} - #ifdef _WIN32 static HANDLE create_event(void) { @@ -354,21 +342,6 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm ID3D12Fence_Release(fence); } -#define update_buffer_data(a, b, c, d) update_buffer_data_(__LINE__, a, b, c, d) -static void update_buffer_data_(unsigned int line, ID3D12Resource *buffer, - size_t offset, size_t size, const void *data) -{ - D3D12_RANGE range; - HRESULT hr; - void *ptr; - - range.Begin = range.End = 0; - hr = ID3D12Resource_Map(buffer, 0, &range, &ptr); - ok_(line)(SUCCEEDED(hr), "Failed to map buffer, hr %#x.\n", hr); - memcpy((BYTE *)ptr + offset, data, size); - ID3D12Resource_Unmap(buffer, 0, NULL); -} - #define create_default_buffer(a, b, c, d) create_default_buffer_(__LINE__, a, b, c, d) static ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *device, size_t size, D3D12_RESOURCE_FLAGS resource_flags, D3D12_RESOURCE_STATES initial_resource_state) @@ -377,19 +350,6 @@ static ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *d resource_flags, initial_resource_state); } -#define create_upload_buffer(a, b, c) create_upload_buffer_(__LINE__, a, b, c) -static ID3D12Resource *create_upload_buffer_(unsigned int line, ID3D12Device *device, - size_t size, const void *data) -{ - ID3D12Resource *buffer; - - buffer = create_buffer_(line, device, D3D12_HEAP_TYPE_UPLOAD, size, - D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_GENERIC_READ); - if (data) - update_buffer_data_(line, buffer, 0, size, data); - return buffer; -} - static void copy_sub_resource_data(const D3D12_MEMCPY_DEST *dst, const D3D12_SUBRESOURCE_DATA *src, unsigned int row_count, unsigned int slice_count, size_t row_size) { diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 02c5a74e1ac9..d4265fc893c8 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -81,6 +81,18 @@ static void exec_command_list(ID3D12CommandQueue *queue, ID3D12GraphicsCommandLi ID3D12CommandQueue_ExecuteCommandLists(queue, 1, lists); } +#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) +static inline void reset_command_list_(unsigned int line, + ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) +{ + HRESULT hr; + + hr = ID3D12CommandAllocator_Reset(allocator); + ok_(line)(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); + ok_(line)(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr); +} + #define create_buffer(a, b, c, d, e) create_buffer_(__LINE__, a, b, c, d, e) static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, D3D12_HEAP_TYPE heap_type, size_t size, D3D12_RESOURCE_FLAGS resource_flags, @@ -121,6 +133,34 @@ static ID3D12Resource *create_readback_buffer_(unsigned int line, ID3D12Device * D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST); } +#define update_buffer_data(a, b, c, d) update_buffer_data_(__LINE__, a, b, c, d) +static inline void update_buffer_data_(unsigned int line, ID3D12Resource *buffer, + size_t offset, size_t size, const void *data) +{ + D3D12_RANGE range; + HRESULT hr; + void *ptr; + + range.Begin = range.End = 0; + hr = ID3D12Resource_Map(buffer, 0, &range, &ptr); + ok_(line)(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memcpy((BYTE *)ptr + offset, data, size); + ID3D12Resource_Unmap(buffer, 0, NULL); +} + +#define create_upload_buffer(a, b, c) create_upload_buffer_(__LINE__, a, b, c) +static inline ID3D12Resource *create_upload_buffer_(unsigned int line, ID3D12Device *device, + size_t size, const void *data) +{ + ID3D12Resource *buffer; + + buffer = create_buffer_(line, device, D3D12_HEAP_TYPE_UPLOAD, size, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_GENERIC_READ); + if (data) + update_buffer_data_(line, buffer, 0, size, data); + return buffer; +} + #define create_cpu_descriptor_heap(a, b, c) create_cpu_descriptor_heap_(__LINE__, a, b, c) static inline ID3D12DescriptorHeap *create_cpu_descriptor_heap_(unsigned int line, ID3D12Device *device, D3D12_DESCRIPTOR_HEAP_TYPE heap_type, unsigned int descriptor_count) @@ -377,7 +417,7 @@ static void check_readback_data_uint_(unsigned int line, struct resource_readbac } #define check_sub_resource_uint(a, b, c, d, e, f) check_sub_resource_uint_(__LINE__, a, b, c, d, e, f) -static void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, +static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, unsigned int expected, unsigned int max_diff) { @@ -617,7 +657,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex } #define init_test_context(context, desc) init_test_context_(__LINE__, context, desc) -static bool init_test_context_(unsigned int line, struct test_context *context, +static inline bool init_test_context_(unsigned int line, struct test_context *context, const struct test_context_desc *desc) { D3D12_COMMAND_QUEUE_DESC command_queue_desc; @@ -687,7 +727,7 @@ static bool init_test_context_(unsigned int line, struct test_context *context, } #define destroy_test_context(context) destroy_test_context_(__LINE__, context) -static void destroy_test_context_(unsigned int line, struct test_context *context) +static inline void destroy_test_context_(unsigned int line, struct test_context *context) { ULONG refcount; -- 2.19.2

2 1

[PATCH vkd3d 10/10] tests: Introduce enable_d3d12_debug_layer() helper function.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 1 + tests/d3d12_crosstest.h | 17 +++++++++++++---- tests/d3d12_invalid_usage.c | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index aee2ccca4295..1598910718f4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21810,6 +21810,7 @@ static void test_primitive_restart(void) START_TEST(d3d12) { parse_args(argc, argv); + enable_d3d12_debug_layer(argc, argv); print_adapter_info(); run_test(test_create_device); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 8f522e880b16..ececd7810329 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -317,6 +317,19 @@ static ID3D12Device *create_device(void) } static void parse_args(int argc, char **argv) +{ + unsigned int i; + + for (i = 1; i < argc; ++i) + { + if (!strcmp(argv[i], "--warp")) + use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } +} + +static void enable_d3d12_debug_layer(int argc, char **argv) { bool enable_debug_layer = false; ID3D12Debug *debug; @@ -326,10 +339,6 @@ static void parse_args(int argc, char **argv) { if (!strcmp(argv[i], "--validate")) enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); } if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 40935428f5ad..5f764eb95fe0 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -153,6 +153,7 @@ static void test_invalid_texture_resource_barriers(void) START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); + enable_d3d12_debug_layer(argc, argv); print_adapter_info(); run_test(test_invalid_texture_resource_barriers); -- 2.19.2

3 2

[PATCH vkd3d 09/10] tests: Introduce parse_args() helper function.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 21 +-------------------- tests/d3d12_crosstest.h | 23 +++++++++++++++++++++++ tests/d3d12_invalid_usage.c | 21 +-------------------- 3 files changed, 25 insertions(+), 40 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3123018aca6f..aee2ccca4295 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21809,26 +21809,7 @@ static void test_primitive_restart(void) START_TEST(d3d12) { - bool enable_debug_layer = false; - ID3D12Debug *debug; - unsigned int i; - - for (i = 1; i < argc; ++i) - { - if (!strcmp(argv[i], "--validate")) - enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); - } - - if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) - { - ID3D12Debug_EnableDebugLayer(debug); - ID3D12Debug_Release(debug); - } - + parse_args(argc, argv); print_adapter_info(); run_test(test_create_device); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ddba9feaa589..8f522e880b16 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -316,4 +316,27 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } +static void parse_args(int argc, char **argv) +{ + bool enable_debug_layer = false; + ID3D12Debug *debug; + unsigned int i; + + for (i = 1; i < argc; ++i) + { + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = true; + else if (!strcmp(argv[i], "--warp")) + use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + + if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) + { + ID3D12Debug_EnableDebugLayer(debug); + ID3D12Debug_Release(debug); + } +} + #endif /* __VKD3D_D3D12_CROSSTEST_H */ diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index ce354b8a8709..40935428f5ad 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -152,26 +152,7 @@ static void test_invalid_texture_resource_barriers(void) START_TEST(d3d12_invalid_usage) { - bool enable_debug_layer = false; - ID3D12Debug *debug; - unsigned int i; - - for (i = 1; i < argc; ++i) - { - if (!strcmp(argv[i], "--validate")) - enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); - } - - if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) - { - ID3D12Debug_EnableDebugLayer(debug); - ID3D12Debug_Release(debug); - } - + parse_args(argc, argv); print_adapter_info(); run_test(test_invalid_texture_resource_barriers); -- 2.19.2

3 2

[PATCH vkd3d 08/10] tests: Move invalid usage tests to separate unit.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Ideally, tests should not produce Vulkan validation errors. Move tests which explicitly test invalid usage of D3D12 and are expected to produce validation errors to a separate file. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 3 +- tests/d3d12.c | 133 --------------------------- tests/d3d12_invalid_usage.c | 178 ++++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 134 deletions(-) create mode 100644 tests/d3d12_invalid_usage.c diff --git a/Makefile.am b/Makefile.am index c2a20c6149c3..86c0184c97a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,8 @@ vkd3d_tests = \ tests/vkd3d_api vkd3d_cross_tests = \ - tests/d3d12 + tests/d3d12 \ + tests/d3d12_invalid_usage vkd3d_test_headers = \ tests/vkd3d_d3d12_test.h diff --git a/tests/d3d12.c b/tests/d3d12.c index d886f960ddf0..3123018aca6f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5080,138 +5080,6 @@ static void test_texture_resource_barriers(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_invalid_texture_resource_barriers(void) -{ - ID3D12Resource *texture, *readback_buffer, *upload_buffer; - D3D12_COMMAND_QUEUE_DESC command_queue_desc; - ID3D12CommandAllocator *command_allocator; - ID3D12GraphicsCommandList *command_list; - ID3D12CommandQueue *queue; - ID3D12Device *device; - ULONG refcount; - HRESULT hr; - - if (!(device = create_device())) - { - skip("Failed to create device.\n"); - return; - } - - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&queue); - ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr); - - hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, - &IID_ID3D12CommandAllocator, (void **)&command_allocator); - ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr); - - hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, - command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); - - texture = create_default_texture(device, 32, 32, DXGI_FORMAT_R8G8B8A8_UNORM, - D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); - upload_buffer = create_upload_buffer(device, 32, NULL); - readback_buffer = create_readback_buffer(device, 32); - - /* The following invalid barrier is not detected by the runtime. */ - transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - hr = ID3D12GraphicsCommandList_Close(command_list); - ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); - - reset_command_list(command_list, command_allocator); - - /* The before state does not match with the previous state. */ - transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_SOURCE); - transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); - hr = ID3D12GraphicsCommandList_Close(command_list); - /* The returned error code has changed after a Windows update. */ - ok(hr == S_OK || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (hr == S_OK) - { - exec_command_list(queue, command_list); - wait_queue_idle(device, queue); - } - - ID3D12GraphicsCommandList_Release(command_list); - hr = ID3D12CommandAllocator_Reset(command_allocator); - ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); - hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, - command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); - - /* The before state does not match with the previous state. */ - transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, - D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); - transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - hr = ID3D12GraphicsCommandList_Close(command_list); - /* The returned error code has changed after a Windows update. */ - ok(hr == S_OK || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (hr == S_OK) - { - exec_command_list(queue, command_list); - wait_queue_idle(device, queue); - } - - hr = ID3D12CommandAllocator_Reset(command_allocator); - ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); - ID3D12GraphicsCommandList_Release(command_list); - hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, - command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); - - /* Exactly one write state or a combination of read-only states are allowed. */ - transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); - hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - - hr = ID3D12CommandAllocator_Reset(command_allocator); - ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); - ID3D12GraphicsCommandList_Release(command_list); - hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, - command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); - - /* Readback resources cannot transition from D3D12_RESOURCE_STATE_COPY_DEST. */ - transition_resource_state(command_list, readback_buffer, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON); - hr = ID3D12GraphicsCommandList_Close(command_list); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - - hr = ID3D12CommandAllocator_Reset(command_allocator); - ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); - ID3D12GraphicsCommandList_Release(command_list); - hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, - command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); - - /* Upload resources cannot transition from D3D12_RESOURCE_STATE_GENERIC_READ. */ - transition_resource_state(command_list, upload_buffer, - D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_COMMON); - hr = ID3D12GraphicsCommandList_Close(command_list); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - - ID3D12CommandAllocator_Release(command_allocator); - ID3D12CommandQueue_Release(queue); - ID3D12GraphicsCommandList_Release(command_list); - ID3D12Resource_Release(readback_buffer); - ID3D12Resource_Release(texture); - ID3D12Resource_Release(upload_buffer); - refcount = ID3D12Device_Release(device); - ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); -} - static void test_device_removed_reason(void) { D3D12_COMMAND_QUEUE_DESC command_queue_desc; @@ -22002,7 +21870,6 @@ START_TEST(d3d12) run_test(test_draw_depth_only); run_test(test_draw_uav_only); run_test(test_texture_resource_barriers); - run_test(test_invalid_texture_resource_barriers); run_test(test_device_removed_reason); run_test(test_map_resource); run_test(test_map_placed_resources); diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c new file mode 100644 index 000000000000..ce354b8a8709 --- /dev/null +++ b/tests/d3d12_invalid_usage.c @@ -0,0 +1,178 @@ +/* + * Copyright 2016-2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3d12_crosstest.h" + +static void test_invalid_texture_resource_barriers(void) +{ + ID3D12Resource *texture, *readback_buffer, *upload_buffer; + D3D12_COMMAND_QUEUE_DESC command_queue_desc; + ID3D12CommandAllocator *command_allocator; + ID3D12GraphicsCommandList *command_list; + ID3D12CommandQueue *queue; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + command_queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, + &IID_ID3D12CommandQueue, (void **)&queue); + ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr); + + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&command_allocator); + ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr); + + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + texture = create_default_texture(device, 32, 32, DXGI_FORMAT_R8G8B8A8_UNORM, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + upload_buffer = create_upload_buffer(device, 32, NULL); + readback_buffer = create_readback_buffer(device, 32); + + /* The following invalid barrier is not detected by the runtime. */ + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); + + reset_command_list(command_list, command_allocator); + + /* The before state does not match with the previous state. */ + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + hr = ID3D12GraphicsCommandList_Close(command_list); + /* The returned error code has changed after a Windows update. */ + ok(hr == S_OK || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + } + + ID3D12GraphicsCommandList_Release(command_list); + hr = ID3D12CommandAllocator_Reset(command_allocator); + ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + /* The before state does not match with the previous state. */ + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, + D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + hr = ID3D12GraphicsCommandList_Close(command_list); + /* The returned error code has changed after a Windows update. */ + ok(hr == S_OK || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + } + + hr = ID3D12CommandAllocator_Reset(command_allocator); + ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + ID3D12GraphicsCommandList_Release(command_list); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + /* Exactly one write state or a combination of read-only states are allowed. */ + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12CommandAllocator_Reset(command_allocator); + ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + ID3D12GraphicsCommandList_Release(command_list); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + /* Readback resources cannot transition from D3D12_RESOURCE_STATE_COPY_DEST. */ + transition_resource_state(command_list, readback_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON); + hr = ID3D12GraphicsCommandList_Close(command_list); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12CommandAllocator_Reset(command_allocator); + ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + ID3D12GraphicsCommandList_Release(command_list); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + /* Upload resources cannot transition from D3D12_RESOURCE_STATE_GENERIC_READ. */ + transition_resource_state(command_list, upload_buffer, + D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_COMMON); + hr = ID3D12GraphicsCommandList_Close(command_list); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D12CommandAllocator_Release(command_allocator); + ID3D12CommandQueue_Release(queue); + ID3D12GraphicsCommandList_Release(command_list); + ID3D12Resource_Release(readback_buffer); + ID3D12Resource_Release(texture); + ID3D12Resource_Release(upload_buffer); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + +START_TEST(d3d12_invalid_usage) +{ + bool enable_debug_layer = false; + ID3D12Debug *debug; + unsigned int i; + + for (i = 1; i < argc; ++i) + { + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = true; + else if (!strcmp(argv[i], "--warp")) + use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + + if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) + { + ID3D12Debug_EnableDebugLayer(debug); + ID3D12Debug_Release(debug); + } + + print_adapter_info(); + + run_test(test_invalid_texture_resource_barriers); +} -- 2.19.2

2 1

[PATCH vkd3d 07/10] tests: Move some helpers to d3d12_crosstest.h.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 256 ---------------------------------------- tests/d3d12_crosstest.h | 256 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 256 insertions(+), 256 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index e48750b9cba6..d886f960ddf0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -173,175 +173,6 @@ static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resourc ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); } -#ifdef _WIN32 -static HANDLE create_event(void) -{ - return CreateEventA(NULL, FALSE, FALSE, NULL); -} - -static void signal_event(HANDLE event) -{ - SetEvent(event); -} - -static unsigned int wait_event(HANDLE event, unsigned int milliseconds) -{ - return WaitForSingleObject(event, milliseconds); -} - -static void destroy_event(HANDLE event) -{ - CloseHandle(event); -} -#else -#define INFINITE VKD3D_INFINITE -#define WAIT_OBJECT_0 VKD3D_WAIT_OBJECT_0 -#define WAIT_TIMEOUT VKD3D_WAIT_TIMEOUT - -static HANDLE create_event(void) -{ - return vkd3d_create_event(); -} - -static void signal_event(HANDLE event) -{ - vkd3d_signal_event(event); -} - -static unsigned int wait_event(HANDLE event, unsigned int milliseconds) -{ - return vkd3d_wait_event(event, milliseconds); -} - -static void destroy_event(HANDLE event) -{ - vkd3d_destroy_event(event); -} -#endif - -typedef void (*thread_main_pfn)(void *data); - -struct test_thread_data -{ - thread_main_pfn main_pfn; - void *user_data; -}; - -#ifdef _WIN32 -static DWORD WINAPI test_thread_main(void *untyped_data) -{ - struct test_thread_data *data = untyped_data; - data->main_pfn(data->user_data); - free(untyped_data); - return 0; -} - -static HANDLE create_thread(thread_main_pfn main_pfn, void *user_data) -{ - struct test_thread_data *data; - - if (!(data = malloc(sizeof(*data)))) - return NULL; - data->main_pfn = main_pfn; - data->user_data = user_data; - - return CreateThread(NULL, 0, test_thread_main, data, 0, NULL); -} - -static bool join_thread(HANDLE thread) -{ - unsigned int ret; - - ret = WaitForSingleObject(thread, INFINITE); - CloseHandle(thread); - return ret == WAIT_OBJECT_0; -} -#else -static void *test_thread_main(void *untyped_data) -{ - struct test_thread_data *data = untyped_data; - data->main_pfn(data->user_data); - free(untyped_data); - return NULL; -} - -static HANDLE create_thread(thread_main_pfn main_pfn, void *user_data) -{ - struct test_thread_data *data; - pthread_t *thread; - - if (!(thread = malloc(sizeof(*thread)))) - return NULL; - - if (!(data = malloc(sizeof(*data)))) - { - free(thread); - return NULL; - } - data->main_pfn = main_pfn; - data->user_data = user_data; - - if (pthread_create(thread, NULL, test_thread_main, data)) - { - free(data); - free(thread); - return NULL; - } - - return thread; -} - -static bool join_thread(HANDLE untyped_thread) -{ - pthread_t *thread = untyped_thread; - int rc; - - rc = pthread_join(*thread, NULL); - free(thread); - return !rc; -} -#endif - -static HRESULT wait_for_fence(ID3D12Fence *fence, UINT64 value) -{ - unsigned int ret; - HANDLE event; - HRESULT hr; - - if (ID3D12Fence_GetCompletedValue(fence) >= value) - return S_OK; - - if (!(event = create_event())) - return E_FAIL; - - if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(fence, value, event))) - { - destroy_event(event); - return hr; - } - - ret = wait_event(event, INFINITE); - destroy_event(event); - return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; -} - -static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue) -{ - ID3D12Fence *fence; - HRESULT hr; - - hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, - &IID_ID3D12Fence, (void **)&fence); - ok_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); - - hr = ID3D12CommandQueue_Signal(queue, fence, 1); - ok_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); - hr = wait_for_fence(fence, 1); - ok_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); - - ID3D12Fence_Release(fence); -} - #define create_default_buffer(a, b, c, d) create_default_buffer_(__LINE__, a, b, c, d) static ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *device, size_t size, D3D12_RESOURCE_FLAGS resource_flags, D3D12_RESOURCE_STATES initial_resource_state) @@ -780,93 +611,6 @@ static void check_sub_resource_uvec4_(unsigned int line, ID3D12Resource *texture expected_value->x, expected_value->y, expected_value->z, expected_value->w, x, y); } -static bool use_warp_device; -static unsigned int use_adapter_idx; - -#ifdef _WIN32 -static IUnknown *create_warp_adapter(IDXGIFactory4 *factory) -{ - IUnknown *adapter; - HRESULT hr; - - adapter = NULL; - hr = IDXGIFactory4_EnumWarpAdapter(factory, &IID_IUnknown, (void **)&adapter); - if (FAILED(hr)) - trace("Failed to get WARP adapter, hr %#x.\n", hr); - return adapter; -} - -static IUnknown *create_adapter(void) -{ - IUnknown *adapter = NULL; - IDXGIFactory4 *factory; - HRESULT hr; - - hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); - ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); - - if (use_warp_device && !(adapter = create_warp_adapter(factory))) - { - IDXGIFactory4_Release(factory); - return adapter; - } - - hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); - IDXGIFactory4_Release(factory); - if (FAILED(hr)) - trace("Failed to get adapter, hr %#x.\n", hr); - return adapter; -} - -static void print_adapter_info(void) -{ - IDXGIAdapter *dxgi_adapter; - DXGI_ADAPTER_DESC desc; - IUnknown *adapter; - HRESULT hr; - - if (!(adapter = create_adapter())) - return; - - hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); - ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); - IUnknown_Release(adapter); - - hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); - ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); - - trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); - - IDXGIAdapter_Release(dxgi_adapter); -} -#else -static IUnknown *create_adapter(void) -{ - return NULL; -} - -static void print_adapter_info(void) {} -#endif - -static ID3D12Device *create_device(void) -{ - IUnknown *adapter = NULL; - ID3D12Device *device; - HRESULT hr; - - if ((use_warp_device || use_adapter_idx) && !(adapter = create_adapter())) - { - trace("Failed to create adapter.\n"); - return NULL; - } - - hr = D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); - if (adapter) - IUnknown_Release(adapter); - - return SUCCEEDED(hr) ? device : NULL; -} - static bool broken_on_warp(bool condition) { return broken(use_warp_device && condition); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index daf156b15b4a..ddba9feaa589 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -60,4 +60,260 @@ typedef int HRESULT; #include "d3d12_test_utils.h" +#ifdef _WIN32 +static inline HANDLE create_event(void) +{ + return CreateEventA(NULL, FALSE, FALSE, NULL); +} + +static inline void signal_event(HANDLE event) +{ + SetEvent(event); +} + +static inline unsigned int wait_event(HANDLE event, unsigned int milliseconds) +{ + return WaitForSingleObject(event, milliseconds); +} + +static inline void destroy_event(HANDLE event) +{ + CloseHandle(event); +} +#else +#define INFINITE VKD3D_INFINITE +#define WAIT_OBJECT_0 VKD3D_WAIT_OBJECT_0 +#define WAIT_TIMEOUT VKD3D_WAIT_TIMEOUT + +static inline HANDLE create_event(void) +{ + return vkd3d_create_event(); +} + +static inline void signal_event(HANDLE event) +{ + vkd3d_signal_event(event); +} + +static inline unsigned int wait_event(HANDLE event, unsigned int milliseconds) +{ + return vkd3d_wait_event(event, milliseconds); +} + +static inline void destroy_event(HANDLE event) +{ + vkd3d_destroy_event(event); +} +#endif + +typedef void (*thread_main_pfn)(void *data); + +struct test_thread_data +{ + thread_main_pfn main_pfn; + void *user_data; +}; + +#ifdef _WIN32 +static inline DWORD WINAPI test_thread_main(void *untyped_data) +{ + struct test_thread_data *data = untyped_data; + data->main_pfn(data->user_data); + free(untyped_data); + return 0; +} + +static inline HANDLE create_thread(thread_main_pfn main_pfn, void *user_data) +{ + struct test_thread_data *data; + + if (!(data = malloc(sizeof(*data)))) + return NULL; + data->main_pfn = main_pfn; + data->user_data = user_data; + + return CreateThread(NULL, 0, test_thread_main, data, 0, NULL); +} + +static inline bool join_thread(HANDLE thread) +{ + unsigned int ret; + + ret = WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + return ret == WAIT_OBJECT_0; +} +#else +static void *test_thread_main(void *untyped_data) +{ + struct test_thread_data *data = untyped_data; + data->main_pfn(data->user_data); + free(untyped_data); + return NULL; +} + +static inline HANDLE create_thread(thread_main_pfn main_pfn, void *user_data) +{ + struct test_thread_data *data; + pthread_t *thread; + + if (!(thread = malloc(sizeof(*thread)))) + return NULL; + + if (!(data = malloc(sizeof(*data)))) + { + free(thread); + return NULL; + } + data->main_pfn = main_pfn; + data->user_data = user_data; + + if (pthread_create(thread, NULL, test_thread_main, data)) + { + free(data); + free(thread); + return NULL; + } + + return thread; +} + +static inline bool join_thread(HANDLE untyped_thread) +{ + pthread_t *thread = untyped_thread; + int rc; + + rc = pthread_join(*thread, NULL); + free(thread); + return !rc; +} +#endif + +static HRESULT wait_for_fence(ID3D12Fence *fence, UINT64 value) +{ + unsigned int ret; + HANDLE event; + HRESULT hr; + + if (ID3D12Fence_GetCompletedValue(fence) >= value) + return S_OK; + + if (!(event = create_event())) + return E_FAIL; + + if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(fence, value, event))) + { + destroy_event(event); + return hr; + } + + ret = wait_event(event, INFINITE); + destroy_event(event); + return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; +} + +static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue) +{ + ID3D12Fence *fence; + HRESULT hr; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&fence); + ok_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + hr = ID3D12CommandQueue_Signal(queue, fence, 1); + ok_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + hr = wait_for_fence(fence, 1); + ok_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + ID3D12Fence_Release(fence); +} + +static bool use_warp_device; +static unsigned int use_adapter_idx; + +#ifdef _WIN32 +static IUnknown *create_warp_adapter(IDXGIFactory4 *factory) +{ + IUnknown *adapter; + HRESULT hr; + + adapter = NULL; + hr = IDXGIFactory4_EnumWarpAdapter(factory, &IID_IUnknown, (void **)&adapter); + if (FAILED(hr)) + trace("Failed to get WARP adapter, hr %#x.\n", hr); + return adapter; +} + +static IUnknown *create_adapter(void) +{ + IUnknown *adapter = NULL; + IDXGIFactory4 *factory; + HRESULT hr; + + hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); + + if (use_warp_device && !(adapter = create_warp_adapter(factory))) + { + IDXGIFactory4_Release(factory); + return adapter; + } + + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + IDXGIFactory4_Release(factory); + if (FAILED(hr)) + trace("Failed to get adapter, hr %#x.\n", hr); + return adapter; +} + +static void print_adapter_info(void) +{ + IDXGIAdapter *dxgi_adapter; + DXGI_ADAPTER_DESC desc; + IUnknown *adapter; + HRESULT hr; + + if (!(adapter = create_adapter())) + return; + + hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); + IUnknown_Release(adapter); + + hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + + IDXGIAdapter_Release(dxgi_adapter); +} +#else +static IUnknown *create_adapter(void) +{ + return NULL; +} + +static void print_adapter_info(void) {} +#endif + +static ID3D12Device *create_device(void) +{ + IUnknown *adapter = NULL; + ID3D12Device *device; + HRESULT hr; + + if ((use_warp_device || use_adapter_idx) && !(adapter = create_adapter())) + { + trace("Failed to create adapter.\n"); + return NULL; + } + + hr = D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (adapter) + IUnknown_Release(adapter); + + return SUCCEEDED(hr) ? device : NULL; +} + #endif /* __VKD3D_D3D12_CROSSTEST_H */ -- 2.19.2

3 2

[PATCH vkd3d 04/10] tests: Add test for indirect indexed draw commands.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 143 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4344aa9f6f1c..6f45ac99fd5d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18575,15 +18575,96 @@ static void test_execute_indirect(void) ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; ID3D12Resource *argument_buffer, *uav; + D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_ROOT_PARAMETER root_parameter; ID3D12PipelineState *pipeline_state; ID3D12RootSignature *root_signature; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + D3D12_INDEX_BUFFER_VIEW ibv; struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; + ID3D12Resource *vb, *ib; unsigned int i; + D3D12_BOX box; HRESULT hr; + static const struct + { + struct vec4 position; + uint32_t color; + } + vertices[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, 0xffffff00}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, 0xffffff00}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 0xffffff00}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, 0xffffff00}, + + {{-1.0f, -1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{-1.0f, 0.5f, 0.0f, 1.0f}, 0xff00ff00}, + {{ 0.5f, -1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{ 0.5f, 0.5f, 0.0f, 1.0f}, 0xff00ff00}, + }; + static const uint32_t indices[] = {0, 1, 2, 3, 2, 1}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + struct vs_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + void main(in struct vs_data vs_input, out struct vs_data vs_output) + { + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; + } +#endif + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD ps_code[] = + { +#if 0 + struct ps_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + float4 main(struct ps_data ps_input) : SV_Target + { + return ps_input.color; + } +#endif + 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; static const DWORD cs_code[] = { #if 0 @@ -18610,15 +18691,19 @@ static void test_execute_indirect(void) { D3D12_DRAW_ARGUMENTS draw; D3D12_DISPATCH_ARGUMENTS dispatch; + D3D12_DRAW_INDEXED_ARGUMENTS indexed_draws[2]; } argument_data = { {3, 1, 0, 0}, {2, 3, 4}, + {{6, 1, 0, 0, 0}, {6, 1, 0, 4, 0}}, }; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - if (!init_test_context(&context, NULL)) + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + if (!init_test_context(&context, &desc)) return; command_list = context.list; queue = context.queue; @@ -18633,7 +18718,7 @@ static void test_execute_indirect(void) signature_desc.NodeMask = 0; hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(SUCCEEDED(hr), "Failed to create command signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); @@ -18656,7 +18741,7 @@ static void test_execute_indirect(void) signature_desc.ByteStride = sizeof(D3D12_DISPATCH_ARGUMENTS); hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(SUCCEEDED(hr), "Failed to create command signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); uav = create_default_buffer(context.device, 2 * 3 * 4 * sizeof(UINT), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -18671,7 +18756,7 @@ static void test_execute_indirect(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(context.device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); pipeline_state = create_compute_pipeline_state(context.device, root_signature, @@ -18692,9 +18777,63 @@ static void test_execute_indirect(void) } release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12CommandSignature_Release(command_signature); + argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED; + signature_desc.ByteStride = sizeof(*argument_data.indexed_draws); + hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + + ID3D12PipelineState_Release(context.pipeline_state); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + ib = create_upload_buffer(context.device, sizeof(indices), indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = sizeof(indices); + ibv.Format = DXGI_FORMAT_R32_UINT; + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, + ARRAY_SIZE(argument_data.indexed_draws), argument_buffer, + offsetof(struct argument_data, indexed_draws), NULL, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 32, 8, 1); + check_readback_data_uint(&rb, &box, 0xffffff00, 0); + set_box(&box, 24, 8, 0, 32, 32, 1); + check_readback_data_uint(&rb, &box, 0xffffff00, 0); + set_box(&box, 0, 8, 0, 24, 32, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + release_resource_readback(&rb); + ID3D12PipelineState_Release(pipeline_state); ID3D12RootSignature_Release(root_signature); + ID3D12Resource_Release(ib); ID3D12Resource_Release(uav); + ID3D12Resource_Release(vb); ID3D12CommandSignature_Release(command_signature); ID3D12Resource_Release(argument_buffer); destroy_test_context(&context); -- 2.19.2

2 1

[PATCH vkd3d 03/10] vkd3d: Validate that command signature contains exactly one dispatch/draw command.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 20 +++++++++++++++++ tests/d3d12.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 06823c893099..a175091b04ff 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4850,6 +4850,26 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ struct d3d12_command_signature **signature) { struct d3d12_command_signature *object; + unsigned int i; + + for (i = 0; i < desc->NumArgumentDescs; ++i) + { + const D3D12_INDIRECT_ARGUMENT_DESC *argument_desc = &desc->pArgumentDescs[i]; + switch (argument_desc->Type) + { + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW: + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: + if (i != desc->NumArgumentDescs - 1) + { + WARN("Draw/dispatch must be the last element of a command signature.\n"); + return E_INVALIDARG; + } + break; + default: + break; + } + } if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/tests/d3d12.c b/tests/d3d12.c index 7ad0303985be..4344aa9f6f1c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1685,6 +1685,56 @@ static void test_create_command_queue(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_command_signature(void) +{ + D3D12_INDIRECT_ARGUMENT_DESC argument_desc[3]; + D3D12_COMMAND_SIGNATURE_DESC signature_desc; + ID3D12CommandSignature *command_signature; + ID3D12Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + signature_desc.ByteStride = 1024; + signature_desc.NumArgumentDescs = ARRAY_SIZE(argument_desc); + signature_desc.pArgumentDescs = argument_desc; + signature_desc.NodeMask = 0; + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + argument_desc[0].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; + argument_desc[1].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; + signature_desc.NumArgumentDescs = 2; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_committed_resource(void) { D3D12_GPU_VIRTUAL_ADDRESS gpu_address; @@ -22116,6 +22166,7 @@ START_TEST(d3d12) run_test(test_create_command_allocator); run_test(test_create_command_list); run_test(test_create_command_queue); + run_test(test_create_command_signature); run_test(test_create_committed_resource); run_test(test_create_heap); run_test(test_create_placed_resource); -- 2.19.2

2 1

[PATCH vkd3d 02/10] vkd3d: Add asserts for indirect draw arguments.
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 937c7e37fc49..06823c893099 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4087,6 +4087,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndEvent(ID3D12GraphicsCommandL FIXME("iface %p stub!\n", iface); } +STATIC_ASSERT(sizeof(VkDispatchIndirectCommand) == sizeof(D3D12_DISPATCH_ARGUMENTS)); +STATIC_ASSERT(sizeof(VkDrawIndexedIndirectCommand) == sizeof(D3D12_DRAW_INDEXED_ARGUMENTS)); +STATIC_ASSERT(sizeof(VkDrawIndirectCommand) == sizeof(D3D12_DRAW_ARGUMENTS)); + static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsCommandList *iface, ID3D12CommandSignature *command_signature, UINT max_command_count, ID3D12Resource *arg_buffer, UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset) -- 2.19.2

2 1

[PATCH vkd3d 01/10] vkd3d: Get rid of asserts from d3d12_device_CopyDescriptors().
by Józef Kucia 04 Dec '18

04 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Do not require that source range sizes match destination range sizes. It works on Windows even though D3D12 validation layers throw errors about size mismatches. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cf40e7a1f064..9e3682830684 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1997,17 +1997,14 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; } - assert(dst_range_idx < dst_descriptor_range_count); - assert(dst_idx < dst_range_size); + if (dst_range_idx >= dst_descriptor_range_count) + break; d3d12_desc_copy(dst++, src++, device); ++dst_idx; } } - - assert(dst_idx == dst_range_size); - assert(dst_range_idx == dst_descriptor_range_count - 1); } static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device *iface, -- 2.19.2

2 1

[PATCH 2/2] winetest: Implement GUI to display the results of individual tests
by Isira Seneviratne 04 Dec '18

04 Dec '18

2 1

[PATCH 1/2] winetest: Add email validation
by Isira Seneviratne 04 Dec '18

04 Dec '18

2 1

[PATCH] wined3d: Get rid of the "colRGBA" variable in light().
by Henri Verbeet 04 Dec '18

04 Dec '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 155517. dlls/wined3d/state.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 42c109da57b..8708aa09b3e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4152,35 +4152,15 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s else { float quad_att; - float colRGBA[] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Light settings are affected by the model view in OpenGL, the View transform in direct3d*/ gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); gl_info->gl_ops.gl.p_glPushMatrix(); gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW]._11); - /* Diffuse: */ - colRGBA[0] = lightInfo->OriginalParms.diffuse.r; - colRGBA[1] = lightInfo->OriginalParms.diffuse.g; - colRGBA[2] = lightInfo->OriginalParms.diffuse.b; - colRGBA[3] = lightInfo->OriginalParms.diffuse.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_DIFFUSE, colRGBA); - checkGLcall("glLightfv"); - - /* Specular */ - colRGBA[0] = lightInfo->OriginalParms.specular.r; - colRGBA[1] = lightInfo->OriginalParms.specular.g; - colRGBA[2] = lightInfo->OriginalParms.specular.b; - colRGBA[3] = lightInfo->OriginalParms.specular.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPECULAR, colRGBA); - checkGLcall("glLightfv"); - - /* Ambient */ - colRGBA[0] = lightInfo->OriginalParms.ambient.r; - colRGBA[1] = lightInfo->OriginalParms.ambient.g; - colRGBA[2] = lightInfo->OriginalParms.ambient.b; - colRGBA[3] = lightInfo->OriginalParms.ambient.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_AMBIENT, colRGBA); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_DIFFUSE, &lightInfo->OriginalParms.diffuse.r); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPECULAR, &lightInfo->OriginalParms.specular.r); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_AMBIENT, &lightInfo->OriginalParms.ambient.r); checkGLcall("glLightfv"); if ((lightInfo->OriginalParms.range * lightInfo->OriginalParms.range) >= FLT_MIN) -- 2.11.0

1 0

[PATCH] ddraw: Drop redundant memset() before memcpy()
by Michael Stefaniuc 04 Dec '18

04 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The memcpy(vp, ..., size) is present on the else branch too. The memsets where introduced with: f4865564ec7c ddraw: Do not return unset viewport from GetViewport(). dlls/ddraw/viewport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e6f862156e..78a2fde6f3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -274,7 +274,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE wined3d_mutex_lock(); size = vp->dwSize; - memset(vp, 0, size); if (viewport->version == DDRAW_VIEWPORT_VERSION_1) { memcpy(vp, &viewport->viewports.vp1, size); @@ -927,7 +926,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI wined3d_mutex_lock(); size = vp->dwSize; - memset(vp, 0, size); if (viewport->version == DDRAW_VIEWPORT_VERSION_2) { memcpy(vp, &viewport->viewports.vp2, size); -- 2.14.5

3 2

[PATCH] dxgi: Introduce the IWineDXGISwapChainFactory interface.
by Henri Verbeet 04 Dec '18

04 Dec '18

The basic idea is that a project like vkd3d could provide its own implementation of the IWineDXGISwapChainFactory interface, and so wouldn't need specific handling in dxgi_factory_CreateSwapChainForHwnd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/device.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 3 +- dlls/dxgi/factory.c | 9 ++-- dlls/dxgi/swapchain.c | 63 ------------------------- include/wine/winedxgi.idl | 17 +++++++ 5 files changed, 141 insertions(+), 69 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index c7481c6b6ef..c7d663f953b 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -49,6 +49,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa return S_OK; } + if (IsEqualGUID(riid, &IID_IWineDXGISwapChainFactory)) + { + IUnknown_AddRef(iface); + *object = &device->IWineDXGISwapChainFactory_iface; + return S_OK; + } + if (device->child_layer) { TRACE("Forwarding to child layer %p.\n", device->child_layer); @@ -403,6 +410,116 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_create_swapchain, }; +static inline struct dxgi_device *impl_from_IWineDXGISwapChainFactory(IWineDXGISwapChainFactory *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_device, IWineDXGISwapChainFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_QueryInterface(IWineDXGISwapChainFactory *iface, + REFIID iid, void **out) +{ + struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return dxgi_device_QueryInterface(&device->IWineDXGIDevice_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE dxgi_swapchain_factory_AddRef(IWineDXGISwapChainFactory *iface) +{ + struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); + + TRACE("iface %p.\n", iface); + + return dxgi_device_AddRef(&device->IWineDXGIDevice_iface); +} + +static ULONG STDMETHODCALLTYPE dxgi_swapchain_factory_Release(IWineDXGISwapChainFactory *iface) +{ + struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); + + TRACE("iface %p.\n", iface); + + return dxgi_device_Release(&device->IWineDXGIDevice_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDXGISwapChainFactory *iface, + IDXGIFactory *factory, HWND window, const DXGI_SWAP_CHAIN_DESC1 *desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) +{ + struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); + struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_desc wined3d_desc; + HRESULT hr; + + TRACE("iface %p, factory %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", + iface, factory, window, desc, fullscreen_desc, output, swapchain); + + if (desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", desc->Scaling); + if (desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); + + switch (desc->SwapEffect) + { + case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; + break; + case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + break; + default: + WARN("Invalid swap effect %#x.\n", desc->SwapEffect); + return DXGI_ERROR_INVALID_CALL; + } + + wined3d_desc.backbuffer_width = desc->Width; + wined3d_desc.backbuffer_height = desc->Height; + wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(desc->Format); + wined3d_desc.backbuffer_count = desc->BufferCount; + wined3d_desc.backbuffer_bind_flags = wined3d_bind_flags_from_dxgi_usage(desc->BufferUsage); + wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, + &wined3d_desc.multisample_quality, &desc->SampleDesc); + wined3d_desc.device_window = window; + wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; + wined3d_desc.enable_auto_depth_stencil = FALSE; + wined3d_desc.auto_depth_stencil_format = 0; + wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(desc->Flags); + wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; + wined3d_desc.auto_restore_display_mode = TRUE; + + if (FAILED(hr = dxgi_device_create_swapchain(&device->IWineDXGIDevice_iface, + &wined3d_desc, FALSE, &wined3d_swapchain))) + { + WARN("Failed to create swapchain, hr %#x.\n", hr); + return hr; + } + + wined3d_mutex_lock(); + *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + wined3d_mutex_unlock(); + + return S_OK; +} + +static const struct IWineDXGISwapChainFactoryVtbl dxgi_swapchain_factory_vtbl = +{ + dxgi_swapchain_factory_QueryInterface, + dxgi_swapchain_factory_AddRef, + dxgi_swapchain_factory_Release, + dxgi_swapchain_factory_create_swapchain, +}; + HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, IDXGIFactory *factory, IDXGIAdapter *adapter, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) @@ -428,6 +545,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l } device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; + device->IWineDXGISwapChainFactory_iface.lpVtbl = &dxgi_swapchain_factory_vtbl; device->refcount = 1; wined3d_mutex_lock(); wined3d_private_store_init(&device->private_store); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 1268a9ca648..320a347dde5 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -122,6 +122,7 @@ struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) DECLSPEC struct dxgi_device { IWineDXGIDevice IWineDXGIDevice_iface; + IWineDXGISwapChainFactory IWineDXGISwapChainFactory_iface; IUnknown *child_layer; LONG refcount; struct wined3d_private_store private_store; @@ -172,8 +173,6 @@ struct d3d11_swapchain IDXGIOutput *target; }; -HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a4577ae278f..52c145bc6a8 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -250,8 +250,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) { + IWineDXGISwapChainFactory *swapchain_factory; ID3D12CommandQueue *command_queue; - IWineDXGIDevice *dxgi_device; HRESULT hr; TRACE("iface %p, device %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", @@ -275,10 +275,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa if (output) FIXME("Ignoring output %p.\n", output); - if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) + if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGISwapChainFactory, (void **)&swapchain_factory))) { - hr = d3d11_swapchain_create(dxgi_device, window, desc, fullscreen_desc, swapchain); - IWineDXGIDevice_Release(dxgi_device); + hr = IWineDXGISwapChainFactory_create_swapchain(swapchain_factory, + (IDXGIFactory *)iface, window, desc, fullscreen_desc, output, swapchain); + IWineDXGISwapChainFactory_Release(swapchain_factory); return hr; } diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5aa2525c06e..07438f3e037 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -803,69 +803,6 @@ cleanup: return hr; } -HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) -{ - struct wined3d_swapchain *wined3d_swapchain; - struct wined3d_swapchain_desc wined3d_desc; - HRESULT hr; - - if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) - FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) - FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) - FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); - if (fullscreen_desc && fullscreen_desc->Scaling) - FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); - - switch (swapchain_desc->SwapEffect) - { - case DXGI_SWAP_EFFECT_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - break; - case DXGI_SWAP_EFFECT_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; - break; - case DXGI_SWAP_EFFECT_FLIP_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; - break; - case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; - break; - default: - WARN("Invalid swap effect %#x.\n", swapchain_desc->SwapEffect); - return DXGI_ERROR_INVALID_CALL; - } - - wined3d_desc.backbuffer_width = swapchain_desc->Width; - wined3d_desc.backbuffer_height = swapchain_desc->Height; - wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); - wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; - wined3d_desc.backbuffer_bind_flags = wined3d_bind_flags_from_dxgi_usage(swapchain_desc->BufferUsage); - wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, - &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.device_window = window; - wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; - wined3d_desc.enable_auto_depth_stencil = FALSE; - wined3d_desc.auto_depth_stencil_format = 0; - wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); - wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; - wined3d_desc.auto_restore_display_mode = TRUE; - - if (FAILED(hr = IWineDXGIDevice_create_swapchain(device, &wined3d_desc, FALSE, &wined3d_swapchain))) - { - WARN("Failed to create swapchain, hr %#x.\n", hr); - return hr; - } - - wined3d_mutex_lock(); - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - wined3d_mutex_unlock(); - - return S_OK; -} - #ifdef SONAME_LIBVKD3D static PFN_vkd3d_acquire_vk_queue vkd3d_acquire_vk_queue; diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index fccf45d7921..f300eb928b6 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -23,6 +23,23 @@ import "dxgi1_6.idl"; [ object, local, + uuid(53cb4ff0-c25a-4164-a891-0e83db0a7aac) +] +interface IWineDXGISwapChainFactory : IUnknown +{ + HRESULT create_swapchain( + [in] IDXGIFactory *factory, + [in] HWND window, + [in] const DXGI_SWAP_CHAIN_DESC1 *desc, + [in] const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, + [in] IDXGIOutput *output, + [out] IDXGISwapChain1 **swapchain + ); +} + +[ + object, + local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] interface IWineDXGIDevice : IDXGIDevice2 -- 2.11.0

2 1

[PATCH v7 01/10] comctl32/listbox: Check for out of bounds index using an unsigned index
by Gabriel Ivăncescu 04 Dec '18

04 Dec '18

Needed for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..71f1c05 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -489,7 +489,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) * Paint an item. */ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, - INT index, UINT action, BOOL ignoreFocus ) + UINT index, UINT action, BOOL ignoreFocus ) { BOOL selected = FALSE, focused; LB_ITEMDATA *item = NULL; @@ -508,7 +508,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); -- 2.19.1

1 9

[PATCH 7/7] webservices: Maximize the amount of data read with each recv call.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 270aecc220..53448c1926 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -628,7 +628,7 @@ static HRESULT read_more_data( struct reader *reader, ULONG min_size, const WS_A if (reader->input_type != WS_XML_READER_INPUT_TYPE_STREAM) return WS_E_INVALID_FORMAT; if (min_size > reader->input_size) return WS_E_QUOTA_EXCEEDED; - if (min_size > reader->input_size - reader->read_pos) + if (reader->read_pos) { memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); reader->read_size -= reader->read_pos; -- 2.11.0

1 0

[PATCH 6/7] webservices: Implement WsFlushBody.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/msg.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ada549c773..31c424b8f0 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -831,6 +831,33 @@ done: return hr; } +/************************************************************************** + * WsFlushBody [webservices.@] + */ +HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = WsFlushWriter( msg->writer_body, size, ctx, error ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *localname ) { const WS_XML_NODE *node; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index bd152b1ac3..c8db3a0375 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -46,7 +46,7 @@ @ stdcall WsFillBody(ptr long ptr ptr) @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) -@ stub WsFlushBody +@ stdcall WsFlushBody(ptr long ptr ptr) @ stdcall WsFlushWriter(ptr long ptr ptr) @ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr) -- 2.11.0

1 0

[PATCH 5/7] webservices: Allow calling WsAcceptChannel again with the same channel handle.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/listener.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index e06b39447f..de1abb557c 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -644,7 +644,10 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, return E_INVALIDARG; } - if (listener->state != WS_LISTENER_STATE_OPEN || listener->channel) hr = WS_E_INVALID_OPERATION; + if (listener->state != WS_LISTENER_STATE_OPEN || (listener->channel && listener->channel != channel_handle)) + { + hr = WS_E_INVALID_OPERATION; + } else { wait = listener->wait; -- 2.11.0

1 0

[PATCH 4/7] webservices: Use stream I/O for UDP and session-less TCP channel bindings.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 167 ++++++++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 72 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5394aa6c28..139e625a36 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1144,33 +1144,9 @@ done: return hr; } -static void set_blocking( SOCKET socket, BOOL blocking ) -{ - ULONG state = !blocking; - ioctlsocket( socket, FIONBIO, &state ); -} - -static int sock_recv( SOCKET socket, char *buf, int len ) -{ - int count, ret; - - if ((ret = recv( socket, buf, len, 0 )) <= 0) return ret; - len -= ret; - - set_blocking( socket, FALSE ); - for (;;) - { - if ((count = recv( socket, buf + ret, len, 0 )) <= 0) break; - ret += count; - len -= count; - } - set_blocking( socket, TRUE ); - return ret; -} - static HRESULT receive_bytes( struct channel *channel, unsigned char *bytes, int len ) { - int count = sock_recv( channel->u.tcp.socket, (char *)bytes, len ); + int count = recv( channel->u.tcp.socket, (char *)bytes, len, 0 ); if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); if (count != len) return WS_E_INVALID_FORMAT; return S_OK; @@ -1214,8 +1190,6 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) HRESULT hr; channel->msg = msg; - if ((hr = connect_channel( channel )) != S_OK) return hr; - WsGetMessageProperty( channel->msg, WS_MESSAGE_PROPERTY_BODY_WRITER, &writer, sizeof(writer), NULL ); WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &buf, sizeof(buf), NULL ); @@ -1232,7 +1206,7 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) return send_message_http( channel->u.http.request, buf.bytes, buf.length ); case WS_TCP_CHANNEL_BINDING: - if (channel->encoding == WS_ENCODING_XML_BINARY_SESSION_1) + if (channel->type & WS_CHANNEL_TYPE_SESSION) { switch (channel->session_state) { @@ -1249,10 +1223,10 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) return WS_E_OTHER; } } - return send_bytes( channel->u.tcp.socket, buf.bytes, buf.length ); + /* fall through */ case WS_UDP_CHANNEL_BINDING: - return send_bytes( channel->u.udp.socket, buf.bytes, buf.length ); + return WsFlushWriter( writer, 0, NULL, NULL ); default: ERR( "unhandled binding %u\n", channel->binding ); @@ -1273,7 +1247,7 @@ HRESULT channel_send_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) return E_INVALIDARG; } - hr = send_message( channel, msg ); + if ((hr = connect_channel( channel )) == S_OK) hr = send_message( channel, msg ); LeaveCriticalSection( &channel->cs ); return hr; @@ -1305,11 +1279,25 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo return hr; } +static CALLBACK HRESULT write_callback( void *state, const WS_BYTES *buf, ULONG count, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + SOCKET socket = *(SOCKET *)state; + if (send( socket, (const char *)buf->bytes, buf->length, 0 ) < 0) + { + TRACE( "send failed %u\n", WSAGetLastError() ); + } + return S_OK; +} + static HRESULT init_writer( struct channel *channel ) { WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; + WS_XML_WRITER_STREAM_OUTPUT stream = {{WS_XML_WRITER_OUTPUT_TYPE_STREAM}}; WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; + const WS_XML_WRITER_ENCODING *encoding; + const WS_XML_WRITER_OUTPUT *output; WS_XML_WRITER_PROPERTY prop; ULONG max_size = (1 << 17); HRESULT hr; @@ -1322,19 +1310,33 @@ static HRESULT init_writer( struct channel *channel ) switch (channel->encoding) { case WS_ENCODING_XML_UTF8: - return WsSetOutput( channel->writer, &text.encoding, &buf.output, NULL, 0, NULL ); + encoding = &text.encoding; + if (channel->binding == WS_UDP_CHANNEL_BINDING || + (channel->binding == WS_TCP_CHANNEL_BINDING && !(channel->type & WS_CHANNEL_TYPE_SESSION))) + { + stream.writeCallback = write_callback; + stream.writeCallbackState = (channel->binding == WS_UDP_CHANNEL_BINDING) ? + &channel->u.udp.socket : &channel->u.tcp.socket; + output = &stream.output; + } + else output = &buf.output; + break; case WS_ENCODING_XML_BINARY_SESSION_1: bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; /* fall through */ case WS_ENCODING_XML_BINARY_1: - return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + encoding = &bin.encoding; + output = &buf.output; + break; default: FIXME( "unhandled encoding %u\n", channel->encoding ); return WS_E_NOT_SUPPORTED; } + + return WsSetOutput( channel->writer, encoding, output, NULL, 0, NULL ); } static HRESULT write_message( struct channel *channel, WS_MESSAGE *msg, const WS_ELEMENT_DESCRIPTION *desc, @@ -1378,6 +1380,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; if ((hr = message_set_action( msg, desc->action )) != S_OK) goto done; + if ((hr = connect_channel( channel )) != S_OK) goto done; if ((hr = init_writer( channel )) != S_OK) goto done; if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; hr = send_message( channel, msg ); @@ -1419,6 +1422,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS if ((hr = message_get_id( request, &req_id )) != S_OK) goto done; if ((hr = message_set_request_id( msg, &req_id )) != S_OK) goto done; + if ((hr = connect_channel( channel )) != S_OK) goto done; if ((hr = init_writer( channel )) != S_OK) goto done; if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; hr = send_message( channel, msg ); @@ -1448,12 +1452,29 @@ static HRESULT resize_read_buffer( struct channel *channel, ULONG size ) return S_OK; } +static CALLBACK HRESULT read_callback( void *state, void *buf, ULONG buflen, ULONG *retlen, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + SOCKET socket = *(SOCKET *)state; + int ret; + + if ((ret = recv( socket, buf, buflen, 0 )) >= 0) *retlen = ret; + else + { + TRACE( "recv failed %u\n", WSAGetLastError() ); + *retlen = 0; + } + return S_OK; +} + static HRESULT init_reader( struct channel *channel ) { WS_XML_READER_BUFFER_INPUT buf = {{WS_XML_READER_INPUT_TYPE_BUFFER}}; + WS_XML_READER_STREAM_INPUT stream = {{WS_XML_READER_INPUT_TYPE_STREAM}}; WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}}; WS_XML_READER_BINARY_ENCODING bin = {{WS_XML_READER_ENCODING_TYPE_BINARY}}; - WS_XML_READER_ENCODING *encoding; + const WS_XML_READER_ENCODING *encoding; + const WS_XML_READER_INPUT *input; HRESULT hr; if (!channel->reader && (hr = WsCreateReader( NULL, 0, &channel->reader, NULL )) != S_OK) return hr; @@ -1463,6 +1484,21 @@ static HRESULT init_reader( struct channel *channel ) case WS_ENCODING_XML_UTF8: text.charSet = WS_CHARSET_UTF8; encoding = &text.encoding; + + if (channel->binding == WS_UDP_CHANNEL_BINDING || + (channel->binding == WS_TCP_CHANNEL_BINDING && !(channel->type & WS_CHANNEL_TYPE_SESSION))) + { + stream.readCallback = read_callback; + stream.readCallbackState = (channel->binding == WS_UDP_CHANNEL_BINDING) ? + &channel->u.udp.socket : &channel->u.tcp.socket; + input = &stream.input; + } + else + { + buf.encodedData = channel->read_buf; + buf.encodedDataSize = channel->read_size; + input = &buf.input; + } break; case WS_ENCODING_XML_BINARY_SESSION_1: @@ -1472,6 +1508,10 @@ static HRESULT init_reader( struct channel *channel ) case WS_ENCODING_XML_BINARY_1: encoding = &bin.encoding; + + buf.encodedData = channel->read_buf; + buf.encodedDataSize = channel->read_size; + input = &buf.input; break; default: @@ -1479,9 +1519,7 @@ static HRESULT init_reader( struct channel *channel ) return WS_E_NOT_SUPPORTED; } - buf.encodedData = channel->read_buf; - buf.encodedDataSize = channel->read_size; - return WsSetInput( channel->reader, encoding, &buf.input, NULL, 0, NULL ); + return WsSetInput( channel->reader, encoding, input, NULL, 0, NULL ); } #define INITIAL_READ_BUFFER_SIZE 4096 @@ -1515,26 +1553,6 @@ static HRESULT receive_message_http( struct channel *channel ) offset += bytes_read; } - return init_reader( channel ); -} - -static HRESULT receive_message_unsized( struct channel *channel, SOCKET socket ) -{ - int bytes_read; - ULONG max_len; - HRESULT hr; - - prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, - &max_len, sizeof(max_len) ); - - if ((hr = resize_read_buffer( channel, max_len )) != S_OK) return hr; - - channel->read_size = 0; - if ((bytes_read = sock_recv( socket, channel->read_buf, max_len )) < 0) - { - return HRESULT_FROM_WIN32( WSAGetLastError() ); - } - channel->read_size = bytes_read; return S_OK; } @@ -1549,7 +1567,7 @@ static HRESULT receive_message_sized( struct channel *channel, unsigned int size channel->read_size = 0; while (channel->read_size < size) { - if ((bytes_read = sock_recv( channel->u.tcp.socket, channel->read_buf + offset, to_read )) < 0) + if ((bytes_read = recv( channel->u.tcp.socket, channel->read_buf + offset, to_read, 0 )) < 0) { return HRESULT_FROM_WIN32( WSAGetLastError() ); } @@ -1798,14 +1816,7 @@ static HRESULT receive_message_session( struct channel *channel ) memmove( channel->read_buf, channel->read_buf + size, channel->read_size ); } - return init_reader( channel ); -} - -static HRESULT receive_message_sock( struct channel *channel, SOCKET socket ) -{ - HRESULT hr; - if ((hr = receive_message_unsized( channel, socket )) != S_OK) return hr; - return init_reader( channel ); + return S_OK; } static HRESULT receive_message_bytes( struct channel *channel ) @@ -1819,7 +1830,7 @@ static HRESULT receive_message_bytes( struct channel *channel ) return receive_message_http( channel ); case WS_TCP_CHANNEL_BINDING: - if (channel->encoding == WS_ENCODING_XML_BINARY_SESSION_1) + if (channel->type & WS_CHANNEL_TYPE_SESSION) { switch (channel->session_state) { @@ -1836,10 +1847,10 @@ static HRESULT receive_message_bytes( struct channel *channel ) return WS_E_OTHER; } } - return receive_message_sock( channel, channel->u.tcp.socket ); + return S_OK; /* nothing to do, data is read through stream callback */ case WS_UDP_CHANNEL_BINDING: - return receive_message_sock( channel, channel->u.udp.socket ); + return S_OK; default: ERR( "unhandled binding %u\n", channel->binding ); @@ -1860,7 +1871,7 @@ HRESULT channel_receive_message( WS_CHANNEL *handle ) return E_INVALIDARG; } - hr = receive_message_bytes( channel ); + if ((hr = receive_message_bytes( channel )) == S_OK) hr = init_reader( channel ); LeaveCriticalSection( &channel->cs ); return hr; @@ -1901,6 +1912,8 @@ static HRESULT receive_message( struct channel *channel, WS_MESSAGE *msg, const ULONG i; if ((hr = receive_message_bytes( channel )) != S_OK) return hr; + if ((hr = init_reader( channel )) != S_OK) return hr; + for (i = 0; i < count; i++) { const WS_ELEMENT_DESCRIPTION *body = desc[i]->bodyElementDescription; @@ -2012,6 +2025,7 @@ static HRESULT request_reply( struct channel *channel, WS_MESSAGE *request, if ((hr = WsAddressMessage( request, &channel->addr, NULL )) != S_OK) return hr; if ((hr = message_set_action( request, request_desc->action )) != S_OK) return hr; + if ((hr = connect_channel( channel )) != S_OK) return hr; if ((hr = init_writer( channel )) != S_OK) return hr; if ((hr = write_message( channel, request, request_desc->bodyElementDescription, write_option, request_body, request_size )) != S_OK) return hr; @@ -2141,7 +2155,8 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS if ((hr = receive_message_bytes( channel )) == S_OK) { - hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); + if ((hr = init_reader( channel )) == S_OK) + hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); } LeaveCriticalSection( &channel->cs ); @@ -2202,6 +2217,7 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W return E_INVALIDARG; } + if ((hr = connect_channel( channel )) != S_OK) goto done; if ((hr = init_writer( channel )) != S_OK) goto done; if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; hr = WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL ); @@ -2235,13 +2251,20 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ return E_INVALIDARG; } - if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message( channel, msg ); + if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK && (hr = connect_channel( channel ) == S_OK)) + hr = send_message( channel, msg ); LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); return hr; } +static void set_blocking( SOCKET socket, BOOL blocking ) +{ + ULONG state = !blocking; + ioctlsocket( socket, FIONBIO, &state ); +} + static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret ) { HANDLE handles[] = { wait, cancel }; -- 2.11.0

1 0

[PATCH 3/7] webservices: Add support for stream output.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 1 - dlls/webservices/tests/writer.c | 71 ++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 + dlls/webservices/writer.c | 98 ++++++++++++++++++++++++++++++---- include/webservices.h | 14 +++-- 6 files changed, 172 insertions(+), 16 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9a9d491730..270aecc220 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6921,7 +6921,6 @@ static void set_input_buffer( struct reader *reader, const unsigned char *data, reader->text_conv_offset = 0; } -#define STREAM_BUFSIZE 4096 static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, void *state ) { reader->input_type = WS_XML_READER_INPUT_TYPE_STREAM; diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index a55da605e8..8d189fd9e4 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -4685,6 +4685,76 @@ static void test_repeating_element_choice(void) WsFreeWriter( writer ); } +static const struct stream_test +{ + ULONG min_size; + ULONG ret_size; +} +stream_tests[] = +{ + { 0, 4 }, + { 1, 4 }, + { 4, 4 }, + { 5, 4 }, +}; + +static CALLBACK HRESULT write_callback( void *state, const WS_BYTES *buf, ULONG count, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + ULONG i = *(ULONG *)state; + ok( buf->length == stream_tests[i].ret_size, "%u: got %u\n", i, buf->length ); + ok( !memcmp( buf->bytes, "<t/>", stream_tests[i].ret_size ), "%u: wrong data\n", i ); + ok( count == 1, "%u: got %u\n", i, count ); + return S_OK; +} + +static void test_stream_output(void) +{ + static WS_XML_STRING str_ns = {0, NULL}, str_t = {1, (BYTE *)"t"}; + WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; + WS_XML_WRITER_STREAM_OUTPUT stream; + WS_XML_WRITER *writer; + HRESULT hr; + ULONG i = 0; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFlushWriter( writer, 0, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + stream.output.outputType = WS_XML_WRITER_OUTPUT_TYPE_STREAM; + stream.writeCallback = write_callback; + stream.writeCallbackState = &i; + hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsFlushWriter( writer, 0, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (i = 0; i < ARRAY_SIZE(stream_tests); i++) + { + stream.writeCallbackState = &i; + hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + hr = WsFlushWriter( writer, stream_tests[i].min_size, NULL, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + } + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -4728,4 +4798,5 @@ START_TEST(writer) test_union_type(); test_text_types_binary(); test_repeating_element_choice(); + test_stream_output(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index adad68dbdd..bd152b1ac3 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -47,7 +47,7 @@ @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody -@ stub WsFlushWriter +@ stdcall WsFlushWriter(ptr long ptr ptr) @ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr) @ stdcall WsFreeHeap(ptr) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b482b5ba20..6a6f65dbec 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,6 +18,8 @@ #include "winhttp.h" +#define STREAM_BUFSIZE 4096 + struct xmlbuf { WS_HEAP *heap; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0a28d9dc84..4f6cb60195 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -84,9 +84,12 @@ struct writer WS_XML_WRITER_ENCODING_TYPE output_enc; WS_CHARSET output_charset; WS_XML_WRITER_OUTPUT_TYPE output_type; + WS_WRITE_CALLBACK output_cb; + void *output_cb_state; struct xmlbuf *output_buf; BOOL output_buf_user; WS_HEAP *output_heap; + unsigned char *stream_buf; const WS_XML_DICTIONARY *dict; BOOL dict_do_lookup; WS_DYNAMIC_STRING_CALLBACK dict_cb; @@ -121,6 +124,7 @@ static void free_writer( struct writer *writer ) destroy_nodes( writer->root ); free_xml_string( writer->current_ns ); WsFreeHeap( writer->output_heap ); + heap_free( writer->stream_buf ); #ifndef __MINGW32__ writer->cs.DebugInfo->Spare[0] = 0; @@ -294,7 +298,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT return E_INVALIDARG; } - if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + if (writer->output_type != WS_XML_WRITER_OUTPUT_TYPE_BUFFER) hr = WS_E_INVALID_OPERATION; else { switch (id) @@ -346,6 +350,15 @@ static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf ) writer->write_pos = 0; } +static void set_output_stream( struct writer *writer, WS_WRITE_CALLBACK callback, void *state ) +{ + writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_STREAM; + writer->output_cb = callback; + writer->output_cb_state = state; + writer->write_bufptr = writer->stream_buf; + writer->write_pos = 0; +} + /************************************************************************** * WsSetOutput [webservices.@] */ @@ -384,7 +397,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING { case WS_XML_WRITER_ENCODING_TYPE_TEXT: { - WS_XML_WRITER_TEXT_ENCODING *text = (WS_XML_WRITER_TEXT_ENCODING *)encoding; + const WS_XML_WRITER_TEXT_ENCODING *text = (const WS_XML_WRITER_TEXT_ENCODING *)encoding; if (text->charSet != WS_CHARSET_UTF8) { FIXME( "charset %u not supported\n", text->charSet ); @@ -397,7 +410,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING } case WS_XML_WRITER_ENCODING_TYPE_BINARY: { - WS_XML_WRITER_BINARY_ENCODING *bin = (WS_XML_WRITER_BINARY_ENCODING *)encoding; + const WS_XML_WRITER_BINARY_ENCODING *bin = (const WS_XML_WRITER_BINARY_ENCODING *)encoding; writer->output_enc = WS_XML_WRITER_ENCODING_TYPE_BINARY; writer->output_charset = 0; writer->dict = bin->staticDictionary; @@ -426,6 +439,18 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING writer->output_buf_user = FALSE; break; } + case WS_XML_WRITER_OUTPUT_TYPE_STREAM: + { + const WS_XML_WRITER_STREAM_OUTPUT *stream = (const WS_XML_WRITER_STREAM_OUTPUT *)output; + if (!writer->stream_buf && !(writer->stream_buf = heap_alloc( STREAM_BUFSIZE ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + set_output_stream( writer, stream->writeCallback, stream->writeCallbackState ); + break; + + } default: FIXME( "output type %u not supported\n", output->outputType ); hr = E_NOTIMPL; @@ -489,12 +514,63 @@ done: return hr; } +static HRESULT flush_writer( struct writer *writer, ULONG min_size, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + WS_BYTES buf; + + if (writer->write_pos < min_size) return S_OK; + + buf.bytes = writer->write_bufptr; + buf.length = writer->write_pos; + writer->output_cb( writer->output_cb_state, &buf, 1, ctx, error ); + writer->write_pos = 0; + return S_OK; +} + +/************************************************************************** + * WsFlushWriter [webservices.@] + */ +HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (writer->output_type != WS_XML_WRITER_OUTPUT_TYPE_STREAM) hr = WS_E_INVALID_OPERATION; + else hr = flush_writer( writer, min_size, ctx, error ); + + LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + static HRESULT write_grow_buffer( struct writer *writer, ULONG size ) { struct xmlbuf *buf = writer->output_buf; SIZE_T new_size; void *tmp; + if (writer->output_type == WS_XML_WRITER_OUTPUT_TYPE_STREAM) + { + if (size > STREAM_BUFSIZE) return WS_E_QUOTA_EXCEEDED; + return flush_writer( writer, STREAM_BUFSIZE - size, NULL, NULL ); + } + if (buf->size >= writer->write_pos + size) { buf->bytes.length = writer->write_pos + size; @@ -2047,7 +2123,7 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING } /* flush current start element if necessary */ -static HRESULT write_flush( struct writer *writer ) +static HRESULT write_commit( struct writer *writer ) { if (writer->state == WRITER_STATE_STARTELEMENT) { @@ -2089,7 +2165,7 @@ static HRESULT write_cdata( struct writer *writer ) static HRESULT write_cdata_node( struct writer *writer ) { HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if ((hr = write_add_cdata_node( writer )) != S_OK) return hr; if ((hr = write_add_endcdata_node( writer )) != S_OK) return hr; if ((hr = write_cdata( writer )) != S_OK) return hr; @@ -2220,7 +2296,7 @@ static HRESULT write_element_node( struct writer *writer, const WS_XML_STRING *p const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if ((hr = write_add_element_node( writer, prefix, localname, ns )) != S_OK) return hr; if ((hr = write_add_endelement_node( writer, writer->current )) != S_OK) return hr; writer->state = WRITER_STATE_STARTELEMENT; @@ -2826,7 +2902,7 @@ static HRESULT write_text_node( struct writer *writer, const WS_XML_TEXT *text ) ULONG offset = 0; HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if (node_type( writer->current ) != WS_XML_NODE_TYPE_TEXT) { if ((hr = write_add_text_node( writer, text )) != S_OK) return hr; @@ -4158,7 +4234,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W goto done; } - if ((hr = write_flush( writer )) != S_OK) goto done; + if ((hr = write_commit( writer )) != S_OK) goto done; if ((hr = write_grow_buffer( writer, xmlbuf->bytes.length )) != S_OK) goto done; write_bytes( writer, xmlbuf->bytes.bytes, xmlbuf->bytes.length ); @@ -4261,7 +4337,7 @@ static HRESULT write_qualified_name( struct writer *writer, const WS_XML_STRING WS_XML_QNAME_TEXT qname = {{WS_XML_TEXT_TYPE_QNAME}}; HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if (!prefix && ((hr = find_prefix( writer, ns, &prefix )) != S_OK)) return hr; qname.prefix = (WS_XML_STRING *)prefix; @@ -4398,7 +4474,7 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found return E_INVALIDARG; } - if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + if (writer->output_type != WS_XML_WRITER_OUTPUT_TYPE_BUFFER) hr = WS_E_INVALID_OPERATION; else hr = write_move_to( writer, move, found ); LeaveCriticalSection( &writer->cs ); @@ -4526,7 +4602,7 @@ static HRESULT write_comment( struct writer *writer ) static HRESULT write_comment_node( struct writer *writer, const WS_XML_STRING *value ) { HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_commit( writer )) != S_OK) return hr; if ((hr = write_add_comment_node( writer, value )) != S_OK) return hr; if ((hr = write_comment( writer )) != S_OK) return hr; writer->state = WRITER_STATE_COMMENT; diff --git a/include/webservices.h b/include/webservices.h index 69e3c8a276..a6018d5d25 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -296,15 +296,21 @@ typedef struct _WS_ASYNC_CONTEXT { typedef HRESULT (CALLBACK *WS_READ_CALLBACK) (void*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); -typedef HRESULT (CALLBACK *WS_WRITE_CALLBACK) - (void*, const WS_BYTES*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); - typedef struct _WS_XML_READER_STREAM_INPUT { WS_XML_READER_INPUT input; WS_READ_CALLBACK readCallback; void *readCallbackState; } WS_XML_READER_STREAM_INPUT; +typedef HRESULT (CALLBACK *WS_WRITE_CALLBACK) + (void*, const WS_BYTES*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef struct _WS_XML_WRITER_STREAM_OUTPUT { + WS_XML_WRITER_OUTPUT output; + WS_WRITE_CALLBACK writeCallback; + void *writeCallbackState; +} WS_XML_WRITER_STREAM_OUTPUT; + typedef enum { WS_ELEMENT_TYPE_MAPPING = 1, WS_ATTRIBUTE_TYPE_MAPPING = 2, @@ -1626,6 +1632,8 @@ HRESULT WINAPI WsFillBody(WS_MESSAGE*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR* HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*); +HRESULT WINAPI WsFlushBody(WS_MESSAGE*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsFlushWriter(WS_XML_WRITER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); void WINAPI WsFreeChannel(WS_CHANNEL*); void WINAPI WsFreeError(WS_ERROR*); void WINAPI WsFreeHeap(WS_HEAP*); -- 2.11.0

1 0

[PATCH 2/7] webservices: Properly check the input buffer type in WsMoveReader.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ba6a951e9c..9a9d491730 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -653,6 +653,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!reader) return E_INVALIDARG; @@ -3582,7 +3583,7 @@ HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found return E_INVALIDARG; } - if (!reader->input_type) hr = WS_E_INVALID_OPERATION; + if (reader->input_type != WS_XML_READER_INPUT_TYPE_BUFFER) hr = WS_E_INVALID_OPERATION; else hr = read_move_to( reader, move, found ); LeaveCriticalSection( &reader->cs ); @@ -6982,8 +6983,8 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { if (input->inputType == WS_XML_READER_INPUT_TYPE_BUFFER) { - WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + const WS_XML_READER_TEXT_ENCODING *text = (const WS_XML_READER_TEXT_ENCODING *)encoding; + const WS_XML_READER_BUFFER_INPUT *buf = (const WS_XML_READER_BUFFER_INPUT *)input; if (text->charSet != WS_CHARSET_AUTO) reader->input_charset = text->charSet; else reader->input_charset = detect_charset( buf->encodedData, buf->encodedDataSize, &offset ); } @@ -6993,7 +6994,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * } case WS_XML_READER_ENCODING_TYPE_BINARY: { - WS_XML_READER_BINARY_ENCODING *bin = (WS_XML_READER_BINARY_ENCODING *)encoding; + const WS_XML_READER_BINARY_ENCODING *bin = (const WS_XML_READER_BINARY_ENCODING *)encoding; reader->input_enc = WS_XML_READER_ENCODING_TYPE_BINARY; reader->input_charset = 0; reader->dict_static = bin->staticDictionary ? bin->staticDictionary : &dict_builtin_static.dict; @@ -7010,13 +7011,13 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { case WS_XML_READER_INPUT_TYPE_BUFFER: { - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + const WS_XML_READER_BUFFER_INPUT *buf = (const WS_XML_READER_BUFFER_INPUT *)input; set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); break; } case WS_XML_READER_INPUT_TYPE_STREAM: { - WS_XML_READER_STREAM_INPUT *stream = (WS_XML_READER_STREAM_INPUT *)input; + const WS_XML_READER_STREAM_INPUT *stream = (const WS_XML_READER_STREAM_INPUT *)input; if (!reader->stream_buf && !(reader->stream_buf = heap_alloc( STREAM_BUFSIZE ))) { hr = E_OUTOFMEMORY; -- 2.11.0

1 0

[PATCH 1/7] webservices: Implement WsFillBody.
by Hans Leidekker 04 Dec '18

04 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/msg.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e28baa2693..ada549c773 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -999,6 +999,33 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des } /************************************************************************** + * WsFillBody [webservices.@] + */ +HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = WsFillReader( msg->reader_body, size, ctx, error ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + +/************************************************************************** * WsInitializeMessage [webservices.@] */ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 30c97e3473..adad68dbdd 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -43,7 +43,7 @@ @ stub WsEndReaderCanonicalization @ stub WsEndWriterCanonicalization @ stdcall WsFileTimeToDateTime(ptr ptr ptr) -@ stub WsFillBody +@ stdcall WsFillBody(ptr long ptr ptr) @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody diff --git a/include/webservices.h b/include/webservices.h index 6cafcc63d6..69e3c8a276 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1622,6 +1622,7 @@ HRESULT WINAPI WsDateTimeToFileTime(const WS_DATETIME*, FILETIME*, WS_ERROR*); HRESULT WINAPI WsDecodeUrl(const WS_STRING*, ULONG, WS_HEAP*, WS_URL**, WS_ERROR*); HRESULT WINAPI WsEncodeUrl(const WS_URL*, ULONG, WS_HEAP*, WS_STRING*, WS_ERROR*); HRESULT WINAPI WsFileTimeToDateTime(const FILETIME*, WS_DATETIME*, WS_ERROR*); +HRESULT WINAPI WsFillBody(WS_MESSAGE*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*); -- 2.11.0

1 0

[PATCH] wineserver: fix debug registers on NetBSD
by Frédéric Fauberteau 04 Dec '18

04 Dec '18

Add a #ifdef to deal with NetBSD specific debug register structure. Debug register structure on NetBSD for x86 (/usr/include/<arch>/reg.h) is: struct dbreg { int dr[<nb>]; } with nb=8 on i386 and nb=16 on amd64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46229 Signed-off-by: Frédéric Fauberteau <triaxx(a)NetBSD.org> --- server/ptrace.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/ptrace.c b/server/ptrace.c index 4eda8ebec3..808328ecbc 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -720,6 +720,13 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int context->debug.i386_regs.dr3 = DBREG_DRX((&dbregs), 3); context->debug.i386_regs.dr6 = DBREG_DRX((&dbregs), 6); context->debug.i386_regs.dr7 = DBREG_DRX((&dbregs), 7); +#elif defined(__NetBSD__) + context->debug.i386_regs.dr0 = dbregs.dr[0]; + context->debug.i386_regs.dr1 = dbregs.dr[1]; + context->debug.i386_regs.dr2 = dbregs.dr[2]; + context->debug.i386_regs.dr3 = dbregs.dr[3]; + context->debug.i386_regs.dr6 = dbregs.dr[6]; + context->debug.i386_regs.dr7 = dbregs.dr[7]; #else context->debug.i386_regs.dr0 = dbregs.dr0; context->debug.i386_regs.dr1 = dbregs.dr1; @@ -754,6 +761,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign DBREG_DRX((&dbregs), 5) = 0; DBREG_DRX((&dbregs), 6) = context->debug.i386_regs.dr6; DBREG_DRX((&dbregs), 7) = context->debug.i386_regs.dr7; +#elif defined(__NetBSD__) + dbregs.dr[0] = context->debug.i386_regs.dr0; + dbregs.dr[1] = context->debug.i386_regs.dr1; + dbregs.dr[2] = context->debug.i386_regs.dr2; + dbregs.dr[3] = context->debug.i386_regs.dr3; + dbregs.dr[4] = 0; + dbregs.dr[5] = 0; + dbregs.dr[6] = context->debug.i386_regs.dr6; + dbregs.dr[7] = context->debug.i386_regs.dr7; #else dbregs.dr0 = context->debug.i386_regs.dr0; dbregs.dr1 = context->debug.i386_regs.dr1; -- 2.19.2

1 0

[PATCH v6 1/7] comctl32/listbox: Check for out of bounds index using an unsigned index
by Gabriel Ivăncescu 04 Dec '18

04 Dec '18

Needed for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..71f1c05 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -489,7 +489,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) * Paint an item. */ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, - INT index, UINT action, BOOL ignoreFocus ) + UINT index, UINT action, BOOL ignoreFocus ) { BOOL selected = FALSE, focused; LB_ITEMDATA *item = NULL; @@ -508,7 +508,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); -- 2.19.1

2 8

[PATCH] ntdll: Add stub for RtlGetUnloadEventTraceEx.
by Alex Henrie 04 Dec '18

04 Dec '18

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44897 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Patch from Wine Staging with minor changes. https://raw.githubusercontent.com/wine-staging/wine-staging/master/patches/… --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3741eb9397..c2e2fb1c66 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -681,6 +681,7 @@ # @ stub RtlGetSetBootStatusData @ stdcall RtlGetThreadErrorMode() @ stdcall RtlGetUnloadEventTrace() +@ stdcall RtlGetUnloadEventTraceEx(ptr ptr ptr) @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index e80aa5e324..393bd27b1a 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1679,6 +1679,20 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) return NULL; } +/********************************************************************* + * RtlGetUnloadEventTraceEx [NTDLL.@] + */ +void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) +{ + static ULONG dummy_size, dummy_count; + + FIXME("(%p, %p, %p): stub!\n", size, count, trace); + + if (size) *size = &dummy_size; + if (count) *count = &dummy_count; + if (trace) *trace = NULL; +} + /********************************************************************* * RtlQueryPackageIdentity [NTDLL.@] */ -- 2.19.2

1 0

[PATCH v2] ieframe: Turn several variables into static constants
by Alex Henrie 04 Dec '18

04 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Keep using lstrlenW for the URL itself --- dlls/ieframe/intshcut.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 4331bb9b0a..8bf8ae8702 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -456,11 +456,11 @@ static HRESULT get_profile_string(LPCWSTR lpAppName, LPCWSTR lpKeyName, static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileName, DWORD dwMode) { + static const WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; + static const WCHAR str_URL[] = {'U','R','L',0}; + static const WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; + static const WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; InternetShortcut *This = impl_from_IPersistFile(pFile); - static WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; - static WCHAR str_URL[] = {'U','R','L',0}; - static WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; - static WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; WCHAR *filename = NULL; WCHAR *url; HRESULT hr; @@ -573,12 +573,12 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam file = CreateFileW(pszFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { + static const char str_header[] = "[InternetShortcut]"; + static const char str_URL[] = "URL="; + static const char str_ICONFILE[] = "ICONFILE="; + static const char str_eol[] = "\r\n"; DWORD bytesWritten; char *iconfile; - char str_header[] = "[InternetShortcut]"; - char str_URL[] = "URL="; - char str_ICONFILE[] = "ICONFILE="; - char str_eol[] = "\r\n"; IPropertyStorage *pPropStgRead; PROPSPEC ps[2]; PROPVARIANT pvread[2]; @@ -587,11 +587,11 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam ps[1].ulKind = PRSPEC_PROPID; ps[1].u.propid = PID_IS_ICONINDEX; - WriteFile(file, str_header, lstrlenA(str_header), &bytesWritten, NULL); - WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); - WriteFile(file, str_URL, lstrlenA(str_URL), &bytesWritten, NULL); + WriteFile(file, str_header, ARRAY_SIZE(str_header) - 1, &bytesWritten, NULL); + WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); + WriteFile(file, str_URL, ARRAY_SIZE(str_URL) - 1, &bytesWritten, NULL); WriteFile(file, url, lstrlenA(url), &bytesWritten, NULL); - WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, STGM_READ|STGM_SHARE_EXCLUSIVE, &pPropStgRead); if (SUCCEEDED(hr)) -- 2.19.2

1 0

[PATCH] wineserver: fix debug registers on NetBSD
by Frédéric Fauberteau 04 Dec '18

04 Dec '18

Add a #ifdef to deal with NetBSD specific debug register structure. Debug register structure on NetBSD for x86 (/usr/include/<arch>/reg.h) is: struct dbreg { int dr[<nb>]; } with nb=8 on i386 and nb=16 on amd64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46229 Signed-off-by: Frédéric Fauberteau <triaxx(a)NetBSD.org> --- server/ptrace.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/ptrace.c b/server/ptrace.c index 4eda8ebec3..808328ecbc 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -720,6 +720,13 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int context->debug.i386_regs.dr3 = DBREG_DRX((&dbregs), 3); context->debug.i386_regs.dr6 = DBREG_DRX((&dbregs), 6); context->debug.i386_regs.dr7 = DBREG_DRX((&dbregs), 7); +#elif defined(__NetBSD__) + context->debug.i386_regs.dr0 = dbregs.dr[0]; + context->debug.i386_regs.dr1 = dbregs.dr[1]; + context->debug.i386_regs.dr2 = dbregs.dr[2]; + context->debug.i386_regs.dr3 = dbregs.dr[3]; + context->debug.i386_regs.dr6 = dbregs.dr[6]; + context->debug.i386_regs.dr7 = dbregs.dr[7]; #else context->debug.i386_regs.dr0 = dbregs.dr0; context->debug.i386_regs.dr1 = dbregs.dr1; @@ -754,6 +761,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign DBREG_DRX((&dbregs), 5) = 0; DBREG_DRX((&dbregs), 6) = context->debug.i386_regs.dr6; DBREG_DRX((&dbregs), 7) = context->debug.i386_regs.dr7; +#elif defined(__NetBSD__) + dbregs.dr[0] = context->debug.i386_regs.dr0; + dbregs.dr[1] = context->debug.i386_regs.dr1; + dbregs.dr[2] = context->debug.i386_regs.dr2; + dbregs.dr[3] = context->debug.i386_regs.dr3; + dbregs.dr[4] = 0; + dbregs.dr[5] = 0; + dbregs.dr[6] = context->debug.i386_regs.dr6; + dbregs.dr[7] = context->debug.i386_regs.dr7; #else dbregs.dr0 = context->debug.i386_regs.dr0; dbregs.dr1 = context->debug.i386_regs.dr1; -- 2.19.2

2 1

[PATCH v2] bcrypt: Support retrieving properties from key handles.
by Hans Leidekker 04 Dec '18

04 Dec '18

v2: Fix the build without GnuTLS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 10 ++++ dlls/bcrypt/bcrypt_main.c | 130 +++++++++++++++++++++++++----------------- dlls/bcrypt/tests/bcrypt.c | 31 +++++++++- 3 files changed, 117 insertions(+), 54 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index a40f9d1a4b..593e78416e 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -198,9 +198,19 @@ struct key } u; }; #else +struct key_symmetric +{ + enum mode_id mode; +}; + struct key { struct object hdr; + enum alg_id alg_id; + union + { + struct key_symmetric s; + } u; }; #endif diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2b9ae0b766..0c68a4f3e6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -413,6 +413,63 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_AES; + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + const WCHAR *str; + switch (mode) + { + case MODE_ID_ECB: str = BCRYPT_CHAIN_MODE_ECB; break; + case MODE_ID_CBC: str = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: str = BCRYPT_CHAIN_MODE_GCM; break; + default: return STATUS_NOT_IMPLEMENTED; + } + + *ret_size = 64; + if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + memcpy( buf, str, (strlenW(str) + 1) * sizeof(WCHAR) ); + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 128; + key_lengths->dwMaxLength = 256; + key_lengths->dwIncrement = 64; + } + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) + { + BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; + if (mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; + *ret_size = sizeof(*tag_length); + if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (tag_length) + { + tag_length->dwMinLength = 12; + tag_length->dwMaxLength = 16; + tag_length->dwIncrement = 1; + } + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -424,59 +481,7 @@ NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR switch (alg->id) { case ALG_ID_AES: - if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) - { - *ret_size = sizeof(ULONG); - if (size < sizeof(ULONG)) - return STATUS_BUFFER_TOO_SMALL; - if (buf) - *(ULONG *)buf = BLOCK_LENGTH_AES; - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { - const WCHAR *mode; - switch (alg->mode) - { - case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; - case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; - default: return STATUS_NOT_IMPLEMENTED; - } - - *ret_size = 64; - if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) ); - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) - { - BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; - *ret_size = sizeof(*key_lengths); - if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (key_lengths) - { - key_lengths->dwMinLength = 128; - key_lengths->dwMaxLength = 256; - key_lengths->dwIncrement = 64; - } - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) - { - BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; - if (alg->mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; - *ret_size = sizeof(*tag_length); - if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (tag_length) - { - tag_length->dwMinLength = 12; - tag_length->dwMaxLength = 16; - tag_length->dwIncrement = 1; - } - return STATUS_SUCCESS; - } - break; + return get_aes_property( alg->mode, prop, buf, size, ret_size ); default: break; @@ -533,6 +538,20 @@ static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, U return status; } +static NTSTATUS get_key_property( const struct key *key, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + switch (key->alg_id) + { + case ALG_ID_AES: + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) return STATUS_NOT_SUPPORTED; + return get_aes_property( key->u.s.mode, prop, buf, size, ret_size ); + + default: + FIXME( "unsupported algorithm %u\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags ) { struct object *object = handle; @@ -549,6 +568,11 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu const struct algorithm *alg = (const struct algorithm *)object; return get_alg_property( alg, prop, buffer, count, res ); } + case MAGIC_KEY: + { + const struct key *key = (const struct key *)object; + return get_key_property( key, prop, buffer, count, res ); + } case MAGIC_HASH: { const struct hash *hash = (const struct hash *)object; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6865e87ca8..c3f8f3d78a 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -507,7 +507,8 @@ static void test_BCryptGenerateSymmetricKey(void) {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key, key2; - UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; + UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16], mode[64]; + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; @@ -608,6 +609,27 @@ static void test_BCryptGenerateSymmetricKey(void) ok(size == 16, "got %u\n", size); ok(!memcmp(plaintext, data, sizeof(data)), "wrong data\n"); + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "wrong mode\n"); + + len = 0; + size = 0; + ret = pBCryptGetProperty(key, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 16, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = pBCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); @@ -855,6 +877,9 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1; @@ -1108,6 +1133,7 @@ static void test_BCryptDecrypt(void) {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; BCRYPT_KEY_LENGTHS_STRUCT key_lengths; + BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_lengths; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; UCHAR *buf, plaintext[48], ivbuf[16]; @@ -1242,6 +1268,9 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_lengths, sizeof(tag_lengths), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1; -- 2.11.0

1 0

[PATCH v2 1/3] setupapi: Implement SetupDiDeleteDeviceInterfaceData().
by Zebediah Figura 04 Dec '18

04 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 34 ++++++++++++++++++++++++++++------ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 25 ++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 82a45b4470..7638a8bd5b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -576,6 +576,16 @@ static void remove_device_iface(struct device_iface *iface) iface->flags |= SPINT_REMOVED; } +static void delete_device_iface(struct device_iface *iface) +{ + list_remove(&iface->entry); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); + heap_free(iface->refstr); + heap_free(iface->symlink); + heap_free(iface); +} + static void remove_device(struct device *device) { WCHAR id[MAX_DEVICE_ID_LEN], *p; @@ -622,12 +632,7 @@ static void delete_device(struct device *device) LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry) { - list_remove(&iface->entry); - RegCloseKey(iface->refstr_key); - RegCloseKey(iface->class_key); - heap_free(iface->refstr); - heap_free(iface->symlink); - heap_free(iface); + delete_device_iface(iface); } free_devnode(device->devnode); list_remove(&device->entry); @@ -1598,6 +1603,23 @@ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_D return TRUE; } +/*********************************************************************** + * SetupDiDeleteDeviceInterfaceData (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) +{ + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + delete_device_iface(iface); + + return TRUE; +} + /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 99509e1bbf..0b44e184fc 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -302,7 +302,7 @@ @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr wstr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(ptr ptr) -@ stub SetupDiDeleteDeviceInterfaceData +@ stdcall SetupDiDeleteDeviceInterfaceData(ptr ptr) @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey @ stdcall SetupDiDestroyClassImageList(ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 29f12c3f53..edb660e106 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -650,6 +650,15 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}"); check_device_iface(set, &device, &guid2, 1, 0, NULL); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 0, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + + check_device_iface(set, &device, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } @@ -862,14 +871,28 @@ static void test_register_device_iface(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "removed", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "deleted", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 1, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 2, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + set2 = SetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); ok(set2 != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_iface(set2, NULL, &guid, 0, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"); - check_device_iface(set2, NULL, &guid, 1, 0, NULL); + check_device_iface(set2, NULL, &guid, 1, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\deleted"); + check_device_iface(set2, NULL, &guid, 2, 0, NULL); ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); -- 2.14.1

1 2

[PATCH 1/5] shlwapi: Forward SHDeleteEmptyKey() to shcore.
by Nikolay Sivov 04 Dec '18

04 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/shcore.spec | 4 +-- dlls/shlwapi/reg.c | 68 --------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +-- 3 files changed, 4 insertions(+), 72 deletions(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6ad1297989..4c2717948d 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -40,8 +40,8 @@ @ stdcall SHCreateThread(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) @ stub SHCreateThreadWithHandle -@ stdcall SHDeleteEmptyKeyA(long ptr) -@ stdcall SHDeleteEmptyKeyW(long ptr) +@ stdcall SHDeleteEmptyKeyA(long str) +@ stdcall SHDeleteEmptyKeyW(long wstr) @ stdcall SHDeleteKeyA(long str) @ stdcall SHDeleteKeyW(long wstr) @ stdcall SHDeleteValueA(long str str) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 163351995c..370161df12 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1590,74 +1590,6 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) return dwRet; } -/************************************************************************* - * SHDeleteEmptyKeyA [SHLWAPI.@] - * - * Delete a registry key with no sub keys. - * - * PARAMS - * hKey [I] Handle to registry key - * lpszSubKey [I] Name of sub key to delete - * - * RETURNS - * Success: ERROR_SUCCESS. The key is deleted. - * Failure: If the key is not empty, returns ERROR_KEY_HAS_CHILDREN. Otherwise - * returns an error code from RegOpenKeyExA(), RegQueryInfoKeyA() or - * RegDeleteKeyA(). - */ -DWORD WINAPI SHDeleteEmptyKeyA(HKEY hKey, LPCSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s)\n", hKey, debugstr_a(lpszSubKey)); - - dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if(!dwRet) - { - dwRet = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, &dwKeyCount, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - RegCloseKey(hSubKey); - if(!dwRet) - { - if (!dwKeyCount) - dwRet = RegDeleteKeyA(hKey, lpszSubKey); - else - dwRet = ERROR_KEY_HAS_CHILDREN; - } - } - return dwRet; -} - -/************************************************************************* - * SHDeleteEmptyKeyW [SHLWAPI.@] - * - * See SHDeleteEmptyKeyA. - */ -DWORD WINAPI SHDeleteEmptyKeyW(HKEY hKey, LPCWSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0; - HKEY hSubKey = 0; - - TRACE("(hkey=%p, %s)\n", hKey, debugstr_w(lpszSubKey)); - - dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if(!dwRet) - { - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - RegCloseKey(hSubKey); - if(!dwRet) - { - if (!dwKeyCount) - dwRet = RegDeleteKeyW(hKey, lpszSubKey); - else - dwRet = ERROR_KEY_HAS_CHILDREN; - } - } - return dwRet; -} - /************************************************************************* * SHDeleteOrphanKeyA [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 30c34cb988..a51088dba8 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -688,8 +688,8 @@ @ stdcall SHCreateStreamOnFileW(wstr long ptr) shcore.SHCreateStreamOnFileW @ stdcall SHCreateStreamWrapper(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef -@ stdcall SHDeleteEmptyKeyA(long ptr) -@ stdcall SHDeleteEmptyKeyW(long ptr) +@ stdcall SHDeleteEmptyKeyA(long str) shcore.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long wstr) shcore.SHDeleteEmptyKeyW @ stdcall SHDeleteKeyA(long str) @ stdcall SHDeleteKeyW(long wstr) @ stdcall SHDeleteOrphanKeyA(long str) -- 2.19.2

1 4

[PATCH 1/3] setupapi: Implement SetupDiDeleteDeviceInterfaceData().
by Zebediah Figura 04 Dec '18

04 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 34 ++++++++++++++++++++++++++++------ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 25 ++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 82a45b4470..7638a8bd5b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -576,6 +576,16 @@ static void remove_device_iface(struct device_iface *iface) iface->flags |= SPINT_REMOVED; } +static void delete_device_iface(struct device_iface *iface) +{ + list_remove(&iface->entry); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); + heap_free(iface->refstr); + heap_free(iface->symlink); + heap_free(iface); +} + static void remove_device(struct device *device) { WCHAR id[MAX_DEVICE_ID_LEN], *p; @@ -622,12 +632,7 @@ static void delete_device(struct device *device) LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry) { - list_remove(&iface->entry); - RegCloseKey(iface->refstr_key); - RegCloseKey(iface->class_key); - heap_free(iface->refstr); - heap_free(iface->symlink); - heap_free(iface); + delete_device_iface(iface); } free_devnode(device->devnode); list_remove(&device->entry); @@ -1598,6 +1603,23 @@ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_D return TRUE; } +/*********************************************************************** + * SetupDiDeleteDeviceInterfaceData (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) +{ + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + delete_device_iface(iface); + + return TRUE; +} + /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 99509e1bbf..0b44e184fc 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -302,7 +302,7 @@ @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr wstr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(ptr ptr) -@ stub SetupDiDeleteDeviceInterfaceData +@ stdcall SetupDiDeleteDeviceInterfaceData(ptr ptr) @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey @ stdcall SetupDiDestroyClassImageList(ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 29f12c3f53..edb660e106 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -650,6 +650,15 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}"); check_device_iface(set, &device, &guid2, 1, 0, NULL); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 0, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + + check_device_iface(set, &device, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } @@ -862,14 +871,28 @@ static void test_register_device_iface(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "removed", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "deleted", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 1, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 2, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + set2 = SetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); ok(set2 != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_iface(set2, NULL, &guid, 0, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"); - check_device_iface(set2, NULL, &guid, 1, 0, NULL); + check_device_iface(set2, NULL, &guid, 1, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\deleted"); + check_device_iface(set2, NULL, &guid, 2, 0, NULL); ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); -- 2.14.1

2 3

[PATCH] avrt: Add AVRT_PRIORITY_VERYLOW to avrt.h
by Kai Krakow 04 Dec '18

04 Dec '18

According to current Windows 10 headers, this priority is supported now. Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- include/avrt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/avrt.h b/include/avrt.h index 2d0ab096bf4..9d12c1b5b1b 100644 --- a/include/avrt.h +++ b/include/avrt.h @@ -28,7 +28,8 @@ extern "C" { typedef enum _AVRT_PRIORITY { - AVRT_PRIORITY_LOW = -1, + AVRT_PRIORITY_VERYLOW = -2, + AVRT_PRIORITY_LOW, AVRT_PRIORITY_NORMAL, AVRT_PRIORITY_HIGH, AVRT_PRIORITY_CRITICAL -- 2.19.2

1 0

[PATCH] shell32/tests: Remove redundant NULL check before CoTaskMemFree()
by Michael Stefaniuc 03 Dec '18

03 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 33a5e6427a..0da164b464 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -490,7 +490,7 @@ static void check_dropdown_(const char *file, UINT line, IAutoCompleteDropDown * else ok_(file, line)(str == NULL, "Expected (null), got %s\n", wine_dbgstr_w(str)); } - if (str) CoTaskMemFree(str); + CoTaskMemFree(str); } } -- 2.14.5

1 0

Re: [PATCH v2] amstream: Simulate IDirectDrawStreamSampleImpl_Update return values.
by symeonidis＠csd.auth.gr 03 Dec '18

03 Dec '18

I've already started working towards a proper implementation of the IDirectDraw* interfaces. However that will probably have to wait until the next release cycle (also my Windows installation is currently broken and I have to fix that first). But before that I have a few questions: 1. Is someone else working on implementing any of these functions? 2. Are there any media test files that I can use for the tests? 3. What is the best way to call a method of an interface from inside a method of an interface?

2 1

[PATCH] testbot: Add support for Locale::Codes.
by Francois Gouget 03 Dec '18

03 Dec '18

Locale::Country and Locale::Language are deprecated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 78 ++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 6783c5177b..e28a34b89c 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,8 +33,6 @@ our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString BuildTag SanitizeTag LocaleName ShQuote ShArgv2Cmd); use Fcntl; -use Locale::Language; -use Locale::Country; use WineTestBot::Config; @@ -106,6 +104,68 @@ sub BuildEMailRecipient($$) return $Recipient; } +my $_LCLang; +my $_LocaleLang; +sub GetLanguageName($) +{ + my ($Code) = @_; + local $@; + + return "Konkani" if ($Code eq "kok"); + + if (!defined $_LCLang) + { + eval + { + require Locale::Codes; + $_LCLang = new Locale::Codes 'language'; + $_LCLang->show_errors(0); + }; + if (!$_LCLang) + { + $_LCLang = 0; + $_LocaleLang = eval { require Locale::Language }; + } + } + my $Name = $_LCLang ? ($_LCLang->code2name($Code) || $Code) : + $_LocaleLang ? eval { Locale::Language::code2language($Code) || $Code } : + $Code; + $Name =~ s/ \(.*$//; + return $Name; +} + +my $_LCCountry; +my $_LocaleCountry; +sub GetCountryName($) +{ + my ($Code) = @_; + local $@; + + return "USA" if ($Code eq "US"); + return "Great Britain" if ($Code eq "GB"); + + if (!defined $_LCCountry) + { + eval + { + require Locale::Codes; + $_LCCountry = new Locale::Codes 'country'; + $_LCCountry->show_errors(0); + }; + if (!$_LCCountry) + { + $_LCCountry = 0; + $_LocaleCountry = eval { require Locale::Country }; + } + } + my $Name = $_LCCountry ? ($_LCCountry->code2name($Code) || $Code) : + $_LocaleCountry ? eval { Locale::Country::code2country($Code) || $Code } : + $Code; + $Name =~ s/(?:, | \().*$//; + return $Name; +} + + sub LocaleName($) { my ($Locale) = @_; @@ -114,18 +174,8 @@ sub LocaleName($) if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.[A-Z0-9-]+)?(?:@([a-z]+))?$/) { my ($Lang, $Country, $Modifier) = ($1, $2, $3); - my $Name = $Lang eq "kok" ? "Konkani" : - (code2language($Lang) || $Lang); - $Name =~ s/ \(.*$//; - - if (uc($Lang) ne $Country) - { - my $CountryName = $Country eq "US" ? "USA" : - $Country eq "GB" ? "Great Britain" : - (code2country($Country) || $Country); - $CountryName =~ s/(?:, | \().*$//; - $Name .= ":$CountryName"; - } + my $Name = GetLanguageName($Lang); + $Name .= ":". GetCountryName($Country) if (uc($Lang) ne $Country); $Name .= " ($Modifier)" if ($Modifier); return $Name; -- 2.19.2

1 0

[PATCH] testbot/web: Allow web pages to override the collection headers.
by Francois Gouget 03 Dec '18

03 Dec '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 17 +++++++++++++++-- .../ObjectModel/CGI/CollectionBlockForPage.pm | 7 +++++++ testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 +++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index f675e6b260..105280e30e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -238,14 +238,27 @@ sub GenerateHeaderRow($$$) { if ($self->CallDisplayProperty($PropertyDescriptor)) { - print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), - "</th>\n"; + $self->CallGenerateHeaderCell($PropertyDescriptor); } } print "</tr>\n"; } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->GenerateHeaderCell($PropertyDescriptor); +} + +sub GenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), + "</th>\n"; +} + sub CallGenerateDataRow($$$$$$) { my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index ff8247ec92..03a45082f0 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -45,6 +45,13 @@ sub CallGenerateFormEnd($) $self->{EnclosingPage}->GenerateFormEnd($self); } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); +} + sub CallGenerateHeaderRow($$$) { my ($self, $PropertyDescriptors, $Actions) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 194379f406..5c48954c68 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -94,6 +94,13 @@ sub GenerateFormEnd($$) $CollectionBlock->GenerateFormEnd(); } +sub GenerateHeaderCell($$$) +{ + my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + + $CollectionBlock->GenerateHeaderCell($PropertyDescriptor); +} + sub GenerateHeaderRow($$$$) { my ($self, $CollectionBlock, $PropertyDescriptors, $Actions) = @_; -- 2.19.2

1 0

[PATCH] testbot: Add a dir option to specify the directory on Wine missions.
by Francois Gouget 03 Dec '18

03 Dec '18

This allows running the tests in a regular directory, in the root of a drive or on a non-c: drive. By default the tests are now run in the root of the wineprefix's c: drive. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/bin/build/WineTest.pl | 20 +++++++++++--------- testbot/lib/Build/Utils.pm | 29 +++++++++++++++++++++++------ testbot/web/admin/VMDetails.pl | 1 + 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index f61ee65e7e..c903ae3695 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -47,6 +47,7 @@ use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; use WineTestBot::Missions; +use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -346,7 +347,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " git pull &&\n". - " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". + " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 19e3e8f3eb..5ce1448eb0 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -439,7 +439,7 @@ $Script .= " ../bin/build/WineTest.pl "; if ($Step->Type eq "suite") { my $BaseTag = BuildTag($VM->Name); - $Script .= "--winetest ". $Task->Missions ." $BaseTag "; + $Script .= "--winetest ". ShQuote($Task->Missions) ." $BaseTag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -455,11 +455,11 @@ if ($Step->Type eq "suite") } elsif ($Step->FileType eq "patch") { - $Script .= "--testpatch ". $Task->Missions ." patch.diff"; + $Script .= "--testpatch ". ShQuote($Task->Missions) ." patch.diff"; } else { - $Script .= join(" ", "--testexe", $Task->Missions, $FileName, $Task->CmdLineArg); + $Script .= join(" ", "--testexe", ShQuote($Task->Missions), $FileName, $Task->CmdLineArg); } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b7389ba25e..b47a6bf0fc 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -99,9 +99,9 @@ sub DailyWineTest($$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); - if (!-f "$BaseName.report") + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -109,8 +109,8 @@ sub DailyWineTest($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -s '../$BaseName.report'")) + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue @@ -168,10 +168,10 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t do.not.submit ". + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$BaseName.report") + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -197,7 +197,9 @@ sub TestExe($$$) } # Run the test executable - RunWine($Mission, "./TestLauncher.exe.so", "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'../$BaseName.report'"); + RunWine($Mission, "TestLauncher.exe.so", + "-t 120 ". ShArgv2Cmd($FileName, @$Args) + ." >'$DataDir/$BaseName.report'"); return 1; } diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index c53f6099c5..b204386827 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -348,10 +348,26 @@ sub RunWine($$$) { my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; - my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". - "time $Wine $Cmd $CmdArgs"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + $Cmd = "$WineDir/$Cmd" if ($Cmd =~ /\.exe\.so$/); + + my $CurDir = "$ENV{WINEPREFIX}/dosdevices"; + if (!-d $CurDir) + { + $CurDir = "."; + } + else + { + my $Dir = $Mission->{dir} || ""; + # We cannot put colons in missions so restore the drive letter + $Dir = "$CurDir/c:/$Dir" if ($Dir !~ s~^([a-z])/~$CurDir/$1:/~); + $CurDir = -d $Dir ? $Dir : "$ENV{WINEPREFIX}/dosdevices/c:"; + } + + my $Magic = `file '$Cmd'`; + my $Wine = ($Magic =~ /ELF 64/ ? "$WineDir/wine64" : "$WineDir/wine"); + return system("set -x && cd '$CurDir' && ". + "time '$Wine' '$Cmd' $CmdArgs"); } @@ -367,7 +383,7 @@ sub CreateWinePrefix($;$) rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Mission, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { return "Failed to disable the crash dialogs: $!"; } @@ -376,7 +392,8 @@ sub CreateWinePrefix($;$) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + system("'$WineDir/server/wineserver' -w"); } return undef; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 4dd9e2501a..095de3a1eb 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -80,6 +80,7 @@ sub GenerateFooter($) print "<p>On Wine VMs:<br>\n"; print "The <i>test</i> option can be set to <i>build</i> to only test building, <i>test</i> to only rerun patched tests, <i>module</i> to rerun all of a patched dll or program's tests, or <i>all</i> to always rerun all the tests.<br>\n"; print "The <i>lang</i> option can be set to run the tests in the specified \$LANG locale. The default is en_US (<i>.UTF-8</i> can be omitted).<br>\n"; + print "The <i>dir</i> option can be set to specify the directory in which to run the tests. A path starting with a single letter followed by a slash specifies the drive, for instance 'c/' for 'c:' (the default).<br>\n"; print "If set, the <i>nosubmit</i> option specifies that the WineTest results should not be published online.</p>\n"; print "</td></tr></tbody>\n"; print "</table></div>\n"; -- 2.19.2

1 0

[PATCH 2/2] include: Add ntddvdeo.h.
by Józef Kucia 03 Dec '18

03 Dec '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/ntddvdeo.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 include/ntddvdeo.h diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h new file mode 100644 index 000000000000..d79670c4566a --- /dev/null +++ b/include/ntddvdeo.h @@ -0,0 +1,24 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NTDDVDEO_H +#define __WINE_NTDDVDEO_H + +DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); + +#endif -- 2.18.1

1 0

[PATCH vkd3d 6/6] vkd3d: Implement D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED.
by Józef Kucia 03 Dec '18

03 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 59 +++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2e6357ac3c3f..937c7e37fc49 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2251,6 +2251,34 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return true; } +static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_command_list *list) +{ + struct d3d12_graphics_pipeline_state *graphics = &list->state->u.graphics; + + /* In Vulkan, the strip cut value is derived from the index buffer format. */ + switch (graphics->index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + { + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + { + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + default: + break; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList *iface, UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) @@ -2287,27 +2315,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap iface, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location); - vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; } - switch (list->state->u.graphics.index_buffer_strip_cut_value) - { - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) - FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) - FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - default: - break; - } + vk_procs = &list->device->vk_procs; + + d3d12_command_list_check_index_buffer_strip_cut_value(list); VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); @@ -4113,6 +4129,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC arg_buffer_offset, max_command_count, signature_desc->ByteStride)); break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + if (!d3d12_command_list_begin_render_pass(list)) + { + WARN("Failed to begin render pass, ignoring draw.\n"); + break; + } + + d3d12_command_list_check_index_buffer_strip_cut_value(list); + + VK_CALL(vkCmdDrawIndexedIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: if (max_command_count != 1) FIXME("Ignoring command count %u.\n", max_command_count); -- 2.18.1

2 1

[PATCH vkd3d 5/6] vkd3d: Add FIXME() for unsupported strip cut values.
by Józef Kucia 03 Dec '18

03 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> In Vulkan, the strip cut value is derived from the current index buffer format. We could recompile the pipeline to handle more cases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 18 ++++++++++++++++++ libs/vkd3d/state.c | 6 ++---- libs/vkd3d/vkd3d_private.h | 4 +++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3d5e898b4adb..2e6357ac3c3f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1703,6 +1703,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, memset(list->strides, 0, sizeof(list->strides)); list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + list->index_buffer_format = DXGI_FORMAT_UNKNOWN; + memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; list->fb_height = 0; @@ -2293,6 +2295,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap return; } + switch (list->state->u.graphics.index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + default: + break; + } + VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); } @@ -3475,6 +3491,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics return; } + list->index_buffer_format = view->Format; + resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, view->BufferLocation); VK_CALL(vkCmdBindIndexBuffer(list->vk_command_buffer, resource->u.vk_buffer, view->BufferLocation - resource->gpu_address, index_type)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 03d8ef35ffd2..64c21588a825 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2236,11 +2236,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s switch (desc->IBStripCutValue) { case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED: - graphics->primitive_restart_enable = VK_FALSE; - break; case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - graphics->primitive_restart_enable = VK_TRUE; + graphics->index_buffer_strip_cut_value = desc->IBStripCutValue; break; default: WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue); @@ -2506,7 +2504,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = topology; - ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable; + ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f97755925888..7e04dc31a0c8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -531,7 +531,7 @@ struct d3d12_graphics_pipeline_state size_t attachment_count, rt_idx; VkRenderPass render_pass; - VkBool32 primitive_restart_enable; + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value; struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc; @@ -696,6 +696,8 @@ struct d3d12_command_list uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; VkPrimitiveTopology primitive_topology; + DXGI_FORMAT index_buffer_format; + VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width; unsigned int fb_height; -- 2.18.1

2 1

[PATCH vkd3d 4/6] tests: Add test for primitive restart.
by Józef Kucia 03 Dec '18

03 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 172 +++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 1 + 2 files changed, 173 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e9dbbaa8c3ba..7ad0303985be 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21914,6 +21914,177 @@ static void test_multisample_rendering(void) destroy_test_context(&context); } +static void test_primitive_restart(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + D3D12_INDEX_BUFFER_VIEW ibv; + struct resource_readback rb; + ID3D12CommandQueue *queue; + unsigned int index_count; + ID3D12Resource *ib, *vb; + size_t buffer_size; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + void *ptr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main(int4 p : POSITION) : SV_Position + { + return p; + } +#endif + 0x43425844, 0x3fd50ab1, 0x580a1d14, 0x28f5f602, 0xd1083e3a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0500002b, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const struct + { + int8_t x, y; + } + quad[] = + { + {-1, -1}, + {-1, 1}, + { 1, -1}, + { 1, 1}, + }; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"position", 0, DXGI_FORMAT_R8G8_SINT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const uint16_t indices16[] = {0, 1, 2, 3}; + static const uint32_t indices[] = {0, 1, 2, 3}; + static const uint16_t indices16_max[] = {0, 1, 2, 0xffff}; + static const uint32_t indices_max16[] = {0, 1, 2, 0xffff}; + static const uint16_t indices16_restart[] = {0, 1, 2, 0xffff, 2, 1, 3}; + static const uint32_t indices_restart[] = {0, 1, 2, 0xffffffff, 2, 1, 3}; + static const struct + { + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value; + DXGI_FORMAT ib_format; + const void *indices; + size_t indices_size; + unsigned int last_index; + bool full_quad; + bool is_todo; + } + tests[] = + { + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, + + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, false}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_restart, sizeof(indices16_restart), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, false, true}, + + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_restart, sizeof(indices_restart), 0x0003, true}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, NULL, &input_layout); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + buffer_size = (tests[i].last_index + 1) * sizeof(*quad); + + vb = create_upload_buffer(context.device, buffer_size, NULL); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = buffer_size; + + pso_desc.IBStripCutValue = tests[i].strip_cut_value; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + ibv.Format = tests[i].ib_format; + ib = create_upload_buffer(context.device, tests[i].indices_size, tests[i].indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = tests[i].indices_size; + index_count = tests[i].indices_size / format_size(ibv.Format); + + hr = ID3D12Resource_Map(vb, 0, NULL, &ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memcpy(ptr, quad, (ARRAY_SIZE(quad) - 1) * sizeof(*quad)); + memcpy((BYTE *)ptr + tests[i].last_index * sizeof(*quad), &quad[ARRAY_SIZE(quad) - 1], sizeof(*quad)); + ID3D12Resource_Unmap(vb, 0, NULL); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, index_count, 1, 0, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + if (tests[i].full_quad) + { + todo_if(tests[i].is_todo) + check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + } + else + { + set_box(&box, 16, 0, 0, 32, 10, 1); + todo_if(tests[i].is_todo) + check_readback_data_uint(&rb, &box, 0xffffffff, 0); + set_box(&box, 0, 16, 0, 16, 32, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + } + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12Resource_Release(ib); + ID3D12Resource_Release(vb); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + } + + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -22047,4 +22218,5 @@ START_TEST(d3d12) run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); run_test(test_multisample_rendering); + run_test(test_primitive_restart); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index fc07af78ffb4..c2e7a3d50458 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -203,6 +203,7 @@ static unsigned int format_size(DXGI_FORMAT format) return 4; case DXGI_FORMAT_R16_FLOAT: case DXGI_FORMAT_R16_UNORM: + case DXGI_FORMAT_R16_UINT: return 2; case DXGI_FORMAT_BC1_UNORM: case DXGI_FORMAT_BC1_UNORM_SRGB: -- 2.18.1

2 1

[PATCH vkd3d v2 1/6] tests: Print adapter info on Windows.
by Józef Kucia 03 Dec '18

03 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: * Fix formatting. * Merge #ifdef blocks. --- include/vkd3d_dxgi.idl | 26 +++++++++++++++++++++++++- tests/d3d12.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_dxgi.idl b/include/vkd3d_dxgi.idl index 5b80e1f6c3f4..7e07a78dd365 100644 --- a/include/vkd3d_dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -38,7 +38,6 @@ typedef enum DXGI_MODE_ROTATION DXGI_MODE_ROTATION_ROTATE270 = 0x4, } DXGI_MODE_ROTATION; -interface IDXGIAdapter; interface IDXGIAdapter1; interface IDXGIOutput; typedef struct DXGI_SWAP_CHAIN_DESC DXGI_SWAP_CHAIN_DESC; @@ -54,6 +53,19 @@ const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x00000100ul; const DXGI_USAGE DXGI_USAGE_DISCARD_ON_PRESENT = 0x00000200ul; const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x00000400ul; +typedef struct DXGI_ADAPTER_DESC +{ + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; +} DXGI_ADAPTER_DESC; + [ local, object, @@ -79,6 +91,18 @@ interface IDXGIDeviceSubObject : IDXGIObject HRESULT GetDevice(REFIID riid, void **device); } +[ + object, + local, + uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) +] +interface IDXGIAdapter : IDXGIObject +{ + HRESULT EnumOutputs(UINT output_idx, IDXGIOutput **output); + HRESULT GetDesc(DXGI_ADAPTER_DESC *desc); + HRESULT CheckInterfaceSupport(REFGUID guid, void *umd_version); +} + [ local, object, diff --git a/tests/d3d12.c b/tests/d3d12.c index e5a6249afff8..3956fbaa3b56 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -890,18 +890,41 @@ static IUnknown *create_adapter(void) return adapter; } - if (use_adapter_idx) - hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get adapter, hr %#x.\n", hr); return adapter; } + +static void print_adapter_info(void) +{ + IDXGIAdapter *dxgi_adapter; + DXGI_ADAPTER_DESC desc; + IUnknown *adapter; + HRESULT hr; + + if (!(adapter = create_adapter())) + return; + + hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); + IUnknown_Release(adapter); + + hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + + IDXGIAdapter_Release(dxgi_adapter); +} #else static IUnknown *create_adapter(void) { return NULL; } + +static void print_adapter_info(void) {} #endif static ID3D12Device *create_device(void) @@ -21923,6 +21946,8 @@ START_TEST(d3d12) ID3D12Debug_Release(debug); } + print_adapter_info(); + run_test(test_create_device); run_test(test_node_count); run_test(test_check_feature_support); -- 2.18.1

2 1

[PATCH vkd3d 2/6] tests: Add more flexible todo() implementation.
by Józef Kucia 03 Dec '18

03 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Based on wine/test.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 75 +++++++++++++++++++++++------------- tests/d3d12.c | 56 +++++++++++---------------- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index fd3ed1572da6..a2649dd64f76 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -32,12 +32,15 @@ static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; static const char *vkd3d_test_platform = "other"; +static void vkd3d_test_start_todo(bool is_todo); +static int vkd3d_test_loop_todo(void); +static void vkd3d_test_end_todo(void); + #define START_TEST(name) \ static const char *vkd3d_test_name = #name; \ static void vkd3d_test_main(int argc, char **argv) #define ok ok_(__LINE__) -#define todo todo_(__LINE__) #define skip skip_(__LINE__) #define trace trace_(__LINE__) @@ -73,6 +76,11 @@ static const char *vkd3d_test_platform = "other"; #define VKD3D_TEST_TRACE(args...) \ vkd3d_test_trace(vkd3d_line, args); } while (0) +#define todo_if(is_todo) \ + for (vkd3d_test_start_todo(is_todo); vkd3d_test_loop_todo(); vkd3d_test_end_todo()) + +#define todo todo_if(true) + static struct { LONG success_count; @@ -82,6 +90,9 @@ static struct LONG todo_success_count; unsigned int debug_level; + + unsigned int todo_level; + bool todo_do_loop; } vkd3d_test_state; static bool @@ -99,7 +110,24 @@ broken(bool condition) static void vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { - if (result) + bool is_todo = vkd3d_test_state.todo_level && !vkd3d_test_platform_is_windows(); + + if (is_todo) + { + if (result) + { + printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); + vprintf(fmt, args); + InterlockedIncrement(&vkd3d_test_state.todo_success_count); + } + else + { + printf("%s:%d: Todo: ", vkd3d_test_name, line); + vprintf(fmt, args); + InterlockedIncrement(&vkd3d_test_state.todo_count); + } + } + else if (result) { if (vkd3d_test_state.debug_level > 1) printf("%s:%d: Test succeeded.\n", vkd3d_test_name, line); @@ -123,31 +151,6 @@ vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) va_end(args); } -static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED -vkd3d_test_todo(unsigned int line, bool result, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - if (vkd3d_test_platform_is_windows()) - { - vkd3d_test_check_ok(line, result, fmt, args); - } - else if (result) - { - printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); - vprintf(fmt, args); - InterlockedIncrement(&vkd3d_test_state.todo_success_count); - } - else - { - printf("%s:%d: Todo: ", vkd3d_test_name, line); - vprintf(fmt, args); - InterlockedIncrement(&vkd3d_test_state.todo_count); - } - va_end(args); -} - static void VKD3D_PRINTF_FUNC(2, 3) VKD3D_UNUSED vkd3d_test_skip(unsigned int line, const char *fmt, ...) { @@ -283,6 +286,24 @@ static inline void vkd3d_run_test(const char *name, vkd3d_test_pfn test_pfn) test_pfn(); } +static inline void vkd3d_test_start_todo(bool is_todo) +{ + vkd3d_test_state.todo_level = (vkd3d_test_state.todo_level << 1) | is_todo; + vkd3d_test_state.todo_do_loop = true; +} + +static inline int vkd3d_test_loop_todo(void) +{ + bool do_loop = vkd3d_test_state.todo_do_loop; + vkd3d_test_state.todo_do_loop = false; + return do_loop; +} + +static inline void vkd3d_test_end_todo(void) +{ + vkd3d_test_state.todo_level >>= 1; +} + #define run_test(test_pfn) \ vkd3d_run_test(#test_pfn, test_pfn) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3956fbaa3b56..e9dbbaa8c3ba 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1412,8 +1412,8 @@ static void test_format_support(void) memset(&format_support, 0, sizeof(format_support)); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, &format_support, sizeof(format_support)); - todo(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo(format_support.Support1 == D3D12_FORMAT_SUPPORT1_BUFFER, + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo ok(format_support.Support1 == D3D12_FORMAT_SUPPORT1_BUFFER, "Got unexpected support1 %#x.\n", format_support.Support1); ok(!format_support.Support2 || format_support.Support2 == D3D12_FORMAT_SUPPORT2_TILED, "Got unexpected support2 %#x.\n", format_support.Support2); @@ -1792,7 +1792,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12Resource_Release(resource); @@ -1835,7 +1835,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); - todo(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12Resource_Release(resource); @@ -2487,7 +2487,7 @@ static void test_create_root_signature(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12RootSignature_Release(root_signature); root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; @@ -2522,7 +2522,7 @@ static void test_create_root_signature(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12RootSignature_Release(root_signature); root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY; @@ -5472,7 +5472,7 @@ static void test_invalid_texture_resource_barriers(void) transition_resource_state(command_list, readback_buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON); hr = ID3D12GraphicsCommandList_Close(command_list); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12CommandAllocator_Reset(command_allocator); ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); @@ -5485,7 +5485,7 @@ static void test_invalid_texture_resource_barriers(void) transition_resource_state(command_list, upload_buffer, D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_COMMON); hr = ID3D12GraphicsCommandList_Close(command_list); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D12CommandAllocator_Release(command_allocator); ID3D12CommandQueue_Release(queue); @@ -5540,7 +5540,7 @@ static void test_device_removed_reason(void) hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, (void **)&tmp_queue); - todo(hr == DXGI_ERROR_DEVICE_REMOVED, "Got unexpected hr %#x.\n", hr); + todo ok(hr == DXGI_ERROR_DEVICE_REMOVED, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12CommandQueue_Release(tmp_queue); @@ -9484,7 +9484,7 @@ static void test_root_signature_serialization_(unsigned int line, const DWORD *c (unsigned int)blob_buffer[0], (unsigned int)code[0]); for (i = 1; i < 5; ++i) { - todo_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", + todo ok_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", (unsigned int)blob_buffer[i], (unsigned int)code[i], i - 1); } for (; i < code_size / sizeof(DWORD); ++i) @@ -12880,7 +12880,7 @@ static void test_update_descriptor_heap_after_closing_command_list(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); value = get_readback_uint(&rb, 0, 0, 0); - todo(value == 0xff00ff00, "Got unexpected value %#x.\n", value); + todo ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value); release_resource_readback(&rb); ID3D12DescriptorHeap_Release(cpu_heap); @@ -17604,17 +17604,12 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - if (test->i.x < 0 + todo_if(test->i.x < 0 && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin"))) - todo(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); - else - ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); } release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -17629,16 +17624,11 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - if (test->i.x < 0 && todo_instruction) - todo(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, imm_instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); - else - ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, imm_instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + todo_if(test->i.x < 0 && todo_instruction) + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, imm_instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); } release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -18008,7 +17998,7 @@ static void test_create_query_heap(void) heap_desc.NodeMask = 0; hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); - todo(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); + todo ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); if (hr == S_OK) ID3D12QueryHeap_Release(query_heap); @@ -18516,7 +18506,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) reset_command_list(command_lists[0], context.allocator); get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_lists[0]); result = get_readback_uint64(&rb, 0, 0); - todo(result == context.render_target_desc.Width * context.render_target_desc.Height, + todo ok(result == context.render_target_desc.Width * context.render_target_desc.Height, "Got unexpected result %"PRIu64".\n", result); release_resource_readback(&rb); -- 2.18.1

2 1

[PATCH vkd3d 3/6] vkd3d: Implement primitive restart.
by Józef Kucia 03 Dec '18

03 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 17 ++++++++++++++++- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1fefb6149cff..03d8ef35ffd2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2233,6 +2233,21 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attribute_count = j; vkd3d_shader_free_shader_signature(&input_signature); + switch (desc->IBStripCutValue) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED: + graphics->primitive_restart_enable = VK_FALSE; + break; + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + graphics->primitive_restart_enable = VK_TRUE; + break; + default: + WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue); + hr = E_INVALIDARG; + goto fail; + } + sub_pass_desc.flags = 0; sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; sub_pass_desc.inputAttachmentCount = 0; @@ -2491,7 +2506,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = topology; - ia_desc.primitiveRestartEnable = VK_FALSE; + ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2fc31da08a96..f97755925888 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -531,6 +531,7 @@ struct d3d12_graphics_pipeline_state size_t attachment_count, rt_idx; VkRenderPass render_pass; + VkBool32 primitive_restart_enable; struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc; -- 2.18.1

2 1

[PATCH 1/2] loader: Move some code in preparation for adding the Mac preloader.
by Ken Thomases 03 Dec '18

03 Dec '18

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- This is a no-op. It justs makes the next patch simpler. loader/preloader.c | 288 +++++++++++++++++++++++++++-------------------------- 1 file changed, 148 insertions(+), 140 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 644244b..de15130 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -93,6 +93,14 @@ #include "main.h" +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ); + +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ); + +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ); + +static void preload_reserve( const char *str ); + /* ELF definitions */ #define ELF_PREFERRED_ADDRESS(loader, maplength, mapstartpref) (mapstartpref) #define ELF_FIXED_ADDRESS(loader, mapstart) ((void) 0) @@ -559,85 +567,6 @@ static inline void *wld_memset( void *dest, int val, size_t len ) return dest; } -/* - * wld_printf - just the basics - * - * %x prints a hex number - * %s prints a string - * %p prints a pointer - */ -static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) -{ - static const char hex_chars[16] = "0123456789abcdef"; - const char *p = fmt; - char *str = buffer; - int i; - - while( *p ) - { - if( *p == '%' ) - { - p++; - if( *p == 'x' ) - { - unsigned int x = va_arg( args, unsigned int ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if (p[0] == 'l' && p[1] == 'x') - { - unsigned long x = va_arg( args, unsigned long ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - p++; - } - else if( *p == 'p' ) - { - unsigned long x = (unsigned long)va_arg( args, void * ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if( *p == 's' ) - { - char *s = va_arg( args, char * ); - while(*s) - *str++ = *s++; - } - else if( *p == 0 ) - break; - p++; - } - *str++ = *p++; - } - *str = 0; - return str - buffer; -} - -static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); -} - -static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); - wld_exit(1); -} - #ifdef DUMP_AUX_INFO /* * Dump interesting bits of the ELF auxv_t structure that is passed @@ -1120,67 +1049,6 @@ found: return (void *)(symtab[idx].st_value + map->l_addr); } -/* - * preload_reserve - * - * Reserve a range specified in string format - */ -static void preload_reserve( const char *str ) -{ - const char *p; - unsigned long result = 0; - void *start = NULL, *end = NULL; - int i, first = 1; - - for (p = str; *p; p++) - { - if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; - else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; - else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; - else if (*p == '-') - { - if (!first) goto error; - start = (void *)(result & ~page_mask); - result = 0; - first = 0; - } - else goto error; - } - if (!first) end = (void *)((result + page_mask) & ~page_mask); - else if (result) goto error; /* single value '0' is allowed */ - - /* sanity checks */ - if (end <= start) start = end = NULL; - else if ((char *)end > preloader_start && - (char *)start <= preloader_end) - { - wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", - start, end, preloader_start, preloader_end ); - start = end = NULL; - } - - /* check for overlap with low memory areas */ - for (i = 0; preload_info[i].size; i++) - { - if ((char *)preload_info[i].addr > (char *)0x00110000) break; - if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) - { - start = end = NULL; - break; - } - if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) - start = (char *)preload_info[i].addr + preload_info[i].size; - } - - while (preload_info[i].size) i++; - preload_info[i].addr = start; - preload_info[i].size = (char *)end - (char *)start; - return; - -error: - fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); -} - /* check if address is in one of the reserved ranges */ static int is_addr_reserved( const void *addr ) { @@ -1374,3 +1242,143 @@ void* wld_start( void **stack ) return (void *)ld_so_map.l_entry; } + +/* + * wld_printf - just the basics + * + * %x prints a hex number + * %s prints a string + * %p prints a pointer + */ +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) +{ + static const char hex_chars[16] = "0123456789abcdef"; + const char *p = fmt; + char *str = buffer; + int i; + + while( *p ) + { + if( *p == '%' ) + { + p++; + if( *p == 'x' ) + { + unsigned int x = va_arg( args, unsigned int ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if (p[0] == 'l' && p[1] == 'x') + { + unsigned long x = va_arg( args, unsigned long ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + p++; + } + else if( *p == 'p' ) + { + unsigned long x = (unsigned long)va_arg( args, void * ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if( *p == 's' ) + { + char *s = va_arg( args, char * ); + while(*s) + *str++ = *s++; + } + else if( *p == 0 ) + break; + p++; + } + *str++ = *p++; + } + *str = 0; + return str - buffer; +} + +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); +} + +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); + wld_exit(1); +} + +/* + * preload_reserve + * + * Reserve a range specified in string format + */ +static void preload_reserve( const char *str ) +{ + const char *p; + unsigned long result = 0; + void *start = NULL, *end = NULL; + int i, first = 1; + + for (p = str; *p; p++) + { + if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; + else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; + else if (*p == '-') + { + if (!first) goto error; + start = (void *)(result & ~page_mask); + result = 0; + first = 0; + } + else goto error; + } + if (!first) end = (void *)((result + page_mask) & ~page_mask); + else if (result) goto error; /* single value '0' is allowed */ + + /* sanity checks */ + if (end <= start) start = end = NULL; + else if ((char *)end > preloader_start && + (char *)start <= preloader_end) + { + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", + start, end, preloader_start, preloader_end ); + start = end = NULL; + } + + /* check for overlap with low memory areas */ + for (i = 0; preload_info[i].size; i++) + { + if ((char *)preload_info[i].addr > (char *)0x00110000) break; + if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) + { + start = end = NULL; + break; + } + if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) + start = (char *)preload_info[i].addr + preload_info[i].size; + } + + while (preload_info[i].size) i++; + preload_info[i].addr = start; + preload_info[i].size = (char *)end - (char *)start; + return; + +error: + fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); +} -- 2.10.2

1 1

[PATCH 3/5] d3d8: Do not touch output parameters when d3d8_GetAdapterIdentifier() fails.
by Józef Kucia 03 Dec '18

03 Dec '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/directx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 385c70d67166..d97882705b58 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -132,15 +132,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.device_name = NULL; /* d3d9 only */ adapter_id.device_name_size = 0; /* d3d9 only */ - hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id); - - identifier->DriverVersion = adapter_id.driver_version; - identifier->VendorId = adapter_id.vendor_id; - identifier->DeviceId = adapter_id.device_id; - identifier->SubSysId = adapter_id.subsystem_id; - identifier->Revision = adapter_id.revision; - memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); - identifier->WHQLLevel = adapter_id.whql_level; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id))) + { + identifier->DriverVersion = adapter_id.driver_version; + identifier->VendorId = adapter_id.vendor_id; + identifier->DeviceId = adapter_id.device_id; + identifier->SubSysId = adapter_id.subsystem_id; + identifier->Revision = adapter_id.revision; + memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); + identifier->WHQLLevel = adapter_id.whql_level; + } return hr; } -- 2.18.1

3 2

[PATCH 4/5] d3d9: Do not touch output parameter when d3d9_GetAdapterLUID() fails.
by Józef Kucia 03 Dec '18

03 Dec '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/directx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 242e36d15de5..4fbf5e9a07ee 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -542,9 +542,8 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI adapter_id.description_size = 0; adapter_id.device_name_size = 0; - hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id); - - *luid = adapter_id.adapter_luid; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id))) + *luid = adapter_id.adapter_luid; return hr; } -- 2.18.1

3 2

[PATCH 5/5] d3d9: Do not touch output parameter when d3d9_GetAdapterIdentifier() fails.
by Józef Kucia 03 Dec '18

03 Dec '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/directx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 4fbf5e9a07ee..3f9c188f3e7f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -137,15 +137,16 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte adapter_id.device_name = identifier->DeviceName; adapter_id.device_name_size = sizeof(identifier->DeviceName); - hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id); - - identifier->DriverVersion = adapter_id.driver_version; - identifier->VendorId = adapter_id.vendor_id; - identifier->DeviceId = adapter_id.device_id; - identifier->SubSysId = adapter_id.subsystem_id; - identifier->Revision = adapter_id.revision; - memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); - identifier->WHQLLevel = adapter_id.whql_level; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id))) + { + identifier->DriverVersion = adapter_id.driver_version; + identifier->VendorId = adapter_id.vendor_id; + identifier->DeviceId = adapter_id.device_id; + identifier->SubSysId = adapter_id.subsystem_id; + identifier->Revision = adapter_id.revision; + memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); + identifier->WHQLLevel = adapter_id.whql_level; + } return hr; } -- 2.18.1

3 2

[PATCH 2/5] wined3d: Lock wined3d mutex in wined3d_get_adapter_identifier().
by Józef Kucia 03 Dec '18

03 Dec '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/directx.c | 2 -- dlls/d3d9/directx.c | 6 +----- dlls/dxgi/adapter.c | 12 ++---------- dlls/wined3d/directx.c | 16 +++++++++++----- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index df5e7d612141..385c70d67166 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -132,9 +132,7 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.device_name = NULL; /* d3d9 only */ adapter_id.device_name_size = 0; /* d3d9 only */ - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id); - wined3d_mutex_unlock(); identifier->DriverVersion = adapter_id.driver_version; identifier->VendorId = adapter_id.vendor_id; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index dd6e0bd8eb81..242e36d15de5 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -137,9 +137,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte adapter_id.device_name = identifier->DeviceName; adapter_id.device_name_size = sizeof(identifier->DeviceName); - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id); - wined3d_mutex_unlock(); identifier->DriverVersion = adapter_id.driver_version; identifier->VendorId = adapter_id.vendor_id; @@ -544,11 +542,9 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI adapter_id.description_size = 0; adapter_id.device_name_size = 0; - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id); - wined3d_mutex_unlock(); - memcpy(luid, &adapter_id.adapter_luid, sizeof(*luid)); + *luid = adapter_id.adapter_luid; return hr; } diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 4371ae74f7e1..31baae6f49ff 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -158,11 +158,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ adapter_id.description_size = sizeof(description); adapter_id.device_name_size = 0; - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) return hr; if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) @@ -311,11 +307,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap adapter_id.description_size = 0; adapter_id.device_name_size = 0; - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) return hr; switch (segment_group) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b9aa9fa44003..544c76ed5c19 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1155,8 +1155,6 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, return WINED3D_OK; } -/* NOTE: due to structure differences between dx8 and dx9 D3DADAPTER_IDENTIFIER, - and fields being inserted in the middle, a new structure is used in place */ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) { @@ -1166,8 +1164,10 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, TRACE("wined3d %p, adapter_idx %u, flags %#x, identifier %p.\n", wined3d, adapter_idx, flags, identifier); + wined3d_mutex_lock(); + if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; + goto fail; adapter = &wined3d->adapters[adapter_idx]; @@ -1194,7 +1194,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->device_name_size, NULL, NULL)) { ERR("Failed to convert device name, last error %#x.\n", GetLastError()); - return WINED3DERR_INVALIDCALL; + goto fail; } } @@ -1206,11 +1206,17 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->revision = 0; memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; - memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); + identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); + wined3d_mutex_unlock(); + return WINED3D_OK; + +fail: + wined3d_mutex_unlock(); + return WINED3DERR_INVALIDCALL; } HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, -- 2.18.1

3 2

[PATCH 1/5] wined3d: Lock wined3d mutex in wined3d_swapchain_present().
by Józef Kucia 03 Dec '18

03 Dec '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/swapchain.c | 7 +------ dlls/d3d9/swapchain.c | 7 +------ dlls/dxgi/swapchain.c | 7 +------ dlls/wined3d/swapchain.c | 5 +++++ 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 6e8b98e3b6de..c9abfffffda3 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -88,7 +88,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChai { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); struct d3d8_device *device = impl_from_IDirect3DDevice8(swapchain->parent_device); - HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); @@ -99,12 +98,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChai if (dirty_region) FIXME("Ignoring dirty_region %p.\n", dirty_region); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, + return wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, swapchain->swap_interval, 0); - wined3d_mutex_unlock(); - - return hr; } static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 1279663dd52b..00ead0fc3e3e 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -140,7 +140,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(swapchain->parent_device); - HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), @@ -152,12 +151,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai if (dirty_region) FIXME("Ignoring dirty_region %p.\n", dirty_region); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, + return wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, swapchain->swap_interval, flags); - wined3d_mutex_unlock(); - - return hr; } static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9Ex *iface, IDirect3DSurface9 *surface) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4dfa06873351..5aa2525c06e3 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -602,7 +602,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface UINT sync_interval, UINT flags, const DXGI_PRESENT_PARAMETERS *present_parameters) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); @@ -624,11 +623,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); - wined3d_mutex_unlock(); - - return hr; + return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); } static BOOL STDMETHODCALLTYPE d3d11_swapchain_IsTemporaryMonoSupported(IDXGISwapChain1 *iface) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 344a1867a8cf..3a7039da4489 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -164,9 +164,12 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, if (flags) FIXME("Ignoring flags %#x.\n", flags); + wined3d_mutex_lock(); + if (!swapchain->back_buffers) { WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL.\n"); + wined3d_mutex_unlock(); return WINED3DERR_INVALIDCALL; } @@ -186,6 +189,8 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, dst_rect, dst_window_override, swap_interval, flags); + wined3d_mutex_unlock(); + return WINED3D_OK; } -- 2.18.1

3 2

[PATCH] wined3d: Use wined3d_state_get_light() in wined3d_state_record_lights().
by Zebediah Figura 03 Dec '18

03 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 52 +++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d7d936ea50..9c8c4e9859 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -674,6 +674,8 @@ void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3 static void wined3d_state_record_lights(struct wined3d_state *dst_state, const struct wined3d_state *src_state) { + const struct wined3d_light_info *src; + struct wined3d_light_info *dst; UINT i; /* Lights... For a recorded state block, we just had a chain of actions @@ -681,48 +683,36 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s * differ. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) { - struct list *e, *f; - LIST_FOR_EACH(e, &dst_state->light_map[i]) + LIST_FOR_EACH_ENTRY(dst, &dst_state->light_map[i], struct wined3d_light_info, entry) { - BOOL updated = FALSE; - struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; - - /* Look up the light in the destination */ - LIST_FOR_EACH(f, &src_state->light_map[i]) + if ((src = wined3d_state_get_light(src_state, dst->OriginalIndex))) { - realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); - if (realLight->OriginalIndex == src->OriginalIndex) + dst->OriginalParms = src->OriginalParms; + + if (src->glIndex == -1 && dst->glIndex != -1) { - src->OriginalParms = realLight->OriginalParms; - - if (realLight->glIndex == -1 && src->glIndex != -1) - { - /* Light disabled */ - dst_state->lights[src->glIndex] = NULL; - } - else if (realLight->glIndex != -1 && src->glIndex == -1) - { - /* Light enabled */ - dst_state->lights[realLight->glIndex] = src; - } - src->glIndex = realLight->glIndex; - updated = TRUE; - break; + /* Light disabled. */ + dst_state->lights[dst->glIndex] = NULL; } + else if (src->glIndex != -1 && dst->glIndex == -1) + { + /* Light enabled. */ + dst_state->lights[src->glIndex] = dst; + } + dst->glIndex = src->glIndex; } - - if (!updated) + else { /* This can happen if the light was originally created as a * default light for SetLightEnable() while recording. */ WARN("Light %u in dst_state %p does not exist in src_state %p.\n", - src->OriginalIndex, dst_state, src_state); + dst->OriginalIndex, dst_state, src_state); - src->OriginalParms = WINED3D_default_light; - if (src->glIndex != -1) + dst->OriginalParms = WINED3D_default_light; + if (dst->glIndex != -1) { - dst_state->lights[src->glIndex] = NULL; - src->glIndex = -1; + dst_state->lights[dst->glIndex] = NULL; + dst->glIndex = -1; } } } -- 2.14.1

2 1

[PATCH 2/2] explorer: send WM_NCDESTROY message to delete hwnd-related global atom
by Daniel Wendt 03 Dec '18

03 Dec '18

2 1

[PATCH 1/2] user32: delete global atom on message WM_NCDESTROY
by Daniel Wendt 03 Dec '18

03 Dec '18

2 1

[PATCH] bcrypt: Support retrieving properties from key handles.
by Hans Leidekker 03 Dec '18

03 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 130 +++++++++++++++++++++++++++------------------ dlls/bcrypt/tests/bcrypt.c | 31 ++++++++++- 2 files changed, 107 insertions(+), 54 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2b9ae0b766..0c68a4f3e6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -413,6 +413,63 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_AES; + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + const WCHAR *str; + switch (mode) + { + case MODE_ID_ECB: str = BCRYPT_CHAIN_MODE_ECB; break; + case MODE_ID_CBC: str = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: str = BCRYPT_CHAIN_MODE_GCM; break; + default: return STATUS_NOT_IMPLEMENTED; + } + + *ret_size = 64; + if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + memcpy( buf, str, (strlenW(str) + 1) * sizeof(WCHAR) ); + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 128; + key_lengths->dwMaxLength = 256; + key_lengths->dwIncrement = 64; + } + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) + { + BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; + if (mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; + *ret_size = sizeof(*tag_length); + if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (tag_length) + { + tag_length->dwMinLength = 12; + tag_length->dwMaxLength = 16; + tag_length->dwIncrement = 1; + } + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -424,59 +481,7 @@ NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR switch (alg->id) { case ALG_ID_AES: - if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) - { - *ret_size = sizeof(ULONG); - if (size < sizeof(ULONG)) - return STATUS_BUFFER_TOO_SMALL; - if (buf) - *(ULONG *)buf = BLOCK_LENGTH_AES; - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { - const WCHAR *mode; - switch (alg->mode) - { - case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; - case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; - default: return STATUS_NOT_IMPLEMENTED; - } - - *ret_size = 64; - if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) ); - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) - { - BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; - *ret_size = sizeof(*key_lengths); - if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (key_lengths) - { - key_lengths->dwMinLength = 128; - key_lengths->dwMaxLength = 256; - key_lengths->dwIncrement = 64; - } - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) - { - BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; - if (alg->mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; - *ret_size = sizeof(*tag_length); - if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (tag_length) - { - tag_length->dwMinLength = 12; - tag_length->dwMaxLength = 16; - tag_length->dwIncrement = 1; - } - return STATUS_SUCCESS; - } - break; + return get_aes_property( alg->mode, prop, buf, size, ret_size ); default: break; @@ -533,6 +538,20 @@ static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, U return status; } +static NTSTATUS get_key_property( const struct key *key, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + switch (key->alg_id) + { + case ALG_ID_AES: + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) return STATUS_NOT_SUPPORTED; + return get_aes_property( key->u.s.mode, prop, buf, size, ret_size ); + + default: + FIXME( "unsupported algorithm %u\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags ) { struct object *object = handle; @@ -549,6 +568,11 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu const struct algorithm *alg = (const struct algorithm *)object; return get_alg_property( alg, prop, buffer, count, res ); } + case MAGIC_KEY: + { + const struct key *key = (const struct key *)object; + return get_key_property( key, prop, buffer, count, res ); + } case MAGIC_HASH: { const struct hash *hash = (const struct hash *)object; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6865e87ca8..c3f8f3d78a 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -507,7 +507,8 @@ static void test_BCryptGenerateSymmetricKey(void) {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key, key2; - UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; + UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16], mode[64]; + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; @@ -608,6 +609,27 @@ static void test_BCryptGenerateSymmetricKey(void) ok(size == 16, "got %u\n", size); ok(!memcmp(plaintext, data, sizeof(data)), "wrong data\n"); + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "wrong mode\n"); + + len = 0; + size = 0; + ret = pBCryptGetProperty(key, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 16, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = pBCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); @@ -855,6 +877,9 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1; @@ -1108,6 +1133,7 @@ static void test_BCryptDecrypt(void) {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; BCRYPT_KEY_LENGTHS_STRUCT key_lengths; + BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_lengths; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; UCHAR *buf, plaintext[48], ivbuf[16]; @@ -1242,6 +1268,9 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_lengths, sizeof(tag_lengths), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1; -- 2.11.0

2 1

[PATCH 2/2] crypt32: Pass type and flags in correct order to the find() helper.
by Dmitry Timoshkov 03 Dec '18

03 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2d7ef42d3c..e591c4dd45 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1811,7 +1811,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, } if (find) - ret = find(hCertStore, dwFlags, dwType, pvPara, pPrevCertContext); + ret = find(hCertStore, dwType, dwFlags, pvPara, pPrevCertContext); else if (compare) ret = cert_compare_certs_in_store(hCertStore, pPrevCertContext, compare, dwType, dwFlags, pvPara); -- 2.17.1

1 0

[PATCH 1/2] crypt32: Use sizeof(WCHAR) instead of 2.
by Dmitry Timoshkov 03 Dec '18

03 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 06d456a474..e70940aa7d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1550,7 +1550,7 @@ static BOOL CRYPT_AsnDecodeNameValueInternal(const BYTE *pbEncoded, case ASN_UTF8STRING: valueType = CERT_RDN_UTF8_STRING; bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, - (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * sizeof(WCHAR); break; default: SetLastError(CRYPT_E_ASN1_BADTAG); -- 2.17.1

1 0

[PATCH] winegcc: Pass -static-libstdc++ to the linker
by Andrew Eikum 03 Dec '18

03 Dec '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- tools/winegcc/winegcc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3365..b5fa881c30 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -71,8 +71,9 @@ * * Linker Options * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol --image-base + * -nostdlib -s -static -static-libgcc -static-libstdc++ + * -shared -shared-libgcc -symbolic -Wl,option + * -Xlinker option -u symbol --image-base * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1288,8 +1289,9 @@ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", - "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" + "-nostdlib", "-s", "-static", "-static-libgcc", "-static-libstdc++", + "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", + "-fprofile-generate", "-fprofile-use" }; unsigned int j; -- 2.19.2

1 0

[PATCH] vbscript: Make constant 'html_delimiterW' static
by Alex Henrie 03 Dec '18

03 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index e8ecf4d1fd..020109998e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -969,7 +969,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) { - const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; + static const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); -- 2.19.2

2 1

[PATCH] shdocvw: Make constants 'wszCLSID' and 'wszInitPropertyBag' static
by Alex Henrie 03 Dec '18

03 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shdocvw/shlinstobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 9c3232c65e..6f6786bdb5 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -361,8 +361,8 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, WCHAR wszInstanceKey[] = { 'C','L','S','I','D','\\','{','0','0','0','0','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0', '0','0','0','0','}','\\','I','n','s','t','a','n','c','e', 0 }; - const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - const WCHAR wszInitPropertyBag[] = + static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; + static const WCHAR wszInitPropertyBag[] = { 'I','n','i','t','P','r','o','p','e','r','t','y','B','a','g',0 }; WCHAR wszCLSIDInstance[CHARS_IN_GUID]; CLSID clsidInstance; -- 2.19.2

2 1

[PATCH 1/5] user32/listbox: Use a helper function to check the selection state of an item.
by Nikolay Sivov 03 Dec '18

03 Dec '18

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 286a33b1c1..3eee691086 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -120,6 +120,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) +{ + return descr->items[index].selected; +} + /********************************************************************* * listbox class descriptor */ @@ -2866,7 +2871,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; - return descr->items[wParam].selected; + return is_item_selected(descr, wParam); case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); -- 2.19.2

2 7

[PATCH] rpcrt4: Fix 'Routeines' typos.
by Serge Gautherie 03 Dec '18

03 Dec '18

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0dc6789..79c9645 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -519,9 +519,9 @@ @ stub long_from_ndr @ stub long_from_ndr_temp @ stub pfnFreeRoutines # wxp -@ stub pfnMarshallRouteines # wxp +@ stub pfnMarshallRoutines # wxp @ stub pfnSizeRoutines # wxp -@ stub pfnUnmarshallRouteines # wxp +@ stub pfnUnmarshallRoutines # wxp @ stub short_array_from_ndr @ stub short_from_ndr @ stub short_from_ndr_temp -- 2.10.0.windows.1

2 1

[PATCH] oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation.
by Dmitry Timoshkov 03 Dec '18

03 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/tmarshal.c | 39 +++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 3 ++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 756cca844d..0b6776b40a 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2861,7 +2861,7 @@ static void test_typelibmarshal(void) ok(!lstrcmpW(bstr, szCat), "IWidget_get_Name should have returned string \"Cat\" instead of %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - /* call DoSomething */ + /* call DoSomething without optional arguments */ VariantInit(&vararg[0]); VariantInit(&vararg[1]); V_VT(&vararg[1]) = VT_R8; @@ -2876,6 +2876,43 @@ static void test_typelibmarshal(void) ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); VariantClear(&varresult); + /* call DoSomething with optional argument set to VT_EMPTY */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_R8; + V_R8(&vararg[2]) = 3.141; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 3; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + + /* call DoSomething with optional arguments set to VT_ERROR/DISP_E_PARAMNOTFOUND */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + VariantInit(&vararg[3]); + V_VT(&vararg[3]) = VT_R8; + V_R8(&vararg[3]) = 3.141; + V_VT(&vararg[1]) = VT_ERROR; + V_ERROR(&vararg[1]) = DISP_E_PARAMNOTFOUND; + V_VT(&vararg[0]) = VT_ERROR; + V_ERROR(&vararg[0]) = DISP_E_PARAMNOTFOUND; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 4; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + /* call get_State */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f32bed35f4..f17a9267b7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7217,7 +7217,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - else if (src_arg) + else if (src_arg && !((wParamFlags & PARAMFLAG_FOPT) && + V_VT(src_arg) == VT_ERROR && V_ERROR(src_arg) == DISP_E_PARAMNOTFOUND)) { TRACE("%s\n", debugstr_variant(src_arg)); -- 2.17.1

2 1

[PATCH] advapi32: Turn several string variables into static constants
by Alex Henrie 03 Dec '18

03 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/security.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 16512d094c..70e2da40e7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -440,10 +440,10 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_regkey( LPWSTR full_key_name, DWORD access, HANDLE *key ) { - WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; - WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; - WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; - WCHAR usersW[] = {'U','S','E','R','S',0}; + static const WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; + static const WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; + static const WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; + static const WCHAR usersW[] = {'U','S','E','R','S',0}; LPWSTR p = strchrW(full_key_name, '\\'); int len = p-full_key_name; HKEY hParent; @@ -4997,9 +4997,9 @@ static void DumpString(LPCWSTR string, int cch, WCHAR **pwptr, ULONG *plen) static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) { + static const WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; + static const WCHAR subauthfmt[] = { '-','%','u',0 }; DWORD i; - WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; - WCHAR subauthfmt[] = { '-','%','u',0 }; WCHAR buf[26]; SID *pisid = psid; -- 2.19.2

8 34

[PATCH] winspool.drv: Make constant 'fmtW' static
by Alex Henrie 03 Dec '18

03 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb268a047f..e91138dbec 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8208,8 +8208,8 @@ end: */ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) { + static const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; WCHAR *cmd; - const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; BOOL r; cmd = HeapAlloc(GetProcessHeap(), 0, strlenW(printer_name) * sizeof(WCHAR) + sizeof(fmtW)); -- 2.19.2

2 1

[PATCH] gdi32: Fix function prototype when building without freetype.
by Nikolay Sivov 03 Dec '18

03 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Change missing from 03ccce70b540379bf4de86232d375f3e64cf465c. dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f50c163f89..fb58a6a7e9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -9168,7 +9168,7 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD unknown, UINT64 offset, vo /************************************************************************* * GetFontFileInfo (GDI32.@) */ -BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed) +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed) { *needed = 0; return FALSE; -- 2.19.2

2 1

[PATCH 1/5] shlwapi: Forward SHCreateMemStream() to shcore.
by Nikolay Sivov 03 Dec '18

03 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/regstream.c | 40 --------------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 63615d3d9c..47e9317208 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -632,46 +632,6 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, return iStream ? iStream : &rsDummyRegStream.IStream_iface; } -/************************************************************************* - * @ [SHLWAPI.12] - * - * Create an IStream object on a block of memory. - * - * PARAMS - * lpbData [I] Memory block to create the IStream object on - * dwDataLen [I] Length of data block - * - * RETURNS - * Success: A pointer to the IStream object. - * Failure: NULL, if any parameters are invalid or an error occurs. - * - * NOTES - * A copy of the memory pointed to by lpbData is made, and is freed - * when the stream is released. - */ -IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) -{ - ISHRegStream *strm = NULL; - LPBYTE lpbDup; - - TRACE("(%p,%d)\n", lpbData, dwDataLen); - - if (!lpbData) - dwDataLen = 0; - - lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); - - if (lpbDup) - { - memcpy(lpbDup, lpbData, dwDataLen); - strm = IStream_Create(NULL, lpbDup, dwDataLen); - - if (!strm) - HeapFree(GetProcessHeap(), 0, lpbDup); - } - return &strm->IStream_iface; -} - /************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 62ebb85f46..ddc76ec0ac 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -9,7 +9,7 @@ 9 stdcall -ordinal SHUnlockShared(ptr) 10 stdcall -ordinal SHFreeShared(long long) 11 stdcall -noname SHMapHandle(long long long long long) -12 stdcall -ordinal SHCreateMemStream(ptr long) +12 stdcall -ordinal SHCreateMemStream(ptr long) shcore.SHCreateMemStream 13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) 14 stdcall -ordinal GetAcceptLanguagesA(ptr ptr) 15 stdcall -ordinal GetAcceptLanguagesW(ptr ptr) -- 2.19.2

1 4

[PATCH v2 1/2] ntdll: Add RtlAddGrowableFunctionTable stub
by Alex Henrie 03 Dec '18

03 Dec '18

From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42255 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Copied from https://bugs.winehq.org/attachment.cgi?id=59935 with minor changes. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_arm64.c | 12 ++++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 4 files changed, 35 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f53f..1f3aeaa0bc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -434,6 +434,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index da0c8fb71e..72087a2c4c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4d2d127711..22a861da60 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -977,6 +977,18 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7228adb3ab..3f886a785c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3506,6 +3506,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) semi-stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return RtlAddFunctionTable(functions, count, base); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ -- 2.19.2

2 2

[PATCH] wininet: Always check if context can be deleted when freeing netconn.
by Daniel Lehman 03 Dec '18

03 Dec '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v3: supersedes https://source.winehq.org/patches/data/155145 fixes a memory leak where netcon_secure_connect_setup fails in the call to netconn_verify_cert resulting in netconn->secure being FALSE, so it doesn't get freed in free_netconn --- dlls/wininet/netconnection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4ad22177ee..615a43c2be 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -392,9 +392,9 @@ void free_netconn(netconn_t *netconn) heap_free(netconn->extra_buf); netconn->extra_buf = NULL; netconn->extra_len = 0; - if (SecIsValidHandle(&netconn->ssl_ctx)) - DeleteSecurityContext(&netconn->ssl_ctx); } + if (SecIsValidHandle(&netconn->ssl_ctx)) + DeleteSecurityContext(&netconn->ssl_ctx); close_netconn(netconn); heap_free(netconn); -- 2.17.1

2 2

Re: [PATCH 2/2] ntdll: Add RtlGrowFunctionTable stub
by Alex Henrie 03 Dec '18

03 Dec '18

On Sun, Dec 2, 2018 at 5:40 PM Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > > Hi Alex, > > How about stealing the ones from staging, they have been improved more than the ones you sent in. > https://github.com/wine-staging/wine-staging/tree/master/patches/ntdll-RtlA… The main difference in the staging patches is that they add the functions to winnt.h too. Since Alexandre doesn't like adding functions to the header files before they have a proper implementation, I think the patches that I sent today are more likely to be accepted. My new patches also have the advantage of making RtlAddGrowableFunctionTable on x64 call RtlAddFunctionTable (which has an x64 implementation already) instead of just doing nothing. -Alex

2 2

[PATCH 0/3] ntdll: processor info parsing improvements/fixes
by Roderick Colenbrander 03 Dec '18

03 Dec '18

Hi, This patch series was motivated by a bug exposed by earlier logical core parsing I added this summer (bug 45453). The fix was simple, but I added a new helper function as more parts of the code use similar code. While adding the fix, I noticed how our Linux CPU parsing logic will really fail on high core count (>32 or >64). These core counts are becoming more and more common. Consumer AMD Threadripper now has 64 logical cores (maybe >64 next year) and in the server space you can already easily go above on dual socket systems. Supporting high core count, doesn't look trivial to me. The CPU parsing logic is quite fragile as it is. We need to break info better down into multiple groups (hard coded to 1, right now) based on NUMA nodes. Wineserver changes likely needed as well for thread affinity. Many others like needed e.g. the classic GetLogicalProcessorInformation supposedly reports info just for the "group" the thread is currently assigned to as it can't handle >32 / >64 cores. All in all some fun improvements, which warrant a FIXME. For users who currently go above the limit, we are probably reaching undefined behavior right now... Thanks, Roderick Roderick Colenbrander (3): ntdll: parse sysfs cpu_shared_map using helper function. ntdll: Fix parsing thread_siblings bitmaps on high core count systems. ntdll: print FIXME on systems supporting more CPU cores than supported. dlls/ntdll/nt.c | 103 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 86 insertions(+), 17 deletions(-) -- 2.19.1

1 3

[PATCH] po\pt_BR: Revision on inconsistencies and spelling errors.
by Roberto Pungartnik 03 Dec '18

03 Dec '18

1 0

[PATCH 1/2] ntdll: Add RtlAddGrowableFunctionTable stub
by Alex Henrie 02 Dec '18

02 Dec '18

From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42255 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Copied from https://bugs.winehq.org/attachment.cgi?id=59935 with minor changes. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f53f..1f3aeaa0bc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -434,6 +434,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index da0c8fb71e..72087a2c4c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7228adb3ab..3f886a785c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3506,6 +3506,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) semi-stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return RtlAddFunctionTable(functions, count, base); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ -- 2.19.2

1 1

[PATCH 1/2] winex11.drv: Make several constants static
by Alex Henrie 02 Dec '18

02 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 7a9a3a7b1c..61730ce6db 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -485,9 +485,9 @@ static void disable_system_cursors(void) */ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { - const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; - const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; - const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; + static const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; + static const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; + static const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; -- 2.19.2

1 1

[PATCH] wsdapi: Turn a constant and several variables into static constants
by Alex Henrie 02 Dec '18

02 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wsdapi/soap.c | 6 +++--- dlls/wsdapi/xml.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index e1233986cc..2ecc01313f 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -364,7 +364,7 @@ HRESULT register_namespaces(IWSDXMLContext *xml_context) static BOOL create_guid(LPWSTR buffer) { - const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; + static const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; WCHAR* uuidString = NULL; UUID uuid; @@ -401,7 +401,7 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac static LPWSTR ulonglong_to_string(void *parent, ULONGLONG value) { - WCHAR formatString[] = { '%','I','6','4','u', 0 }; + static const WCHAR formatString[] = { '%','I','6','4','u', 0 }; LPWSTR ret; ret = WSDAllocateLinkedMemory(parent, MAX_ULONGLONG_STRING_SIZE * sizeof(WCHAR)); @@ -560,7 +560,7 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAME_LIST *list, struct list *namespaces) { - WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; + static const WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; LPWSTR current_buf_pos = buffer; size_t memory_needed = 0; const WSD_NAME_LIST *cur = list; diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 98bdec6b0d..727d83af60 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -380,7 +380,7 @@ static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) static LPWSTR generate_namespace_prefix(IWSDXMLContextImpl *impl, void *parentMemoryBlock, LPCWSTR uri) { - WCHAR formatString[] = { 'u','n','%','d', 0 }; + static const WCHAR formatString[] = { 'u','n','%','d', 0 }; WCHAR suggestedPrefix[7]; /* Find a unique prefix */ -- 2.19.2

1 0

[PATCH] windowscodecs: Make constant 'valuename_format' static
by Alex Henrie 02 Dec '18

02 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/windowscodecs/regsvr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b011d71645..3f53591552 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1032,10 +1032,10 @@ static HRESULT register_pixelformats(struct regsvr_pixelformat const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->channelmasks) { + static const WCHAR valuename_format[] = {'%','d',0}; HKEY masks_key; UINT i, mask_size; WCHAR mask_valuename[11]; - const WCHAR valuename_format[] = {'%','d',0}; mask_size = (list->bitsperpixel + 7)/8; -- 2.19.2

1 0

[PATCH] shlwapi: Turn several constants and variables into static constants
by Alex Henrie 02 Dec '18

02 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shlwapi/url.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 8313b98fb2..fb3892013e 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -746,26 +746,24 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, * the last leaf starting from the '#'. Otherwise the '#' is not * meaningful and just start looking from the end. */ if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) { - const WCHAR htmlW[] = {'.','h','t','m','l',0}; - const int len_htmlW = 5; - const WCHAR htmW[] = {'.','h','t','m',0}; - const int len_htmW = 4; + static const WCHAR htmlW[] = {'.','h','t','m','l'}; + static const WCHAR htmW[] = {'.','h','t','m'}; if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; - else if (work - base.pszSuffix > len_htmW) { - work -= len_htmW; - if (strncmpiW(work, htmW, len_htmW) == 0) + else if (work - base.pszSuffix > ARRAY_SIZE(htmW)) { + work -= ARRAY_SIZE(htmW); + if (strncmpiW(work, htmW, ARRAY_SIZE(htmW)) == 0) manual_search = TRUE; - work += len_htmW; + work += ARRAY_SIZE(htmW); } if (!manual_search && - work - base.pszSuffix > len_htmlW) { - work -= len_htmlW; - if (strncmpiW(work, htmlW, len_htmlW) == 0) + work - base.pszSuffix > ARRAY_SIZE(htmlW)) { + work -= ARRAY_SIZE(htmlW); + if (strncmpiW(work, htmlW, ARRAY_SIZE(htmlW)) == 0) manual_search = TRUE; - work += len_htmlW; + work += ARRAY_SIZE(htmlW); } } @@ -1734,11 +1732,11 @@ static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) static HRESULT URL_CreateFromPath(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUrl) { + static const WCHAR file_colonW[] = {'f','i','l','e',':',0}; + static const WCHAR three_slashesW[] = {'/','/','/',0}; DWORD needed; HRESULT ret = S_OK; WCHAR *pszNewUrl; - WCHAR file_colonW[] = {'f','i','l','e',':',0}; - WCHAR three_slashesW[] = {'/','/','/',0}; PARSEDURLW parsed_url; parsed_url.cbSize = sizeof(parsed_url); -- 2.19.2

1 0

[PATCH v2] amstream: Simulate IDirectDrawStreamSampleImpl_Update return values.
by Anastasios Simeonidis 02 Dec '18

02 Dec '18

Simulate a successful stream playback so that apps don't get stuck when trying to play a media file using the DirectShow api. Signed-off-by: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> --- dlls/amstream/mediastream.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index bc61597502..633ba91591 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1196,6 +1196,8 @@ typedef struct { IMediaStream *parent; IDirectDrawSurface *surface; RECT rect; + // FIXME: Implement IDirectDrawStreamSampleImpl_Update. + int workaround; } IDirectDrawStreamSampleImpl; static inline IDirectDrawStreamSampleImpl *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) @@ -1279,9 +1281,15 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStre static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, PAPCFUNC func_APC, DWORD APC_data) { + IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); + FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); - return S_OK; + // Simulate successful playback. + int count = (This->workaround + 1) % 300; + This->workaround = count; + + return (count == 299) ? MS_S_ENDOFSTREAM : S_OK; } static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) @@ -1404,8 +1412,9 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD SetRect(&object->rect, 0, 0, desc.dwWidth, desc.dwHeight); } - *ddraw_stream_sample = &object->IDirectDrawStreamSample_iface; + object->workaround = 0; + *ddraw_stream_sample = &object->IDirectDrawStreamSample_iface; return S_OK; } -- 2.19.2

2 1

Wine fails to load executables that reference dxil.dll
by Graham Wihlidal 02 Dec '18

02 Dec '18

Hello! I have been doing a lot of recent work in getting Windows graphics utilities (especially shader compilers) running on Linux, and some of these tools require Wine to operate correctly. The new DirectX shader compiler now compiles on Linux, but the signing must occur using a signed validator (dxil.dll that ships with Windows 10). I wrote a little utility that loads dxil.dll and can do dxil signing post-compilation, and the hope was to run this in Wine, but I get some errors when trying to do so. I blogged about the adventure here: https://www.wihlidal.com/blog/pipeline/ ... t-compile/<https://www.wihlidal.com/blog/pipeline/2018-09-16-dxil-signing-post-compile/> I'm hoping someone can shed some light on what the issue here is, preferably with a fix or some instructions on how to debug this on my end. My utility that reproduces the Wine error is open source in case someone wants to give it a whirl (prebuilt Windows binaries in the releases area): https://github.com/gwihlidal/dxil-signing Thank you, Graham

3 6

[PATCH] amstream: Return MS_S_ENDOFSTREAM in IDirectDrawStreamSampleImpl_Update.
by Andrey Gusev 01 Dec '18

01 Dec '18

Demo version of Runaway required this. Most likely replace with MS_S_ENDOFSTREAM will break the things.

1 0

[PATCH 1/6] wined3d: Introduce WINED3DUSAGE_MANAGED.
by Matteo Bruni 01 Dec '18

01 Dec '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d8/buffer.c | 4 ++++ dlls/d3d8/device.c | 2 ++ dlls/d3d8/texture.c | 6 ++++++ dlls/d3d9/buffer.c | 4 ++++ dlls/d3d9/device.c | 2 ++ dlls/d3d9/texture.c | 6 ++++++ dlls/ddraw/surface.c | 1 + dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/resource.c | 9 ++++++++- dlls/wined3d/texture.c | 12 +++++------- dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 5 ----- include/wine/wined3d.h | 1 + 14 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 9534c33932d..2f0d1679c22 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -288,6 +288,8 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -577,6 +579,8 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b05df7e2914..b60e00cce1f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1165,6 +1165,8 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c952579ce61..d9e68f87035 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1110,6 +1110,8 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -1159,6 +1161,8 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -1207,6 +1211,8 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index ea98ef4242f..0c4a1262ff1 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -289,6 +289,8 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -576,6 +578,8 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1e7c0ea0f45..d641b94221e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1392,6 +1392,8 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage); desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 70d35fc50c1..a4db0e9dec8 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1314,6 +1314,8 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -1401,6 +1403,8 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -1473,6 +1477,8 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6bb92d5d399..dfa740833b7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6191,6 +6191,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; /* Managed textures have the system memory flag set. */ desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + wined3d_desc.usage |= WINED3DUSAGE_MANAGED; } else if (desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 020116da7f6..ff81044fcff 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1393,7 +1393,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(desc->access)) + || desc->usage & WINED3DUSAGE_MANAGED) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1af76f235c8..14e2260c023 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4744,7 +4744,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); - if (wined3d_resource_access_is_managed(resource->access) && !resource->map_count) + if (resource->usage & WINED3DUSAGE_MANAGED && !resource->map_count) { TRACE("Evicting %p.\n", resource); wined3d_cs_emit_unload_resource(device->cs, resource); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 58caccc7305..299202e6d31 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -36,6 +36,7 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_SCRATCH + | WINED3DUSAGE_MANAGED | WINED3DUSAGE_PRIVATE | WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE @@ -92,6 +93,12 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * wined3d_debug_resource_access(access)); return WINED3DERR_INVALIDCALL; } + if (usage & WINED3DUSAGE_MANAGED && ~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)) + { + ERR("Trying to create a managed resource with access flags %s.\n", + wined3d_debug_resource_access(access)); + return WINED3DERR_INVALIDCALL; + } if (!size) ERR("Attempting to create a zero-sized resource.\n"); @@ -258,7 +265,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO { DWORD prev; - if (!wined3d_resource_access_is_managed(resource->access)) + if (~resource->usage & WINED3DUSAGE_MANAGED) { WARN("Called on non-managed resource %p, ignoring.\n", resource); return 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e01becd44f8..9c19e4e9fb6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1410,10 +1410,9 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) /* The d3d9:texture test shows that SetLOD is ignored on non-managed * textures. The call always returns 0, and GetLOD always returns 0. */ resource = &texture->resource; - if (!wined3d_resource_access_is_managed(resource->access)) + if (~resource->usage & WINED3DUSAGE_MANAGED) { - TRACE("Ignoring LOD on texture with resource access %s.\n", - wined3d_debug_resource_access(resource->access)); + TRACE("Ignoring LOD on texture with resource usage %s.\n", debug_d3dusage(resource->usage)); return 0; } @@ -2898,11 +2897,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } format = wined3d_get_format(device->adapter, desc->format, desc->bind_flags); - if (desc->usage & WINED3DUSAGE_DYNAMIC && (wined3d_resource_access_is_managed(desc->access) - || desc->usage & WINED3DUSAGE_SCRATCH)) + if (desc->usage & WINED3DUSAGE_DYNAMIC + && desc->usage & (WINED3DUSAGE_MANAGED | WINED3DUSAGE_SCRATCH)) { - WARN("Attempted to create a dynamic texture with access %s and usage %s.\n", - wined3d_debug_resource_access(desc->access), debug_d3dusage(desc->usage)); + WARN("Attempted to create a dynamic texture with usage %s.\n", debug_d3dusage(desc->usage)); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a7b1b10f9ac..5edea43c510 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4524,6 +4524,8 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTAPI); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_MANAGED); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_PRIVATE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_LEGACY_CUBEMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b7ddfce10d..d53f0ccc192 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3083,11 +3083,6 @@ const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; -static inline BOOL wined3d_resource_access_is_managed(unsigned int access) -{ - return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); -} - struct wined3d_resource_ops { ULONG (*resource_incref)(struct wined3d_resource *resource); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fd907578c2d..4fd80dca27d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -930,6 +930,7 @@ enum wined3d_shader_type #define WINED3DUSAGE_MASK 0x10007bfa #define WINED3DUSAGE_SCRATCH 0x00200000 +#define WINED3DUSAGE_MANAGED 0x00000004 #define WINED3DUSAGE_PRIVATE 0x00400000 #define WINED3DUSAGE_LEGACY_CUBEMAP 0x00800000 #define WINED3DUSAGE_TEXTURE 0x01000000 -- 2.18.1

2 6

[PATCH v7 1/3] mpr: Implement remembered connection enumeration.
by Pierre Schweitzer 01 Dec '18

01 Dec '18

Fixing a little bug in previous iteration. -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH v6 1/3] mpr: Implement remembered connection enumeration.
by Pierre Schweitzer 01 Dec '18

01 Dec '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH 1/2] ntdll: Call the select request directly in RtlWaitOnAddress().
by Zebediah Figura 01 Dec '18

01 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is not particularly pretty, but the structure of server_select() doesn't easily lend itself to helper methods. I'm open to suggestions. dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/server.c | 4 +-- dlls/ntdll/sync.c | 86 +++++++++++++++++++++++++++++++++++++------------ 3 files changed, 70 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index fdb443b45c..1630978f0a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -104,6 +104,8 @@ extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; +extern int wait_select_reply( void *cookie ) DECLSPEC_HIDDEN; +extern BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ec034455aa..38356f4674 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -349,7 +349,7 @@ void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sig * * Wait for a reply on the waiting pipe of the current thread. */ -static int wait_select_reply( void *cookie ) +int wait_select_reply( void *cookie ) { int signaled; struct wake_up_reply reply; @@ -386,7 +386,7 @@ static int wait_select_reply( void *cookie ) * * Invoke a single APC. Return TRUE if a user APC has been run. */ -static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) +BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) { BOOL user_apc = FALSE; SIZE_T size; diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0c373a4c88..e1a48d7044 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1961,35 +1961,81 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, return status; } -/*********************************************************************** - * RtlWaitOnAddress (NTDLL.@) - */ -NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, - const LARGE_INTEGER *timeout ) +static BOOL compare_addr( const void *addr, const void *cmp, SIZE_T size ) { switch (size) { case 1: - if (*(const UCHAR *)addr != *(const UCHAR *)cmp) - return STATUS_SUCCESS; - break; + return (*(const UCHAR *)addr == *(const UCHAR *)cmp); case 2: - if (*(const USHORT *)addr != *(const USHORT *)cmp) - return STATUS_SUCCESS; - break; + return (*(const USHORT *)addr == *(const USHORT *)cmp); case 4: - if (*(const ULONG *)addr != *(const ULONG *)cmp) - return STATUS_SUCCESS; - break; + return (*(const ULONG *)addr == *(const ULONG *)cmp); case 8: - if (*(const ULONG64 *)addr != *(const ULONG64 *)cmp) - return STATUS_SUCCESS; - break; - default: - return STATUS_INVALID_PARAMETER; + return (*(const ULONG64 *)addr == *(const ULONG64 *)cmp); } - return NtWaitForKeyedEvent( 0, addr, 0, timeout ); + return FALSE; +} + +/*********************************************************************** + * RtlWaitOnAddress (NTDLL.@) + */ +NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, + const LARGE_INTEGER *timeout ) +{ + select_op_t select_op; + NTSTATUS ret; + int cookie; + BOOL user_apc = FALSE; + obj_handle_t apc_handle = 0; + apc_call_t call; + apc_result_t result; + timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + + if (size != 1 && size != 2 && size != 4 && size != 8) + return STATUS_INVALID_PARAMETER; + + select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; + select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); + select_op.keyed_event.key = wine_server_client_ptr( addr ); + + memset( &result, 0, sizeof(result) ); + + for (;;) + { + if (!compare_addr( addr, cmp, size )) + return STATUS_SUCCESS; + + SERVER_START_REQ( select ) + { + req->flags = SELECT_INTERRUPTIBLE; + req->cookie = wine_server_client_ptr( &cookie ); + req->prev_apc = apc_handle; + req->timeout = abs_timeout; + wine_server_add_data( req, &result, sizeof(result) ); + wine_server_add_data( req, &select_op, sizeof(select_op.keyed_event) ); + ret = wine_server_call( req ); + abs_timeout = reply->timeout; + apc_handle = reply->apc_handle; + call = reply->call; + } + SERVER_END_REQ; + if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); + if (ret != STATUS_USER_APC) break; + if (invoke_apc( &call, &result )) + { + /* if we ran a user apc we have to check once more if additional apcs are queued, + * but we don't want to wait */ + abs_timeout = 0; + user_apc = TRUE; + size = 0; + } + } + + if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; + + return ret; } /*********************************************************************** -- 2.14.1

1 1

[PATCH 1/4] setupapi: Implement SetupDiRemoveDeviceInterface().
by Zebediah Figura 30 Nov '18

30 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 28 ++++++++++++++++++++++++---- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 55fca897c3..479b8297b0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -556,6 +556,19 @@ static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, return FALSE; } +static void remove_device_iface(struct device_iface *iface) +{ + RegDeleteTreeW(iface->refstr_key, NULL); + RegDeleteKeyW(iface->refstr_key, emptyW); + RegCloseKey(iface->refstr_key); + iface->refstr_key = NULL; + /* Also remove the class key if it's empty. */ + RegDeleteKeyW(iface->class_key, emptyW); + RegCloseKey(iface->class_key); + iface->class_key = NULL; + iface->flags |= SPINT_REMOVED; +} + static void SETUPDI_RemoveDevice(struct device *device) { struct device_iface *iface, *next; @@ -1537,11 +1550,18 @@ BOOL WINAPI SetupDiRemoveDevice( /*********************************************************************** * SetupDiRemoveDeviceInterface (SETUPAPI.@) */ -BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO info, PSP_DEVICE_INTERFACE_DATA data) +BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) { - FIXME("(%p, %p): stub\n", info, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + remove_device_iface(iface); + + return TRUE; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 338393e5f2..fbc62dcbb9 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -552,7 +552,6 @@ static void check_device_iface_(int line, HDEVINFO set, SP_DEVINFO_DATA *device, ok_(__FILE__, line)(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); ok_(__FILE__, line)(IsEqualGUID(&iface.InterfaceClassGuid, class), "Got unexpected class %s.\n", wine_dbgstr_guid(&iface.InterfaceClassGuid)); -todo_wine_if(flags & SPINT_REMOVED) ok_(__FILE__, line)(iface.Flags == flags, "Got unexpected flags %#x.\n", iface.Flags); ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, detail, sizeof(buffer), NULL, NULL); ok_(__FILE__, line)(ret, "Failed to get interface detail, error %#x.\n", GetLastError()); @@ -656,7 +655,6 @@ static void test_device_iface(void) ret = SetupDiEnumDeviceInterfaces(set, &device, &guid2, 0, &iface); ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); ret = SetupDiRemoveDeviceInterface(set, &iface); -todo_wine ok(ret, "Failed to remove interface, error %#x.\n", GetLastError()); check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}"); -- 2.14.1

1 3

[PATCH 4/4] jscript: Add interpreter support for getters and setters in object initializer.
by Jacek Caban 30 Nov '18

30 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 9 ++---- dlls/jscript/engine.c | 24 +++++++++++++- dlls/jscript/engine.h | 2 +- dlls/mshtml/tests/es5.js | 69 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 95 insertions(+), 9 deletions(-)

1 0

[PATCH 3/4] jscript: Add parser support for getters and setters in object initializer.
by Jacek Caban 30 Nov '18

30 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.h | 6 ++++++ dlls/jscript/lex.c | 17 ++++++++++++++--- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 29 +++++++++++++++++++++-------- dlls/jscript/tests/lang.js | 2 ++ 5 files changed, 44 insertions(+), 11 deletions(-)

1 0

[PATCH 2/4] jscript: Use separated parser rule for property definition.
by Jacek Caban 30 Nov '18

30 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/parser.y | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)

1 0

[PATCH 1/4] jscript: Rename prop_val_t to property_definition_t.
by Jacek Caban 30 Nov '18

30 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 4 ++-- dlls/jscript/parser.h | 8 ++++---- dlls/jscript/parser.y | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-)

1 0

[PATCH] amstream: Return MS_S_ENDOFSTREAM in IDirectDrawStreamSampleImpl_Update.
by Anastasios Simeonidis 30 Nov '18

30 Nov '18

Applications test the return value of the 'Update' function to check if a media stream is still playing. Returning S_OK results in a deadlock on these applications. Return MS_S_ENDOFSTREAM to signal the application that no video is playing. Signed-off-by: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> --- dlls/amstream/mediastream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index bc61597502..5b9e8e4898 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1281,7 +1281,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample { FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); - return S_OK; + return MS_S_ENDOFSTREAM; } static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) -- 2.19.2

2 1

[PATCH] jscript: Support undefined separator in String.split implementation.
by Jacek Caban 30 Nov '18

30 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/string.c | 25 ++++++++++++++++---- dlls/jscript/tests/api.js | 22 ++++++++++++++++++ dlls/mshtml/tests/es5.js | 48 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 89 insertions(+), 6 deletions(-)

2 1

[PATCH 1/2] d3d8/tests: Use correct index variable in test_resource_access() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 49d2a9818cc4..a812f032a3d9 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9081,17 +9081,19 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + todo_wine_if(tests[i].pool == D3DPOOL_SCRATCH && tests[i].format == FORMAT_ATI2) + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].format != FORMAT_ATI2 + ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; -- 2.18.1

3 2

[PATCH 6/6] wined3d: Use wined3d_cs_finish() in swapchain_cleanup().
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6ed4f89b03f8..344a1867a8cf 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -66,7 +66,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) } wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); - swapchain->device->cs->ops->finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); /* Restore the screen resolution if we rendered in fullscreen. * This will restore the screen resolution to what it was before creating -- 2.18.1

3 2

[PATCH 5/6] wined3d: Introduce wined3d_cs_require_space() helper.
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 106 ++++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0c169559278f..5ea25e992aa5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -444,6 +444,12 @@ struct wined3d_cs_stop enum wined3d_cs_op opcode; }; +static inline void *wined3d_cs_require_space(struct wined3d_cs *cs, + size_t size, enum wined3d_cs_queue_id queue_id) +{ + return cs->ops->require_space(cs, size, queue_id); +} + static inline void wined3d_cs_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { cs->ops->submit(cs, queue_id); @@ -541,7 +547,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw unsigned int i; LONG pending; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_PRESENT; op->dst_window_override = dst_window_override; op->swapchain = swapchain; @@ -602,7 +608,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * RECT view_rect; unsigned int i; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; @@ -650,7 +656,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined size_t size; size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); - op = cs->ops->require_space(cs, size, WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, size, WINED3D_CS_QUEUE_DEFAULT); op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; @@ -815,7 +821,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_dispatch *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; op->parameters.indirect = FALSE; op->parameters.u.direct.group_count_x = group_count_x; @@ -833,7 +839,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_dispatch *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; op->parameters.indirect = TRUE; op->parameters.u.indirect.buffer = buffer; @@ -975,7 +981,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; op->primitive_type = primitive_type; op->patch_vertex_count = patch_vertex_count; @@ -999,7 +1005,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; op->primitive_type = primitive_type; op->patch_vertex_count = patch_vertex_count; @@ -1028,7 +1034,7 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) { struct wined3d_cs_flush *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_FLUSH; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1047,7 +1053,7 @@ void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query { struct wined3d_cs_set_predication *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_PREDICATION; op->predicate = predicate; op->value = value; @@ -1072,7 +1078,7 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_ { struct wined3d_cs_set_viewports *op; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VIEWPORTS; memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); @@ -1097,7 +1103,7 @@ void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_ { struct wined3d_cs_set_scissor_rects *op; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; memcpy(op->rects, rects, rect_count * sizeof(*rects)); @@ -1127,7 +1133,7 @@ void wined3d_cs_emit_set_rendertarget_view(struct wined3d_cs *cs, unsigned int v { struct wined3d_cs_set_rendertarget_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_RENDERTARGET_VIEW; op->view_idx = view_idx; op->view = view; @@ -1173,7 +1179,7 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3 { struct wined3d_cs_set_depth_stencil_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW; op->view = view; @@ -1192,7 +1198,7 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3 { struct wined3d_cs_set_vertex_declaration *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VERTEX_DECLARATION; op->declaration = declaration; @@ -1224,7 +1230,7 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, { struct wined3d_cs_set_stream_source *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE; op->stream_idx = stream_idx; op->buffer = buffer; @@ -1250,7 +1256,7 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i { struct wined3d_cs_set_stream_source_freq *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ; op->stream_idx = stream_idx; op->frequency = frequency; @@ -1283,7 +1289,7 @@ void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, { struct wined3d_cs_set_stream_output *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUT; op->stream_idx = stream_idx; op->buffer = buffer; @@ -1315,7 +1321,7 @@ void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buff { struct wined3d_cs_set_index_buffer *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_INDEX_BUFFER; op->buffer = buffer; op->format_id = format_id; @@ -1345,7 +1351,7 @@ void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_sha { struct wined3d_cs_set_constant_buffer *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; op->type = type; op->cb_idx = cb_idx; @@ -1437,7 +1443,7 @@ void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined { struct wined3d_cs_set_texture *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_TEXTURE; op->stage = stage; op->texture = texture; @@ -1469,7 +1475,7 @@ void wined3d_cs_emit_set_shader_resource_view(struct wined3d_cs *cs, enum wined3 { struct wined3d_cs_set_shader_resource_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW; op->type = type; op->view_idx = view_idx; @@ -1502,7 +1508,7 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined { struct wined3d_cs_set_unordered_access_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW; op->pipeline = pipeline; op->view_idx = view_idx; @@ -1528,7 +1534,7 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type { struct wined3d_cs_set_sampler *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SAMPLER; op->type = type; op->sampler_idx = sampler_idx; @@ -1553,7 +1559,7 @@ void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type { struct wined3d_cs_set_shader *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SHADER; op->type = type; op->shader = shader; @@ -1580,7 +1586,7 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend { struct wined3d_cs_set_blend_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_BLEND_STATE; op->state = state; op->factor = *blend_factor; @@ -1601,7 +1607,7 @@ void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs, { struct wined3d_cs_set_rasterizer_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_RASTERIZER_STATE; op->state = rasterizer_state; @@ -1620,7 +1626,7 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render { struct wined3d_cs_set_render_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_RENDER_STATE; op->state = state; op->value = value; @@ -1641,7 +1647,7 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, { struct wined3d_cs_set_texture_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_TEXTURE_STATE; op->stage = stage; op->state = state; @@ -1663,7 +1669,7 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, { struct wined3d_cs_set_sampler_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SAMPLER_STATE; op->sampler_idx = sampler_idx; op->state = state; @@ -1686,7 +1692,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform { struct wined3d_cs_set_transform *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_TRANSFORM; op->state = state; op->matrix = *matrix; @@ -1706,7 +1712,7 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const { struct wined3d_cs_set_clip_plane *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_CLIP_PLANE; op->plane_idx = plane_idx; op->plane = *plane; @@ -1782,7 +1788,7 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture { struct wined3d_cs_set_color_key *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_COLOR_KEY; op->texture = texture; op->flags = flags; @@ -1809,7 +1815,7 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma { struct wined3d_cs_set_material *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_MATERIAL; op->material = *material; @@ -1857,7 +1863,7 @@ void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light { struct wined3d_cs_set_light *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT; op->light = *light; @@ -1890,7 +1896,7 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B { struct wined3d_cs_set_light_enable *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT_ENABLE; op->idx = idx; op->enable = enable; @@ -1955,7 +1961,7 @@ static void wined3d_cs_mt_push_constants(struct wined3d_cs *cs, enum wined3d_pus size_t size; size = count * wined3d_cs_push_constant_info[p].size; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_push_constants, constants[size]), + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_push_constants, constants[size]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_PUSH_CONSTANTS; op->type = p; @@ -1979,7 +1985,7 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) { struct wined3d_cs_reset_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_RESET_STATE; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1996,7 +2002,7 @@ static void wined3d_cs_emit_callback(struct wined3d_cs *cs, void (*callback)(voi { struct wined3d_cs_callback *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CALLBACK; op->callback = callback; op->object = object; @@ -2060,7 +2066,7 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu { struct wined3d_cs_query_issue *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_QUERY_ISSUE; op->query = query; op->flags = flags; @@ -2082,7 +2088,7 @@ void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_reso { struct wined3d_cs_preload_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_PRELOAD_RESOURCE; op->resource = resource; @@ -2104,7 +2110,7 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou { struct wined3d_cs_unload_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; op->resource = resource; @@ -2132,7 +2138,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, * increasing the map count would be visible to applications. */ wined3d_not_from_cs(cs); - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2162,7 +2168,7 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc wined3d_not_from_cs(cs); - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UNMAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2281,7 +2287,7 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso { struct wined3d_cs_blt_sub_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_BLT_SUB_RESOURCE; op->dst_resource = dst_resource; op->dst_sub_resource_idx = dst_sub_resource_idx; @@ -2370,7 +2376,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r { struct wined3d_cs_update_sub_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2413,7 +2419,7 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, { struct wined3d_cs_add_dirty_texture_region *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION; op->texture = texture; op->layer = layer; @@ -2441,7 +2447,7 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, { struct wined3d_cs_clear_unordered_access_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW; op->view = view; op->clear_value = *clear_value; @@ -2469,7 +2475,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff { struct wined3d_cs_copy_uav_counter *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_COPY_UAV_COUNTER; op->buffer = dst_buffer; op->offset = offset; @@ -2493,7 +2499,7 @@ void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shad { struct wined3d_cs_generate_mipmaps *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_GENERATE_MIPMAPS; op->view = view; @@ -2506,7 +2512,7 @@ static void wined3d_cs_emit_stop(struct wined3d_cs *cs) { struct wined3d_cs_stop *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_STOP; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); -- 2.18.1

3 2

[PATCH 1/6] dxgi: Implement dxgi_output_GetGammaControlCapabilities().
by Józef Kucia 30 Nov '18

30 Nov '18

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43584 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/output.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 868a36845863..4a508b3d6b02 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -297,9 +297,22 @@ static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, DXGI_GAMMA_CONTROL_CAPABILITIES *gamma_caps) { - FIXME("iface %p, gamma_caps %p stub!\n", iface, gamma_caps); + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, gamma_caps %p.\n", iface, gamma_caps); + + if (!gamma_caps) + return E_INVALIDARG; + + gamma_caps->ScaleAndOffsetSupported = FALSE; + gamma_caps->MaxConvertedValue = 1.0f; + gamma_caps->MinConvertedValue = 0.0f; + gamma_caps->NumGammaControlPoints = 256; + + for (i = 0; i < gamma_caps->NumGammaControlPoints; ++i) + gamma_caps->ControlPointPositions[i] = i / 255.0f; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface, -- 2.18.1

3 2

[PATCH 4/6] wined3d: Introduce wined3d_cs_submit() helper.
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Mainly for consistency. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 105 ++++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5090220f8ceb..0c169559278f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -444,6 +444,11 @@ struct wined3d_cs_stop enum wined3d_cs_op opcode; }; +static inline void wined3d_cs_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) +{ + cs->ops->submit(cs, queue_id); +} + static const char *debug_cs_op(enum wined3d_cs_op op) { switch (op) @@ -553,7 +558,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw wined3d_resource_acquire(&swapchain->back_buffers[i]->resource); } - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); /* Limit input latency by limiting the number of presents that we can get * ahead of the worker thread. */ @@ -635,7 +640,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * wined3d_resource_acquire(view->resource); } - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, @@ -671,7 +676,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined wined3d_resource_acquire(view->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3DCLEAR_SYNCHRONOUS) wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -819,7 +824,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, acquire_compute_pipeline_resources(state); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, @@ -837,7 +842,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, acquire_compute_pipeline_resources(state); wined3d_resource_acquire(&buffer->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) @@ -984,7 +989,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned acquire_graphics_pipeline_resources(state, indexed, d3d_info); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, @@ -1006,7 +1011,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) @@ -1026,7 +1031,7 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_FLUSH; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = TRUE; } @@ -1047,7 +1052,7 @@ void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query op->predicate = predicate; op->value = value; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *data) @@ -1073,7 +1078,7 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_ memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); op->viewport_count = viewport_count; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void *data) @@ -1098,7 +1103,7 @@ void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_ memcpy(op->rects, rects, rect_count * sizeof(*rects)); op->rect_count = rect_count; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const void *data) @@ -1127,7 +1132,7 @@ void wined3d_cs_emit_set_rendertarget_view(struct wined3d_cs *cs, unsigned int v op->view_idx = view_idx; op->view = view; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const void *data) @@ -1172,7 +1177,7 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3 op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW; op->view = view; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const void *data) @@ -1191,7 +1196,7 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3 op->opcode = WINED3D_CS_OP_SET_VERTEX_DECLARATION; op->declaration = declaration; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void *data) @@ -1226,7 +1231,7 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, op->offset = offset; op->stride = stride; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_source_freq(struct wined3d_cs *cs, const void *data) @@ -1251,7 +1256,7 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i op->frequency = frequency; op->flags = flags; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void *data) @@ -1284,7 +1289,7 @@ void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, op->buffer = buffer; op->offset = offset; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void *data) @@ -1316,7 +1321,7 @@ void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buff op->format_id = format_id; op->offset = offset; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) @@ -1346,7 +1351,7 @@ void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_sha op->cb_idx = cb_idx; op->buffer = buffer; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) @@ -1437,7 +1442,7 @@ void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined op->stage = stage; op->texture = texture; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, const void *data) @@ -1470,7 +1475,7 @@ void wined3d_cs_emit_set_shader_resource_view(struct wined3d_cs *cs, enum wined3 op->view_idx = view_idx; op->view = view; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, const void *data) @@ -1504,7 +1509,7 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined op->view = view; op->initial_count = initial_count; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_sampler(struct wined3d_cs *cs, const void *data) @@ -1529,7 +1534,7 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type op->sampler_idx = sampler_idx; op->sampler = sampler; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) @@ -1553,7 +1558,7 @@ void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type op->type = type; op->shader = shader; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_blend_state(struct wined3d_cs *cs, const void *data) @@ -1580,7 +1585,7 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend op->state = state; op->factor = *blend_factor; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const void *data) @@ -1600,7 +1605,7 @@ void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs, op->opcode = WINED3D_CS_OP_SET_RASTERIZER_STATE; op->state = rasterizer_state; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_render_state(struct wined3d_cs *cs, const void *data) @@ -1620,7 +1625,7 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render op->state = state; op->value = value; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void *data) @@ -1642,7 +1647,7 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, op->state = state; op->value = value; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void *data) @@ -1664,7 +1669,7 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, op->state = state; op->value = value; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data) @@ -1686,7 +1691,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform op->state = state; op->matrix = *matrix; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *data) @@ -1706,7 +1711,7 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const op->plane_idx = plane_idx; op->plane = *plane; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *data) @@ -1789,7 +1794,7 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture else op->set = 0; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data) @@ -1808,7 +1813,7 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma op->opcode = WINED3D_CS_OP_SET_MATERIAL; op->material = *material; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) @@ -1856,7 +1861,7 @@ void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light op->opcode = WINED3D_CS_OP_SET_LIGHT; op->light = *light; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void *data) @@ -1890,7 +1895,7 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B op->idx = idx; op->enable = enable; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static const struct @@ -1958,7 +1963,7 @@ static void wined3d_cs_mt_push_constants(struct wined3d_cs *cs, enum wined3d_pus op->count = count; memcpy(op->constants, constants, size); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) @@ -1977,7 +1982,7 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_RESET_STATE; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_callback(struct wined3d_cs *cs, const void *data) @@ -1996,7 +2001,7 @@ static void wined3d_cs_emit_callback(struct wined3d_cs *cs, void (*callback)(voi op->callback = callback; op->object = object; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) @@ -2060,7 +2065,7 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu op->query = query; op->flags = flags; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = FALSE; } @@ -2083,7 +2088,7 @@ void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_reso wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_unload_resource(struct wined3d_cs *cs, const void *data) @@ -2105,7 +2110,7 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) @@ -2136,7 +2141,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, op->flags = flags; op->hr = &hr; - cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2163,7 +2168,7 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc op->sub_resource_idx = sub_resource_idx; op->hr = &hr; - cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2295,7 +2300,7 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso if (src_resource) wined3d_resource_acquire(src_resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3D_BLT_SYNCHRONOUS) wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -2376,7 +2381,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. * Copying the data may be faster if it's small. */ wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); @@ -2415,7 +2420,7 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, wined3d_resource_acquire(&texture->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_clear_unordered_access_view(struct wined3d_cs *cs, const void *data) @@ -2443,7 +2448,7 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, wined3d_resource_acquire(view->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *data) @@ -2472,7 +2477,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff wined3d_resource_acquire(&dst_buffer->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_generate_mipmaps(struct wined3d_cs *cs, const void *data) @@ -2494,7 +2499,7 @@ void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shad wined3d_resource_acquire(view->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_emit_stop(struct wined3d_cs *cs) @@ -2504,7 +2509,7 @@ static void wined3d_cs_emit_stop(struct wined3d_cs *cs) op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_STOP; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } -- 2.18.1

3 2

[PATCH 2/6] dxgi: Return S_OK from dxgi_output_SetGammaControl() stub.
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43584 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/output.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4a508b3d6b02..bf0a4159376a 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -320,10 +320,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); - return E_NOTIMPL; + return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, DXGI_GAMMA_CONTROL *gamma_control) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, + DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); -- 2.18.1

3 2

[PATCH 3/6] dxgi/tests: Add basic test for gamma control.
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Based on a patch by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 113 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 1aaed468cf38..02cf744be358 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4835,6 +4835,118 @@ static void test_swapchain_window_styles(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_gamma_control(void) +{ + DXGI_GAMMA_CONTROL_CAPABILITIES caps; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + DXGI_GAMMA_CONTROL gamma; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + IDXGIOutput *output; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter doesn't have any outputs.\n"); + IDXGIAdapter_Release(adapter); + IDXGIDevice_Release(device); + return; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_Release(output); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to enter fullscreen, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + goto done; + } + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&caps, 0, sizeof(caps)); + hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(caps.MaxConvertedValue > caps.MinConvertedValue + || broken(caps.MaxConvertedValue == 0.0f && caps.MinConvertedValue == 1.0f) /* WARP */, + "Expected max gamma value (%.8e) to be bigger than min value (%.8e).\n", + caps.MaxConvertedValue, caps.MinConvertedValue); + + for (i = 1; i < caps.NumGammaControlPoints; ++i) + { + ok(caps.ControlPointPositions[i] > caps.ControlPointPositions[i - 1], + "Expected control point positions to be strictly monotonically increasing (%.8e > %.8e).\n", + caps.ControlPointPositions[i], caps.ControlPointPositions[i - 1]); + } + + memset(&gamma, 0, sizeof(gamma)); + hr = IDXGIOutput_GetGammaControl(output, &gamma); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_SetGammaControl(output, &gamma); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + IDXGIOutput_Release(output); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + +done: + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -4929,6 +5041,7 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_resize_target(); test_inexact_modes(); + test_gamma_control(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); -- 2.18.1

3 2

[PATCH 2/2] d3d8: Remove dead code from indexbuffer_init() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/buffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 558583d752d2..626d74e964c1 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -586,8 +586,6 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; -- 2.18.1

3 2

[PATCH 1/2] d3d9: Remove dead code from indexbuffer_init() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/buffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 219ee43df0f5..02b3570402f3 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -597,8 +597,6 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; -- 2.18.1

3 2

[PATCH] mshtml: Load xul with LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR.
by Jactry Zeng 30 Nov '18

30 Nov '18

Superseded patch 155118. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9acb0d29e8..5f6c046fd6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -496,7 +496,7 @@ static BOOL load_xul(const PRUnichar *gre_path) set_environment(gre_path); - xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + xul_handle = LoadLibraryExW(file_name, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); if(!xul_handle) { WARN("Could not load XUL: %d\n", GetLastError()); return FALSE; -- 2.19.2

2 1

[PATCH] testbot/web: Simplify FormPage::GetDisplayValue().
by Francois Gouget 30 Nov '18

30 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 01f7894891..735755f3cf 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -189,12 +189,8 @@ sub GetDisplayValue($$) { my ($self, $PropertyDescriptor) = @_; - my $Value; - if (defined($self->GetParam($PropertyDescriptor->GetName()))) - { - $Value = $self->GetParam($PropertyDescriptor->GetName()); - } - else + my $Value = $self->GetParam($PropertyDescriptor->GetName()); + if (!defined $Value) { $Value = $self->GetPropertyValue($PropertyDescriptor); } -- 2.19.1

1 0

[PATCH] testbot/web: Remove unnecessary LastPage checks in Submit.
by Francois Gouget 30 Nov '18

30 Nov '18

Only Submit.pl can decide when to call Validate() because only it knows whether this is appropriate for the current action. And this always happens as a check before moving on to the next page which means $self->{Page} is equal to $self->{LastPage}. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 8a30110193..c73ff425c4 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -461,7 +461,7 @@ sub Validate($) { my ($self) = @_; - if ($self->{Page} == 2 && $self->{LastPage} == 2) + if ($self->{Page} == 2) { my $VMSelected = !1; my $VMs = CreateVMs(); @@ -481,7 +481,7 @@ sub Validate($) return !1; } } - elsif ($self->{Page} == 3 && $self->{LastPage} == 3) + elsif ($self->{Page} == 3) { if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || -- 2.19.1

1 0

[PATCH 2/2] d3d9/tests: Use correct index variable in test_resource_access() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 9 +++++---- dlls/d3d9/tests/device.c | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 82acaf4d6a8e..eb6856f0ff76 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4449,18 +4449,19 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED - ? D3D_OK : D3DERR_INVALIDCALL), + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) + && (tests[i].format != FORMAT_ATI2 || tests[i].pool == D3DPOOL_SCRATCH) + && tests[i].pool != D3DPOOL_MANAGED ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6edf2b35b30d..79e2ca5a651c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12915,17 +12915,19 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) + && (tests[i].format != FORMAT_ATI2 || tests[i].pool == D3DPOOL_SCRATCH) + ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; -- 2.18.1

2 1

[PATCH 1/5] shcore: Add registry access helpers.
by Nikolay Sivov 30 Nov '18

30 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 442 +++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 42 ++-- dlls/shcore/tests/shcore.c | 333 ++++++++++++++++++++++++++++ 3 files changed, 796 insertions(+), 21 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 94e1ab1bbb..45df1a8f45 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1873,3 +1873,445 @@ DWORD WINAPI SHDeleteValueA(HKEY hkey, const char *subkey, const char *value) CoTaskMemFree(valueW); return ret; } + +/************************************************************************* + * SHCopyKeyA [SHCORE.@] + */ +DWORD WINAPI SHCopyKeyA(HKEY hkey_src, const char *subkey, HKEY hkey_dst, DWORD reserved) +{ + WCHAR *subkeyW = NULL; + DWORD ret; + + TRACE("(%p, %s, %p, %d)\n", hkey_src, debugstr_a(subkey), hkey_dst, reserved); + + if (subkey && FAILED(SHStrDupA(subkey, &subkeyW))) + return 0; + + ret = SHCopyKeyW(hkey_src, subkeyW, hkey_dst, reserved); + CoTaskMemFree(subkeyW); + return ret; +} + +/************************************************************************* + * SHCopyKeyW [SHCORE.@] + */ +DWORD WINAPI SHCopyKeyW(HKEY hkey_src, const WCHAR *subkey, HKEY hkey_dst, DWORD reserved) +{ + DWORD key_count = 0, value_count = 0, max_key_len = 0; + WCHAR name[MAX_PATH], *ptr_name = name; + BYTE buff[1024], *ptr = buff; + DWORD max_data_len = 0, i; + DWORD ret = 0; + + TRACE("(%p, %s, %p, %d)\n", hkey_src, debugstr_w(subkey), hkey_dst, reserved); + + if (!hkey_dst || !hkey_src) + return ERROR_INVALID_PARAMETER; + + if (subkey) + ret = RegOpenKeyExW(hkey_src, subkey, 0, KEY_ALL_ACCESS, &hkey_src); + + if (ret) + hkey_src = NULL; /* Don't close this key since we didn't open it */ + else + { + DWORD max_value_len; + + ret = RegQueryInfoKeyW(hkey_src, NULL, NULL, NULL, &key_count, &max_key_len, + NULL, &value_count, &max_value_len, &max_data_len, NULL, NULL); + if (!ret) + { + /* Get max size for key/value names */ + max_key_len = max(max_key_len, max_value_len); + + if (max_key_len++ > MAX_PATH - 1) + ptr_name = heap_alloc(max_key_len * sizeof(WCHAR)); + + if (max_data_len > sizeof(buff)) + ptr = heap_alloc(max_data_len); + + if (!ptr_name || !ptr) + ret = ERROR_NOT_ENOUGH_MEMORY; + } + } + + for (i = 0; i < key_count && !ret; i++) + { + HKEY hsubkey_src, hsubkey_dst; + DWORD length = max_key_len; + + ret = RegEnumKeyExW(hkey_src, i, ptr_name, &length, NULL, NULL, NULL, NULL); + if (!ret) + { + ret = RegOpenKeyExW(hkey_src, ptr_name, 0, KEY_READ, &hsubkey_src); + if (!ret) + { + /* Create destination sub key */ + ret = RegCreateKeyW(hkey_dst, ptr_name, &hsubkey_dst); + if (!ret) + { + /* Recursively copy keys and values from the sub key */ + ret = SHCopyKeyW(hsubkey_src, NULL, hsubkey_dst, 0); + RegCloseKey(hsubkey_dst); + } + } + RegCloseKey(hsubkey_src); + } + } + + /* Copy all the values in this key */ + for (i = 0; i < value_count && !ret; i++) + { + DWORD length = max_key_len, type, data_len = max_data_len; + + ret = RegEnumValueW(hkey_src, i, ptr_name, &length, NULL, &type, ptr, &data_len); + if (!ret) { + ret = SHSetValueW(hkey_dst, NULL, ptr_name, type, ptr, data_len); + } + } + + /* Free buffers if allocated */ + if (ptr_name != name) + heap_free(ptr_name); + if (ptr != buff) + heap_free(ptr); + + if (subkey && hkey_src) + RegCloseKey(hkey_src); + + return ret; +} + + +/************************************************************************* + * SHEnumKeyExA [SHCORE.@] + */ +LONG WINAPI SHEnumKeyExA(HKEY hkey, DWORD index, char *subkey, DWORD *length) +{ + TRACE("(%p, %d, %s, %p)\n", hkey, index, debugstr_a(subkey), length); + + return RegEnumKeyExA(hkey, index, subkey, length, NULL, NULL, NULL, NULL); +} + +/************************************************************************* + * SHEnumKeyExW [SHCORE.@] + */ +LONG WINAPI SHEnumKeyExW(HKEY hkey, DWORD index, WCHAR *subkey, DWORD *length) +{ + TRACE("(%p, %d, %s, %p)\n", hkey, index, debugstr_w(subkey), length); + + return RegEnumKeyExW(hkey, index, subkey, length, NULL, NULL, NULL, NULL); +} + +/************************************************************************* + * SHEnumValueA [SHCORE.@] + */ +LONG WINAPI SHEnumValueA(HKEY hkey, DWORD index, char *value, DWORD *length, DWORD *type, + void *data, DWORD *data_len) +{ + TRACE("(%p, %d, %s, %p, %p, %p, %p)\n", hkey, index, debugstr_a(value), length, type, data, data_len); + + return RegEnumValueA(hkey, index, value, length, NULL, type, data, data_len); +} + +/************************************************************************* + * SHEnumValueW [SHCORE.@] + */ +LONG WINAPI SHEnumValueW(HKEY hkey, DWORD index, WCHAR *value, DWORD *length, DWORD *type, + void *data, DWORD *data_len) +{ + TRACE("(%p, %d, %s, %p, %p, %p, %p)\n", hkey, index, debugstr_w(value), length, type, data, data_len); + + return RegEnumValueW(hkey, index, value, length, NULL, type, data, data_len); +} + +/************************************************************************* + * SHQueryValueExW [SHCORE.@] + */ +DWORD WINAPI SHQueryValueExW(HKEY hkey, const WCHAR *name, DWORD *reserved, DWORD *type, + void *buff, DWORD *buff_len) +{ + DWORD ret, value_type, data_len = 0; + + TRACE("(%p, %s, %p, %p, %p, %p)\n", hkey, debugstr_w(name), reserved, type, buff, buff_len); + + if (buff_len) + data_len = *buff_len; + + ret = RegQueryValueExW(hkey, name, reserved, &value_type, buff, &data_len); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + return ret; + + if (buff_len && value_type == REG_EXPAND_SZ) + { + DWORD length; + WCHAR *value; + + if (!buff || ret == ERROR_MORE_DATA) + { + length = data_len; + value = heap_alloc(length); + RegQueryValueExW(hkey, name, reserved, NULL, (BYTE *)value, &length); + length = ExpandEnvironmentStringsW(value, NULL, 0); + } + else + { + length = (strlenW(buff) + 1) * sizeof(WCHAR); + value = heap_alloc(length); + memcpy(value, buff, length); + length = ExpandEnvironmentStringsW(value, buff, *buff_len / sizeof(WCHAR)); + if (length > *buff_len) ret = ERROR_MORE_DATA; + } + data_len = max(data_len, length); + heap_free(value); + } + + if (type) + *type = value_type == REG_EXPAND_SZ ? REG_SZ : value_type; + if (buff_len) + *buff_len = data_len; + return ret; +} + +/************************************************************************* + * SHQueryValueExA [SHCORE.@] + */ +DWORD WINAPI SHQueryValueExA(HKEY hkey, const char *name, DWORD *reserved, DWORD *type, + void *buff, DWORD *buff_len) +{ + DWORD ret, value_type, data_len = 0; + + TRACE("(%p, %s, %p, %p, %p, %p)\n", hkey, debugstr_a(name), reserved, type, buff, buff_len); + + if (buff_len) + data_len = *buff_len; + + ret = RegQueryValueExA(hkey, name, reserved, &value_type, buff, &data_len); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + return ret; + + if (buff_len && value_type == REG_EXPAND_SZ) + { + DWORD length; + char *value; + + if (!buff || ret == ERROR_MORE_DATA) + { + length = data_len; + value = heap_alloc(length); + RegQueryValueExA(hkey, name, reserved, NULL, (BYTE *)value, &length); + length = ExpandEnvironmentStringsA(value, NULL, 0); + } + else + { + length = strlen(buff) + 1; + value = heap_alloc(length); + memcpy(value, buff, length); + length = ExpandEnvironmentStringsA(value, buff, *buff_len); + if (length > *buff_len) ret = ERROR_MORE_DATA; + } + data_len = max(data_len, length); + heap_free(value); + } + + if (type) + *type = value_type == REG_EXPAND_SZ ? REG_SZ : value_type; + if (buff_len) + *buff_len = data_len; + return ret; +} + +/************************************************************************* + * SHGetValueA [SHCORE.@] + */ +DWORD WINAPI SHGetValueA(HKEY hkey, const char *subkey, const char *value, + DWORD *type, void *data, DWORD *data_len) +{ + HKEY hsubkey = 0; + DWORD ret = 0; + + TRACE("(%p, %s, %s, %p, %p, %p)\n", hkey, debugstr_a(subkey), debugstr_a(value), + type, data, data_len); + + if (subkey) + ret = RegOpenKeyExA(hkey, subkey, 0, KEY_QUERY_VALUE, &hsubkey); + + if (!ret) + { + ret = SHQueryValueExA(hsubkey ? hsubkey : hkey, value, 0, type, data, data_len); + if (subkey) + RegCloseKey(hsubkey); + } + + return ret; +} + +/************************************************************************* + * SHGetValueW [SHCORE.@] + */ +DWORD WINAPI SHGetValueW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, + DWORD *type, void *data, DWORD *data_len) +{ + HKEY hsubkey = 0; + DWORD ret = 0; + + TRACE("(%p, %s, %s, %p, %p, %p)\n", hkey, debugstr_w(subkey), debugstr_w(value), + type, data, data_len); + + if (subkey) + ret = RegOpenKeyExW(hkey, subkey, 0, KEY_QUERY_VALUE, &hsubkey); + + if (!ret) + { + ret = SHQueryValueExW(hsubkey ? hsubkey : hkey, value, 0, type, data, data_len); + if (subkey) + RegCloseKey(hsubkey); + } + + return ret; +} + +/************************************************************************* + * SHRegGetIntW [SHCORE.280] + */ +int WINAPI SHRegGetIntW(HKEY hkey, const WCHAR *value, int default_value) +{ + WCHAR buff[32]; + DWORD buff_len; + + TRACE("(%p, %s, %d)\n", hkey, debugstr_w(value), default_value); + + buff[0] = 0; + buff_len = sizeof(buff); + if (SHQueryValueExW(hkey, value, 0, 0, buff, &buff_len)) + return default_value; + + if (*buff >= '0' && *buff <= '9') + return atoiW(buff); + + return default_value; +} + +/************************************************************************* + * SHRegGetPathA [SHCORE.@] + */ +DWORD WINAPI SHRegGetPathA(HKEY hkey, const char *subkey, const char *value, char *path, DWORD flags) +{ + DWORD length = MAX_PATH; + + TRACE("(%p, %s, %s, %p, %#x)\n", hkey, debugstr_a(subkey), debugstr_a(value), path, flags); + + return SHGetValueA(hkey, subkey, value, 0, path, &length); +} + +/************************************************************************* + * SHRegGetPathW [SHCORE.@] + */ +DWORD WINAPI SHRegGetPathW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, WCHAR *path, DWORD flags) +{ + DWORD length = MAX_PATH; + + TRACE("(%p, %s, %s, %p, %d)\n", hkey, debugstr_w(subkey), debugstr_w(value), path, flags); + + return SHGetValueW(hkey, subkey, value, 0, path, &length); +} + +/************************************************************************* + * SHSetValueW [SHCORE.@] + */ +DWORD WINAPI SHSetValueW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, DWORD type, + const void *data, DWORD data_len) +{ + DWORD ret = ERROR_SUCCESS, dummy; + HKEY hsubkey; + + TRACE("(%p, %s, %s, %d, %p, %d)\n", hkey, debugstr_w(subkey), debugstr_w(value), + type, data, data_len); + + if (subkey && *subkey) + ret = RegCreateKeyExW(hkey, subkey, 0, NULL, 0, KEY_SET_VALUE, NULL, &hsubkey, &dummy); + else + hsubkey = hkey; + + if (!ret) + { + ret = RegSetValueExW(hsubkey, value, 0, type, data, data_len); + if (hsubkey != hkey) + RegCloseKey(hsubkey); + } + + return ret; +} + +/************************************************************************* + * SHSetValueA [SHCORE.@] + */ +DWORD WINAPI SHSetValueA(HKEY hkey, const char *subkey, const char *value, + DWORD type, const void *data, DWORD data_len) +{ + DWORD ret = ERROR_SUCCESS, dummy; + HKEY hsubkey; + + TRACE("(%p, %s, %s, %d, %p, %d)\n", hkey, debugstr_a(subkey), debugstr_a(value), + type, data, data_len); + + if (subkey && *subkey) + ret = RegCreateKeyExA(hkey, subkey, 0, NULL, 0, KEY_SET_VALUE, NULL, &hsubkey, &dummy); + else + hsubkey = hkey; + + if (!ret) + { + ret = RegSetValueExA(hsubkey, value, 0, type, data, data_len); + if (hsubkey != hkey) + RegCloseKey(hsubkey); + } + + return ret; +} + +/************************************************************************* + * SHRegSetPathA [SHCORE.@] + */ +DWORD WINAPI SHRegSetPathA(HKEY hkey, const char *subkey, const char *value, const char *path, DWORD flags) +{ + FIXME("(%p, %s, %s, %p, %#x) - semi-stub\n", hkey, debugstr_a(subkey), + debugstr_a(value), debugstr_a(path), flags); + + /* FIXME: PathUnExpandEnvStringsA() */ + + return SHSetValueA(hkey, subkey, value, REG_SZ, path, lstrlenA(path)); +} + +/************************************************************************* + * SHRegSetPathW [SHCORE.@] + */ +DWORD WINAPI SHRegSetPathW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, const WCHAR *path, DWORD flags) +{ + FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hkey, debugstr_w(subkey), + debugstr_w(value), debugstr_w(path), flags); + + /* FIXME: PathUnExpandEnvStringsW(); */ + + return SHSetValueW(hkey, subkey, value, REG_SZ, path, lstrlenW(path)); +} + +/************************************************************************* + * SHQueryInfoKeyA [SHCORE.@] + */ +LONG WINAPI SHQueryInfoKeyA(HKEY hkey, DWORD *subkeys, DWORD *subkey_max, DWORD *values, DWORD *value_max) +{ + TRACE("(%p, %p, %p, %p, %p)\n", hkey, subkeys, subkey_max, values, value_max); + + return RegQueryInfoKeyA(hkey, NULL, NULL, NULL, subkeys, subkey_max, NULL, values, value_max, NULL, NULL, NULL); +} + +/************************************************************************* + * SHQueryInfoKeyW [SHCORE.@] + */ +LONG WINAPI SHQueryInfoKeyW(HKEY hkey, DWORD *subkeys, DWORD *subkey_max, DWORD *values, DWORD *value_max) +{ + TRACE("(%p, %p, %p, %p, %p)\n", hkey, subkeys, subkey_max, values, value_max); + + return RegQueryInfoKeyW(hkey, NULL, NULL, NULL, subkeys, subkey_max, NULL, values, value_max, NULL, NULL, NULL); +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index d6e48368ae..c0150cbc90 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -31,8 +31,8 @@ @ stub RevokeScaleChangeNotifications @ stdcall SHAnsiToAnsi(str ptr long) @ stdcall SHAnsiToUnicode(str ptr long) -@ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA -@ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW +@ stdcall SHCopyKeyA(long str long long) +@ stdcall SHCopyKeyW(long wstr long long) @ stdcall SHCreateMemStream(ptr long) @ stdcall SHCreateStreamOnFileA(str long ptr) @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) @@ -46,33 +46,33 @@ @ stdcall SHDeleteKeyW(long wstr) @ stdcall SHDeleteValueA(long str str) @ stdcall SHDeleteValueW(long wstr wstr) -@ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA -@ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW -@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA -@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW +@ stdcall SHEnumKeyExA(long long str ptr) +@ stdcall SHEnumKeyExW(long long wstr ptr) +@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) +@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) @ stdcall SHGetThreadRef(ptr) -@ stdcall SHGetValueA( long str str ptr ptr ptr ) shlwapi.SHGetValueA -@ stdcall SHGetValueW( long wstr wstr ptr ptr ptr ) shlwapi.SHGetValueW +@ stdcall SHGetValueA(long str str ptr ptr ptr) +@ stdcall SHGetValueW(long wstr wstr ptr ptr ptr) @ stdcall SHOpenRegStream2A(long str str long) @ stdcall SHOpenRegStream2W(long wstr wstr long) @ stdcall SHOpenRegStreamA(long str str long) @ stdcall SHOpenRegStreamW(long wstr wstr long) -@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyA -@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW -@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA -@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW +@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) +@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) +@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) +@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) @ stdcall SHRegDuplicateHKey(long) -@ stdcall SHRegGetIntW(ptr wstr long) shlwapi.SHRegGetIntW -@ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA -@ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW -@ stdcall SHRegGetValueA( long str str long ptr ptr ptr ) shlwapi.SHRegGetValueA -@ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW -@ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA -@ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW +@ stdcall SHRegGetIntW(ptr wstr long) +@ stdcall SHRegGetPathA(long str str ptr long) +@ stdcall SHRegGetPathW(long wstr wstr ptr long) +@ stdcall SHRegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +@ stdcall SHRegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +@ stdcall SHRegSetPathA(long str str str long) +@ stdcall SHRegSetPathW(long wstr wstr wstr long) @ stdcall SHReleaseThreadRef() @ stdcall SHSetThreadRef(ptr) -@ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA -@ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW +@ stdcall SHSetValueA(long str str long ptr long) +@ stdcall SHSetValueW(long wstr wstr long ptr long) @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) @ stdcall SHUnicodeToAnsi(wstr ptr ptr) diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index e1af2a2edc..0738659f7c 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -23,6 +23,7 @@ #include <windows.h> #include "initguid.h" #include "objidl.h" +#include "shlwapi.h" #include "wine/test.h" @@ -35,6 +36,26 @@ static int (WINAPI *pSHAnsiToAnsi)(const char *, char *, int); static int (WINAPI *pSHUnicodeToUnicode)(const WCHAR *, WCHAR *, int); static HKEY (WINAPI *pSHRegDuplicateHKey)(HKEY); static DWORD (WINAPI *pSHDeleteKeyA)(HKEY, const char *); +static DWORD (WINAPI *pSHGetValueA)(HKEY, const char *, const char *, DWORD *, void *, DWORD *); +static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY, const char *, const char *, SRRF, DWORD *, void *, DWORD *); +static DWORD (WINAPI *pSHQueryValueExA)(HKEY, const char *, DWORD *, DWORD *, void *buff, DWORD *buff_len); +static DWORD (WINAPI *pSHRegGetPathA)(HKEY, const char *, const char *, char *, DWORD); +static DWORD (WINAPI *pSHCopyKeyA)(HKEY, const char *, HKEY, DWORD); + +/* Keys used for testing */ +#define REG_TEST_KEY "Software\\Wine\\Test" +#define REG_CURRENT_VERSION "Software\\Microsoft\\Windows\\CurrentVersion\\explorer" + +static const char test_path1[] = "%LONGSYSTEMVAR%\\subdir1"; +static const char test_path2[] = "%FOO%\\subdir1"; + +static const char * test_envvar1 = "bar"; +static const char * test_envvar2 = "ImARatherLongButIndeedNeededString"; +static char test_exp_path1[MAX_PATH]; +static char test_exp_path2[MAX_PATH]; +static DWORD exp_len1; +static DWORD exp_len2; +static const char * initial_buffer ="0123456789"; static void init(HMODULE hshcore) { @@ -47,6 +68,11 @@ static void init(HMODULE hshcore) X(SHUnicodeToUnicode); X(SHRegDuplicateHKey); X(SHDeleteKeyA); + X(SHGetValueA); + X(SHRegGetValueA); + X(SHQueryValueExA); + X(SHRegGetPathA); + X(SHCopyKeyA); #undef X } @@ -343,6 +369,308 @@ static void test_SHDeleteKey(void) ok(!ret, "Failed to delete a key, %d.\n", ret); } +static HKEY create_test_entries(void) +{ + HKEY hKey; + DWORD ret; + DWORD nExpectedLen1, nExpectedLen2; + + SetEnvironmentVariableA("LONGSYSTEMVAR", test_envvar1); + SetEnvironmentVariableA("FOO", test_envvar2); + + ret = RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY, &hKey); + ok(!ret, "RegCreateKeyA failed, ret=%u\n", ret); + + if (hKey) + { + ok(!RegSetValueExA(hKey, "Test1", 0, REG_EXPAND_SZ, (BYTE *)test_path1, strlen(test_path1)+1), "RegSetValueExA failed\n"); + ok(!RegSetValueExA(hKey, "Test2", 0, REG_SZ, (BYTE *)test_path1, strlen(test_path1)+1), "RegSetValueExA failed\n"); + ok(!RegSetValueExA(hKey, "Test3", 0, REG_EXPAND_SZ, (BYTE *)test_path2, strlen(test_path2)+1), "RegSetValueExA failed\n"); + } + + exp_len1 = ExpandEnvironmentStringsA(test_path1, test_exp_path1, sizeof(test_exp_path1)); + exp_len2 = ExpandEnvironmentStringsA(test_path2, test_exp_path2, sizeof(test_exp_path2)); + + nExpectedLen1 = strlen(test_path1) - strlen("%LONGSYSTEMVAR%") + strlen(test_envvar1) + 1; + nExpectedLen2 = strlen(test_path2) - strlen("%FOO%") + strlen(test_envvar2) + 1; + + /* Make sure we carry on with correct values */ + exp_len1 = nExpectedLen1; + exp_len2 = nExpectedLen2; + + return hKey; +} + +/* delete key and all its subkeys */ +static DWORD delete_key( HKEY hkey, LPCSTR parent, LPCSTR keyname ) +{ + HKEY parentKey; + DWORD ret; + + RegCloseKey(hkey); + + /* open the parent of the key to close */ + ret = RegOpenKeyExA( HKEY_CURRENT_USER, parent, 0, KEY_ALL_ACCESS, &parentKey); + if (ret != ERROR_SUCCESS) + return ret; + + ret = pSHDeleteKeyA( parentKey, keyname ); + RegCloseKey(parentKey); + + return ret; +} + +static void test_SHGetValue(void) +{ + DWORD size; + DWORD type; + DWORD ret; + char buf[MAX_PATH]; + + HKEY hkey = create_test_entries(); + + strcpy(buf, initial_buffer); + size = MAX_PATH; + type = -1; + ret = pSHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", &type, buf, &size); + ok(!ret, "Failed to get value, ret %u.\n", ret); + + ok(!strcmp(test_exp_path1, buf), "Unexpected value %s.\n", buf); + ok(type == REG_SZ, "Unexpected value type %d.\n", type); + + strcpy(buf, initial_buffer); + size = MAX_PATH; + type = -1; + ret = pSHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", &type, buf, &size); + ok(!ret, "Failed to get value, ret %u.\n", ret); + ok(!strcmp(test_path1, buf), "Unexpected value %s.\n", buf); + ok(type == REG_SZ, "Unexpected value type %d.\n", type); + + delete_key(hkey, "Software\\Wine", "Test"); +} + +static void test_SHRegGetValue(void) +{ + LSTATUS ret; + DWORD size, type; + char data[MAX_PATH]; + + HKEY hkey = create_test_entries(); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_EXPAND_SZ, &type, data, &size); + ok(ret == ERROR_INVALID_PARAMETER, "SHRegGetValue failed, ret=%u\n", ret); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_SZ, &type, data, &size); + ok(ret == ERROR_SUCCESS, "SHRegGetValue failed, ret=%u\n", ret); + ok(!strcmp(data, test_exp_path1), "data = %s, expected %s\n", data, test_exp_path1); + ok(type == REG_SZ, "type = %d, expected REG_SZ\n", type); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_DWORD, &type, data, &size); + ok(ret == ERROR_UNSUPPORTED_TYPE, "SHRegGetValue failed, ret=%u\n", ret); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_EXPAND_SZ, &type, data, &size); + ok(ret == ERROR_INVALID_PARAMETER, "SHRegGetValue failed, ret=%u\n", ret); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_SZ, &type, data, &size); + ok(ret == ERROR_SUCCESS, "SHRegGetValue failed, ret=%u\n", ret); + ok(!strcmp(data, test_path1), "data = %s, expected %s\n", data, test_path1); + ok(type == REG_SZ, "type = %d, expected REG_SZ\n", type); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_QWORD, &type, data, &size); + ok(ret == ERROR_UNSUPPORTED_TYPE, "SHRegGetValue failed, ret=%u\n", ret); + + delete_key(hkey, "Software\\Wine", "Test"); +} + +static void test_SHQueryValueEx(void) +{ + DWORD buffer_len1,buffer_len2; + DWORD ret, type, size; + char buf[MAX_PATH]; + HKEY hKey, testkey; + + testkey = create_test_entries(); + + ret = RegOpenKeyExA(HKEY_CURRENT_USER, REG_TEST_KEY, 0, KEY_QUERY_VALUE, &hKey); + ok(!ret, "Failed to open a key, ret %u.\n", ret); + + /****** SHQueryValueExA ******/ + + buffer_len1 = max(strlen(test_exp_path1)+1, strlen(test_path1)+1); + buffer_len2 = max(strlen(test_exp_path2)+1, strlen(test_path2)+1); + + /* + * Case 1.1 All arguments are NULL + */ + ret = pSHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, NULL); + ok(!ret, "Failed to query value, ret %u.\n", ret); + + /* + * Case 1.2 dwType is set + */ + type = -1; + ret = pSHQueryValueExA( hKey, "Test1", NULL, &type, NULL, NULL); + ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + size = 6; + ret = pSHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, &size); + ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(size == buffer_len1, "Buffer sizes (%u) and (%u) are not equal\n", size, buffer_len1); + + /* + * Expanded > unexpanded + */ + size = 6; + ret = pSHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &size); + ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + + /* + * Case 1 string shrinks during expanding + */ + strcpy(buf, initial_buffer); + size = 6; + type = -1; + ret = pSHQueryValueExA( hKey, "Test1", NULL, &type, buf, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + ok(!strcmp(initial_buffer, buf), "Comparing (%s) with (%s) failed\n", buf, initial_buffer); + ok(size == buffer_len1, "Buffer sizes (%u) and (%u) are not equal\n", size, buffer_len1); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + /* + * string grows during expanding + * dwSize is smaller than the size of the unexpanded string + */ + strcpy(buf, initial_buffer); + size = 6; + type = -1; + ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, buf, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + ok(!strcmp(initial_buffer, buf), "Comparing (%s) with (%s) failed\n", buf, initial_buffer); + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + /* + * string grows during expanding + * dwSize is larger than the size of the unexpanded string, but + * smaller than the part before the backslash. If the unexpanded + * string fits into the buffer, it can get cut when expanded. + */ + strcpy(buf, initial_buffer); + size = strlen(test_envvar2) - 2; + type = -1; + ret = pSHQueryValueExA(hKey, "Test3", NULL, &type, buf, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + + todo_wine + { + ok(!strcmp("", buf), "Unexpanded string %s.\n", buf); + } + + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + /* + * string grows during expanding + * dwSize is larger than the size of the part before the backslash, + * but smaller than the expanded string. If the unexpanded string fits + * into the buffer, it can get cut when expanded. + */ + strcpy(buf, initial_buffer); + size = exp_len2 - 4; + type = -1; + ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, buf, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + + todo_wine + { + ok( (0 == strcmp("", buf)) || (0 == strcmp(test_envvar2, buf)), + "Expected empty or first part of the string \"%s\", got \"%s\"\n", test_envvar2, buf); + } + + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + /* + * The buffer is NULL but the size is set + */ + strcpy(buf, initial_buffer); + size = 6; + type = -1; + ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, NULL, &size); + ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + RegCloseKey(hKey); + + delete_key(testkey, "Software\\Wine", "Test"); +} + +static void test_SHRegGetPath(void) +{ + char buf[MAX_PATH]; + DWORD ret; + HKEY hkey; + + hkey = create_test_entries(); + + strcpy(buf, initial_buffer); + ret = pSHRegGetPathA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", buf, 0); + ok(!ret, "Failed to get path, ret %u.\n", ret); + ok(!strcmp(test_exp_path1, buf), "Unexpected path %s.\n", buf); + + delete_key(hkey, "Software\\Wine", "Test"); +} + +static void test_SHCopyKey(void) +{ + HKEY hKeySrc, hKeyDst; + DWORD ret; + + HKEY hkey = create_test_entries(); + + /* Delete existing destination sub keys */ + hKeyDst = NULL; + if (!RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination", &hKeyDst) && hKeyDst) + { + pSHDeleteKeyA(hKeyDst, NULL); + RegCloseKey(hKeyDst); + } + + hKeyDst = NULL; + ret = RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination", &hKeyDst); + ok(!ret, "Failed to create a test key, ret %d.\n", ret); + + hKeySrc = NULL; + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, REG_CURRENT_VERSION, &hKeySrc); + ok(!ret, "Failed to open a test key, ret %d.\n", ret); + + ret = pSHCopyKeyA(hKeySrc, NULL, hKeyDst, 0); + ok(!ret, "Copy failed, ret=(%u)\n", ret); + + RegCloseKey(hKeySrc); + RegCloseKey(hKeyDst); + + /* Check we copied the sub keys, i.e. something that's on every windows system (including Wine) */ + hKeyDst = NULL; + ret = RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination\\Shell Folders", &hKeyDst); + ok(!ret, "Failed to open a test key, ret %d.\n", ret); + + /* And the we copied the values too */ + ok(!pSHQueryValueExA(hKeyDst, "Common AppData", NULL, NULL, NULL, NULL), "SHQueryValueExA failed\n"); + + RegCloseKey(hKeyDst); + delete_key( hkey, "Software\\Wine", "Test" ); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -362,4 +690,9 @@ START_TEST(shcore) test_SHUnicodeToUnicode(); test_SHRegDuplicateHKey(); test_SHDeleteKey(); + test_SHGetValue(); + test_SHRegGetValue(); + test_SHQueryValueEx(); + test_SHRegGetPath(); + test_SHCopyKey(); } -- 2.19.2

1 4

[PATCH] mfplat: Fix memory allocation in mfsourceresolver_CreateObjectFromByteStream() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 83afb940517f..c7c346512f79 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1907,7 +1907,7 @@ static HRESULT WINAPI mfsourceresolver_CreateObjectFromByteStream(IMFSourceResol { mfsource *new_object; - new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*new_object) ); if (!new_object) return E_OUTOFMEMORY; -- 2.18.1

1 0

[PATCH] mshtml: Make sure LoadLibraryEx() will search directory of xul.
by Jactry Zeng 30 Nov '18

30 Nov '18

Some applications call SetDefaultDllDirectories(0xc00) which will override directory of xul and let xul can't find its dependence. So let's add xul's path by AddDllDirectory() before calling LoadLibraryEx(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9acb0d29e8..a157afc3e9 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -488,6 +488,7 @@ static BOOL load_xul(const PRUnichar *gre_path) { static const WCHAR xul_dllW[] = {'\\','x','u','l','.','d','l','l',0}; WCHAR file_name[MAX_PATH]; + DLL_DIRECTORY_COOKIE cookie; strcpyW(file_name, gre_path); strcatW(file_name, xul_dllW); @@ -496,7 +497,9 @@ static BOOL load_xul(const PRUnichar *gre_path) set_environment(gre_path); + cookie = AddDllDirectory(gre_path); xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + RemoveDllDirectory(cookie); if(!xul_handle) { WARN("Could not load XUL: %d\n", GetLastError()); return FALSE; -- 2.19.2

3 2

[PATCH 3/7] windowscodecs: Add support for palette image formats to TIFF encoder.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 6 ++++++ dlls/windowscodecs/tests/converter.c | 23 +++++++++++++++-------- dlls/windowscodecs/tiffformat.c | 26 ++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b011d71645..b32b294d72 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1211,6 +1211,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, @@ -1370,6 +1372,10 @@ static GUID const * const tiff_encode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index c221f3b99e..d859c8dda0 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -752,13 +752,13 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) { - ok(width == 32, "wrong width %u\n", width); + ok(width == 16, "wrong width %u\n", width); ok(height == 2, "wrong height %u\n", height); - ok(bps == 1, "wrong bps %d\n", bps); + ok(bps == 2, "wrong bps %d\n", bps); ok(photo == 3, "wrong photometric %d\n", photo); ok(samples == 1, "wrong samples %d\n", samples); - ok(colormap == 6, "wrong colormap %d\n", colormap); + ok(colormap == 12, "wrong colormap %d\n", colormap); } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { @@ -1151,8 +1151,9 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls memcpy(&pixelformat, srcs[i]->format, sizeof(GUID)); hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); - ok(IsEqualGUID(&pixelformat, dsts[i]->format), "SetPixelFormat changed the format to %s (%s)\n", - wine_dbgstr_guid(&pixelformat), name); + ok(IsEqualGUID(&pixelformat, dsts[i]->format) || + broken(IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), + "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); @@ -1315,6 +1316,15 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(count == 4, "expected 4, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + } else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) { ok(count == 16, "expected 16, got %u (%s)\n", count, name); @@ -1504,8 +1514,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in test_encoder(&testdata_BlackWhite, &CLSID_WICTiffEncoder, &testdata_BlackWhite, &CLSID_WICTiffDecoder, "TIFF encoder BlackWhite"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, @@ -1514,7 +1522,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); -} test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f43b330547..ac98d7dcdb 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -461,6 +462,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->bpp = bps; switch (bps) { + case 1: + decode_info->format = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + decode_info->format = &GUID_WICPixelFormat2bppIndexed; + break; case 4: decode_info->format = &GUID_WICPixelFormat4bppIndexed; break; @@ -1408,6 +1415,10 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat2bppIndexed, 3, 2, 1, 2, 0, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, {0} }; @@ -1690,6 +1701,21 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); } + if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < This->colors; i++) + { + red[i] = (This->palette[i] >> 8) & 0xff00; + green[i] = This->palette[i] & 0xff00; + blue[i] = (This->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + This->info_written = TRUE; } -- 2.17.1

2 1

[PATCH 1/7] windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 337 ++++++++++++++++++++++----- 1 file changed, 283 insertions(+), 54 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 5f9f1d88a3..c221f3b99e 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -316,6 +316,20 @@ static const struct bitmap_data testdata_BlackWhite = { static const struct bitmap_data testdata_1bppIndexed = { &GUID_WICPixelFormat1bppIndexed, 1, bits_1bpp, 32, 2, 96.0, 96.0}; +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_2bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_2bppIndexed = { + &GUID_WICPixelFormat2bppIndexed, 2, bits_2bpp, 16, 2, 96.0, 96.0}; + +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_4bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_4bppIndexed = { + &GUID_WICPixelFormat4bppIndexed, 4, bits_4bpp, 8, 2, 96.0, 96.0}; + static const BYTE bits_8bpp[] = { 0,1,2,3, 4,5,6,7}; @@ -632,64 +646,224 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } } -static void check_bmp_format(IStream *stream, const struct bitmap_data *data) +static void load_stream(IUnknown *reader, IStream *stream) +{ + HRESULT hr; + IWICPersistStream *persist; +#ifdef WORDS_BIGENDIAN + DWORD persist_options = WICPersistOptionBigEndian; +#else + DWORD persist_options = WICPersistOptionLittleEndian; +#endif + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + hr = IWICPersistStream_LoadEx(persist, stream, NULL, persist_options); + ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); + + IWICPersistStream_Release(persist); +} + +static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) { - BITMAPFILEHEADER bfh; - BITMAPINFOHEADER bih; HRESULT hr; - ULONG len; + IWICMetadataReader *reader; + PROPVARIANT id, value; + struct + { + USHORT byte_order; + USHORT version; + ULONG dir_offset; + } tiff; + LARGE_INTEGER pos; + UINT count, i; + int width, height, bps, photo, samples, colormap; + struct + { + int id, *value; + } tag[] = + { + { 0x100, &width }, { 0x101, &height }, { 0x102, &bps }, + { 0x106, &photo }, { 0x115, &samples }, { 0x140, &colormap } + }; + + memset(&tiff, 0, sizeof(tiff)); + hr = IStream_Read(stream, &tiff, sizeof(tiff), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + ok(tiff.byte_order == MAKEWORD('I','I') || tiff.byte_order == MAKEWORD('M','M'), + "wrong TIFF byte order mark %02x\n", tiff.byte_order); + ok(tiff.version == 42, "wrong TIFF version %u\n", tiff.version); + + pos.QuadPart = tiff.dir_offset; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + load_stream((IUnknown *)reader, stream); - hr = IStream_Read(stream, &bfh, sizeof(bfh), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count != 0, "wrong count %u\n", count); - hr = IStream_Read(stream, &bih, sizeof(bih), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + for (i = 0; i < sizeof(tag)/sizeof(tag[0]); i++) + { + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_UI2; + U(id).uiVal = tag[i].id; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + ok(hr == S_OK || (tag[i].id == 0x140 && hr == WINCODEC_ERR_PROPERTYNOTFOUND), + "GetValue(%04x) error %#x\n", tag[i].id, hr); + if (hr == S_OK) + { + ok(value.vt == VT_UI2 || value.vt == VT_UI4 || value.vt == (VT_UI2 | VT_VECTOR), "wrong vt: %d\n", value.vt); + tag[i].value[0] = U(value).uiVal; + } + else + tag[i].value[0] = -1; + } - ok(bfh.bfType == 0x4d42, "Unexpected header type, %#x.\n", bfh.bfType); - ok(bfh.bfSize != 0, "Unexpected bitmap size %d.\n", bfh.bfSize); - ok(bfh.bfReserved1 == 0, "Unexpected bfReserved1 field.\n"); - ok(bfh.bfReserved2 == 0, "Unexpected bfReserved2 field.\n"); + IWICMetadataReader_Release(reader); - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed) - || IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) + if (IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite)) { - /* TODO: test with actual palette size */ - ok(bfh.bfOffBits > sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 1, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); } - else - ok(bfh.bfOffBits == sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); - - ok(bih.biSize == sizeof(bih), "Unexpected header size %d.\n", bih.biSize); - ok(bih.biWidth == data->width, "Unexpected bitmap width %d.\n", bih.biWidth); - ok(bih.biHeight == data->height, "Unexpected bitmap height %d.\n", bih.biHeight); - ok(bih.biPlanes == 1, "Unexpected planes count %d.\n", bih.biPlanes); - - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed)) - ok(bih.biBitCount == 1, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) - ok(bih.biBitCount == 8, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat32bppBGR)) - ok(bih.biBitCount == 32, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - - ok(bih.biCompression == BI_RGB, "Unexpected compression mode %u.\n", bih.biCompression); -todo_wine - ok(bih.biSizeImage == 0, "Unexpected image size %d.\n", bih.biSizeImage); - ok(bih.biXPelsPerMeter == 3780 || broken(bih.biXPelsPerMeter == 0) /* XP */, "Unexpected horz resolution %d.\n", - bih.biXPelsPerMeter); - ok(bih.biYPelsPerMeter == 3780 || broken(bih.biYPelsPerMeter == 0) /* XP */, "Unexpected vert resolution %d.\n", - bih.biYPelsPerMeter); + else if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 6, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 6, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(width == 8, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); - /* FIXME: test actual data */ + ok(bps == 4, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 48, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 8, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 768, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat24bppBGR)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 3, "wrong bps %d\n", bps); + ok(photo == 2, "wrong photometric %d\n", photo); + ok(samples == 3, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); + } + else + ok(0, "unknown TIFF pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) +static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) { - /* FIXME */ + HRESULT hr; + BITMAPFILEHEADER bfh; + BITMAPV5HEADER bih; + + memset(&bfh, 0, sizeof(bfh)); + hr = IStream_Read(stream, &bfh, sizeof(bfh), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(bfh.bfType == 0x4d42, "wrong BMP signature %02x\n", bfh.bfType); + ok(bfh.bfReserved1 == 0, "wrong bfReserved1 %02x\n", bfh.bfReserved1); + ok(bfh.bfReserved2 == 0, "wrong bfReserved2 %02x\n", bfh.bfReserved2); + + memset(&bih, 0, sizeof(bih)); + hr = IStream_Read(stream, &bih, sizeof(bih), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 1, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(bih.bV5Width == 16, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 2, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 4, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 8, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 32, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 0, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 0, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else + ok(0, "unknown BMP pixel format %s\n", wine_dbgstr_guid(format)); } static unsigned be_uint(unsigned val) @@ -746,6 +920,28 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(png.filter == 0, "wrong filter %d\n", png.filter); ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(be_uint(png.width) == 16, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 2, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(be_uint(png.width) == 8, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 4, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { ok(be_uint(png.width) == 4, "wrong width %u\n", be_uint(png.width)); @@ -772,7 +968,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_bitmap_format(IStream *stream, const CLSID *encoder, const struct bitmap_data *dst) +static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; LARGE_INTEGER pos; @@ -782,11 +978,11 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const str ok(hr == S_OK, "IStream_Seek error %#x\n", hr); if (IsEqualGUID(encoder, &CLSID_WICPngEncoder)) - check_png_format(stream, dst->format); + check_png_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICBmpEncoder)) - check_bmp_format(stream, dst); + check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) - check_tiff_format(stream, dst->format); + check_tiff_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -991,6 +1187,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "WriteSource(%dx%d) failed, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); else ok(hr == S_OK || + broken(hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) || + broken(hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) || broken(hr == E_INVALIDARG && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && IsEqualGUID(srcs[i]->format, &GUID_WICPixelFormatBlackWhite)) /* XP */, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); } @@ -1022,7 +1220,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - check_bitmap_format(stream, clsid_encoder, dsts[0]); + check_bitmap_format(stream, clsid_encoder, dsts[0]->format); } if (SUCCEEDED(hr)) @@ -1082,7 +1280,12 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(ret == count, "expected %u, got %u\n", count, ret); if (IsEqualGUID(clsid_decoder, &CLSID_WICPngDecoder)) { - ok(count == 256 || count == 2 /* newer libpng versions */, "expected 256, got %u (%s)\n", count, name); + /* Newer libpng versions don't accept larger palettes than the declared + * bit depth, so we need to generate the palette of the correct length. + */ + ok(count == 256 || (dsts[i]->bpp == 1 && count == 2) || + (dsts[i]->bpp == 2 && count == 4) || (dsts[i]->bpp == 4 && count == 16), + "expected 256, got %u (%s)\n", count, name); ok(colors[0] == 0x11111111, "got %08x (%s)\n", colors[0], name); ok(colors[1] == 0x22222222, "got %08x (%s)\n", colors[1], name); @@ -1090,8 +1293,11 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls { ok(colors[2] == 0x33333333, "got %08x (%s)\n", colors[2], name); ok(colors[3] == 0x44444444, "got %08x (%s)\n", colors[3], name); - ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); - ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + if (count > 4) + { + ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + } } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || @@ -1109,6 +1315,17 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(count == 16, "expected 16, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); + } else { ok(count == 2, "expected 2, got %u (%s)\n", count, name); @@ -1260,6 +1477,10 @@ START_TEST(converter) &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder, &testdata_1bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICPngEncoder, + &testdata_2bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICPngEncoder, + &testdata_4bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICPngEncoder, &testdata_8bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 8bppIndexed"); test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, @@ -1271,6 +1492,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICBmpEncoder, + &testdata_2bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICBmpEncoder, + &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); } @@ -1283,6 +1508,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in { test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, + &testdata_2bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICTiffEncoder, + &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); } -- 2.17.1

2 1

[PATCH 7/7] windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tests/pngformat.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3ac7dee896..49ff15d270 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -622,7 +622,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; - hr = E_FAIL; + hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; goto end; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 5f4a5e17d5..d08a5fb618 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -811,7 +811,6 @@ static void test_color_formats(void) hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -840,7 +839,6 @@ next_1: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -869,7 +867,6 @@ next_2: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -897,7 +894,6 @@ next_3: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) -- 2.17.1

1 0

[PATCH 6/7] windowscodecs: find_decoder() should return an error it received from the decoder.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

If IWICBitmapDecoderInfo::MatchesPattern() has recognized the decoder by the pattern, and the called IWICBitmapDecoder::Initialize() has failed, an error should be returned right away instead of trying next codec. This allows report image format related errors instead of WINCODEC_ERR_COMPONENTNOTFOUND. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/imgfactory.c | 42 ++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index b564efc332..fb235fbbe1 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -131,22 +131,23 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( return hr; } -static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendor, - WICDecodeOptions metadataOptions) +static HRESULT find_decoder(IStream *pIStream, const GUID *pguidVendor, + WICDecodeOptions metadataOptions, IWICBitmapDecoder **decoder) { IEnumUnknown *enumdecoders; IUnknown *unkdecoderinfo; IWICBitmapDecoderInfo *decoderinfo; - IWICBitmapDecoder *decoder = NULL; GUID vendor; HRESULT res; ULONG num_fetched; BOOL matches; + *decoder = NULL; + res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); - if (FAILED(res)) return NULL; + if (FAILED(res)) return res; - while (!decoder) + while (!*decoder) { res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); @@ -171,18 +172,21 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo if (SUCCEEDED(res) && matches) { - res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder); + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, decoder); /* FIXME: should use QueryCapability to choose a decoder */ if (SUCCEEDED(res)) { - res = IWICBitmapDecoder_Initialize(decoder, pIStream, metadataOptions); + res = IWICBitmapDecoder_Initialize(*decoder, pIStream, metadataOptions); if (FAILED(res)) { - IWICBitmapDecoder_Release(decoder); - decoder = NULL; + IWICBitmapDecoder_Release(*decoder); + IWICBitmapDecoderInfo_Release(decoderinfo); + IUnknown_Release(unkdecoderinfo); + *decoder = NULL; + return res; } } } @@ -198,7 +202,7 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo IEnumUnknown_Release(enumdecoders); - return decoder; + return WINCODEC_ERR_COMPONENTNOTFOUND; } static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( @@ -212,9 +216,9 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( metadataOptions, ppIDecoder); if (pguidVendor) - decoder = find_decoder(pIStream, pguidVendor, metadataOptions); + res = find_decoder(pIStream, pguidVendor, metadataOptions, &decoder); if (!decoder) - decoder = find_decoder(pIStream, NULL, metadataOptions); + res = find_decoder(pIStream, NULL, metadataOptions, &decoder); if (decoder) { @@ -229,17 +233,17 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( BYTE data[4]; ULONG bytesread; - WARN("failed to load from a stream\n"); + WARN("failed to load from a stream %#x\n", res); seek.QuadPart = 0; - res = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - if (SUCCEEDED(res)) - res = IStream_Read(pIStream, data, 4, &bytesread); - if (SUCCEEDED(res)) - WARN("first %i bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]); + if (IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL) == S_OK) + { + if (IStream_Read(pIStream, data, 4, &bytesread) == S_OK) + WARN("first %i bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]); + } } *ppIDecoder = NULL; - return WINCODEC_ERR_COMPONENTNOTFOUND; + return res; } } -- 2.17.1

1 0

[PATCH 5/7] windowscodecs: Add support for palette image formats to BMP encoder.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpencode.c | 44 ++++++++++++++++++++++------ dlls/windowscodecs/info.c | 8 ++++- dlls/windowscodecs/regsvr.c | 5 ++++ dlls/windowscodecs/tests/converter.c | 16 +++++++--- 4 files changed, 59 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index fb04f9ddb2..51840c89d2 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); struct bmp_pixelformat { const WICPixelFormatGUID *guid; UINT bpp; + UINT colors; /* palette size */ DWORD compression; DWORD redmask; DWORD greenmask; @@ -45,13 +47,18 @@ struct bmp_pixelformat { }; static const struct bmp_pixelformat formats[] = { - {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR555, 16, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR565, 16, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, - {&GUID_WICPixelFormat32bppBGR, 32, BI_RGB}, + {&GUID_WICPixelFormat24bppBGR, 24, 0, BI_RGB}, + {&GUID_WICPixelFormatBlackWhite, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat1bppIndexed, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat2bppIndexed, 2, 4, BI_RGB}, + {&GUID_WICPixelFormat4bppIndexed, 4, 16, BI_RGB}, + {&GUID_WICPixelFormat8bppIndexed, 8, 256, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR555, 16, 0, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR565, 16, 0, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, 0, BI_RGB}, #if 0 /* Windows doesn't seem to support this one. */ - {&GUID_WICPixelFormat32bppBGRA, 32, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, + {&GUID_WICPixelFormat32bppBGRA, 32, 0, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, #endif {NULL} }; @@ -184,11 +191,13 @@ static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } if (!formats[i].guid) i = 0; + else if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormatBlackWhite)) + i = 2; /* GUID_WICPixelFormat1bppIndexed */ This->format = &formats[i]; memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); @@ -207,6 +216,7 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, IWICPalette *palette) { BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; TRACE("(%p,%p)\n", iface, palette); @@ -215,7 +225,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; - return IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + if (hr == S_OK) + { + UINT i; + for (i = 0; i < This->colors; i++) + This->palette[i] |= 0xff000000; /* BMP palette has no alpha */ + } + return hr; } static HRESULT WINAPI BmpFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -330,8 +347,8 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5SizeImage = This->stride*This->height; bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; - bih.bV5ClrUsed = 0; - bih.bV5ClrImportant = 0; + bih.bV5ClrUsed = (This->format->bpp <= 8) ? This->colors : 0; + bih.bV5ClrImportant = bih.bV5ClrUsed; if (This->format->compression == BI_BITFIELDS) { @@ -348,6 +365,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage; bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; + bfh.bfOffBits += bih.bV5ClrUsed * sizeof(WICColor); pos.QuadPart = 0; hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); @@ -361,6 +379,14 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) if (FAILED(hr)) return hr; if (byteswritten != info_size) return E_FAIL; + /* write the palette */ + if (This->format->colors) + { + hr = IStream_Write(This->stream, This->palette, This->colors * sizeof(WICColor), &byteswritten); + if (FAILED(hr)) return hr; + if (byteswritten != This->colors * sizeof(WICColor)) return E_FAIL; + } + hr = IStream_Write(This->stream, This->bits, bih.bV5SizeImage, &byteswritten); if (FAILED(hr)) return hr; if (byteswritten != bih.bV5SizeImage) return E_FAIL; diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107e99..86707e1253 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2461,6 +2461,12 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn return hr; } +static BOOL is_1bpp_format(const WICPixelFormatGUID *format) +{ + return IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite) || + IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed); +} + HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst) { HRESULT res; @@ -2476,7 +2482,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma res = IWICBitmapSource_GetPixelFormat(pISrc, &srcFormat); if (FAILED(res)) return res; - if (IsEqualGUID(&srcFormat, dstFormat)) + if (IsEqualGUID(&srcFormat, dstFormat) || (is_1bpp_format(&srcFormat) && is_1bpp_format(dstFormat))) { IWICBitmapSource_AddRef(pISrc); *ppIDst = pISrc; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b32b294d72..c72fbf1899 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1347,6 +1347,11 @@ static GUID const * const bmp_encode_formats[] = { &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, NULL }; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index d859c8dda0..80ef61087d 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -814,6 +814,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -824,6 +826,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 16, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -834,6 +838,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -844,6 +850,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -854,6 +862,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) { + ok(bfh.bfOffBits == 0x0036, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -1152,7 +1162,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&pixelformat, dsts[i]->format) || - broken(IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), + broken(IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)) || + broken(IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); @@ -1496,8 +1507,6 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_BlackWhite, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, @@ -1508,7 +1517,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); -} test_encoder(&testdata_32bppBGR, &CLSID_WICBmpEncoder, &testdata_32bppBGR, &CLSID_WICBmpDecoder, "BMP encoder 32bppBGR"); -- 2.17.1

1 0

[PATCH 4/7] windowscodecs: Limit number of colors in a palette in BMP decoder.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpdecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 6254b150ca..f5a2589d68 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -271,7 +271,7 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, if (This->bih.bV5ClrUsed == 0) count = 1 << This->bih.bV5BitCount; else - count = This->bih.bV5ClrUsed; + count = min(This->bih.bV5ClrUsed, 1 << This->bih.bV5BitCount); tablesize = sizeof(WICColor) * count; wiccolors = HeapAlloc(GetProcessHeap(), 0, tablesize); -- 2.17.1

1 0

[PATCH 2/7] windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 67773fd32f..f43b330547 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1964,7 +1964,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, VARIANT v; VariantInit(&v); V_VT(&v) = VT_UI1; - V_UNION(&v, bVal) = WICTiffCompressionDontCare; + V_UI1(&v) = WICTiffCompressionDontCare; hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, (PROPBAG2 *)opts, &v); VariantClear(&v); if (FAILED(hr)) -- 2.17.1

1 0

[PATCH 6/9] dxgi: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 76a4d440565b..914ba480e827 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -143,14 +143,10 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_AddRef(IDXGISwapChain1 *iface) struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); ULONG refcount = InterlockedIncrement(&swapchain->refcount); - TRACE("%p increasing refcount to %u\n", swapchain, refcount); + TRACE("%p increasing refcount to %u.\n", swapchain, refcount); if (refcount == 1) - { - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - } return refcount; } -- 2.18.1

3 2

[PATCH 8/9] wined3d: Lock wined3d mutex in wined3d_swapchain_create().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/swapchain.c | 8 ++------ dlls/d3d9/swapchain.c | 8 ++------ dlls/wined3d/swapchain.c | 2 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index c137d0ded0bb..6e8b98e3b6de 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -171,12 +171,8 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi swapchain->IDirect3DSwapChain8_iface.lpVtbl = &d3d8_swapchain_vtbl; swapchain->swap_interval = swap_interval; - wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 5bd16bad5a7d..1279663dd52b 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -371,12 +371,8 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi swapchain->IDirect3DSwapChain9Ex_iface.lpVtbl = &d3d9_swapchain_vtbl; swapchain->swap_interval = swap_interval; - wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ed8a3b3aca5f..60ef6ad78c9c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1030,7 +1030,9 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + wined3d_mutex_lock(); hr = swapchain_init(object, device, desc, parent, parent_ops); + wined3d_mutex_unlock(); if (FAILED(hr)) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); -- 2.18.1

3 2

[PATCH 9/9] wined3d: Introduce wined3d_cs_finish() helper.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 12 ++++++------ dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/swapchain.c | 17 ++++++----------- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c7c0c0bddb81..5090220f8ceb 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -673,7 +673,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3DCLEAR_SYNCHRONOUS) - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) @@ -2137,7 +2137,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, op->hr = &hr; cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); - cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; } @@ -2164,7 +2164,7 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc op->hr = &hr; cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); - cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; } @@ -2297,7 +2297,7 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3D_BLT_SYNCHRONOUS) - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) @@ -2379,7 +2379,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. * Copying the data may be faster if it's small. */ - cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); } static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) @@ -2505,7 +2505,7 @@ static void wined3d_cs_emit_stop(struct wined3d_cs *cs) op->opcode = WINED3D_CS_OP_STOP; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d6f53060ee1..c90cbdbe10fe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1017,7 +1017,7 @@ static void wined3d_device_delete_opengl_contexts_cs(void *object) static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) { wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_device_create_primary_opengl_context_cs(void *object) @@ -1058,7 +1058,7 @@ static void wined3d_device_create_primary_opengl_context_cs(void *object) static HRESULT wined3d_device_create_primary_opengl_context(struct wined3d_device *device) { wined3d_cs_init_object(device->cs, wined3d_device_create_primary_opengl_context_cs, device); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!device->swapchains[0]->num_contexts) return E_FAIL; @@ -1208,7 +1208,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (!device->d3d_initialized) return WINED3DERR_INVALIDCALL; - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (device->logo_texture) wined3d_texture_decref(device->logo_texture); @@ -4788,7 +4788,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", device, swapchain_desc, mode, callback, reset_state); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!(swapchain = wined3d_device_get_swapchain(device, 0))) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 60ef6ad78c9c..6ed4f89b03f8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -109,7 +109,6 @@ ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) { ULONG refcount = InterlockedDecrement(&swapchain->ref); - struct wined3d_device *device; TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); @@ -117,8 +116,7 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) { wined3d_mutex_lock(); - device = swapchain->device; - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); @@ -140,8 +138,6 @@ void * CDECL wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapch void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) { - struct wined3d_device *device = swapchain->device; - if (!window) window = swapchain->device_window; if (window == swapchain->win_handle) @@ -150,7 +146,7 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN TRACE("Setting swapchain %p window from %p to %p.\n", swapchain, swapchain->win_handle, window); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain->win_handle = window; } @@ -905,7 +901,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!swapchain->context[0]) { @@ -1006,8 +1002,8 @@ err: heap_free(swapchain->back_buffers); } - wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); - swapchain->device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_destroy_object(device->cs, wined3d_swapchain_destroy_object, swapchain); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (swapchain->front_buffer) { @@ -1213,7 +1209,6 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality) { - struct wined3d_device *device = swapchain->device; BOOL update_desc = FALSE; TRACE("swapchain %p, buffer_count %u, width %u, height %u, format %s, " @@ -1226,7 +1221,7 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha if (buffer_count && buffer_count != swapchain->desc.backbuffer_count) FIXME("Cannot change the back buffer count yet.\n"); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!width || !height) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5b41d4a9cdc2..cb9ac2aa4ffb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1622,7 +1622,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT struct wined3d_texture_idx texture_idx = {texture, 0}; wined3d_cs_destroy_object(device->cs, wined3d_texture_destroy_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); create_dib = TRUE; } @@ -1692,7 +1692,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT struct wined3d_texture_idx texture_idx = {texture, 0}; wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } return WINED3D_OK; @@ -3117,7 +3117,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc struct wined3d_texture_idx texture_idx = {texture, i}; wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!texture->dc_info || !texture->dc_info[i].dc) { wined3d_texture_cleanup_sync(texture); @@ -3737,7 +3737,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!(dc_info = texture->dc_info) || !dc_info[sub_resource_idx].dc) return WINED3DERR_INVALIDCALL; } @@ -3785,7 +3785,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; wined3d_cs_destroy_object(device->cs, wined3d_texture_destroy_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } --sub_resource->map_count; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e80cc75acfa..5a6715a5906c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3739,6 +3739,11 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; +static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) +{ + cs->ops->finish(cs, queue_id); +} + static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants) { -- 2.18.1

3 2

[PATCH 7/9] wined3d: Lock wined3d mutex in wined3d_swapchain_decref().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/swapchain.c | 2 -- dlls/d3d9/swapchain.c | 2 -- dlls/dxgi/swapchain.c | 2 -- dlls/wined3d/swapchain.c | 7 ++++++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 92ec011f99cb..c137d0ded0bb 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -74,9 +74,7 @@ static ULONG WINAPI d3d8_swapchain_Release(IDirect3DSwapChain8 *iface) { IDirect3DDevice8 *parent_device = swapchain->parent_device; - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); if (parent_device) IDirect3DDevice8_Release(parent_device); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 81d560539051..5bd16bad5a7d 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -124,9 +124,7 @@ static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9Ex *iface) { IDirect3DDevice9Ex *parent_device = swapchain->parent_device; - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ if (parent_device) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 914ba480e827..4dfa06873351 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -168,9 +168,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); if (device) IWineDXGIDevice_Release(device); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2170629801c5..ed8a3b3aca5f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -109,17 +109,22 @@ ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) { ULONG refcount = InterlockedDecrement(&swapchain->ref); + struct wined3d_device *device; TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); if (!refcount) { - struct wined3d_device *device = swapchain->device; + wined3d_mutex_lock(); + device = swapchain->device; device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); + + wined3d_mutex_unlock(); + heap_free(swapchain); } -- 2.18.1

3 2

[PATCH 5/9] d3d9: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/swapchain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index d303f3f95640..81d560539051 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -100,9 +100,7 @@ static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9Ex *iface) if (swapchain->parent_device) IDirect3DDevice9Ex_AddRef(swapchain->parent_device); - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); } return refcount; -- 2.18.1

3 2

[PATCH 4/9] d3d8: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- In preparation for more fine-grained locking in wined3d. It won't be ready for Wine 4.0... --- dlls/d3d8/swapchain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 39e3b2387390..92ec011f99cb 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -57,9 +57,7 @@ static ULONG WINAPI d3d8_swapchain_AddRef(IDirect3DSwapChain8 *iface) { if (swapchain->parent_device) IDirect3DDevice8_AddRef(swapchain->parent_device); - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); } return ref; -- 2.18.1

3 2

[PATCH 3/9] dxgi/tests: Add separate window thread for test_resize_target_wndproc().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45431 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 80 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bfe98f40bc25..1aaed468cf38 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2686,20 +2686,65 @@ static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, W } } +struct window_thread_data +{ + HWND window; + HANDLE window_created; + HANDLE finished; +}; + +static DWORD WINAPI window_thread(void *data) +{ + struct window_thread_data *thread_data = data; + unsigned int ret; + WNDCLASSA wc; + MSG msg; + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = resize_target_wndproc; + wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + thread_data->window = CreateWindowA("dxgi_resize_target_wndproc_wc", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!thread_data->window, "Failed to create window.\n"); + + ret = SetEvent(thread_data->window_created); + ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + + for (;;) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + + ret = WaitForSingleObject(thread_data->finished, 0); + if (ret != WAIT_TIMEOUT) + break; + } + ok(ret == WAIT_OBJECT_0, "Failed to wait for event, ret %#x, last error %#x.\n", ret, GetLastError()); + + DestroyWindow(thread_data->window); + thread_data->window = NULL; + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + + return 0; +} + static void test_resize_target_wndproc(void) { + struct window_thread_data thread_data; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; IDXGIAdapter *adapter; DXGI_MODE_DESC mode; IDXGIDevice *device; + unsigned int ret; ULONG refcount; LONG_PTR data; - WNDCLASSA wc; + HANDLE thread; HRESULT hr; RECT rect; - BOOL ret; if (!(device = create_device(0))) { @@ -2707,10 +2752,16 @@ static void test_resize_target_wndproc(void) return; } - memset(&wc, 0, sizeof(wc)); - wc.lpfnWndProc = resize_target_wndproc; - wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; - ok(RegisterClassA(&wc), "Failed to register window class.\n"); + memset(&thread_data, 0, sizeof(thread_data)); + thread_data.window_created = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(!!thread_data.window_created, "Failed to create event, last error %#x.\n", GetLastError()); + thread_data.finished = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(!!thread_data.finished, "Failed to create event, last error %#x.\n", GetLastError()); + + thread = CreateThread(NULL, 0, window_thread, &thread_data, 0, NULL); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + ret = WaitForSingleObject(thread_data.window_created, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); hr = IDXGIDevice_GetAdapter(device, &adapter); ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); @@ -2728,18 +2779,14 @@ static void test_resize_target_wndproc(void) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = thread_data.window; swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - - swapchain_desc.OutputWindow = CreateWindowA("dxgi_resize_target_wndproc_wc", - "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); - ok(!!swapchain_desc.OutputWindow, "Failed to create window.\n"); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); - data = SetWindowLongPtrA(swapchain_desc.OutputWindow, GWLP_USERDATA, (LONG_PTR)swapchain); + data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)swapchain); ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); memset(&mode, 0, sizeof(mode)); @@ -2762,7 +2809,6 @@ static void test_resize_target_wndproc(void) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - DestroyWindow(swapchain_desc.OutputWindow); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); @@ -2770,7 +2816,13 @@ static void test_resize_target_wndproc(void) refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); - UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + ret = SetEvent(thread_data.finished); + ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); + CloseHandle(thread); + CloseHandle(thread_data.window_created); + CloseHandle(thread_data.finished); } static void test_inexact_modes(void) -- 2.18.1

3 2

[PATCH 2/9] wined3d: Lock wined3d mutex in wined3d_swapchain_resize_target().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a deadlock. It can also be seen as a small step towards more fine-grained locking in wined3d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45431 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 7 +------ dlls/wined3d/swapchain.c | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0d325cf61f9d..76a4d440565b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -434,7 +434,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_display_mode mode; - HRESULT hr; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); @@ -451,11 +450,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - wined3d_mutex_lock(); - hr = wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); - wined3d_mutex_unlock(); - - return hr; + return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 43582ceb2eea..2170629801c5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1327,29 +1327,38 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, const struct wined3d_display_mode *mode) { - struct wined3d_device *device = swapchain->device; struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; + struct wined3d_device *device; + HWND window; HRESULT hr; TRACE("swapchain %p, mode %p.\n", swapchain, mode); + wined3d_mutex_lock(); + + device = swapchain->device; + window = swapchain->device_window; + if (swapchain->desc.windowed) { SetRect(&window_rect, 0, 0, mode->width, mode->height); AdjustWindowRectEx(&window_rect, - GetWindowLongW(swapchain->device_window, GWL_STYLE), FALSE, - GetWindowLongW(swapchain->device_window, GWL_EXSTYLE)); + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); SetRect(&window_rect, 0, 0, window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(swapchain->device_window, &original_window_rect); + GetWindowRect(window, &original_window_rect); OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); } else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) + { + wined3d_mutex_unlock(); return hr; + } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } else @@ -1358,15 +1367,17 @@ HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchai &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); return hr; } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } - MoveWindow(swapchain->device_window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, - window_rect.bottom - window_rect.top, TRUE); + wined3d_mutex_unlock(); + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); return WINED3D_OK; } -- 2.18.1

3 2

[PATCH 1/9] dxgi/tests: Add test for ResizeTarget() with window procedure.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 109 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b3a470506bf4..bfe98f40bc25 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2665,6 +2665,114 @@ static void test_resize_target(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) +{ + IDXGISwapChain *swapchain = (IDXGISwapChain *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + DXGI_SWAP_CHAIN_DESC desc; + HRESULT hr; + + switch (message) + { + case WM_SIZE: + ok(!!swapchain, "GWLP_USERDATA is NULL.\n"); + hr = IDXGISwapChain_GetDesc(swapchain, &desc); + ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); + ok(desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width); + ok(desc.BufferDesc.Height == 600, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height); + return 0; + + default: + return DefWindowProcA(hwnd, message, wparam, lparam); + } +} + +static void test_resize_target_wndproc(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + DXGI_MODE_DESC mode; + IDXGIDevice *device; + ULONG refcount; + LONG_PTR data; + WNDCLASSA wc; + HRESULT hr; + RECT rect; + BOOL ret; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = resize_target_wndproc; + wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + swapchain_desc.OutputWindow = CreateWindowA("dxgi_resize_target_wndproc_wc", + "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!swapchain_desc.OutputWindow, "Failed to create window.\n"); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + data = SetWindowLongPtrA(swapchain_desc.OutputWindow, GWLP_USERDATA, (LONG_PTR)swapchain); + ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); + + memset(&mode, 0, sizeof(mode)); + mode.Width = 600; + mode.Height = 400; + hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); + ok(hr == S_OK, "Getswapchain_desc failed, hr %#x.\n", hr); + ok(swapchain_desc.BufferDesc.Width == 800, + "Got unexpected buffer width %u.\n", swapchain_desc.BufferDesc.Width); + ok(swapchain_desc.BufferDesc.Height == 600, + "Got unexpected buffer height %u.\n", swapchain_desc.BufferDesc.Height); + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + ok(rect.right == mode.Width && rect.bottom == mode.Height, + "Got unexpected client rect %s.\n", wine_dbgstr_rect(&rect)); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); +} + static void test_inexact_modes(void) { struct swapchain_fullscreen_state initial_state, expected_state; @@ -4753,6 +4861,7 @@ START_TEST(dxgi) queue_test(test_output); queue_test(test_find_closest_matching_mode); queue_test(test_get_containing_output); + queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); queue_test(test_swapchain_present); -- 2.18.1

3 2

[PATCH] usp10/tests: Fix a typo in ok() message.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/usp10/tests/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index aa26997112..8c4b125bae 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3349,7 +3349,7 @@ static void test_ScriptCacheGetHeight(HDC hdc) height = 123; hr = ScriptCacheGetHeight(hdc, NULL, &height); - ok(hr == E_INVALIDARG, "Uexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(height == 123, "Unexpected height.\n"); memset(&tm, 0, sizeof(tm)); -- 2.17.2

2 1

[PATCH] ddraw: Get rid of redundant call to wined3d_stateblock_capture().
by Zebediah Figura 29 Nov '18

29 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/ddraw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5043994a56..6b2abe3c1f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -933,7 +933,6 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, goto done; } - wined3d_stateblock_capture(stateblock); rtv = wined3d_device_get_rendertarget_view(ddraw->wined3d_device, 0); /* Rendering to ddraw->wined3d_frontbuffer. */ if (rtv && !wined3d_rendertarget_view_get_sub_resource_parent(rtv)) -- 2.14.1

3 2

[PATCH vkd3d 4/5] tests: Print adapter info on Windows.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_dxgi.idl | 25 ++++++++++++++++++++++++- tests/d3d12.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_dxgi.idl b/include/vkd3d_dxgi.idl index 5b80e1f6c3f4..91f233664f91 100644 --- a/include/vkd3d_dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -38,7 +38,6 @@ typedef enum DXGI_MODE_ROTATION DXGI_MODE_ROTATION_ROTATE270 = 0x4, } DXGI_MODE_ROTATION; -interface IDXGIAdapter; interface IDXGIAdapter1; interface IDXGIOutput; typedef struct DXGI_SWAP_CHAIN_DESC DXGI_SWAP_CHAIN_DESC; @@ -54,6 +53,18 @@ const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x00000100ul; const DXGI_USAGE DXGI_USAGE_DISCARD_ON_PRESENT = 0x00000200ul; const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x00000400ul; +typedef struct DXGI_ADAPTER_DESC { + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; +} DXGI_ADAPTER_DESC; + [ local, object, @@ -79,6 +90,18 @@ interface IDXGIDeviceSubObject : IDXGIObject HRESULT GetDevice(REFIID riid, void **device); } +[ + object, + local, + uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) +] +interface IDXGIAdapter : IDXGIObject +{ + HRESULT EnumOutputs(UINT output_idx, IDXGIOutput **output); + HRESULT GetDesc(DXGI_ADAPTER_DESC *desc); + HRESULT CheckInterfaceSupport(REFGUID guid, void *umd_version); +} + [ local, object, diff --git a/tests/d3d12.c b/tests/d3d12.c index f52176632819..5265ed12424e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -890,8 +890,7 @@ static IUnknown *create_adapter(void) return adapter; } - if (use_adapter_idx) - hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get adapter, hr %#x.\n", hr); @@ -923,6 +922,32 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } +#ifdef _WIN32 +static void print_adapter_info(void) +{ + IDXGIAdapter *dxgi_adapter; + DXGI_ADAPTER_DESC desc; + IUnknown *adapter; + HRESULT hr; + + if (!(adapter = create_adapter())) + return; + + hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); + IUnknown_Release(adapter); + + hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + + IDXGIAdapter_Release(dxgi_adapter); +} +#else +static void print_adapter_info(void) {} +#endif + static bool broken_on_warp(bool condition) { return broken(use_warp_device && condition); @@ -21915,6 +21940,8 @@ START_TEST(d3d12) ID3D12Debug_Release(debug); } + print_adapter_info(); + run_test(test_create_device); run_test(test_node_count); run_test(test_check_feature_support); -- 2.18.1

2 3

[PATCH resend] explorer: Fix atom leaks caused by not releasing DDE interface
by Ralf Habacker 29 Nov '18

29 Nov '18

1 0

[PATCH vkd3d 5/5] vkd3d: Add FIXME() for invalid depth/stencil formats.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Needs more tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 3 +++ tests/d3d12.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 66da08a9c417..1fefb6149cff 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1966,6 +1966,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) + FIXME("Format %#x is not depth/stencil format.\n", format->dxgi_format); + if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5265ed12424e..522217d87c9a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2770,6 +2770,14 @@ static void test_create_graphics_pipeline_state(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D12PipelineState_Release(pipeline_state); + /* Invalid DSVFormat */ + pso_desc.DSVFormat = DXGI_FORMAT_R8G8B8A8_UNORM; + pso_desc.DepthStencilState.DepthEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); -- 2.18.1

2 1

[PATCH vkd3d 1/5] vkd3d: Disable depth/stencil tests for DXGI_FORMAT_UNKNOWN.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Needs more tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 7 ++++++- tests/d3d12.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6f7373e996ef..66da08a9c417 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1948,8 +1948,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rt_count = ARRAY_SIZE(graphics->attachments) - 1; } + if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN + && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) + FIXME("DSV format is DXGI_FORMAT_UNKNOWN, disabling depth/stencil tests.\n"); + graphics->rt_idx = 0; - if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) + if (desc->DSVFormat != DXGI_FORMAT_UNKNOWN + && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) { const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; VkImageLayout depth_layout; diff --git a/tests/d3d12.c b/tests/d3d12.c index d0372454a8c3..42fb24cc73d2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2734,6 +2734,17 @@ static void test_create_graphics_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* DSVFormat = DXGI_FORMAT_UNKNOWN */ + memset(blend, 0, sizeof(*blend)); + pso_desc.DSVFormat = DXGI_FORMAT_UNKNOWN; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); -- 2.18.1

2 1

[PATCH vkd3d 3/5] tests: Rename vkd3d_d3d12_test.h to d3d12_test_utils.h.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 2 +- tests/{vkd3d_d3d12_test.h => d3d12_test_utils.h} | 0 tests/vkd3d_api.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/{vkd3d_d3d12_test.h => d3d12_test_utils.h} (100%) diff --git a/tests/d3d12.c b/tests/d3d12.c index d10811715d0d..f52176632819 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -55,7 +55,7 @@ typedef int HRESULT; # include "vkd3d_utils.h" #endif -#include "vkd3d_d3d12_test.h" +#include "d3d12_test_utils.h" struct vec2 { diff --git a/tests/vkd3d_d3d12_test.h b/tests/d3d12_test_utils.h similarity index 100% rename from tests/vkd3d_d3d12_test.h rename to tests/d3d12_test_utils.h diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index ff5704dff778..f84409be8311 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -22,7 +22,7 @@ #include "vkd3d_test.h" #include <vkd3d.h> -#include "vkd3d_d3d12_test.h" +#include "d3d12_test_utils.h" HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) -- 2.18.1

2 1

[PATCH vkd3d 2/5] tests: Insert UAV barrier between ClearUAV() commands.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a bunch of test failures on RADV. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 42fb24cc73d2..d10811715d0d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3956,6 +3956,9 @@ static void test_clear_unordered_access_view(void) get_gpu_descriptor_handle(&context, gpu_heap, 1), get_cpu_descriptor_handle(&context, cpu_heap, 1), buffer, clear_value, 0, NULL); + + uav_barrier(command_list, buffer); + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, get_gpu_descriptor_handle(&context, gpu_heap, 0), get_cpu_descriptor_handle(&context, cpu_heap, 0), -- 2.18.1

2 1

[v3 PATCH 1/4] shcore: Implement a bunch of string conversion functions.
by Nikolay Sivov 29 Nov '18

29 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 90 ++++++++++++++++++ dlls/shcore/shcore.spec | 8 +- dlls/shcore/tests/shcore.c | 182 +++++++++++++++++++++++++++++++++++++ 3 files changed, 276 insertions(+), 4 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index bf477aefcc..88c36ecf2d 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1455,3 +1455,93 @@ HRESULT WINAPI SHStrDupA(const char *src, WCHAR **dest) return S_OK; } + +/************************************************************************* + * SHAnsiToAnsi [SHCORE.@] + */ +DWORD WINAPI SHAnsiToAnsi(const char *src, char *dest, int dest_len) +{ + DWORD ret; + + TRACE("(%s, %p, %d)\n", debugstr_a(src), dest, dest_len); + + if (!src || !dest || dest_len <= 0) + return 0; + + lstrcpynA(dest, src, dest_len); + ret = strlen(dest); + + return src[ret] ? 0 : ret + 1; +} + +/************************************************************************* + * SHUnicodeToAnsi [SHCORE.@] + */ +DWORD WINAPI SHUnicodeToAnsi(const WCHAR *src, char *dest, int dest_len) +{ + int ret = 1; + + TRACE("(%s, %p, %d)\n", debugstr_w(src), dest, dest_len); + + if (!dest || !dest_len) + return 0; + + if (src) + { + ret = WideCharToMultiByte(CP_ACP, 0, src, -1, dest, dest_len, NULL, NULL); + if (!ret) + { + dest[dest_len - 1] = 0; + ret = dest_len; + } + } + else + dest[0] = 0; + + return ret; +} + +/************************************************************************* + * SHUnicodeToUnicode [SHCORE.@] + */ +DWORD WINAPI SHUnicodeToUnicode(const WCHAR *src, WCHAR *dest, int dest_len) +{ + DWORD ret; + + TRACE("(%s, %p, %d)\n", debugstr_w(src), dest, dest_len); + + if (!src || !dest || dest_len <= 0) + return 0; + + lstrcpynW(dest, src, dest_len); + ret = strlenW(dest); + + return src[ret] ? 0 : ret + 1; +} + +/************************************************************************* + * SHAnsiToUnicode [SHCORE.@] + */ +DWORD WINAPI SHAnsiToUnicode(const char *src, WCHAR *dest, int dest_len) +{ + int ret = 1; + + TRACE("(%s, %p, %d)\n", debugstr_a(src), dest, dest_len); + + if (!dest || !dest_len) + return 0; + + if (src) + { + ret = MultiByteToWideChar(CP_ACP, 0, src, -1, dest, dest_len); + if (!ret) + { + dest[dest_len - 1] = 0; + ret = dest_len; + } + } + else + dest[0] = 0; + + return ret; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 1473bf7b0a..918ba5595c 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -29,8 +29,8 @@ @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications -@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi -@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode +@ stdcall SHAnsiToAnsi(str ptr long) +@ stdcall SHAnsiToUnicode(str ptr long) @ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA @ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW @ stdcall SHCreateMemStream(ptr long) @@ -75,8 +75,8 @@ @ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) -@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi -@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) +@ stdcall SHUnicodeToUnicode(wstr ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stdcall SetProcessReference(ptr) diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 904d8264cd..f788afdd22 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -29,12 +29,20 @@ static HRESULT (WINAPI *pGetProcessReference)(IUnknown **); static void (WINAPI *pSetProcessReference)(IUnknown *); static HRESULT (WINAPI *pSHGetInstanceExplorer)(IUnknown **); +static int (WINAPI *pSHUnicodeToAnsi)(const WCHAR *, char *, int); +static int (WINAPI *pSHAnsiToUnicode)(const char *, WCHAR *, int); +static int (WINAPI *pSHAnsiToAnsi)(const char *, char *, int); +static int (WINAPI *pSHUnicodeToUnicode)(const WCHAR *, WCHAR *, int); static void init(HMODULE hshcore) { #define X(f) p##f = (void*)GetProcAddress(hshcore, #f) X(GetProcessReference); X(SetProcessReference); + X(SHUnicodeToAnsi); + X(SHAnsiToUnicode); + X(SHAnsiToAnsi); + X(SHUnicodeToUnicode); #undef X } @@ -122,6 +130,176 @@ static void test_process_reference(void) ok(test_unk2.refcount == 3, "Unexpected refcount %u.\n", test_unk2.refcount); } +static void test_SHUnicodeToAnsi(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR emptyW[] = { 0 }; + char buff[16]; + int ret; + + ret = pSHUnicodeToAnsi(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + strcpy(buff, "abc"); + ret = pSHUnicodeToAnsi(NULL, buff, 2); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(buff[0] == 0 && buff[1] == 'b', "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(NULL, buff, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buff[0] == 1, "Unexpected buffer contents.\n"); + + buff[0] = 1; + strcpy(buff, "test"); + ret = pSHUnicodeToAnsi(emptyW, buff, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buff == 0, "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(testW, buff, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buff[0] == 1, "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(testW, buff, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buff == 0, "Unexpected buffer contents.\n"); + + ret = pSHUnicodeToAnsi(testW, buff, 16); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); + + ret = pSHUnicodeToAnsi(testW, buff, 2); + ok(ret == 2, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "t"), "Unexpected buffer contents.\n"); +} + +static void test_SHAnsiToUnicode(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + WCHAR buffW[16]; + int ret; + + ret = pSHAnsiToUnicode(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + buffW[0] = 1; + buffW[1] = 2; + ret = pSHAnsiToUnicode(NULL, buffW, 2); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 0 && buffW[1] == 2, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode(NULL, buffW, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 1, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("", buffW, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buffW == 0, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("test", buffW, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 1, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("test", buffW, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buffW == 0, "Unexpected buffer contents.\n"); + + ret = pSHAnsiToUnicode("test", buffW, 16); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!lstrcmpW(buffW, testW), "Unexpected buffer contents.\n"); + + ret = pSHAnsiToUnicode("test", buffW, 2); + ok(ret == 2, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 't' && buffW[1] == 0, "Unexpected buffer contents.\n"); +} + +static void test_SHAnsiToAnsi(void) +{ + char buff[16]; + int ret; + + ret = pSHAnsiToAnsi(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("test", buff, 3); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "te"), "Unexpected buffer contents.\n"); + ok(buff[3] == 'd', "Unexpected buffer contents.\n"); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("", buff, 3); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(!*buff, "Unexpected buffer contents.\n"); + ok(buff[3] == 'd', "Unexpected buffer contents.\n"); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("test", buff, 4); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "tes"), "Unexpected buffer contents.\n"); + ok(buff[4] == 'e', "Unexpected buffer contents.\n"); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("test", buff, 5); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); + ok(buff[5] == 'f', "Unexpected buffer contents.\n"); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("test", buff, 6); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); + ok(buff[5] == 'f', "Unexpected buffer contents.\n"); +} + +static void test_SHUnicodeToUnicode(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR strW[] = {'a','b','c','d','e','f','g','h','i','k','l','m',0}; + static const WCHAR emptyW[] = { 0 }; + WCHAR buff[16]; + int ret; + + ret = pSHUnicodeToUnicode(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(testW, buff, 3); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!memcmp(buff, testW, 2 * sizeof(WCHAR)) && !buff[2], "Unexpected buffer contents.\n"); + ok(buff[3] == 'd', "Unexpected buffer contents.\n"); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(emptyW, buff, 3); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(!*buff, "Unexpected buffer contents.\n"); + ok(buff[3] == 'd', "Unexpected buffer contents.\n"); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(testW, buff, 4); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!memcmp(buff, testW, 3 * sizeof(WCHAR)) && !buff[3], "Unexpected buffer contents.\n"); + ok(buff[4] == 'e', "Unexpected buffer contents.\n"); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(testW, buff, 5); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!lstrcmpW(buff, testW), "Unexpected buffer contents.\n"); + ok(buff[5] == 'f', "Unexpected buffer contents.\n"); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(testW, buff, 6); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!lstrcmpW(buff, testW), "Unexpected buffer contents.\n"); + ok(buff[5] == 'f', "Unexpected buffer contents.\n"); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -135,4 +313,8 @@ START_TEST(shcore) init(hshcore); test_process_reference(); + test_SHUnicodeToAnsi(); + test_SHAnsiToUnicode(); + test_SHAnsiToAnsi(); + test_SHUnicodeToUnicode(); } -- 2.19.2

4 9

[PATCH v2 1/8] riched20: Add destroy_para() helper.
by Sergio Gómez Del Real 29 Nov '18

29 Nov '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/riched20/editor.c | 5 ++++- dlls/riched20/editor.h | 1 + dlls/riched20/list.c | 6 ------ dlls/riched20/para.c | 11 ++++++++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2571ce97bc..d79888b933 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3164,7 +3164,10 @@ void ME_DestroyEditor(ME_TextEditor *editor) ME_EmptyUndoStack(editor); while(p) { pNext = p->next; - ME_DestroyDisplayItem(p); + if (p->type == diParagraph) + destroy_para(editor, p); + else + ME_DestroyDisplayItem(p); p = pNext; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index eba6d35fc7..e1a002bfaa 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -77,6 +77,7 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index ba35a90a98..23d1a38991 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -161,12 +161,6 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) { if (0) TRACE("type=%s\n", ME_GetDITypeName(item->type)); - if (item->type==diParagraph) - { - ME_DestroyString(item->member.para.text); - para_num_clear( &item->member.para.para_num ); - } - if (item->type==diRun) { if (item->member.run.reobj) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fcd7936807..3d86734aa1 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -32,6 +32,15 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) return item; } +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) +{ + assert(item->type == diParagraph); + + ME_DestroyString(item->member.para.text); + para_num_clear( &item->member.para.para_num ); + ME_DestroyDisplayItem(item); +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; @@ -682,7 +691,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, tp->member.para.next_para = pNext->member.para.next_para; pNext->member.para.next_para->member.para.prev_para = tp; ME_Remove(pNext); - ME_DestroyDisplayItem(pNext); + destroy_para(editor, pNext); ME_PropagateCharOffset(tp->member.para.next_para, -end_len); -- 2.17.1

2 15

[PATCH] explorer: Fix atom leaks caused by not releasing DDE interface
by Ralf Habacker 29 Nov '18

29 Nov '18

2 1

[PATCH v2] winealsa.drv: Don't crash when getting NULL event from midi
by Fabian Maurer 29 Nov '18

29 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46170 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/winealsa.drv/midi.c | 226 ++++++++++++++++++++------------------- 1 file changed, 118 insertions(+), 108 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 3d4d933ead..58b10bf666 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -292,6 +292,116 @@ static int midiCloseSeq(void) return 0; } +static void handle_midi_event(snd_seq_event_t *ev) +{ + WORD wDevID; + + /* Find the target device */ + for (wDevID = 0; wDevID < MIDM_NumDevs; wDevID++) + if ( (ev->source.client == MidiInDev[wDevID].addr.client) && (ev->source.port == MidiInDev[wDevID].addr.port) ) + break; + if ((wDevID == MIDM_NumDevs) || (MidiInDev[wDevID].state != 1)) + FIXME("Unexpected event received, type = %x from %d:%d\n", ev->type, ev->source.client, ev->source.port); + else { + DWORD dwTime, toSend = 0; + int value = 0; + /* FIXME: Should use ev->time instead for better accuracy */ + dwTime = GetTickCount() - MidiInDev[wDevID].startTime; + TRACE("Event received, type = %x, device = %d\n", ev->type, wDevID); + switch(ev->type) + { + case SND_SEQ_EVENT_NOTEOFF: + toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; + break; + case SND_SEQ_EVENT_NOTEON: + toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; + break; + case SND_SEQ_EVENT_KEYPRESS: + toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CONTROLLER: + toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PITCHBEND: + value = ev->data.control.value + 0x2000; + toSend = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PGMCHANGE: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CHANPRESS: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CLOCK: + toSend = 0xF8; + break; + case SND_SEQ_EVENT_START: + toSend = 0xFA; + break; + case SND_SEQ_EVENT_CONTINUE: + toSend = 0xFB; + break; + case SND_SEQ_EVENT_STOP: + toSend = 0xFC; + break; + case SND_SEQ_EVENT_SONGPOS: + toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; + break; + case SND_SEQ_EVENT_SONGSEL: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; + break; + case SND_SEQ_EVENT_RESET: + toSend = 0xFF; + break; + case SND_SEQ_EVENT_QFRAME: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; + break; + case SND_SEQ_EVENT_SYSEX: + { + int pos = 0; + int len = ev->data.ext.len; + LPBYTE ptr = ev->data.ext.ptr; + LPMIDIHDR lpMidiHdr; + + EnterCriticalSection(&crit_sect); + while (len) { + if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { + int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); + memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr + pos, copylen); + lpMidiHdr->dwBytesRecorded += copylen; + len -= copylen; + pos += copylen; + /* We check if we reach the end of buffer or the end of sysex before notifying + * to handle the case where ALSA split the sysex into several events */ + if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || + (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + } + } else { + FIXME("Sysex data received but no buffer to store it!\n"); + break; + } + } + LeaveCriticalSection(&crit_sect); + } + break; + case SND_SEQ_EVENT_SENSING: + /* Noting to do */ + break; + default: + FIXME("Unhandled event received, type = %x\n", ev->type); + break; + } + if (toSend != 0) { + TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); + MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); + } + } +} + static DWORD WINAPI midRecThread(LPVOID arg) { int npfd; @@ -323,116 +433,16 @@ static DWORD WINAPI midRecThread(LPVOID arg) }*/ do { - WORD wDevID; - snd_seq_event_t* ev; + snd_seq_event_t *ev; + EnterCriticalSection(&midiSeqLock); - snd_seq_event_input(midiSeq, &ev); + snd_seq_event_input(midiSeq, &ev); LeaveCriticalSection(&midiSeqLock); - /* Find the target device */ - for (wDevID = 0; wDevID < MIDM_NumDevs; wDevID++) - if ( (ev->source.client == MidiInDev[wDevID].addr.client) && (ev->source.port == MidiInDev[wDevID].addr.port) ) - break; - if ((wDevID == MIDM_NumDevs) || (MidiInDev[wDevID].state != 1)) - FIXME("Unexpected event received, type = %x from %d:%d\n", ev->type, ev->source.client, ev->source.port); - else { - DWORD dwTime, toSend = 0; - int value = 0; - /* FIXME: Should use ev->time instead for better accuracy */ - dwTime = GetTickCount() - MidiInDev[wDevID].startTime; - TRACE("Event received, type = %x, device = %d\n", ev->type, wDevID); - switch(ev->type) - { - case SND_SEQ_EVENT_NOTEOFF: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; - break; - case SND_SEQ_EVENT_NOTEON: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; - break; - case SND_SEQ_EVENT_KEYPRESS: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CONTROLLER: - toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PITCHBEND: - value = ev->data.control.value + 0x2000; - toSend = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PGMCHANGE: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CHANPRESS: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CLOCK: - toSend = 0xF8; - break; - case SND_SEQ_EVENT_START: - toSend = 0xFA; - break; - case SND_SEQ_EVENT_CONTINUE: - toSend = 0xFB; - break; - case SND_SEQ_EVENT_STOP: - toSend = 0xFC; - break; - case SND_SEQ_EVENT_SONGPOS: - toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; - break; - case SND_SEQ_EVENT_SONGSEL: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; - break; - case SND_SEQ_EVENT_RESET: - toSend = 0xFF; - break; - case SND_SEQ_EVENT_QFRAME: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; - break; - case SND_SEQ_EVENT_SYSEX: - { - int pos = 0; - int len = ev->data.ext.len; - LPBYTE ptr = ev->data.ext.ptr; - LPMIDIHDR lpMidiHdr; - - EnterCriticalSection(&crit_sect); - while (len) { - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); - memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr + pos, copylen); - lpMidiHdr->dwBytesRecorded += copylen; - len -= copylen; - pos += copylen; - /* We check if we reach the end of buffer or the end of sysex before notifying - * to handle the case where ALSA split the sysex into several events */ - if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || - (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - } else { - FIXME("Sysex data received but no buffer to store it!\n"); - break; - } - } - LeaveCriticalSection(&crit_sect); - } - break; - case SND_SEQ_EVENT_SENSING: - /* Noting to do */ - break; - default: - FIXME("Unhandled event received, type = %x\n", ev->type); - break; - } - if (toSend != 0) { - TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); - MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); - } - } - snd_seq_free_event(ev); + + if (ev) { + handle_midi_event(ev); + snd_seq_free_event(ev); + } EnterCriticalSection(&midiSeqLock); ret = snd_seq_event_input_pending(midiSeq, 0); -- 2.19.1

2 2

[PATCH 1/8] riched20: Add destroy_para() helper.
by Sergio Gómez Del Real 29 Nov '18

29 Nov '18

--- dlls/riched20/editor.c | 5 ++++- dlls/riched20/editor.h | 1 + dlls/riched20/list.c | 6 ------ dlls/riched20/para.c | 11 ++++++++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2571ce97bc..d79888b933 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3164,7 +3164,10 @@ void ME_DestroyEditor(ME_TextEditor *editor) ME_EmptyUndoStack(editor); while(p) { pNext = p->next; - ME_DestroyDisplayItem(p); + if (p->type == diParagraph) + destroy_para(editor, p); + else + ME_DestroyDisplayItem(p); p = pNext; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index eba6d35fc7..e1a002bfaa 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -77,6 +77,7 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index ba35a90a98..23d1a38991 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -161,12 +161,6 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) { if (0) TRACE("type=%s\n", ME_GetDITypeName(item->type)); - if (item->type==diParagraph) - { - ME_DestroyString(item->member.para.text); - para_num_clear( &item->member.para.para_num ); - } - if (item->type==diRun) { if (item->member.run.reobj) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fcd7936807..3d86734aa1 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -32,6 +32,15 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) return item; } +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) +{ + assert(item->type == diParagraph); + + ME_DestroyString(item->member.para.text); + para_num_clear( &item->member.para.para_num ); + ME_DestroyDisplayItem(item); +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; @@ -682,7 +691,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, tp->member.para.next_para = pNext->member.para.next_para; pNext->member.para.next_para->member.para.prev_para = tp; ME_Remove(pNext); - ME_DestroyDisplayItem(pNext); + destroy_para(editor, pNext); ME_PropagateCharOffset(tp->member.para.next_para, -end_len); -- 2.17.1

1 7

[PATCH] setupapi: fixed size passed to MultiByteToWideChar
by Marcus Meissner 29 Nov '18

29 Nov '18

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 55fca897c3..ae7a575302 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1351,7 +1351,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, return FALSE; } - MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, sizeof(nameW)); + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, ARRAY_SIZE(nameW)); if (DeviceDescription) { -- 2.19.1

1 0

[PATCH] krnl386.exe16: Fix a typo in comment.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/krnl386.exe16/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 4e7f7c4b33..44b1e759a7 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -549,7 +549,7 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, if (!entry) { /* We have to return the list of keys in the section but without the values - * so we need to massage the results of GetPrivateProfileSectionA. + * so we need to message the results of GetPrivateProfileSectionA. */ UINT ret, oldlen = len, size = min( len, 1024 ); LPSTR data, src; -- 2.17.2

2 1

[PATCH] oleaut32: Fix a typo in FIXME() message.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/oleaut32/safearray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 01dbfc3417..64a5ab94d5 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -289,7 +289,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell) ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); if (ulStartCell > ulCellCount) { - FIXME("unexpted ulcellcount %d, start %d\n",ulCellCount,ulStartCell); + FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell); return E_UNEXPECTED; } -- 2.17.2

1 0

[PATCH] kernel32/tests: Fix typos in ok() messages.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index f27bbdf2b5..331db9b23b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1012,8 +1012,8 @@ static VOID test_GetCurrentThreadStackLimits(void) } pGetCurrentThreadStackLimits(&low, &high); - ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "exptected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); - ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "exptected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); + ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "expected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); + ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "expected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); } static VOID test_GetThreadExitCode(void) -- 2.17.2

1 0

[PATCH] shell32: Fix a typo in comment.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/shell32/shfldr_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 66150f4ce8..22f568a592 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -288,7 +288,7 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) * Now we can parse into namespaces implemented by shell extensions * * Behaviour on win98: lpszDisplayName=NULL -> crash -* lpszDisplayName="" -> returns mycoputer-pidl +* lpszDisplayName="" -> returns mycomputer-pidl * * FIXME * pdwAttributes is not set -- 2.17.2

1 0

[PATCH] ntdll/tests: Fix a typo in comment.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntdll/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 79344e7e74..b59d267618 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -374,7 +374,7 @@ todo_wine ok(!key, "key = %p\n", key); if (status == STATUS_SUCCESS) NtClose(key); - /* Calling without parent key requres full registry path. */ + /* Calling without parent key requires full registry path. */ pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); InitializeObjectAttributes(&attr, &str, 0, 0, 0); key = (HANDLE)0xdeadbeef; -- 2.17.2

1 0

[PATCH] riched20/tests: Fix typos in ok() messages.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/riched20/tests/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1aa08f89a4..0415be8b80 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -1013,9 +1013,9 @@ static void test_default_format(void) ITextHostImpl_TxGetCharFormat(host, &host_cf); ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); - ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expected %d.\n", cf2.yHeight, host_cf->yHeight); expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); - ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(host_cf->dwEffects == expected_effects, "got wrong dwEffects: %x, expected %x.\n", cf2.dwEffects, expected_effects); ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", cf2.bPitchAndFamily, host_cf->bPitchAndFamily); ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); -- 2.17.2

1 0

[PATCH 1/2] shell32/iconcache: Prevent the imagelists from going out of sync when loading an icon
by Gabriel Ivăncescu 29 Nov '18

29 Nov '18

When populating the imagelists cache with icons of different sizes, it can happen that only some icon sizes actually succeed the extraction, with others failing with a NULL handle. This is especially true with some broken "executable packers" where for example, a 32x32 icon loads okay, but a 16x16 fails. Even when PrivateExtractIconsW succeeds, the returned handle can still be NULL, leading to the ImageLists becoming out of sync. This fixes a regression, because at some point, we stopped failing if one icon failed to extract, so when SIC_IconAppend called ImageList_AddIcon with a NULL icon handle, it would go out of sync. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/iconcache.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c..44422ab 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -364,13 +364,14 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 }; unsigned int i; SIZE size; - int ret; + INT ret = -1; for (i = 0; i < ARRAY_SIZE(hicons); i++) { get_imagelist_icon_size( i, &size ); if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); + if (!hicons[i]) goto fail; } if (flags & GIL_FORSHORTCUT) @@ -403,6 +404,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) } ret = SIC_IconAppend( sourcefile, index, hicons, flags ); + +fail: for (i = 0; i < ARRAY_SIZE(hicons); i++) DestroyIcon(hicons[i]); return ret; -- 2.19.1

2 7

TestBot news
by Francois Gouget 29 Nov '18

29 Nov '18

Yesterday I added an option to let the TestBot administrator decide whether to run all the tests in Wine for every Wine patch. I have not activated it yet. But I set it to run all of a dll's tests on Wine whenever that dll is patched. So for instance because job 43715 patched dinput the TestBot reran all of the dinput tests. In contrast, for dinput8 the patch only modified dinput8:dinput so only that test was rerun. And yes, this also illustrates that this mode does not take PARENTSRC into account (yet) :-( https://testbot.winehq.org/JobDetails.pl?Key=43715&f601=win32.report#k601 If this does not cause too many issues (false positives, long processing times) I'll change it to run all the tests all the time in a few days. The remaining todo list for the TestBot: * Add support for locales in Wine VMs. * Fix the performance issues caused by running all the tests on Wine for every Wine patch (I expect we can get by with just duplicating the Debian VM so we can run all the win32 tests on one host while another runs the module-level wow32 + wow64 + locale ones). * Allow submitting Windows test executables to run in Wine. * Allow specifying a locale for jobs running in Wine. * Better locale handling when submitting a job on the Windows VMs (duplicating the VM on the submit page is fine as long as there are only a couple locales but will get unwieldly as more are added). * Fix date/time handling on Wine VMs (the time is not updated when the task starts and risks getting too far off). * Support for Wine's other source repositories to limit the risk of misidentifying Wine patches. * Have the TestBot build its own WineTest executables. * Split the "Update Wine VMs" job in two so it does not hog the Debian VM for hours. * Testing vkd3d's patches... somehow. * Monitoring the VM disk sizes (the Debian one grows particularly fast). * Fix monitoring of WineTest log sizes. * Update the Windows VMs (Windows+TestAgentd). The Windows 10 one obviously but also the slow reverting ones (w7u 3mn, wvista 1mn, w864 1mn). * Automate creating locale snapshots for the Windows Ultimate VMs somehow (either via Ansible or through TestAgentd). * Add more locale snapshots for the Windows Ultimate VMs (w7u and wvistau64). * Remember the user's VM preferences for jobs. * Let users change their email, password, etc. * One day maybe: rewrite the web interface using "modern" technologies to avoid page reloads. -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

[PATCH 1/2] kernel32/tests: Align SizeOfHeaders to FileAlignment
by Brendan McGrath 29 Nov '18

29 Nov '18

According to: https://docs.microsoft.com/en-us/windows/desktop/debug/pe-format#optional-h… SizeOfHeaders: The combined size of an MS-DOS stub, PE header, and section headers rounded up to a multiple of FileAlignment. This change also fixes two kernel loader tests currently failing under 64bit. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- This patch set fixes three of the four failing 64bit kernel32 loader tests. The remaining test that fails is due to the clr header being version 2.4 and wine only offering 64bit support for clr header version 2.5 and above. I couldn't find any documentation to state why that is so I've left the test as failing. dlls/kernel32/tests/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 01c7cfa8a911..aaaa39f601d4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1097,7 +1097,7 @@ static void test_Loader(void) nt64.OptionalHeader.MajorOperatingSystemVersion = 4; nt64.OptionalHeader.MajorImageVersion = 1; nt64.OptionalHeader.MajorSubsystemVersion = 4; - nt64.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt64) + sizeof(IMAGE_SECTION_HEADER); + nt64.OptionalHeader.SizeOfHeaders = ALIGN_SIZE(sizeof(dos_header) + sizeof(nt64) + sizeof(IMAGE_SECTION_HEADER), nt64.OptionalHeader.FileAlignment); nt64.OptionalHeader.SizeOfImage = nt64.OptionalHeader.SizeOfHeaders + 0x1000; nt64.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; nt64.OptionalHeader.SizeOfStackReserve = 0x321000; @@ -1212,7 +1212,7 @@ static void test_Loader(void) nt32.OptionalHeader.MajorOperatingSystemVersion = 4; nt32.OptionalHeader.MajorImageVersion = 1; nt32.OptionalHeader.MajorSubsystemVersion = 4; - nt32.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt32) + sizeof(IMAGE_SECTION_HEADER); + nt32.OptionalHeader.SizeOfHeaders = ALIGN_SIZE(sizeof(dos_header) + sizeof(nt32) + sizeof(IMAGE_SECTION_HEADER), nt32.OptionalHeader.FileAlignment); nt32.OptionalHeader.SizeOfImage = nt32.OptionalHeader.SizeOfHeaders + 0x1000; nt32.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; nt32.OptionalHeader.SizeOfStackReserve = 0x321000; -- 2.17.1

3 5

[PATCH 1/2] libs/wine: Do not restrict base address of main thread on 64 bit mac os.
by Ken Thomases 29 Nov '18

29 Nov '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- libs/wine/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 0af3b8e..8f40ea0 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -709,6 +709,7 @@ struct apple_stack_info * Callback for wine_mmap_enum_reserved_areas to allocate space for * the secondary thread's stack. */ +#ifndef _WIN64 static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) { struct apple_stack_info *info = arg; @@ -725,6 +726,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED ); return (info->stack != (void *)-1); } +#endif /*********************************************************************** * apple_create_wine_thread @@ -742,6 +744,7 @@ static void apple_create_wine_thread( void *init_func ) if (!pthread_attr_init( &attr )) { +#ifndef _WIN64 struct apple_stack_info info; /* Try to put the new thread's stack in the reserved area. If this @@ -753,6 +756,7 @@ static void apple_create_wine_thread( void *init_func ) wine_mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); } +#endif if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && !pthread_create( &thread, &attr, init_func, NULL )) -- 2.10.2

2 2

[PATCH] testbot/WineRunBuild: Trust the build task's missions.
by Francois Gouget 29 Nov '18

29 Nov '18

We now set the build task's missions field with the list of builds to perform so there is no need to recompute it in WineRunBuild. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 5a3a683fbb..68e6be4c0c 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -335,22 +335,6 @@ if ($Step->FileType ne "patch") } -# -# Figure out what to build -# - -my (%Missions, %TestExes); -foreach my $TestStep (@{$Job->Steps->GetItems()}) -{ - if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe/) - { - $Missions{$TestStep->FileType} = 1; - $TestExes{$TestStep->FileName} = $TestStep->FileType; - } -} - - # # Run the build # @@ -364,7 +348,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Missions) ."\n". + " ../bin/build/Build.pl patch.diff ". $Task->Missions ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -446,6 +430,16 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # +my %TestExes; +foreach my $TestStep (@{$Job->Steps->GetItems()}) +{ + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe/) + { + $TestExes{$TestStep->FileName} = $TestStep->FileType; + } +} + my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) -- 2.19.1

1 0

[PATCH] testbot/web: Clean up Submit's page handling.
by Francois Gouget 29 Nov '18

29 Nov '18

Also validate the page like every parameter coming from the web browser. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 5c40ef5046..a81a954d5b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -48,6 +48,9 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->{Page} = $self->GetParam("Page") || 1; + # Page is a hidden parameter so fix it instead of issuing an error + $self->{Page} = 1 if ($self->{Page} !~ /^[1-4]$/); + $self->{LastPage} = $self->{Page}; my @PropertyDescriptors1 = ( CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), @@ -132,8 +135,7 @@ sub GenerateFields($) { my ($self) = @_; - print "<div><input type='hidden' name='Page' value='", $self->{Page}, - "'></div>\n"; + print "<div><input type='hidden' name='Page' value='$self->{Page}'></div>\n"; if ($self->{Page} == 1) { print "<div class='ItemProperty'><label>File</label>", @@ -215,7 +217,7 @@ sub GenerateFields($) } if ($self->{Page} == 2) { - if ($self->GetParam("Page") == 3) + if ($self->{LastPage} == 3) { my $VMs = CreateVMs(); # VMs that are only visible with ShowAll @@ -274,7 +276,7 @@ sub GenerateFields($) $Checked = undef; } if ($Checked and - ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) + ($self->{LastPage} == 1 || $self->GetParam($FieldName))) { print " checked='checked'"; } @@ -454,7 +456,7 @@ sub Validate($) { my ($self) = @_; - if ($self->{Page} == 2 && $self->GetParam("Page") == 2) + if ($self->{Page} == 2 && $self->{LastPage} == 2) { my $VMSelected = !1; my $VMs = CreateVMs(); @@ -474,7 +476,7 @@ sub Validate($) return !1; } } - elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) + elsif ($self->{Page} == 3 && $self->{LastPage} == 3) { if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || -- 2.19.1

1 0

[PATCH] testbot: Better identify when multiple locales are tested.
by Francois Gouget 29 Nov '18

29 Nov '18

Previously testing the default English locale and one other locale would only show the latter in the mission description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 18d4f5ed3f..26623405d4 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -125,14 +125,16 @@ sub GetTaskMissionDescription($$) my $Lang; foreach my $Mission (@{$TaskMission->{Missions}}) { - next if (!$Mission->{lang}); - if (defined $Lang) + if (!defined $Lang) + { + $Lang = $Mission->{lang} || ""; + } + elsif ($Lang ne ($Mission->{lang} || "")) { $Description .= " + Locales"; $Lang = undef; last; } - $Lang = $Mission->{lang}; } $Description .= " ". LocaleName($Lang) if ($Lang); $Description .= " tests"; -- 2.19.1

1 0

[PATCH 3/3] gdi32/tests: Explicitly test BeginPath() return value in the metafile path tests.
by Dmitry Timoshkov 29 Nov '18

29 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/metafile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b33437a172..15f29d61fc 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2963,7 +2963,8 @@ static void test_mf_GetPath(void) hdc = CreateMetaFileA(NULL); ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); - BeginPath(hdc); + ret = BeginPath(hdc); + ok(!ret, "BeginPath on metafile DC should fail\n"); ret = MoveToEx(hdc, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdc, 50, 150); @@ -3851,7 +3852,8 @@ static void test_emf_paths(void) hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); - BeginPath(hdcMetafile); + ret = BeginPath(hdcMetafile); + ok(ret, "BeginPath error %d\n", GetLastError()); ret = MoveToEx(hdcMetafile, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 50, 150); -- 2.17.1

2 1

[PATCH 2/3] gdi32: ExtTextOut on a path with bitmap font selected shouldn't fail.
by Dmitry Timoshkov 29 Nov '18

29 Nov '18

This just leads to empty path generated. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/path.c | 2 +- dlls/gdi32/tests/metafile.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 49e270c4fe..402b082f4c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1594,7 +1594,7 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC void *outline; dwSize = GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity); - if (dwSize == GDI_ERROR) return FALSE; + if (dwSize == GDI_ERROR) continue; /* add outline only if char is printable */ if(dwSize) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index c683f58af9..b33437a172 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2439,7 +2439,6 @@ static void test_emf_ExtTextOut_on_path(void) ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); -todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcDisplay); @@ -2455,7 +2454,7 @@ todo_wine ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); - todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); + ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcMetafile); ok(ret, "EndPath error %d\n", GetLastError()); @@ -2514,7 +2513,6 @@ todo_wine ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); -todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcMetafile); -- 2.17.1

2 1

[PATCH 1/3] gdi32/tests: Add some additional tests for ExtExtOut on a path for an EMF DC.
by Dmitry Timoshkov 29 Nov '18

29 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/metafile.c | 118 ++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 230d1e6d84..c683f58af9 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1122,6 +1122,44 @@ static const unsigned char EMF_TEXTOUT_ON_PATH_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_TEXTOUT_OUTLINE_ON_PATH_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x90, 0x06, 0x00, 0x00, 0x1a, 0x04, 0x00, 0x00, + 0x51, 0x02, 0x00, 0x00, 0x72, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x1a, 0x0b, 0x09, 0x00, + 0xf0, 0xa6, 0x05, 0x00, 0x25, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x80, + 0x3b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x54, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x01, 0x00, 0x00, 0x00, 0xc3, 0x30, 0x0d, 0x42, + 0xcf, 0xf3, 0x0c, 0x42, 0x0b, 0x00, 0x00, 0x00, + 0x16, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x54, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, + 0x73, 0x00, 0x74, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x80, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + static const unsigned char MF_LINETO_BITS[] = { 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -2384,6 +2422,8 @@ static void test_emf_ExtTextOut_on_path(void) HDC hdcDisplay, hdcMetafile; HENHMETAFILE hMetafile; BOOL ret; + LOGFONTA lf; + HFONT hFont; static const INT dx[4] = { 3, 5, 8, 12 }; /* Win9x doesn't play EMFs on invisible windows */ @@ -2394,6 +2434,20 @@ static void test_emf_ExtTextOut_on_path(void) hdcDisplay = GetDC(hwnd); ok(hdcDisplay != 0, "GetDC error %d\n", GetLastError()); + /* with default font */ + ret = BeginPath(hdcDisplay); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); +todo_wine + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcDisplay); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcDisplay, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); @@ -2406,6 +2460,9 @@ static void test_emf_ExtTextOut_on_path(void) ret = EndPath(hdcMetafile); ok(ret, "EndPath error %d\n", GetLastError()); + ret = GetPath(hdcMetafile, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); + hMetafile = CloseEnhMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -2421,6 +2478,67 @@ static void test_emf_ExtTextOut_on_path(void) ret = DeleteEnhMetaFile(hMetafile); ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); + + /* with outline font */ + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = ANSI_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfWeight = FW_DONTCARE; + lf.lfHeight = 7; + lf.lfQuality = DEFAULT_QUALITY; + lstrcpyA(lf.lfFaceName, "Tahoma"); + hFont = CreateFontIndirectA(&lf); + ok(hFont != 0, "CreateFontIndirectA error %d\n", GetLastError()); + hFont = SelectObject(hdcDisplay, hFont); + + ret = BeginPath(hdcDisplay); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcDisplay); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcDisplay, NULL, NULL, 0); + ok(ret != 0, "expected != 0\n"); + + SelectObject(hdcDisplay, hFont); + + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + hFont = SelectObject(hdcMetafile, hFont); + + ret = BeginPath(hdcMetafile); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); +todo_wine + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcMetafile); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcMetafile, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); + + hFont = SelectObject(hdcMetafile, hFont); + DeleteObject(hFont); + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if (compare_emf_bits(hMetafile, EMF_TEXTOUT_OUTLINE_ON_PATH_BITS, sizeof(EMF_TEXTOUT_OUTLINE_ON_PATH_BITS), + "emf_TextOut_on_path", FALSE) != 0) + { + dump_emf_bits(hMetafile, "emf_TextOut_outline_on_path"); + dump_emf_records(hMetafile, "emf_TextOut_outline_on_path"); + } + + ret = DeleteEnhMetaFile(hMetafile); + ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); + ret = ReleaseDC(hwnd, hdcDisplay); ok(ret, "ReleaseDC error %d\n", GetLastError()); DestroyWindow(hwnd); -- 2.17.1

2 1

[PATCH] gdi32: Improve detection of symbol charset for old truetype fonts.
by Dmitry Timoshkov 29 Nov '18

29 Nov '18

This patch uses same check for symbol charset that get_outline_text_metrics() already does, and allows the font attached to the bug 33117 be correctly recognized as a symbol ttf (like Windows does). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/freetype.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5a4727239c..638ff941b0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2011,7 +2011,6 @@ static inline void get_bitmap_size( FT_Face ft_face, Bitmap_Size *face_size ) static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) { TT_OS2 *os2; - FT_UInt dummy; CHARSETINFO csi; FT_WinFNT_HeaderRec winfnt_header; int i; @@ -2028,10 +2027,10 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) if (os2->version == 0) { - if (pFT_Get_First_Char( ft_face, &dummy ) < 0x100) - fs->fsCsb[0] = FS_LATIN1; - else + if (os2->usFirstCharIndex >= 0xf000 && os2->usFirstCharIndex < 0xf100) fs->fsCsb[0] = FS_SYMBOL; + else + fs->fsCsb[0] = FS_LATIN1; } else { -- 2.17.1

2 1

[v2 PATCH 1/5] wincodecs: Fix return values for scaler's CopyPalette().
by Nikolay Sivov 29 Nov '18

29 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 3789831a97..eedc1bbac4 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -163,7 +163,7 @@ static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, return E_INVALIDARG; if (!This->source) - return WINCODEC_ERR_WRONGSTATE; + return WINCODEC_ERR_PALETTEUNAVAILABLE; return IWICBitmapSource_CopyPalette(This->source, pIPalette); } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 2b5c373bf9..d4b597900d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1084,6 +1084,7 @@ static void test_bitmap_scaler(void) { WICPixelFormatGUID pixel_format; IWICBitmapScaler *scaler; + IWICPalette *palette; double res_x, res_y; IWICBitmap *bitmap; UINT width, height; @@ -1148,6 +1149,15 @@ static void test_bitmap_scaler(void) ok(width == 123, "Unexpected width %u.\n", width); ok(height == 321, "Unexpected height %u.\n", height); + hr = IWICBitmapScaler_CopyPalette(scaler, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 4, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1224,6 +1234,12 @@ static void test_bitmap_scaler(void) ok(hr == S_OK, "Failed to get scaler resolution, hr %#x.\n", hr); ok(res_x == 0.0 && res_y == 0.0, "Unexpected resolution %f x %f.\n", res_x, res_y); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap); -- 2.19.2

1 4

[PATCH] gdi32: Try Fontconfig substitutions when the font face is missing.
by Akihiro Sagawa 29 Nov '18

29 Nov '18

This improves font selection. With this patch, we can choose a decent font family by Fontconfig. Otherwise, Wine chooses some fonts based on supported charset, e.g. Droid Sans Fallback. Droid Sans Fallback supports various scripts including Japanese. However, as it's a fallback font, it doesn't have Latin alphabet glyphs. If the font is chosen, typically Japanese Ubuntu environment, users see a lot of squares instead of Latin alphabets. This patch asks Fontconfig for the best font for the current locale. If the font is returned and matches requested charset, the font is used. If failure, it fallbacks to existing procedure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)

2 1

[PATCH 1/4] shell32/autocomplete: Sort the enumerated strings using a helper function
by Gabriel Ivăncescu 29 Nov '18

29 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 236ba15..b9ea68f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -103,11 +103,16 @@ static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); } -static int enumerate_strings_cmpfn(const void *a, const void *b) +static int sort_strs_cmpfn(const void *a, const void *b) { return strcmpiW(*(WCHAR* const*)a, *(WCHAR* const*)b); } +static void sort_strs(WCHAR **strs, UINT numstrs) +{ + qsort(strs, numstrs, sizeof(*strs), sort_strs_cmpfn); +} + /* Enumerate all of the strings and sort them in the internal list. @@ -140,7 +145,7 @@ static void enumerate_strings(IAutoCompleteImpl *ac) { strs = tmp; if (cur > 0) - qsort(strs, cur, sizeof(*strs), enumerate_strings_cmpfn); + sort_strs(strs, cur); ac->enum_strs = strs; ac->enum_strs_num = cur; -- 2.19.1

2 7

[PATCH 1/5] wincodecs: Fix return value for scaler's CopyPalette().
by Nikolay Sivov 29 Nov '18

29 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 3789831a97..eedc1bbac4 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -163,7 +163,7 @@ static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, return E_INVALIDARG; if (!This->source) - return WINCODEC_ERR_WRONGSTATE; + return WINCODEC_ERR_PALETTEUNAVAILABLE; return IWICBitmapSource_CopyPalette(This->source, pIPalette); } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 2b5c373bf9..d4b597900d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1084,6 +1084,7 @@ static void test_bitmap_scaler(void) { WICPixelFormatGUID pixel_format; IWICBitmapScaler *scaler; + IWICPalette *palette; double res_x, res_y; IWICBitmap *bitmap; UINT width, height; @@ -1148,6 +1149,15 @@ static void test_bitmap_scaler(void) ok(width == 123, "Unexpected width %u.\n", width); ok(height == 321, "Unexpected height %u.\n", height); + hr = IWICBitmapScaler_CopyPalette(scaler, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 4, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1224,6 +1234,12 @@ static void test_bitmap_scaler(void) ok(hr == S_OK, "Failed to get scaler resolution, hr %#x.\n", hr); ok(res_x == 0.0 && res_y == 0.0, "Unexpected resolution %f x %f.\n", res_x, res_y); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap); -- 2.19.2

3 10

[v2 PATCH 1/4] shcore: Implement a bunch of string conversion functions.
by Nikolay Sivov 29 Nov '18

29 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 102 +++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 8 +-- dlls/shcore/tests/shcore.c | 95 ++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 4 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index bf477aefcc..2f32a741f4 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1455,3 +1455,105 @@ HRESULT WINAPI SHStrDupA(const char *src, WCHAR **dest) return S_OK; } + +/************************************************************************* + * SHAnsiToAnsi [SHCORE.@] + */ +DWORD WINAPI SHAnsiToAnsi(const char *src, char *dest, int dest_len) +{ + DWORD ret = 0; + + TRACE("(%s, %p, %d)\n", debugstr_a(src), dest, dest_len); + + if (!src || !dest || dest_len <= 0) + return 0; + + while (dest_len > 1 && *src) + { + dest_len--; + *dest++ = *src++; + ret++; + } + + if (dest_len) + { + *dest = 0; + ret++; + } + + return ret; +} + +/************************************************************************* + * SHUnicodeToAnsi [SHCORE.@] + */ +DWORD WINAPI SHUnicodeToAnsi(const WCHAR *src, char *dest, int dest_len) +{ + int required = 1; + + TRACE("(%s, %p, %d)\n", debugstr_w(src), dest, dest_len); + + if (!dest || !dest_len) + return 0; + + if (src) + { + required = WideCharToMultiByte(CP_ACP, 0, src, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, src, -1, dest, dest_len, NULL, NULL); + } + dest_len = min(required, dest_len); + + dest[dest_len - 1] = 0; + return dest_len; +} + +/************************************************************************* + * SHUnicodeToUnicode [SHCORE.@] + */ +DWORD WINAPI SHUnicodeToUnicode(const WCHAR *src, WCHAR *dest, int dest_len) +{ + DWORD ret = 0; + + TRACE("(%s, %p, %d)\n", debugstr_w(src), dest, dest_len); + + if (!src || !dest || dest_len <= 0) + return 0; + + while (dest_len > 1 && *src) + { + dest_len--; + *dest++ = *src++; + ret++; + } + + if (dest_len) + { + *dest = 0; + ret++; + } + + return ret; +} + +/************************************************************************* + * SHAnsiToUnicode [SHCORE.@] + */ +DWORD WINAPI SHAnsiToUnicode(const char *src, WCHAR *dest, int dest_len) +{ + int required = 1; + + TRACE("(%s, %p, %d)\n", debugstr_a(src), dest, dest_len); + + if (!dest || !dest_len) + return 0; + + if (src) + { + required = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); + MultiByteToWideChar(CP_ACP, 0, src, -1, dest, dest_len); + } + dest_len = min(required, dest_len); + + dest[dest_len - 1] = 0; + return dest_len; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 1473bf7b0a..918ba5595c 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -29,8 +29,8 @@ @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications -@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi -@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode +@ stdcall SHAnsiToAnsi(str ptr long) +@ stdcall SHAnsiToUnicode(str ptr long) @ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA @ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW @ stdcall SHCreateMemStream(ptr long) @@ -75,8 +75,8 @@ @ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) -@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi -@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) +@ stdcall SHUnicodeToUnicode(wstr ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stdcall SetProcessReference(ptr) diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 904d8264cd..15fcda5449 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -29,12 +29,16 @@ static HRESULT (WINAPI *pGetProcessReference)(IUnknown **); static void (WINAPI *pSetProcessReference)(IUnknown *); static HRESULT (WINAPI *pSHGetInstanceExplorer)(IUnknown **); +static int (WINAPI *pSHUnicodeToAnsi)(const WCHAR *, char *, int); +static int (WINAPI *pSHAnsiToUnicode)(const char *, WCHAR *, int); static void init(HMODULE hshcore) { #define X(f) p##f = (void*)GetProcAddress(hshcore, #f) X(GetProcessReference); X(SetProcessReference); + X(SHUnicodeToAnsi); + X(SHAnsiToUnicode); #undef X } @@ -122,6 +126,95 @@ static void test_process_reference(void) ok(test_unk2.refcount == 3, "Unexpected refcount %u.\n", test_unk2.refcount); } +static void test_SHUnicodeToAnsi(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR emptyW[] = { 0 }; + char buff[16]; + int ret; + + ret = pSHUnicodeToAnsi(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + strcpy(buff, "abc"); + ret = pSHUnicodeToAnsi(NULL, buff, 2); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(buff[0] == 0 && buff[1] == 'b', "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(NULL, buff, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buff[0] == 1, "Unexpected buffer contents.\n"); + + buff[0] = 1; + strcpy(buff, "test"); + ret = pSHUnicodeToAnsi(emptyW, buff, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buff == 0, "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(testW, buff, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buff[0] == 1, "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(testW, buff, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buff == 0, "Unexpected buffer contents.\n"); + + ret = pSHUnicodeToAnsi(testW, buff, 16); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); + + ret = pSHUnicodeToAnsi(testW, buff, 2); + ok(ret == 2, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "t"), "Unexpected buffer contents.\n"); +} + +static void test_SHAnsiToUnicode(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + WCHAR buffW[16]; + int ret; + + ret = pSHAnsiToUnicode(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + buffW[0] = 1; + buffW[1] = 2; + ret = pSHAnsiToUnicode(NULL, buffW, 2); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 0 && buffW[1] == 2, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode(NULL, buffW, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 1, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("", buffW, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buffW == 0, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("test", buffW, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 1, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("test", buffW, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buffW == 0, "Unexpected buffer contents.\n"); + + ret = pSHAnsiToUnicode("test", buffW, 16); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!lstrcmpW(buffW, testW), "Unexpected buffer contents.\n"); + + ret = pSHAnsiToUnicode("test", buffW, 2); + ok(ret == 2, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 't' && buffW[1] == 0, "Unexpected buffer contents.\n"); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -135,4 +228,6 @@ START_TEST(shcore) init(hshcore); test_process_reference(); + test_SHUnicodeToAnsi(); + test_SHAnsiToUnicode(); } -- 2.19.2

2 7

[PATCH v2] wininet: Free security context in failure case.
by Daniel Lehman 29 Nov '18

29 Nov '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: invalidate handle after free --- dlls/wininet/netconnection.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4ad22177ee..c8bb3973e7 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -573,6 +573,10 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf); connection->ssl_buf = NULL; + if(SecIsValidHandle(&connection->ssl_ctx)) { + DeleteSecurityContext(&connection->ssl_ctx); + SecInvalidateHandle(&connection->ssl_ctx); + } return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; } -- 2.17.1

2 1

[PATCH v2] user32: LoadImage should not only search in the working directory
by Fabian Maurer 28 Nov '18

28 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46186 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Use SearchPathW and add more tests --- dlls/user32/cursoricon.c | 11 ++++- dlls/user32/tests/cursoricon.c | 89 ++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f11f5e45ed..0f64a32e41 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3039,11 +3039,20 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags ) { int depth; + WCHAR path[MAX_PATH]; TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); - if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; + if (loadflags & LR_LOADFROMFILE) { + loadflags &= ~LR_SHARED; + + /* Relative paths are not only relating to the current working directory */ + if (name != NULL && lstrlenW(name) > 2 && name[0] != '\\' && name[1] != ':') { + SearchPathW(NULL, name, NULL, ARRAY_SIZE(path), path, NULL); + name = path; + } + } switch (type) { case IMAGE_BITMAP: return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8404ee71ab..1db5467541 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,6 +1203,92 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } +void test_LoadImage_working_directory_run(char *path) +{ + DWORD bytes_written; + HANDLE handle; + BOOL ret; + char path_cursor[MAX_PATH]; + char path_image[MAX_PATH]; + static const test_icon_entries_t icon_desc = {32, 32}; + + sprintf(path_cursor, "%s\\icon.ico", path); + sprintf(path_image, "%s\\test.bmp", path); + + /* Create Files */ + create_ico_file(path_cursor, &icon_desc, 1); + + handle = CreateFileA(path_image, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "run %s: CreateFileA failed. %u\n", path, GetLastError()); + ret = WriteFile(handle, bmpimage, sizeof(bmpimage), &bytes_written, NULL); + ok(ret && bytes_written == sizeof(bmpimage), "run %s: Test file created improperly.\n", path); + CloseHandle(handle); + + /* Test cursor */ + handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "run %s: LoadImage() failed.\n", path); + + ret = DestroyCursor(handle); + ok(ret, "run %s: DestroyCusor failed: %d\n", path, GetLastError()); + + /* Test image */ + handle = LoadImageA(NULL, "test.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "run %s: LoadImageA failed.\n", path); + + ret = DeleteObject(handle); + ok(ret, "run %s: DeleteObject failed: %d\n", path, GetLastError()); + + /* Cleanup */ + ret = DeleteFileA(path_image); + ok(ret, "run %s: DeleteFileA failed: %d\n", path, GetLastError()); + ret = DeleteFileA(path_cursor); + ok(ret, "run %s: DeleteFileA failed: %d\n", path, GetLastError()); +} + +static void test_LoadImage_working_directory(void) +{ + char old_working_dir[MAX_PATH]; + char temp_dir_current[MAX_PATH]; + char temp_dir_PATH[MAX_PATH]; + char executable_path[MAX_PATH]; + int pos_slash; + char old_PATH[10000]; + char new_PATH[10000]; + BOOL ret; + + GetCurrentDirectoryA(ARRAY_SIZE(old_working_dir), old_working_dir); + + GetTempPathA(ARRAY_SIZE(temp_dir_current), temp_dir_current); + strcat(temp_dir_current, "wine-test-dir-current\\"); + GetTempPathA(ARRAY_SIZE(temp_dir_PATH), temp_dir_PATH); + strcat(temp_dir_PATH, "wine-test-dir-path\\"); + + GetModuleFileNameA(NULL, executable_path, ARRAY_SIZE(executable_path)); + pos_slash = strrchr(executable_path, '\\') - executable_path; + executable_path[pos_slash + 1] = 0; + + CreateDirectoryA(temp_dir_current, NULL); + CreateDirectoryA(temp_dir_PATH, NULL); + + SetCurrentDirectoryA(temp_dir_current); + + GetEnvironmentVariableA("PATH", old_PATH, ARRAY_SIZE(old_PATH)); + sprintf(new_PATH, "%s;%s", old_PATH, temp_dir_PATH); + SetEnvironmentVariableA("PATH", new_PATH); + + test_LoadImage_working_directory_run(temp_dir_current); + test_LoadImage_working_directory_run(executable_path); + test_LoadImage_working_directory_run(temp_dir_PATH); + + SetCurrentDirectoryA(old_working_dir); + SetEnvironmentVariableA("PATH", old_PATH); + + ret = RemoveDirectoryA(temp_dir_current); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); + ret = RemoveDirectoryA(temp_dir_PATH); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_LoadImage(void) { HANDLE handle; @@ -1326,6 +1412,9 @@ static void test_LoadImage(void) bitmap_header->biSize = sizeof(BITMAPINFOHEADER); test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); + + /* Test in which paths images with a relative path can be found */ + test_LoadImage_working_directory(); } static void test_CreateIconFromResource(void) -- 2.19.2

1 0

[PATCH] ntdll: Add a futex-based condition variable implementation.
by Brendan McGrath 28 Nov '18

28 Nov '18

From: Zebediah Figura <z.figura12(a)gmail.com> With significant contributions from Andrew Wesie. --- What would be required to get this patch from wine-staging mainlined? It's required for Elite Dangerous to run (and I thought it would be nice to have included in wine v4.0) dlls/ntdll/sync.c | 213 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 185 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0c373a4c880a..79f36ca65278 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -26,6 +26,7 @@ #include <assert.h> #include <errno.h> +#include <limits.h> #include <signal.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> @@ -36,6 +37,9 @@ #ifdef HAVE_SYS_POLL_H # include <sys/poll.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -61,7 +65,140 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); HANDLE keyed_event = NULL; + static const LARGE_INTEGER zero_timeout; +#define TICKSPERSEC 10000000 + +#ifdef __linux__ + +static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ +static int wake_op = 129; /*FUTEX_WAKE|FUTEX_PRIVATE_FLAG*/ + +static inline int futex_wait( int *addr, int val, struct timespec *timeout ) +{ + return syscall( __NR_futex, addr, wait_op, val, timeout, 0, 0 ); +} + +static inline int futex_wake( int *addr, int val ) +{ + return syscall( __NR_futex, addr, wake_op, val, NULL, 0, 0 ); +} + +static inline int use_futexes(void) +{ + static int supported = -1; + + if (supported == -1) + { + futex_wait( &supported, 10, NULL ); + if (errno == ENOSYS) + { + wait_op = 0; /*FUTEX_WAIT*/ + wake_op = 1; /*FUTEX_WAKE*/ + futex_wait( &supported, 10, NULL ); + } + supported = (errno != ENOSYS); + } + return supported; +} + +static inline NTSTATUS fast_wait( RTL_CONDITION_VARIABLE *variable, int val, + const LARGE_INTEGER *timeout) +{ + struct timespec timespec; + LONGLONG timeleft; + LARGE_INTEGER now; + int ret; + + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; + + if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) + { + if (timeout->QuadPart >= 0) + { + NtQuerySystemTime( &now ); + timeleft = timeout->QuadPart - now.QuadPart; + if (timeleft < 0) timeleft = 0; + } + else + timeleft = -timeout->QuadPart; + + timespec.tv_sec = timeleft / TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + + ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + } + else + ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + + if (ret == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; + return STATUS_WAIT_0; +} + +static inline NTSTATUS fast_sleep_cs( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *crit, const LARGE_INTEGER *timeout ) +{ + int val = *(int *)&variable->Ptr; + NTSTATUS ret; + + RtlLeaveCriticalSection( crit ); + + ret = fast_wait( variable, val, timeout ); + + RtlEnterCriticalSection( crit ); + + return ret; +} + +static inline NTSTATUS fast_sleep_srw( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + int val = *(int *)&variable->Ptr; + NTSTATUS ret; + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + ret = fast_wait( variable, val, timeout ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + + return ret; +} + +static inline NTSTATUS fast_wake( RTL_CONDITION_VARIABLE *variable, int val ) +{ + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; + + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + futex_wake( (int *)&variable->Ptr, val ); + return STATUS_SUCCESS; +} + +#else +static inline NTSTATUS fast_sleep_cs( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *crit, const LARGE_INTEGER *timeout ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static inline NTSTATUS fast_sleep_srw( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static inline NTSTATUS fast_wake( RTL_CONDITION_VARIABLE *variable, int val ) +{ + return STATUS_NOT_IMPLEMENTED; +} +#endif + static inline int interlocked_dec_if_nonzero( int *dest ) { @@ -1868,8 +2005,11 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + if (fast_wake( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + { + if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } } /*********************************************************************** @@ -1879,9 +2019,12 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); - while (val-- > 0) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + if (fast_wake( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + { + int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); + while (val-- > 0) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } } /*********************************************************************** @@ -1903,17 +2046,24 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - RtlLeaveCriticalSection( crit ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) + if ((status = fast_sleep_cs( variable, crit, timeout )) == STATUS_NOT_IMPLEMENTED) { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlLeaveCriticalSection( crit ); - RtlEnterCriticalSection( crit ); + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + else if (status != STATUS_SUCCESS) + interlocked_dec_if_nonzero( (int *)&variable->Ptr ); + + RtlEnterCriticalSection( crit ); + } return status; } @@ -1940,24 +2090,31 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - - if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) - RtlReleaseSRWLockShared( lock ); - else - RtlReleaseSRWLockExclusive( lock ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) + if ((status = fast_sleep_srw( variable, lock, timeout, flags )) == STATUS_NOT_IMPLEMENTED) { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) - RtlAcquireSRWLockShared( lock ); - else - RtlAcquireSRWLockExclusive( lock ); + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + else if (status != STATUS_SUCCESS) + interlocked_dec_if_nonzero( (int *)&variable->Ptr ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + } return status; } -- 2.17.1

3 4

[PATCH 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu 28 Nov '18

28 Nov '18

Renaming a file or directory from foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Currently Wine simply finds the existing foobar and thus "changes" it from foobar to foobar, which is a no-op and wrong. This is especially annoying with file managers when trying to rename files to different capitalization... The __wine_wcstoumbs thing is taken from the similar __wine_init_codepages layout used in locale.c. I've had to do it this way and export it because accessing the ntdll_wcstoumbs internal function is required here to build the filename in its original capitalization, untouched. I am aware that the extern function declaration may not be acceptable, but I made it similar to __wine_init_codepages since this function should not really be declared in other headers, in my opinion. Unless, of course, there's a better way to do this. dlls/kernel32/path.c | 69 +++++++++++++++++++++++++++++++++++++++---- dlls/ntdll/ntdll.spec | 1 + 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 41f0d34..9ad9a6f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1310,6 +1320,9 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, LPPROGRESS_ROUTINE fnProgress, LPVOID param, DWORD flag ) { + extern int __wine_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, + int dstlen, const char* defchar, int *used); + FILE_BASIC_INFORMATION info; UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; @@ -1317,6 +1330,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1383,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attr = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attr = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attr & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1408,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); } @@ -1401,13 +1420,53 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { SetLastError( RtlNtStatusToDosError(status) ); + RtlFreeUnicodeString( &nt_name ); goto error; } + /* when it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links, the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t ntpathlen, pathlen; + int num, used_default; + char *tmp; + + /* find the '\' from the end */ + for (ntpathlen = nt_name.Length; nt_name.Buffer[--ntpathlen] != '\\';) {} + ntpathlen++; + + /* build it from path + filename (the latter converted from nt_name) */ + num = __wine_wcstoumbs(0, nt_name.Buffer + ntpathlen, nt_name.Length - ntpathlen, + NULL, 0, NULL, &used_default); + if (num > 0 && !used_default) + { + /* find the '/' from the end */ + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (source_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = pathlen + num + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + __wine_wcstoumbs(0, nt_name.Buffer + ntpathlen, nt_name.Length - ntpathlen, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f..3fb308e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1510,6 +1510,7 @@ # Codepages @ cdecl __wine_init_codepages(ptr ptr ptr) +@ cdecl __wine_wcstoumbs(long wstr long ptr long str ptr) ntdll_wcstoumbs # signal handling @ cdecl __wine_set_signal_handler(long ptr) -- 2.19.1

2 4

[v2 PATCH] comctl32/listbox: Store the items array size instead of using HeapSize().
by Nikolay Sivov 28 Nov '18

28 Nov '18

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listbox.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 7525e7f7fe..cb645b4467 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -72,6 +72,7 @@ typedef struct INT height; /* Window height */ LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ + UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ INT focus_item; /* Item that has the focus */ @@ -688,7 +689,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + nb_items += descr->items_size; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, nb_items * sizeof(LB_ITEMDATA)); } @@ -702,6 +703,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = nb_items; descr->items = item; return LB_OKAY; } @@ -1528,12 +1530,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) + if (descr->nb_items == descr->items_size) { /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; + max_items = descr->items_size + LB_ARRAY_GRANULARITY; if (descr->items) item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); @@ -1545,6 +1545,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = max_items; descr->items = item; } @@ -1704,13 +1705,17 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* Shrink the item array if possible */ - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + max_items = descr->items_size; if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) { max_items -= LB_ARRAY_GRANULARITY; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); - if (item) descr->items = item; + if (item) + { + descr->items_size = max_items; + descr->items = item; + } } /* Repaint the items */ @@ -1756,6 +1761,7 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; + descr->items_size = 0; descr->items = NULL; } @@ -2493,6 +2499,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; + descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1; -- 2.19.2

1 0

[PATCH 1/2] comctl32/tests: Also include LBS_NODATA cases when testing ownerdraw
by Gabriel Ivăncescu 28 Nov '18

28 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/tests/listbox.c | 79 +++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 43da3ca..a384e03 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -402,62 +402,71 @@ static HWND create_parent( void ) static void test_ownerdraw(void) { + static const DWORD styles[] = + { + 0, + LBS_NODATA + }; HWND parent, hLB; INT ret; RECT rc; + UINT i; parent = create_parent(); ok(parent != NULL, "Failed to create parent window.\n"); - hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); - ok(hLB != NULL, "Failed to create listbox window.\n"); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE | styles[i], parent); + ok(hLB != NULL, "Failed to create listbox window.\n"); - SetForegroundWindow(hLB); - UpdateWindow(hLB); + SetForegroundWindow(hLB); + UpdateWindow(hLB); - /* make height short enough */ - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); - /* make 0 item invisible */ - SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); - ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); - ok(ret == 1, "wrong top index %d\n", ret); + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - ok(!IsRectEmpty(&rc), "empty item rect\n"); - ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); - DestroyWindow(hLB); + DestroyWindow(hLB); - /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ - hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, - NULL, NULL, NULL, 0); - ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE | styles[i], + 0, 0, 100, 100, NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); - ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 0, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 1, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 13, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - DestroyWindow (hLB); + DestroyWindow (hLB); + } DestroyWindow(parent); } -- 2.19.1

2 3

[PATCH 1/5] shcore: Add SHCreateThread().
by Nikolay Sivov 28 Nov '18

28 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 119 ++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 488e78eb86..93effef6ad 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ocidl.h" #include "shellscalingapi.h" +#include "shlwapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1290,3 +1291,121 @@ void WINAPI SetProcessReference(IUnknown *obj) process_ref = obj; } + +struct thread_data +{ + LPTHREAD_START_ROUTINE thread_proc; + LPTHREAD_START_ROUTINE callback; + void *data; + DWORD flags; + HANDLE hEvent; + IUnknown *thread_ref; + IUnknown *process_ref; +}; + +static DWORD WINAPI shcore_thread_wrapper(void *data) +{ + struct thread_data thread_data; + HRESULT hr = E_FAIL; + DWORD retval; + + TRACE("(%p)\n", data); + + /* We are now executing in the context of the newly created thread. + * So we copy the data passed to us (it is on the stack of the function + * that called us, which is waiting for us to signal an event before + * returning). */ + thread_data = *(struct thread_data *)data; + + if (thread_data.flags & CTF_COINIT) + { + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + if (FAILED(hr)) + hr = CoInitializeEx(NULL, COINIT_DISABLE_OLE1DDE); + } + + if (thread_data.callback) + thread_data.callback(thread_data.data); + + /* Signal the thread that created us; it can return now. */ + SetEvent(thread_data.hEvent); + + /* Execute the callers start code. */ + retval = thread_data.thread_proc(thread_data.data); + + /* Release thread and process references. */ + if (thread_data.thread_ref) + IUnknown_Release(thread_data.thread_ref); + + if (thread_data.process_ref) + IUnknown_Release(thread_data.process_ref); + + if (SUCCEEDED(hr)) + CoUninitialize(); + + return retval; +} + +/************************************************************************* + * SHCreateThread [SHCORE.@] + */ +BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE thread_proc, void *data, DWORD flags, LPTHREAD_START_ROUTINE callback) +{ + struct thread_data thread_data; + BOOL called = FALSE; + + TRACE("(%p, %p, %#x, %p)\n", thread_proc, data, flags, callback); + + thread_data.thread_proc = thread_proc; + thread_data.callback = callback; + thread_data.data = data; + thread_data.flags = flags; + thread_data.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + if (flags & CTF_THREAD_REF) + SHGetThreadRef(&thread_data.thread_ref); + else + thread_data.thread_ref = NULL; + + if (flags & CTF_PROCESS_REF) + GetProcessReference(&thread_data.process_ref); + else + thread_data.process_ref = NULL; + + /* Create the thread */ + if (thread_data.hEvent) + { + HANDLE hThread; + DWORD retval; + + hThread = CreateThread(NULL, 0, shcore_thread_wrapper, &thread_data, 0, &retval); + if (hThread) + { + /* Wait for the thread to signal us to continue */ + WaitForSingleObject(thread_data.hEvent, INFINITE); + CloseHandle(hThread); + called = TRUE; + } + CloseHandle(thread_data.hEvent); + } + + if (!called) + { + if (!thread_data.callback && flags & CTF_INSIST) + { + /* Couldn't call, call synchronously */ + thread_data.thread_proc(data); + called = TRUE; + } + else + { + if (thread_data.thread_ref) + IUnknown_Release(thread_data.thread_ref); + + if (thread_data.process_ref) + IUnknown_Release(thread_data.process_ref); + } + } + + return called; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index c98f2db54a..a08c2da7e0 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -37,7 +37,7 @@ @ stdcall SHCreateStreamOnFileA(str long ptr) @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) @ stdcall SHCreateStreamOnFileW(wstr long ptr) -@ stdcall SHCreateThread(ptr ptr long ptr) shlwapi.SHCreateThread +@ stdcall SHCreateThread(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) @ stub SHCreateThreadWithHandle @ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA -- 2.19.2

2 5

[PATCH 2/2] user32: If there is no dialog controls to set focus to then set focus to dialog itself.
by Dmitry Timoshkov 28 Nov '18

28 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/dialog.c | 2 ++ dlls/user32/tests/msg.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c47bd571ae..0b33a579b5 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -691,6 +691,8 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SendMessageW( focus, EM_SETSEL, 0, MAXLONG ); SetFocus( focus ); } + else + SetFocus( hwnd ); } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2fdb118e84..366a138b52 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13574,10 +13574,12 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_MOVE, sent }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, - { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ { HCBT_SETFOCUS, hook }, { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_PALETTEISCHANGING, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -13760,9 +13762,8 @@ static void test_dialog_messages(void) flush_sequence(); hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 1); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); - ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", TRUE); + ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE); hfocus = GetFocus(); -todo_wine ok(hfocus == hdlg, "wrong focus %p\n", hfocus); EndDialog(hdlg, 0); DestroyWindow(hdlg); -- 2.17.1

2 1

[PATCH 1/2] user32/tests: Add a focus test for an empty dialog that returns TRUE in WM_INITDIALOG.
by Dmitry Timoshkov 28 Nov '18

28 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 42 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f78858f4d4..2fdb118e84 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13440,6 +13440,8 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR switch (message) { case WM_INITDIALOG: + return lParam; + case WM_GETDLGCODE: return 0; } @@ -13548,6 +13550,20 @@ static const struct message WmDefDlgSetFocus_2[] = { { 0 } }; /* Creation of a dialog */ +static const struct message WmCreateDialogParamSeq_0[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; +/* Creation of a dialog */ static const struct message WmCreateDialogParamSeq_1[] = { { HCBT_CREATEWND, hook }, { WM_NCCREATE, sent }, @@ -13558,6 +13574,14 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_MOVE, sent }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent|wparam, 1 }, + { WM_SETFOCUS, sent }, { WM_CHANGEUISTATE, sent|optional }, { 0 } }; @@ -13721,9 +13745,25 @@ static void test_dialog_messages(void) cls.lpfnWndProc = test_dlg_proc; if (!RegisterClassA(&cls)) assert(0); + SetFocus(0); + flush_sequence(); hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 0); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); - ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE); + ok_sequence(WmCreateDialogParamSeq_0, "CreateDialogParam_0", FALSE); + hfocus = GetFocus(); + ok(hfocus == 0, "wrong focus %p\n", hfocus); + EndDialog(hdlg, 0); + DestroyWindow(hdlg); + flush_sequence(); + + SetFocus(0); + flush_sequence(); + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 1); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", TRUE); + hfocus = GetFocus(); +todo_wine + ok(hfocus == hdlg, "wrong focus %p\n", hfocus); EndDialog(hdlg, 0); DestroyWindow(hdlg); flush_sequence(); -- 2.17.1

2 1

[PATCH] testbot: Use autoreconf instead of autoconf.
by Zebediah Figura 28 Nov '18

28 Nov '18

autoconf doesn't regenerate config.h.in. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- testbot/lib/Build/Utils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 0f1ddb0..c53f609 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -139,11 +139,11 @@ sub ApplyPatch($$) if ($Impacts->{Autoconf}) { - InfoMsg "\nRunning autoconf\n"; - system("cd '$DataDir/$Dir' && set -x && autoconf"); + InfoMsg "\nRunning autoreconf\n"; + system("cd '$DataDir/$Dir' && set -x && autoreconf"); if ($? != 0) { - LogMsg "Autoconf failed\n"; + LogMsg "autoreconf failed\n"; return undef; } } -- 2.19.1

2 1

[PATCH 1/4] tools/make_unicode: Implement full Unicode character decomposition.
by Brendan McGrath 28 Nov '18

28 Nov '18

From: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- This is a patch-set from wine-staging required for the keyboard binds within Elite Dangerous to work. What would be required to see this mainlined (hopefully before wine v4.0)? (Please do correct me if sending the entire patchset to wine-devel is not the correct approach) libs/port/mbtowc.c | 14 +- tools/make_unicode | 333 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 279 insertions(+), 68 deletions(-) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82d8b12..6976f89722a7 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ); /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ @@ -101,19 +101,19 @@ static int mbstowcs_sbcs_decompose( const struct sbcs_table *table, int flags, WCHAR *dst, unsigned int dstlen ) { const WCHAR * const cp2uni = (flags & MB_USEGLYPHCHARS) ? table->cp2uni_glyphs : table->cp2uni; - unsigned int len; + int len; if (!dstlen) /* compute length */ { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ for (len = 0; srclen; srclen--, src++) - len += wine_decompose( cp2uni[*src], dummy, 4 ); + len += wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dummy, 4 ); return len; } for (len = dstlen; srclen && len; srclen--, src++) { - unsigned int res = wine_decompose( cp2uni[*src], dst, len ); + int res = wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dst, len ); if (!res) break; len -= res; dst += res; @@ -203,7 +203,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, { const WCHAR * const cp2uni = table->cp2uni; const unsigned char * const cp2uni_lb = table->cp2uni_leadbytes; - unsigned int len, res; + int len, res; WCHAR ch; if (!dstlen) /* compute length */ @@ -219,7 +219,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - len += wine_decompose( ch, dummy, 4 ); + len += wine_unicode_decompose_string( 0, &ch, 1, dummy, 4 ); } return len; } @@ -234,7 +234,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - if (!(res = wine_decompose( ch, dst, len ))) break; + if (!(res = wine_unicode_decompose_string( 0, &ch, 1, dst, len ))) break; dst += res; len -= res; } diff --git a/tools/make_unicode b/tools/make_unicode index 56d190565677..2aa063bff624 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -472,6 +472,28 @@ sub READ_DEFAULTS($) next if $decomp eq ""; # no decomposition, skip it + # store decomposition table + if ($decomp =~ /^<([a-zA-Z]+)>(\s+[0-9a-fA-F]+)+$/) + { + my @seq = (); + for my $ch (split /\s+/, (split /\s+/, $decomp, 2)[1]) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [1, \@seq]; + } + elsif ($decomp =~ /^([0-9a-fA-F]+)(\s+([0-9a-fA-F]+))*$/) + { + my @seq = (); + for my $ch (split /\s+/, $decomp) + { + # we don't support surrogates at the moment + next if hex $ch > 0xffff; + push @seq, (hex $ch); + } + $decomp_table[$src] = [0, \@seq]; + } + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known @@ -506,16 +528,13 @@ sub READ_DEFAULTS($) # decomposition contains only char values without prefix -> use first char $dst = hex $1; $category_table[$src] |= $category_table[$dst] if defined $category_table[$dst]; - # store decomposition if it contains two chars if ($decomp =~ /^([0-9a-fA-F]+)\s+([0-9a-fA-F]+)$/) { - $decomp_table[$src] = [ hex $1, hex $2 ]; push @compose_table, [ hex $1, hex $2, $src ]; } elsif ($decomp =~ /^(<[a-z]+>\s)*([0-9a-fA-F]+)$/ && (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))) { - # Single char decomposition in the compatibility range $compatmap_table[$src] = hex $2; } } @@ -2264,6 +2283,51 @@ EOF save_file($filename); } +sub do_decomp +{ + my ($char, $table_ref, $compat) = @_; + + return ($char) unless defined $table_ref->[$char]; + my $data = $table_ref->[$char]; + return ($char) if $data->[0] && !$compat; + my @mapping = (); + for my $ch (@{$data->[1]}) + { + push @mapping, $ch; + } + return @mapping; +} + +sub expand_pairs +{ + my @data = @_; + my @result = (); + + for my $ch (@data) + { + if ($ch <= 0xFFFF) + { + push @result, $ch; + } + elsif ($ch >= 2097152) # 2**21 + { + die sprintf "Invalid Unicode character %04x\n", $ch; + } + else + { + my $hx = $ch & 0xFFFF; + my $hu = ($ch >> 16) & ((1 << 5) - 1); + my $hw = ($hu - 1) & 0xFFFF; + my $hi = 0xD800 | ($hw << 6) | ($hx >> 10); + my $lx = $ch & 0xFFFF; + my $lo = (0xDC00 | ($lx & ((1 << 10) - 1))) & 0xFFFF; + push @result, $hi; + push @result, $lo; + } + } + return @result; +} + ################################################################ # dump the char decomposition table sub dump_decompose_table($) @@ -2272,98 +2336,245 @@ sub dump_decompose_table($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; - print OUTPUT "/* Unicode char composition */\n"; + print OUTPUT "/* Unicode char decomposition */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - # first determine all the 16-char subsets that contain something + # limit code points to BMP + my $utflim = 65536; + my %nfd_lookup = (); + my %nfkd_lookup = (); + my %decomp_lookup = (); + my @decomp_data = (0); + my $pos = 1; + my $lastchar_decomp; - my @filled = (0) x 4096; - my $pos = 16*2; # for the null subset - for (my $i = 0; $i < 65536; $i++) + for (my $i = 0; $i < $utflim; $i++) { next unless defined $decomp_table[$i]; - $filled[$i >> 4] = $pos; - $pos += 16*2; - $i |= 15; + + if (defined $decomp_table[$i]) + { + $lastchar_decomp = $i; + # fully expand input and mappings + + my @char; + push @char, $i; + push @char, 0; + my $char = pack "n*", @char; + + my @nfd = do_decomp( $i, \@decomp_table, 0 ); + push @nfd, 0; + my $nfd = pack "n*", @nfd; + + my @nfkd = do_decomp( $i, \@decomp_table, 1 ); + push @nfkd, 0; + my $nfkd = pack "n*", @nfkd; + + # lookup or add mappings + + if ($nfd eq $char) + { + $nfd = undef; + } + elsif (exists $decomp_lookup{$nfd}) + { + $nfd_lookup{$i} = $decomp_lookup{$nfd}; + } + else + { + push @decomp_data, @nfd; + $decomp_lookup{$nfd} = $pos; + $nfd_lookup{$i} = $pos; + $pos += @nfd; + } + + if ($nfkd eq $char) + { + $nfkd = undef; + } + elsif (exists $decomp_lookup{$nfkd}) + { + $nfkd_lookup{$i} = $decomp_lookup{$nfkd}; + } + else + { + push @decomp_data, @nfkd; + $decomp_lookup{$nfkd} = $pos; + $nfkd_lookup{$i} = $pos; + $pos += @nfkd; + } + } } - my $total = $pos; - # now count the 256-char subsets that contain something + printf OUTPUT "static const UINT last_decomposable = 0x%x;\n\n", $lastchar_decomp; - my @filled_idx = (256) x 256; - $pos = 256 + 16; - for (my $i = 0; $i < 4096; $i++) + # dump decomposition data + + printf OUTPUT "static const WCHAR data_decomp[%d] =\n", $pos; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @decomp_data ); + print OUTPUT "\n};\n\n"; + + # find 256-char subsets that contain something + + my $filled_pos = 1; + my $filled_lim = ($lastchar_decomp >> 8) + 1; + my @filled = (0) x $filled_lim; + for (my $i = 0; $i < $utflim; $i++) + { + last if $i > $lastchar_decomp; + next unless exists $nfd_lookup{$i} || exists $nfkd_lookup{$i}; + $filled[$i >> 8] = $filled_pos++; + $i |= 255; + } + + # dump index of 256-char subsets + + printf OUTPUT "static const BYTE idx1_decomp[%d] =\n", $filled_lim; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%02x", 0, @filled ); + print OUTPUT "\n};\n\n"; + + # for 256-char subsets, find non-empty 16-char subsets + + my $sub_filled_pos = 1; + my %sub_filled = (); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled_idx[$i >> 4] = $pos; - $pos += 16; - $i |= 15; + for (my $j = 0; $j < 256; $j++) + { + my $idx = ($i << 8) | $j; + next unless exists $nfd_lookup{$idx} || exists $nfkd_lookup{$idx}; + $sub_filled{$idx >> 4} = $sub_filled_pos++; + $j |= 15; + } } - my $null_offset = $pos; # null mapping - $total += $pos; - # add the index offsets to the subsets positions + # dump index of 16-char subsets - for (my $i = 0; $i < 4096; $i++) + printf OUTPUT "static const USHORT idx2_decomp[%d] =\n", $filled_pos * 16; + print OUTPUT "{\n"; + my @null_idx = (0) x 16; + print OUTPUT " /* null sub-index */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_idx ); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled[$i] += $null_offset; + printf OUTPUT ",\n /* sub-index 0x%02x */\n", $filled[$i]; + + my @sub_idx; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($i << 4) | $j; + $sub_idx[$j] = $sub_filled{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_idx ); } + print OUTPUT "\n};\n\n"; - # dump the main index + # dump the 16-char subsets - printf OUTPUT "static const WCHAR table[%d] =\n", $total; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); - printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 ); + printf OUTPUT "static const USHORT offsets_decomp[%d] =\n", 32 * $sub_filled_pos; + print OUTPUT "{\n"; + print OUTPUT " /* (nfd, nfkd) x 16 */\n"; + my @null_table = (0) x 32; + print OUTPUT " /* no decomposition */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_table ); + for my $key (sort {$a <=> $b} keys %sub_filled) + { + printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $key, $key; + my @sub_table; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($key << 4) | $j; + $sub_table[2 * $j] = $nfd_lookup{$idx} || 0; + $sub_table[2 * $j + 1] = $nfkd_lookup{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_table ); + } + print OUTPUT "\n};\n\n"; - # dump the second-level indexes + print OUTPUT <<"EOF"; +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data, UINT scale_data ) +{ + USHORT a, b, c, d; - for (my $i = 0; $i < 256; $i++) + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << scale_data); + if (compat) ++c; + d = offsets[c]; + + return &data[d]; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) +{ + int total_decomp = 0; + int size_decomp; + const WCHAR *map; + + if (ch < 0xa0) /* fast path */ { - next unless ($filled_idx[$i] > 256); - my @table = @filled[($i<<4)..($i<<4)+15]; - for (my $j = 0; $j < 16; $j++) { $table[$j] ||= $null_offset; } - printf OUTPUT ",\n /* sub-index %02x */\n", $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup( ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp, 1 ))) + { + if (dstlen) *dst = (WCHAR)ch; + return 1; } + else { + while (*map) + { + size_decomp = decompose_char_recursive( compat, *map, dst, dstlen ); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} - # dump the 16-char subsets +int wine_unicode_decompose_string( int compat, const WCHAR *src, + int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0; + int decomp_len; - printf OUTPUT ",\n /* null mapping */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, (0) x 32 ); + if (dstlen < 0) dstlen = 0; - for (my $i = 0; $i < 4096; $i++) + while (srcpos < srclen) { - next unless $filled[$i]; - my @table = (0) x 32; - for (my $j = 0; $j < 16; $j++) + ch = src[srcpos]; + + decomp_len = decompose_char_recursive( compat, ch, dst+dstpos, dstlen ); + dstpos += decomp_len; + + if (dstlen > 0) { - if (defined $decomp_table[($i<<4) + $j]) + dstlen -= decomp_len; + while (dstlen < 0) { - $table[2 * $j] = ${$decomp_table[($i << 4) + $j]}[0]; - $table[2 * $j + 1] = ${$decomp_table[($i << 4) + $j]}[1]; + dstpos--; + dstlen++; } } - printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $i, $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + + ++srcpos; } - printf OUTPUT "\n};\n\n"; - print OUTPUT <<"EOF"; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) -{ - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; - - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; + return dstpos; } EOF close OUTPUT; -- 2.17.1

2 6

[PATCH 1/5] setupapi: Enforce a maximum device instance ID length.
by Zebediah Figura 28 Nov '18

28 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 14 +++++++++----- dlls/setupapi/tests/devinst.c | 20 +++++++++++++++++++- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 64c04131b0..8ce1344cda 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1337,7 +1337,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da /*********************************************************************** * SetupDiCreateDeviceInfoA (SETUPAPI.@) */ -BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceName, +BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, const GUID *ClassGuid, PCSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData) { @@ -1345,11 +1345,15 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceName, LPWSTR DeviceNameW = NULL; LPWSTR DeviceDescriptionW = NULL; - if (DeviceName) + if (!name || strlen(name) >= MAX_DEVICE_ID_LEN) { - DeviceNameW = MultiByteToUnicode(DeviceName, CP_ACP); - if (DeviceNameW == NULL) return FALSE; + SetLastError(ERROR_INVALID_DEVINST_NAME); + return FALSE; } + + DeviceNameW = MultiByteToUnicode(name, CP_ACP); + if (DeviceNameW == NULL) return FALSE; + if (DeviceDescription) { DeviceDescriptionW = MultiByteToUnicode(DeviceDescription, CP_ACP); @@ -1407,7 +1411,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, PCWSTR DeviceName, devinfo, debugstr_w(DeviceName), debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), hwndParent, CreationFlags, device_data); - if (!DeviceName) + if (!DeviceName || strlenW(DeviceName) >= MAX_DEVICE_ID_LEN) { SetLastError(ERROR_INVALID_DEVINST_NAME); return FALSE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0e6a1c0a4e..338393e5f2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -271,8 +271,8 @@ static void test_device_info(void) { static const GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; SP_DEVINFO_DATA device = {0}, ret_device = {sizeof(ret_device)}; + char id[MAX_DEVICE_ID_LEN + 2]; HDEVINFO set; - char id[50]; BOOL ret; SetLastError(0xdeadbeef); @@ -382,6 +382,24 @@ todo_wine { check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\testguid"); check_device_info(set, 3, NULL, NULL); + memset(id, 'x', sizeof(id)); + memcpy(id, "Root\\LEGACY_BOGUS\\", strlen("Root\\LEGACY_BOGUS\\")); + id[MAX_DEVICE_ID_LEN + 1] = 0; + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, id, &guid, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DEVINST_NAME, "Got unexpected error %#x.\n", GetLastError()); + + id[MAX_DEVICE_ID_LEN] = 0; + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, id, &guid, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DEVINST_NAME, "Got unexpected error %#x.\n", GetLastError()); + + id[MAX_DEVICE_ID_LEN - 1] = 0; + ret = SetupDiCreateDeviceInfoA(set, id, &guid, NULL, NULL, 0, NULL); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList(set); } -- 2.14.1

1 4

[PATCH 1/6] ntoskrnl.exe: Implement KeInitializeTimerEx().
by Zebediah Figura 28 Nov '18

28 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 --------------------- dlls/ntoskrnl.exe/sync.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 712681e0f9..be63740cf1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2285,27 +2285,6 @@ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) FIXME( "stub: %p\n", SpinLock ); } - -/*********************************************************************** - * KeInitializeTimerEx (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeTimerEx( PKTIMER Timer, TIMER_TYPE Type ) -{ - FIXME( "stub: %p %d\n", Timer, Type ); - - RtlZeroMemory(Timer, sizeof(KTIMER)); - Timer->Header.Type = Type ? 9 : 8; -} - - -/*********************************************************************** - * KeInitializeTimer (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeTimer( PKTIMER Timer ) -{ - KeInitializeTimerEx(Timer, NotificationTimer); -} - /*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index e63c7935bb..910572b0ee 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -38,6 +38,8 @@ enum object_type TYPE_AUTO_EVENT = 1, TYPE_MUTEX = 2, TYPE_SEMAPHORE = 5, + TYPE_MANUAL_TIMER = 8, + TYPE_AUTO_TIMER = 9, }; static CRITICAL_SECTION sync_cs; @@ -292,3 +294,26 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX mutex, BOOLEAN wait ) return ret; } + +/*********************************************************************** + * KeInitializeTimerEx (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeTimerEx( KTIMER *timer, TIMER_TYPE type ) +{ + TRACE("timer %p, type %u.\n", timer, type); + + RtlZeroMemory(timer, sizeof(KTIMER)); + timer->Header.Type = (type == NotificationTimer) ? TYPE_MANUAL_TIMER : TYPE_AUTO_TIMER; + timer->Header.SignalState = FALSE; + timer->Header.Inserted = FALSE; + timer->Header.WaitListHead.Blink = NULL; + timer->Header.WaitListHead.Flink = NULL; +} + +/*********************************************************************** + * KeInitializeTimer (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeTimer( KTIMER *timer ) +{ + KeInitializeTimerEx(timer, NotificationTimer); +} -- 2.14.1

1 5

[PATCH v4 1/2] dbghelp: Avoid using inline assembly in do_x86cpuid().
by Zebediah Figura 28 Nov '18

28 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v4: fix build failure dlls/dbghelp/minidump.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 975bb45c9a..ad40c79bcf 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <time.h> #define NONAMELESSUNION @@ -542,20 +543,27 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +extern void do_x86cpuid(unsigned int ax, unsigned int *p); + +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_x86cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ); +#else +void do_x86cpuid(unsigned int ax, unsigned int *p) { -#if defined(__GNUC__) && defined(__i386__) - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif } +#endif /* From xf86info havecpuid.c 1.11 */ static inline int have_x86cpuid(void) -- 2.14.1

1 1

[v2 PATCH 3/3] comsvcs: Add initial tests
by Alistair Leslie-Hughes 27 Nov '18

27 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/comsvcs/tests/Makefile.in | 5 + dlls/comsvcs/tests/dispenser.c | 256 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 263 insertions(+) create mode 100644 dlls/comsvcs/tests/Makefile.in create mode 100644 dlls/comsvcs/tests/dispenser.c diff --git a/configure b/configure index bb2817c..855e402 100755 --- a/configure +++ b/configure @@ -19255,6 +19255,7 @@ wine_fn_config_makefile dlls/commdlg.dll16 enable_win16 wine_fn_config_makefile dlls/compobj.dll16 enable_win16 wine_fn_config_makefile dlls/compstui enable_compstui wine_fn_config_makefile dlls/comsvcs enable_comsvcs +wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 wine_fn_config_makefile dlls/connect enable_connect wine_fn_config_makefile dlls/credui enable_credui diff --git a/configure.ac b/configure.ac index 8bf5e10..194ee1e 100644 --- a/configure.ac +++ b/configure.ac @@ -3110,6 +3110,7 @@ WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compstui) WINE_CONFIG_MAKEFILE(dlls/comsvcs) +WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) WINE_CONFIG_MAKEFILE(dlls/connect) WINE_CONFIG_MAKEFILE(dlls/credui) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in new file mode 100644 index 0000000..c89c193 --- /dev/null +++ b/dlls/comsvcs/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = comsvcs.dll +IMPORTS = ole32 uuid oleaut32 + +C_SRCS = \ + dispenser.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c new file mode 100644 index 0000000..187800e --- /dev/null +++ b/dlls/comsvcs/tests/dispenser.c @@ -0,0 +1,256 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "comsvcs.h" + +#include "wine/test.h" + +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + trace(#func "\n"); \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(driver_CreateResource); +DEFINE_EXPECT(driver_DestroyResource); +DEFINE_EXPECT(driver_ResetResource); +DEFINE_EXPECT(driver_Release); + +HRESULT driver_DestroyResource_ret = S_OK; + +static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid, void **object) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispenserDriver)) + { + *object = iface; + + return S_OK; + } + + ok(0, "Unknown iterface %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI driver_AddRef(IDispenserDriver *iface) +{ + trace("AddRef\n"); + return 2; +} + +static ULONG WINAPI driver_Release(IDispenserDriver *iface) +{ + CHECK_EXPECT2(driver_Release); + return 1; +} + +static HRESULT WINAPI driver_CreateResource(IDispenserDriver *iface, const RESTYPID restypid, RESID *resid, TIMEINSECS *destroy) +{ + CHECK_EXPECT2(driver_CreateResource); + + *resid = 10; + return S_OK; +} + +static HRESULT WINAPI driver_RateResource(IDispenserDriver *iface, const RESTYPID restypid, const RESID resid, + const BOOL requires, RESOURCERATING *rating) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_EnlistResource(IDispenserDriver *iface, const RESID resid, const TRANSID transid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_ResetResource(IDispenserDriver *iface, const RESID resid) +{ + CHECK_EXPECT2(driver_ResetResource); + ok((int)resid == 10, "RESID %d\n", (int)resid); + return S_OK; +} + +static HRESULT WINAPI driver_DestroyResource(IDispenserDriver *iface, const RESID resid) +{ + todo_wine CHECK_EXPECT2(driver_DestroyResource); + return driver_DestroyResource_ret; +} + +static HRESULT WINAPI driver_DestroyResourceS(IDispenserDriver *iface, const SRESID resid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + + +static const struct IDispenserDriverVtbl driver_vtbl = +{ + driver_QueryInterface, + driver_AddRef, + driver_Release, + driver_CreateResource, + driver_RateResource, + driver_EnlistResource, + driver_ResetResource, + driver_DestroyResource, + driver_DestroyResourceS +}; + +static IDispenserDriver DispenserDriver = { &driver_vtbl }; + +static void create_dispenser(void) +{ + static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; + static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0}; + static const WCHAR data[] = {'d','a','t','a','1',0}; + HRESULT hr; + IDispenserManager *dispenser = NULL; + IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + RESID resid; + BSTR str; + + hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("DispenserManager not available\n"); + return; + } + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(holder1 != holder2, "same holder object returned\n"); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool1, &holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if(holder1) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED_BROKEN(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder1, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + + IHolder_Release(holder1); + } + if(holder2) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED_BROKEN(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder2, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + /* DestroyResource return doesn't directly affect the Holder Close return value */ + driver_DestroyResource_ret = E_FAIL; + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + driver_DestroyResource_ret = S_OK; + IHolder_Release(holder2); + } + if(holder3) + { + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + IHolder_Release(holder3); + } + + IDispenserManager_Release(dispenser); +} + + +START_TEST(dispenser) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok( hr == S_OK, "failed to init com\n"); + if (hr != S_OK) + return; + + create_dispenser(); + + CoUninitialize(); +} -- 1.9.1

2 1

[PATCH] testbot: Show more specific mission descriptions.
by Francois Gouget 27 Nov '18

27 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 37 +++++++++++++++++---------- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 869f699358..18d4f5ed3f 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -102,33 +102,42 @@ sub GetMissionBaseName($) return $BaseName; } -sub GetTaskMissionDescription($) +sub GetTaskMissionDescription($$) { - my ($TaskMission) = @_; + my ($TaskMission, $VMType) = @_; my $Builds = $TaskMission->{Builds}; my $Description = - ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit executable" : - $Builds->{exe32} ? "32 bit executable" : - $Builds->{exe64} ? "64 bit executable" : + ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit" : + $Builds->{exe32} ? "32 bit" : + $Builds->{exe64} ? "64 bit" : ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" : $Builds->{win32} ? "32 bit" : $Builds->{wow32} ? "32 bit WoW" : "64 bit WoW"; - my $Lang; - foreach my $Mission (@{$TaskMission->{Missions}}) + if ($Builds->{exe32} or $Builds->{exe64}) { - next if (!$Mission->{lang}); - if (defined $Lang) + $Description .= ($VMType eq "build") ? " build" : " executable"; + } + else + { + my $Lang; + foreach my $Mission (@{$TaskMission->{Missions}}) { - $Description .= " + Locales"; - $Lang = undef; - last; + next if (!$Mission->{lang}); + if (defined $Lang) + { + $Description .= " + Locales"; + $Lang = undef; + last; + } + $Lang = $Mission->{lang}; } - $Lang = $Mission->{lang}; + $Description .= " ". LocaleName($Lang) if ($Lang); + $Description .= " tests"; } - $Description .= " ". LocaleName($Lang) if ($Lang); + return $Description; } diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 4a803e775a..19bedaaf41 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -91,7 +91,7 @@ sub GetTitle($) my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); if (!defined $ErrMessage and @$Missions == 1) { - push @TitleParts, GetTaskMissionDescription($Missions->[0]); + push @TitleParts, GetTaskMissionDescription($Missions->[0], $self->VM->Type); } } if ($self->Type ne "suite" and $self->CmdLineArg) -- 2.19.1

1 0

[PATCH] testbot: Allow running Windows executables on the Wine VMs.
by Francois Gouget 27 Nov '18

27 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 17 +++--- testbot/bin/build/WineReconfig.pl | 19 +++++-- testbot/bin/build/WineTest.pl | 59 ++++++++++++++++++--- testbot/web/Submit.pl | 87 ++++++++++++++++--------------- 4 files changed, 124 insertions(+), 58 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 592162ad7b..19e3e8f3eb 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -388,7 +388,7 @@ if ($Step->Type ne "suite" and $Step->Type ne "single") FatalError("Unexpected step type '". $Step->Type ."' found\n"); } if (($Step->Type eq "suite" and $Step->FileType ne "none") or - ($Step->Type ne "suite" and $Step->FileType ne "patch")) + ($Step->Type ne "suite" and $Step->FileType !~ /^(?:exe32|exe64|patch)$/)) { FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } @@ -417,13 +417,14 @@ if (!$TA->SetTime()) } } -my $FileName = $Step->GetFullFileName(); +my $FileName = $Step->FileName; if (defined $FileName) { Debug(Elapsed($Start), " Sending '$FileName'\n"); - if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) + my $Dst = $Step->FileType eq "patch" ? "patch.diff" : $FileName; + if (!$TA->SendFile($Step->GetFullFileName(), "staging/$Dst", 0)) { - FatalTAError($TA, "Could not copy the patch to the VM"); + FatalTAError($TA, "Could send '$FileName' to the VM"); } } @@ -452,10 +453,14 @@ if ($Step->Type eq "suite") } $Script .= join(" ", "-m", ShQuote($AdminEMail), "-i", ShQuote($Info)); } -else +elsif ($Step->FileType eq "patch") { $Script .= "--testpatch ". $Task->Missions ." patch.diff"; } +else +{ + $Script .= join(" ", "--testexe", $Task->Missions, $FileName, $Task->CmdLineArg); +} $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -557,7 +562,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) { chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", $Step->FileType eq "patch", $TaskTimedOut); $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); if (!defined $LogFailures and @$LogErrors == 1) { diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index cc25da0cc8..77810958ab 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -49,9 +49,9 @@ use WineTestBot::Missions; # Build helpers # -sub BuildWine($$$$) +sub BuildWine($$$$;$) { - my ($TaskMissions, $NoRm, $Build, $Extras) = @_; + my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); @@ -60,6 +60,7 @@ sub BuildWine($$$$) # accumulate InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); + $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine); system("cd '$DataDir/wine-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". @@ -70,6 +71,18 @@ sub BuildWine($$$$) return !1; } + # Compile TestLauncher + my $Bits = ($Build =~ /64/) ? "64" : "32"; + $WithWine ||= "."; + system("cd '$DataDir/wine-$Build' && set -x && ". + "gcc -m$Bits -c -o TestLauncher.o ../../src/TestLauncher/TestLauncher.c -fPIC -Iinclude -I../wine/include && ". + "'$WithWine/tools/winegcc/winegcc' -B'$WithWine/tools/winebuild' --sysroot=. -m$Bits -o TestLauncher.exe.so TestLauncher.o"); + if ($? != 0) + { + LogMsg "The $Build TestLauncher build failed\n"; + return !1; + } + return 1; } @@ -79,7 +92,7 @@ sub UpdateWineBuilds($$) return BuildWine($TaskMissions, $NoRm, "win32", "") && BuildWine($TaskMissions, $NoRm, "wow64", "--enable-win64") && - BuildWine($TaskMissions, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); + BuildWine($TaskMissions, $NoRm, "wow32", "", "$DataDir/wine-wow64"); } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 23da71832c..b7389ba25e 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -180,6 +180,28 @@ sub TestPatch($$) return 1; } +sub TestExe($$$) +{ + my ($Mission, $FileName, $Args) = @_; + + my $BaseName = SetupTest("the tests", $Mission); + if (!-d $ENV{WINEPREFIX}) + { + # FIXME Wait for the wineserver as a workaround for bug 41713. + my $ErrMessage = CreateWinePrefix($Mission, "wait"); + if (defined $ErrMessage) + { + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; + return 0; + } + } + + # Run the test executable + RunWine($Mission, "./TestLauncher.exe.so", "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'../$BaseName.report'"); + + return 1; +} + # # Setup and command line processing @@ -193,7 +215,11 @@ my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--testpatch") + if ($Arg eq "--testexe") + { + $Action = "testexe"; + } + elsif ($Arg eq "--testpatch") { $Action = "testpatch"; } @@ -243,6 +269,11 @@ while (@ARGV) $Usage = 2; last; } + if ($Action eq "testexe") + { + # The remainder are the executable's arguments + last; + } } else { @@ -319,10 +350,18 @@ if (!defined $Usage) } } - if (!defined $FileName and $Action eq "testpatch") + if (!defined $FileName) { - Error "you must provide a patch to test\n"; - $Usage = 2; + if ($Action eq "testexe") + { + Error "you must provide an executable to run\n"; + $Usage = 2; + } + elsif ($Action eq "testpatch") + { + Error "you must provide a patch to test\n"; + $Usage = 2; + } } } if (defined $Usage) @@ -333,12 +372,14 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--help] --testpatch MISSIONS PATCH\n"; + print "Usage: $Name0 [--help] --testexe MISSIONS EXE ARGS...\n"; + print "or $Name0 [--help] --testpatch MISSIONS PATCH\n"; print "or $Name0 [--help] --winetest [--no-submit] MISSIONS BASETAG ARGS\n"; print "\n"; print "Tests the specified patch or runs WineTest in Wine.\n"; print "\n"; print "Where:\n"; + print " --testexe Run the executable in Wine.\n"; print " --testpatch Verify that the patch compiles and run the impacted tests.\n"; print " --winetest Run WineTest and submit the result to the website.\n"; print " --no-submit Do not submit the WineTest results to the website.\n"; @@ -346,6 +387,8 @@ if (defined $Usage) print " - win32: The regular 32 bit Wine build.\n"; print " - wow32: The 32 bit WoW Wine build.\n"; print " - wow64: The 64 bit WoW Wine build.\n"; + print " EXE Is the staging file containing the executable to run.\n"; + print " ARGS Are the arguments for the test executable.\n"; print " PATCH Is the staging file containing the patch to test.\n"; print " BASETAG Is the tag for this WineTest run. Note that the build type is\n"; print " automatically added to this tag.\n"; @@ -379,7 +422,11 @@ if ($Action eq "testpatch") } foreach my $Mission (@{$TaskMissions->{Missions}}) { - if ($Action eq "testpatch") + if ($Action eq "testexe") + { + exit(1) if (!TestExe($Mission, $FileName, \@ARGV)); + } + elsif ($Action eq "testpatch") { exit(1) if (!TestPatch($Mission, $Impacts)); } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3b7da0636f..5c40ef5046 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -243,11 +243,7 @@ sub GenerateFields($) my $VMs = CreateVMs(); if ($self->{FileType} eq "exe64") { - $VMs->AddFilter("Type", ["win64"]); - } - elsif ($self->{FileType} eq "exe32") - { - $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Type", ["win64", "wine"]); } else { @@ -808,7 +804,7 @@ sub SubmitJob($$$) if (!defined $ErrMessage) { $Task->Timeout(GetBuildTimeout($Impacts, $Missions->[0])); - $Task->Missions($Missions->[0]); + $Task->Missions($MissionStatement); # Save the build step so the others can reference it (my $ErrKey, my $ErrProperty, $ErrMessage) = $Jobs->Save(); @@ -849,49 +845,54 @@ sub SubmitJob($$$) } } - if ($FileType eq "patch") + my ($Tasks, $MissionStatement, $Timeout); + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["wine"]); + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + foreach my $VMKey (@$SortedKeys) { - my ($Tasks, $MissionStatement, $Timeout); - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["wine"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + next if (!$self->GetParam($FieldName)); # skip unselected VMs - if (!$Tasks) + if (!$Tasks) + { + # First create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($BaseName); + $WineStep->FileType($FileType); + $WineStep->Type("single"); + $WineStep->DebugLevel($self->GetParam("DebugLevel")); + $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); + $Tasks = $WineStep->Tasks; + + $MissionStatement = ($FileType =~ /^(?:exe32|patch)$/) ? "win32" : ""; + if ($FileType eq "exe64" or + ($FileType eq "patch" and defined $self->GetParam("Run64"))) { - # First create the Wine test step - my $WineStep = $Steps->Add(); - $WineStep->FileName($BaseName); - $WineStep->FileType($FileType); - $WineStep->Type("single"); - $WineStep->DebugLevel($self->GetParam("DebugLevel")); - $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); - $Tasks = $WineStep->Tasks; - - $MissionStatement = "win32"; - $MissionStatement.= ":wow64" if (defined $self->GetParam("Run64")); - - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - $Missions = $Missions->[0]; - $Timeout = GetBuildTimeout($Impacts, $Missions) + - GetTestTimeout($Impacts, $Missions); + $MissionStatement .= ":wow64"; } + $MissionStatement =~ s/^://; - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($Timeout); - $Task->Missions($MissionStatement); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + $Missions = $Missions->[0]; + $Timeout = $FileType ne "patch" ? + $SingleTimeout : + GetBuildTimeout($Impacts, $Missions) + + GetTestTimeout($Impacts, $Missions); } + + # Then add a task for this VM + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($Timeout); + $Task->Missions($MissionStatement); + $Task->CmdLineArg($self->GetParam("CmdLineArg")) if ($FileType ne "patch"); } # Now save it all (or whatever's left to save) -- 2.19.1

1 0

[PATCH] Revert "include: Use the ARRAY_SIZE() macro in debug.h."
by Andre Heider 27 Nov '18

27 Nov '18

This reverts commit af3992374e530a037e650b45194f933c5406038f. wine/debug.h is a public header, and ARRAY_SIZE() is not defined for external projects. Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 066873a38a..fb0d6bb737 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) if (vt & ~VT_TYPEMASK) return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); - if (vt < ARRAY_SIZE(variant_types)) + if (vt < sizeof(variant_types)/sizeof(*variant_types)) return variant_types[vt]; if (vt == VT_BSTR_BLOB) -- 2.19.1

4 18

[PATCH vkd3d 3/5] vkd3d: Disallow creating shader visible RTV/DSV descriptor heaps.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 7 +++++++ tests/d3d12.c | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 36c5cb232f67..0c3d7e809806 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2522,6 +2522,13 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, return E_INVALIDARG; } + if ((desc->Flags & D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE) + && (desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_RTV || desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_DSV)) + { + WARN("RTV/DSV descriptors heap cannot be shader visible.\n"); + return E_INVALIDARG; + } + max_descriptor_count = (~(size_t)0 - sizeof(*object)) / descriptor_size; if (desc->NumDescriptors > max_descriptor_count) { diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b3f04d47410..d0372454a8c3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2207,12 +2207,12 @@ static void test_create_descriptor_heap(void) heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; heap_desc.NodeMask = 0; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12DescriptorHeap_GetDevice(heap, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -2229,31 +2229,39 @@ static void test_create_descriptor_heap(void) heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); + heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_DSV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); + heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.18.1

3 2

[PATCH vkd3d 5/5] vkd3d: Skip uninitialized DSV and RTV descriptors.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9e5921ef81e2..3d5e898b4adb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3570,9 +3570,21 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi for (i = 0; i < render_target_descriptor_count; ++i) { if (single_descriptor_handle) - rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors) + i; + { + if ((rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors))) + rtv_desc += i; + } else + { rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); + } + + if (!rtv_desc) + { + WARN("RTV descriptor %u is not initialized.\n", i); + list->views[i + 1] = VK_NULL_HANDLE; + continue; + } d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -3591,21 +3603,28 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor); + if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor))) + { + d3d12_command_list_track_resource_usage(list, dsv_desc->resource); - d3d12_command_list_track_resource_usage(list, dsv_desc->resource); + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = dsv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + list->views[0] = VK_NULL_HANDLE; + } - /* In D3D12 CPU descriptors are consumed when a command is recorded. */ - view = dsv_desc->view; - if (!d3d12_command_allocator_add_view(list->allocator, view)) + list->views[0] = view->u.vk_image_view; + list->fb_width = max(list->fb_width, dsv_desc->width); + list->fb_height = max(list->fb_height, dsv_desc->height); + list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); + } + else { - WARN("Failed to add view.\n"); + WARN("DSV descriptor is not initialized.\n"); + list->views[0] = VK_NULL_HANDLE; } - - list->views[0] = view->u.vk_image_view; - list->fb_width = max(list->fb_width, dsv_desc->width); - list->fb_height = max(list->fb_height, dsv_desc->height); - list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); } d3d12_command_list_invalidate_current_framebuffer(list); -- 2.18.1

2 1

[PATCH vkd3d 4/5] vkd3d: Improve invalid format messages.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3ee602fafb4b..6f7373e996ef 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1809,7 +1809,7 @@ static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input if (!(format = vkd3d_get_format(e->Format, false))) { - WARN("Invalid DXGI format %#x.\n", e->Format); + WARN("Invalid input element format %#x.\n", e->Format); return E_INVALIDARG; } @@ -1956,7 +1956,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(desc->DSVFormat, true))) { - WARN("Invalid DXGI format %#x.\n", desc->DSVFormat); + WARN("Invalid DSV format %#x.\n", desc->DSVFormat); hr = E_INVALIDARG; goto fail; } @@ -2014,7 +2014,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) { - WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]); + WARN("Invalid RTV format %#x.\n", desc->RTVFormats[i]); hr = E_INVALIDARG; goto fail; } @@ -2148,7 +2148,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(e->Format, false))) { - WARN("Invalid DXGI format %#x.\n", e->Format); + WARN("Invalid input element format %#x.\n", e->Format); hr = E_INVALIDARG; goto fail; } -- 2.18.1

2 1

[PATCH vkd3d 1/5] tests: Add more test for clearing array textures.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- More test for Anv bug... --- tests/d3d12.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index aa35315f3e7a..09dc339c8084 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3630,8 +3630,16 @@ static void test_clear_depth_stencil_view(void) static void test_clear_render_target_view(void) { + static const unsigned int array_expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000}; + static const struct vec4 array_colors[] = + { + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + }; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + ID3D12Resource *resource, *resolved_resource; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3644,11 +3652,13 @@ static void test_clear_render_target_view(void) struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; - ID3D12Resource *resource; ID3D12Device *device; + unsigned int i; D3D12_BOX box; HRESULT hr; + STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors)); + memset(&desc, 0, sizeof(desc)); desc.no_render_target = true; if (!init_test_context(&context, &desc)) @@ -3687,7 +3697,7 @@ static void test_clear_render_target_view(void) &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); memset(&rtv_desc, 0, sizeof(rtv_desc)); rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -3720,12 +3730,88 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + /* 2D array texture */ + ID3D12Resource_Release(resource); + resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors); + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + reset_command_list(command_list, context.allocator); + for (i = 0; i < ARRAY_SIZE(array_colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY; + rtv_desc.Texture2DArray.FirstArraySlice = i; + rtv_desc.Texture2DArray.ArraySize = 1; + + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) + { + check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2); + reset_command_list(command_list, context.allocator); + } + + /* 2D multisample array texture */ + ID3D12Resource_Release(resource); + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + resource_desc.DepthOrArraySize = 1; + resource_desc.SampleDesc.Count = 1; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, + &IID_ID3D12Resource, (void **)&resolved_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(array_colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; + rtv_desc.Texture2DMSArray.FirstArraySlice = i; + rtv_desc.Texture2DMSArray.ArraySize = 1; + + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) + { + transition_resource_state(command_list, resolved_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + resolved_resource, 0, resource, i, DXGI_FORMAT_R8G8B8A8_UNORM); + transition_resource_state(command_list, resolved_resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(resolved_resource, 0, queue, command_list, array_expected_colors[i], 2); + reset_command_list(command_list, context.allocator); + } + + ID3D12Resource_Release(resolved_resource); + /* 3D texture */ ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; resource_desc.DepthOrArraySize = 32; resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, @@ -3734,7 +3820,6 @@ static void test_clear_render_target_view(void) ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle); - reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); -- 2.18.1

2 1

[PATCH vkd3d 2/5] tests: Implement readback for multisample textures.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 24 +++-------- tests/vkd3d_d3d12_test.h | 86 ++++++++++++++++++++++++++-------------- 2 files changed, 62 insertions(+), 48 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 09dc339c8084..1b3f04d47410 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3630,16 +3630,15 @@ static void test_clear_depth_stencil_view(void) static void test_clear_render_target_view(void) { - static const unsigned int array_expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000}; + static const unsigned int array_expected_colors[] = {0xff00ff00, 0xff0000ff, 0xffff0000}; static const struct vec4 array_colors[] = { - {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f}, }; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; - ID3D12Resource *resource, *resolved_resource; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3652,6 +3651,7 @@ static void test_clear_render_target_view(void) struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; + ID3D12Resource *resource; ID3D12Device *device; unsigned int i; D3D12_BOX box; @@ -3770,13 +3770,6 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); - resource_desc.DepthOrArraySize = 1; - resource_desc.SampleDesc.Count = 1; - hr = ID3D12Device_CreateCommittedResource(device, - &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, - D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, - &IID_ID3D12Resource, (void **)&resolved_resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(array_colors); ++i) { @@ -3795,23 +3788,16 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) { - transition_resource_state(command_list, resolved_resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); - ID3D12GraphicsCommandList_ResolveSubresource(command_list, - resolved_resource, 0, resource, i, DXGI_FORMAT_R8G8B8A8_UNORM); - transition_resource_state(command_list, resolved_resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resolved_resource, 0, queue, command_list, array_expected_colors[i], 2); + check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2); reset_command_list(command_list, context.allocator); } - ID3D12Resource_Release(resolved_resource); - /* 3D texture */ ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; resource_desc.DepthOrArraySize = 32; resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 1; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, diff --git a/tests/vkd3d_d3d12_test.h b/tests/vkd3d_d3d12_test.h index 28225e1749d2..fc07af78ffb4 100644 --- a/tests/vkd3d_d3d12_test.h +++ b/tests/vkd3d_d3d12_test.h @@ -159,6 +159,28 @@ static inline ID3D12DescriptorHeap *create_gpu_descriptor_heap_(unsigned int lin return descriptor_heap; } +static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, + unsigned int sub_resource_idx, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) +{ + D3D12_RESOURCE_BARRIER barrier; + + barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + barrier.Transition.pResource = resource; + barrier.Transition.Subresource = sub_resource_idx; + barrier.Transition.StateBefore = state_before; + barrier.Transition.StateAfter = state_after; + + ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); +} + +static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, + D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) +{ + transition_sub_resource_state(list, resource, D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, + state_before, state_after); +} + static unsigned int format_size(DXGI_FORMAT format) { switch (format) @@ -218,15 +240,16 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; + ID3D12Resource *src_resource; D3D12_RANGE read_range; unsigned int miplevel; ID3D12Device *device; - DXGI_FORMAT format; HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(texture); ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, @@ -240,35 +263,62 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi rb->row_pitch = align(rb->width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->data = NULL; - format = resource_desc.Format; + if (resource_desc.SampleDesc.Count > 1) + { + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + resource_desc.Alignment = 0; + resource_desc.DepthOrArraySize = 1; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, + &IID_ID3D12Resource, (void **)&src_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + src_resource, 0, texture, sub_resource, resource_desc.Format); + transition_resource_state(command_list, src_resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + sub_resource = 0; + } + else + { + src_resource = texture; + } rb->resource = create_readback_buffer(device, rb->row_pitch * rb->height * rb->depth); dst_location.pResource = rb->resource; dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; dst_location.PlacedFootprint.Offset = 0; - dst_location.PlacedFootprint.Footprint.Format = format; + dst_location.PlacedFootprint.Footprint.Format = resource_desc.Format; dst_location.PlacedFootprint.Footprint.Width = rb->width; dst_location.PlacedFootprint.Footprint.Height = rb->height; dst_location.PlacedFootprint.Footprint.Depth = rb->depth; dst_location.PlacedFootprint.Footprint.RowPitch = rb->row_pitch; - src_location.pResource = texture; + src_location.pResource = src_resource; src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; src_location.SubresourceIndex = sub_resource; ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); ID3D12Device_Release(device); + if (src_resource != texture) + ID3D12Resource_Release(src_resource); + read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); - ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } static void *get_readback_data(struct resource_readback *rb, @@ -367,28 +417,6 @@ static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device return texture; } -static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, - unsigned int sub_resource_idx, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) -{ - D3D12_RESOURCE_BARRIER barrier; - - barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; - barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; - barrier.Transition.pResource = resource; - barrier.Transition.Subresource = sub_resource_idx; - barrier.Transition.StateBefore = state_before; - barrier.Transition.StateAfter = state_after; - - ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); -} - -static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, - D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) -{ - transition_sub_resource_state(list, resource, D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, - state_before, state_after); -} - static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **root_signature) { -- 2.18.1

2 1

[PATCH 1/5] wined3d: Simplify "glsl_generate_ffp" texture projection
by Daniel Ansorregui 27 Nov '18

27 Nov '18

* This is to simplify the code before adding the FETCH4 modifications No change is intended in the shader generation Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 63 ++++++++++---------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 545e1bff9f..4b2dfaf34a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9863,65 +9863,34 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * switch (settings->op[stage].tex_type) { case WINED3D_GL_RES_TYPE_TEX_1D: - if (proj) - { - texture_function = "texture1DProj"; - coord_mask = "xw"; - } - else - { - texture_function = "texture1D"; - coord_mask = "x"; - } + texture_function = "texture1D"; + coord_mask = "x"; break; case WINED3D_GL_RES_TYPE_TEX_2D: - if (proj) - { - texture_function = "texture2DProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2D"; - coord_mask = "xy"; - } + texture_function = "texture2D"; + coord_mask = "xy"; break; case WINED3D_GL_RES_TYPE_TEX_3D: - if (proj) - { - texture_function = "texture3DProj"; - coord_mask = "xyzw"; - } - else - { - texture_function = "texture3D"; - coord_mask = "xyz"; - } + texture_function = "texture3D"; + coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_CUBE: texture_function = "textureCube"; coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_RECT: - if (proj) - { - texture_function = "texture2DRectProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2DRect"; - coord_mask = "xy"; - } + texture_function = "texture2DRect"; + coord_mask = "xy"; break; default: FIXME("Unhandled texture type %#x.\n", settings->op[stage].tex_type); texture_function = ""; coord_mask = "xyzw"; + proj = FALSE; break; } if (!legacy_syntax) - texture_function = proj ? "textureProj" : "texture"; + texture_function = "texture"; if (stage > 0 && (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP @@ -9953,8 +9922,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, "ret = ffp_texcoord[%u] + ret.xyxy;\n", stage); } - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", - stage, texture_function, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ret.%s%c);\n", + stage, texture_function, proj ? "Proj" : "", stage, coord_mask, proj ? 'w' : ' '); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) shader_addline(buffer, "tex%u *= clamp(tex%u.z * bumpenv_lum_scale%u + bumpenv_lum_offset%u, 0.0, 1.0);\n", @@ -9962,13 +9931,13 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", - stage, texture_function, stage, stage); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage); } else { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].%s);\n", - stage, texture_function, stage, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].%s%c);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage, coord_mask, proj ? 'w' : ' '); } string_buffer_sprintf(tex_reg_name, "tex%u", stage); -- 2.17.1

6 26

[PATCH v3 2/3] mpr: Implement support for making connections persistent.
by Pierre Schweitzer 27 Nov '18

27 Nov '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH 1/6] ntoskrnl.exe: Implement KeInitializeSemaphore().
by Zebediah Figura 27 Nov '18

27 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1cfb032dd..07e9104498 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2307,15 +2307,6 @@ LONG WINAPI KeReleaseMutex(PRKMUTEX Mutex, BOOLEAN Wait) } -/*********************************************************************** - * KeInitializeSemaphore (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeSemaphore( PRKSEMAPHORE Semaphore, LONG Count, LONG Limit ) -{ - FIXME( "(%p %d %d) stub\n", Semaphore , Count, Limit ); -} - - /*********************************************************************** * KeInitializeSpinLock (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 8011b56754..2190faa81f 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -36,6 +36,7 @@ enum object_type { TYPE_MANUAL_EVENT = 0, TYPE_AUTO_EVENT = 1, + TYPE_SEMAPHORE = 5, }; static CRITICAL_SECTION sync_cs; @@ -172,3 +173,17 @@ LONG WINAPI KeResetEvent( PRKEVENT event ) return ret; } + +/*********************************************************************** + * KeInitializeSemaphore (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeSemaphore( PRKSEMAPHORE semaphore, LONG count, LONG limit ) +{ + TRACE("semaphore %p, count %d, limit %d.\n", semaphore, count, limit); + + semaphore->Header.Type = TYPE_SEMAPHORE; + semaphore->Header.SignalState = count; + semaphore->Header.WaitListHead.Blink = NULL; + semaphore->Header.WaitListHead.Flink = NULL; + semaphore->Limit = limit; +} -- 2.14.1

2 7

[PATCH v5] server: Release of related atoms when destroying a window class
by Ralf Habacker 27 Nov '18

27 Nov '18

1 0

[PATCH] testbot: Provide the missions list to the Reconfig scripts.
by Francois Gouget 27 Nov '18

27 Nov '18

The scripts need it to know which builds to update. A Wine VM may only need to update the win32 build for instance, but may have to recreate wineprefixes for multiple locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4d50a3789a..2a8b1d625d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Engine::Notify; @@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " echo git pull &&\n". - " ../bin/build/$Script\n". + " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.19.1

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel