February 2018 - Wine-devel - list.winehq.org

[PATCH] server: Keep reference to terminated async in free_async_queue.
by Jacek Caban 26 Feb '18

26 Feb '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/async.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 2/2] mshtml: Support X-UA-Compatible HTTP header.
by Jacek Caban 26 Feb '18

26 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/mutation.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/navigate.c | 9 ++++++++- 3 files changed, 45 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] urlmon: Use HttpQueryInfoA in IWinInetHttpInfo::QueryInfo implementation.
by Jacek Caban 26 Feb '18

26 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/http.c | 8 +++---- dlls/urlmon/tests/protocol.c | 51 +++++++++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 20 deletions(-)

1 0

[PATCH 1/2] wincodecs/tests: Run decoder info tests for all decoders
by Nikolay Sivov 26 Feb '18

26 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/tests/info.c | 291 ++++++++++++++++++++++++---------------- 1 file changed, 179 insertions(+), 112 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 64ccab52ae..5d0dc44ed5 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -67,126 +67,193 @@ static BOOL is_pixelformat(GUID *format) static void test_decoder_info(void) { + struct decoder_info_test + { + const CLSID *clsid; + const char *mimetype; + const char *extensions; + unsigned int todo; + } decoder_info_tests[] = + { + { + &CLSID_WICBmpDecoder, + "image/bmp", + ".bmp,.dib,.rle" + }, + { + &CLSID_WICGifDecoder, + "image/gif", + ".gif" + }, + { + &CLSID_WICIcoDecoder, + "image/ico,image/x-icon", + ".ico,.icon", + 1 + }, + { + &CLSID_WICJpegDecoder, + "image/jpeg,image/jpe,image/jpg", + ".jpeg,.jpe,.jpg,.jfif,.exif", + 1 + }, + { + &CLSID_WICPngDecoder, + "image/png", + ".png" + }, + { + &CLSID_WICTiffDecoder, + "image/tiff,image/tif", + ".tiff,.tif", + 1 + }, + }; IWICComponentInfo *info; IWICBitmapDecoderInfo *decoder_info; HRESULT hr; ULONG len; WCHAR value[256]; - const WCHAR expected_mimetype[] = {'i','m','a','g','e','/','b','m','p',0}; - const WCHAR expected_extensions[] = {'.','b','m','p',',','.','d','i','b',',','.','r','l','e',0}; CLSID clsid; - GUID pixelformats[20]; + GUID pixelformats[32]; UINT num_formats, count; - int i; - - hr = get_component_info(&CLSID_WICBmpDecoder, &info); - ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); - - hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void**)&decoder_info); - ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); - - hr = IWICBitmapDecoderInfo_GetCLSID(decoder_info, NULL); - ok(hr == E_INVALIDARG, "GetCLSID failed, hr=%x\n", hr); - - hr = IWICBitmapDecoderInfo_GetCLSID(decoder_info, &clsid); - ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr); - ok(IsEqualGUID(&CLSID_WICBmpDecoder, &clsid), "GetCLSID returned wrong result\n"); - - hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, NULL); - ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); - - hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len); - ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); - ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); - - hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL); - ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); - - hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len); - ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); - ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); - - value[0] = 0; - hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len); - ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); - ok(lstrcmpW(value, expected_mimetype) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); - ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); - - hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len); - ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%x\n", hr); - ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); - - hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); - ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); - ok(lstrcmpW(value, expected_mimetype) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); - ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); - - num_formats = 0xdeadbeef; - hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, &num_formats); - ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); - ok(num_formats < 20 && num_formats > 1, "got %d formats\n", num_formats); - - hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, NULL); - ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); - - count = 0xdeadbeef; - hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, pixelformats, &count); - ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); - ok(count == 0, "got %d formats\n", count); + int i, j; - count = 0xdeadbeef; - hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 1, pixelformats, &count); - ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); - ok(count == 1, "got %d formats\n", count); - ok(is_pixelformat(&pixelformats[0]), "got invalid pixel format\n"); - - count = 0xdeadbeef; - hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, &count); - ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); - ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); - for (i=0; i<num_formats; i++) - ok(is_pixelformat(&pixelformats[i]), "got invalid pixel format\n"); - - hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, NULL); - ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); - - count = 0xdeadbeef; - hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 20, pixelformats, &count); - ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); - ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); - - hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, NULL); - ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); - - hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, NULL, &len); - ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); - ok(len == lstrlenW(expected_extensions)+1, "GetFileExtensions returned wrong len %i\n", len); - - hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, NULL); - ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); - - hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, &len); - ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - ok(len == lstrlenW(expected_extensions)+1, "GetFileExtensions returned wrong len %i\n", len); - - value[0] = 0; - hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, &len); - ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - ok(lstrcmpW(value, expected_extensions) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); - ok(len == lstrlenW(expected_extensions)+1, "GetFileExtensions returned wrong len %i\n", len); - - hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, value, &len); - ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetFileExtensions failed, hr=%x\n", hr); - ok(len == lstrlenW(expected_extensions)+1, "GetFileExtensions returned wrong len %i\n", len); - - hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 256, value, &len); - ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - ok(lstrcmpW(value, expected_extensions) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); - ok(len == lstrlenW(expected_extensions)+1, "GetFileExtensions returned wrong len %i\n", len); - - IWICBitmapDecoderInfo_Release(decoder_info); - - IWICComponentInfo_Release(info); + for (i = 0; i < sizeof(decoder_info_tests)/sizeof(decoder_info_tests[0]); i++) + { + struct decoder_info_test *test = &decoder_info_tests[i]; + WCHAR extensionsW[64]; + WCHAR mimetypeW[64]; + + MultiByteToWideChar(CP_ACP, 0, test->mimetype, -1, mimetypeW, sizeof(mimetypeW)/sizeof(mimetypeW[0])); + MultiByteToWideChar(CP_ACP, 0, test->extensions, -1, extensionsW, sizeof(extensionsW)/sizeof(extensionsW[0])); + + hr = get_component_info(test->clsid, &info); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + + hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void **)&decoder_info); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + hr = IWICBitmapDecoderInfo_GetCLSID(decoder_info, NULL); + ok(hr == E_INVALIDARG, "GetCLSID failed, hr=%x\n", hr); + + hr = IWICBitmapDecoderInfo_GetCLSID(decoder_info, &clsid); + ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr); + ok(IsEqualGUID(test->clsid, &clsid), "GetCLSID returned wrong result\n"); + + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); + + len = 0; + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len); + ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); + todo_wine_if(test->todo) + ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); + + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL); + ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); + + len = 0; + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len); + ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); + todo_wine_if(test->todo) + ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); + + value[0] = 0; + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len); + ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); + todo_wine_if(test->todo) { + ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); + ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); + } + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%x\n", hr); + todo_wine_if(test->todo) + ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); + + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); + ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); + todo_wine_if(test->todo) { + ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); + ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); + } + num_formats = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, &num_formats); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok((num_formats <= 21 && num_formats >= 1) || + broken(IsEqualCLSID(test->clsid, &CLSID_WICIcoDecoder) && num_formats == 0) /* WinXP */, + "%u: got %d formats\n", i, num_formats); + + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == 0, "got %d formats\n", count); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 1, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok((count == 1) || broken(IsEqualCLSID(test->clsid, &CLSID_WICIcoDecoder) && count == 0) /* WinXP */, + "%u: got %d formats\n", i, num_formats); + ok(is_pixelformat(&pixelformats[0]), "got invalid pixel format\n"); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); + for (j = 0; j < num_formats; j++) + ok(is_pixelformat(&pixelformats[j]), "got invalid pixel format\n"); + + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, NULL); + ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, sizeof(pixelformats)/sizeof(pixelformats[0]), + pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); + + hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); + + hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, NULL, &len); + ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + ok(len == lstrlenW(extensionsW) + 1, "%u: GetFileExtensions returned wrong len %i\n", i, len); + + hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, NULL); + ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); + + hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, &len); + ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); + + value[0] = 0; + hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, &len); + ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); + todo_wine_if(test->todo) + ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); + + hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, value, &len); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetFileExtensions failed, hr=%x\n", hr); + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); + + hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 256, value, &len); + ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); + todo_wine_if(test->todo) + ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); + + IWICBitmapDecoderInfo_Release(decoder_info); + IWICComponentInfo_Release(info); + } } static void test_pixelformat_info(void) -- 2.16.1

