- Wine-Devel - list.winehq.org

[PATCH 1/2] opcservices: Use CRT allocation functions.
by Nikolay Sivov March 29, 2022

March 29, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/compress.c | 19 ++++++------ dlls/opcservices/factory.c | 6 ++-- dlls/opcservices/opc_private.h | 3 +- dlls/opcservices/package.c | 54 +++++++++++++++++----------------- dlls/opcservices/uri.c | 20 ++++++------- 5 files changed, 50 insertions(+), 52 deletions(-) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index cb4fabcc477..37a90716a74 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -28,7 +28,6 @@ #include "opc_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msopc); @@ -120,7 +119,7 @@ HRESULT compress_create_archive(IStream *output, struct zip_archive **out) WORD date, time; FILETIME ft; - if (!(archive = heap_alloc(sizeof(*archive)))) + if (!(archive = malloc(sizeof(*archive)))) return E_OUTOFMEMORY; archive->files = NULL; @@ -180,9 +179,9 @@ void compress_finalize_archive(struct zip_archive *archive) IStream_Release(archive->output); for (i = 0; i < archive->file_count; i++) - heap_free(archive->files[i]); - heap_free(archive->files); - heap_free(archive); + free(archive->files[i]); + free(archive->files); + free(archive); } static void compress_write_content(struct zip_archive *archive, IStream *content, @@ -270,7 +269,7 @@ HRESULT compress_add_file(struct zip_archive *archive, const WCHAR *path, DWORD len; len = WideCharToMultiByte(CP_ACP, 0, path, -1, NULL, 0, NULL, NULL); - if (!(name = heap_alloc(len))) + if (!(name = malloc(len))) return E_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, path, -1, name, len, NULL, NULL); @@ -302,9 +301,9 @@ HRESULT compress_add_file(struct zip_archive *archive, const WCHAR *path, return archive->write_result; /* Set directory entry */ - if (!(entry = heap_alloc_zero(sizeof(*entry) + local_header.name_length))) + if (!(entry = calloc(1, sizeof(*entry) + local_header.name_length))) { - heap_free(name); + free(name); return E_OUTOFMEMORY; } @@ -320,12 +319,12 @@ HRESULT compress_add_file(struct zip_archive *archive, const WCHAR *path, entry->name_length = local_header.name_length; entry->local_file_offset = local_header_pos; memcpy(entry + 1, name, entry->name_length); - heap_free(name); + free(name); if (!opc_array_reserve((void **)&archive->files, &archive->file_size, archive->file_count + 1, sizeof(*archive->files))) { - heap_free(entry); + free(entry); return E_OUTOFMEMORY; } diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 4c465f653f8..fcebb977c1d 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -85,7 +85,7 @@ static ULONG WINAPI opc_filestream_Release(IStream *iface) if (!refcount) { CloseHandle(stream->hfile); - heap_free(stream); + free(stream); } return refcount; @@ -263,14 +263,14 @@ static HRESULT opc_filestream_create(const WCHAR *filename, OPC_STREAM_IO_MODE i return E_INVALIDARG; } - if (!(stream = heap_alloc_zero(sizeof(*stream)))) + if (!(stream = calloc(1, sizeof(*stream)))) return E_OUTOFMEMORY; stream->hfile = CreateFileW(filename, access, 0, sa, creation, flags, NULL); if (stream->hfile == INVALID_HANDLE_VALUE) { HRESULT hr = HRESULT_FROM_WIN32(GetLastError()); - heap_free(stream); + free(stream); return hr; } diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index c7b1d0cab3d..b1163fe1215 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -17,7 +17,6 @@ */ #include "msopc.h" -#include "wine/heap.h" static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { @@ -37,7 +36,7 @@ static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t c if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 64d34d4b853..e080b386c61 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -170,8 +170,8 @@ static void opc_content_release(struct opc_content *content) if (!refcount) { - heap_free(content->data); - heap_free(content); + free(content->data); + free(content); } } @@ -214,7 +214,7 @@ static ULONG WINAPI opc_part_enum_Release(IOpcPartEnumerator *iface) if (!refcount) { IOpcPartSet_Release(&part_enum->part_set->IOpcPartSet_iface); - heap_free(part_enum); + free(part_enum); } return refcount; @@ -321,7 +321,7 @@ static HRESULT opc_part_enum_create(struct opc_part_set *part_set, IOpcPartEnume { struct opc_part_enum *part_enum; - if (!(part_enum = heap_alloc_zero(sizeof(*part_enum)))) + if (!(part_enum = calloc(1, sizeof(*part_enum)))) return E_OUTOFMEMORY; part_enum->IOpcPartEnumerator_iface.lpVtbl = &opc_part_enum_vtbl; @@ -375,7 +375,7 @@ static ULONG WINAPI opc_rel_enum_Release(IOpcRelationshipEnumerator *iface) if (!refcount) { IOpcRelationshipSet_Release(&rel_enum->rel_set->IOpcRelationshipSet_iface); - heap_free(rel_enum); + free(rel_enum); } return refcount; @@ -482,7 +482,7 @@ static HRESULT opc_rel_enum_create(struct opc_relationship_set *rel_set, IOpcRel { struct opc_rel_enum *rel_enum; - if (!(rel_enum = heap_alloc_zero(sizeof(*rel_enum)))) + if (!(rel_enum = calloc(1, sizeof(*rel_enum)))) return E_OUTOFMEMORY; rel_enum->IOpcRelationshipEnumerator_iface.lpVtbl = &opc_rel_enum_vtbl; @@ -535,7 +535,7 @@ static ULONG WINAPI opc_content_stream_Release(IStream *iface) if (!refcount) { opc_content_release(stream->content); - heap_free(stream); + free(stream); } return refcount; @@ -578,7 +578,7 @@ static HRESULT WINAPI opc_content_stream_Write(IStream *iface, const void *data, if (size > stream->content->size.QuadPart - stream->pos.QuadPart) { - void *ptr = heap_realloc(stream->content->data, stream->pos.QuadPart + size); + void *ptr = realloc(stream->content->data, stream->pos.QuadPart + size); if (!ptr) return E_OUTOFMEMORY; stream->content->data = ptr; @@ -707,7 +707,7 @@ static HRESULT opc_content_stream_create(struct opc_content *content, IStream ** { struct opc_content_stream *stream; - if (!(stream = heap_alloc_zero(sizeof(*stream)))) + if (!(stream = calloc(1, sizeof(*stream)))) return E_OUTOFMEMORY; stream->IStream_iface.lpVtbl = &opc_content_stream_vtbl; @@ -780,7 +780,7 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) IOpcPartUri_Release(part->name); CoTaskMemFree(part->content_type); opc_content_release(part->content); - heap_free(part); + free(part); } return refcount; @@ -866,7 +866,7 @@ static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, cons if (!opc_array_reserve((void **)&set->parts, &set->size, set->count + 1, sizeof(*set->parts))) return E_OUTOFMEMORY; - if (!(part = heap_alloc_zero(sizeof(*part)))) + if (!(part = calloc(1, sizeof(*part)))) return E_OUTOFMEMORY; part->IOpcPart_iface.lpVtbl = &opc_part_vtbl; @@ -880,7 +880,7 @@ static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, cons return E_OUTOFMEMORY; } - part->content = heap_alloc_zero(sizeof(*part->content)); + part->content = calloc(1, sizeof(*part->content)); if (!part->content) { IOpcPart_Release(&part->IOpcPart_iface); @@ -951,8 +951,8 @@ static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface) for (i = 0; i < part_set->count; ++i) IOpcPart_Release(&part_set->parts[i]->IOpcPart_iface); - heap_free(part_set->parts); - heap_free(part_set); + free(part_set->parts); + free(part_set); } return refcount; @@ -1088,7 +1088,7 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) CoTaskMemFree(relationship->type); IOpcUri_Release(relationship->source_uri); IUri_Release(relationship->target); - heap_free(relationship); + free(relationship); } return refcount; @@ -1183,7 +1183,7 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W if (!opc_array_reserve((void **)&set->relationships, &set->size, set->count + 1, sizeof(*set->relationships))) return E_OUTOFMEMORY; - if (!(relationship = heap_alloc_zero(sizeof(*relationship)))) + if (!(relationship = calloc(1, sizeof(*relationship)))) return E_OUTOFMEMORY; relationship->IOpcRelationship_iface.lpVtbl = &opc_relationship_vtbl; @@ -1272,8 +1272,8 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) for (i = 0; i < relationship_set->count; ++i) IOpcRelationship_Release(&relationship_set->relationships[i]->IOpcRelationship_iface); IOpcUri_Release(relationship_set->source_uri); - heap_free(relationship_set->relationships); - heap_free(relationship_set); + free(relationship_set->relationships); + free(relationship_set); } return refcount; @@ -1398,7 +1398,7 @@ static HRESULT opc_relationship_set_create(IOpcUri *source_uri, IOpcRelationship { struct opc_relationship_set *relationship_set; - if (!(relationship_set = heap_alloc_zero(sizeof(*relationship_set)))) + if (!(relationship_set = calloc(1, sizeof(*relationship_set)))) return E_OUTOFMEMORY; relationship_set->IOpcRelationshipSet_iface.lpVtbl = &opc_relationship_set_vtbl; @@ -1452,7 +1452,7 @@ static ULONG WINAPI opc_package_Release(IOpcPackage *iface) IOpcRelationshipSet_Release(package->relationship_set); if (package->source_uri) IOpcUri_Release(package->source_uri); - heap_free(package); + free(package); } return refcount; @@ -1466,7 +1466,7 @@ static HRESULT WINAPI opc_package_GetPartSet(IOpcPackage *iface, IOpcPartSet **p if (!package->part_set) { - struct opc_part_set *part_set = heap_alloc_zero(sizeof(*part_set)); + struct opc_part_set *part_set = calloc(1, sizeof(*part_set)); if (!part_set) return E_OUTOFMEMORY; @@ -1515,7 +1515,7 @@ HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) struct opc_package *package; HRESULT hr; - if (!(package = heap_alloc_zero(sizeof(*package)))) + if (!(package = calloc(1, sizeof(*package)))) return E_OUTOFMEMORY; package->IOpcPackage_iface.lpVtbl = &opc_package_vtbl; @@ -1523,7 +1523,7 @@ HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) if (FAILED(hr = IOpcFactory_CreatePackageRootUri(factory, &package->source_uri))) { - heap_free(package); + free(package); return hr; } @@ -1566,7 +1566,7 @@ static HRESULT opc_package_add_override_content_type(struct content_types *types { struct content_type *type; - if (!(type = heap_alloc(sizeof(*type)))) + if (!(type = malloc(sizeof(*type)))) return E_OUTOFMEMORY; type->element = CONTENT_TYPE_OVERRIDE; @@ -1583,7 +1583,7 @@ static HRESULT opc_package_add_default_content_type(struct content_types *types, { struct content_type *type; - if (!(type = heap_alloc(sizeof(*type)))) + if (!(type = malloc(sizeof(*type)))) return E_OUTOFMEMORY; type->element = CONTENT_TYPE_DEFAULT; @@ -1593,7 +1593,7 @@ static HRESULT opc_package_add_default_content_type(struct content_types *types, { CoTaskMemFree(type->u.def.ext); CoTaskMemFree(type->u.def.type); - heap_free(type); + free(type); return E_OUTOFMEMORY; } @@ -1810,7 +1810,7 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a hr = IXmlWriter_WriteEndElement(writer); list_remove(&content_type->entry); - heap_free(content_type); + free(content_type); } if (SUCCEEDED(hr)) diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 0a7e2ef3660..556aaae354d 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -79,7 +79,7 @@ static ULONG WINAPI opc_uri_Release(IOpcPartUri *iface) if (uri->source_uri) IOpcPartUri_Release(&uri->source_uri->IOpcPartUri_iface); IUri_Release(uri->uri); - heap_free(uri); + free(uri); } return refcount; @@ -485,7 +485,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) } } - ret = heap_alloc((len + ARRAY_SIZE(relsextW) + ARRAY_SIZE(relsdirW)) * sizeof(WCHAR)); + ret = malloc((len + ARRAY_SIZE(relsextW) + ARRAY_SIZE(relsdirW)) * sizeof(WCHAR)); if (!ret) { SysFreeString(path); @@ -505,7 +505,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) WARN("Failed to create rels uri, hr %#lx.\n", hr); - heap_free(ret); + free(ret); SysFreeString(path); return rels_uri; @@ -539,13 +539,13 @@ static HRESULT opc_source_uri_create(struct opc_uri *uri, IOpcUri **out) if (!uri->source_uri) return OPC_E_RELATIONSHIP_URI_REQUIRED; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; if (FAILED(hr = opc_part_uri_init(obj, NULL, uri->source_uri->is_part_uri, uri->source_uri->uri))) { WARN("Failed to init part uri, hr %#lx.\n", hr); - heap_free(obj); + free(obj); return hr; } @@ -561,13 +561,13 @@ HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri * struct opc_uri *obj; HRESULT hr; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; if (FAILED(hr = opc_part_uri_init(obj, source_uri, TRUE, uri))) { WARN("Failed to init part uri, hr %#lx.\n", hr); - heap_free(obj); + free(obj); return hr; } @@ -584,13 +584,13 @@ HRESULT opc_root_uri_create(IOpcUri **out) *out = NULL; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) { WARN("Failed to create rels uri, hr %#lx.\n", hr); - heap_free(obj); + free(obj); return hr; } @@ -599,7 +599,7 @@ HRESULT opc_root_uri_create(IOpcUri **out) if (FAILED(hr)) { WARN("Failed to init uri, hr %#lx.\n", hr); - heap_free(uri); + free(uri); return hr; } -- 2.35.1

