[PATCH 0/2] MR1359: localspl: Use CRT allocation functions.
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/localspl/localmon.c | 6 ++-- dlls/localspl/provider.c | 70 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 5b64c7061ee..9b72b9403df 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -498,7 +498,7 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) type = get_type_from_local_name(pName); if (!type) return FALSE; - port = heap_alloc(FIELD_OFFSET(port_t, nameW[lstrlenW(pName) + 1])); + port = heap_alloc(FIELD_OFFSET(port_t, nameW[wcslen(pName) + 1])); if (!port) return FALSE; port->type = type; @@ -679,7 +679,7 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE ptr = ((xcv_t *)hXcv)->nameW; } lstrcpynW(buffer, ptr, ARRAY_SIZE(buffer)); - if (buffer[0]) buffer[lstrlenW(buffer)-1] = '\0'; /* remove the ':' */ + if (buffer[0]) buffer[wcslen(buffer)-1] = '\0'; /* remove the ':' */ res = SetDefaultCommConfigW(buffer, (LPCOMMCONFIG) pInputData, cbInputData); TRACE("got %lu with %lu\n", res, GetLastError() ); return res ? ERROR_SUCCESS : GetLastError(); @@ -710,7 +710,7 @@ static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess TRACE("%s, 0x%lx, %p)\n", debugstr_w(pName), GrantedAccess, phXcv); /* No checks for any field is done in Windows */ - xcv = heap_alloc(FIELD_OFFSET(xcv_t, nameW[lstrlenW(pName) + 1])); + xcv = heap_alloc(FIELD_OFFSET(xcv_t, nameW[wcslen(pName) + 1])); if (xcv) { xcv->GrantedAccess = GrantedAccess; lstrcpyW(xcv->nameW, pName); diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ca8dc5fbe78..c6a8e635cc3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -287,7 +287,7 @@ static LPWSTR strdupW(LPCWSTR p) DWORD len; if(!p) return NULL; - len = (lstrlenW(p) + 1) * sizeof(WCHAR); + len = (wcslen(p) + 1) * sizeof(WCHAR); ret = heap_alloc(len); if (ret) memcpy(ret, p, len); return ret; @@ -360,7 +360,7 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) server = &name[2]; /* skip over both backslash, find separator '\' */ ptr = wcschr(server, '\\'); - serverlen = (ptr) ? ptr - server : lstrlenW(server); + serverlen = (ptr) ? ptr - server : wcslen(server); /* servername is empty */ if (serverlen == 0) return 0; @@ -596,7 +596,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) DWORD len; if (name) { - len = lstrlenW(monitorsW) + lstrlenW(name) + 2; + len = wcslen(monitorsW) + wcslen(name) + 2; regroot = heap_alloc(len * sizeof(WCHAR)); } @@ -847,7 +847,7 @@ static monitor_t * monitor_load_by_port(LPCWSTR portname) RegCloseKey(hroot); } - len = MAX_PATH + lstrlenW(L"\\Ports\\") + lstrlenW(portname) + 1; + len = MAX_PATH + wcslen(L"\\Ports\\") + wcslen(portname) + 1; buffer = heap_alloc(len * sizeof(WCHAR)); if (buffer == NULL) return NULL; @@ -859,7 +859,7 @@ static monitor_t * monitor_load_by_port(LPCWSTR portname) buffer[0] = '\0'; RegEnumKeyW(hroot, id, buffer, MAX_PATH); TRACE("testing %s\n", debugstr_w(buffer)); - len = lstrlenW(buffer); + len = wcslen(buffer); lstrcatW(buffer, L"\\Ports\\"); lstrcatW(buffer, portname); if (RegOpenKeyW(hroot, buffer, &hport) == ERROR_SUCCESS) { @@ -887,7 +887,7 @@ static int multi_sz_lenW(const WCHAR *str) if (!str) return 0; do { - ptr += lstrlenW(ptr) + 1; + ptr += wcslen(ptr) + 1; } while (*ptr); return (ptr - str + 1) * sizeof(WCHAR); @@ -999,10 +999,10 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW if (dllname[0]) { numentries++; needed += entrysize; - needed += (len+1) * sizeof(WCHAR); /* len is lstrlenW(monitorname) */ + needed += (len+1) * sizeof(WCHAR); /* len is wcslen(monitorname) */ if (level > 1) { /* we install and return only monitors for "Windows NT x86" */ - needed += (lstrlenW(x86_envnameW) +1) * sizeof(WCHAR); + needed += (wcslen(x86_envnameW) +1) * sizeof(WCHAR); needed += dllsize; } @@ -1014,11 +1014,11 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW TRACE("%p: writing MONITOR_INFO_%ldW #%ld\n", mi, level, numentries); mi->pName = ptr; lstrcpyW(ptr, buffer); /* Name of the Monitor */ - ptr += (len+1); /* len is lstrlenW(monitorname) */ + ptr += (len+1); /* len is wcslen(monitorname) */ if (level > 1) { mi->pEnvironment = ptr; lstrcpyW(ptr, x86_envnameW); /* fixed to "Windows NT x86" */ - ptr += (lstrlenW(x86_envnameW)+1); + ptr += (wcslen(x86_envnameW)+1); mi->pDLLName = ptr; lstrcpyW(ptr, dllname); /* Name of the Driver-DLL */ @@ -1099,7 +1099,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb if (dllname[0]) { numentries++; needed += sizeof(PRINTPROCESSOR_INFO_1W); - needed += (len+1) * sizeof(WCHAR); /* len is lstrlenW(printprocessor name) */ + needed += (len+1) * sizeof(WCHAR); /* len is wcslen(printprocessor name) */ /* required size is calculated. Now fill the user-buffer */ if (pPPInfo && (cbBuf >= needed)){ @@ -1109,7 +1109,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%ld\n", ppi, numentries); ppi->pName = ptr; lstrcpyW(ptr, buffer); /* Name of the Print Processor */ - ptr += (len+1); /* len is lstrlenW(printprosessor name) */ + ptr += (len+1); /* len is wcslen(printprosessor name) */ } } index++; @@ -1197,15 +1197,15 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf out = (LPPORT_INFO_2W) &pPorts[outindex * entrysize]; out->pPortName = ptr; lstrcpyW(ptr, cache->pPortName); - ptr += (lstrlenW(ptr)+1); + ptr += (wcslen(ptr)+1); if (level > 1) { out->pMonitorName = ptr; lstrcpyW(ptr, cache->pMonitorName); - ptr += (lstrlenW(ptr)+1); + ptr += (wcslen(ptr)+1); out->pDescription = ptr; lstrcpyW(ptr, cache->pDescription); - ptr += (lstrlenW(ptr)+1); + ptr += (wcslen(ptr)+1); out->fPortType = cache->fPortType; out->Reserved = cache->Reserved; } @@ -1246,7 +1246,7 @@ static HKEY open_driver_reg(LPCWSTR pEnvironment) if (!env) return NULL; buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(fmt_driversW) + - (lstrlenW(env->envname) + lstrlenW(env->versionregpath)) * sizeof(WCHAR)); + (wcslen(env->envname) + wcslen(env->versionregpath)) * sizeof(WCHAR)); if (buffer) { wsprintfW(buffer, fmt_driversW, env->envname, env->versionregpath); @@ -1306,9 +1306,9 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment /* GetSystemDirectoryW returns number of WCHAR including the '\0' */ needed = GetSystemDirectoryW(NULL, 0); /* add the Size for the Subdirectories */ - needed += lstrlenW(L"\\spool"); - needed += lstrlenW(L"\\drivers\\"); - needed += lstrlenW(env->subdir); + needed += wcslen(L"\\spool"); + needed += wcslen(L"\\drivers\\"); + needed += wcslen(env->subdir); needed *= sizeof(WCHAR); /* return-value is size in Bytes */ *pcbNeeded = needed; @@ -1356,7 +1356,7 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) /* build the driverdir */ len = sizeof(fullname) - - (lstrlenW(env->versionsubdir) + 1 + lstrlenW(dllname) + 1) * sizeof(WCHAR); + (wcslen(env->versionsubdir) + 1 + wcslen(dllname) + 1) * sizeof(WCHAR); if (!fpGetPrinterDriverDirectory(NULL, (LPWSTR) env->envname, 1, (LPBYTE) fullname, len, &len)) { @@ -1575,10 +1575,10 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo } memcpy(apd.dst, apd.src, len); lstrcatW(apd.src, L"\\"); - apd.srclen = lstrlenW(apd.src); + apd.srclen = wcslen(apd.src); lstrcatW(apd.dst, env->versionsubdir); lstrcatW(apd.dst, L"\\"); - apd.dstlen = lstrlenW(apd.dst); + apd.dstlen = wcslen(apd.dst); apd.copyflags = dwFileCopyFlags; apd.lazy = lazy; CreateDirectoryW(apd.src, NULL); @@ -1607,22 +1607,22 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo sizeof(DWORD)); file = get_file_part( di.pDriverPath ); - RegSetValueExW( hdrv, L"Driver", 0, REG_SZ, (BYTE*)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, L"Driver", 0, REG_SZ, (BYTE*)file, (wcslen( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pDriverPath, file, &apd ); file = get_file_part( di.pDataFile ); - RegSetValueExW( hdrv, L"Data File", 0, REG_SZ, (BYTE*)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, L"Data File", 0, REG_SZ, (BYTE*)file, (wcslen( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pDataFile, file, &apd ); file = get_file_part( di.pConfigFile ); - RegSetValueExW( hdrv, L"Configuration File", 0, REG_SZ, (BYTE*)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, L"Configuration File", 0, REG_SZ, (BYTE*)file, (wcslen( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pConfigFile, file, &apd ); /* settings for level 3 */ if (di.pHelpFile) { file = get_file_part( di.pHelpFile ); - RegSetValueExW( hdrv, L"Help File", 0, REG_SZ, (BYTE*)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, L"Help File", 0, REG_SZ, (BYTE*)file, (wcslen( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pHelpFile, file, &apd ); } else @@ -1633,10 +1633,10 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo WCHAR *reg, *reg_ptr, *in_ptr; reg = reg_ptr = HeapAlloc( GetProcessHeap(), 0, multi_sz_lenW( di.pDependentFiles ) ); - for (in_ptr = di.pDependentFiles; *in_ptr; in_ptr += lstrlenW( in_ptr ) + 1) + for (in_ptr = di.pDependentFiles; *in_ptr; in_ptr += wcslen( in_ptr ) + 1) { file = get_file_part( in_ptr ); - len = lstrlenW( file ) + 1; + len = wcslen( file ) + 1; memcpy( reg_ptr, file, len * sizeof(WCHAR) ); reg_ptr += len; apd_copyfile( in_ptr, file, &apd ); @@ -1652,13 +1652,13 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo /* The language-Monitor was already copied by the caller to "%SystemRoot%\system32" */ if (di.pMonitorName) RegSetValueExW(hdrv, L"Monitor", 0, REG_SZ, (BYTE*)di.pMonitorName, - (lstrlenW(di.pMonitorName)+1)* sizeof(WCHAR)); + (wcslen(di.pMonitorName)+1)* sizeof(WCHAR)); else RegSetValueExW(hdrv, L"Monitor", 0, REG_SZ, (const BYTE*)L"", sizeof(L"")); if (di.pDefaultDataType) RegSetValueExW(hdrv, L"Datatype", 0, REG_SZ, (BYTE*)di.pDefaultDataType, - (lstrlenW(di.pDefaultDataType)+1)* sizeof(WCHAR)); + (wcslen(di.pDefaultDataType)+1)* sizeof(WCHAR)); else RegSetValueExW(hdrv, L"Datatype", 0, REG_SZ, (const BYTE*)L"", sizeof(L"")); @@ -1770,7 +1770,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) else { INT len; - len = (lstrlenW(mi2w->pDLLName) +1) * sizeof(WCHAR); + len = (wcslen(mi2w->pDLLName) +1) * sizeof(WCHAR); res = (RegSetValueExW(hentry, L"Driver", 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); @@ -2447,7 +2447,7 @@ static BOOL WINAPI fpEnumPrintProcessors(LPWSTR pName, LPWSTR pEnvironment, DWOR goto epp_cleanup; /* ERROR_INVALID_ENVIRONMENT */ regpathW = heap_alloc(sizeof(fmt_printprocessorsW) + - (lstrlenW(env->envname) * sizeof(WCHAR))); + (wcslen(env->envname) * sizeof(WCHAR))); if (!regpathW) goto epp_cleanup; @@ -2529,8 +2529,8 @@ static BOOL WINAPI fpGetPrintProcessorDirectory(LPWSTR pName, LPWSTR pEnvironmen /* GetSystemDirectoryW returns number of WCHAR including the '\0' */ needed = GetSystemDirectoryW(NULL, 0); /* add the Size for the Subdirectories */ - needed += lstrlenW(L"\\spool\\prtprocs\\"); - needed += lstrlenW(env->subdir); + needed += wcslen(L"\\spool\\prtprocs\\"); + needed += wcslen(env->subdir); needed *= sizeof(WCHAR); /* return-value is size in Bytes */ *pcbNeeded = needed; @@ -2664,7 +2664,7 @@ static void fill_builtin_form_info( BYTE **base, WCHAR **strings, const struct b DWORD size, DWORD *used ) { FORM_INFO_2W *info = *(FORM_INFO_2W**)base; - DWORD name_len = lstrlenW( form->name ) + 1, res_len, keyword_len, total_size; + DWORD name_len = wcslen( form->name ) + 1, res_len, keyword_len, total_size; static const WCHAR dll_name[] = L"localspl.dll"; const WCHAR *resource; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1359
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/localspl/localmon.c | 19 +++++++------- dlls/localspl/provider.c | 56 ++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 9b72b9403df..381b36dd2e2 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -34,7 +34,6 @@ #include "localspl_private.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" @@ -117,7 +116,7 @@ static BOOL does_port_exist(LPCWSTR myname) TRACE("(%s)\n", debugstr_w(myname)); id = EnumPortsW(NULL, 1, NULL, 0, &needed, &returned); - pi = heap_alloc(needed); + pi = malloc(needed); returned = 0; if (pi) id = EnumPortsW(NULL, 1, (LPBYTE) pi, needed, &needed, &returned); @@ -128,13 +127,13 @@ static BOOL does_port_exist(LPCWSTR myname) { if (lstrcmpiW(myname, pi[id].pName) == 0) { TRACE("(%lu) found %s\n", id, debugstr_w(pi[id].pName)); - heap_free(pi); + free(pi); return TRUE; } } } - heap_free(pi); + free(pi); return FALSE; } @@ -306,7 +305,7 @@ static DWORD get_type_from_local_name(LPCWSTR nameW) TRACE("(%s)\n", debugstr_w(myname)); needed = get_ports_from_reg(1, NULL, 0, &numentries); - pi = heap_alloc(needed); + pi = malloc(needed); if (pi) needed = get_ports_from_reg(1, (LPBYTE) pi, needed, &numentries); @@ -325,7 +324,7 @@ static DWORD get_type_from_local_name(LPCWSTR nameW) id = (myname) ? get_type_from_name(myname) : PORT_IS_UNKNOWN; - heap_free(pi); + free(pi); return id; } @@ -407,7 +406,7 @@ static BOOL WINAPI localmon_ClosePort(HANDLE hPort) EnterCriticalSection(&port_handles_cs); list_remove(&port->entry); LeaveCriticalSection(&port_handles_cs); - heap_free(port); + free(port); return TRUE; } @@ -498,7 +497,7 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) type = get_type_from_local_name(pName); if (!type) return FALSE; - port = heap_alloc(FIELD_OFFSET(port_t, nameW[wcslen(pName) + 1])); + port = malloc(FIELD_OFFSET(port_t, nameW[wcslen(pName) + 1])); if (!port) return FALSE; port->type = type; @@ -535,7 +534,7 @@ static BOOL WINAPI localmon_XcvClosePort(HANDLE hXcv) EnterCriticalSection(&xcv_handles_cs); list_remove(&xcv->entry); LeaveCriticalSection(&xcv_handles_cs); - heap_free(xcv); + free(xcv); return TRUE; } @@ -710,7 +709,7 @@ static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess TRACE("%s, 0x%lx, %p)\n", debugstr_w(pName), GrantedAccess, phXcv); /* No checks for any field is done in Windows */ - xcv = heap_alloc(FIELD_OFFSET(xcv_t, nameW[wcslen(pName) + 1])); + xcv = malloc(FIELD_OFFSET(xcv_t, nameW[wcslen(pName) + 1])); if (xcv) { xcv->GrantedAccess = GrantedAccess; lstrcpyW(xcv->nameW, pName); diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c6a8e635cc3..4faf38c9c61 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #define COBJMACROS @@ -33,7 +34,6 @@ #include "ddk/winsplp.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #include "localspl_private.h" @@ -288,7 +288,7 @@ static LPWSTR strdupW(LPCWSTR p) if(!p) return NULL; len = (wcslen(p) + 1) * sizeof(WCHAR); - ret = heap_alloc(len); + ret = malloc(len); if (ret) memcpy(ret, p, len); return ret; } @@ -432,9 +432,9 @@ static void monitor_unload(monitor_t * pm) pm->monitor.pfnShutdown(pm->hmon); FreeLibrary(pm->hdll); - heap_free(pm->name); - heap_free(pm->dllname); - heap_free(pm); + free(pm->name); + free(pm->dllname); + free(pm); } LeaveCriticalSection(&monitor_handles_cs); } @@ -585,7 +585,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) } if (pm == NULL) { - pm = heap_alloc_zero(sizeof(monitor_t)); + pm = calloc(1, sizeof(monitor_t)); if (pm == NULL) goto cleanup; list_add_tail(&monitor_handles, &pm->entry); } @@ -597,7 +597,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (name) { len = wcslen(monitorsW) + wcslen(name) + 2; - regroot = heap_alloc(len * sizeof(WCHAR)); + regroot = malloc(len * sizeof(WCHAR)); } if (regroot) { @@ -609,7 +609,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) DWORD namesize; if (RegQueryValueExW(hroot, L"Driver", NULL, NULL, NULL, &namesize) == ERROR_SUCCESS) { - driver = heap_alloc(namesize); + driver = malloc(namesize); RegQueryValueExW(hroot, L"Driver", NULL, NULL, (BYTE*)driver, &namesize); } } @@ -734,9 +734,9 @@ cleanup: pm_localport = pm; } LeaveCriticalSection(&monitor_handles_cs); - if (driver != dllname) heap_free(driver); + if (driver != dllname) free(driver); if (hroot) RegCloseKey(hroot); - heap_free(regroot); + free(regroot); TRACE("=> %p\n", pm); return pm; } @@ -848,7 +848,7 @@ static monitor_t * monitor_load_by_port(LPCWSTR portname) } len = MAX_PATH + wcslen(L"\\Ports\\") + wcslen(portname) + 1; - buffer = heap_alloc(len * sizeof(WCHAR)); + buffer = malloc(len * sizeof(WCHAR)); if (buffer == NULL) return NULL; if (RegOpenKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) == ERROR_SUCCESS) { @@ -872,7 +872,7 @@ static monitor_t * monitor_load_by_port(LPCWSTR portname) LeaveCriticalSection(&monitor_handles_cs); RegCloseKey(hroot); } - heap_free(buffer); + free(buffer); return pm; } @@ -1177,9 +1177,9 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf pi_returned = 0; res = wrap_EnumPorts(pm, NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { - /* Do not use heap_realloc (we do not need the old data in the buffer) */ - heap_free(pi_buffer); - pi_buffer = heap_alloc(pi_needed); + /* Do not use realloc (we do not need the old data in the buffer) */ + free(pi_buffer); + pi_buffer = malloc(pi_needed); pi_allocated = (pi_buffer) ? pi_needed : 0; res = wrap_EnumPorts(pm, NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); } @@ -1216,7 +1216,7 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf } } /* the temporary portinfo-buffer is no longer needed */ - heap_free(pi_buffer); + free(pi_buffer); *lpreturned = numentries; TRACE("need %ld byte for %ld entries\n", needed, numentries); @@ -1245,13 +1245,13 @@ static HKEY open_driver_reg(LPCWSTR pEnvironment) env = validate_envW(pEnvironment); if (!env) return NULL; - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(fmt_driversW) + - (wcslen(env->envname) + wcslen(env->versionregpath)) * sizeof(WCHAR)); + buffer = malloc(sizeof(fmt_driversW) + + (wcslen(env->envname) + wcslen(env->versionregpath)) * sizeof(WCHAR)); if (buffer) { wsprintfW(buffer, fmt_driversW, env->envname, env->versionregpath); RegCreateKeyW(HKEY_LOCAL_MACHINE, buffer, &retval); - HeapFree(GetProcessHeap(), 0, buffer); + free(buffer); } return retval; } @@ -1389,9 +1389,9 @@ static VOID printer_free(printer_t * printer) monitor_unload(printer->pm); - heap_free(printer->printername); - heap_free(printer->name); - heap_free(printer); + free(printer->printername); + free(printer->name); + free(printer); } /****************************************************************** @@ -1423,7 +1423,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) return NULL; } - printer = heap_alloc_zero(sizeof(printer_t)); + printer = calloc(1, sizeof(printer_t)); if (!printer) goto end; /* clone the base name. This is NULL for the printserver */ @@ -1631,7 +1631,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo if (di.pDependentFiles && *di.pDependentFiles) { WCHAR *reg, *reg_ptr, *in_ptr; - reg = reg_ptr = HeapAlloc( GetProcessHeap(), 0, multi_sz_lenW( di.pDependentFiles ) ); + reg = reg_ptr = malloc( multi_sz_lenW( di.pDependentFiles ) ); for (in_ptr = di.pDependentFiles; *in_ptr; in_ptr += wcslen( in_ptr ) + 1) { @@ -1644,7 +1644,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo *reg_ptr = 0; RegSetValueExW( hdrv, L"Dependent Files", 0, REG_MULTI_SZ, (BYTE*)reg, (reg_ptr - reg + 1) * sizeof(WCHAR) ); - HeapFree( GetProcessHeap(), 0, reg ); + free( reg ); } else RegSetValueExW(hdrv, L"Dependent Files", 0, REG_MULTI_SZ, (const BYTE*)L"", sizeof(L"")); @@ -2446,8 +2446,8 @@ static BOOL WINAPI fpEnumPrintProcessors(LPWSTR pName, LPWSTR pEnvironment, DWOR if (!env) goto epp_cleanup; /* ERROR_INVALID_ENVIRONMENT */ - regpathW = heap_alloc(sizeof(fmt_printprocessorsW) + - (wcslen(env->envname) * sizeof(WCHAR))); + regpathW = malloc(sizeof(fmt_printprocessorsW) + + (wcslen(env->envname) * sizeof(WCHAR))); if (!regpathW) goto epp_cleanup; @@ -2469,7 +2469,7 @@ static BOOL WINAPI fpEnumPrintProcessors(LPWSTR pName, LPWSTR pEnvironment, DWOR res = TRUE; epp_cleanup: - heap_free(regpathW); + free(regpathW); if (pcbNeeded) *pcbNeeded = needed; if (pcReturned) *pcReturned = numentries; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1359
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=126147 Your paranoid android. === debian11 (32 bit report) === crypt32: cert.c:4191: Test failed: success cert.c:4192: Test failed: got 00000000 cert.c:4193: Test failed: got 00000000
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1359
participants (4)
-
Huw Davies (＠huw) -
Marvin -
Piotr Caban
-
Piotr Caban (＠piotr)