- Wine-Commits - list.winehq.org

Paul Gofman : wmic: Handle VariantChangeType() failures.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 97b9d8ddbec45ce674e5878802fa685bb8e21395 URL: https://gitlab.winehq.org/wine/wine/-/commit/97b9d8ddbec45ce674e5878802fa68… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 12:15:35 2022 -0600 wmic: Handle VariantChangeType() failures. wmic currently crashes on, e. g., VT_EMPTY or VT_ARRAY types returned. --- programs/wmic/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 72a54c09b57..ef3ca5fff4e 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -165,6 +165,19 @@ static HRESULT process_property_list( IWbemClassObject *obj, const WCHAR *propli return hr; } +static void convert_to_bstr( VARIANT *v ) +{ + VARTYPE vt; + + if (SUCCEEDED(VariantChangeType( v, v, 0, VT_BSTR ))) return; + vt = V_VT(v); + VariantClear( v ); + V_VT(v) = VT_BSTR; + V_BSTR(v) = SysAllocString( L"" ); + if (vt != VT_NULL && vt != VT_EMPTY) + WINE_FIXME( "Could not convert variant, vt %u.\n", vt ); +} + static int query_prop( const WCHAR *class, const WCHAR *propnames ) { HRESULT hr; @@ -227,7 +240,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, &name, &v, NULL, NULL ) == S_OK) { - VariantChangeType( &v, &v, 0, VT_BSTR ); + convert_to_bstr( &v ); width = max( lstrlenW( V_BSTR( &v ) ), width ); VariantClear( &v ); SysFreeString( name ); @@ -261,7 +274,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, NULL, &v, NULL, NULL ) == S_OK) { - VariantChangeType( &v, &v, 0, VT_BSTR ); + convert_to_bstr( &v ); output_text( V_BSTR( &v ), width ); VariantClear( &v ); }

1 0

