December 2022 - Wine-commits

Piotr Caban : localspl: Use separate structure to store XcvPort and XcvMonitor handles.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 730b0826a0ce240c2473ab279cbea3b59083749d URL: https://gitlab.winehq.org/wine/wine/-/commit/730b0826a0ce240c2473ab279cbea3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 15:42:23 2022 +0100 localspl: Use separate structure to store XcvPort and XcvMonitor handles. --- dlls/localspl/provider.c | 258 ++++++++++++++++++++++++++--------------------- 1 file changed, 141 insertions(+), 117 deletions(-)

1 0

Piotr Caban : localspl: Use separate structure to store printserver handles.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: da4d55db4b8c667090f95bd657d97fa4b16622f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/da4d55db4b8c667090f95bd657d97f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 16:05:15 2022 +0100 localspl: Use separate structure to store printserver handles. --- dlls/localspl/provider.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f1303508d80..236cf7aaf6e 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -248,6 +248,8 @@ typedef struct { } type; } handle_header_t; +typedef handle_header_t server_t; + typedef struct { handle_header_t header; monitor_t *pm; @@ -1536,6 +1538,24 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) return hui; } +static HANDLE server_alloc_handle(const WCHAR *name, BOOL *stop_search) +{ + server_t *server; + + *stop_search = FALSE; + if (name) + return NULL; + + server = malloc(sizeof(*server)); + if (!server) + { + *stop_search = TRUE; + return NULL; + } + server->type = HANDLE_SERVER; + return (HANDLE)server; +} + static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL *stop_search) { static const WCHAR xcv_monitor[] = L"XcvMonitor "; @@ -1544,7 +1564,7 @@ static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL * xcv_t *xcv; *stop_search = FALSE; - if (!name || name[0] != ',') + if (name[0] != ',') return NULL; name++; @@ -1613,13 +1633,6 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename, return NULL; } - if (!basename) - { - TRACE("using the local printserver\n"); - printer->header.type = HANDLE_SERVER; - return (HANDLE)printer; - } - printer->info = get_printer_info(basename); if (!printer->info) { @@ -2646,7 +2659,9 @@ static BOOL WINAPI fpOpenPrinter(WCHAR *name, HANDLE *hprinter, return FALSE; } - *hprinter = xcv_alloc_handle(basename, def, &stop_search); + *hprinter = server_alloc_handle(basename, &stop_search); + if (!*hprinter && !stop_search) + *hprinter = xcv_alloc_handle(basename, def, &stop_search); if (!*hprinter && !stop_search) *hprinter = printer_alloc_handle(name, basename, def); @@ -3417,7 +3432,11 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter) if (!header) return FALSE; - if (header->type == HANDLE_XCV) + if (header->type == HANDLE_SERVER) + { + free(header); + } + else if (header->type == HANDLE_XCV) { xcv_t *xcv = (xcv_t *)hprinter; @@ -3427,7 +3446,7 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter) monitor_unload(xcv->pm); free(xcv); } - else if (header->type == HANDLE_SERVER || header->type == HANDLE_PRINTER) + else if (header->type == HANDLE_PRINTER) { printer_t *printer = (printer_t *)hprinter;

1 0

Piotr Caban : localspl: Rename job_t structure to job_info_t.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 4d74944a62c3ee0fc6212e310e4fc40bc77fb1cd URL: https://gitlab.winehq.org/wine/wine/-/commit/4d74944a62c3ee0fc6212e310e4fc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 16:08:01 2022 +0100 localspl: Rename job_t structure to job_info_t. --- dlls/localspl/provider.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 236cf7aaf6e..5b0b6b339a2 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -226,7 +226,7 @@ typedef struct { WCHAR *document_title; DEVMODEW *devmode; HANDLE hf; -} job_t; +} job_info_t; typedef struct { WCHAR *name; @@ -261,7 +261,7 @@ typedef struct { printer_info_t *info; LPWSTR name; DEVMODEW *devmode; - job_t *doc; + job_info_t *doc; } printer_t; /* ############################### */ @@ -542,7 +542,7 @@ static printer_info_t* get_printer_info(const WCHAR *name) return info; } -static void free_job(job_t *job) +static void free_job(job_info_t *job) { list_remove(&job->entry); free(job->filename); @@ -569,7 +569,7 @@ static void release_printer_info(printer_info_t *info) DeleteCriticalSection(&info->jobs_cs); while (!list_empty(&info->jobs)) { - job_t *job = LIST_ENTRY(list_head(&info->jobs), job_t, entry); + job_info_t *job = LIST_ENTRY(list_head(&info->jobs), job_info_t, entry); free_job(job); } free(info); @@ -2912,11 +2912,11 @@ static size_t get_spool_filename(DWORD job_id, WCHAR *buf, size_t len) return ret; } -static job_t* add_job(printer_t *printer, DOC_INFO_1W *info, BOOL create) +static job_info_t* add_job(printer_t *printer, DOC_INFO_1W *info, BOOL create) { DWORD job_id, last_id; size_t len; - job_t *job; + job_info_t *job; job = calloc(1, sizeof(*job)); if (!job) @@ -2975,7 +2975,7 @@ static BOOL WINAPI fpAddJob(HANDLE hprinter, DWORD level, BYTE *data, DWORD size ADDJOB_INFO_1W *addjob = (ADDJOB_INFO_1W *)data; printer_t *printer = (printer_t *)hprinter; DOC_INFO_1W doc_info; - job_t *job; + job_info_t *job; size_t len; TRACE("(%p %ld %p %ld %p)\n", hprinter, level, data, size, needed); @@ -3070,11 +3070,11 @@ static BOOL WINAPI fpWritePrinter(HANDLE hprinter, void *buf, DWORD size, DWORD return WriteFile(printer->doc->hf, buf, size, written, NULL); } -static job_t * get_job(printer_info_t *info, DWORD job_id) +static job_info_t * get_job(printer_info_t *info, DWORD job_id) { - job_t *job; + job_info_t *job; - LIST_FOR_EACH_ENTRY(job, &info->jobs, job_t, entry) + LIST_FOR_EACH_ENTRY(job, &info->jobs, job_info_t, entry) { if(job->id == job_id) return job; @@ -3087,7 +3087,7 @@ static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id, { printer_t *printer = (printer_t *)hprinter; BOOL ret = FALSE; - job_t *job; + job_info_t *job; TRACE("(%p, %ld, %ld, %p, %ld)\n", hprinter, job_id, level, data, command); FIXME("Ignoring everything other than document title\n"); @@ -3164,7 +3164,7 @@ static BOOL WINAPI fpGetJob(HANDLE hprinter, DWORD job_id, DWORD level, printer_t *printer = (printer_t *)hprinter; BOOL ret = TRUE; DWORD s = 0; - job_t *job; + job_info_t *job; WCHAR *p; TRACE("%p %ld %ld %p %ld %p\n", hprinter, job_id, level, data, size, needed); @@ -3288,11 +3288,11 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) const WCHAR *port_name, *port; WCHAR output[1024]; DOC_INFO_1W info; + job_info_t *job; monitor_t *mon; BYTE buf[4096]; HANDLE hport; DWORD r, w; - job_t *job; HANDLE hf; HKEY hkey;

1 0

Piotr Caban : localspl: Add support for Job handles.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: f4dbb3e8a4b2c25f0549f0fb37bb48bc9e8ce5e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4dbb3e8a4b2c25f0549f0fb37bb48… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 19:24:38 2022 +0100 localspl: Add support for Job handles. --- dlls/localspl/provider.c | 135 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 117 insertions(+), 18 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 5b0b6b339a2..4cb30afd076 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,6 +245,7 @@ typedef struct { HANDLE_SERVER, HANDLE_PRINTER, HANDLE_XCV, + HANDLE_JOB, } type; } handle_header_t; @@ -256,6 +257,11 @@ typedef struct { HANDLE hxcv; } xcv_t; +typedef struct { + handle_header_t header; + HANDLE hf; +} job_t; + typedef struct { handle_header_t header; printer_info_t *info; @@ -490,24 +496,39 @@ static void monitor_unloadall(void) LeaveCriticalSection(&monitor_handles_cs); } -static printer_info_t* get_printer_info(const WCHAR *name) +static printer_info_t *find_printer_info(const WCHAR *name, unsigned int len) { - HKEY hkey, hprinter = NULL; printer_info_t *info; - WCHAR port[MAX_PATH]; - LSTATUS ret; - DWORD size; EnterCriticalSection(&printers_cs); LIST_FOR_EACH_ENTRY(info, &printers, printer_info_t, entry) { - if (!wcscmp(info->name, name)) + if (!wcsncmp(info->name, name, len) && (len == -1 || !info->name[len])) { InterlockedIncrement(&info->ref); LeaveCriticalSection(&printers_cs); return info; } } + LeaveCriticalSection(&printers_cs); + return NULL; +} + +static printer_info_t* get_printer_info(const WCHAR *name) +{ + HKEY hkey, hprinter = NULL; + printer_info_t *info; + WCHAR port[MAX_PATH]; + LSTATUS ret; + DWORD size; + + EnterCriticalSection(&printers_cs); + info = find_printer_info(name, -1); + if (info) + { + LeaveCriticalSection(&printers_cs); + return info; + } ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, printersW, &hkey); if (ret == ERROR_SUCCESS) @@ -1538,6 +1559,18 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) return hui; } +static job_info_t * get_job(printer_info_t *info, DWORD job_id) +{ + job_info_t *job; + + LIST_FOR_EACH_ENTRY(job, &info->jobs, job_info_t, entry) + { + if(job->id == job_id) + return job; + } + return NULL; +} + static HANDLE server_alloc_handle(const WCHAR *name, BOOL *stop_search) { server_t *server; @@ -1615,6 +1648,75 @@ static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL * return (HANDLE)xcv; } +static HANDLE job_alloc_handle(const WCHAR *name, BOOL *stop_search) +{ + static const WCHAR jobW[] = L"Job "; + + unsigned int name_len, job_id; + printer_info_t *printer_info; + job_info_t *job_info; + job_t *job; + + *stop_search = FALSE; + name_len = 0; + for (name_len = 0; name[name_len] != ','; name_len++) + { + if (!name[name_len]) + return NULL; + } + + for (job_id = name_len + 1; name[job_id] == ' '; job_id++); + if (!name[job_id]) + return NULL; + + if (wcsncmp(name + job_id, jobW, ARRAY_SIZE(jobW) - 1)) + return NULL; + + *stop_search = TRUE; + job_id += ARRAY_SIZE(jobW) - 1; + job_id = wcstoul(name + job_id, NULL, 10); + + printer_info = find_printer_info(name, name_len); + if (!printer_info) + { + SetLastError(ERROR_INVALID_PRINTER_NAME); + return NULL; + } + + EnterCriticalSection(&printer_info->jobs_cs); + + job_info = get_job(printer_info, job_id); + if (!job_info) + { + LeaveCriticalSection(&printer_info->jobs_cs); + release_printer_info(printer_info); + SetLastError(ERROR_INVALID_PRINTER_NAME); + return NULL; + } + + job = malloc(sizeof(*job)); + if (!job) + { + LeaveCriticalSection(&printer_info->jobs_cs); + release_printer_info(printer_info); + return NULL; + } + job->header.type = HANDLE_JOB; + job->hf = CreateFileW(job_info->filename, GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + + LeaveCriticalSection(&printer_info->jobs_cs); + release_printer_info(printer_info); + + if (job->hf == INVALID_HANDLE_VALUE) + { + free(job); + return NULL; + } + return (HANDLE)job; +} + static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename, PRINTER_DEFAULTSW *def) { @@ -2662,6 +2764,8 @@ static BOOL WINAPI fpOpenPrinter(WCHAR *name, HANDLE *hprinter, *hprinter = server_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) *hprinter = xcv_alloc_handle(basename, def, &stop_search); + if (!*hprinter && !stop_search) + *hprinter = job_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) *hprinter = printer_alloc_handle(name, basename, def); @@ -3070,18 +3174,6 @@ static BOOL WINAPI fpWritePrinter(HANDLE hprinter, void *buf, DWORD size, DWORD return WriteFile(printer->doc->hf, buf, size, written, NULL); } -static job_info_t * get_job(printer_info_t *info, DWORD job_id) -{ - job_info_t *job; - - LIST_FOR_EACH_ENTRY(job, &info->jobs, job_info_t, entry) - { - if(job->id == job_id) - return job; - } - return NULL; -} - static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id, DWORD level, BYTE *data, DWORD command) { @@ -3446,6 +3538,13 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter) monitor_unload(xcv->pm); free(xcv); } + else if (header->type == HANDLE_JOB) + { + job_t *job = (job_t *)hprinter; + + CloseHandle(job->hf); + free(job); + } else if (header->type == HANDLE_PRINTER) { printer_t *printer = (printer_t *)hprinter;

1 0

Piotr Caban : localspl: Add ReadPrinter implementation.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 5c58e4488f01522bb2c6b0184a7d8b8cd4fc2572 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c58e4488f01522bb2c6b0184a7d8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 19:29:50 2022 +0100 localspl: Add ReadPrinter implementation. --- dlls/localspl/provider.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4cb30afd076..f3881ba7269 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3476,6 +3476,21 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) return ret; } +static BOOL WINAPI fpReadPrinter(HANDLE hprinter, void *buf, DWORD size, DWORD *bytes_read) +{ + job_t *job = (job_t *)hprinter; + + TRACE("%p %p %lu %p\n", hprinter, buf, size, bytes_read); + + if (!job || (job->header.type != HANDLE_JOB)) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + return ReadFile(job->hf, buf, size, bytes_read, NULL); +} + static BOOL WINAPI fpEndDocPrinter(HANDLE hprinter) { printer_t *printer = (printer_t *)hprinter; @@ -3590,7 +3605,7 @@ static const PRINTPROVIDOR backend = { fpWritePrinter, NULL, /* fpEndPagePrinter */ NULL, /* fpAbortPrinter */ - NULL, /* fpReadPrinter */ + fpReadPrinter, fpEndDocPrinter, fpAddJob, fpScheduleJob,

1 0

Piotr Caban : winspool: Call providor in ReadPrinter implementation.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 056d570d498a5fbc7f56e021ea0d3d66d008dddd URL: https://gitlab.winehq.org/wine/wine/-/commit/056d570d498a5fbc7f56e021ea0d3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 19:26:52 2022 +0100 winspool: Call providor in ReadPrinter implementation. --- dlls/winspool.drv/info.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 656477553ba..e58ae925c2b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3229,11 +3229,19 @@ BOOL WINAPI SetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form ) /***************************************************************************** * ReadPrinter [WINSPOOL.@] */ -BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, - LPDWORD pNoBytesRead) +BOOL WINAPI ReadPrinter(HANDLE printer, void *buf, DWORD size, DWORD *bytes_read) { - FIXME("(%p,%p,%ld,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead); - return FALSE; + HANDLE handle = get_backend_handle(printer); + + TRACE("(%p,%p,%ld,%p)\n", printer, buf, size, bytes_read); + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + return backend->fpReadPrinter(handle, buf, size, bytes_read); } /*****************************************************************************

1 0

Rémi Bernon : mfplat: Clear the clsid pointer in MFTEnum to avoid invalid free.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 2dad3edf7c6e4d009899721189f95c332067f9e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dad3edf7c6e4d009899721189f95c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:35:38 2022 +0100 mfplat: Clear the clsid pointer in MFTEnum to avoid invalid free. --- dlls/mfplat/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ebab4ed6f1f..e1315de125a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1350,6 +1350,7 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu return E_INVALIDARG; *count = 0; + *clsids = NULL; list_init(&mfts);

1 0

Alex Henrie : include: Annotate SnmpUtilMem(Re)Alloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: c9dc3e1d4ef55425cb49e63989c4ef70e91fe8de URL: https://gitlab.winehq.org/wine/wine/-/commit/c9dc3e1d4ef55425cb49e63989c4ef… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 1 19:49:17 2022 -0700 include: Annotate SnmpUtilMem(Re)Alloc with __WINE_(DEALLOC|MALLOC). --- include/snmp.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/snmp.h b/include/snmp.h index 0530fc66527..026c6f0367f 100644 --- a/include/snmp.h +++ b/include/snmp.h @@ -271,9 +271,11 @@ INT WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *pVblDst, SnmpVarBindList *pVblSrc); VOID WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *pVbl); -LPVOID WINAPI SnmpUtilMemAlloc(UINT nBytes) __WINE_ALLOC_SIZE(1); -LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID pMem, UINT nBytes) __WINE_ALLOC_SIZE(2); -VOID WINAPI SnmpUtilMemFree(LPVOID pMem); +void WINAPI SnmpUtilMemFree(void *mem); +void * WINAPI SnmpUtilMemAlloc(UINT n_bytes) + __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(SnmpUtilMemFree) __WINE_MALLOC; +void * WINAPI SnmpUtilMemReAlloc(void *mem, UINT n_bytes) + __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(SnmpUtilMemFree); LPSTR WINAPI SnmpUtilOidToA(AsnObjectIdentifier *Oid); LPSTR WINAPI SnmpUtilIdsToA(UINT *Ids, UINT IdLength);

1 0

Alex Henrie : mshtml: Annotate nsalloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: e1f1912abe373c0bf8331125128d991ef41f31f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1f1912abe373c0bf8331125128d99… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 1 20:00:54 2022 -0700 mshtml: Annotate nsalloc with __WINE_(DEALLOC|MALLOC). --- dlls/mshtml/mshtml_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a648cb12be8..d5a9e02aa13 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1061,8 +1061,8 @@ HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; void call_property_onchanged(ConnectionPointContainer*,DISPID) DECLSPEC_HIDDEN; HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*) DECLSPEC_HIDDEN; -void *nsalloc(size_t) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; void nsfree(void*) DECLSPEC_HIDDEN; +void *nsalloc(size_t) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(nsfree) __WINE_MALLOC DECLSPEC_HIDDEN; BOOL nsACString_Init(nsACString *str, const char *data) DECLSPEC_HIDDEN; void nsACString_InitDepend(nsACString*,const char*) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : mshtml: Fix realloc size vs element count mixup.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 466f31dce91334f5508fa9fc2d7139b6c33c8534 URL: https://gitlab.winehq.org/wine/wine/-/commit/466f31dce91334f5508fa9fc2d7139… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 21:41:54 2022 +0100 mshtml: Fix realloc size vs element count mixup. --- dlls/mshtml/htmlstorage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 9a883e4bc05..21e3df5c3fb 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -1119,7 +1119,7 @@ static HRESULT get_prop(HTMLStorage *This, const WCHAR *name, DISPID *dispid) } if(is_power_of_2(This->num_props)) { - BSTR *new_props = realloc(This->props, max(This->num_props * 2 * sizeof(BSTR*), 1)); + BSTR *new_props = realloc(This->props, max(This->num_props * 2, 1) * sizeof(*This->props)); if(!new_props) return E_OUTOFMEMORY; This->props = new_props;

1 0