December 2022 - Wine-commits

Torge Matthies : msvcr110: Implement _StructuredTaskCollection constructor.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: d1468c2b609df6b278fb9f9357441995ffd58939 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1468c2b609df6b278fb9f93574419… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr110: Implement _StructuredTaskCollection constructor. --- dlls/msvcr120/tests/msvcr120.c | 6 +++--- dlls/msvcrt/concurrency.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 91e9bae1cf8..0a4fb383e0e 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1403,7 +1403,7 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) MSVCRT_bool canceling = call_func1( p__StructuredTaskCollection__IsCanceling, chore->chore.task_collection); - ok(canceling, "Task is not canceling\n"); + todo_wine ok(canceling, "Task is not canceling\n"); } } @@ -1433,7 +1433,7 @@ static void test_StructuredTaskCollection(void) skip("_StructuredTaskCollection constructor not implemented\n"); return; } - ok(task_coll.unk2 == 0x1fffffff, + todo_wine ok(task_coll.unk2 == 0x1fffffff, "_StructuredTaskCollection ctor set wrong unk2: 0x%x != 0x1fffffff\n", task_coll.unk2); ok(task_coll.unk3 == NULL, "_StructuredTaskCollection ctor set wrong unk3: %p != NULL\n", task_coll.unk3); @@ -1587,7 +1587,7 @@ static void test_StructuredTaskCollection(void) ok(b, "SetEvent failed\n"); status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); - ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + todo_wine ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); call_func1(p__StructuredTaskCollection_dtor, &task_coll); CloseHandle(chore_start_evt); diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index fbb2c8b4147..5a6bbec5452 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1873,8 +1873,14 @@ DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_ctor, 8) _StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( _StructuredTaskCollection *this, /*_CancellationTokenState*/void *token) { - FIXME("(%p): stub\n", this); - return NULL; + TRACE("(%p)\n", this); + + if (token) + FIXME("_StructuredTaskCollection with cancellation token not implemented!\n"); + + memset(this, 0, sizeof(*this)); + this->finished = FINISHED_INITIAL; + return this; } #endif /* _MSVCR_VER >= 110 */

1 0

Torge Matthies : msvcr100: Implement missing_wait exception.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: cef3dcbddd1fc86d5ea82017548022fbe949d633 URL: https://gitlab.winehq.org/wine/wine/-/commit/cef3dcbddd1fc86d5ea82017548022… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr100: Implement missing_wait exception. --- dlls/concrt140/concrt140.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/concurrency.c | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 65 insertions(+), 28 deletions(-)

1 0

Torge Matthies : msvcr120: Throw exception in ~_StructuredTaskCollection if _RunAndWait was not called.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: a261c043ebc74d39462a31a0dfcacf055f4b6c4c URL: https://gitlab.winehq.org/wine/wine/-/commit/a261c043ebc74d39462a31a0dfcacf… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr120: Throw exception in ~_StructuredTaskCollection if _RunAndWait was not called. --- dlls/msvcrt/concurrency.c | 11 +++++++++++ dlls/msvcrt/cxx.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 6d7e9f18d63..fe156938e3a 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -686,6 +686,9 @@ DEFINE_CXX_DATA1(invalid_multiple_scheduling, &cexception_cxx_type_info, cexcept DEFINE_CXX_DATA1(invalid_scheduler_policy_key, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_thread_specification, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_value, &cexception_cxx_type_info, cexception_dtor) +#if _MSVCR_VER >= 120 +DEFINE_CXX_DATA1(missing_wait, &cexception_cxx_type_info, cexception_dtor) +#endif DEFINE_CXX_DATA1(scheduler_resource_allocation_error, &cexception_cxx_type_info, cexception_dtor) __ASM_BLOCK_BEGIN(concurrency_exception_vtables) @@ -1930,6 +1933,11 @@ DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_dtor, 4) void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) { FIXME("(%p): stub!\n", this); + if (this->count && !__uncaught_exception()) { + missing_wait e; + missing_wait_ctor_str(&e, "Missing call to _RunAndWait"); + _CxxThrowException(&e, &missing_wait_exception_type); + } } #endif /* _MSVCR_VER >= 120 */ @@ -3445,6 +3453,9 @@ void msvcrt_init_concurrency(void *base) init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); init_invalid_scheduler_policy_value_cxx(base); +#if _MSVCR_VER >= 120 + init_missing_wait_cxx(base); +#endif init_scheduler_resource_allocation_error_cxx(base); #endif } diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index c2558974b73..aa73aabf797 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -321,3 +321,5 @@ void exception_ptr_from_record(exception_ptr*,EXCEPTION_RECORD*) DECLSPEC_HIDDEN void __cdecl __ExceptionPtrCreate(exception_ptr*); void __cdecl __ExceptionPtrDestroy(exception_ptr*); void __cdecl __ExceptionPtrRethrow(const exception_ptr*); + +BOOL __cdecl __uncaught_exception(void);