1 1

[PATCH] winex11: Always call XInstallColormap after XCreateColormap
by Alex Henrie March 29, 2022

March 29, 2022

Unless XInstallColormap is called, Xephyr does not use the new color map, even if it is associated to a window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52742 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This also helps with bug 46666, but there are still a lot of graphics problems with that game and it's not clear to me whether or not they're related to the color palette. --- dlls/winex11.drv/desktop.c | 5 +++++ dlls/winex11.drv/opengl.c | 3 +++ dlls/winex11.drv/palette.c | 1 + dlls/winex11.drv/window.c | 4 ++++ dlls/winex11.drv/x11drv_main.c | 1 + 5 files changed, 14 insertions(+) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 0ac538d06ed..b563487e801 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -349,10 +349,15 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) win_attr.cursor = XCreateFontCursor( display, XC_top_left_arrow ); if (default_visual.visual != DefaultVisual( display, DefaultScreen(display) )) + { win_attr.colormap = XCreateColormap( display, DefaultRootWindow(display), default_visual.visual, AllocNone ); + XInstallColormap( display, win_attr.colormap ); + } else + { win_attr.colormap = None; + } win = XCreateWindow( display, DefaultRootWindow(display), 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 567205f742c..2756ed5fe92 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -458,7 +458,10 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) root = RootWindow( gdi_display, vis->screen ); if (vis->visual != DefaultVisual( gdi_display, vis->screen )) + { attr.colormap = XCreateColormap( gdi_display, root, vis->visual, AllocNone ); + XInstallColormap( gdi_display, attr.colormap ); + } if ((win = XCreateWindow( gdi_display, root, -1, -1, 1, 1, 0, vis->depth, InputOutput, vis->visual, CWBorderPixel | CWOverrideRedirect | CWColormap, &attr ))) XMapWindow( gdi_display, win ); diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 8fbd7820c95..845f01902fc 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -304,6 +304,7 @@ int X11DRV_PALETTE_Init(void) XFreeColormap( gdi_display, default_colormap ); default_colormap = XCreateColormap( gdi_display, root_window, default_visual.visual, AllocAll ); + XInstallColormap( gdi_display, default_colormap ); if (default_colormap) { X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_PRIVATE; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 36fb41ac710..818310d5461 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1520,6 +1520,7 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) (visual->class == PseudoColor || visual->class == GrayScale || visual->class == DirectColor) ? AllocAll : AllocNone ); + XInstallColormap( gdi_display, data->client_colormap ); attr.colormap = data->client_colormap; attr.bit_gravity = NorthWestGravity; attr.win_gravity = NorthWestGravity; @@ -1579,7 +1580,10 @@ static void create_whole_window( struct x11drv_win_data *data ) data->shaped = (win_rgn != 0); if (data->vis.visualid != default_visual.visualid) + { data->whole_colormap = XCreateColormap( data->display, root_window, data->vis.visual, AllocNone ); + XInstallColormap( data->display, data->whole_colormap ); + } mask = get_window_attributes( data, &attr ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 32beb84a009..8de464aa8bd 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -558,6 +558,7 @@ static void init_visuals( Display *display, int screen ) default_visual.bits_per_rgb = default_visual.visual->bits_per_rgb; } default_colormap = XCreateColormap( display, root_window, default_visual.visual, AllocNone ); + XInstallColormap( display, default_colormap ); TRACE( "default visual %lx class %u argb %lx\n", default_visual.visualid, default_visual.class, argb_visual.visualid ); -- 2.35.1