2 3

[PATCH v9] windowscodecs: Fix data corruption for Adobe CMYK JPEGs
by Anton Romanov 26 Feb '18

26 Feb '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43520 Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/windowscodecs/jpegformat.c | 10 ++- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/jpegformat.c | 145 ++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 dlls/windowscodecs/tests/jpegformat.c diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ef050ba688..aab4b92740 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -680,9 +680,15 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + DWORD *pDwordData = (DWORD*) (This->image_data + stride * first_scanline); + DWORD *pDwordDataEnd = (DWORD*) (This->image_data + This->cinfo.output_scanline * stride); + /* Adobe JPEG's have inverted CMYK data. */ - for (i=0; i<data_size; i++) - This->image_data[i] ^= 0xff; + while(pDwordData < pDwordDataEnd) + *pDwordData++ ^= 0xffffffff; + } + } LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index b1e78f995c..3d64210ba0 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -13,4 +13,5 @@ C_SRCS = \ pngformat.c \ propertybag.c \ stream.c \ + jpegformat.c \ tiffformat.c diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c new file mode 100644 index 0000000000..c1e46c4869 --- /dev/null +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -0,0 +1,145 @@ +/* + * 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 "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static const char jpeg_adobe_cmyk_1x5[] = + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x01\x2c" + "\x01\x2c\x00\x00\xff\xee\x00\x0e\x41\x64\x6f\x62\x65\x00\x64\x00" + "\x00\x00\x00\x02\xff\xfe\x00\x13\x43\x72\x65\x61\x74\x65\x64\x20" + "\x77\x69\x74\x68\x20\x47\x49\x4d\x50\xff\xdb\x00\x43\x00\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb" + "\x00\x43\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\xff\xc0\x00\x14\x08\x00\x05\x00\x01\x04\x01\x11\x00" + "\x02\x11\x01\x03\x11\x01\x04\x11\x00\xff\xc4\x00\x15\x00\x01\x01" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x08" + "\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\xff\xc4\x00\x14" + "\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\xff\xda\x00\x0e\x04\x01\x00\x02\x11\x03\x11\x04\x00\x00" + "\x3f\x00\x40\x44\x02\x1e\xa4\x1f\xff\xd9"; + +static void test_decode_adobe_cmyk(void) +{ + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hjpegdata; + char *jpegdata; + IStream *jpegstream; + GUID guidresult; + UINT count=0, width=0, height=0; + BYTE imagedata[5 * 4] = {1}; + UINT i; + + const BYTE expected_imagedata[5 * 4] = { + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + }; + + const BYTE expected_imagedata_24bpp[5 * 4] = { + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + }; + + hr = CoCreateInstance(&CLSID_WICJpegDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); + ok(hjpegdata != 0, "GlobalAlloc failed\n"); + if (hjpegdata) + { + jpegdata = GlobalLock(hjpegdata); + memcpy(jpegdata, jpeg_adobe_cmyk_1x5, sizeof(jpeg_adobe_cmyk_1x5)); + GlobalUnlock(hjpegdata); + + hr = CreateStreamOnHGlobal(hjpegdata, FALSE, &jpegstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, jpegstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatJpeg), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 1, "expected width=1, got %u\n", width); + ok(height == 5, "expected height=5, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat32bppCMYK) || + broken(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR)), /* xp/2003 */ + "unexpected pixel format: %s\n", wine_dbgstr_guid(&guidresult)); + + /* We want to be sure our state tracking will not impact output + * data on subsequent calls */ + for(i=2; i>0; --i) + { + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, NULL, 4, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)) || + broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ + "unexpected image data\n"); + } + IWICBitmapFrameDecode_Release(framedecode); + } + IStream_Release(jpegstream); + } + GlobalFree(hjpegdata); + } + IWICBitmapDecoder_Release(decoder); +} + + +START_TEST(jpegformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_decode_adobe_cmyk(); + + CoUninitialize(); +} -- 2.16.1