1 0

Jacek Caban : winevulkan: Rename needs_host_type to needs_win32_type.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: c65bfc062bfe1e2256a814ec7a0286214da04b0e URL: https://gitlab.winehq.org/wine/wine/-/commit/c65bfc062bfe1e2256a814ec7a0286… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 15:56:39 2022 +0100 winevulkan: Rename needs_host_type to needs_win32_type. --- dlls/winevulkan/make_vulkan | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 40ea2aa79d5..fb8aa1f8185 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1260,8 +1260,8 @@ class VkVariable(object): return (self.is_struct() or (self.is_union() and self.selector)) and self.struct.needs_alloc(conv, unwrap) - def needs_host_type(self): - return (self.is_struct() or (self.is_union() and self.selector)) and self.struct.needs_host_type() + def needs_win32_type(self): + return (self.is_struct() or (self.is_union() and self.selector)) and self.struct.needs_win32_type() def get_conversions(self, unwrap, parent_const=False): """ Get a list of conversions required for this parameter if any. @@ -1315,7 +1315,7 @@ class VkVariable(object): cast_type += "PTR32 *" else: cast_type += self.type - if self.needs_host_type(): + if self.needs_win32_type(): cast_type += "32" if self.is_pointer(): @@ -1496,7 +1496,7 @@ class VkMember(VkVariable): text += "struct " text += self.type - if conv and self.needs_host_type(): + if conv and self.needs_win32_type(): text += "32" if self.is_pointer(): @@ -1717,7 +1717,7 @@ class VkParam(VkVariable): proto += self.type name = self.name - if conv and self.needs_host_type(): + if conv and self.needs_win32_type(): proto += "32" if is_member and self.needs_alignment(): @@ -2139,7 +2139,7 @@ class VkStruct(Sequence): return False - def needs_host_type(self): + def needs_win32_type(self): # VkAllocationCallbacks never needs conversion if self.name == "VkAllocationCallbacks": return False @@ -2151,7 +2151,7 @@ class VkStruct(Sequence): return True if m.needs_alignment(): return True - if (m.is_struct() or m.is_union()) and m.struct.needs_host_type(): + if (m.is_struct() or m.is_union()) and m.struct.needs_win32_type(): return True def set_type_info(self, types): @@ -2233,7 +2233,7 @@ class StructConversionFunction(object): needs_alloc = self.direction != Direction.OUTPUT and self.operand.needs_alloc(self.conv, self.unwrap) win_type = self.type - if self.conv and self.operand.needs_host_type(): + if self.conv and self.operand.needs_win32_type(): win_type += "32" if self.direction == Direction.OUTPUT and self.const: win_type = "const " + win_type @@ -2323,7 +2323,7 @@ class StructConversionFunction(object): continue stype = next(x for x in ext.members if x.name == "sType").values - win_type = ext.name + "32" if self.conv and ext.needs_host_type() else ext.name + win_type = ext.name + "32" if self.conv and ext.needs_win32_type() else ext.name if self.direction == Direction.INPUT: in_type = "const " + win_type out_type = ext.name @@ -2421,7 +2421,7 @@ class ArrayConversionFunction(object): win_type = self.type if self.conv: - if self.array.needs_host_type(): + if self.array.needs_win32_type(): win_type += "32" elif self.array.is_handle() and self.array.handle.is_dispatchable(): win_type = "PTR32" @@ -2545,7 +2545,7 @@ class VkGenerator(object): # Build a list conversion functions for struct conversion. self.conversions = [] - self.host_structs = [] + self.win32_structs = [] for func in self.registry.funcs.values(): if not func.needs_exposing(): continue @@ -2560,18 +2560,18 @@ class VkGenerator(object): continue for e in conv.operand.struct_extensions: - if not e.required or not e.needs_host_type(): + if not e.required or not e.needs_win32_type(): continue - if not any(s.name == e.name for s in self.host_structs): - self.host_structs.append(e) + if not any(s.name == e.name for s in self.win32_structs): + self.win32_structs.append(e) - if not conv.operand.needs_host_type(): + if not conv.operand.needs_win32_type(): continue # Structs can be used in different ways by different conversions # e.g. array vs non-array. Just make sure we pull in each struct once. - if not any(s.name == conv.operand.name for s in self.host_structs): - self.host_structs.append(conv.operand) + if not any(s.name == conv.operand.name for s in self.win32_structs): + self.win32_structs.append(conv.operand) def _generate_copyright(self, f, spec_file=False): f.write("# " if spec_file else "/* ") @@ -2598,7 +2598,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") - for struct in self.host_structs: + for struct in self.win32_structs: f.write(struct.definition(conv=True, align=True)) f.write("\n")