2 2

[PATCH] chakra: Add stub dll.
by Mohamad Al-Jaf March 29, 2022

March 29, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52741 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52746 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Confirmed that Minecraft Windows Bedrock server runs with this patch. --- configure.ac | 1 + dlls/chakra/Makefile.in | 5 ++ dlls/chakra/chakra.spec | 160 ++++++++++++++++++++++++++++++++++++++++ dlls/chakra/version.rc | 26 +++++++ 4 files changed, 192 insertions(+) create mode 100644 dlls/chakra/Makefile.in create mode 100644 dlls/chakra/chakra.spec create mode 100644 dlls/chakra/version.rc diff --git a/configure.ac b/configure.ac index e509b232d11..f9ac5e45ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -2372,6 +2372,7 @@ WINE_CONFIG_MAKEFILE(dlls/capi2032) WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) +WINE_CONFIG_MAKEFILE(dlls/chakra) WINE_CONFIG_MAKEFILE(dlls/clusapi) WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) diff --git a/dlls/chakra/Makefile.in b/dlls/chakra/Makefile.in new file mode 100644 index 00000000000..5b3429d844f --- /dev/null +++ b/dlls/chakra/Makefile.in @@ -0,0 +1,5 @@ +MODULE = chakra.dll + +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native + +RC_SRCS = version.rc diff --git a/dlls/chakra/chakra.spec b/dlls/chakra/chakra.spec new file mode 100644 index 00000000000..4116c40850c --- /dev/null +++ b/dlls/chakra/chakra.spec @@ -0,0 +1,160 @@ +@ stub JsProjectWinRTNamespace +@ stub JsSetProjectionEnqueueCallback +@ stub CreateChakraEngine +@ stub DumpDiagInfo +@ stub JsDiscardBackgroundParse +@ stub JsInitializeJITServer +@ stub JsQueueBackgroundParse +@ stub MemProtectHeapAddRootSection +@ stub MemProtectHeapCollect +@ stub MemProtectHeapCreate +@ stub MemProtectHeapDestroy +@ stub MemProtectHeapDisableCollection +@ stub MemProtectHeapIsValidObject +@ stub MemProtectHeapMemSize +@ stub MemProtectHeapNotifyCurrentThreadDetach +@ stub MemProtectHeapProtectCurrentThread +@ stub MemProtectHeapRemoveRootSection +@ stub MemProtectHeapReportHeapSize +@ stub MemProtectHeapRootAlloc +@ stub MemProtectHeapRootAllocLeaf +@ stub MemProtectHeapRootRealloc +@ stub MemProtectHeapRootReallocLeaf +@ stub MemProtectHeapSynchronizeWithCollector +@ stub MemProtectHeapUnprotectCurrentThread +@ stub MemProtectHeapUnrootAndZero +@ stub RecyclerNativeHeapAddExternalMemoryUsage +@ stub RecyclerNativeHeapAllocLeaf +@ stub RecyclerNativeHeapAllocLeafFinalized +@ stub RecyclerNativeHeapAllocTraced +@ stub RecyclerNativeHeapAllocTracedFinalized +@ stub RecyclerNativeHeapCollectGarbageInThread +@ stub RecyclerNativeHeapCreateWeakReference +@ stub RecyclerNativeHeapGetRealAddressFromInterior +@ stub RecyclerNativeHeapGetStrongReference +@ stub RecyclerNativeHeapHasWeakReferenceCleanupOccurred +@ stub RecyclerNativeHeapRootAddRef +@ stub RecyclerNativeHeapRootRelease +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub JsAddRef +@ stub JsBoolToBoolean +@ stub JsBooleanToBool +@ stub JsCallFunction +@ stub JsCollectGarbage +@ stub JsConstructObject +@ stub JsConvertValueToBoolean +@ stub JsConvertValueToNumber +@ stub JsConvertValueToObject +@ stub JsConvertValueToString +@ stub JsCreateArray +@ stub JsCreateArrayBuffer +@ stub JsCreateContext +@ stub JsCreateDataView +@ stub JsCreateError +@ stub JsCreateExternalArrayBuffer +@ stub JsCreateExternalObject +@ stub JsCreateFunction +@ stub JsCreateNamedFunction +@ stub JsCreateObject +@ stub JsCreateRangeError +@ stub JsCreateReferenceError +@ stub JsCreateRuntime +@ stub JsCreateSymbol +@ stub JsCreateSyntaxError +@ stub JsCreateThreadService +@ stub JsCreateTypeError +@ stub JsCreateTypedArray +@ stub JsCreateURIError +@ stub JsDefineProperty +@ stub JsDeleteIndexedProperty +@ stub JsDeleteProperty +@ stub JsDisableRuntimeExecution +@ stub JsDisposeRuntime +@ stub JsDoubleToNumber +@ stub JsEnableRuntimeExecution +@ stub JsEnumerateHeap +@ stub JsEquals +@ stub JsGetAndClearException +@ stub JsGetArrayBufferStorage +@ stub JsGetContextData +@ stub JsGetContextOfObject +@ stub JsGetCurrentContext +@ stub JsGetDataViewStorage +@ stub JsGetExtensionAllowed +@ stub JsGetExternalData +@ stub JsGetFalseValue +@ stub JsGetGlobalObject +@ stub JsGetIndexedPropertiesExternalData +@ stub JsGetIndexedProperty +@ stub JsGetNullValue +@ stub JsGetOwnPropertyDescriptor +@ stub JsGetOwnPropertyNames +@ stub JsGetOwnPropertySymbols +@ stub JsGetProperty +@ stub JsGetPropertyIdFromName +@ stub JsGetPropertyIdFromSymbol +@ stub JsGetPropertyIdType +@ stub JsGetPropertyNameFromId +@ stub JsGetPrototype +@ stub JsGetRuntime +@ stub JsGetRuntimeMemoryLimit +@ stub JsGetRuntimeMemoryUsage +@ stub JsGetStringLength +@ stub JsGetSymbolFromPropertyId +@ stub JsGetTrueValue +@ stub JsGetTypedArrayInfo +@ stub JsGetTypedArrayStorage +@ stub JsGetUndefinedValue +@ stub JsGetValueType +@ stub JsHasException +@ stub JsHasExternalData +@ stub JsHasIndexedPropertiesExternalData +@ stub JsHasIndexedProperty +@ stub JsHasProperty +@ stub JsIdle +@ stub JsInspectableToObject +@ stub JsInstanceOf +@ stub JsIntToNumber +@ stub JsIsEnumeratingHeap +@ stub JsIsRuntimeExecutionDisabled +@ stub JsNumberToDouble +@ stub JsNumberToInt +@ stub JsObjectToInspectable +@ stub JsParseScript +@ stub JsParseScriptWithAttributes +@ stub JsParseSerializedScript +@ stub JsParseSerializedScriptWithCallback +@ stub JsPointerToString +@ stub JsPreventExtension +@ stub JsRelease +@ stub JsRunScript +@ stub JsRunSerializedScript +@ stub JsRunSerializedScriptWithCallback +@ stub JsSerializeScript +@ stub JsSetContextData +@ stub JsSetCurrentContext +@ stub JsSetException +@ stub JsSetExternalData +@ stub JsSetIndexedPropertiesToExternalData +@ stub JsSetIndexedProperty +@ stub JsSetObjectBeforeCollectCallback +@ stub JsSetPromiseContinuationCallback +@ stub JsSetProperty +@ stub JsSetPrototype +@ stub JsSetRuntimeBeforeCollectCallback +@ stub JsSetRuntimeMemoryAllocationCallback +@ stub JsSetRuntimeMemoryLimit +@ stub JsStartDebugging +@ stub JsStartProfiling +@ stub JsStopProfiling +@ stub JsStrictEquals +@ stub JsStringToPointer +@ stub JsValueToVariant +@ stub JsVarAddRef +@ stub JsVarRelease +@ stub JsVarToExtension +@ stub JsVarToScriptDirect +@ stub JsVariantToValue diff --git a/dlls/chakra/version.rc b/dlls/chakra/version.rc new file mode 100644 index 00000000000..a73bf2bc5ad --- /dev/null +++ b/dlls/chakra/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine chakra" +#define WINE_FILENAME_STR "chakra.dll" +#define WINE_FILEVERSION 11,0,22000,348 +#define WINE_FILEVERSION_STR "11.0.22000.348" +#define WINE_PRODUCTVERSION 11,00,22000,348 +#define WINE_PRODUCTVERSION_STR "11.00.22000.348" + +#include "wine/wine_common_ver.rc" -- 2.35.1

