- Wine-Devel - list.winehq.org

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

March 30, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52741 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Remove duplicate wine-bug link. - Remove unnecessary -mno-cygwin flag (copy paste mistake). --- 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..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] setupapi: Return CR_SUCCESS for CM_Get_DevNode_Status{_Ex}.
by Zhiyi Zhang March 30, 2022

March 30, 2022

One Piece: Pirate Warriors 4 relies on CM_Get_DevNode_Status() to return CR_SUCCESS. Otherwise, it shows a graphics driver error dialog and exits. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/stubs.c | 5 ++--- include/cfgmgr32.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4b1585c8df6..75185de047c 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -455,8 +455,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, ULONG flags) { - FIXME("%p %p 0x%08lx 0x%08lx: stub\n", status, problem, dev, flags); - return CR_FAILURE; + return CM_Get_DevNode_Status_Ex(status, problem, dev, flags, NULL); } /*********************************************************************** @@ -466,7 +465,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST ULONG flags, HMACHINE machine) { FIXME("%p %p 0x%08lx 0x%08lx %p: stub\n", status, problem, dev, flags, machine); - return CR_FAILURE; + return CR_SUCCESS; } /*********************************************************************** diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 7c4f4714126..d300c4babaa 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -234,6 +234,8 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void); -- 2.32.0

1 0

[PATCH] sxs: Use CRT memory allocation functions.
by Nikolay Sivov March 30, 2022

March 30, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/sxs/cache.c | 76 +++++++++++++++++++++--------------------- dlls/sxs/name.c | 34 +++++++++---------- dlls/sxs/sxs.c | 6 ++-- dlls/sxs/sxs_private.h | 10 ------ 4 files changed, 58 insertions(+), 68 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 02403501231..a924a359700 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -89,7 +89,7 @@ static ULONG WINAPI cache_Release( IAssemblyCache *iface ) { TRACE("destroying %p\n", cache); CloseHandle( cache->lock ); - HeapFree( GetProcessHeap(), 0, cache ); + free( cache ); } return refs; } @@ -115,7 +115,7 @@ static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const W buflen += lstrlenW( name ); buflen += lstrlenW( token ); buflen += lstrlenW( version ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( buflen * sizeof(WCHAR) ))) return NULL; *len = swprintf( ret, buflen, fmtW, arch, name, token, version ); return wcslwr( ret ); } @@ -128,15 +128,15 @@ static WCHAR *build_dll_path( const WCHAR *arch, const WCHAR *name, const WCHAR if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; len += build_sxs_path( sxsdir ) + 2; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(ret = malloc( len * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return NULL; } lstrcpyW( ret, sxsdir ); lstrcatW( ret, path ); lstrcatW( ret, L"\\" ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return ret; } @@ -151,7 +151,7 @@ static WCHAR *build_policy_name( const WCHAR *arch, const WCHAR *name, const WCH buflen += lstrlenW( arch ); buflen += lstrlenW( name ); buflen += lstrlenW( token ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( buflen * sizeof(WCHAR) ))) return NULL; *len = swprintf( ret, buflen, fmtW, arch, name, token ); return wcslwr( ret ); } @@ -168,13 +168,13 @@ static WCHAR *build_policy_path( const WCHAR *arch, const WCHAR *name, const WCH len += ARRAY_SIZE(fmtW); len += build_sxs_path( sxsdir ); len += lstrlenW( version ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(ret = malloc( len * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return NULL; } swprintf( ret, len, fmtW, sxsdir, path, version ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return ret; } @@ -259,7 +259,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( } done: - HeapFree( GetProcessHeap(), 0, path ); + free( path ); IAssemblyName_Release( name_obj ); cache_unlock( cache ); return hr; @@ -339,9 +339,9 @@ static void free_assembly( struct assembly *assembly ) struct file *file = LIST_ENTRY( item, struct file, entry ); list_remove( &file->entry ); SysFreeString( file->name ); - HeapFree( GetProcessHeap(), 0, file ); + free( file ); } - HeapFree( GetProcessHeap(), 0, assembly ); + free( assembly ); } static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) @@ -386,7 +386,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) if (hr != S_OK) goto done; - if (!(f = HeapAlloc( GetProcessHeap(), 0, sizeof(struct file) ))) + if (!(f = malloc( sizeof(*f) ))) { IXMLDOMNamedNodeMap_Release( attrs ); hr = E_OUTOFMEMORY; @@ -397,7 +397,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) IXMLDOMNamedNodeMap_Release( attrs ); if (!f->name) { - HeapFree( GetProcessHeap(), 0, f ); + free( f ); hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; goto done; } @@ -450,7 +450,7 @@ static HRESULT parse_assembly( IXMLDOMDocument *doc, struct assembly **assembly hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; goto done; } - if (!(a = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct assembly) ))) + if (!(a = calloc(1, sizeof(*a) ))) { hr = E_OUTOFMEMORY; goto done; @@ -497,9 +497,9 @@ static WCHAR *build_policy_filename( const WCHAR *arch, const WCHAR *name, const len += ARRAY_SIZE(policiesW) - 1; len += lstrlenW( version ); len += ARRAY_SIZE(suffixW) - 1; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return NULL; } lstrcpyW( ret, sxsdir ); @@ -511,7 +511,7 @@ static WCHAR *build_policy_filename( const WCHAR *arch, const WCHAR *name, const lstrcatW( ret, version ); lstrcatW( ret, suffixW ); - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return ret; } @@ -526,7 +526,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly if (!dst) return E_OUTOFMEMORY; ret = CopyFileW( manifest, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, dst ); + free( dst ); if (!ret) { HRESULT hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -544,10 +544,10 @@ static WCHAR *build_source_filename( const WCHAR *manifest, struct file *file ) p = wcsrchr( manifest, '\\' ); if (!p) p = wcsrchr( manifest, '/' ); - if (!p) return strdupW( manifest ); + if (!p) return wcsdup( manifest ); len = p - manifest + 1; - if (!(src = HeapAlloc( GetProcessHeap(), 0, (len + lstrlenW( file->name ) + 1) * sizeof(WCHAR) ))) + if (!(src = malloc( (len + lstrlenW( file->name ) + 1) * sizeof(WCHAR) ))) return NULL; memcpy( src, manifest, len * sizeof(WCHAR) ); @@ -567,9 +567,9 @@ static WCHAR *build_manifest_filename( const WCHAR *arch, const WCHAR *name, con len += build_sxs_path( sxsdir ); len += ARRAY_SIZE(manifestsW) - 1; len += ARRAY_SIZE(suffixW) - 1; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return NULL; } lstrcpyW( ret, sxsdir ); @@ -577,7 +577,7 @@ static WCHAR *build_manifest_filename( const WCHAR *arch, const WCHAR *name, con lstrcatW( ret, fullname ); lstrcatW( ret, suffixW ); - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return ret; } @@ -615,7 +615,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!dst) return E_OUTOFMEMORY; ret = CopyFileW( manifest, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, dst ); + free( dst ); if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -633,9 +633,9 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!(src = build_source_filename( manifest, file ))) goto done; len = len_sxsdir + len_name + lstrlenW( file->name ); - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR) ))) + if (!(dst = malloc( (len + 2) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, src ); + free( src ); goto done; } lstrcpyW( dst, sxsdir ); @@ -647,8 +647,8 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl for (p = dst; *p; p++) *p = towlower( *p ); ret = CopyFileW( src, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, src ); - HeapFree( GetProcessHeap(), 0, dst ); + free( src ); + free( dst ); if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -659,7 +659,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl hr = S_OK; done: - HeapFree( GetProcessHeap(), 0, name ); + free( name ); return hr; } @@ -711,7 +711,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) name = build_assembly_name( assembly->arch, assembly->name, assembly->token, assembly->version, &len_name ); if (!name) return E_OUTOFMEMORY; - if (!(dirname = HeapAlloc( GetProcessHeap(), 0, (len_sxsdir + len_name + 1) * sizeof(WCHAR) ))) + if (!(dirname = malloc( (len_sxsdir + len_name + 1) * sizeof(WCHAR) ))) goto done; lstrcpyW( dirname, sxsdir ); lstrcpyW( dirname + len_sxsdir, name ); @@ -719,20 +719,20 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) LIST_FOR_EACH_ENTRY( file, &assembly->files, struct file, entry ) { len = len_sxsdir + len_name + 1 + lstrlenW( file->name ); - if (!(filename = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) goto done; + if (!(filename = malloc( (len + 1) * sizeof(WCHAR) ))) goto done; lstrcpyW( filename, dirname ); lstrcatW( filename, backslashW ); lstrcatW( filename, file->name ); if (!DeleteFileW( filename )) WARN( "failed to delete file %lu\n", GetLastError() ); - HeapFree( GetProcessHeap(), 0, filename ); + free( filename ); } RemoveDirectoryW( dirname ); hr = S_OK; done: - HeapFree( GetProcessHeap(), 0, dirname ); - HeapFree( GetProcessHeap(), 0, name ); + free( dirname ); + free( name ); return hr; } @@ -800,7 +800,7 @@ static HRESULT WINAPI cache_UninstallAssembly( done: if (name_obj) IAssemblyName_Release( name_obj ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); free_assembly( assembly ); if (doc) IXMLDOMDocument_Release( doc ); if (SUCCEEDED(init)) CoUninitialize(); @@ -834,7 +834,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) *obj = NULL; - cache = HeapAlloc( GetProcessHeap(), 0, sizeof(struct cache) ); + cache = malloc( sizeof(*cache) ); if (!cache) return E_OUTOFMEMORY; @@ -843,7 +843,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); if (!cache->lock) { - HeapFree( GetProcessHeap(), 0, cache ); + free( cache ); return HRESULT_FROM_WIN32( GetLastError() ); } *obj = &cache->IAssemblyCache_iface; diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 29368b6d788..4772c7317c5 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -88,12 +88,12 @@ static ULONG WINAPI name_Release( IAssemblyName *iface ) if (!refs) { TRACE("destroying %p\n", name); - HeapFree( GetProcessHeap(), 0, name->name ); - HeapFree( GetProcessHeap(), 0, name->arch ); - HeapFree( GetProcessHeap(), 0, name->token ); - HeapFree( GetProcessHeap(), 0, name->type ); - HeapFree( GetProcessHeap(), 0, name->version ); - HeapFree( GetProcessHeap(), 0, name ); + free( name->name ); + free( name->arch ); + free( name->token ); + free( name->type ); + free( name->version ); + free( name ); } return refs; } @@ -251,9 +251,9 @@ static HRESULT WINAPI name_GetVersion( TRACE("%p, %p, %p\n", iface, high, low); if (!name->version) return HRESULT_FROM_WIN32( ERROR_NOT_FOUND ); - if (!(version = strdupW( name->version ))) return E_OUTOFMEMORY; + if (!(version = wcsdup( name->version ))) return E_OUTOFMEMORY; hr = parse_version( version, high, low ); - HeapFree( GetProcessHeap(), 0, version ); + free( version ); return hr; } @@ -300,7 +300,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int *len ) if (!*p) return NULL; *len = p - str; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, *len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( *len * sizeof(WCHAR) ))) return NULL; memcpy( ret, str + 1, (*len - 1) * sizeof(WCHAR) ); ret[*len - 1] = 0; return ret; @@ -314,7 +314,7 @@ static HRESULT parse_displayname( struct name *name, const WCHAR *displayname ) p = q = displayname; while (*q && *q != ',') q++; len = q - p; - if (!(name->name = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(name->name = malloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( name->name, p, len * sizeof(WCHAR) ); name->name[len] = 0; if (!*q) return S_OK; @@ -376,7 +376,7 @@ HRESULT WINAPI CreateAssemblyNameObject( if (!assembly || !assembly[0] || flags != CANOF_PARSE_DISPLAY_NAME) return E_INVALIDARG; - if (!(name = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*name) ))) + if (!(name = calloc(1, sizeof(*name) ))) return E_OUTOFMEMORY; name->IAssemblyName_iface.lpVtbl = &name_vtbl; @@ -385,12 +385,12 @@ HRESULT WINAPI CreateAssemblyNameObject( hr = parse_displayname( name, assembly ); if (hr != S_OK) { - HeapFree( GetProcessHeap(), 0, name->name ); - HeapFree( GetProcessHeap(), 0, name->arch ); - HeapFree( GetProcessHeap(), 0, name->token ); - HeapFree( GetProcessHeap(), 0, name->type ); - HeapFree( GetProcessHeap(), 0, name->version ); - HeapFree( GetProcessHeap(), 0, name ); + free( name->name ); + free( name->arch ); + free( name->token ); + free( name->type ); + free( name->version ); + free( name ); return hr; } *obj = &name->IAssemblyName_iface; diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 934aa9345c8..150a49a322f 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -19,11 +19,11 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sxs); @@ -147,7 +147,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff goto out; } - assembly_info = heap_alloc(bytes_assembly_info); + assembly_info = malloc(bytes_assembly_info); if (!(retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info))) @@ -219,6 +219,6 @@ out: if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) DeactivateActCtx(0, cookie); - heap_free(assembly_info); + free(assembly_info); return retval; } diff --git a/dlls/sxs/sxs_private.h b/dlls/sxs/sxs_private.h index c03e6db566e..4ae6bb8e2fc 100644 --- a/dlls/sxs/sxs_private.h +++ b/dlls/sxs/sxs_private.h @@ -26,13 +26,3 @@ enum name_attr_id }; const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ) DECLSPEC_HIDDEN; - -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - - if (!src) return NULL; - dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) lstrcpyW( dst, src ); - return dst; -} -- 2.35.1

1 0

[PATCH] fusion: Use CRT memory allocation functions.
by Nikolay Sivov March 30, 2022

March 30, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/fusion/asmcache.c | 44 +++++++++++++++++++------------------- dlls/fusion/asmenum.c | 14 ++++++------ dlls/fusion/asmname.c | 46 +++++++++++++++++++--------------------- dlls/fusion/assembly.c | 26 +++++++++++------------ dlls/fusion/fusionpriv.h | 14 ------------ 5 files changed, 64 insertions(+), 80 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index b9cb505de86..88805bb354b 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -62,7 +62,7 @@ static BOOL create_full_path(LPCWSTR path) BOOL ret = TRUE; int len; - if (!(new_path = heap_alloc((lstrlenW(path) + 1) * sizeof(WCHAR)))) return FALSE; + if (!(new_path = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)))) return FALSE; lstrcpyW(new_path, path); @@ -100,7 +100,7 @@ static BOOL create_full_path(LPCWSTR path) new_path[len] = '\\'; } - heap_free(new_path); + free(new_path); return ret; } @@ -197,7 +197,7 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) if (!refCount) { CloseHandle( cache->lock ); - heap_free( cache ); + free( cache ); } return refCount; } @@ -255,7 +255,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) goto done; - if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + if (!(path = malloc( len * sizeof(WCHAR) ))) { hr = E_OUTOFMEMORY; goto done; @@ -290,7 +290,7 @@ done: IAssemblyName_Release( asmname ); if (next) IAssemblyName_Release( next ); if (asmenum) IAssemblyEnum_Release( asmenum ); - heap_free( path ); + free( path ); cache_unlock( cache ); return hr; } @@ -372,7 +372,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *ppAsmItem = NULL; - if (!(item = heap_alloc(sizeof(*item)))) return E_OUTOFMEMORY; + if (!(item = malloc(sizeof(*item)))) return E_OUTOFMEMORY; item->IAssemblyCacheItem_iface.lpVtbl = &AssemblyCacheItemVtbl; item->ref = 1; @@ -395,22 +395,22 @@ static HRESULT copy_file( const WCHAR *src_dir, DWORD src_len, const WCHAR *dst_ DWORD len = lstrlenW( filename ); HRESULT hr = S_OK; - if (!(src_file = heap_alloc( (src_len + len + 1) * sizeof(WCHAR) ))) + if (!(src_file = malloc( (src_len + len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( src_file, src_dir, src_len * sizeof(WCHAR) ); lstrcpyW( src_file + src_len, filename ); - if (!(dst_file = heap_alloc( (dst_len + len + 1) * sizeof(WCHAR) ))) + if (!(dst_file = malloc( (dst_len + len + 1) * sizeof(WCHAR) ))) { - heap_free( src_file ); + free( src_file ); return E_OUTOFMEMORY; } memcpy( dst_file, dst_dir, dst_len * sizeof(WCHAR) ); lstrcpyW( dst_file + dst_len, filename ); if (!CopyFileW( src_file, dst_file, FALSE )) hr = HRESULT_FROM_WIN32( GetLastError() ); - heap_free( src_file ); - heap_free( dst_file ); + free( src_file ); + free( dst_file ); return hr; } @@ -483,7 +483,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); dst_len += lstrlenW(asmdir) + lstrlenW(name) + lstrlenW(version) + lstrlenW(token); - if (!(dst_dir = heap_alloc(dst_len * sizeof(WCHAR)))) + if (!(dst_dir = malloc(dst_len * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -523,13 +523,13 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, } done: - heap_free(name); - heap_free(token); - heap_free(version); - heap_free(asmpath); - heap_free(dst_dir); - for (i = 0; i < count; i++) heap_free(external_files[i]); - heap_free(external_files); + free(name); + free(token); + free(version); + free(asmpath); + free(dst_dir); + for (i = 0; i < count; i++) free(external_files[i]); + free(external_files); assembly_release(assembly); cache_unlock( cache ); return hr; @@ -560,14 +560,14 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved *ppAsmCache = NULL; - if (!(cache = heap_alloc(sizeof(*cache)))) return E_OUTOFMEMORY; + if (!(cache = malloc(sizeof(*cache)))) return E_OUTOFMEMORY; cache->IAssemblyCache_iface.lpVtbl = &AssemblyCacheVtbl; cache->ref = 1; cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); if (!cache->lock) { - heap_free( cache ); + free( cache ); return HRESULT_FROM_WIN32( GetLastError() ); } *ppAsmCache = &cache->IAssemblyCache_iface; @@ -620,7 +620,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_Release(IAssemblyCacheItem *iface) TRACE("(%p)->(ref before = %lu)\n", This, refCount + 1); if (!refCount) - heap_free(This); + free(This); return refCount; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index d545e2533b5..8a35951accc 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -105,10 +105,10 @@ static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) list_remove(&asmname->entry); IAssemblyName_Release(asmname->name); - heap_free(asmname); + free(asmname); } - heap_free(This); + free(This); } return refCount; @@ -354,7 +354,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } swprintf(disp, ARRAY_SIZE(disp), name_fmt, parent, version, token); - if (!(asmname = heap_alloc(sizeof(*asmname)))) + if (!(asmname = malloc(sizeof(*asmname)))) { hr = E_OUTOFMEMORY; break; @@ -364,7 +364,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, CANOF_PARSE_DISPLAY_NAME, NULL); if (FAILED(hr)) { - heap_free(asmname); + free(asmname); break; } @@ -372,7 +372,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, if (FAILED(hr)) { IAssemblyName_Release(asmname->name); - heap_free(asmname); + free(asmname); break; } @@ -475,7 +475,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, if (dwFlags == 0 || dwFlags == ASM_CACHE_ROOT) return E_INVALIDARG; - if (!(asmenum = heap_alloc(sizeof(*asmenum)))) return E_OUTOFMEMORY; + if (!(asmenum = malloc(sizeof(*asmenum)))) return E_OUTOFMEMORY; asmenum->IAssemblyEnum_iface.lpVtbl = &AssemblyEnumVtbl; asmenum->ref = 1; @@ -486,7 +486,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, hr = enumerate_gac(asmenum, pName); if (FAILED(hr)) { - heap_free(asmenum); + free(asmenum); return hr; } } diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 8a6531df0b8..1d4d588762d 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -114,12 +114,12 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) if (!refCount) { - heap_free(This->path); - heap_free(This->displayname); - heap_free(This->name); - heap_free(This->culture); - heap_free(This->procarch); - heap_free(This); + free(This->path); + free(This->displayname); + free(This->name); + free(This->culture); + free(This->procarch); + free(This); } return refCount; @@ -521,7 +521,7 @@ HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) { IAssemblyNameImpl *name = unsafe_impl_from_IAssemblyName(iface); - name->path = strdupW(path); + name->path = wcsdup(path); if (!name->path) return E_OUTOFMEMORY; @@ -576,12 +576,10 @@ static HRESULT parse_version(IAssemblyNameImpl *name, LPWSTR version) static HRESULT parse_culture(IAssemblyNameImpl *name, LPCWSTR culture) { - static const WCHAR empty[] = {0}; - if (lstrlenW(culture) == 2) - name->culture = strdupW(culture); + name->culture = wcsdup(culture); else - name->culture = strdupW(empty); + name->culture = wcsdup(L""); return S_OK; } @@ -662,7 +660,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) BOOL quoted = FALSE; unsigned int i = 0; - if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) return NULL; if (*p == '\"') { quoted = TRUE; @@ -671,7 +669,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) while (*p && *p != '\"') ret[i++] = *p++; if ((quoted && *p != '\"') || (!quoted && *p == '\"')) { - heap_free( ret ); + free( ret ); return NULL; } ret[i] = 0; @@ -687,11 +685,11 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam if (!szAssemblyName) return S_OK; - name->displayname = strdupW(szAssemblyName); + name->displayname = wcsdup(szAssemblyName); if (!name->displayname) return E_OUTOFMEMORY; - str = strdupW(szAssemblyName); + str = wcsdup(szAssemblyName); save = str; if (!str) { @@ -709,7 +707,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam goto done; } - name->name = strdupW(str); + name->name = wcsdup(str); if (!name->name) { hr = E_OUTOFMEMORY; @@ -768,7 +766,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam hr = parse_procarch( name, name->procarch ); } - heap_free( value ); + free( value ); if (FAILED(hr)) goto done; @@ -777,13 +775,13 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam } done: - heap_free(save); + free(save); if (FAILED(hr)) { - heap_free(name->displayname); - heap_free(name->name); - heap_free(name->culture); - heap_free(name->procarch); + free(name->displayname); + free(name->name); + free(name->culture); + free(name->procarch); } return hr; } @@ -808,7 +806,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, (!szAssemblyName || !*szAssemblyName)) return E_INVALIDARG; - if (!(name = heap_alloc_zero(sizeof(*name)))) return E_OUTOFMEMORY; + if (!(name = calloc(1, sizeof(*name)))) return E_OUTOFMEMORY; name->IAssemblyName_iface.lpVtbl = &AssemblyNameVtbl; name->ref = 1; @@ -816,7 +814,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, hr = parse_display_name(name, szAssemblyName); if (FAILED(hr)) { - heap_free(name); + free(name); return hr; } diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 83f08888f8a..48d5308dd4b 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -540,7 +540,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) metadatahdr = (METADATAHDR *)ptr; - if (!(assembly->metadatahdr = heap_alloc(sizeof(*assembly->metadatahdr)))) return E_OUTOFMEMORY; + if (!(assembly->metadatahdr = malloc(sizeof(*assembly->metadatahdr)))) return E_OUTOFMEMORY; size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size); @@ -645,9 +645,9 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - if (!(assembly = heap_alloc_zero(sizeof(*assembly)))) return E_OUTOFMEMORY; + if (!(assembly = calloc(1, sizeof(*assembly)))) return E_OUTOFMEMORY; - assembly->path = strdupW(file); + assembly->path = wcsdup(file); if (!assembly->path) { hr = E_OUTOFMEMORY; @@ -696,12 +696,12 @@ HRESULT assembly_release(ASSEMBLY *assembly) if (!assembly) return S_OK; - heap_free(assembly->metadatahdr); - heap_free(assembly->path); + free(assembly->metadatahdr); + free(assembly->path); UnmapViewOfFile(assembly->data); CloseHandle(assembly->hmap); CloseHandle(assembly->hfile); - heap_free(assembly); + free(assembly); return S_OK; } @@ -714,7 +714,7 @@ static LPWSTR assembly_dup_str(const ASSEMBLY *assembly, DWORD index) len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - if ((cpy = heap_alloc(len * sizeof(WCHAR)))) + if ((cpy = malloc(len * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, str, -1, cpy, len); return cpy; @@ -749,7 +749,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) { - WCHAR *cpy = heap_alloc((lstrlenW(assembly->path) + 1) * sizeof(WCHAR)); + WCHAR *cpy = malloc((lstrlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; if (cpy) lstrcpyW(cpy, assembly->path); @@ -776,7 +776,7 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) if (!asmtbl) return E_FAIL; - if (!(*version = heap_alloc(24 * sizeof(WCHAR)))) + if (!(*version = malloc(24 * sizeof(WCHAR)))) return E_OUTOFMEMORY; swprintf(*version, 24, format, asmtbl->MajorVersion, asmtbl->MinorVersion, @@ -846,7 +846,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; - if (!(tok = heap_alloc((TOKEN_LENGTH + 1) * sizeof(WCHAR)))) + if (!(tok = malloc((TOKEN_LENGTH + 1) * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -890,7 +890,7 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c if (num_rows <= 0) return S_OK; - if (!(ret = heap_alloc(num_rows * sizeof(WCHAR *)))) return E_OUTOFMEMORY; + if (!(ret = malloc(num_rows * sizeof(WCHAR *)))) return E_OUTOFMEMORY; for (i = 0; i < num_rows; i++) { @@ -903,8 +903,8 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c ret[i] = assembly_dup_str(assembly, idx); if (!ret[i]) { - for (; i >= 0; i--) heap_free(ret[i]); - heap_free(ret); + for (; i >= 0; i--) free(ret[i]); + free(ret); return E_OUTOFMEMORY; } ptr += assembly->stringsz; /* skip Name field */ diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 22de4ca7846..66ef7b9ff08 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -27,7 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "winver.h" -#include "wine/heap.h" #include <pshpack1.h> @@ -442,19 +441,6 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN; -static inline LPWSTR strdupW(LPCWSTR src) -{ - LPWSTR dest; - - if (!src) - return NULL; - - if ((dest = heap_alloc((lstrlenW(src) + 1) * sizeof(WCHAR)))) - lstrcpyW(dest, src); - - return dest; -} - #define BYTES_PER_TOKEN 8 #define CHARS_PER_BYTE 2 #define TOKEN_LENGTH (BYTES_PER_TOKEN * CHARS_PER_BYTE + 1) -- 2.35.1