Paul Gofman : wmic: Call _BeginEnumeration() before iterating class object.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 85b84a949c08c54a173492664c7d15c98e0dd9a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/85b84a949c08c54a173492664c7d15… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 12:01:07 2022 -0600 wmic: Call _BeginEnumeration() before iterating class object. Otherwise enumeration fails on Windows. --- programs/wmic/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 2eb2895031e..72a54c09b57 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -224,6 +224,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; + IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, &name, &v, NULL, NULL ) == S_OK) { VariantChangeType( &v, &v, 0, VT_BSTR ); @@ -241,6 +242,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (count) { + IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, &name, NULL, NULL, NULL ) == S_OK) { output_text( name, width ); @@ -256,7 +258,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) { IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; - + IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, NULL, &v, NULL, NULL ) == S_OK) { VariantChangeType( &v, &v, 0, VT_BSTR );

1 0

Paul Gofman : wmic: Don't set WBEM_FLAG_FORWARD_ONLY flag on query.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 6412b3dc3ac9d5b22fb68ff68c22e3b798f97bbb URL: https://gitlab.winehq.org/wine/wine/-/commit/6412b3dc3ac9d5b22fb68ff68c22e3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 11:58:20 2022 -0600 wmic: Don't set WBEM_FLAG_FORWARD_ONLY flag on query. The result access is not forward only. --- programs/wmic/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index cfc20e45ffd..2eb2895031e 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -171,7 +171,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IWbemLocator *locator = NULL; IWbemServices *services = NULL; IEnumWbemClassObject *result = NULL; - LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; + LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY; BSTR path = NULL, wql = NULL, query = NULL, name, str = NULL; WCHAR *proplist = NULL; int len, ret = -1;

1 0

Alex Henrie : mshtml: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

1 0

Alexandre Julliard : wineusb.sys: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: e7caf5a68728421c7514875d012dab7df6fc689a URL: https://gitlab.winehq.org/wine/wine/-/commit/e7caf5a68728421c7514875d012dab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:34:28 2022 +0100 wineusb.sys: Use the Unix call helpers. --- dlls/wineusb.sys/wineusb.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 63b723503c9..e9e91326a84 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -66,8 +66,6 @@ __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, DECLARE_CRITICAL_SECTION(wineusb_cs); -static unixlib_handle_t unix_handle; - static struct list device_list = LIST_INIT(device_list); struct usb_device @@ -99,7 +97,7 @@ static void destroy_unix_device(struct unix_device *unix_device) .device = unix_device, }; - __wine_unix_call(unix_handle, unix_usb_destroy_device, &params); + WINE_UNIX_CALL(unix_usb_destroy_device, &params); } static void add_unix_device(const struct usb_add_device_event *event) @@ -171,7 +169,7 @@ static HANDLE libusb_event_thread, event_thread; static DWORD CALLBACK libusb_event_thread_proc(void *arg) { - __wine_unix_call(unix_handle, unix_usb_main_loop, NULL); + WINE_UNIX_CALL(unix_usb_main_loop, NULL); return 0; } @@ -199,7 +197,7 @@ static DWORD CALLBACK event_thread_proc(void *arg) .event = &event, }; - __wine_unix_call(unix_handle, unix_usb_get_event, &params); + WINE_UNIX_CALL(unix_usb_get_event, &params); switch (event.type) { @@ -282,7 +280,7 @@ static NTSTATUS fdo_pnp(IRP *irp) { struct usb_device *device, *cursor; - __wine_unix_call(unix_handle, unix_usb_exit, NULL); + WINE_UNIX_CALL(unix_usb_exit, NULL); WaitForSingleObject(libusb_event_thread, INFINITE); CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE); @@ -536,7 +534,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) .transfer = queued_irp->Tail.Overlay.DriverContext[0], }; - __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); + WINE_UNIX_CALL(unix_usb_cancel_transfer, &params); } LeaveCriticalSection(&wineusb_cs); @@ -560,7 +558,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) * completion between submitting and queuing, we won't try to * dequeue the IRP until it's actually been queued. */ EnterCriticalSection(&wineusb_cs); - status = __wine_unix_call(unix_handle, unix_usb_submit_urb, &params); + status = WINE_UNIX_CALL(unix_usb_submit_urb, &params); if (status == STATUS_PENDING) { IoMarkIrpPending(irp); @@ -644,13 +642,10 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { NTSTATUS status; - void *instance; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlPcToFileHeader(DriverEntry, &instance); - if ((status = NtQueryVirtualMemory(GetCurrentProcess(), instance, - MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL))) + if ((status = __wine_init_unix_call())) { ERR("Failed to initialize Unix library, status %#lx.\n", status); return status;

1 0

Alexandre Julliard : nsiproxy.sys: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 2a366cddd71fed2148a4e6fd0fe28312421e13e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a366cddd71fed2148a4e6fd0fe283… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:33:45 2022 +0100 nsiproxy.sys: Use the Unix call helpers. --- dlls/nsiproxy.sys/device.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 7aba1f0c36f..4528e934991 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -37,7 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); -static unixlib_handle_t nsiproxy_handle; static HANDLE request_event; #define DECLARE_CRITICAL_SECTION(cs) \ @@ -53,7 +52,7 @@ static LIST_ENTRY request_queue = LIST_ENTRY_INIT( request_queue ); static NTSTATUS nsiproxy_call( unsigned int code, void *args ) { - return __wine_unix_call( nsiproxy_handle, code, args ); + return WINE_UNIX_CALL( code, args ); } enum unix_calls @@ -425,15 +424,12 @@ static DWORD WINAPI request_thread_proc( void *arg ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { - HMODULE instance; NTSTATUS status; HANDLE thread; TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); - RtlPcToFileHeader( &DriverEntry, (void *)&instance ); - status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &nsiproxy_handle, sizeof(nsiproxy_handle), NULL ); + status = __wine_init_unix_call(); if (status) return status; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl;

1 0