1 0

Hans Leidekker : wtsapi32: Improve the stub for WTSQuerySessionInformation(WTSClientProtocolType).
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 090e574adb0c65eb905f5380ff5c4f9dae9bb529 URL: https://gitlab.winehq.org/wine/wine/-/commit/090e574adb0c65eb905f5380ff5c4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 1 16:01:40 2022 +0100 wtsapi32: Improve the stub for WTSQuerySessionInformation(WTSClientProtocolType). --- dlls/wtsapi32/tests/wtsapi.c | 10 ++++++++++ dlls/wtsapi32/wtsapi32.c | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 32caa05588c..2023a21e938 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -192,6 +192,7 @@ static void test_WTSQuerySessionInformation(void) WCHAR *buf1, usernameW[UNLEN + 1], computernameW[MAX_COMPUTERNAME_LENGTH + 1]; char *buf2, username[UNLEN + 1], computername[MAX_COMPUTERNAME_LENGTH + 1]; DWORD count, tempsize; + USHORT *protocol; BOOL ret; SetLastError(0xdeadbeef); @@ -283,6 +284,15 @@ static void test_WTSQuerySessionInformation(void) ok(!stricmp(buf2, computername), "expected %s, got %s\n", computername, buf2); ok(count == tempsize + 1, "expected %lu, got %lu\n", tempsize + 1, count); WTSFreeMemory(buf2); + + count = 0; + protocol = NULL; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSClientProtocolType, + (char **)&protocol, &count); + ok(ret, "got %lu\n", GetLastError()); + ok(protocol != NULL, "protocol not set\n"); + ok(count == sizeof(*protocol), "got %lu\n", count); + WTSFreeMemory(protocol); } static void test_WTSQueryUserToken(void) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index e7a6297396a..7de1b8124ea 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -418,6 +418,18 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF return FALSE; } + if (class == WTSClientProtocolType) + { + USHORT *protocol; + + if (!(protocol = heap_alloc(sizeof(*protocol)))) return FALSE; + FIXME("returning 0 protocol type\n"); + *protocol = 0; + *buffer = (char *)protocol; + *count = sizeof(*protocol); + return TRUE; + } + if (!WTSQuerySessionInformationW(server, session_id, class, &bufferW, count)) return FALSE; @@ -458,6 +470,18 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF return FALSE; } + if (class == WTSClientProtocolType) + { + USHORT *protocol; + + if (!(protocol = heap_alloc(sizeof(*protocol)))) return FALSE; + FIXME("returning 0 protocol type\n"); + *protocol = 0; + *buffer = (WCHAR *)protocol; + *count = sizeof(*protocol); + return TRUE; + } + if (class == WTSUserName) { DWORD size = UNLEN + 1;

