November 2018 - Wine-commits

Nikolay Sivov : wincodecs: Implement CreateBitmapFromSourceRect().
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: e26e3da6cde859c843dce8b9049838e1774b23a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e26e3da6cde859c843dce8b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 8 15:20:54 2018 +0300 wincodecs: Implement CreateBitmapFromSourceRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/imgfactory.c | 46 +++++++++++++++++++++++++++++------ dlls/windowscodecs/tests/bitmap.c | 51 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index dbcc5f5..78919a7 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -486,9 +486,8 @@ static HRESULT WINAPI ImagingFactory_CreateBitmap(IWICImagingFactory2 *iface, return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, 0, pixelFormat, option, ppIBitmap); } -static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 *iface, - IWICBitmapSource *piBitmapSource, WICBitmapCreateCacheOption option, - IWICBitmap **ppIBitmap) +static HRESULT create_bitmap_from_source_rect(IWICBitmapSource *piBitmapSource, const WICRect *rect, + WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { IWICBitmap *result; IWICBitmapLock *lock; @@ -502,13 +501,20 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 IWICPixelFormatInfo2 *formatinfo; WICPixelFormatNumericRepresentation format_type; - TRACE("(%p,%p,%u,%p)\n", iface, piBitmapSource, option, ppIBitmap); - if (!piBitmapSource || !ppIBitmap) return E_INVALIDARG; hr = IWICBitmapSource_GetSize(piBitmapSource, &width, &height); + if (SUCCEEDED(hr) && rect) + { + if (rect->X >= width || rect->Y >= height || rect->Width == 0 || rect->Height == 0) + return E_INVALIDARG; + + width = min(width - rect->X, rect->Width); + height = min(height - rect->Y, rect->Height); + } + if (SUCCEEDED(hr)) hr = IWICBitmapSource_GetPixelFormat(piBitmapSource, &pixelformat); @@ -539,7 +545,14 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 { UINT stride, buffersize; BYTE *buffer; - rc.X = rc.Y = 0; + + if (rect) + { + rc.X = rect->X; + rc.Y = rect->Y; + } + else + rc.X = rc.Y = 0; rc.Width = width; rc.Height = height; @@ -592,13 +605,30 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 return hr; } +static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 *iface, + IWICBitmapSource *piBitmapSource, WICBitmapCreateCacheOption option, + IWICBitmap **ppIBitmap) +{ + TRACE("(%p,%p,%u,%p)\n", iface, piBitmapSource, option, ppIBitmap); + + return create_bitmap_from_source_rect(piBitmapSource, NULL, option, ppIBitmap); +} + static HRESULT WINAPI ImagingFactory_CreateBitmapFromSourceRect(IWICImagingFactory2 *iface, IWICBitmapSource *piBitmapSource, UINT x, UINT y, UINT width, UINT height, IWICBitmap **ppIBitmap) { - FIXME("(%p,%p,%u,%u,%u,%u,%p): stub\n", iface, piBitmapSource, x, y, width, + WICRect rect; + + TRACE("(%p,%p,%u,%u,%u,%u,%p)\n", iface, piBitmapSource, x, y, width, height, ppIBitmap); - return E_NOTIMPL; + + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; + + return create_bitmap_from_source_rect(piBitmapSource, &rect, WICBitmapCacheOnLoad, ppIBitmap); } static HRESULT WINAPI ImagingFactory_CreateBitmapFromMemory(IWICImagingFactory2 *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 6e01f0b..61e985a 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -452,6 +452,20 @@ static void test_createbitmapfromsource(void) hr = IWICBitmap_SetResolution(bitmap, 12.0, 34.0); ok(hr == S_OK, "IWICBitmap_SetResolution failed hr=%x\n", hr); + /* WICBitmapNoCache */ + hr = IWICImagingFactory_CreateBitmapFromSource(factory, (IWICBitmapSource *)bitmap, + WICBitmapNoCache, &bitmap2); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); +todo_wine + ok(bitmap2 == bitmap, "Unexpected bitmap instance.\n"); + + IWICBitmap_Release(bitmap2); + + bitmap2 = (void *)0xdeadbeef; + hr = IWICImagingFactory_CreateBitmapFromSource(factory, &bitmapsource, WICBitmapNoCache, &bitmap2); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(bitmap2 == (void *)0xdeadbeef, "Unexpected pointer %p.\n", bitmap2); + hr = IWICImagingFactory_CreateBitmapFromSource(factory, (IWICBitmapSource*)bitmap, WICBitmapCacheOnLoad, &bitmap2); ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); @@ -538,6 +552,43 @@ static void test_createbitmapfromsource(void) ok(width == 3, "got %d, expected 3\n", width); ok(height == 3, "got %d, expected 3\n", height); + /* CreateBitmapFromSourceRect */ + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 0, 0, 16, 32, &bitmap); + ok(hr == S_OK, "Failed to create a bitmap, hr %#x.\n", hr); + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "Failed to get bitmap size, hr %#x.\n", hr); + ok(width == 3, "Unexpected width %u.\n", width); + ok(height == 3, "Unexpected height %u.\n", height); + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 0, 0, 1, 1, &bitmap); + ok(hr == S_OK, "Failed to create a bitmap, hr %#x.\n", hr); + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "Failed to get bitmap size, hr %#x.\n", hr); + ok(width == 1, "Unexpected width %u.\n", width); + ok(height == 1, "Unexpected height %u.\n", height); + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 2, 1, 16, 32, &bitmap); + ok(hr == S_OK, "Failed to create a bitmap, hr %#x.\n", hr); + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "Failed to get bitmap size, hr %#x.\n", hr); + ok(width == 1, "Unexpected width %u.\n", width); + ok(height == 2, "Unexpected height %u.\n", height); + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 0, 0, 0, 2, &bitmap); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 0, 0, 2, 0, &bitmap); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 1, 3, 16, 32, &bitmap); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 3, 1, 16, 32, &bitmap); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IWICBitmap_Release(bitmap2); }

