April 2022 - Wine-devel - list.winehq.org

[PATCH] dlls/rtqwork: trace 64-bit integers with I64 width modifier
by Eric Pouech 09 Apr '22

09 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rtworkq/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 35ba1e28d03c..d6c28ca45660 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -875,7 +875,7 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) CloseThreadpoolTimer(item->u.timer_object); else - WARN("Unknown item key mask %#lx.\n", (DWORD)key); + WARN("Unknown item key mask %#I64x.\n", key); queue_release_pending_item(item); hr = S_OK; break;

2 1

[PATCH] gdiplus: Accept newer version in OpenType header.
by Esme Povirk 09 Apr '22

09 Apr '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- Chrono Cross: The Radical Dreamers Edition loads a font like this. dlls/gdiplus/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6529f94bc1f..0e864068c52 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1402,7 +1402,8 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) header = (const tt_header*)mem; count = GET_BE_WORD(header->tables_no); - if (GET_BE_WORD(header->major_version) != 1 || GET_BE_WORD(header->minor_version) != 0) + if ((GET_BE_WORD(header->major_version) != 1 || GET_BE_WORD(header->minor_version) != 0) + && (GET_BE_WORD(header->major_version) != 0x4f54 || GET_BE_WORD(header->minor_version) != 0x544f)) return NULL; pos = sizeof(*header); -- 2.32.0

2 1

[PATCH] include: Avoid a C++ keyword for RegisterUserApiHook().
by Zhiyi Zhang 09 Apr '22

09 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52787 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/hook.c | 10 +++++----- include/winuser.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 6dc8c571c0c..e6db8590934 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -502,16 +502,16 @@ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) } /* Undocumented RegisterUserApiHook() */ -BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old) +BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook) { - if (!new) + if (!new_hook) return FALSE; USER_Lock(); - hooked_user_api = *new; + hooked_user_api = *new_hook; user_api = &hooked_user_api; - if (old) - *old = original_user_api; + if (old_hook) + *old_hook = original_user_api; USER_Unlock(); return TRUE; } diff --git a/include/winuser.h b/include/winuser.h index bb585efd16d..4f79face860 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4444,7 +4444,7 @@ struct user_api_hook LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); }; -WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old); +WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook); WINUSERAPI void WINAPI UnregisterUserApiHook(void); #endif -- 2.32.0

2 1

Wine staging 7.6 release
by Alistair Leslie-Hughes 09 Apr '22

09 Apr '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.6 (560 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v3] chakra: Add stub dll.
by Mohamad Al-Jaf 08 Apr '22

08 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52741 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: - Use the default implementations for DllRegisterServer and DllUnregisterServer. --- 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..7ca3e00c6d7 --- /dev/null +++ b/dlls/chakra/Makefile.in @@ -0,0 +1,5 @@ +MODULE = chakra.dll + +EXTRADLLFLAGS = -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..90e176ddf85 --- /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 +@ stdcall -private DllRegisterServer() +@ stdcall -private 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

3 6

[PATCH] diasymreader: Use default DllCanUnloadNow implementation.
by Mohamad Al-Jaf 08 Apr '22

08 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/diasymreader/diasymreader.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/diasymreader/diasymreader.spec b/dlls/diasymreader/diasymreader.spec index 63644e07fd4..ec18371bba8 100644 --- a/dlls/diasymreader/diasymreader.spec +++ b/dlls/diasymreader/diasymreader.spec @@ -1,5 +1,5 @@ @ stub CreateNGenPdbWriter -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectInternal @ stdcall -private DllRegisterServer() -- 2.35.1

3 5

[PATCH] qcap/filewriter: Avoid casting to DWORD in an ERR message.
by Zebediah Figura 08 Apr '22

