- Wine-Devel - list.winehq.org

[PATCH 2/8] windowscodecs: Start loading PNG in unix lib.
by Esme Povirk Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 159 ++++++++++++++++++++++++- dlls/windowscodecs/main.c | 19 +++ dlls/windowscodecs/pngformat.c | 21 +++- dlls/windowscodecs/unix_iface.c | 14 ++- dlls/windowscodecs/unix_lib.c | 15 +++ dlls/windowscodecs/wincodecs_common.h | 5 + dlls/windowscodecs/wincodecs_private.h | 20 ++++ 7 files changed, 247 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 336fbb389b8..f41ef765f9b 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -42,6 +42,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBPNG +#include <png.h> + +static void *libpng_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_create_read_struct); +MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_error); +MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_set_crc_action); +MAKE_FUNCPTR(png_set_error_fn); +MAKE_FUNCPTR(png_set_read_fn); +#undef MAKE_FUNCPTR + +static CRITICAL_SECTION init_png_cs; +static CRITICAL_SECTION_DEBUG init_png_cs_debug = +{ + 0, 0, &init_png_cs, + { &init_png_cs_debug.ProcessLocksList, + &init_png_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_png_cs") } +}; +static CRITICAL_SECTION init_png_cs = { &init_png_cs_debug, -1, 0, 0, 0, 0 }; + +static void *load_libpng(void) +{ + void *result; + + RtlEnterCriticalSection(&init_png_cs); + + if(!libpng_handle && (libpng_handle = dlopen(SONAME_LIBPNG, RTLD_NOW)) != NULL) { + +#define LOAD_FUNCPTR(f) \ + if((p##f = dlsym(libpng_handle, #f)) == NULL) { \ + libpng_handle = NULL; \ + RtlLeaveCriticalSection(&init_png_cs); \ + return NULL; \ + } + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_set_crc_action); + LOAD_FUNCPTR(png_set_error_fn); + LOAD_FUNCPTR(png_set_read_fn); + +#undef LOAD_FUNCPTR + } + + result = libpng_handle; + + RtlLeaveCriticalSection(&init_png_cs); + + return result; +} + struct png_decoder { struct decoder decoder; @@ -52,6 +113,97 @@ static inline struct png_decoder *impl_from_decoder(struct decoder* iface) return CONTAINING_RECORD(iface, struct png_decoder, decoder); } +static void user_error_fn(png_structp png_ptr, png_const_charp error_message) +{ + jmp_buf *pjmpbuf; + + /* This uses setjmp/longjmp just like the default. We can't use the + * default because there's no way to access the jmp buffer in the png_struct + * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */ + WARN("PNG error: %s\n", debugstr_a(error_message)); + pjmpbuf = ppng_get_error_ptr(png_ptr); + longjmp(*pjmpbuf, 1); +} + +static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message) +{ + WARN("PNG warning: %s\n", debugstr_a(warning_message)); +} + +static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + IStream *stream = ppng_get_io_ptr(png_ptr); + HRESULT hr; + ULONG bytesread; + + hr = stream_read(stream, data, length, &bytesread); + if (FAILED(hr) || bytesread != length) + { + ppng_error(png_ptr, "failed reading data"); + } +} + +HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +{ + png_structp png_ptr; + png_infop info_ptr; + png_infop end_info; + jmp_buf jmpbuf; + HRESULT hr = E_FAIL; + + png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!png_ptr) + { + return E_FAIL; + } + + info_ptr = ppng_create_info_struct(png_ptr); + if (!info_ptr) + { + ppng_destroy_read_struct(&png_ptr, NULL, NULL); + return E_FAIL; + } + + end_info = ppng_create_info_struct(png_ptr); + if (!end_info) + { + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return E_FAIL; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; + goto end; + } + ppng_set_error_fn(png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); + + /* seek to the start of the stream */ + hr = stream_seek(stream, 0, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) + { + goto end; + } + + /* set up custom i/o handling */ + ppng_set_read_fn(png_ptr, stream, user_read_data); + + /* read the header */ + ppng_read_info(png_ptr, info_ptr); + + st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata; + st->frame_count = 1; + hr = S_OK; + +end: + ppng_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return hr; +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); @@ -60,6 +212,7 @@ void CDECL png_decoder_destroy(struct decoder* iface) } static const struct decoder_funcs png_decoder_vtable = { + png_decoder_initialize, png_decoder_destroy }; @@ -67,7 +220,11 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res { struct png_decoder *This; - TRACE("\n"); + if (!load_libpng()) + { + ERR("Failed reading PNG because unable to find %s\n",SONAME_LIBPNG); + return E_FAIL; + } This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 3849e24c2a1..2d8b0336f3f 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -255,6 +255,25 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, return hr; } +HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read) +{ + return IStream_Read(stream, buffer, read, bytes_read); +} + +HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position) +{ + HRESULT hr; + LARGE_INTEGER ofs_large; + ULARGE_INTEGER pos_large; + + ofs_large.QuadPart = ofs; + hr = IStream_Seek(stream, ofs_large, origin, &pos_large); + if (new_position) + *new_position = pos_large.QuadPart; + + return hr; +} + void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) { UINT x, y; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3b326c1266f..5a4d94ae4f3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -446,6 +446,7 @@ typedef struct { IStream *stream; struct decoder *png_decoder; struct decoder_info decoder_info; + struct decoder_stat file_info; png_structp png_ptr; png_infop info_ptr; png_infop end_info; @@ -543,6 +544,7 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, DWORD *capability) { + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); HRESULT hr; TRACE("(%p,%p,%p)\n", iface, stream, capability); @@ -552,9 +554,7 @@ static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); if (hr != S_OK) return hr; - *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | - WICBitmapDecoderCapabilityCanDecodeSomeImages; - /* FIXME: WICBitmapDecoderCapabilityCanEnumerateMetadata */ + *capability = (This->file_info.flags & DECODER_FLAGS_CAPABILITY_MASK); return S_OK; } @@ -595,6 +595,16 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p EnterCriticalSection(&This->lock); + if (This->initialized) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + hr = decoder_initialize(This->png_decoder, pIStream, &This->file_info); + if (FAILED(hr)) + goto end; + /* initialize libpng */ This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!This->png_ptr) @@ -896,9 +906,12 @@ static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); if (!pCount) return E_INVALIDARG; - *pCount = 1; + if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; + + *pCount = This->file_info.frame_count; return S_OK; } diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index cae64a6774c..924ed7f5c0d 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -39,9 +39,14 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static const struct unix_funcs *unix_funcs; +static const struct win32_funcs win32_funcs = { + stream_read, + stream_seek +}; + static BOOL WINAPI load_unixlib( INIT_ONCE *once, void *param, void **context ) { - __wine_init_unix_lib( windowscodecs_module, DLL_PROCESS_ATTACH, NULL, &unix_funcs ); + __wine_init_unix_lib( windowscodecs_module, DLL_PROCESS_ATTACH, &win32_funcs, &unix_funcs ); return TRUE; } @@ -61,6 +66,12 @@ static inline struct decoder_wrapper *impl_from_decoder(struct decoder* iface) return CONTAINING_RECORD(iface, struct decoder_wrapper, win32_decoder); } +HRESULT CDECL decoder_wrapper_initialize(struct decoder* iface, IStream* stream, struct decoder_stat *st) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_initialize(This->unix_decoder, stream, st); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -69,6 +80,7 @@ void CDECL decoder_wrapper_destroy(struct decoder* iface) } static const struct decoder_funcs decoder_wrapper_vtable = { + decoder_wrapper_initialize, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 80321d5b745..fb4400bfe97 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -43,6 +43,18 @@ #include "wincodecs_common.h" +static const struct win32_funcs *win32_funcs; + +HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read) +{ + return win32_funcs->stream_read(stream, buffer, read, bytes_read); +} + +HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position) +{ + return win32_funcs->stream_seek(stream, ofs, origin, new_position); +} + HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) { if (IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder)) @@ -53,6 +65,7 @@ HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *in static const struct unix_funcs unix_funcs = { decoder_create, + decoder_initialize, decoder_destroy }; @@ -60,6 +73,8 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p { if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + win32_funcs = ptr_in; + *(const struct unix_funcs **)ptr_out = &unix_funcs; return STATUS_SUCCESS; } diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index 4592a7ee15b..ddc3d486dcd 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -16,6 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +HRESULT CDECL decoder_initialize(struct decoder *decoder, IStream *stream, struct decoder_stat *st) +{ + return decoder->vtable->initialize(decoder, stream, st); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 0085639b2e1..110a0bd510a 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -259,6 +259,14 @@ struct decoder_info CLSID clsid; }; +#define DECODER_FLAGS_CAPABILITY_MASK 0x1f + +struct decoder_stat +{ + DWORD flags; + DWORD frame_count; +}; + struct decoder { const struct decoder_funcs *vtable; @@ -266,10 +274,21 @@ struct decoder struct decoder_funcs { + HRESULT (CDECL *initialize)(struct decoder* This, IStream *stream, struct decoder_stat *st); void (CDECL *destroy)(struct decoder* This); }; +HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read); +HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position); + +struct win32_funcs +{ + HRESULT (CDECL *stream_read)(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read); + HRESULT (CDECL *stream_seek)(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position); +}; + HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); +HRESULT CDECL decoder_initialize(struct decoder *This, IStream *stream, struct decoder_stat *st); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -277,6 +296,7 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res struct unix_funcs { HRESULT (CDECL *decoder_create)(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); + HRESULT (CDECL *decoder_initialize)(struct decoder *This, IStream *stream, struct decoder_stat *st); void (CDECL *decoder_destroy)(struct decoder* This); }; -- 2.17.1

