April 2017 - Wine-commits - list.winehq.org

Daniel Lehman : msvcp140: Add __crtWaitForThreadpoolTimerCallbacks.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 5fb502b06e60ce58a6def812e1cf0b25d6d4ff8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb502b06e60ce58a6def812e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 14:07:03 2017 -0700 msvcp140: Add __crtWaitForThreadpoolTimerCallbacks. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1b5bdcb..c32514a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3778,6 +3778,6 @@ @ stub __crtSetFileInformationByHandle @ cdecl __crtSetThreadpoolTimer(ptr ptr long long) MSVCP__crtSetThreadpoolTimer @ cdecl __crtSetThreadpoolWait(ptr long ptr) MSVCP__crtSetThreadpoolWait -@ stub __crtWaitForThreadpoolTimerCallbacks +@ cdecl __crtWaitForThreadpoolTimerCallbacks(ptr long) MSVCP__crtWaitForThreadpoolTimerCallbacks @ stub __set_stl_sync_api_mode @ cdecl xtime_get(ptr long) xtime_get diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ac23c2b..7b97b5c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1296,6 +1296,15 @@ VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, } /********************************************************************* + * __crtWaitForThreadpoolTimerCallbacks (MSVCP140.@) + */ +VOID CDECL MSVCP__crtWaitForThreadpoolTimerCallbacks(TP_TIMER *timer, BOOL cancel) +{ + TRACE("(%p %d)\n", timer, cancel); + WaitForThreadpoolTimerCallbacks(timer, cancel); +} + +/********************************************************************* * __crtCreateThreadpoolWait (MSVCP140.@) */ PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, diff --git a/include/winbase.h b/include/winbase.h index be1cb64..25e5077 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2636,6 +2636,7 @@ WINBASEAPI DWORD WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DW WINBASEAPI DWORD WINAPI WaitForMultipleObjectsEx(DWORD,const HANDLE*,BOOL,DWORD,BOOL); WINBASEAPI DWORD WINAPI WaitForSingleObject(HANDLE,DWORD); WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); +WINBASEAPI VOID WINAPI WaitForThreadpoolTimerCallbacks(PTP_TIMER,BOOL); WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe)

1 0

Daniel Lehman : msvcp140: Add __crtFreeLibraryWhenCallbackReturns.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: e54654ef3f00a49d31e04e1674ade03f412fb718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54654ef3f00a49d31e04e167… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 17:10:26 2017 -0700 msvcp140: Add __crtFreeLibraryWhenCallbackReturns. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c32514a..81a3902 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3763,7 +3763,7 @@ @ cdecl __crtCreateThreadpoolTimer(ptr ptr ptr) MSVCP__crtCreateThreadpoolTimer @ cdecl __crtCreateThreadpoolWait(ptr ptr ptr) MSVCP__crtCreateThreadpoolWait @ stub __crtFlushProcessWriteBuffers -@ stub __crtFreeLibraryWhenCallbackReturns +@ cdecl __crtFreeLibraryWhenCallbackReturns(ptr ptr) MSVCP__crtFreeLibraryWhenCallbackReturns @ stub __crtGetCurrentProcessorNumber @ stub __crtGetFileInformationByHandleEx @ stub __crtGetLocaleInfoEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7b97b5c..b358656 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1332,6 +1332,15 @@ VOID CDECL MSVCP__crtSetThreadpoolWait(TP_WAIT *wait, HANDLE handle, FILETIME *d return SetThreadpoolWait(wait, handle, due_time); } +/********************************************************************* + * __crtFreeLibraryWhenCallbackReturns (MSVCP140.@) + */ +VOID CDECL MSVCP__crtFreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE instance, HMODULE mod) +{ + TRACE("(%p %p)\n", instance, mod); + FreeLibraryWhenCallbackReturns(instance, mod); +} + /* ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ /* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) diff --git a/include/winbase.h b/include/winbase.h index 25e5077..b7f86a2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1994,6 +1994,7 @@ WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); #define FreeEnvironmentStrings WINELIB_NAME_AW(FreeEnvironmentStrings) WINBASEAPI BOOL WINAPI FreeLibrary(HMODULE); WINBASEAPI VOID DECLSPEC_NORETURN WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD); +WINBASEAPI VOID WINAPI FreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HMODULE); #define FreeModule(handle) FreeLibrary(handle) #define FreeProcInstance(proc) /*nothing*/ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL);