1 0

Nikolay Sivov : wincodecs: Add support for WICBitmapNoCache in CreateBitmapFromSource() for bitmap as a source.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 70a3e86997ad1c1419cd02b9b49db7953cf5c4e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70a3e86997ad1c1419cd02b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 8 15:20:55 2018 +0300 wincodecs: Add support for WICBitmapNoCache in CreateBitmapFromSource() for bitmap as a source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/imgfactory.c | 10 ++++++++++ dlls/windowscodecs/tests/bitmap.c | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 78919a7..b564efc 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -19,6 +19,7 @@ #include "config.h" +#include <assert.h> #include <stdarg.h> #define COBJMACROS @@ -501,9 +502,18 @@ static HRESULT create_bitmap_from_source_rect(IWICBitmapSource *piBitmapSource, IWICPixelFormatInfo2 *formatinfo; WICPixelFormatNumericRepresentation format_type; + assert(!rect || (rect && option == WICBitmapCacheOnLoad)); + if (!piBitmapSource || !ppIBitmap) return E_INVALIDARG; + if (option == WICBitmapNoCache && SUCCEEDED(IWICBitmapSource_QueryInterface(piBitmapSource, + &IID_IWICBitmap, (void **)&result))) + { + *ppIBitmap = result; + return S_OK; + } + hr = IWICBitmapSource_GetSize(piBitmapSource, &width, &height); if (SUCCEEDED(hr) && rect) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 61e985a..5c225d2 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -456,7 +456,6 @@ static void test_createbitmapfromsource(void) hr = IWICImagingFactory_CreateBitmapFromSource(factory, (IWICBitmapSource *)bitmap, WICBitmapNoCache, &bitmap2); ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); -todo_wine ok(bitmap2 == bitmap, "Unexpected bitmap instance.\n"); IWICBitmap_Release(bitmap2);

1 0

Akihiro Sagawa : gdiplus/tests: Add more PNG color format tests.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 5855ff78462f04dc7388560b7ca265274e43e711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5855ff78462f04dc7388560b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 8 22:17:01 2018 +0900 gdiplus/tests: Add more PNG color format tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 229 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 188 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5855ff78462f04dc7388…

1 0