2 1

[PATCH] w2_32: Ignore setting several port assignment related socket options.
by Alistair Leslie-Hughes 26 Feb '18

26 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 16 ++++++++++++++++ include/winsock.h | 9 +++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e39901d..d983633 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5886,6 +5886,22 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, break; #endif + case WS_SO_RANDOMIZE_PORT: + FIXME("Ignoring WS_SO_RANDOMIZE_PORT\n"); + return 0; + + case WS_SO_PORT_SCALABILITY: + FIXME("Ignoring WS_SO_PORT_SCALABILITY\n"); + return 0; + + case WS_SO_REUSE_UNICASTPORT: + FIXME("Ignoring WS_SO_REUSE_UNICASTPORT\n"); + return 0; + + case WS_SO_REUSE_MULTICASTPORT: + FIXME("Ignoring WS_SO_REUSE_MULTICASTPORT\n"); + return 0; + default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/include/winsock.h b/include/winsock.h index 8bb067f..891fa9d 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -672,6 +672,10 @@ typedef struct WS(WSAData) #define SO_TYPE 0x1008 #define SO_BSP_STATE 0x1009 +#define SO_RANDOMIZE_PORT 0x3005 +#define SO_PORT_SCALABILITY 0x3006 +#define SO_REUSE_UNICASTPORT 0x3007 +#define SO_REUSE_MULTICASTPORT 0x3008 #define IOCPARM_MASK 0x7f #define IOC_VOID 0x20000000 @@ -707,6 +711,11 @@ typedef struct WS(WSAData) #define WS_SO_TYPE 0x1008 #define WS_SO_BSP_STATE 0x1009 +#define WS_SO_RANDOMIZE_PORT 0x3005 +#define WS_SO_PORT_SCALABILITY 0x3006 +#define WS_SO_REUSE_UNICASTPORT 0x3007 +#define WS_SO_REUSE_MULTICASTPORT 0x3008 + #define WS_IOCPARM_MASK 0x7f #define WS_IOC_VOID 0x20000000 #define WS_IOC_OUT 0x40000000 -- 1.9.1

