November 2022 - Wine-Commits

Alex Henrie : schedsvc: Remove unused function heap_strdupW.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 6a5dcc5273bc169c6c060de3dadf6c930847d10d URL: https://gitlab.winehq.org/wine/wine/-/commit/6a5dcc5273bc169c6c060de3dadf6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 21:57:42 2022 -0700 schedsvc: Remove unused function heap_strdupW. --- dlls/schedsvc/schedsvc_private.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 1eada2bca96..62b25f97794 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -32,14 +32,4 @@ void check_task_time(void) DECLSPEC_HIDDEN; void load_at_tasks(void) DECLSPEC_HIDDEN; void check_missed_task_time(void) DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - unsigned len; - if (!src) return NULL; - len = (lstrlenW(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - #endif /* __WINE_SCHEDSVC_PRIVATE_H__ */

1 0

Alex Henrie : schedsvc: Use standard C functions for memory allocation in atsvc.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 4ee48f26bdaa9e466ad96c5f923027a6b7aca7fe URL: https://gitlab.winehq.org/wine/wine/-/commit/4ee48f26bdaa9e466ad96c5f923027… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 21:56:01 2022 -0700 schedsvc: Use standard C functions for memory allocation in atsvc.c. --- dlls/schedsvc/atsvc.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index e8ea1b25c6f..aa7881d39ba 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -354,15 +354,15 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, struct job_t *j switch (i) { case 0: - job->info.Command = heap_strdupW((const WCHAR *)data); + job->info.Command = wcsdup((const WCHAR *)data); break; case 1: - job->params = heap_strdupW((const WCHAR *)data); + job->params = wcsdup((const WCHAR *)data); break; case 2: - job->curdir = heap_strdupW((const WCHAR *)data); + job->curdir = wcsdup((const WCHAR *)data); break; default: @@ -504,7 +504,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) return FALSE; } - info->trigger = heap_alloc(info->trigger_count * sizeof(info->trigger[0])); + info->trigger = malloc(info->trigger_count * sizeof(info->trigger[0])); if (!info->trigger) { TRACE("not enough memory for trigger data\n"); @@ -596,24 +596,24 @@ static BOOL load_job(const WCHAR *name, struct job_t *info) static void free_job_info(AT_ENUM *info) { - heap_free(info->Command); + free(info->Command); } static void free_job(struct job_t *job) { free_job_info(&job->info); - heap_free(job->name); - heap_free(job->params); - heap_free(job->curdir); - heap_free(job->trigger); - heap_free(job); + free(job->name); + free(job->params); + free(job->curdir); + free(job->trigger); + free(job); } void add_job(const WCHAR *name) { struct job_t *job; - job = heap_alloc_zero(sizeof(*job)); + job = calloc(1, sizeof(*job)); if (!job) return; if (!load_job(name, job)) @@ -623,7 +623,7 @@ void add_job(const WCHAR *name) } EnterCriticalSection(&at_job_list_section); - job->name = heap_strdupW(name); + job->name = wcsdup(name); job->info.JobId = current_jobid++; list_add_tail(&at_job_list, &job->entry); LeaveCriticalSection(&at_job_list_section); @@ -920,7 +920,7 @@ void update_process_status(DWORD pid) { CloseHandle(runjob->process); list_remove(&runjob->entry); - heap_free(runjob); + free(runjob); job->data.exit_code = exit_code; job->data.status = SCHED_S_TASK_TERMINATED; @@ -969,7 +969,7 @@ void check_task_state(void) if (job->instance_count) FIXME("process %s is already running\n", debugstr_w(job->info.Command)); - runjob = heap_alloc(sizeof(*runjob)); + runjob = malloc(sizeof(*runjob)); if (runjob) { static WCHAR winsta0[] = { 'W','i','n','S','t','a','0',0 }; @@ -1179,9 +1179,9 @@ static void free_container(AT_ENUM_CONTAINER *container) DWORD i; for (i = 0; i < container->EntriesRead; i++) - heap_free(container->Buffer[i].Command); + free(container->Buffer[i].Command); - heap_free(container->Buffer); + free(container->Buffer); } DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container, @@ -1197,7 +1197,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container container->EntriesRead = 0; allocated = 64; - container->Buffer = heap_alloc(allocated * sizeof(AT_ENUM)); + container->Buffer = malloc(allocated * sizeof(AT_ENUM)); if (!container->Buffer) return ERROR_NOT_ENOUGH_MEMORY; EnterCriticalSection(&at_job_list_section); @@ -1215,7 +1215,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container AT_ENUM *new_buffer; allocated *= 2; - new_buffer = heap_realloc(container->Buffer, allocated * sizeof(AT_ENUM)); + new_buffer = realloc(container->Buffer, allocated * sizeof(AT_ENUM)); if (!new_buffer) { free_container(container); @@ -1226,7 +1226,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container } container->Buffer[container->EntriesRead] = job->info; - container->Buffer[container->EntriesRead].Command = heap_strdupW(job->info.Command); + container->Buffer[container->EntriesRead].Command = wcsdup(job->info.Command); container->EntriesRead++; } @@ -1249,7 +1249,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in job = find_job(jobid, NULL, NULL); if (job) { - AT_INFO *info_ret = heap_alloc(sizeof(*info_ret)); + AT_INFO *info_ret = malloc(sizeof(*info_ret)); if (!info_ret) ret = ERROR_NOT_ENOUGH_MEMORY; else @@ -1258,7 +1258,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in info_ret->DaysOfMonth = job->info.DaysOfMonth; info_ret->DaysOfWeek = job->info.DaysOfWeek; info_ret->Flags = job->info.Flags; - info_ret->Command = heap_strdupW(job->info.Command); + info_ret->Command = wcsdup(job->info.Command); *info = info_ret; ret = ERROR_SUCCESS; }