1 0

[v2 PATCH 1/3] scrobj: Use CRT allocation functions.
by Nikolay Sivov March 30, 2022

March 30, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: missed some Heap* calls. dlls/scrobj/scrobj.c | 92 ++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 50 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 0df6be1cd44..b01fa60d6a4 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -34,7 +34,6 @@ #include "xmllite.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrobj); @@ -243,15 +242,6 @@ static void release_typelib(void) ITypeLib_Release(typelib); } -static WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - size_t size = (wcslen(str) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc(size))) return NULL; - memcpy(ret, str, size); - return ret; -} - static inline struct scriptlet_global *global_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, struct scriptlet_global, IDispatchEx_iface); @@ -304,7 +294,8 @@ static ULONG WINAPI global_Release(IDispatchEx *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) heap_free(This); + if (!ref) free(This); + return ref; } @@ -495,8 +486,8 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->language); - heap_free(This); + free(This->language); + free(This); } return ref; @@ -758,7 +749,8 @@ static HRESULT lookup_object_properties(struct scriptlet_instance *object, struc if (!member_cnt) return S_OK; - if (!(object->members = heap_alloc_zero(member_cnt * sizeof(*object->members)))) return E_OUTOFMEMORY; + if (!(object->members = calloc(member_cnt, sizeof(*object->members)))) + return E_OUTOFMEMORY; object->member_cnt = member_cnt; LIST_FOR_EACH_ENTRY(member, &factory->members, struct scriptlet_member, entry) @@ -858,7 +850,8 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s struct script_host *host; HRESULT hres; - if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; + if (!(host = calloc(1, sizeof(*host)))) + return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; @@ -866,7 +859,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->ref = 1; host->state = SCRIPTSTATE_CLOSED; - if (!(host->language = heap_strdupW(language))) + if (!(host->language = wcsdup(language))) { IActiveScriptSite_Release(&host->IActiveScriptSite_iface); return E_OUTOFMEMORY; @@ -990,10 +983,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) unsigned i; for (i = 0; i < This->member_cnt; i++) SysFreeString(This->members[i].name); - heap_free(This->members); + free(This->members); detach_script_hosts(&This->hosts); if (This->global) IDispatchEx_Release(&This->global->IDispatchEx_iface); - heap_free(This); + free(This); } return ref; } @@ -1197,13 +1190,14 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis IDispatch *script_dispatch; HRESULT hres; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; + if (!(obj = calloc(1, sizeof(*obj)))) + return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; list_init(&obj->hosts); - if (!(obj->global = heap_alloc(sizeof(*obj->global)))) + if (!(obj->global = malloc(sizeof(*obj->global)))) { IDispatchEx_Release(&obj->IDispatchEx_iface); return E_OUTOFMEMORY; @@ -1325,7 +1319,7 @@ static HRESULT read_xml_value(struct scriptlet_factory *factory, WCHAR **ret) HRESULT hres; hres = IXmlReader_GetValue(factory->xml_reader, &str, &len); if (FAILED(hres)) return hres; - if (!(*ret = heap_alloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(*ret = malloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(*ret, str, len * sizeof(WCHAR)); (*ret)[len] = 0; return S_OK; @@ -1414,7 +1408,7 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) size_t progid_len = wcslen(factory->progid); size_t version_len = wcslen(factory->version); - if (!(factory->versioned_progid = heap_alloc((progid_len + version_len + 2) * sizeof(WCHAR)))) + if (!(factory->versioned_progid = malloc((progid_len + version_len + 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(factory->versioned_progid, factory->progid, (progid_len + 1) * sizeof(WCHAR)); @@ -1476,13 +1470,13 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + if (!(member = malloc(sizeof(*member)))) return E_OUTOFMEMORY; member->type = member_type; hres = read_xml_value(factory, &member->name); if (FAILED(hres)) { - heap_free(member); + free(member); return hres; } @@ -1491,7 +1485,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) if (!wcsicmp(member_iter->name, member->name)) { FIXME("Duplicated member %s\n", debugstr_w(member->name)); - heap_free(member); + free(member); return E_FAIL; } } @@ -1530,7 +1524,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(parameter = heap_alloc_zero(sizeof(*parameter)))) return E_OUTOFMEMORY; + if (!(parameter = calloc(1, sizeof(*parameter)))) return E_OUTOFMEMORY; list_add_tail(&member->u.parameters, &parameter->entry); hres = read_xml_value(factory, &parameter->name); @@ -1639,7 +1633,7 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct return E_FAIL; } - if (!(script->body = heap_alloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(script->body = malloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; size = 0; for (;;) @@ -1651,12 +1645,12 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct if (hres == S_FALSE) break; if (size + 1 == buf_size) { - if (!(new_body = heap_realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(new_body = realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; script->body = new_body; } } script->body[size++] = 0; - if (size != buf_size) script->body = heap_realloc(script->body, size * sizeof(WCHAR)); + if (size != buf_size) script->body = realloc(script->body, size * sizeof(WCHAR)); TRACE("body %s\n", debugstr_w(script->body)); return expect_end_element(factory); @@ -1725,7 +1719,7 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH else if (is_xml_name(factory, L"script")) { struct scriptlet_script *script; - if (!(script = heap_alloc_zero(sizeof(*script)))) return E_OUTOFMEMORY; + if (!(script = calloc(1, sizeof(*script)))) return E_OUTOFMEMORY; list_add_tail(&factory->scripts, &script->entry); hres = parse_scriptlet_script(factory, script); if (FAILED(hres)) return hres; @@ -1803,33 +1797,33 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) { struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); list_remove(&member->entry); - heap_free(member->name); + free(member->name); if (member->type == MEMBER_METHOD) { while (!list_empty(&member->u.parameters)) { struct method_parameter *parameter = LIST_ENTRY(list_head(&member->u.parameters), struct method_parameter, entry); list_remove(&parameter->entry); - heap_free(parameter->name); - heap_free(parameter); + free(parameter->name); + free(parameter); } } - heap_free(member); + free(member); } while (!list_empty(&This->scripts)) { struct scriptlet_script *script = LIST_ENTRY(list_head(&This->scripts), struct scriptlet_script, entry); list_remove(&script->entry); - heap_free(script->language); - heap_free(script->body); - heap_free(script); + free(script->language); + free(script->body); + free(script); } - heap_free(This->classid_str); - heap_free(This->description); - heap_free(This->versioned_progid); - heap_free(This->progid); - heap_free(This->version); - heap_free(This); + free(This->classid_str); + free(This->description); + free(This->versioned_progid); + free(This->progid); + free(This->version); + free(This); } return ref; } @@ -1888,7 +1882,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto TRACE("%s\n", debugstr_w(url)); - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) { IClassFactory_Release(&factory->IClassFactory_iface); return E_OUTOFMEMORY; @@ -2106,7 +2100,7 @@ static ULONG WINAPI scriptlet_typelib_Release(IGenScriptletTLib *iface) if (!ref) { SysFreeString(This->guid); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -2424,13 +2418,11 @@ static HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, I *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IGenScriptletTLib_iface.lpVtbl = &scriptlet_typelib_vtbl; This->ref = 1; - This->guid = NULL; hr = IGenScriptletTLib_QueryInterface(&This->IGenScriptletTLib_iface, riid, obj); IGenScriptletTLib_Release(&This->IGenScriptletTLib_iface); @@ -2517,11 +2509,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) WCHAR *url; HRESULT hres; - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(url = malloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; status = RegQueryValueW(HKEY_CLASSES_ROOT, key_name, url, &size); hres = create_scriptlet_factory(url, &factory); - heap_free(url); + free(url); if (FAILED(hres)) return hres; hres = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, ppv); -- 2.35.1