1 0

Robert Wilhelm : wshom.ocx: Implement IWshNetwork2_get_UserName().
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 895f8006f25244a2a09bb338d10856559ffd1b70 URL: https://gitlab.winehq.org/wine/wine/-/commit/895f8006f25244a2a09bb338d10856… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Dec 6 13:50:08 2022 +0100 wshom.ocx: Implement IWshNetwork2_get_UserName(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53971 --- dlls/wshom.ocx/network.c | 20 ++++++++++++++++++-- dlls/wshom.ocx/tests/wshom.c | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index c33f4347762..42ed61ffe01 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -120,9 +120,25 @@ static HRESULT WINAPI WshNetwork2_get_UserDomain(IWshNetwork2 *iface, BSTR *user static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_name) { - FIXME("%p stub\n", user_name); + BOOL ret; + DWORD len = 0; + + TRACE("%p\n", user_name); + + GetUserNameW(NULL, &len); + *user_name = SysAllocStringLen(NULL, len-1); + if (!*user_name) + return E_OUTOFMEMORY; + + ret = GetUserNameW(*user_name, &len); + if (!ret) { + HRESULT hr = HRESULT_FROM_WIN32(GetLastError()); + SysFreeString(*user_name); + *user_name = NULL; + return hr; + } - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WshNetwork2_get_UserProfile(IWshNetwork2 *iface, BSTR *user_profile) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 5b3b7f81720..5212dd83b5c 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -692,7 +692,11 @@ static void test_popup(void) static void test_wshnetwork(void) { IDispatch *disp; + IWshNetwork2 *nw2; + BSTR str,username; HRESULT hr; + DWORD len = 0; + BOOL ret; hr = CoCreateInstance(&CLSID_WshNetwork, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); @@ -703,6 +707,23 @@ static void test_wshnetwork(void) check_interface(disp, &IID_IDispatchEx, FALSE); check_interface(disp, &IID_IObjectWithSite, FALSE); + hr = IDispatch_QueryInterface(disp, &IID_IWshNetwork2, (void**)&nw2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + str = NULL; + hr = IWshNetwork2_get_UserName(nw2, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(str && str[0] != 0, "got empty string\n"); + CHECK_BSTR_LENGTH(str); + GetUserNameW(NULL, &len); + ok(len > 0, "Unexpected len %ld.\n", len); + username = SysAllocStringLen(NULL, len-1); + ret = GetUserNameW(username, &len); + ok(ret == TRUE, "GetUserNameW returned %d.\n", ret); + ok(!wcscmp(str,username), "user names do not match %s %s.\n", debugstr_w(str), debugstr_w(username)); + SysFreeString(username); + SysFreeString(str); + IDispatch_Release(disp); }

1 0

Sven Baars : taskschd/tests: Fix test failures on newer version of Windows 10.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: fab6c2d687e7e680d495857d5bc51683aab4b8a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fab6c2d687e7e680d495857d5bc516… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Dec 8 09:30:23 2022 +0100 taskschd/tests: Fix test failures on newer version of Windows 10. --- dlls/taskschd/tests/scheduler.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 4e156e7ef33..07ba0f4bd95 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -783,7 +783,10 @@ static void test_GetTask(void) /* Delete the folder and recreate it to prevent a crash on w1064v1507 */ hr = ITaskFolder_DeleteFolder(root, Wine, 0); - ok(hr == S_OK, "DeleteTask error %#lx\n", hr); + todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || broken(hr == S_OK) /* w1064v1507 */, + "expected ERROR_FILE_NOT_FOUND, got %#lx\n", hr); + ITaskFolder_Release(folder); hr = ITaskFolder_CreateFolder(root, Wine, v_null, &folder); ok(hr == S_OK, "CreateFolder error %#lx\n", hr);

