wine-commits December 2022

wine-commits@winehq.org

1 participants
539 discussions

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: 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: 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: Preparation for using handle type specific structures.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: aa7cedbc1261ed5b8c13957c1d4b3836b9067e37 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa7cedbc1261ed5b8c13957c1d4b38… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 13:53:13 2022 +0100 localspl: Preparation for using handle type specific structures. --- dlls/localspl/provider.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 2a5a453fddf..e927edb7b28 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -240,6 +240,16 @@ typedef struct { } printer_info_t; typedef struct { + enum + { + HANDLE_SERVER, + HANDLE_PRINTER, + HANDLE_XCV, + } type; +} handle_header_t; + +typedef struct { + handle_header_t header; printer_info_t *info; LPWSTR name; monitor_t * pm; @@ -1618,6 +1628,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) printer = NULL; goto end; } + printer->header.type = HANDLE_XCV; } else { @@ -1629,11 +1640,13 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) printer = NULL; goto end; } + printer->header.type = HANDLE_PRINTER; } } else { TRACE("using the local printserver\n"); + printer->header.type = HANDLE_SERVER; } if (pDefault && pDefault->pDevMode) @@ -2679,13 +2692,13 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) { - printer_t *printer = (printer_t * ) hXcv; + printer_t *printer = (printer_t *)hXcv; TRACE("(%p, %s, %p, %ld, %p, %ld, %p, %p)\n", hXcv, debugstr_w(pszDataName), pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); - if (!printer || (!printer->hXcv)) { + if (!printer || printer->header.type != HANDLE_XCV) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -2952,7 +2965,7 @@ static BOOL WINAPI fpAddJob(HANDLE hprinter, DWORD level, BYTE *data, DWORD size TRACE("(%p %ld %p %ld %p)\n", hprinter, level, data, size, needed); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -2999,7 +3012,7 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in hprinter, level, doc_info, debugstr_w(info->pDocName), debugstr_w(info->pOutputFile), debugstr_w(info->pDatatype)); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return 0; @@ -3027,7 +3040,7 @@ static BOOL WINAPI fpWritePrinter(HANDLE hprinter, void *buf, DWORD size, DWORD TRACE("(%p, %p, %ld, %p)\n", hprinter, buf, size, written); - if(!printer || !printer->info) + if(!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3064,7 +3077,7 @@ static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id, TRACE("(%p, %ld, %ld, %p, %ld)\n", hprinter, job_id, level, data, command); FIXME("Ignoring everything other than document title\n"); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return 0; @@ -3141,7 +3154,7 @@ static BOOL WINAPI fpGetJob(HANDLE hprinter, DWORD job_id, DWORD level, TRACE("%p %ld %ld %p %ld %p\n", hprinter, job_id, level, data, size, needed); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3270,7 +3283,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) TRACE("%p %ld\n", hprinter, job_id); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3363,7 +3376,7 @@ static BOOL WINAPI fpEndDocPrinter(HANDLE hprinter) TRACE("%p\n", hprinter); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE;

1 0

Piotr Caban : localspl: Fix error handling in printer_alloc_handle helper.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 5954a7f3cdc1239abbb8fc98b3f01826e0c08fcb URL: https://gitlab.winehq.org/wine/wine/-/commit/5954a7f3cdc1239abbb8fc98b3f018… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 13:42:28 2022 +0100 localspl: Fix error handling in printer_alloc_handle helper. --- dlls/localspl/provider.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4b557e15a9c..2a5a453fddf 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1573,9 +1573,10 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) /* clone the full name */ printer->name = wcsdup(name); - if (name && (!printer->name)) { + if (name && !printer->name) { printer_free(printer); printer = NULL; + goto end; } if (printername) { len = ARRAY_SIZE(L",XcvMonitor ") - 1;

1 0

Alex Henrie : rpcrt4/tests: Don't use an array of pointers in test_conf_complex_struct.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: e09c93de7bd4f27b41f572a4a79d9df190c63c6f URL: https://gitlab.winehq.org/wine/wine/-/commit/e09c93de7bd4f27b41f572a4a79d9d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 21:23:54 2022 -0700 rpcrt4/tests: Don't use an array of pointers in test_conf_complex_struct. An array of pointers isn't conformant on 64-bit and will overrun the destination buffer when unmarshalling. Since the purpose of this function is to test a conformant FC_BOGUS_STRUCT, use one that is conformant on both 32-bit and 64-bit. The revised test coincidentally reveals that there is a problem with the padding or alignment after a marshalled 16-bit enum, which will need to be addressed separately. Co-authored-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 92 +++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 48 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index bae9b12f7ab..52e432e6436 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2327,49 +2327,43 @@ static void test_conf_complex_struct(void) unsigned int i; struct conf_complex { - unsigned int size; - unsigned int *array[1]; + enum {dummy} enum16; + unsigned int size; + unsigned int array[1]; }; struct conf_complex *memsrc; struct conf_complex *mem; + /* + struct conf_complex + { + enum {dummy} enum16; + int size; + [size_is(size), unique] int array[]; + }; + */ static const unsigned char fmtstr_complex_struct[] = { -/* 0 */ - 0x1b, /* FC_CARRAY */ - 0x3, /* 3 */ -/* 2 */ NdrFcShort( 0x4 ), /* 4 */ -/* 4 */ 0x8, /* Corr desc: FC_LONG */ - 0x0, /* */ -/* 6 */ NdrFcShort( 0xfffc ), /* -4 */ -/* 8 */ - 0x4b, /* FC_PP */ - 0x5c, /* FC_PAD */ -/* 10 */ - 0x48, /* FC_VARIABLE_REPEAT */ - 0x49, /* FC_FIXED_OFFSET */ -/* 12 */ NdrFcShort( 0x4 ), /* 4 */ -/* 14 */ NdrFcShort( 0x0 ), /* 0 */ -/* 16 */ NdrFcShort( 0x1 ), /* 1 */ -/* 18 */ NdrFcShort( 0x0 ), /* 0 */ -/* 20 */ NdrFcShort( 0x0 ), /* 0 */ -/* 22 */ 0x12, 0x8, /* FC_UP [simple_pointer] */ -/* 24 */ 0x8, /* FC_LONG */ - 0x5c, /* FC_PAD */ -/* 26 */ - 0x5b, /* FC_END */ - - 0x8, /* FC_LONG */ -/* 28 */ 0x5c, /* FC_PAD */ - 0x5b, /* FC_END */ -/* 30 */ - 0x1a, /* FC_BOGUS_STRUCT */ - 0x3, /* 3 */ -/* 32 */ NdrFcShort( 0x4 ), /* 4 */ -/* 34 */ NdrFcShort( 0xffffffde ), /* Offset= -34 (0) */ -/* 36 */ NdrFcShort( 0x0 ), /* Offset= 0 (36) */ -/* 38 */ 0x8, /* FC_LONG */ - 0x5b, /* FC_END */ + NdrFcShort(0x0), +/* 2 (int[]) */ + 0x1b, /* FC_CARRAY */ + 0x3, /* 3 */ + NdrFcShort(0x4), /* 4 */ + 0x8, /* Corr desc: field size, FC_LONG */ + 0x0, /* no operators */ + NdrFcShort(0xfffc), /* offset = -4 */ + 0x08, /* FC_LONG */ + 0x5b, /* FC_END */ +/* 12 (struct conf_complex) */ + 0x1a, /* FC_BOGUS_STRUCT */ + 0x3, /* 3 */ + NdrFcShort(0x8), /* 8 */ + NdrFcShort(0xfff2), /* Offset= -14 (2) */ + NdrFcShort(0x0), /* Offset= 0 (18) */ + 0x0d, /* FC_ENUM16 */ + 0x08, /* FC_LONG */ + 0x5c, /* FC_PAD */ + 0x5b, /* FC_END */ }; memsrc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -2386,32 +2380,34 @@ static void test_conf_complex_struct(void) 0); StubMsg.BufferLength = 0; - NdrComplexStructBufferSize( &StubMsg, - (unsigned char *)memsrc, - &fmtstr_complex_struct[30] ); - ok(StubMsg.BufferLength >= 28, "length %ld\n", StubMsg.BufferLength); + NdrComplexStructBufferSize(&StubMsg, (unsigned char *)memsrc, &fmtstr_complex_struct[12]); + ok(StubMsg.BufferLength >= 92, "length %ld\n", StubMsg.BufferLength); /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; - ptr = NdrComplexStructMarshall( &StubMsg, (unsigned char *)memsrc, - &fmtstr_complex_struct[30] ); + ptr = NdrComplexStructMarshall(&StubMsg, (unsigned char *)memsrc, &fmtstr_complex_struct[12]); ok(ptr == NULL, "ret %p\n", ptr); - ok(*(unsigned int *)StubMsg.BufferStart == 20, "Conformance should have been 20 instead of %d\n", *(unsigned int *)StubMsg.BufferStart); - ok(*(unsigned int *)(StubMsg.BufferStart + 4) == 20, "conf_complex.size should have been 20 instead of %d\n", *(unsigned int *)(StubMsg.BufferStart + 4)); + ok(*(unsigned int *)StubMsg.BufferStart == 20, "Conformance should have been 20 instead of %u\n", + *(unsigned int *)StubMsg.BufferStart); + todo_wine + ok(*(unsigned int *)(StubMsg.BufferStart + 8) == 20, "conf_complex.size should have been 20 instead of %u\n", + *(unsigned int *)(StubMsg.BufferStart + 8)); for (i = 0; i < 20; i++) - ok(*(unsigned int *)(StubMsg.BufferStart + 8 + i * 4) == 0, "pointer id for conf_complex.array[%d] should have been 0 instead of 0x%x\n", i, *(unsigned int *)(StubMsg.BufferStart + 8 + i * 4)); + ok(*(unsigned int *)(StubMsg.BufferStart + 12 + i * 4) == 0, + "pointer id for conf_complex.array[%u] should have been 0 instead of 0x%x\n", i, + *(unsigned int *)(StubMsg.BufferStart + 12 + i * 4)); /* Server */ my_alloc_called = 0; StubMsg.IsClient = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; - ptr = NdrComplexStructUnmarshall( &StubMsg, (unsigned char **)&mem, &fmtstr_complex_struct[30], 0); + ptr = NdrComplexStructUnmarshall(&StubMsg, (unsigned char **)&mem, &fmtstr_complex_struct[12], 0); ok(ptr == NULL, "ret %p\n", ptr); ok(mem->size == 20, "mem->size wasn't unmarshalled correctly (%d)\n", mem->size); - ok(mem->array[0] == NULL, "mem->array[0] wasn't unmarshalled correctly (%p)\n", mem->array[0]); + ok(mem->array[0] == 0, "mem->array[0] wasn't unmarshalled correctly (%u)\n", mem->array[0]); StubMsg.pfnFree(mem); HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer);

1 0

Rémi Bernon : msvcrt: Use operator_delete to free _Condition_variable queue nodes.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 996c115217f18654747cd1c4baeda54d9342c808 URL: https://gitlab.winehq.org/wine/wine/-/commit/996c115217f18654747cd1c4baeda5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 08:16:30 2022 +0100 msvcrt: Use operator_delete to free _Condition_variable queue nodes. --- dlls/msvcrt/concurrency.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f7f7adb86ed..c5db2868d58 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2656,7 +2656,7 @@ void __thiscall _Condition_variable_dtor(_Condition_variable *this) cv_queue *next = this->queue->next; if(!this->queue->expired) ERR("there's an active wait\n"); - HeapFree(GetProcessHeap(), 0, this->queue); + operator_delete(this->queue); this->queue = next; } critical_section_dtor(&this->lock); @@ -2753,7 +2753,7 @@ void __thiscall _Condition_variable_notify_one(_Condition_variable *this) RtlWakeAddressSingle(&node->next); return; } else { - HeapFree(GetProcessHeap(), 0, node); + operator_delete(node); } } } @@ -2782,7 +2782,7 @@ void __thiscall _Condition_variable_notify_all(_Condition_variable *this) if(!InterlockedExchange(&ptr->expired, TRUE)) RtlWakeAddressSingle(&ptr->next); else - HeapFree(GetProcessHeap(), 0, ptr); + operator_delete(ptr); ptr = next; } }

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

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

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

← Newer
1
...
42
43
44
45
46
47
48
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2022