Alexandre Julliard : winebus.sys: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 4510e490e9392c3326241de7c587c990f249614f URL: https://gitlab.winehq.org/wine/wine/-/commit/4510e490e9392c3326241de7c587c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:34:04 2022 +0100 winebus.sys: Use the Unix call helpers. --- dlls/winebus.sys/main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 35f84bd9e29..c02f786a11f 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -100,12 +100,9 @@ static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static struct list device_list = LIST_INIT(device_list); -static HMODULE instance; -static unixlib_handle_t winebus_handle; - static NTSTATUS winebus_call(unsigned int code, void *args) { - return __wine_unix_call(winebus_handle, code, args); + return WINE_UNIX_CALL(code, args); } static void unix_device_remove(DEVICE_OBJECT *device) @@ -1181,10 +1178,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); - RtlPcToFileHeader(&DriverEntry, (void *)&instance); - if ((ret = NtQueryVirtualMemory(GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &winebus_handle, sizeof(winebus_handle), NULL))) - return ret; + if ((ret = __wine_init_unix_call())) return ret; attr.Length = sizeof(attr); attr.ObjectName = path;

1 0

Alexandre Julliard : mountmgr.sys: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 14d411b8a097fa3b335750d0b04a47f2525d6058 URL: https://gitlab.winehq.org/wine/wine/-/commit/14d411b8a097fa3b335750d0b04a47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:33:23 2022 +0100 mountmgr.sys: Use the Unix call helpers. --- dlls/mountmgr.sys/mountmgr.c | 7 +------ dlls/mountmgr.sys/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 66034621b44..b67082229f6 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -46,8 +46,6 @@ struct mount_point static struct list mount_points_list = LIST_INIT(mount_points_list); static HKEY mount_key; -unixlib_handle_t mountmgr_handle = 0; - void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) { RtlFreeHeap( GetProcessHeap(), 0, mount->id ); @@ -620,7 +618,6 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) #ifdef _WIN64 HKEY wow64_ports_key = NULL; #endif - void *instance; UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; HKEY devicemap_key; @@ -629,9 +626,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) TRACE( "%s\n", debugstr_w(path->Buffer) ); - RtlPcToFileHeader( DriverEntry, &instance ); - status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &mountmgr_handle, sizeof(mountmgr_handle), NULL ); + status = __wine_init_unix_call(); if (status) return status; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = mountmgr_ioctl; diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index d70371876fa..efbce71b979 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -174,9 +174,7 @@ enum mountmgr_funcs unix_enumerate_credentials, }; -extern unixlib_handle_t mountmgr_handle; - -#define MOUNTMGR_CALL( func, params ) __wine_unix_call( mountmgr_handle, unix_ ## func, params ) +#define MOUNTMGR_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) extern void queue_device_op( enum device_op op, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid,

1 0

Alexandre Julliard : winecoreaudio.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: c372caaebceff9fe751b122ff30a1b9797101cdc URL: https://gitlab.winehq.org/wine/wine/-/commit/c372caaebceff9fe751b122ff30a1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:31:49 2022 +0100 winecoreaudio.drv: Use the Unix call helpers. --- dlls/winecoreaudio.drv/mmdevdrv.c | 5 +---- dlls/winecoreaudio.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6715ab72e88..367f7ba0ab8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -unixlib_handle_t coreaudio_handle = 0; - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -199,8 +197,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(dll); - if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &coreaudio_handle, sizeof(coreaudio_handle), NULL)) + if (__wine_init_unix_call()) return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index caa352d2dfa..1ff4a0bac24 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -33,6 +33,4 @@ NTSTATUS unix_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS unix_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif -extern unixlib_handle_t coreaudio_handle; - -#define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, func, params ) +#define UNIX_CALL( func, params ) WINE_UNIX_CALL( func, params )

1 0