Akihiro Sagawa : gdiplus: Convert to 32bppARGB when PNG image with transparency chunk is loaded. ( rebased).
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 748a246a8de172678a6e8b779b9378cf5fd0aca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=748a246a8de172678a6e8b77… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 8 22:17:04 2018 +0900 gdiplus: Convert to 32bppARGB when PNG image with transparency chunk is loaded. (rebased). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44409 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 10 +++++----- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e9b0b08..ccfa165 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3949,6 +3949,39 @@ static GpStatus decode_image_jpeg(IStream* stream, GpImage **image) return decode_image_wic(stream, &GUID_ContainerFormatJpeg, NULL, image); } +static BOOL has_png_transparency_chunk(IStream *pIStream) +{ + LARGE_INTEGER seek; + BOOL has_tRNS = FALSE; + HRESULT hr; + BYTE header[8]; + + seek.QuadPart = 8; + do + { + ULARGE_INTEGER chunk_start; + ULONG bytesread, chunk_size; + + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); + if (FAILED(hr)) break; + + hr = IStream_Read(pIStream, header, 8, &bytesread); + if (FAILED(hr) || bytesread < 8) break; + + chunk_size = (header[0] << 24) | (header[1] << 16) | (header[2] << 8) | header[3]; + if (!memcmp(&header[4], "tRNS", 4)) + { + has_tRNS = TRUE; + break; + } + + seek.QuadPart = chunk_start.QuadPart + chunk_size + 12; /* skip data and CRC */ + } while (memcmp(&header[4], "IDAT", 4) && memcmp(&header[4], "IEND", 4)); + + TRACE("has_tRNS = %d\n", has_tRNS); + return has_tRNS; +} + static GpStatus decode_image_png(IStream* stream, GpImage **image) { IWICBitmapDecoder *decoder; @@ -3970,6 +4003,14 @@ static GpStatus decode_image_png(IStream* stream, GpImage **image) { if (IsEqualGUID(&format, &GUID_WICPixelFormat8bppGray)) force_conversion = TRUE; + else if ((IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed) || + IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed) || + IsEqualGUID(&format, &GUID_WICPixelFormat2bppIndexed) || + IsEqualGUID(&format, &GUID_WICPixelFormat1bppIndexed) || + IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR)) && + has_png_transparency_chunk(stream)) + force_conversion = TRUE; + status = decode_frame_wic(decoder, force_conversion, 0, png_metadata_reader, image); } else diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index ca78747..41ec4dc 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5168,7 +5168,7 @@ static void test_png_color_formats(void) { 2, PNG_COLOR_TYPE_RGB }, { 4, PNG_COLOR_TYPE_RGB }, { 8, PNG_COLOR_TYPE_RGB, - {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB, TRUE }, + {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB }, { PixelFormat24bppRGB, ImageFlagsColorSpaceRGB }, { PixelFormat24bppRGB, ImageFlagsColorSpaceRGB }}}, /* libpng refuses to load our test image complaining about extra compressed data, @@ -5182,7 +5182,7 @@ static void test_png_color_formats(void) /* 5 */ { 1, PNG_COLOR_TYPE_GRAY, - {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB, TRUE }, + {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB }, { PixelFormat1bppIndexed, ImageFlagsColorSpaceRGB }, { PixelFormat1bppIndexed, ImageFlagsColorSpaceRGB }}}, { 2, PNG_COLOR_TYPE_GRAY, @@ -5194,7 +5194,7 @@ static void test_png_color_formats(void) { PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, { PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }}}, { 8, PNG_COLOR_TYPE_GRAY, - {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB, TRUE }, + {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB }, { PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, { PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }}}, { 16, PNG_COLOR_TYPE_GRAY, @@ -5204,7 +5204,7 @@ static void test_png_color_formats(void) /* 10 */ { 1, PNG_COLOR_TYPE_PALETTE, - {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB, TRUE }, + {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB }, { PixelFormat1bppIndexed, ImageFlagsColorSpaceRGB }, { 0, 0 }}}, { 2, PNG_COLOR_TYPE_PALETTE, @@ -5216,7 +5216,7 @@ static void test_png_color_formats(void) { PixelFormat4bppIndexed, ImageFlagsColorSpaceRGB, TRUE }, { 0, 0 }}}, { 8, PNG_COLOR_TYPE_PALETTE, - {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB, TRUE }, + {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB }, { PixelFormat8bppIndexed, ImageFlagsColorSpaceRGB }, { 0, 0 }}}, { 16, PNG_COLOR_TYPE_PALETTE },

1 0