1 2

[PATCH] winex11: Check for invalid format in get_tile_pict
by Alex Henrie March 30, 2022

March 30, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52747 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/xrender.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 5ede97fb026..1cb7e67a477 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1230,6 +1230,8 @@ static Picture get_tile_pict( enum wxr_format wxr_format, const XRenderColor *co XRenderColor current_color; } tiles[WXR_NB_FORMATS], *tile; + if (wxr_format == WXR_INVALID_FORMAT) return 0; + tile = &tiles[wxr_format]; if(!tile->xpm) -- 2.35.1

1 0

[PATCH 1/3] scrobj: Use CRT allocation functions.
by Nikolay Sivov March 30, 2022

March 30, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 86 +++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 0df6be1cd44..7f93c146b96 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -34,7 +34,6 @@ #include "xmllite.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrobj); @@ -243,15 +242,6 @@ static void release_typelib(void) ITypeLib_Release(typelib); } -static WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - size_t size = (wcslen(str) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc(size))) return NULL; - memcpy(ret, str, size); - return ret; -} - static inline struct scriptlet_global *global_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, struct scriptlet_global, IDispatchEx_iface); @@ -304,7 +294,8 @@ static ULONG WINAPI global_Release(IDispatchEx *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) heap_free(This); + if (!ref) free(This); + return ref; } @@ -495,8 +486,8 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->language); - heap_free(This); + free(This->language); + free(This); } return ref; @@ -758,7 +749,8 @@ static HRESULT lookup_object_properties(struct scriptlet_instance *object, struc if (!member_cnt) return S_OK; - if (!(object->members = heap_alloc_zero(member_cnt * sizeof(*object->members)))) return E_OUTOFMEMORY; + if (!(object->members = calloc(member_cnt, sizeof(*object->members)))) + return E_OUTOFMEMORY; object->member_cnt = member_cnt; LIST_FOR_EACH_ENTRY(member, &factory->members, struct scriptlet_member, entry) @@ -858,7 +850,8 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s struct script_host *host; HRESULT hres; - if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; + if (!(host = calloc(1, sizeof(*host)))) + return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; @@ -866,7 +859,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->ref = 1; host->state = SCRIPTSTATE_CLOSED; - if (!(host->language = heap_strdupW(language))) + if (!(host->language = wcsdup(language))) { IActiveScriptSite_Release(&host->IActiveScriptSite_iface); return E_OUTOFMEMORY; @@ -990,10 +983,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) unsigned i; for (i = 0; i < This->member_cnt; i++) SysFreeString(This->members[i].name); - heap_free(This->members); + free(This->members); detach_script_hosts(&This->hosts); if (This->global) IDispatchEx_Release(&This->global->IDispatchEx_iface); - heap_free(This); + free(This); } return ref; } @@ -1197,13 +1190,14 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis IDispatch *script_dispatch; HRESULT hres; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; + if (!(obj = calloc(1, sizeof(*obj)))) + return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; list_init(&obj->hosts); - if (!(obj->global = heap_alloc(sizeof(*obj->global)))) + if (!(obj->global = malloc(sizeof(*obj->global)))) { IDispatchEx_Release(&obj->IDispatchEx_iface); return E_OUTOFMEMORY; @@ -1325,7 +1319,7 @@ static HRESULT read_xml_value(struct scriptlet_factory *factory, WCHAR **ret) HRESULT hres; hres = IXmlReader_GetValue(factory->xml_reader, &str, &len); if (FAILED(hres)) return hres; - if (!(*ret = heap_alloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(*ret = malloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(*ret, str, len * sizeof(WCHAR)); (*ret)[len] = 0; return S_OK; @@ -1414,7 +1408,7 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) size_t progid_len = wcslen(factory->progid); size_t version_len = wcslen(factory->version); - if (!(factory->versioned_progid = heap_alloc((progid_len + version_len + 2) * sizeof(WCHAR)))) + if (!(factory->versioned_progid = malloc((progid_len + version_len + 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(factory->versioned_progid, factory->progid, (progid_len + 1) * sizeof(WCHAR)); @@ -1476,13 +1470,13 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + if (!(member = malloc(sizeof(*member)))) return E_OUTOFMEMORY; member->type = member_type; hres = read_xml_value(factory, &member->name); if (FAILED(hres)) { - heap_free(member); + free(member); return hres; } @@ -1491,7 +1485,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) if (!wcsicmp(member_iter->name, member->name)) { FIXME("Duplicated member %s\n", debugstr_w(member->name)); - heap_free(member); + free(member); return E_FAIL; } } @@ -1530,7 +1524,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(parameter = heap_alloc_zero(sizeof(*parameter)))) return E_OUTOFMEMORY; + if (!(parameter = calloc(1, sizeof(*parameter)))) return E_OUTOFMEMORY; list_add_tail(&member->u.parameters, &parameter->entry); hres = read_xml_value(factory, &parameter->name); @@ -1639,7 +1633,7 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct return E_FAIL; } - if (!(script->body = heap_alloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(script->body = malloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; size = 0; for (;;) @@ -1651,12 +1645,12 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct if (hres == S_FALSE) break; if (size + 1 == buf_size) { - if (!(new_body = heap_realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(new_body = realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; script->body = new_body; } } script->body[size++] = 0; - if (size != buf_size) script->body = heap_realloc(script->body, size * sizeof(WCHAR)); + if (size != buf_size) script->body = realloc(script->body, size * sizeof(WCHAR)); TRACE("body %s\n", debugstr_w(script->body)); return expect_end_element(factory); @@ -1725,7 +1719,7 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH else if (is_xml_name(factory, L"script")) { struct scriptlet_script *script; - if (!(script = heap_alloc_zero(sizeof(*script)))) return E_OUTOFMEMORY; + if (!(script = calloc(1, sizeof(*script)))) return E_OUTOFMEMORY; list_add_tail(&factory->scripts, &script->entry); hres = parse_scriptlet_script(factory, script); if (FAILED(hres)) return hres; @@ -1803,33 +1797,33 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) { struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); list_remove(&member->entry); - heap_free(member->name); + free(member->name); if (member->type == MEMBER_METHOD) { while (!list_empty(&member->u.parameters)) { struct method_parameter *parameter = LIST_ENTRY(list_head(&member->u.parameters), struct method_parameter, entry); list_remove(&parameter->entry); - heap_free(parameter->name); - heap_free(parameter); + free(parameter->name); + free(parameter); } } - heap_free(member); + free(member); } while (!list_empty(&This->scripts)) { struct scriptlet_script *script = LIST_ENTRY(list_head(&This->scripts), struct scriptlet_script, entry); list_remove(&script->entry); - heap_free(script->language); - heap_free(script->body); - heap_free(script); + free(script->language); + free(script->body); + free(script); } - heap_free(This->classid_str); - heap_free(This->description); - heap_free(This->versioned_progid); - heap_free(This->progid); - heap_free(This->version); - heap_free(This); + free(This->classid_str); + free(This->description); + free(This->versioned_progid); + free(This->progid); + free(This->version); + free(This); } return ref; } @@ -1888,7 +1882,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto TRACE("%s\n", debugstr_w(url)); - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) { IClassFactory_Release(&factory->IClassFactory_iface); return E_OUTOFMEMORY; @@ -2517,11 +2511,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) WCHAR *url; HRESULT hres; - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(url = malloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; status = RegQueryValueW(HKEY_CLASSES_ROOT, key_name, url, &size); hres = create_scriptlet_factory(url, &factory); - heap_free(url); + free(url); if (FAILED(hres)) return hres; hres = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, ppv); -- 2.35.1