1 0

[PATCH 1/8] windowscodecs: Add a unix library and start to use it for PNG.
by Esme Povirk Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 3 + dlls/windowscodecs/libpng.c | 98 ++++++++++++++++++++++++ dlls/windowscodecs/main.c | 5 ++ dlls/windowscodecs/pngformat.c | 20 ++++- dlls/windowscodecs/unix_iface.c | 102 +++++++++++++++++++++++++ dlls/windowscodecs/unix_lib.c | 66 ++++++++++++++++ dlls/windowscodecs/wincodecs_common.h | 23 ++++++ dlls/windowscodecs/wincodecs_private.h | 35 +++++++++ 8 files changed, 349 insertions(+), 3 deletions(-) create mode 100644 dlls/windowscodecs/libpng.c create mode 100644 dlls/windowscodecs/unix_iface.c create mode 100644 dlls/windowscodecs/unix_lib.c create mode 100644 dlls/windowscodecs/wincodecs_common.h diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index fac90344fa3..fde28aea778 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ imgfactory.c \ info.c \ jpegformat.c \ + libpng.c \ main.c \ metadatahandler.c \ metadataquery.c \ @@ -34,6 +35,8 @@ C_SRCS = \ tgaformat.c \ tiffformat.c \ ungif.c \ + unix_iface.c \ + unix_lib.c \ uuid.c RC_SRCS = version.rc diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c new file mode 100644 index 00000000000..336fbb389b8 --- /dev/null +++ b/dlls/windowscodecs/libpng.c @@ -0,0 +1,98 @@ +/* + * Copyright 2020 Esme Povirk + * + * 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "winbase.h" +#include "objbase.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#ifdef SONAME_LIBPNG + +struct png_decoder +{ + struct decoder decoder; +}; + +static inline struct png_decoder *impl_from_decoder(struct decoder* iface) +{ + return CONTAINING_RECORD(iface, struct png_decoder, decoder); +} + +void CDECL png_decoder_destroy(struct decoder* iface) +{ + struct png_decoder *This = impl_from_decoder(iface); + + RtlFreeHeap(GetProcessHeap(), 0, This); +} + +static const struct decoder_funcs png_decoder_vtable = { + png_decoder_destroy +}; + +HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result) +{ + struct png_decoder *This; + + TRACE("\n"); + + This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); + + if (!This) + { + return E_OUTOFMEMORY; + } + + This->decoder.vtable = &png_decoder_vtable; + *result = &This->decoder; + + info->container_format = GUID_ContainerFormatPng; + info->block_format = GUID_ContainerFormatPng; + info->clsid = CLSID_WICPngDecoder; + + return S_OK; +} + +#else + +HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result) +{ + ERR("Trying to load PNG picture, but PNG support is not compiled in.\n"); + return E_FAIL; +} + +#endif + diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 7e03112a63c..3849e24c2a1 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -32,8 +32,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_common.h" + extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +extern HMODULE windowscodecs_module; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -41,6 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); + windowscodecs_module = hinstDLL; break; case DLL_PROCESS_DETACH: ReleaseComponentInfos(); diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3cf47b4211f..3b326c1266f 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -444,6 +444,8 @@ typedef struct { IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; IStream *stream; + struct decoder *png_decoder; + struct decoder_info decoder_info; png_structp png_ptr; png_infop info_ptr; png_infop end_info; @@ -521,6 +523,8 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) IStream_Release(This->stream); if (This->png_ptr) ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + if (This->png_decoder) + decoder_destroy(This->png_decoder); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->image_bits); @@ -828,16 +832,18 @@ end: static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, GUID *pguidContainerFormat) { - memcpy(pguidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID)); + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); + memcpy(pguidContainerFormat, &This->decoder_info.container_format, sizeof(GUID)); return S_OK; } static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - return get_decoder_info(&CLSID_WICPngDecoder, ppIDecoderInfo); + return get_decoder_info(&This->decoder_info.clsid, ppIDecoderInfo); } static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, @@ -1208,8 +1214,9 @@ static ULONG WINAPI PngDecoder_Block_Release(IWICMetadataBlockReader *iface) static HRESULT WINAPI PngDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, GUID *pguidContainerFormat) { + PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); if (!pguidContainerFormat) return E_INVALIDARG; - memcpy(pguidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID)); + memcpy(pguidContainerFormat, &This->decoder_info.block_format, sizeof(GUID)); return S_OK; } @@ -1312,6 +1319,13 @@ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngDecoder)); if (!This) return E_OUTOFMEMORY; + ret = get_unix_decoder(&CLSID_WICPngDecoder, &This->decoder_info, &This->png_decoder); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, This); + return ret; + } + This->IWICBitmapDecoder_iface.lpVtbl = &PngDecoder_Vtbl; This->IWICBitmapFrameDecode_iface.lpVtbl = &PngDecoder_FrameVtbl; This->IWICMetadataBlockReader_iface.lpVtbl = &PngDecoder_BlockVtbl; diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c new file mode 100644 index 00000000000..cae64a6774c --- /dev/null +++ b/dlls/windowscodecs/unix_iface.c @@ -0,0 +1,102 @@ +/* + * unix_iface.c - This is the Win32 side of the Unix interface. + * + * Copyright 2020 Esme Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "winternl.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + +static const struct unix_funcs *unix_funcs; + +static BOOL WINAPI load_unixlib( INIT_ONCE *once, void *param, void **context ) +{ + __wine_init_unix_lib( windowscodecs_module, DLL_PROCESS_ATTACH, NULL, &unix_funcs ); + return TRUE; +} + +static void init_unixlib(void) +{ + InitOnceExecuteOnce( &init_once, load_unixlib, NULL, NULL ); +} + +struct decoder_wrapper +{ + struct decoder win32_decoder; + struct decoder *unix_decoder; +}; + +static inline struct decoder_wrapper *impl_from_decoder(struct decoder* iface) +{ + return CONTAINING_RECORD(iface, struct decoder_wrapper, win32_decoder); +} + +void CDECL decoder_wrapper_destroy(struct decoder* iface) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + unix_funcs->decoder_destroy(This->unix_decoder); + HeapFree(GetProcessHeap(), 0, This); +} + +static const struct decoder_funcs decoder_wrapper_vtable = { + decoder_wrapper_destroy +}; + +HRESULT get_unix_decoder(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) +{ + HRESULT hr; + struct decoder_wrapper *wrapper; + struct decoder *unix_decoder; + + init_unixlib(); + + hr = unix_funcs->decoder_create(decoder_clsid, info, &unix_decoder); + + if (SUCCEEDED(hr)) + { + wrapper = HeapAlloc(GetProcessHeap(), 0, sizeof(*wrapper)); + + if (!wrapper) + { + unix_funcs->decoder_destroy(unix_decoder); + return E_OUTOFMEMORY; + } + + wrapper->win32_decoder.vtable = &decoder_wrapper_vtable; + wrapper->unix_decoder = unix_decoder; + *result = &wrapper->win32_decoder; + } + + return hr; +} + diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c new file mode 100644 index 00000000000..80321d5b745 --- /dev/null +++ b/dlls/windowscodecs/unix_lib.c @@ -0,0 +1,66 @@ +/* + * unix_lib.c - This is the Unix side of the Unix interface. + * + * Copyright 2020 Esme Povirk + * + * 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "winbase.h" +#include "objbase.h" + +#include "initguid.h" +#include "wincodecs_private.h" + +#include "wine/debug.h" + +#include "wincodecs_common.h" + +HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) +{ + if (IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder)) + return png_decoder_create(info, result); + + return E_NOTIMPL; +} + +static const struct unix_funcs unix_funcs = { + decoder_create, + decoder_destroy +}; + +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) +{ + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + + *(const struct unix_funcs **)ptr_out = &unix_funcs; + return STATUS_SUCCESS; +} + diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h new file mode 100644 index 00000000000..4592a7ee15b --- /dev/null +++ b/dlls/windowscodecs/wincodecs_common.h @@ -0,0 +1,23 @@ +/* + * Copyright 2020 Esme Povirk + * + * 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 + */ + +void CDECL decoder_destroy(struct decoder *decoder) +{ + decoder->vtable->destroy(decoder); +} + diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index f7665d11732..0085639b2e1 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -247,4 +247,39 @@ static inline const char *debug_wic_rect(const WICRect *rect) return wine_dbg_sprintf("(%u,%u)-(%u,%u)", rect->X, rect->Y, rect->Width, rect->Height); } +HMODULE windowscodecs_module; + +/* unixlib iface */ +struct decoder_funcs; + +struct decoder_info +{ + GUID container_format; + GUID block_format; + CLSID clsid; +}; + +struct decoder +{ + const struct decoder_funcs *vtable; +}; + +struct decoder_funcs +{ + void (CDECL *destroy)(struct decoder* This); +}; + +HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); +void CDECL decoder_destroy(struct decoder *This); + +HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); + +struct unix_funcs +{ + HRESULT (CDECL *decoder_create)(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); + void (CDECL *decoder_destroy)(struct decoder* This); +}; + +HRESULT get_unix_decoder(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result); + #endif /* WINCODECS_PRIVATE_H */ -- 2.17.1