Akihiro Sagawa : gdiplus: Add 4bppIndexed to the list of supported formats.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 0e082c0416b49dede36e5012ec875e6bb41d110c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e082c0416b49dede36e5012… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 8 22:17:06 2018 +0900 gdiplus: Add 4bppIndexed to the list of supported formats. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 1 + dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ccfa165..2e844cf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -55,6 +55,7 @@ static const struct { { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 41ec4dc..b31f32e 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5213,7 +5213,7 @@ static void test_png_color_formats(void) { 0, 0 }}}, { 4, PNG_COLOR_TYPE_PALETTE, {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB }, - { PixelFormat4bppIndexed, ImageFlagsColorSpaceRGB, TRUE }, + { PixelFormat4bppIndexed, ImageFlagsColorSpaceRGB }, { 0, 0 }}}, { 8, PNG_COLOR_TYPE_PALETTE, {{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB },

1 0

Fabian Maurer : make_specfiles: Add kernelbase for api-ms-win-core-synch-*.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: e4ffe65899c225dbbb8bc97d644ff649e72a63ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ffe65899c225dbbb8bc97d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 8 18:28:19 2018 +0100 make_specfiles: Add kernelbase for api-ms-win-core-synch-*. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec | 6 +++--- dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec | 6 +++--- tools/make_specfiles | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec index d35fe78..84beb97 100644 --- a/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec +++ b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec @@ -51,8 +51,8 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx @ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject @ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx -@ stub WaitOnAddress +@ stdcall WaitOnAddress(ptr ptr long long) kernelbase.WaitOnAddress @ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable -@ stub WakeByAddressAll -@ stub WakeByAddressSingle +@ stdcall WakeByAddressAll(ptr) kernelbase.WakeByAddressAll +@ stdcall WakeByAddressSingle(ptr) kernelbase.WakeByAddressSingle @ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable diff --git a/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec b/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec index 84f40fa..9e53367 100644 --- a/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec +++ b/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec @@ -54,8 +54,8 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx @ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject @ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx -@ stub WaitOnAddress +@ stdcall WaitOnAddress(ptr ptr long long) kernelbase.WaitOnAddress @ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable -@ stub WakeByAddressAll -@ stub WakeByAddressSingle +@ stdcall WakeByAddressAll(ptr) kernelbase.WakeByAddressAll +@ stdcall WakeByAddressSingle(ptr) kernelbase.WakeByAddressSingle @ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable diff --git a/tools/make_specfiles b/tools/make_specfiles index b05afb8..ffb3bae 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -194,6 +194,7 @@ my @dll_groups = ], [ "kernel32", + "kernelbase", "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1", "api-ms-win-downlevel-normaliz-l1-1-0",

1 0

Henri Verbeet : wined3d: Respect WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: cdfdfc382b6cc307efcd51d5989eff8bca082e1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfdfc382b6cc307efcd51d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 21:47:02 2018 +0330 wined3d: Respect WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/swapchain.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3697b8f..b1a322e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4756,6 +4756,11 @@ static void update_swapchain_flags(struct wined3d_texture *texture) { unsigned int flags = texture->swapchain->desc.flags; + if (flags & WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER) + texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + else + texture->resource.access &= ~(WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W); + if (flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) texture->flags |= WINED3D_TEXTURE_GET_DC; else diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 499e163..b95623b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -838,6 +838,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.usage |= WINED3DUSAGE_OWNDC; texture_desc.bind_flags = 0; texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER) + texture_desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture_desc.width = swapchain->desc.backbuffer_width; texture_desc.height = swapchain->desc.backbuffer_height; texture_desc.depth = 1; @@ -947,6 +949,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.format = swapchain->desc.auto_depth_stencil_format; texture_desc.usage = 0; texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; + texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, device->device_parent, &texture_desc, 0, &ds)))

1 0

Henri Verbeet : d3d9: Only set WINED3D_SWAPCHAIN_GDI_COMPATIBLE on mappable swapchains.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 2266e289514e234b250e2f366a53ef444edcfd08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2266e289514e234b250e2f36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 21:47:03 2018 +0330 d3d9: Only set WINED3D_SWAPCHAIN_GDI_COMPATIBLE on mappable swapchains. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index eaf162c..d6faa97 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -346,10 +346,11 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); swapchain_desc->flags = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format) + if ((present_parameters->Flags & D3DPRESENTFLAG_LOCKABLE_BACKBUFFER) + && (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format) /* WINED3DFMT_UNKNOWN creates the swapchain with the current * display format, which is always GDI-compatible. */ - || swapchain_desc->backbuffer_format == WINED3DFMT_UNKNOWN) + || swapchain_desc->backbuffer_format == WINED3DFMT_UNKNOWN)) swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE; swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->auto_restore_display_mode = TRUE;

1 0

Henri Verbeet : d3d9: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 471715b946e9faa045c9755c95cae6b02ee3ba3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=471715b946e9faa045c9755c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 21:47:04 2018 +0330 d3d9: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 +-- dlls/d3d9/tests/device.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d6faa97..0cf2049 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4184,8 +4184,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic container_parent = &device->IDirect3DDevice9Ex_iface; if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, - texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, - &d3d9_null_wined3d_parent_ops, texture))) + texture_flags, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e789107..56f7a43 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12131,7 +12131,6 @@ todo_wine ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); -todo_wine ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr);

1 0

Henri Verbeet : d3d9: Translate E_INVALIDARG to D3DERR_INVALIDCALL in d3d9_surface_LockRect().
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 6b86019a9664483f3c09195a91142cb7ec5c1b60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b86019a9664483f3c09195a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 21:47:05 2018 +0330 d3d9: Translate E_INVALIDARG to D3DERR_INVALIDCALL in d3d9_surface_LockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 2 ++ dlls/d3d9/tests/device.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 50c035d..7d4d93b5e8 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -258,6 +258,8 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, locked_rect->pBits = map_desc.data; } + if (hr == E_INVALIDARG) + return D3DERR_INVALIDCALL; return hr; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 56f7a43..aba083c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12103,7 +12103,6 @@ static void test_lockable_backbuffer(void) ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); dc = (void *)0xdeadbeef;

1 0