1 2

[PATCH] ntoskrnl.exe: Make USD pointers volatile to silent a warning.
by Rémi Bernon March 29, 2022

March 29, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 8f1aa4d45a3..05976c38b27 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -497,8 +497,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define SIB_BASE( sib, rex ) (((sib) & 7) | (((rex) & REX_B) ? 8 : 0)) /* keep in sync with dlls/ntdll/thread.c:thread_init */ -static const BYTE *wine_user_shared_data = (BYTE *)0x7ffe0000; -static const BYTE *user_shared_data = (BYTE *)0xfffff78000000000; +static const volatile BYTE *const volatile wine_user_shared_data = (BYTE *)0x7ffe0000; +static const volatile BYTE *const volatile user_shared_data = (BYTE *)0xfffff78000000000; static inline DWORD64 *get_int_reg( CONTEXT *context, int index ) { @@ -843,7 +843,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) ULONGLONG temp = 0; TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &temp, wine_user_shared_data + offset, data_size ); + memcpy( &temp, (BYTE *)wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV ); context->Rip += prefixlen + len + 2; return ExceptionContinueExecution; @@ -869,19 +869,19 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) switch (*instr) { case 0x8a: - store_reg_byte( context, instr[1], wine_user_shared_data + offset, + store_reg_byte( context, instr[1], (BYTE *)wine_user_shared_data + offset, rex, INSTR_OP_MOV ); break; case 0x8b: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_MOV ); break; case 0x0b: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_OR ); break; case 0x33: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_XOR ); break; } @@ -902,7 +902,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); + memcpy( &context->Rax, (BYTE *)wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution; } -- 2.35.1