1 0

Hans Leidekker : winhttp/tests: Reduce send buffer size.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 3797a66404a80b33b5618189fa6630827eb78b8a URL: https://gitlab.winehq.org/wine/wine/-/commit/3797a66404a80b33b5618189fa6630… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 8 10:08:29 2022 +0100 winhttp/tests: Reduce send buffer size. It looks like there was a change on the websocket test server that causes our send operations to block. Reducing the size of the send buffer works around the test failures. The tests still succeed on Windows, which suggests that native sends large buffers in smaller chunks. --- dlls/winhttp/tests/notification.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index a9f782f5e3d..7c313370768 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -776,7 +776,7 @@ static const struct notification websocket_test5[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; -#define BIG_BUFFER_SIZE (32 * 1024) +#define BIG_BUFFER_SIZE (16 * 1024) static void test_websocket(BOOL secure) {

1 0

Alex Henrie : include: Add corecrt_malloc.h.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 926433faa325dd075f03b12d4831eae607bae7f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/926433faa325dd075f03b12d4831ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 7 22:14:11 2022 -0700 include: Add corecrt_malloc.h. --- include/Makefile.in | 1 + include/msvcrt/corecrt_malloc.h | 47 +++++++++++++++++++++++++++++++++++++++++ include/msvcrt/malloc.h | 14 +----------- include/msvcrt/stdlib.h | 5 +---- 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 27c06a30906..d0ae4b4667e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -474,6 +474,7 @@ SOURCES = \ msvcrt/conio.h \ msvcrt/corecrt.h \ msvcrt/corecrt_io.h \ + msvcrt/corecrt_malloc.h \ msvcrt/corecrt_startup.h \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ diff --git a/include/msvcrt/corecrt_malloc.h b/include/msvcrt/corecrt_malloc.h new file mode 100644 index 00000000000..1478a6a6c89 --- /dev/null +++ b/include/msvcrt/corecrt_malloc.h @@ -0,0 +1,47 @@ +/* + * Heap definitions + * + * Copyright 2001 Francois Gouget. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_CORECRT_MALLOC_H +#define __WINE_CORECRT_MALLOC_H + +#include <corecrt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +_ACRTIMP void* __cdecl calloc(size_t,size_t); +_ACRTIMP void __cdecl free(void*); +_ACRTIMP void* __cdecl malloc(size_t); +_ACRTIMP void* __cdecl realloc(void*,size_t); + +_ACRTIMP void* __cdecl _expand(void*,size_t); +_ACRTIMP size_t __cdecl _msize(void*); + +_ACRTIMP void __cdecl _aligned_free(void*); +_ACRTIMP void* __cdecl _aligned_malloc(size_t,size_t); +_ACRTIMP void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t); +_ACRTIMP void* __cdecl _aligned_realloc(void*,size_t,size_t); +_ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_CORECRT_MALLOC_H */ diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index fcbadbeb4e0..359ef4578e9 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -21,6 +21,7 @@ #define __WINE_MALLOC_H #include <corecrt.h> +#include <corecrt_malloc.h> /* heap function constants */ #define _HEAPEMPTY -1 @@ -54,25 +55,12 @@ extern unsigned int _amblksiz; extern "C" { #endif -_ACRTIMP void* __cdecl _expand(void*,size_t); _ACRTIMP int __cdecl _heapadd(void*,size_t); _ACRTIMP int __cdecl _heapchk(void); _ACRTIMP int __cdecl _heapmin(void); _ACRTIMP int __cdecl _heapset(unsigned int); _ACRTIMP size_t __cdecl _heapused(size_t*,size_t*); _ACRTIMP int __cdecl _heapwalk(_HEAPINFO*); -_ACRTIMP size_t __cdecl _msize(void*); - -_ACRTIMP void* __cdecl calloc(size_t,size_t); -_ACRTIMP void __cdecl free(void*); -_ACRTIMP void* __cdecl malloc(size_t); -_ACRTIMP void* __cdecl realloc(void*,size_t); - -_ACRTIMP void __cdecl _aligned_free(void*); -_ACRTIMP void* __cdecl _aligned_malloc(size_t,size_t); -_ACRTIMP void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t); -_ACRTIMP void* __cdecl _aligned_realloc(void*,size_t,size_t); -_ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); _ACRTIMP size_t __cdecl _get_sbh_threshold(void); _ACRTIMP int __cdecl _set_sbh_threshold(size_t size); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index c52423523f7..e7dd2caefc4 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -8,6 +8,7 @@ #ifndef __WINE_STDLIB_H #define __WINE_STDLIB_H +#include <corecrt_malloc.h> #include <corecrt_wstdlib.h> #include <limits.h> @@ -208,23 +209,19 @@ _ACRTIMP int __cdecl atoi(const char*); _ACRTIMP int __cdecl _atoi_l(const char*,_locale_t); _ACRTIMP __msvcrt_long __cdecl atol(const char*); _ACRTIMP __int64 __cdecl atoll(const char*); -_ACRTIMP void* __cdecl calloc(size_t,size_t); #ifndef __i386__ _ACRTIMP div_t __cdecl div(int,int); _ACRTIMP ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif _ACRTIMP lldiv_t __cdecl lldiv(__int64,__int64); _ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); -_ACRTIMP void __cdecl free(void*); _ACRTIMP char* __cdecl getenv(const char*); _ACRTIMP __msvcrt_long __cdecl labs(__msvcrt_long); _ACRTIMP __int64 __cdecl llabs(__int64); -_ACRTIMP void* __cdecl malloc(size_t); _ACRTIMP int __cdecl mblen(const char*,size_t); _ACRTIMP void __cdecl perror(const char*); _ACRTIMP int __cdecl rand(void); _ACRTIMP errno_t __cdecl rand_s(unsigned int*); -_ACRTIMP void* __cdecl realloc(void*,size_t); _ACRTIMP void __cdecl srand(unsigned int); _ACRTIMP float __cdecl strtof(const char*,char**); _ACRTIMP double __cdecl strtod(const char*,char**);