1 0

Alex Henrie : sapi: Use standard C functions for memory allocation in token.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: caf39cd12240ecd965027e7a29a5ed66d04a1a74 URL: https://gitlab.winehq.org/wine/wine/-/commit/caf39cd12240ecd965027e7a29a5ed… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 19:39:25 2022 -0700 sapi: Use standard C functions for memory allocation in token.c. --- dlls/sapi/sapi_private.h | 15 --------------- dlls/sapi/token.c | 44 ++++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 8a375cdb6c2..fcecafb450e 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -28,18 +28,3 @@ HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_ HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; - -static inline LPWSTR heap_strdupW(LPCWSTR str) -{ - LPWSTR ret = NULL; - DWORD size; - - if (str) - { - size = (lstrlenW( str ) + 1) * sizeof(WCHAR); - ret = heap_alloc( size ); - if (ret) memcpy( ret, str, size ); - } - - return ret; -} diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 478a400f920..385555a4cef 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -101,7 +101,7 @@ static ULONG WINAPI data_key_Release( ISpRegDataKey *iface ) if (!ref) { if (This->key) RegCloseKey( This->key ); - heap_free( This ); + free( This ); } return ref; @@ -270,7 +270,7 @@ const struct ISpRegDataKeyVtbl data_key_vtbl = HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) { - struct data_key *This = heap_alloc( sizeof(*This) ); + struct data_key *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -338,7 +338,7 @@ static ULONG WINAPI token_category_Release( ISpObjectTokenCategory *iface ) if (!ref) { if (This->data_key) ISpRegDataKey_Release( This->data_key ); - heap_free( This ); + free( This ); } return ref; } @@ -637,7 +637,7 @@ const struct ISpObjectTokenCategoryVtbl token_category_vtbl = HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) { - struct token_category *This = heap_alloc( sizeof(*This) ); + struct token_category *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -692,9 +692,9 @@ static ULONG WINAPI token_enum_Release( ISpObjectTokenEnumBuilder *iface ) { if (This->key) RegCloseKey(This->key); - heap_free( This->req ); - heap_free( This->opt ); - heap_free( This ); + free( This->req ); + free( This->opt ); + free( This ); } return ref; @@ -721,14 +721,14 @@ static HRESULT WINAPI token_enum_Next( ISpObjectTokenEnumBuilder *iface, RegQueryInfoKeyW( This->key, NULL, NULL, NULL, NULL, &size, NULL, NULL, NULL, NULL, NULL, NULL ); size = (size+1) * sizeof(WCHAR); - subkey_name = heap_alloc(size); + subkey_name = malloc( size ); if (!subkey_name) return E_OUTOFMEMORY; retCode = RegEnumKeyExW( This->key, This->index, subkey_name, &size, NULL, NULL, NULL, NULL ); if (retCode != ERROR_SUCCESS) { - heap_free(subkey_name); + free( subkey_name ); return S_FALSE; } @@ -736,14 +736,14 @@ static HRESULT WINAPI token_enum_Next( ISpObjectTokenEnumBuilder *iface, if (RegOpenKeyExW( This->key, subkey_name, 0, KEY_READ, &sub_key ) != ERROR_SUCCESS) { - heap_free(subkey_name); + free( subkey_name ); return E_FAIL; } hr = token_create( NULL, &IID_ISpObjectToken, (void**)tokens ); if (FAILED(hr)) { - heap_free(subkey_name); + free( subkey_name ); return hr; } @@ -794,28 +794,28 @@ static HRESULT WINAPI token_enum_Item( ISpObjectTokenEnumBuilder *iface, RegQueryInfoKeyW(This->key, NULL, NULL, NULL, NULL, &size, NULL, NULL, NULL, NULL, NULL, NULL); size = (size+1) * sizeof(WCHAR); - subkey = heap_alloc(size); + subkey = malloc( size ); if (!subkey) return E_OUTOFMEMORY; ret = RegEnumKeyExW(This->key, index, subkey, &size, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) { - heap_free(subkey); + free( subkey ); return HRESULT_FROM_WIN32(ret); } ret = RegOpenKeyExW (This->key, subkey, 0, KEY_READ, &key); if (ret != ERROR_SUCCESS) { - heap_free(subkey); + free( subkey ); return HRESULT_FROM_WIN32(ret); } hr = token_create( NULL, &IID_ISpObjectToken, (void**)&subtoken ); if (FAILED(hr)) { - heap_free(subkey); + free( subkey ); return hr; } @@ -852,13 +852,13 @@ static HRESULT WINAPI token_enum_SetAttribs( ISpObjectTokenEnumBuilder *iface, if (req) { - This->req = heap_strdupW( req ); + This->req = wcsdup( req ); if (!This->req) goto out_of_mem; } if (opt) { - This->opt = heap_strdupW( opt ); + This->opt = wcsdup( opt ); if (!This->opt) goto out_of_mem; } @@ -866,7 +866,7 @@ static HRESULT WINAPI token_enum_SetAttribs( ISpObjectTokenEnumBuilder *iface, return S_OK; out_of_mem: - heap_free( This->req ); + free( This->req ); return E_OUTOFMEMORY; } @@ -919,7 +919,7 @@ const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl = HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) { - struct token_enum *This = heap_alloc( sizeof(*This) ); + struct token_enum *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -978,8 +978,8 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { if (This->token_key) RegCloseKey( This->token_key ); - free(This->token_id); - heap_free( This ); + free( This->token_id ); + free( This ); } return ref; @@ -1265,7 +1265,7 @@ const struct ISpObjectTokenVtbl token_vtbl = HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) { - struct object_token *This = heap_alloc( sizeof(*This) ); + struct object_token *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY;