08 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This supersedes 232052. dlls/qcap/filewriter.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 43f6274ea8d..bc63abcb8cb 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -68,26 +68,27 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed struct file_writer *filter = impl_from_strmbase_pin(&iface->pin); REFERENCE_TIME start, stop; LARGE_INTEGER offset; + DWORD size, ret_size; HRESULT hr; - DWORD size; BYTE *data; if ((hr = IMediaSample_GetTime(sample, &start, &stop)) != S_OK) ERR("Failed to get sample time, hr %#lx.\n", hr); + size = stop - start; if ((hr = IMediaSample_GetPointer(sample, &data)) != S_OK) ERR("Failed to get sample pointer, hr %#lx.\n", hr); offset.QuadPart = start; if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN) - || !WriteFile(filter->file, data, stop - start, &size, NULL)) + || !WriteFile(filter->file, data, size, &ret_size, NULL)) { ERR("Failed to write file, error %lu.\n", GetLastError()); return HRESULT_FROM_WIN32(hr); } - if (size != stop - start) - ERR("Short write, %lu/%lu.\n", size, (DWORD)(stop - start)); + if (ret_size != size) + ERR("Short write, %lu/%lu.\n", ret_size, size); return S_OK; } -- 2.35.1

1 0

[PATCH 1/4] winegstreamer: Use WG_MAJOR_TYPE_UNKNOWN to mark a stream that should not be forced into a certain format.
by Zebediah Figura 08 Apr '22

08 Apr '22

Instead of checking the enabled state. The reasoning here is that we would like to keep the stream enabled—that is, buffer samples instead of discarding them—even when the client is not yet reading samples from it, so that we can avoid wasting CPU power in decoding. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_format.c | 2 +- dlls/winegstreamer/wg_parser.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index b4455a6e6d0..84163f1e5d7 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -495,7 +495,7 @@ GstCaps *wg_format_to_caps(const struct wg_format *format) switch (format->major_type) { case WG_MAJOR_TYPE_UNKNOWN: - return NULL; + return gst_caps_new_any(); case WG_MAJOR_TYPE_WMA: return wg_format_to_caps_wma(format); case WG_MAJOR_TYPE_H264: diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e7a60ec158a..9b3a5ca796d 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -254,6 +254,7 @@ static NTSTATUS wg_parser_stream_disable(void *args) pthread_mutex_lock(&parser->mutex); stream->enabled = false; + stream->current_format.major_type = WG_MAJOR_TYPE_UNKNOWN; pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&stream->event_empty_cond); return S_OK; @@ -601,12 +602,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_caps(query, &filter); pthread_mutex_lock(&parser->mutex); - - if (stream->enabled) - caps = wg_format_to_caps(&stream->current_format); - else - caps = gst_caps_new_any(); - + caps = wg_format_to_caps(&stream->current_format); pthread_mutex_unlock(&parser->mutex); if (!caps) @@ -636,7 +632,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) pthread_mutex_lock(&parser->mutex); - if (!stream->enabled) + if (stream->current_format.major_type == WG_MAJOR_TYPE_UNKNOWN) { pthread_mutex_unlock(&parser->mutex); gst_query_set_accept_caps_result(query, TRUE); @@ -689,6 +685,7 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) gst_segment_init(&stream->segment, GST_FORMAT_UNDEFINED); stream->parser = parser; + stream->current_format.major_type = WG_MAJOR_TYPE_UNKNOWN; pthread_cond_init(&stream->event_cond, NULL); pthread_cond_init(&stream->event_empty_cond, NULL); -- 2.35.1

1 3

[PATCH v3 1/2] riched20/tests: Add tests for IRichEditOleCallback_QueryInsertObject.
by Jinoh Kang 08 Apr '22