1 0

Nikolay Sivov : xmllite: Recognize us-ascii encoding.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: ef023c3fd65658884256f70779326018d4e5094a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef023c3fd65658884256f7077… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 21:35:16 2017 +0300 xmllite: Recognize us-ascii encoding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 6 ++++-- dlls/xmllite/tests/writer.c | 7 +++++++ dlls/xmllite/xmllite_private.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b4b455b..6056418 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -84,6 +84,7 @@ typedef enum StringValue_Last } XmlReaderStringValue; +static const WCHAR usasciiW[] = {'U','S','-','A','S','C','I','I',0}; static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; @@ -154,8 +155,9 @@ struct xml_encoding_data }; static const struct xml_encoding_data xml_encoding_map[] = { + { usasciiW, XmlEncoding_USASCII, 20127 }, { utf16W, XmlEncoding_UTF16, ~0 }, - { utf8W, XmlEncoding_UTF8, CP_UTF8 } + { utf8W, XmlEncoding_UTF8, CP_UTF8 }, }; const WCHAR *get_encoding_name(xml_encoding encoding) @@ -734,7 +736,7 @@ xml_encoding parse_encoding_name(const WCHAR *name, int len) if (!name) return XmlEncoding_Unknown; min = 0; - max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; + max = sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]) - 1; while (min <= max) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 0508466..74546e0 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -275,6 +275,7 @@ static void test_writer_create(void) static void test_writeroutput(void) { static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; + static const WCHAR usasciiW[] = {'u','s','-','a','s','c','i','i',0}; IXmlWriterOutput *output; IUnknown *unk; HRESULT hr; @@ -312,6 +313,12 @@ todo_wine /* releasing 'unk' crashes on native */ IUnknown_Release(output); IUnknown_Release(output); + + /* create with us-ascii */ + output = NULL; + hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, usasciiW, &output); + ok(hr == S_OK, "got %08x\n", hr); + IUnknown_Release(output); } static void test_writestartdocument(void) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index fa29265..702fadb 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -64,6 +64,7 @@ static inline void m_free(IMalloc *imalloc, void *mem) typedef enum { + XmlEncoding_USASCII, XmlEncoding_UTF16, XmlEncoding_UTF8, XmlEncoding_Unknown

1 0

Nikolay Sivov : xmllite/writer: Preserve original encoding name spelling in writer output.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: a68e51ce63753edd56b82867d291143ede5ad53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68e51ce63753edd56b82867d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 21:35:17 2017 +0300 xmllite/writer: Preserve original encoding name spelling in writer output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 29 +++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 34 +++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 74546e0..62ab871 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -324,9 +324,12 @@ todo_wine static void test_writestartdocument(void) { static const char fullprolog[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; + static const char *prologversion2 = "<?xml version=\"1.0\" encoding=\"uS-asCii\"?>"; static const char prologversion[] = "<?xml version=\"1.0\"?>"; static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR usasciiW[] = {'u','S','-','a','s','C','i','i',0}; static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriterOutput *output; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -386,6 +389,32 @@ static void test_writestartdocument(void) IStream_Release(stream); IXmlWriter_Release(writer); + + /* create with us-ascii */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + output = NULL; + hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, usasciiW, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, prologversion2); + + IStream_Release(stream); + IXmlWriter_Release(writer); + IUnknown_Release(output); } static void test_flush(void) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 3a0bd29..a841614 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -73,6 +73,7 @@ typedef struct ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; + WCHAR *encoding_name; /* exactly as specified on output creation */ struct output_buffer buffer; } xmlwriteroutput; @@ -373,6 +374,14 @@ static HRESULT write_encoding_bom(xmlwriter *writer) return S_OK; } +static const WCHAR *get_output_encoding_name(xmlwriteroutput *output) +{ + if (output->encoding_name) + return output->encoding_name; + + return get_encoding_name(output->encoding); +} + static HRESULT write_xmldecl(xmlwriter *writer, XmlStandalone standalone) { static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"'}; @@ -387,7 +396,7 @@ static HRESULT write_xmldecl(xmlwriter *writer, XmlStandalone standalone) /* encoding */ write_output_buffer(writer->output, encodingW, ARRAY_SIZE(encodingW)); - write_output_buffer_quoted(writer->output, get_encoding_name(writer->output->encoding), -1); + write_output_buffer_quoted(writer->output, get_output_encoding_name(writer->output), -1); /* standalone */ if (standalone == XmlStandalone_Omit) @@ -1366,6 +1375,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) if (This->output) IUnknown_Release(This->output); if (This->stream) ISequentialStream_Release(This->stream); free_output_buffer(This); + writeroutput_free(This, This->encoding_name); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -1420,8 +1430,8 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) return S_OK; } -static HRESULT create_writer(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, - IXmlWriterOutput **output) +static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + const WCHAR *encoding_name, IXmlWriterOutput **output) { xmlwriteroutput *writeroutput; HRESULT hr; @@ -1432,12 +1442,14 @@ static HRESULT create_writer(IUnknown *stream, IMalloc *imalloc, xml_encoding en writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); else writeroutput = heap_alloc(sizeof(*writeroutput)); - if(!writeroutput) return E_OUTOFMEMORY; + if (!writeroutput) + return E_OUTOFMEMORY; writeroutput->IXmlWriterOutput_iface.lpVtbl = &xmlwriteroutputvtbl; writeroutput->ref = 1; writeroutput->imalloc = imalloc; - if (imalloc) IMalloc_AddRef(imalloc); + if (imalloc) + IMalloc_AddRef(imalloc); writeroutput->encoding = encoding; writeroutput->stream = NULL; hr = init_output_buffer(writeroutput); @@ -1446,6 +1458,14 @@ static HRESULT create_writer(IUnknown *stream, IMalloc *imalloc, xml_encoding en return hr; } + if (encoding_name) { + unsigned int size = (strlenW(encoding_name) + 1) * sizeof(WCHAR); + writeroutput->encoding_name = writeroutput_alloc(writeroutput, size); + memcpy(writeroutput->encoding_name, encoding_name, size); + } + else + writeroutput->encoding_name = NULL; + IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); *output = &writeroutput->IXmlWriterOutput_iface; @@ -1468,7 +1488,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (!stream || !output) return E_INVALIDARG; xml_enc = parse_encoding_name(encoding ? encoding : utf8W, -1); - return create_writer(stream, imalloc, xml_enc, output); + return create_writer_output(stream, imalloc, xml_enc, encoding, output); } HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, @@ -1483,5 +1503,5 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, if (!stream || !output) return E_INVALIDARG; xml_enc = get_encoding_from_codepage(codepage); - return create_writer(stream, imalloc, xml_enc, output); + return create_writer_output(stream, imalloc, xml_enc, NULL, output); }

1 0

Viktor Semykin : windowscodecs/tests: Test for png codec seeking too far.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 5ada4e947ebeee3bf30e1b211dc045e5f5d9eeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ada4e947ebeee3bf30e1b211… Author: Viktor Semykin <thesame.ml(a)gmail.com> Date: Thu Mar 30 13:52:12 2017 -0300 windowscodecs/tests: Test for png codec seeking too far. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 34cb533..e9a0c18 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -284,6 +284,8 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size IStream *stream; GUID format; LONG refcount; + ULARGE_INTEGER pos; + LARGE_INTEGER zero; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -302,6 +304,11 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size ok(IsEqualGUID(&format, &GUID_ContainerFormatPng), "wrong container format %s\n", wine_dbgstr_guid(&format)); + zero.QuadPart = 0; + IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); + todo_wine ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", + (UINT)(pos.QuadPart >> 32), (UINT)pos.QuadPart, image_size); + refcount = IStream_Release(stream); ok(refcount > 0, "expected stream refcount > 0\n");