Alex Henrie : pdh: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: ed510dd900a6feb57f280b0d10ee2a61b7873fe8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed510dd900a6feb57f280b0d10ee2a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 23 21:43:11 2022 -0700 pdh: Use standard C functions for memory allocation. --- dlls/pdh/pdh_main.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 3fc3f7bc6b8..7eae7872b48 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <math.h> #define NONAMELESSUNION @@ -32,7 +33,6 @@ #include "winperf.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(pdh); @@ -47,15 +47,6 @@ static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug = }; static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 }; -static inline WCHAR *pdh_strdup( const WCHAR *src ) -{ - WCHAR *dst; - - if (!src) return NULL; - if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); - return dst; -} - static inline WCHAR *pdh_strdup_aw( const char *src ) { int len; @@ -63,7 +54,7 @@ static inline WCHAR *pdh_strdup_aw( const char *src ) if (!src) return NULL; len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); - if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + if ((dst = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); return dst; } @@ -98,7 +89,7 @@ static struct counter *create_counter( void ) { struct counter *counter; - if ((counter = heap_alloc_zero( sizeof(struct counter) ))) + if ((counter = calloc( 1, sizeof(struct counter) ))) { counter->magic = PDH_MAGIC_COUNTER; return counter; @@ -109,8 +100,8 @@ static struct counter *create_counter( void ) static void destroy_counter( struct counter *counter ) { counter->magic = 0; - heap_free( counter->path ); - heap_free( counter ); + free( counter->path ); + free( counter ); } #define PDH_MAGIC_QUERY 0x50444830 /* 'PDH0' */ @@ -130,7 +121,7 @@ static struct query *create_query( void ) { struct query *query; - if ((query = heap_alloc_zero( sizeof(struct query) ))) + if ((query = calloc( 1, sizeof(struct query) ))) { query->magic = PDH_MAGIC_QUERY; list_init( &query->counters ); @@ -142,7 +133,7 @@ static struct query *create_query( void ) static void destroy_query( struct query *query ) { query->magic = 0; - heap_free( query ); + free( query ); } struct source @@ -222,7 +213,7 @@ PDH_STATUS WINAPI PdhAddCounterA( PDH_HQUERY query, LPCSTR path, ret = PdhAddCounterW( query, pathW, userdata, counter ); - heap_free( pathW ); + free( pathW ); return ret; } @@ -254,7 +245,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, { if ((counter = create_counter())) { - counter->path = pdh_strdup( counter_sources[i].path ); + counter->path = wcsdup( counter_sources[i].path ); counter->collect = counter_sources[i].collect; counter->type = counter_sources[i].type; counter->defaultscale = counter_sources[i].scale; @@ -822,8 +813,8 @@ PDH_STATUS WINAPI PdhLookupPerfIndexByNameA( LPCSTR machine, LPCSTR name, LPDWOR ret = PdhLookupPerfIndexByNameW( machineW, nameW, index ); - heap_free( nameW ); - heap_free( machineW ); + free( nameW ); + free( machineW ); return ret; } @@ -878,7 +869,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR else WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, required, NULL, NULL ); *size = required; } - heap_free( machineW ); + free( machineW ); return ret; } @@ -934,7 +925,7 @@ PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY * if (source && !(sourceW = pdh_strdup_aw( source ))) return PDH_MEMORY_ALLOCATION_FAILURE; ret = PdhOpenQueryW( sourceW, userdata, query ); - heap_free( sourceW ); + free( sourceW ); return ret; } @@ -1030,7 +1021,7 @@ PDH_STATUS WINAPI PdhValidatePathA( LPCSTR path ) ret = PdhValidatePathW( pathW ); - heap_free( pathW ); + free( pathW ); return ret; } @@ -1128,7 +1119,7 @@ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buf ret = PdhMakeCounterPathW( &eW, NULL, &buflenW, flags ); if (ret == PDH_MORE_DATA) { - if ((bufferW = heap_alloc( buflenW * sizeof(WCHAR) ))) + if ((bufferW = malloc( buflenW * sizeof(WCHAR) ))) { if (!(ret = PdhMakeCounterPathW( &eW, bufferW, &buflenW, flags ))) { @@ -1137,18 +1128,18 @@ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buf else ret = PDH_MORE_DATA; *buflen = len; } - heap_free( bufferW ); + free( bufferW ); } else ret = PDH_MEMORY_ALLOCATION_FAILURE; } done: - heap_free( eW.szMachineName ); - heap_free( eW.szObjectName ); - heap_free( eW.szInstanceName ); - heap_free( eW.szParentInstance ); - heap_free( eW.szCounterName ); + free( eW.szMachineName ); + free( eW.szObjectName ); + free( eW.szInstanceName ); + free( eW.szParentInstance ); + free( eW.szCounterName ); return ret; }

1 0