08 Apr '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: - remove unused typedef storage class specifier from struct IRichEditOleCallbackImpl definition (thanks huw) - remove Hungarian notation from struct fields and callback params (thanks huw) v2 -> v3: - Substitute pointer typedef names (LP*) with actual pointer to object type - Fix brace style in struct declaration - Rename RIchEditOleCallbackImpl to reobjcb_obj - Obey 120 chars-per-line limit dlls/riched20/tests/richole.c | 266 ++++++++++++++++++++++++++++++++-- 1 file changed, 255 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 24284a24484..65c07162421 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -33,6 +33,185 @@ #include <tom.h> #include <wine/test.h> +#define EXPECT_TODO_WINE 0x80000000UL + +struct reolecb_obj +{ + IRichEditOleCallback IRichEditOleCallback_iface; + LONG ref; + int line; + + ULONG expect_queryinsertobject; + + const CLSID *clsid; + IStorage *stg; + LONG cp; + HRESULT queryinsertobject_result; +}; + +static inline struct reolecb_obj *impl_from_IRichEditOleCallback(IRichEditOleCallback *iface) +{ + return CONTAINING_RECORD(iface, struct reolecb_obj, IRichEditOleCallback_iface); +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_QueryInterface(IRichEditOleCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IRichEditOleCallback)) { + IRichEditOleCallback_AddRef(iface); + *obj = iface; + return S_OK; + } + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE reolecb_obj_AddRef(IRichEditOleCallback *iface) +{ + struct reolecb_obj *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE reolecb_obj_Release(IRichEditOleCallback *iface) +{ + struct reolecb_obj *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) free(This); + return ref; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetNewStorage(IRichEditOleCallback *iface, IStorage **stg) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetInPlaceContext(IRichEditOleCallback *iface, + IOleInPlaceFrame **frame, + IOleInPlaceUIWindow **doc, + OLEINPLACEFRAMEINFO *frame_info) +{ + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_ShowContainerUI(IRichEditOleCallback *iface, BOOL show) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_QueryInsertObject(IRichEditOleCallback *iface, CLSID *clsid, + IStorage *stg, LONG cp) +{ + struct reolecb_obj *This = impl_from_IRichEditOleCallback(iface); + ULONG expect = This->expect_queryinsertobject; + + todo_wine_if(expect & EXPECT_TODO_WINE) + ok_(__FILE__,This->line)( expect & ~EXPECT_TODO_WINE, + "unexpected call to IRichEditOleCallback_QueryInsertObject\n"); + if (!(expect & ~EXPECT_TODO_WINE)) return S_OK; + This->expect_queryinsertobject--; + + if (This->clsid && clsid) + ok_(__FILE__,This->line)( IsEqualGUID(This->clsid, clsid), + "QueryInsertObject clsid expected %s, got %s\n", + wine_dbgstr_guid( This->clsid ), wine_dbgstr_guid( clsid )); + else + ok_(__FILE__,This->line)( This->clsid == clsid, + "QueryInsertObject clsid expected %p, got %p\n", This->clsid, clsid ); + ok_(__FILE__,This->line)( This->stg == stg, "QueryInsertObject stg expected %p, got %p\n", This->stg, stg ); + ok_(__FILE__,This->line)( This->cp == cp, "QueryInsertObject cp expected %ld, got %ld\n", This->cp, cp ); + return This->queryinsertobject_result; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_DeleteObject(IRichEditOleCallback *iface, IOleObject *oleobj) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_QueryAcceptData(IRichEditOleCallback *iface, IDataObject *dataobj, + CLIPFORMAT *cf_format, DWORD reco, BOOL really, + HGLOBAL metapict) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_ContextSensitiveHelp(IRichEditOleCallback *iface, BOOL enter_mode) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetClipboardData(IRichEditOleCallback *iface, CHARRANGE *chrg, + DWORD reco, IDataObject **dataobj) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetDragDropEffect(IRichEditOleCallback *iface, BOOL drag, + DWORD key_state, DWORD *effect) +{ + if (effect) *effect = DROPEFFECT_COPY; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetContextMenu(IRichEditOleCallback *iface, WORD seltype, + IOleObject *oleobj, CHARRANGE *chrg, HMENU *hmenu) +{ + return E_NOTIMPL; +} + +static const struct IRichEditOleCallbackVtbl reolecb_obj_Vtbl = { + reolecb_obj_QueryInterface, + reolecb_obj_AddRef, + reolecb_obj_Release, + reolecb_obj_GetNewStorage, + reolecb_obj_GetInPlaceContext, + reolecb_obj_ShowContainerUI, + reolecb_obj_QueryInsertObject, + reolecb_obj_DeleteObject, + reolecb_obj_QueryAcceptData, + reolecb_obj_ContextSensitiveHelp, + reolecb_obj_GetClipboardData, + reolecb_obj_GetDragDropEffect, + reolecb_obj_GetContextMenu, +}; + +static HRESULT reolecb_obj_Create(struct reolecb_obj **objptr) +{ + struct reolecb_obj *obj; + + obj = calloc(sizeof(struct reolecb_obj), 1); + if (!obj) return E_OUTOFMEMORY; + + obj->IRichEditOleCallback_iface.lpVtbl = &reolecb_obj_Vtbl; + obj->ref = 1; + + *objptr = obj; + return S_OK; +} + +static void olecb_expect_QueryInsertObject(struct reolecb_obj *This, int line, ULONG expect, + const CLSID *clsid, IStorage *stg, LONG cp, HRESULT result) +{ + if (!This) return; + + This->line = line; + This->expect_queryinsertobject = expect; + This->clsid = clsid; + This->stg = stg; + This->cp = cp; + This->queryinsertobject_result = result; +} + +static void olecb_check_QueryInsertObject(struct reolecb_obj *This, int line) +{ + if (!This) return; + + todo_wine_if(This->expect_queryinsertobject & EXPECT_TODO_WINE) + ok( !(This->expect_queryinsertobject & ~EXPECT_TODO_WINE), + "expected IRichEditOleCallback_QueryInsertObject to be called\n" ); + + olecb_expect_QueryInsertObject(This, 0, 0, NULL, NULL, 0, S_OK); +} + static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -3233,21 +3412,26 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); } -#define INSERT_REOBJECT(reole,reobj,cp,user) \ - _insert_reobject(reole, reobj, cp, user, __LINE__) -static void _insert_reobject(IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) +#define INSERT_REOBJECT(callback,reole,reobj,cp,user) \ + _insert_reobject(callback, reole, reobj, cp, user, __LINE__) +static void _insert_reobject(struct reolecb_obj *callback, IRichEditOle *reole, + REOBJECT *reobj, LONG cp, DWORD user, int line) { IOleClientSite *clientsite; HRESULT hr; + + olecb_expect_QueryInsertObject(callback, line, EXPECT_TODO_WINE | 1, + &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user); hr = IRichEditOle_InsertObject(reole, reobj); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_InsertObject got hr %#lx.\n", hr); IOleClientSite_Release(clientsite); + olecb_check_QueryInsertObject(callback, line); } -static void test_InsertObject(void) +static void subtest_InsertObject(struct reolecb_obj *callback) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; @@ -3271,6 +3455,12 @@ static void test_InsertObject(void) BSTR bstr; create_interfaces(&hwnd, &reole, &doc, &selection); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, (LPARAM)&callback->IRichEditOleCallback_iface); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -3278,22 +3468,48 @@ static void test_InsertObject(void) /* insert object1 in (0, 1)*/ SendMessageA(hwnd, EM_SETSEL, 0, 1); - INSERT_REOBJECT(reole, &reo1, REO_CP_SELECTION, 1); + INSERT_REOBJECT(callback, reole, &reo1, REO_CP_SELECTION, 1); count = IRichEditOle_GetObjectCount(reole); ok(count == 1, "got wrong object count: %ld\n", count); /* insert object2 in (2, 3)*/ SendMessageA(hwnd, EM_SETSEL, 2, 3); - INSERT_REOBJECT(reole, &reo2, REO_CP_SELECTION, 2); + INSERT_REOBJECT(callback, reole, &reo2, REO_CP_SELECTION, 2); count = IRichEditOle_GetObjectCount(reole); ok(count == 2, "got wrong object count: %ld\n", count); /* insert object3 in (1, 2)*/ SendMessageA(hwnd, EM_SETSEL, 1, 2); - INSERT_REOBJECT(reole, &reo3, REO_CP_SELECTION, 3); + INSERT_REOBJECT(callback, reole, &reo3, REO_CP_SELECTION, 3); count = IRichEditOle_GetObjectCount(reole); ok(count == 3, "got wrong object count: %ld\n", count); + if (callback) + { + IOleClientSite *clientsite; + REOBJECT reobj; + + /* (fail to) insert object1 in (3, 4)*/ + SendMessageA(hwnd, EM_SETSEL, 3, 4); + + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); + + olecb_expect_QueryInsertObject(callback, __LINE__, EXPECT_TODO_WINE | 1, + &CLSID_NULL, NULL, REO_CP_SELECTION, S_FALSE); + fill_reobject_struct(&reobj, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 0); + hr = IRichEditOle_InsertObject(reole, &reobj); + todo_wine + ok(hr == S_FALSE, "IRichEditOle_InsertObject got hr %#lx.\n", hr); + olecb_check_QueryInsertObject(callback, __LINE__); + + IOleClientSite_Release(clientsite); + + count = IRichEditOle_GetObjectCount(reole); + todo_wine + ok(count == 3, "got wrong object count: %ld\n", count); + } + /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); @@ -3371,8 +3587,8 @@ static void test_InsertObject(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); /* "abc|d|efg" */ - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); SendMessageW(hwnd, EM_SETSEL, 2, 3); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); @@ -3473,8 +3689,8 @@ static void test_InsertObject(void) ok(!result, "Got result %lx.\n", result); /* "abc|d|efg" */ SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); expected_string = L"abc d efg"; charrange.cpMin = 0; @@ -3551,9 +3767,37 @@ static void test_InsertObject(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(result == 0xfffc, "Got char: %lc\n", (WCHAR)result); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, 0); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + release_interfaces(&hwnd, &reole, &doc, &selection); } +static void test_InsertObject(void) +{ + struct reolecb_obj *callback; + HRESULT hr; + ULONG ref; + + subtest_InsertObject(NULL); + + hr = reolecb_obj_Create(&callback); + ok(SUCCEEDED(hr), "reolecb_obj_Create returned %#lx\n", hr); + if (SUCCEEDED(hr)) + { + subtest_InsertObject(callback); + ref = IRichEditOleCallback_Release(&callback->IRichEditOleCallback_iface); + ok(ref == 0, "expected IRichEditOleCallback recount to be 0, got %lu\n", ref); + } + else + { + skip("cannot test InsertObject with callback\n"); + } +} + static void test_GetStoryLength(void) { static const CHAR test_text1[] = "TestSomeText"; -- 2.34.1