1 0

Viktor Semykin : windowscodecs: Fixed loading png from streams.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 2d5c861f750eea985a45c726f31576d941e824e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c861f750eea985a45c726f… Author: Viktor Semykin <thesame.ml(a)gmail.com> Date: Thu Mar 30 13:52:13 2017 -0300 windowscodecs: Fixed loading png from streams. Png decoder was making one extra seek after it met IEND chunk. This led to crashes of some software. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 7 +++---- dlls/windowscodecs/tests/pngformat.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 990dcf6..c98a6a7 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -774,11 +774,12 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p /* Find the metadata chunks in the file. */ seek.QuadPart = 8; - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); - if (FAILED(hr)) goto end; do { + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); + if (FAILED(hr)) goto end; + hr = read_png_chunk(pIStream, chunk_type, NULL, &chunk_size); if (FAILED(hr)) goto end; @@ -816,8 +817,6 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } seek.QuadPart = chunk_start.QuadPart + chunk_size + 12; /* skip data and CRC */ - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); - if (FAILED(hr)) goto end; } while (memcmp(chunk_type, "IEND", 4)); This->stream = pIStream; diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index e9a0c18..02e0b1c 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -306,7 +306,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size zero.QuadPart = 0; IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); - todo_wine ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", + ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", (UINT)(pos.QuadPart >> 32), (UINT)pos.QuadPart, image_size); refcount = IStream_Release(stream);