1 0

[PATCH 1/5] windows.media.speech: Add IVector<HSTRING>.
by Bernhard Kölbl March 28, 2022

March 28, 2022

And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 299 +++++++++++++++++++++ 4 files changed, 312 insertions(+), 3 deletions(-) create mode 100644 dlls/windows.media.speech/vector.c diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 5dbdb03cf2f..5a8291ba6f0 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ listconstraint.c \ main.c \ recognizer.c \ - synthesizer.c + synthesizer.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index d641902f4bc..0c486a415a7 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -36,6 +36,7 @@ struct list_constraint LONG ref; BOOLEAN enabled; + IVector_HSTRING *commands; }; /* @@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + IVector_HSTRING_Release(impl->commands); free(impl); + } return ref; } @@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); + *listconstraint = NULL; + if (!commands) return E_POINTER; - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (FAILED(vector_hstring_create(&impl->commands))) { - *listconstraint = NULL; + free(impl); return E_OUTOFMEMORY; } diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3e2fa9aed38..a09b5f5ef7e 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken * HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); HRESULT typed_event_handlers_clear( struct list* list ); +HRESULT vector_hstring_create( IVector_HSTRING **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c new file mode 100644 index 00000000000..e151ec31b49 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,299 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * + * 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 "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +/* + * + * IVector<HSTRING> + * + */ + +struct vector_hstring +{ + IVector_HSTRING IVector_HSTRING_iface; + LONG ref; + + UINT32 size; + UINT32 capacity; + HSTRING *elements; +}; + +static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface); +} + +static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVector_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVector_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_hstring_AddRef( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IVector_HSTRING_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_hstring_GetIids( IVector_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + WindowsDeleteString(impl->elements[index]); + WindowsDuplicateString(value, &impl->elements[index]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING *tmp = impl->elements; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + WindowsDuplicateString(value, &impl->elements[index]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + + WindowsDeleteString(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_HSTRING_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) WindowsDeleteString(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_HSTRING_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + WindowsDuplicateString(impl->elements[i], &items[i-start_index]); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_HSTRING_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]); + return hr; +} + +static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = +{ + /* IUnknown methods */ + vector_hstring_QueryInterface, + vector_hstring_AddRef, + vector_hstring_Release, + /* IInspectable methods */ + vector_hstring_GetIids, + vector_hstring_GetRuntimeClassName, + vector_hstring_GetTrustLevel, + /* IVector<HSTRING> methods */ + vector_hstring_GetAt, + vector_hstring_get_Size, + vector_hstring_GetView, + vector_hstring_IndexOf, + vector_hstring_SetAt, + vector_hstring_InsertAt, + vector_hstring_RemoveAt, + vector_hstring_Append, + vector_hstring_RemoveAtEnd, + vector_hstring_Clear, + vector_hstring_GetMany, + vector_hstring_ReplaceAll, +}; + +HRESULT vector_hstring_create( IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->ref = 1; + + *out = &impl->IVector_HSTRING_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 10

[PATCH v2 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf March 28, 2022

March 28, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 46 +++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 6 +++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..09f9a8aa892 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,52 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + switch(V_VT(pvar)) + { + case VT_BSTR: + { + if (V_BSTR(pvar) == NULL) + return L""; + + return V_BSTR(pvar); + } + case VT_BYREF | VT_BSTR: + { + if (*V_BSTRREF(pvar) == NULL) + return L""; + + return *V_BSTRREF(pvar); + } + case VT_BYREF | VT_VARIANT: + { + if (V_VT(V_VARIANTREF(pvar)) == VT_BSTR) + { + if (V_BSTR(V_VARIANTREF(pvar)) == NULL) + return L""; + + return V_BSTR(V_VARIANTREF(pvar)); + } + + if (V_VT(V_VARIANTREF(pvar)) == (VT_BYREF | VT_BSTR)) + { + if (*V_BSTRREF(V_VARIANTREF(pvar)) == NULL) + return L""; + + return *V_BSTRREF(V_VARIANTREF(pvar)); + } + } + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

2 8

[PATCH v3 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf March 28, 2022

March 28, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 22 ++++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..a1dfba78cce 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,28 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + VARIANT var = *pvar; + + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(&var) == (VT_BYREF | VT_VARIANT)) var = *V_VARIANTREF(pvar); + if (V_VT(&var) == (VT_BYREF | VT_BSTR) || V_VT(&var) == VT_BSTR) + { + PCWSTR str; + str = V_ISBYREF(&var) ? *V_BSTRREF(&var) : V_BSTR(&var); + + if (!str) return L""; + return str; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1

[PATCH] maintainers: Update the path to strmbase.
by Zebediah Figura March 28, 2022

March 28, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9ceae9e80bf..14fe2e0cb9b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -109,8 +109,8 @@ F: dlls/qcap/ F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ -F: dlls/strmbase/ F: dlls/winegstreamer/quartz_parser.c +F: libs/strmbase/ DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com> -- 2.35.1

1 0

[PATCH 1/5] d3dcompiler: Initialize initial_filename in D3DCompile2().
by Matteo Bruni March 28, 2022

March 28, 2022

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4d2642f17e3..ba7789f45a8 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -891,6 +891,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen preprocess_info.pfn_open_include = open_include; preprocess_info.pfn_close_include = close_include; preprocess_info.include_context = include; + initial_filename = filename ? filename : ""; hlsl_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; hlsl_info.next = NULL; -- 2.34.1

4 13

[PATCH 1/6] strmbase: Add a separate id for pins.
by Rémi Bernon March 28, 2022

March 28, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wine/strmbase.h | 1 + libs/strmbase/filter.c | 2 +- libs/strmbase/pin.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3e92136b7f7..1b4cc3f7657 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -36,6 +36,7 @@ struct strmbase_pin struct strmbase_filter *filter; PIN_DIRECTION dir; WCHAR name[128]; + WCHAR id[128]; IPin *peer; AM_MEDIA_TYPE mt; diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index 92b4f1cb4b6..ee41611a198 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -436,7 +436,7 @@ static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin * for (i = 0; (pin = filter->ops->filter_get_pin(filter, i)); ++i) { - if (!lstrcmpW(id, pin->name)) + if (!lstrcmpW(id, pin->id)) { IPin_AddRef(*ret = &pin->IPin_iface); return S_OK; diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 1aecb7a8c98..03330837477 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -383,10 +383,10 @@ static HRESULT WINAPI pin_QueryId(IPin *iface, WCHAR **id) TRACE("pin %p %s:%s, id %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), id); - if (!(*id = CoTaskMemAlloc((lstrlenW(pin->name) + 1) * sizeof(WCHAR)))) + if (!(*id = CoTaskMemAlloc((lstrlenW(pin->id) + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; - lstrcpyW(*id, pin->name); + lstrcpyW(*id, pin->id); return S_OK; } @@ -770,6 +770,7 @@ void strmbase_source_init(struct strmbase_source *pin, struct strmbase_filter *f pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; } @@ -1172,6 +1173,7 @@ void strmbase_sink_init(struct strmbase_sink *pin, struct strmbase_filter *filte pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; pin->pAllocator = pin->preferred_allocator = allocator; -- 2.35.1

3 12

[PATCH v3 resend 1/4] winegstreamer: Implement H264 decoder GetInputStreamInfo.
by Rémi Bernon March 28, 2022

March 28, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Resending with the sign-offs but without PATCH 5 which will require some changes. Supersedes: 230378-230382 dlls/mf/tests/mf.c | 6 ------ dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e58d8278b82..6563ca81b29 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6790,17 +6790,11 @@ static void test_h264_decoder(void) flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); - todo_wine ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); - todo_wine ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags); - todo_wine ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize); - todo_wine ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); - todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment); flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 2f4b42ed101..f24b07ef496 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + info->hnsMaxLatency = 0; + info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + info->cbSize = 0x1000; + info->cbMaxLookahead = 0; + info->cbAlignment = 0; + + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) -- 2.35.1

1 3