3 4

[PATCH 1/4] winegstreamer: Avoid using the same event for multiple purposes.
by Zebediah Figura 26 Feb '18

26 Feb '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0ce92a4..42c455b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -69,7 +69,7 @@ typedef struct GSTImpl { GstBus *bus; guint64 start, nextofs, nextpullofs, stop; ALLOCATOR_PROPERTIES props; - HANDLE event, changed_ofs; + HANDLE no_more_pads_event, push_event; HANDLE push_thread; } GSTImpl; @@ -519,7 +519,7 @@ static DWORD CALLBACK push_data(LPVOID iface) TRACE("Waiting..\n"); - WaitForSingleObject(This->event, INFINITE); + WaitForSingleObject(This->push_event, INFINITE); TRACE("Starting..\n"); for (;;) { @@ -1050,7 +1050,7 @@ static void no_more_pads(GstElement *decodebin, gpointer user) { GSTImpl *This = (GSTImpl*)user; TRACE("%p %p\n", This, decodebin); - SetEvent(This->event); + SetEvent(This->no_more_pads_event); } static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) @@ -1156,7 +1156,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI /* Add initial pins */ This->initial = This->discont = TRUE; - ResetEvent(This->event); + ResetEvent(This->no_more_pads_event); gst_element_set_state(This->container, GST_STATE_PLAYING); ret = gst_element_get_state(This->container, NULL, NULL, -1); @@ -1166,7 +1166,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI return E_FAIL; } - WaitForSingleObject(This->event, INFINITE); + WaitForSingleObject(This->no_more_pads_event, INFINITE); gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < This->cStreams; ++i) @@ -1259,7 +1259,8 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) This->cStreams = 0; This->ppPins = NULL; This->push_thread = NULL; - This->event = CreateEventW(NULL, 0, 0, NULL); + This->no_more_pads_event = CreateEventW(NULL, 0, 0, NULL); + This->push_event = CreateEventW(NULL, 0, 0, NULL); This->bus = NULL; piInput = &This->pInputPin.pin.pinInfo; @@ -1286,7 +1287,8 @@ static void GST_Destroy(GSTImpl *This) TRACE("Destroying %p\n", This); - CloseHandle(This->event); + CloseHandle(This->no_more_pads_event); + CloseHandle(This->push_event); /* Don't need to clean up output pins, disconnecting input pin will do that */ IPin_ConnectedTo((IPin *)&This->pInputPin, &connected); @@ -1994,6 +1996,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, This->pReader = NULL; This->pAlloc = NULL; + ResetEvent(((GSTImpl *)This->pin.pinInfo.pFilter)->push_event); if (SUCCEEDED(hr)) hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader); if (SUCCEEDED(hr)) @@ -2016,7 +2019,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); hr = IMemAllocator_Commit(This->pAlloc); - SetEvent(((GSTImpl*)This->pin.pinInfo.pFilter)->event); + SetEvent(((GSTImpl*)This->pin.pinInfo.pFilter)->push_event); } else { GST_RemoveOutputPins((GSTImpl *)This->pin.pinInfo.pFilter); if (This->pReader) -- 2.7.4

2 8

[PATCH 5/5] usp10/tests: Cleanup test_ScriptString().
by Henri Verbeet 26 Feb '18

26 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 87 ++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cfa51b3..c6ae57e 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3099,22 +3099,19 @@ static void test_ScriptXtoX(void) win_skip("Uniscribe version too old to test Hebrew clusters\n"); } +/* This set of tests is for the string functions of Uniscribe. The + * ScriptStringAnalyse() function allocates memory pointed to by the + * SCRIPT_STRING_ANALYSIS ssa pointer. This memory is freed by + * ScriptStringFree(). There needs to be a valid hdc for this as + * ScriptStringAnalyse() calls ScriptItemize(), ScriptShape() and + * ScriptPlace() which require it. */ static void test_ScriptString(HDC hdc) { -/******************************************************************************************* - * - * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse - * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This - * memory is freed by ScriptStringFree. There needs to be a valid hdc for this as - * ScriptStringAnalyse calls ScriptItemize, ScriptShape and ScriptPlace which require it. - * - */ HRESULT hr; WCHAR teststr[] = {'T','e','s','t','1',' ','a','2','b','3', '\0'}; int len = ARRAY_SIZE(teststr) - 1; int Glyphs = len * 2 + 16; - int Charset; DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; static const int Dx[ARRAY_SIZE(teststr) - 1]; @@ -3129,55 +3126,49 @@ static void test_ScriptString(HDC hdc) int MaxSel = 0; BOOL Disabled = FALSE; const int *clip_len; - int i; UINT *order; + unsigned int i; + /* Test without hdc to get E_PENDING. */ + hr = ScriptStringAnalyse(NULL, teststr, len, Glyphs, -1, + Flags, ReqWidth, NULL, NULL, Dx, NULL, InClass, &ssa); + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); - Charset = -1; /* this flag indicates unicode input */ - /* Test without hdc to get E_PENDING */ - hr = ScriptStringAnalyse( NULL, teststr, len, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, Dx, NULL, - InClass, &ssa); - ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); - - /* Test that 0 length string returns E_INVALIDARG */ - hr = ScriptStringAnalyse( hdc, teststr, 0, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, Dx, NULL, - InClass, &ssa); - ok(hr == E_INVALIDARG, "ScriptStringAnalyse should return E_INVALIDARG not %08x\n", hr); - - /* test with hdc, this should be a valid test */ - hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, Dx, NULL, - InClass, &ssa); - ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + /* Test that 0 length string returns E_INVALIDARG. */ + hr = ScriptStringAnalyse(hdc, teststr, 0, Glyphs, -1, + Flags, ReqWidth, NULL, NULL, Dx, NULL, InClass, &ssa); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* Test with hdc, this should be a valid test. */ + hr = ScriptStringAnalyse(hdc, teststr, len, Glyphs, -1, + Flags, ReqWidth, NULL, NULL, Dx, NULL, InClass, &ssa); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ScriptStringFree(&ssa); - /* test makes sure that a call with a valid pssa still works */ - hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, Dx, NULL, - InClass, &ssa); - ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); - ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); + /* Test makes sure that a call with a valid pssa still works. */ + hr = ScriptStringAnalyse(hdc, teststr, len, Glyphs, -1, + Flags, ReqWidth, NULL, NULL, Dx, NULL, InClass, &ssa); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!ssa, "Got unexpected ssa %p.\n", ssa); - if (hr == S_OK) - { - hr = ScriptStringOut(ssa, X, Y, Options, &rc, MinSel, MaxSel, Disabled); - ok(hr == S_OK, "ScriptStringOut should return S_OK not %08x\n", hr); - } + hr = ScriptStringOut(ssa, X, Y, Options, &rc, MinSel, MaxSel, Disabled); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - clip_len = ScriptString_pcOutChars(ssa); - ok(*clip_len == len, "ScriptString_pcOutChars failed, got %d, expected %d\n", *clip_len, len); + clip_len = ScriptString_pcOutChars(ssa); + ok(*clip_len == len, "Got unexpected *clip_len %d, expected %d.\n", *clip_len, len); - order = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *clip_len * sizeof(UINT)); - hr = ScriptStringGetOrder(ssa, order); - ok(hr == S_OK, "ScriptStringGetOrder failed, got %08x, expected S_OK\n", hr); + order = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *clip_len * sizeof(*order)); + hr = ScriptStringGetOrder(ssa, order); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < *clip_len; i++) ok(order[i] == i, "%d: got %d expected %d\n", i, order[i], i); - HeapFree(GetProcessHeap(), 0, order); + for (i = 0; i < *clip_len; ++i) + { + ok(order[i] == i, "Got unexpected order[%u] %u.\n", i, order[i]); + } + HeapFree(GetProcessHeap(), 0, order); - hr = ScriptStringFree(&ssa); - ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); + hr = ScriptStringFree(&ssa); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } static void test_ScriptStringXtoCP_CPtoX(HDC hdc) -- 2.1.4