1 0

[PATCH 2/2] localui/tests: Use strings instead of arrays of chars
by Michael Stefaniuc Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localui/tests/localui.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index d323dc067b3..23be8c779d1 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -43,8 +43,6 @@ static PMONITORUI pui; static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); -static const CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; -static const CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; static LPBYTE pi_buffer; static DWORD pi_numports; @@ -304,7 +302,7 @@ START_TEST(localui) /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, fmt_lptA, id); + sprintf(bufferA, "LPT%u:", id); MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; @@ -315,7 +313,7 @@ START_TEST(localui) /* "COM1:" - "COM9:" */ while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, fmt_comA, id); + sprintf(bufferA, "COM%u:", id); MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; -- 2.25.4

1 0

[PATCH] wer: Use wide-char string literals.
by Michael Stefaniuc Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wer/main.c | 6 +----- dlls/wer/tests/main.c | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index b40aa1b7625..ad57cbdf40e 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -48,11 +48,7 @@ static CRITICAL_SECTION report_table_cs = { &report_table_cs_debug, -1, 0, 0, 0, static struct list report_table = LIST_INIT(report_table); -static const WCHAR regpath_exclude[] = - {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', - 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; +static const WCHAR regpath_exclude[] = L"Software\\Microsoft\\Windows Error Reporting\\ExcludedApplications"; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 7fa9a8c67f5..038b29c25a9 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -29,11 +29,7 @@ #include "werapi.h" #include "wine/test.h" - -static const WCHAR appcrash[] = {'A','P','P','C','R','A','S','H',0}; -static const WCHAR backslash[] = {'\\',0}; -static const WCHAR empty[] = {0}; -static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e','r','.','e','x','e',0}; +static const WCHAR winetest_wer[] = L"winetest_wer.exe"; /* ###### */ @@ -51,7 +47,7 @@ static void test_WerAddExcludedApplication(void) hr = WerAddExcludedApplication(NULL, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); - hr = WerAddExcludedApplication(empty, FALSE); + hr = WerAddExcludedApplication(L"", FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerAddExcludedApplication(winetest_wer, FALSE); @@ -74,7 +70,7 @@ static void test_WerAddExcludedApplication(void) hr = WerRemoveExcludedApplication(buffer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); - lstrcatW(buffer, backslash); + lstrcatW(buffer, L"\\"); hr = WerAddExcludedApplication(buffer, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); @@ -106,7 +102,7 @@ static void test_WerRemoveExcludedApplication(void) hr = WerRemoveExcludedApplication(NULL, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); - hr = WerRemoveExcludedApplication(empty, FALSE); + hr = WerRemoveExcludedApplication(L"", FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerRemoveExcludedApplication(winetest_wer, FALSE); @@ -130,7 +126,7 @@ static void test_WerRemoveExcludedApplication(void) hr = WerRemoveExcludedApplication(buffer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); - lstrcatW(buffer, backslash); + lstrcatW(buffer, L"\\"); hr = WerAddExcludedApplication(buffer, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerRemoveExcludedApplication(buffer, FALSE); @@ -152,7 +148,7 @@ static void test_WerReportCloseHandle(void) HREPORT report; report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &report); ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -183,7 +179,7 @@ static void test_WerReportCreate(void) report = (void *) 0xdeadbeef; /* test a simple valid case */ - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &report); ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -195,7 +191,7 @@ static void test_WerReportCreate(void) ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, report); /* the ptr to store the created handle is always needed */ - hr = WerReportCreate(appcrash, WerReportCritical, NULL, NULL); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); /* the event type must be a valid string */ @@ -204,13 +200,13 @@ static void test_WerReportCreate(void) ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); report = (void *) 0xdeadbeef; - hr = WerReportCreate(empty, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"", WerReportCritical, NULL, &report); ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); /* a valid WER_REPORT_TYPE works */ for (i = 0; i < WerReportInvalid; i++) { report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, i, NULL, &report); + hr = WerReportCreate(L"APPCRASH", i, NULL, &report); ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); hr = WerReportCloseHandle(report); @@ -222,7 +218,7 @@ static void test_WerReportCreate(void) but older windows versions did not check the report type and WerReportCreate always succeeded */ report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportInvalid, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportInvalid, NULL, &report); ok((hr == E_INVALIDARG) | broken(hr == S_OK), "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); if (hr == S_OK) { @@ -231,7 +227,7 @@ static void test_WerReportCreate(void) } report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, 42, NULL, &report); + hr = WerReportCreate(L"APPCRASH", 42, NULL, &report); ok((hr == E_INVALIDARG) | broken(hr == S_OK), "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); if (hr == S_OK) { @@ -243,7 +239,7 @@ static void test_WerReportCreate(void) memset(table, 0, sizeof(table)); for (i = 0; i < (ARRAY_SIZE(table) - 1); i++) { report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &table[i]); ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]); } -- 2.25.4