1 0

Viktor Semykin : windowscodecs/tests: Test with SHCreateMemStream.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 2fcfe35e88fe051ed02e837b274f9c00969032be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcfe35e88fe051ed02e837b2… Author: Viktor Semykin <thesame.ml(a)gmail.com> Date: Thu Mar 30 13:52:14 2017 -0300 windowscodecs/tests: Test with SHCreateMemStream. SHCreateMemStream takes less code to inialize and is preferred over CreateStreamOnHGlobal according to documentation. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/Makefile.in | 2 +- dlls/windowscodecs/tests/pngformat.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index e11d184..e006e3d 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windowscodecs.dll -IMPORTS = windowscodecs oleaut32 ole32 user32 gdi32 +IMPORTS = windowscodecs oleaut32 ole32 user32 gdi32 shlwapi C_SRCS = \ bitmap.c \ diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 02e0b1c..1aeb9bc 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -25,6 +25,7 @@ #include "windef.h" #include "wincodec.h" #include "wine/test.h" +#include "shlwapi.h" /* 1x1 pixel PNG image */ static const char png_no_color_profile[] = { @@ -277,8 +278,6 @@ static IWICImagingFactory *factory; static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) { - HGLOBAL hmem; - BYTE *data; HRESULT hr; IWICBitmapDecoder *decoder = NULL; IStream *stream; @@ -287,13 +286,8 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size ULARGE_INTEGER pos; LARGE_INTEGER zero; - hmem = GlobalAlloc(0, image_size); - data = GlobalLock(hmem); - memcpy(data, image_data, image_size); - GlobalUnlock(hmem); - - hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + stream = SHCreateMemStream (image_data, image_size); + ok(stream != NULL, "SHCreateMemStream error\n"); hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr);

1 0

Nikolay Sivov : dwrite: Added missing max bitmap size initialization.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: cc25929d3a152ee70f0f779091d82da88010f2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc25929d3a152ee70f0f77909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 3 08:14:08 2017 +0300 dwrite: Added missing max bitmap size initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e89d0a8..4e35cea 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5203,6 +5203,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->flags = 0; analysis->bitmap = NULL; + analysis->max_glyph_bitmap_size = 0; analysis->ppdip = desc->ppdip; analysis->origin.x = desc->origin_x * desc->ppdip; analysis->origin.y = desc->origin_y * desc->ppdip;

1 0