1 0

Francois Gouget : kernel32/tests: Avoid failures when processes start during the process test.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 508b793ec915bae900edb42e10d7bf8d659cd32a URL: https://gitlab.winehq.org/wine/wine/-/commit/508b793ec915bae900edb42e10d7bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 8 03:39:39 2022 +0100 kernel32/tests: Avoid failures when processes start during the process test. On Windows processes sometimes start during test_services_exe() so that the size returned by the first NtQuerySystemInformation() is no longer sufficient for the second call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54094 --- dlls/kernel32/tests/process.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a15f8dd1fa8..5ac6ed57bbe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4949,16 +4949,25 @@ static void test_job_list_attribute(HANDLE parent_job) static void test_services_exe(void) { NTSTATUS status; - ULONG size, offset; + ULONG size, offset, try; char *buf; SYSTEM_PROCESS_INFORMATION *spi; ULONG services_pid = 0, services_session_id = ~0; - status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); + /* Check that passing a zero size returns a size suitable for the next call, + * taking into account that in rare cases processes may start between the + * two NtQuerySystemInformation() calls. So this may require a few tries. + */ + for (try = 0; try < 3; try++) + { + status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); - buf = malloc(size); - status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + buf = malloc(size); + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + if (status != STATUS_INFO_LENGTH_MISMATCH) break; + free(buf); + } ok(status == STATUS_SUCCESS, "got %#lx\n", status); spi = (SYSTEM_PROCESS_INFORMATION *)buf;

1 0