April 2020 - Wine-Devel - list.winehq.org

[PATCH v2 2/3] msasn1: Add ASN1_CreateModule stub implementation
by Vijay Kiran Kamuju April 29, 2020

April 29, 2020

based on previous patch from Austin English. https://source.winehq.org/patches/data/115834 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/3] msasn1/tests: Add initial tests
by Vijay Kiran Kamuju April 29, 2020

April 29, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] include: Add related ASN1encoding_s and ASN1decoding_s structs
by Vijay Kiran Kamuju April 29, 2020

April 29, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] gdiplus: Include palette when writing PNG indexed formats.
by Jeff Smith April 29, 2020

April 29, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/image.c | 32 +++++++++++++++-- dlls/gdiplus/tests/image.c | 70 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f33e2328bf..ace27cd342 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -53,11 +53,11 @@ static const struct WICBitmapPaletteType palette_type; } pixel_formats[] = { - { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, - { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, @@ -126,6 +126,31 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT return palette; } +static HRESULT set_palette(IWICBitmapFrameEncode *frame, ColorPalette *palette) +{ + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *wic_palette; + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) + return hr; + + hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); + IWICImagingFactory_Release(factory); + if (SUCCEEDED(hr)) + { + hr = IWICPalette_InitializeCustom(wic_palette, palette->Entries, palette->Count); + + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameEncode_SetPalette(frame, wic_palette); + + IWICPalette_Release(wic_palette); + } + + return hr; +} + GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, RECT* roi, BOOL useAuxData, VOID** auxData, INT* auxDataSize) { @@ -4566,6 +4591,9 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) } } + if (SUCCEEDED(hr) && IsIndexedPixelFormat(gdipformat)) + hr = set_palette(frameencode, image->palette); + if (SUCCEEDED(hr)) { stat = GdipBitmapLockBits(bitmap, &rc, ImageLockModeRead, gdipformat, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 145eadbfd3..56727ce63c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5622,6 +5622,75 @@ static void test_png_color_formats(void) #undef PNG_COLOR_TYPE_GRAY_ALPHA #undef PNG_COLOR_TYPE_RGB_ALPHA +static void test_png_save_palette(void) +{ + GpStatus status; + GpBitmap *bitmap; + HGLOBAL hglob; + BOOL result; + IStream *stream; + GUID enc_format, clsid; + LARGE_INTEGER seek; + ULARGE_INTEGER pos; + UINT i, ptr; + BYTE *data; + + PixelFormat formats[] = { + PixelFormat1bppIndexed, + PixelFormat4bppIndexed, + PixelFormat8bppIndexed, + PixelFormat16bppGrayScale, + PixelFormat16bppRGB555, + PixelFormat16bppRGB565, + PixelFormat16bppARGB1555, + PixelFormat24bppRGB, + PixelFormat32bppRGB, + PixelFormat32bppARGB, + PixelFormat32bppPARGB, + }; + + result = get_encoder_clsid(L"image/png", &enc_format, &clsid); + ok(result, "getting PNG encoding clsid failed"); + + hglob = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD | GMEM_ZEROINIT, 1024); + + for (i = 0; i < ARRAY_SIZE(formats); i++) + { + status = GdipCreateBitmapFromScan0(8, 8, 0, formats[i], NULL, &bitmap); + ok(status == Ok, "Unexpected return value %d creating bitmap for PixelFormat %#x\n", status, formats[i]); + + CreateStreamOnHGlobal(hglob, FALSE, &stream); + status = GdipSaveImageToStream((GpImage *)bitmap, stream, &clsid, NULL); + GdipDisposeImage((GpImage*)bitmap); + + todo_wine_if(formats[i] == PixelFormat16bppGrayScale) + ok(formats[i] == PixelFormat16bppGrayScale ? + (status == GenericError || status == Win32Error) : status == Ok, + "Unexpected return value %d saving image for PixelFormat %#x\n", status, formats[i]); + + if (status == Ok) + { + data = GlobalLock(hglob); + seek.QuadPart = 0; + IStream_Seek(stream, seek, STREAM_SEEK_CUR, &pos); + for (ptr = 0; ptr < pos.QuadPart - 4; ptr++) + if (!memcmp(data + ptr, "PLTE", 4)) + break; + memset(data, 0, 1024); + GlobalUnlock(hglob); + + if (IsIndexedPixelFormat(formats[i])) + ok(ptr < pos.QuadPart - 4, "Expected palette not found for PixelFormat %#x\n", formats[i]); + else + ok(ptr >= pos.QuadPart - 4, "Unexpected palette found for PixelFormat %#x\n", formats[i]); + } + + IStream_Release(stream); + } + + GlobalFree(hglob); +} + static void test_GdipLoadImageFromStream(void) { IStream *stream; @@ -5865,6 +5934,7 @@ START_TEST(image) test_GdipInitializePalette(); test_png_color_formats(); + test_png_save_palette(); test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); -- 2.23.0

2 4

[PATCH v2 1/3] server: Abort waiting on a completion port when closing it.
by Alexey Prokhin April 29, 2020

April 29, 2020

Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- v2: Update kernelbase patch. Supersedes 184510 --- server/completion.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/server/completion.c b/server/completion.c index db04727b93..9e15c1ca07 100644 --- a/server/completion.c +++ b/server/completion.c @@ -48,12 +48,14 @@ struct completion struct object obj; struct list queue; unsigned int depth; + int abandoned; }; static void completion_dump( struct object*, int ); static struct object_type *completion_get_type( struct object *obj ); static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int completion_map_access( struct object *obj, unsigned int access ); +static int completion_close( struct object *obj, struct process *process, obj_handle_t handle ); static void completion_destroy( struct object * ); static const struct object_ops completion_ops = @@ -75,7 +77,7 @@ static const struct object_ops completion_ops = default_unlink_name, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - no_close_handle, /* close_handle */ + completion_close, /* close_handle */ completion_destroy /* destroy */ }; @@ -88,6 +90,22 @@ struct comp_msg unsigned int status; }; +static int completion_close( struct object *obj, struct process *process, obj_handle_t handle ) +{ + struct completion *completion = (struct completion *) obj; + struct wait_queue_entry *entry; + + LIST_FOR_EACH_ENTRY( entry, &obj->wait_queue, struct wait_queue_entry, entry ) + { + make_wait_abandoned( entry ); + } + + completion->abandoned = 1; + wake_up( &completion->obj, 0 ); + + return 1; +} + static void completion_destroy( struct object *obj) { struct completion *completion = (struct completion *) obj; @@ -118,7 +136,7 @@ static int completion_signaled( struct object *obj, struct wait_queue_entry *ent { struct completion *completion = (struct completion *)obj; - return !list_empty( &completion->queue ); + return !list_empty( &completion->queue ) || completion->abandoned; } static unsigned int completion_map_access( struct object *obj, unsigned int access ) @@ -141,6 +159,7 @@ static struct completion *create_completion( struct object *root, const struct u if (get_error() != STATUS_OBJECT_NAME_EXISTS) { list_init( &completion->queue ); + completion->abandoned = 0; completion->depth = 0; } } @@ -224,7 +243,7 @@ DECL_HANDLER(remove_completion) entry = list_head( &completion->queue ); if (!entry) - set_error( STATUS_PENDING ); + set_error( completion->abandoned ? STATUS_ABANDONED_WAIT_0 : STATUS_PENDING ); else { list_remove( entry ); -- 2.26.2

1 1

[PATCH] gdiplus/tests: Indicate which encoder failed when attempting to save image.
by Jeff Smith April 29, 2020

April 29, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/image.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9a62cd505e..f63346e1db 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5106,22 +5106,17 @@ static void test_CloneBitmapArea(void) static void test_supported_encoders(void) { - static const WCHAR bmp_mimetype[] = { 'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p',0 }; - static const WCHAR jpeg_mimetype[] = { 'i','m','a','g','e','/','j','p','e','g',0 }; - static const WCHAR gif_mimetype[] = { 'i','m','a','g','e','/','g','i','f',0 }; - static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; - static const WCHAR png_mimetype[] = { 'i','m','a','g','e','/','p','n','g',0 }; static const struct test_data { LPCWSTR mime; const GUID *format; } td[] = { - { bmp_mimetype, &ImageFormatBMP }, - { jpeg_mimetype, &ImageFormatJPEG }, - { gif_mimetype, &ImageFormatGIF }, - { tiff_mimetype, &ImageFormatTIFF }, - { png_mimetype, &ImageFormatPNG } + { L"image/bmp", &ImageFormatBMP }, + { L"image/jpeg", &ImageFormatJPEG }, + { L"image/gif", &ImageFormatGIF }, + { L"image/tiff", &ImageFormatTIFF }, + { L"image/png", &ImageFormatPNG } }; GUID format, clsid; BOOL ret; @@ -5147,7 +5142,7 @@ static void test_supported_encoders(void) ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL); - ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + ok(status == Ok, "%s encoder, GdipSaveImageToStream error %d\n", wine_dbgstr_w(td[i].mime), status); IStream_Release(stream); } -- 2.23.0

2 1

[PATCH v2 2/3] kernelbase: Set the proper error code in GetQueuedCompletionStatus{Ex} when the handle is closed.
by Alexey Prokhin April 29, 2020

April 29, 2020

Planet Zoo relies on it being ERROR_ABANDONED_WAIT_0. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- v2: ERROR_WAIT_NO_CHILDREN -> STATUS_ABANDONED_WAIT_0. Supersedes 184511 --- dlls/kernelbase/sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index c0db4679e9..ca8bb691cc 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -959,6 +959,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetQueuedCompletionStatus( HANDLE port, LPDWORD co } if (status == STATUS_TIMEOUT) SetLastError( WAIT_TIMEOUT ); + else if (status == STATUS_ABANDONED_WAIT_0) SetLastError( ERROR_ABANDONED_WAIT_0 ); else SetLastError( RtlNtStatusToDosError(status) ); return FALSE; } @@ -980,6 +981,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetQueuedCompletionStatusEx( HANDLE port, OVERLAPP if (ret == STATUS_SUCCESS) return TRUE; else if (ret == STATUS_TIMEOUT) SetLastError( WAIT_TIMEOUT ); else if (ret == STATUS_USER_APC) SetLastError( WAIT_IO_COMPLETION ); + else if (ret == STATUS_ABANDONED_WAIT_0) SetLastError( ERROR_ABANDONED_WAIT_0 ); else SetLastError( RtlNtStatusToDosError(ret) ); return FALSE; } -- 2.26.2

1 0

[PATCH] devenum: Use free for memory allocated with wcsdup.
by Rémi Bernon April 29, 2020

April 29, 2020

The memory is otherwise released to the process heap, although msvcrt allocated it from its internal heap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/devenum/mediacatenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index c0006ad53efa..9176d8470dbf 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -323,7 +323,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) TRACE("(%p) ref=%d\n", This, ref); if (ref == 0) { - CoTaskMemFree(This->name); + free(This->name); free(This); DEVENUM_UnlockModule(); } -- 2.26.1

2 1

[PATCH v2] include: Add IWbemRefresher related interfaces
by Vijay Kiran Kamuju April 29, 2020

April 29, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49044 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] include: Add IWbemRefresher related interfaces
by Vijay Kiran Kamuju April 29, 2020

April 29, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49044 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2