2 3

[PATCH v2 1/5] kernel32/tests: Add invalid pointer heap validation tests.
by Rémi Bernon 08 Apr '22

08 Apr '22

Adding commented-out crashing tests to make it obvious that they were tested and that HeapFree or HeapReAlloc don't validate pointers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix spurious todo_wine success on 32bit. dlls/kernel32/tests/heap.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 6f85ecc6425..190e83cc208 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -78,6 +78,7 @@ struct heap static void test_HeapCreate(void) { + static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; BYTE *ptr, *ptr1, *ptrs[128]; HANDLE heap, heap1; @@ -107,12 +108,49 @@ static void test_HeapCreate(void) ret = HeapFree( heap, 0, NULL ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); +#if 0 /* crashes */ + SetLastError( 0xdeadbeef ); + ret = HeapFree( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapFree( heap, 0, ptr ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); +#endif SetLastError( 0xdeadbeef ); ptr = HeapReAlloc( heap, 0, NULL, 1 ); ok( !ptr, "HeapReAlloc succeeded\n" ); todo_wine ok( GetLastError() == NO_ERROR, "got error %lu\n", GetLastError() ); +#if 0 /* crashes */ + SetLastError( 0xdeadbeef ); + ptr1 = HeapReAlloc( heap, 0, (void *)0xdeadbe00, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ptr1 = HeapReAlloc( heap, 0, ptr, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); +#endif + + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, NULL ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapValidate succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapValidate( heap, 0, ptr ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); ptr = HeapAlloc( heap, 0, 0 ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); @@ -122,8 +160,14 @@ static void test_HeapCreate(void) ok( !ptr1, "HeapReAlloc succeeded\n" ); ptr1 = pHeapReAlloc( heap, 0, ptr, ~(SIZE_T)0 ); ok( !ptr1, "HeapReAlloc succeeded\n" ); + ret = HeapValidate( heap, 0, ptr ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, ptr ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); ptr = pHeapAlloc( heap, 0, ~(SIZE_T)0 ); ok( !ptr, "HeapAlloc succeeded\n" ); @@ -247,6 +291,7 @@ static void test_HeapCreate(void) ptr1 = HeapReAlloc( heap, HEAP_REALLOC_IN_PLACE_ONLY, ptr, 2 * alloc_size ); todo_wine ok( ptr1 != ptr, "HeapReAlloc HEAP_REALLOC_IN_PLACE_ONLY succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr1 ); -- 2.35.1

1 4