1 0

Eric Pouech : ntdll/tests: Extend file tests about delete-on-close and disposition.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 9ff426270c793f0ccbbb18d7de344f723d5ff097 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ff426270c793f0ccbbb18d7de344f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 17 16:07:39 2022 +0100 ntdll/tests: Extend file tests about delete-on-close and disposition. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/file.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2ec61f72aa9..6186afdfb63 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3000,6 +3000,10 @@ static void test_file_disposition_information(void) fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + todo_wine + ok(fsi.DeletePending, "Handle should be marked for deletion\n"); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" ); @@ -3408,6 +3412,68 @@ static void test_file_disposition_information(void) res = DeleteFileA( buffer ); ok( !res, "expected failure\n" ); ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %lu\n", GetLastError() ); + + /* pending delete flag is shared across handles */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, FILE_SHARE_DELETE, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + ok(!fsi.DeletePending, "Handle shouldn't be marked for deletion\n"); + handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok( handle2 != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = NtQueryInformationFile(handle2, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + ok(!fsi.DeletePending, "Handle shouldn't be marked for deletion\n"); + fdi.DoDeleteFile = TRUE; + res = NtSetInformationFile(handle, &io, &fdi, sizeof(fdi), FileDispositionInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + res = NtQueryInformationFile(handle2, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + todo_wine + ok(fsi.DeletePending, "Handle should be marked for deletion\n"); + fdi.DoDeleteFile = FALSE; + res = NtSetInformationFile(handle2, &io, &fdi, sizeof(fdi), FileDispositionInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + ok(!fsi.DeletePending, "Handle shouldn't be marked for deletion\n"); + CloseHandle(handle); + CloseHandle(handle2); + res = GetFileAttributesA( buffer ); + todo_wine + ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); + + /* pending delete flag is shared across handles (even after closing) */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, FILE_SHARE_DELETE, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + ok(!fsi.DeletePending, "Handle shouldn't be marked for deletion\n"); + handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok( handle2 != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = NtQueryInformationFile(handle2, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + ok(!fsi.DeletePending, "Handle shouldn't be marked for deletion\n"); + fdi.DoDeleteFile = TRUE; + res = NtSetInformationFile(handle, &io, &fdi, sizeof(fdi), FileDispositionInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + res = NtQueryInformationFile(handle2, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + todo_wine + ok(fsi.DeletePending, "Handle should be marked for deletion\n"); + fdi.DoDeleteFile = FALSE; + res = NtSetInformationFile(handle2, &io, &fdi, sizeof(fdi), FileDispositionInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + CloseHandle(handle2); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + ok(!fsi.DeletePending, "Handle shouldn't be marked for deletion\n"); + CloseHandle(handle); + res = GetFileAttributesA( buffer ); + todo_wine + ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); } static void test_file_name_information(void)

1 0

Alex Henrie : oledb32: Use standard C functions for memory allocation in datainit.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: cce78c245d9455953f3dc7035e2c2f66d4dd7fe9 URL: https://gitlab.winehq.org/wine/wine/-/commit/cce78c245d9455953f3dc7035e2c2f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 19:31:15 2022 -0700 oledb32: Use standard C functions for memory allocation in datainit.c. --- dlls/oledb32/datainit.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 0438375202b..4281e5f9e1c 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -29,7 +29,6 @@ #include "oledb_private.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); @@ -191,7 +190,7 @@ static ULONG WINAPI dbinit_Release(IDBInitialize *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - heap_free(This); + free(This); return ref; } @@ -231,7 +230,7 @@ static HRESULT create_db_init(IUnknown **obj) *obj = NULL; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; @@ -282,7 +281,7 @@ static ULONG WINAPI datainit_Release(IDataInitialize *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - heap_free(This); + free(This); return ref; } @@ -400,7 +399,7 @@ static HRESULT add_dbprop_to_list(struct dbprops *props, BSTR name, BSTR value) { struct dbprop_pair *pair; - pair = heap_alloc(sizeof(*pair)); + pair = malloc(sizeof(*pair)); if (!pair) return E_OUTOFMEMORY; @@ -419,7 +418,7 @@ static void free_dbprop_list(struct dbprops *props) list_remove(&p->entry); SysFreeString(p->name); SysFreeString(p->value); - heap_free(p); + free(p); } } @@ -604,26 +603,16 @@ static void datasource_release(BOOL created, IUnknown **datasource) *datasource = NULL; } -static inline WCHAR *strdupW(const WCHAR *src) -{ - WCHAR *dest; - if (!src) return NULL; - dest = heap_alloc((lstrlenW(src)+1)*sizeof(WCHAR)); - if (dest) - lstrcpyW(dest, src); - return dest; -} - static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub) { LPWSTR strlower, sublower, r; - strlower = CharLowerW(strdupW(str)); - sublower = CharLowerW(strdupW(sub)); + strlower = CharLowerW(wcsdup(str)); + sublower = CharLowerW(wcsdup(sub)); r = wcsstr(strlower, sublower); if (r) r = (LPWSTR)str + (r - strlower); - heap_free(strlower); - heap_free(sublower); + free(strlower); + free(sublower); return r; } @@ -1017,7 +1006,7 @@ HRESULT create_data_init(IUnknown *outer, void **obj) *obj = NULL; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDataInitialize_iface.lpVtbl = &datainit_vtbl;

1 0

Alex Henrie : oleaut32: Use standard C functions for memory allocation in olefont.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 88e3c7323ad3ee7f7be17b1d8e51a589b7a0e836 URL: https://gitlab.winehq.org/wine/wine/-/commit/88e3c7323ad3ee7f7be17b1d8e51a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 19:22:35 2022 -0700 oleaut32: Use standard C functions for memory allocation in olefont.c. --- dlls/oleaut32/olefont.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 28cfcdf933c..d08c26249b0 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -117,7 +117,7 @@ static void HFONTItem_Delete(PHFONTItem item) { DeleteObject(item->gdiFont); list_remove(&item->entry); - HeapFree(GetProcessHeap(), 0, item); + free(item); } /* Find hfont item entry in the list. Should be called while holding the crit sect */ @@ -136,7 +136,7 @@ static HFONTItem *find_hfontitem(HFONT hfont) /* Add an item to the list with one internal reference */ static HRESULT add_hfontitem(HFONT hfont) { - HFONTItem *new_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_item)); + HFONTItem *new_item = malloc(sizeof(*new_item)); if(!new_item) return E_OUTOFMEMORY; @@ -226,17 +226,6 @@ static HRESULT dec_ext_ref(HFONT hfont) return hr; } -static WCHAR *strdupW(const WCHAR* str) -{ - WCHAR *ret; - DWORD size = (lstrlenW(str) + 1) * sizeof(WCHAR); - - ret = HeapAlloc(GetProcessHeap(), 0, size); - if(ret) - memcpy(ret, str, size); - return ret; -} - /*********************************************************************** * Declaration of the implementation class for the IFont interface */ @@ -621,8 +610,8 @@ static void realize_font(OLEFontImpl *This) GetTextFaceW(hdc, ARRAY_SIZE(text_face), text_face); if(lstrcmpiW(text_face, This->description.lpstrName)) { - HeapFree(GetProcessHeap(), 0, This->description.lpstrName); - This->description.lpstrName = strdupW(text_face); + free(This->description.lpstrName); + This->description.lpstrName = wcsdup(text_face); } GetTextMetricsW(hdc, &tm); This->description.sCharset = tm.tmCharSet; @@ -669,8 +658,8 @@ static HRESULT WINAPI OLEFontImpl_put_Name( if (!name) return CTL_E_INVALIDPROPERTYVALUE; - HeapFree(GetProcessHeap(), 0, This->description.lpstrName); - This->description.lpstrName = strdupW(name); + free(This->description.lpstrName); + This->description.lpstrName = wcsdup(name); if (!This->description.lpstrName) return E_OUTOFMEMORY; TRACE("new name %s\n", debugstr_w(This->description.lpstrName)); @@ -960,13 +949,13 @@ static HRESULT WINAPI OLEFontImpl_Clone( *ppfont = NULL; - newObject = HeapAlloc(GetProcessHeap(), 0, sizeof(OLEFontImpl)); + newObject = malloc(sizeof(OLEFontImpl)); if (newObject==NULL) return E_OUTOFMEMORY; *newObject = *this; /* allocate separate buffer */ - newObject->description.lpstrName = strdupW(this->description.lpstrName); + newObject->description.lpstrName = wcsdup(this->description.lpstrName); /* Increment internal ref in hfont item list */ if(newObject->gdiFont) inc_int_ref(newObject->gdiFont); @@ -1623,10 +1612,10 @@ static HRESULT WINAPI OLEFontImpl_Load( IStream_Read(pLoadStream, readBuffer, string_size, &cbRead); if (cbRead != string_size) return E_FAIL; - HeapFree(GetProcessHeap(), 0, this->description.lpstrName); + free(this->description.lpstrName); len = MultiByteToWideChar( CP_ACP, 0, readBuffer, string_size, NULL, 0 ); - this->description.lpstrName = HeapAlloc( GetProcessHeap(), 0, (len+1) * sizeof(WCHAR) ); + this->description.lpstrName = malloc((len + 1) * sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, readBuffer, string_size, this->description.lpstrName, len ); this->description.lpstrName[len] = 0; @@ -1697,13 +1686,13 @@ static HRESULT WINAPI OLEFontImpl_Save( if (string_size) { - if (!(writeBuffer = HeapAlloc( GetProcessHeap(), 0, string_size ))) return E_OUTOFMEMORY; + if (!(writeBuffer = malloc(string_size))) return E_OUTOFMEMORY; WideCharToMultiByte( CP_ACP, 0, this->description.lpstrName, lstrlenW(this->description.lpstrName), writeBuffer, string_size, NULL, NULL ); IStream_Write(pOutStream, writeBuffer, string_size, &written); - HeapFree(GetProcessHeap(), 0, writeBuffer); + free(writeBuffer); if (written != string_size) return E_FAIL; } @@ -2024,7 +2013,7 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) { OLEFontImpl* newObject; - newObject = HeapAlloc(GetProcessHeap(), 0, sizeof(OLEFontImpl)); + newObject = malloc(sizeof(OLEFontImpl)); if (newObject==0) return newObject; @@ -2038,7 +2027,7 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) newObject->ref = 1; newObject->description.cbSizeofstruct = sizeof(FONTDESC); - newObject->description.lpstrName = strdupW(fontDesc->lpstrName); + newObject->description.lpstrName = wcsdup(fontDesc->lpstrName); newObject->description.cySize = fontDesc->cySize; newObject->description.sWeight = fontDesc->sWeight; newObject->description.sCharset = fontDesc->sCharset; @@ -2079,14 +2068,14 @@ static void OLEFontImpl_Destroy(OLEFontImpl* fontDesc) { TRACE("(%p)\n", fontDesc); - HeapFree(GetProcessHeap(), 0, fontDesc->description.lpstrName); + free(fontDesc->description.lpstrName); if (fontDesc->pPropertyNotifyCP) IConnectionPoint_Release(fontDesc->pPropertyNotifyCP); if (fontDesc->pFontEventsCP) IConnectionPoint_Release(fontDesc->pFontEventsCP); - HeapFree(GetProcessHeap(), 0, fontDesc); + free(fontDesc); } /*******************************************************************************

1 0

Eric Pouech : ntdll/tests: Fix share mode for some delete-on-close/delete disposition tests.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: b9bf5abe5b2ccbc7ac194d553ea0a1e429c73014 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9bf5abe5b2ccbc7ac194d553ea0a1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 17 16:07:37 2022 +0100 ntdll/tests: Fix share mode for some delete-on-close/delete disposition tests. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7b6cf704971..2ec61f72aa9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3155,10 +3155,13 @@ static void test_file_disposition_information(void) todo_wine ok( res == STATUS_OBJECT_NAME_NOT_FOUND || broken(res == STATUS_DELETE_PENDING), "got %#lx\n", res ); /* can't open the deleted file */ - handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == ERROR_ACCESS_DENIED), "got %lu\n", GetLastError()); + if (handle2 != INVALID_HANDLE_VALUE) + CloseHandle( handle2); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" );

1 0

Eric Pouech : ntdll/tests: Adapt file tests on delete-on-close / delete disposition to Windows 10.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 35ec92113fa643ad2fd0f526797e5392bdf8cf4f URL: https://gitlab.winehq.org/wine/wine/-/commit/35ec92113fa643ad2fd0f526797e53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 17 16:07:36 2022 +0100 ntdll/tests: Adapt file tests on delete-on-close / delete disposition to Windows 10. Fix a couple of failures on Windows 10: - it seems that attributes are no longer accessible by name after shared deletion - really looks like that shared deletion is now marked at object's name hierarchy level (see error codes have changed too) So, - replace tests based on GetFileAttribute with testing presence of pending deletion flag (FileStandardInformation) - add Win10 error codes (and mark the Win7/8 ones as broken) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/file.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 98d9e6b3b0a..7b6cf704971 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2957,6 +2957,7 @@ static void test_file_disposition_information(void) NTSTATUS res; IO_STATUS_BLOCK io; FILE_DISPOSITION_INFORMATION fdi; + FILE_STANDARD_INFORMATION fsi; BOOL fileDeleted; DWORD fdi2, size; void *view; @@ -3141,18 +3142,23 @@ static void test_file_disposition_information(void) GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, FILE_SHARE_DELETE, NULL, CREATE_ALWAYS, 0, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + ok(!fsi.DeletePending, "Handle shouldn't be marked for deletion\n"); fileDeleted = DeleteFileA( buffer ); ok( fileDeleted, "File should have been deleted\n" ); - fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - ok( !fileDeleted, "File shouldn't have been deleted\n" ); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + todo_wine + ok(fsi.DeletePending, "Handle should be marked for deletion\n"); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine - ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res ); + ok( res == STATUS_OBJECT_NAME_NOT_FOUND || broken(res == STATUS_DELETE_PENDING), "got %#lx\n", res ); /* can't open the deleted file */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == ERROR_ACCESS_DENIED), "got %lu\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" ); @@ -3190,19 +3196,24 @@ static void test_file_disposition_information(void) ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); handle = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + ok(!fsi.DeletePending, "Handle shouldn't be marked for deletion\n"); fileDeleted = RemoveDirectoryA( buffer ); ok( fileDeleted, "Directory should have been deleted\n" ); - fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + res = NtQueryInformationFile(handle, &io, &fsi, sizeof(fsi), FileStandardInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", res); + todo_wine + ok(fsi.DeletePending, "Handle should be marked for deletion\n"); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine - ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res ); + ok( res == STATUS_OBJECT_NAME_NOT_FOUND || broken(res == STATUS_DELETE_PENDING), "got %#lx\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == ERROR_ACCESS_DENIED), "got %lu\n", GetLastError()); if (handle2 != INVALID_HANDLE_VALUE) CloseHandle( handle2 ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;

1 0

Eric Pouech : dbghelp: Create a single compiland instance by name in PDB.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: f763332b93e505d9f7b87269fe002e2437046e80 URL: https://gitlab.winehq.org/wine/wine/-/commit/f763332b93e505d9f7b87269fe002e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 17 10:50:50 2022 +0100 dbghelp: Create a single compiland instance by name in PDB. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 65992e6ba28..6eceaa41422 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2245,6 +2245,24 @@ static struct symt_function* codeview_create_inline_site(const struct msc_debug_ return inlined; } +static struct symt_compiland* codeview_new_compiland(const struct msc_debug_info* msc_dbg, const char* objname) +{ + unsigned int src_idx = source_new(msc_dbg->module, NULL, objname); + unsigned int i; + + /* In some cases MSVC generates several compiland entries with same pathname in PDB file. + * (for example: for an import library, one compiland entry per imported function is generated). + * But native dbghelp (in this case) merges in a single compiland instance. + */ + for (i = 0; i < msc_dbg->module->top->vchildren.num_elts; i++) + { + struct symt_compiland** p = vector_at(&msc_dbg->module->top->vchildren, i); + if (symt_check_tag(&(*p)->symt, SymTagCompiland) && (*p)->source == src_idx) + return *p; + } + return symt_new_compiland(msc_dbg->module, src_idx); +} + static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root, unsigned offset, unsigned size, const struct cv_module_snarf* cvmod, @@ -2260,7 +2278,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, /* overwrite compiland name from outter context (if any) */ if (objname) - compiland = symt_new_compiland(msc_dbg->module, source_new(msc_dbg->module, NULL, objname)); + compiland = codeview_new_compiland(msc_dbg, objname); /* * Loop over the different types of records and whenever we * find something we are interested in, record it and move on. @@ -2522,17 +2540,13 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_OBJNAME: TRACE("S-ObjName-V3 %s\n", sym->objname_v3.name); if (!compiland) - compiland = symt_new_compiland(msc_dbg->module, - source_new(msc_dbg->module, NULL, - sym->objname_v3.name)); + compiland = codeview_new_compiland(msc_dbg, sym->objname_v3.name); break; case S_OBJNAME_ST: TRACE("S-ObjName-V1 %s\n", terminate_string(&sym->objname_v1.p_name)); if (!compiland) - compiland = symt_new_compiland(msc_dbg->module, - source_new(msc_dbg->module, NULL, - terminate_string(&sym->objname_v1.p_name))); + compiland = codeview_new_compiland(msc_dbg, terminate_string(&sym->objname_v1.p_name)); break; case S_LABEL32_ST:

1 0

Etaash Mathamsetty : ntoskrnl.exe: Implement KeQueryActiveProcessorCount.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 22e9093c801d30b31dee5df41e45fca8a57047fe URL: https://gitlab.winehq.org/wine/wine/-/commit/22e9093c801d30b31dee5df41e45fc… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sat Oct 29 00:15:47 2022 -0400 ntoskrnl.exe: Implement KeQueryActiveProcessorCount. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a0a073eda2e..66c39996d59 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2602,6 +2602,16 @@ ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT group_number) return GetActiveProcessorCount(group_number); } +ULONG WINAPI KeQueryActiveProcessorCount(PKAFFINITY active_processors) +{ + TRACE("active_processors %p.\n", active_processors); + + if(active_processors) + *active_processors = KeQueryActiveProcessors(); + + return KeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS); +} + /********************************************************************** * KeQueryInterruptTime (NTOSKRNL.EXE.@) * diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index cfb74a008b6..0a484829ca3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -600,6 +600,7 @@ @ stub KePulseEvent @ stdcall KeQueryActiveProcessors() @ stdcall KeQueryActiveProcessorCountEx(long) +@ stdcall KeQueryActiveProcessorCount(ptr) @ stdcall KeQueryActiveGroupCount() GetActiveProcessorGroupCount @ stdcall KeQueryInterruptTime() @ stdcall KeQueryPriorityThread(ptr)

1 0