1 0

[PATCH 1/2] localui: Use wide-char string literals.
by Michael Stefaniuc Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localui/localui.c | 58 ++++++++++-------------------------- dlls/localui/tests/localui.c | 19 +++++------- 2 files changed, 23 insertions(+), 54 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index ab8f5c95d52..87522494a1d 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -38,32 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(localui); static HINSTANCE LOCALUI_hInstance; -static const WCHAR cmd_AddPortW[] = {'A','d','d','P','o','r','t',0}; -static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', - 'L','P','T','P','o','r','t', - 'C','o','m','m','a','n','d','O','K',0}; -static const WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; -static const WCHAR cmd_GetDefaultCommConfigW[] = {'G','e','t', - 'D','e','f','a','u','l','t', - 'C','o','m','m','C','o','n','f','i','g',0}; -static const WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', - 'T','r','a','n','s','m','i','s','s','i','o','n', - 'R','e','t','r','y','T','i','m','e','o','u','t',0}; -static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; -static const WCHAR cmd_SetDefaultCommConfigW[] = {'S','e','t', - 'D','e','f','a','u','l','t', - 'C','o','m','m','C','o','n','f','i','g',0}; - -static const WCHAR fmt_uW[] = {'%','u',0}; -static const WCHAR portname_LPT[] = {'L','P','T',0}; -static const WCHAR portname_COM[] = {'C','O','M',0}; -static const WCHAR portname_FILE[] = {'F','I','L','E',':',0}; -static const WCHAR portname_CUPS[] = {'C','U','P','S',':',0}; -static const WCHAR portname_LPR[] = {'L','P','R',':',0}; - -static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0}; -static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; - /*****************************************************/ typedef struct tag_addportui_t { @@ -121,7 +95,7 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) /* get current settings */ len = FIELD_OFFSET(COMMCONFIG, wcProviderData[1]); status = ERROR_SUCCESS; - res = XcvDataW( hXcv, cmd_GetDefaultCommConfigW, + res = XcvDataW( hXcv, L"GetDefaultCommConfig", (PBYTE) shortname, (lstrlenW(shortname) +1) * sizeof(WCHAR), (PBYTE) &cfg, len, &len, &status); @@ -132,7 +106,7 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) if (res) { status = ERROR_SUCCESS; /* set new settings */ - res = XcvDataW(hXcv, cmd_SetDefaultCommConfigW, + res = XcvDataW(hXcv, L"SetDefaultCommConfig", (PBYTE) &cfg, len, (PBYTE) &dummy, 0, &len, &status); } @@ -292,7 +266,7 @@ static INT_PTR CALLBACK dlgproc_addport(HWND hwnd, UINT msg, WPARAM wparam, LPAR /* length is in WCHAR, including the '\0' */ GetDlgItemTextW(hwnd, ADDPORT_EDIT, data->portname, len + 1); status = ERROR_SUCCESS; - res = XcvDataW( data->hXcv, cmd_PortIsValidW, (PBYTE) data->portname, + res = XcvDataW( data->hXcv, L"PortIsValid", (BYTE *) data->portname, (lstrlenW(data->portname) + 1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &len, &status); @@ -356,7 +330,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP /* Get current setting */ data->value = 45; status = ERROR_SUCCESS; - res = XcvDataW( data->hXcv, cmd_GetTransmissionRetryTimeoutW, + res = XcvDataW( data->hXcv, L"GetTransmissionRetryTimeout", (PBYTE) &dummy, 0, (PBYTE) &data->value, sizeof(data->value), &len, &status); @@ -379,8 +353,8 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP /* native localui.dll use the same limits */ if ((res > 0) && (res < 1000000) && status) { - swprintf(bufferW, ARRAY_SIZE(bufferW), fmt_uW, res); - res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW, + swprintf(bufferW, ARRAY_SIZE(bufferW), L"%u", res); + res = XcvDataW( data->hXcv, L"ConfigureLPTPortCommandOK", (PBYTE) bufferW, (lstrlenW(bufferW) +1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &len, &status); @@ -415,13 +389,13 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!wcsnicmp(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1)) + if (!wcsnicmp(name, L"LPT", ARRAY_SIZE(L"LPT") -1)) return PORT_IS_LPT; - if (!wcsnicmp(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) + if (!wcsnicmp(name, L"COM", ARRAY_SIZE(L"COM") -1)) return PORT_IS_COM; - if (!wcsicmp(name, portname_FILE)) + if (!wcsicmp(name, L"FILE:")) return PORT_IS_FILE; if (name[0] == '/') @@ -430,10 +404,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!wcsncmp(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1)) + if (!wcsncmp(name, L"CUPS:", ARRAY_SIZE(L"CUPS:") -1)) return PORT_IS_CUPS; - if (!wcsncmp(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1)) + if (!wcsncmp(name, L"LPR:", ARRAY_SIZE(L"LPR:") -1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */ @@ -508,7 +482,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam TRACE( "(%s, %p, %s, %p) (*ppPortName: %p)\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName), ppPortName, ppPortName ? *ppPortName : NULL); - if (open_monitor_by_name(XcvMonitorW, pMonitorName, &hXcv)) { + if (open_monitor_by_name(L",XcvMonitor ", pMonitorName, &hXcv)) { ZeroMemory(&data, sizeof(addportui_t)); data.hXcv = hXcv; @@ -520,7 +494,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam if (ppPortName) *ppPortName = NULL; if (res) { - res = XcvDataW(hXcv, cmd_AddPortW, (PBYTE) data.portname, + res = XcvDataW(hXcv, L"AddPort", (BYTE *) data.portname, (lstrlenW(data.portname)+1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &needed, &status); @@ -572,7 +546,7 @@ static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPort DWORD res; TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - if (open_monitor_by_name(XcvPortW, pPortName, &hXcv)) { + if (open_monitor_by_name(L",XcvPort ", pPortName, &hXcv)) { res = get_type_from_name(pPortName); switch(res) @@ -631,10 +605,10 @@ static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortNam return FALSE; } - if (open_monitor_by_name(XcvPortW, pPortName, &hXcv)) { + if (open_monitor_by_name(L",XcvPort ", pPortName, &hXcv)) { /* native localui tests here for LPT / COM - Ports and failed with ERROR_NOT_SUPPORTED. */ - if (XcvDataW(hXcv, cmd_DeletePortW, (LPBYTE) pPortName, + if (XcvDataW(hXcv, L"DeletePort", (BYTE *) pPortName, (lstrlenW(pPortName)+1) * sizeof(WCHAR), (LPBYTE) &dummy, 0, &needed, &status)) { ClosePrinter(hXcv); diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index f051880fd1c..d323dc067b3 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -43,13 +43,8 @@ static PMONITORUI pui; static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); - -static const WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; -static const WCHAR emptyW[] = {0}; static const CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; static const CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; -static const WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; -static const WCHAR portname_fileW[] = {'F','I','L','E',':',0}; static LPBYTE pi_buffer; static DWORD pi_numports; @@ -148,14 +143,14 @@ static void test_AddPortUI(void) "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pAddPortUI(NULL, NULL, emptyW, NULL); + res = pAddPortUI(NULL, NULL, L"", NULL); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pAddPortUI(NULL, NULL, does_not_existW, NULL); + res = pAddPortUI(NULL, NULL, L"does_not_exist", NULL); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " @@ -172,7 +167,7 @@ static void test_AddPortUI(void) * - When the new port starts with "COM" or "LPT", * FALSE is returned with ERROR_NOT_SUPPORTED on windows */ - res = pAddPortUI(NULL, NULL, localportW, &new_portname); + res = pAddPortUI(NULL, NULL, L"Local Port", &new_portname); ok( res || (GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED) || @@ -205,7 +200,7 @@ static void test_ConfigurePortUI(void) "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pConfigurePortUI(NULL, NULL, emptyW); + res = pConfigurePortUI(NULL, NULL, L""); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " @@ -213,7 +208,7 @@ static void test_ConfigurePortUI(void) SetLastError(0xdeadbeef); - res = pConfigurePortUI(NULL, NULL, does_not_existW); + res = pConfigurePortUI(NULL, NULL, L"does_not_exist"); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " @@ -258,7 +253,7 @@ static void test_ConfigurePortUI(void) if (winetest_interactive && file_present) { SetLastError(0xdeadbeef); - res = pConfigurePortUI(NULL, NULL, portname_fileW); + res = pConfigurePortUI(NULL, NULL, L"FILE:"); ok( !res && ((GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED)), "got %d with %u (expected '0' with: ERROR_CANCELLED or " @@ -300,7 +295,7 @@ START_TEST(localui) /* find installed ports */ /* "FILE:" */ - file_present = find_portinfo2(portname_fileW); + file_present = find_portinfo2(L"FILE:"); if (!pi_numports) /* Nothing to test without a port */ return; -- 2.25.4

1 0

[PATCH] vbscript: support for class default sub.
by Robert Wilhelm Oct. 9, 2020

Oct. 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 37 +++++++++++++++++++++++++++--------- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parser.y | 4 ++++ dlls/vbscript/tests/lang.vbs | 31 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 4 +++- 6 files changed, 68 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 2e991b0c0ae..d0342a128b1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1456,11 +1456,13 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f switch(func->type) { case FUNC_FUNCTION: + case FUNC_DEFFUNC: ctx->func_end_label = alloc_label(ctx); if(!ctx->func_end_label) return E_OUTOFMEMORY; break; case FUNC_SUB: + case FUNC_DEFSUB: ctx->sub_end_label = alloc_label(ctx); if(!ctx->sub_end_label) return E_OUTOFMEMORY; @@ -1628,7 +1630,9 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d for(funcprop_decl = func_decl; funcprop_decl; funcprop_decl = funcprop_decl->next_prop_func) { switch(funcprop_decl->type) { case FUNC_FUNCTION: + case FUNC_DEFFUNC: case FUNC_SUB: + case FUNC_DEFSUB: case FUNC_PROPGET: case FUNC_DEFGET: invoke_type = VBDISP_CALLGET; @@ -1673,6 +1677,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc_t *class_desc; dim_decl_t *prop_decl; unsigned i; + BOOL isDefault=FALSE; HRESULT hres; static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; @@ -1695,11 +1700,18 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->func_cnt = 1; /* always allocate slot for default getter */ for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { - for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) - break; + isDefault = FALSE; + if(func_decl->type == FUNC_DEFFUNC || func_decl->type == FUNC_DEFSUB) { + isDefault = TRUE; + } else { + for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { + if(func_prop_decl->type == FUNC_DEFGET) { + isDefault = TRUE; + break; + } + } } - if(!func_prop_decl) + if(isDefault != TRUE) class_desc->func_cnt++; } @@ -1709,10 +1721,17 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) memset(class_desc->funcs, 0, class_desc->func_cnt*sizeof(*class_desc->funcs)); for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { - for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) { - i--; - break; + isDefault = FALSE; + if(func_decl->type == FUNC_DEFFUNC || func_decl->type == FUNC_DEFSUB) { + i--; + isDefault = TRUE; + } else { + for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { + if(func_prop_decl->type == FUNC_DEFGET) { + i--; + isDefault = TRUE; + break; + } } } @@ -1732,7 +1751,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->class_terminate_id = i; } - hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (func_prop_decl ? 0 : i)); + hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (isDefault ? 0 : i)); if(FAILED(hres)) return hres; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d58e89b7dba..51395f3c690 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -134,7 +134,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_DEFFUNC || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index cf94bdce464..9471f54bc2f 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -994,6 +994,10 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, if(storage_flags & STORAGE_IS_DEFAULT) { if(type == FUNC_PROPGET) { type = FUNC_DEFGET; + }else if(type == FUNC_FUNCTION) { + type = FUNC_DEFFUNC; + }else if(type == FUNC_SUB) { + type = FUNC_DEFSUB; }else { FIXME("Invalid default property\n"); ctx->hres = E_FAIL; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fc762450a3b..3250f889808 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1750,6 +1750,37 @@ call ok(x.getprop.getprop().prop is obj, "x.getprop.getprop().prop is not obj (e ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) + +funcCalled = "" +class DefaultSubTest1 + Public default Sub init(a) + funcCalled = "init" & a + end sub +end class + +Set obj = New DefaultSubTest1 +obj.init(1) +call ok(funcCalled = "init1","funcCalled=" & funcCalled) +funcCalled = "" +obj(2) +call ok(funcCalled = "init2","funcCalled=" & funcCalled) + +class DefaultSubTest2 + Public Default Function init + funcCalled = "init" + end function +end class + +Set obj = New DefaultSubTest2 +funcCalled = "" +obj.init() +call ok(funcCalled = "init","funcCalled=" & funcCalled) +funcCalled = "" +' todo this is not yet supported +'funcCalled = "" +'obj() +'call ok(funcCalled = "init","funcCalled=" & funcCalled) + with nothing end with diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 36eba21e279..5178949e956 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -38,7 +38,7 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t { unsigned i; - for(i = invoke_type == VBDISP_ANY ? 0 : 1; i < This->desc->func_cnt; i++) { + for(i = 0; i < This->desc->func_cnt; i++) { if(invoke_type == VBDISP_ANY) { if(!search_private && !This->desc->funcs[i].is_public) continue; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 869fb05b6ed..1f4132b1898 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -314,7 +314,9 @@ typedef enum { FUNC_PROPGET, FUNC_PROPLET, FUNC_PROPSET, - FUNC_DEFGET + FUNC_DEFGET, + FUNC_DEFFUNC, + FUNC_DEFSUB } function_type_t; typedef struct { -- 2.26.2

2 2

[PATCH 6/6] conhost: Import menu handling from wineconsole.
by Jacek Caban Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 85 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+)

1 0

[PATCH 5/6] conhost: Import config dialog from wineconsole.
by Jacek Caban Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/Makefile.in | 1 + programs/conhost/conhost.h | 39 ++ programs/conhost/conhost.rc | 82 ++++ programs/conhost/window.c | 849 +++++++++++++++++++++++++++++++++++ 4 files changed, 971 insertions(+)

1 0

[PATCH 4/6] conhost: Import mouse event handling from wineconsole.
by Jacek Caban Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 146 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+)

1 0

[PATCH 3/6] conhost: Import keyboard event handling from wineconsole.
by Jacek Caban Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 4 +- programs/conhost/conhost.h | 2 + programs/conhost/window.c | 267 +++++++++++++++++++++++++++++++++++++ 3 files changed, 271 insertions(+), 2 deletions(-)

1 0