2 4

[PATCH] dlls/{mciwave, winmm}: properly handle mmioRead/mmioWrite in case of errors
by Eric Pouech March 29, 2022

March 29, 2022

In C, an inequality comparison between a signed and an unsigned integer ends up with an unsigned comparison. So, force signed comparison to catch both case of errors and partial read operation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52628 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciwave/mciwave.c | 3 ++- dlls/winmm/mmio.c | 8 +++----- dlls/winmm/playsound.c | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1d9abce84a3..3bb271f66ec 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -291,7 +291,8 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) if (!pwfx) return MCIERR_OUT_OF_MEMORY; r = mmioRead(wmw->hFile, (HPSTR)pwfx, mmckInfo.cksize); - if (r < sizeof(PCMWAVEFORMAT)) { + /* forcing signed comparison to catch errors (negative value) as well */ + if (r < (LONG)sizeof(PCMWAVEFORMAT)) { HeapFree(GetProcessHeap(), 0, pwfx); return MCIERR_INVALID_FILE; } diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 352da62a215..3bcde1fe34b 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1231,10 +1231,8 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, while (TRUE) { - LONG ix; - - ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)); - if (ix < 2*sizeof(DWORD)) + /* forcing signed comparison to catch errors as well */ + if (mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)) < (LONG)(2*sizeof(DWORD))) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return ChunkNotFound\n"); @@ -1336,7 +1334,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ix = mmioWrite(hmmio, (LPSTR)lpck, size); TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); - if (ix < size) { + if (ix != size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); return MMIOERR_CANNOTWRITE; diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0858f958583..95131bddce6 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -361,7 +361,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) + /* forcing signed comparison to catch errors as well */ + if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < (LONG)sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

2 1

[PATCH] mciseq: Print data only when successfully read.
by Rémi Bernon March 29, 2022

March 29, 2022

This may lead to a uninitialized use of twd otherwise. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mciseq/mcimidi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 4211ed5ca4a..2d3c4975296 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -937,8 +937,8 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) if (TRACE_ON(mcimidi)) { WORD twd; - MIDI_mciReadWord(wmm, &twd); /* == 0 */ - TRACE("Got sequence number %u\n", twd); + if (MIDI_mciReadWord(wmm, &twd)) WARN("Failed to read word\n"); + else TRACE("Got sequence number %u\n", twd); } break; case 0x01: /* any text */ -- 2.35.1

1 0