2 1

[PATCH 1/7] wined3d: Move dispatch_compute() to context.c file.
by Józef Kucia 26 Feb '18

26 Feb '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 61 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/drawprim.c | 59 ---------------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 60 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4929b843c244..e36898f84fd9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4003,7 +4003,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, return TRUE; } -void context_apply_compute_state(struct wined3d_context *context, +static void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct StateEntry *state_table = context->state_table; @@ -4227,3 +4227,62 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, ERR("Acquired context %p instead of %p.\n", current_context, context); return current_context; } + +void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_dispatch_parameters *parameters) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(device, NULL, 0); + if (!context->valid) + { + context_release(context); + WARN("Invalid context, skipping dispatch.\n"); + return; + } + gl_info = context->gl_info; + + if (!gl_info->supported[ARB_COMPUTE_SHADER]) + { + context_release(context); + FIXME("OpenGL implementation does not support compute shaders.\n"); + return; + } + + if (parameters->indirect) + wined3d_buffer_load(parameters->u.indirect.buffer, context, state); + + context_apply_compute_state(context, device, state); + + if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) + { + context_release(context); + WARN("No compute shader bound, skipping dispatch.\n"); + return; + } + + if (parameters->indirect) + { + const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; + struct wined3d_buffer *buffer = indirect->buffer; + + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); + GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); + } + else + { + const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; + GL_EXTCALL(glDispatchCompute(direct->group_count_x, direct->group_count_y, direct->group_count_z)); + } + checkGLcall("dispatch compute"); + + GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); + checkGLcall("glMemoryBarrier"); + + if (wined3d_settings.strict_draw_ordering) + gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + + context_release(context); +} diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 7eccc8f7d621..f87f0919c166 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -727,62 +727,3 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s TRACE("Done all gl drawing.\n"); } - -void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, - const struct wined3d_dispatch_parameters *parameters) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(device, NULL, 0); - if (!context->valid) - { - context_release(context); - WARN("Invalid context, skipping dispatch.\n"); - return; - } - gl_info = context->gl_info; - - if (!gl_info->supported[ARB_COMPUTE_SHADER]) - { - context_release(context); - FIXME("OpenGL implementation does not support compute shaders.\n"); - return; - } - - if (parameters->indirect) - wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - - context_apply_compute_state(context, device, state); - - if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) - { - context_release(context); - WARN("No compute shader bound, skipping dispatch.\n"); - return; - } - - if (parameters->indirect) - { - const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; - struct wined3d_buffer *buffer = indirect->buffer; - - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); - GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); - } - else - { - const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; - GL_EXTCALL(glDispatchCompute(direct->group_count_x, direct->group_count_y, direct->group_count_z)); - } - checkGLcall("dispatch compute"); - - GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); - checkGLcall("glMemoryBarrier"); - - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); -} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4d15c5b5f95..650c1a554e27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2135,8 +2135,6 @@ void context_alloc_occlusion_query(struct wined3d_context *context, void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; -void context_apply_compute_state(struct wined3d_context *context, - const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, -- 2.16.1

2 12

[PATCH] winebuild: Fix memory leaks (Pinpoint)
by Zhiyi Zhang 26 Feb '18

26 Feb '18

Fix bug 44601,44602,44603,44604,44605,44606,44607,44608 Although winebuild only runs for a short period of time. These memory leaks should be fixed anyway. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- tools/winebuild/import.c | 8 +++++++- tools/winebuild/main.c | 2 ++ tools/winebuild/parser.c | 1 + tools/winebuild/res32.c | 2 ++ tools/winebuild/spec32.c | 5 ++++- tools/winebuild/utils.c | 5 ++++- 6 files changed, 20 insertions(+), 3 deletions(-)

2 2