Henri Verbeet : wined3d: Ignore the blitter's depth/ colour fill return value in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 49f2a1ab2f0edfc76062ca4f418132dde1a4e65e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f2a1ab2f0edfc76062ca4f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:43 2017 +0200 wined3d: Ignore the blitter's depth/colour fill return value in wined3d_device_clear_rendertarget_view(). Direct3D 10 and later don't have a return value, earlier versions seem to claim success even if the fill/clear is unsupported. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 13 +++++-------- dlls/wined3d/device.c | 6 ++++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 59a2e7d..5f96cc3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1310,8 +1310,7 @@ static void color_fill_test(void) enum { CHECK_FILL_VALUE = 0x1, - TODO_FILL_RETURN = 0x2, - BLOCKS = 0x4, + BLOCKS = 0x2, } flags; DWORD fill_value; } @@ -1337,7 +1336,7 @@ static void color_fill_test(void) * result on Wine. * {D3DFMT_YUY2, "D3DFMT_YUY2", BLOCKS, 0}, * {D3DFMT_UYVY, "D3DFMT_UYVY", BLOCKS, 0}, */ - {D3DFMT_DXT1, "D3DFMT_DXT1", BLOCKS | TODO_FILL_RETURN, 0}, + {D3DFMT_DXT1, "D3DFMT_DXT1", BLOCKS, 0x00000000}, /* Vendor-specific formats like ATI2N are a non-issue here since they're not * supported as offscreen plain surfaces and do not support D3DUSAGE_RENDERTARGET * when created as texture. */ @@ -1447,18 +1446,16 @@ static void color_fill_test(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, NULL, 0xdeadbeef); - todo_wine_if (formats[i].flags & TODO_FILL_RETURN) - ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); + ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, &rect, 0xdeadbeef); - todo_wine_if (formats[i].flags & TODO_FILL_RETURN) - ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); + ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); if (SUCCEEDED(hr)) { hr = IDirect3DDevice9_ColorFill(device, surface, &rect2, 0xdeadbeef); if (formats[i].flags & BLOCKS) - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, fmt=%s.\n", hr, formats[i].name); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, fmt=%s.\n", hr, formats[i].name); else ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3b50e48..618e289 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4197,9 +4197,11 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi } if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) - return blitter->color_fill(device, view, rect, color); + blitter->color_fill(device, view, rect, color); else - return blitter->depth_fill(device, view, rect, flags, depth, stencil); + blitter->depth_fill(device, view, rect, flags, depth, stencil); + + return WINED3D_OK; } struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Allow all formats with "glInternal" set in CheckSurfaceCapability().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 8c98be4791f18f31b04a4a0f08d18979aa0d06df URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c98be4791f18f31b04a4a0f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:44 2017 +0200 wined3d: Allow all formats with "glInternal" set in CheckSurfaceCapability(). Rendertarget, depth/stencil and texturing restrictions are applied later in wined3d_check_device_format(), so to the extent this make a difference it mostly affects off-screen plain surfaces. Note that if the blitter check were to be implemented properly it would practically always return TRUE as well, because of the CPU based blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 419eb4d..82abcfa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5126,13 +5126,11 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *adapter_format, - const struct wined3d_format *check_format, BOOL no3d) +static BOOL wined3d_check_surface_capability(const struct wined3d_format *format, BOOL no3d) { if (no3d) { - switch (check_format->id) + switch (format->id) { case WINED3DFMT_B8G8R8_UNORM: TRACE("[FAILED] - Not enumerated on Windows.\n"); @@ -5162,21 +5160,7 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, } } - /* All formats that are supported for textures are supported for surfaces - * as well. */ - if (check_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) - return TRUE; - /* All depth stencil formats are supported on surfaces */ - if (CheckDepthStencilCapability(adapter, adapter_format, check_format, WINED3D_GL_RES_TYPE_TEX_2D)) - return TRUE; - if (CheckDepthStencilCapability(adapter, adapter_format, check_format, WINED3D_GL_RES_TYPE_RB)) - return TRUE; - - /* If opengl can't process the format natively, the blitter may be able to convert it */ - if (adapter->blitter->blit_supported(&adapter->gl_info, &adapter->d3d_info, - WINED3D_BLIT_OP_COLOR_BLIT, - NULL, WINED3D_POOL_DEFAULT, 0, check_format, - NULL, WINED3D_POOL_DEFAULT, 0, adapter_format)) + if (format->glInternal) { TRACE("[OK]\n"); return TRUE; @@ -5227,7 +5211,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; if (!(usage & WINED3DUSAGE_TEXTURE)) { - if (!CheckSurfaceCapability(adapter, adapter_format, format, wined3d->flags & WINED3D_NO3D)) + if (!wined3d_check_surface_capability(format, wined3d->flags & WINED3D_NO3D)) { TRACE("[FAILED] - Not supported for plain surfaces.\n"); return WINED3DERR_NOTAVAILABLE;

1 0