September 2023 - Wine-commits

Alex Henrie : shlwapi: Use CRT allocation functions.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 0a6ea2d3241bc55e7c51347c5e0a4bf8f3d44013 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a6ea2d3241bc55e7c51347c5e0a4b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 1 21:26:37 2023 -0600 shlwapi: Use CRT allocation functions. --- dlls/shlwapi/assoc.c | 23 ++++++++++------------- dlls/shlwapi/msgbox.c | 4 ++-- dlls/shlwapi/ordinal.c | 32 ++++++++++++++++---------------- dlls/shlwapi/path.c | 8 ++++---- dlls/shlwapi/regstream.c | 10 +++++----- dlls/shlwapi/string.c | 12 ++++++------ 6 files changed, 43 insertions(+), 46 deletions(-)

1 0

Alex Henrie : snmpapi: Use CRT allocation functions.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: f62464dd461050a449e73ccbb7ae89a85dfeca5c URL: https://gitlab.winehq.org/wine/wine/-/commit/f62464dd461050a449e73ccbb7ae89… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 1 21:28:42 2023 -0600 snmpapi: Use CRT allocation functions. --- dlls/snmpapi/main.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 4c647b6d2be..4965526a6ed 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -51,7 +51,7 @@ static INT asn_any_copy(AsnAny *dst, const AsnAny *src) BYTE *stream; UINT length = src->asnValue.string.length; - if (!(stream = HeapAlloc(GetProcessHeap(), 0, length))) return SNMPAPI_ERROR; + if (!(stream = malloc(length))) return SNMPAPI_ERROR; memcpy(stream, src->asnValue.string.stream, length); dst->asnValue.string.stream = stream; @@ -63,7 +63,7 @@ static INT asn_any_copy(AsnAny *dst, const AsnAny *src) { UINT *ids, i, size = src->asnValue.object.idLength * sizeof(UINT); - if (!(ids = HeapAlloc(GetProcessHeap(), 0, size))) return SNMPAPI_ERROR; + if (!(ids = malloc(size))) return SNMPAPI_ERROR; dst->asnValue.object.ids = ids; dst->asnValue.object.idLength = src->asnValue.object.idLength; @@ -94,14 +94,14 @@ static void asn_any_free(AsnAny *any) { if (any->asnValue.string.dynamic) { - HeapFree(GetProcessHeap(), 0, any->asnValue.string.stream); + free(any->asnValue.string.stream); any->asnValue.string.stream = NULL; } break; } case ASN_OBJECTIDENTIFIER: { - HeapFree(GetProcessHeap(), 0, any->asnValue.object.ids); + free(any->asnValue.object.ids); any->asnValue.object.ids = NULL; break; } @@ -168,7 +168,7 @@ VOID WINAPIV SnmpUtilDbgPrint(INT loglevel, LPSTR format, ...) LPVOID WINAPI SnmpUtilMemAlloc(UINT nbytes) { TRACE("(%d)\n", nbytes); - return HeapAlloc(GetProcessHeap(), 0, nbytes); + return malloc(nbytes); } /*********************************************************************** @@ -177,7 +177,7 @@ LPVOID WINAPI SnmpUtilMemAlloc(UINT nbytes) LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID mem, UINT nbytes) { TRACE("(%p, %d)\n", mem, nbytes); - return HeapReAlloc(GetProcessHeap(), 0, mem, nbytes); + return realloc(mem, nbytes); } /*********************************************************************** @@ -186,7 +186,7 @@ LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID mem, UINT nbytes) VOID WINAPI SnmpUtilMemFree(LPVOID mem) { TRACE("(%p)\n", mem); - HeapFree(GetProcessHeap(), 0, mem); + free(mem); } /*********************************************************************** @@ -222,7 +222,7 @@ INT WINAPI SnmpUtilOctetsCpy(AsnOctetString *dst, AsnOctetString *src) dst->stream = NULL; return SNMPAPI_NOERROR; } - if ((dst->stream = HeapAlloc(GetProcessHeap(), 0, src->length))) + if ((dst->stream = malloc(src->length))) { unsigned int i; @@ -244,7 +244,7 @@ VOID WINAPI SnmpUtilOctetsFree(AsnOctetString *octets) if (octets) { octets->length = 0; - if (octets->dynamic) HeapFree(GetProcessHeap(), 0, octets->stream); + if (octets->dynamic) free(octets->stream); octets->stream = NULL; octets->dynamic = FALSE; } @@ -294,9 +294,9 @@ INT WINAPI SnmpUtilOidAppend(AsnObjectIdentifier *dst, AsnObjectIdentifier *src) if (!src) return SNMPAPI_NOERROR; size = (src->idLength + dst->idLength) * sizeof(UINT); - if (!(ids = HeapReAlloc(GetProcessHeap(), 0, dst->ids, size))) + if (!(ids = realloc(dst->ids, size))) { - if (!(ids = HeapAlloc(GetProcessHeap(), 0, size))) + if (!(ids = malloc(size))) { SetLastError(SNMP_MEM_ALLOC_ERROR); return SNMPAPI_ERROR; @@ -325,7 +325,7 @@ INT WINAPI SnmpUtilOidCpy(AsnObjectIdentifier *dst, AsnObjectIdentifier *src) dst->ids = NULL; return SNMPAPI_NOERROR; } - if ((dst->ids = HeapAlloc(GetProcessHeap(), 0, src->idLength * sizeof(UINT)))) + if ((dst->ids = malloc(src->idLength * sizeof(UINT)))) { unsigned int i; @@ -346,7 +346,7 @@ VOID WINAPI SnmpUtilOidFree(AsnObjectIdentifier *oid) if (!oid) return; oid->idLength = 0; - HeapFree(GetProcessHeap(), 0, oid->ids); + free(oid->ids); oid->ids = NULL; } @@ -404,14 +404,14 @@ INT WINAPI SnmpUtilVarBindCpy(SnmpVarBind *dst, SnmpVarBind *src) } size = src->name.idLength * sizeof(UINT); - if (!(dst->name.ids = HeapAlloc(GetProcessHeap(), 0, size))) return SNMPAPI_ERROR; + if (!(dst->name.ids = malloc(size))) return SNMPAPI_ERROR; for (i = 0; i < src->name.idLength; i++) dst->name.ids[i] = src->name.ids[i]; dst->name.idLength = src->name.idLength; if (!asn_any_copy(&dst->value, &src->value)) { - HeapFree(GetProcessHeap(), 0, dst->name.ids); + free(dst->name.ids); return SNMPAPI_ERROR; } return SNMPAPI_NOERROR; @@ -427,7 +427,7 @@ VOID WINAPI SnmpUtilVarBindFree(SnmpVarBind *vb) if (!vb) return; asn_any_free(&vb->value); - HeapFree(GetProcessHeap(), 0, vb->name.ids); + free(vb->name.ids); vb->name.idLength = 0; vb->name.ids = NULL; } @@ -449,7 +449,7 @@ INT WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *dst, SnmpVarBindList *src) return SNMPAPI_NOERROR; } size = src->len * sizeof(SnmpVarBind); - if (!(dst->list = HeapAlloc(GetProcessHeap(), 0, size))) + if (!(dst->list = malloc(size))) return SNMPAPI_ERROR; src_entry = src->list; @@ -464,7 +464,7 @@ INT WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *dst, SnmpVarBindList *src) else { for (--i; i > 0; i--) SnmpUtilVarBindFree(--dst_entry); - HeapFree(GetProcessHeap(), 0, dst->list); + free(dst->list); return SNMPAPI_ERROR; } } @@ -484,7 +484,7 @@ VOID WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *vb) entry = vb->list; for (i = 0; i < vb->len; i++) SnmpUtilVarBindFree(entry++); - HeapFree(GetProcessHeap(), 0, vb->list); + free(vb->list); vb->list = NULL; vb->len = 0; }

1 0

Alex Henrie : uiautomationcore: Use CRT allocation functions.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: d89665847f2f1d1616b68b3d5e0184c94f93a06d URL: https://gitlab.winehq.org/wine/wine/-/commit/d89665847f2f1d1616b68b3d5e0184… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 1 21:36:24 2023 -0600 uiautomationcore: Use CRT allocation functions. --- dlls/uiautomationcore/uia_client.c | 32 ++++++++-------- dlls/uiautomationcore/uia_com_client.c | 68 +++++++++++++++++----------------- dlls/uiautomationcore/uia_event.c | 40 ++++++++++---------- dlls/uiautomationcore/uia_main.c | 14 +++---- dlls/uiautomationcore/uia_private.h | 6 +-- dlls/uiautomationcore/uia_provider.c | 20 +++++----- dlls/uiautomationcore/uia_utils.c | 22 +++++------ 7 files changed, 99 insertions(+), 103 deletions(-)

1 0

Alex Henrie : mpr: Use CRT allocation functions.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 61c5d2a0e303cda1ccd4c3fcadb2a1853ff8e121 URL: https://gitlab.winehq.org/wine/wine/-/commit/61c5d2a0e303cda1ccd4c3fcadb2a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 28 23:53:29 2023 -0600 mpr: Use CRT allocation functions. --- dlls/mpr/mpr_main.c | 13 ++---- dlls/mpr/pwcache.c | 12 ++--- dlls/mpr/wnet.c | 124 +++++++++++++++++++++++++--------------------------- 3 files changed, 69 insertions(+), 80 deletions(-)

1 0

Martin Storsjö : include: Add the D3D_PRIMITIVE enum and the D3D12_PRIMITIVE typedef.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: vkd3d Branch: master Commit: fdaacb158ec3cc15eeababa5d98c0ae61a99c9bd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fdaacb158ec3cc15eeababa5d98c0… Author: Martin Storsjö <martin(a)martin.st> Date: Sun Sep 3 00:43:23 2023 +0300 include: Add the D3D_PRIMITIVE enum and the D3D12_PRIMITIVE typedef. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 2 ++ include/vkd3d_d3dcommon.idl | 86 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 8f9c226e..71a74999 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1599,6 +1599,8 @@ typedef enum D3D12_INDEX_BUFFER_STRIP_CUT_VALUE typedef D3D_PRIMITIVE_TOPOLOGY D3D12_PRIMITIVE_TOPOLOGY; +typedef D3D_PRIMITIVE D3D12_PRIMITIVE; + typedef enum D3D12_PRIMITIVE_TOPOLOGY_TYPE { D3D12_PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED = 0, diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index 0e0d4f7b..b7948609 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -21,6 +21,92 @@ import "vkd3d_windows.h"; #include "vkd3d_unknown.idl" +typedef enum D3D_PRIMITIVE +{ + D3D_PRIMITIVE_UNDEFINED, + D3D_PRIMITIVE_POINT, + D3D_PRIMITIVE_LINE, + D3D_PRIMITIVE_TRIANGLE, + D3D_PRIMITIVE_LINE_ADJ = 6, + D3D_PRIMITIVE_TRIANGLE_ADJ, + D3D_PRIMITIVE_1_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_2_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_3_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_4_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_5_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_6_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_7_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_8_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_9_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_10_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_11_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_12_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_13_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_14_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_15_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_16_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_17_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_18_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_19_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_20_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_21_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_22_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_23_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_24_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_25_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_26_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_27_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_28_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_29_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_30_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_31_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_32_CONTROL_POINT_PATCH, + D3D10_PRIMITIVE_UNDEFINED = 0, + D3D10_PRIMITIVE_POINT, + D3D10_PRIMITIVE_LINE, + D3D10_PRIMITIVE_TRIANGLE, + D3D10_PRIMITIVE_LINE_ADJ = 6, + D3D10_PRIMITIVE_TRIANGLE_ADJ, + D3D11_PRIMITIVE_UNDEFINED = 0, + D3D11_PRIMITIVE_POINT, + D3D11_PRIMITIVE_LINE, + D3D11_PRIMITIVE_TRIANGLE, + D3D11_PRIMITIVE_LINE_ADJ = 6, + D3D11_PRIMITIVE_TRIANGLE_ADJ, + D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH, +} D3D_PRIMITIVE; + typedef enum D3D_PRIMITIVE_TOPOLOGY { D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0,

1 0

Giovanni Mascellani : ci: Run the tests on a 32 bit Linux system.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: vkd3d Branch: master Commit: f525e9e93a991480fce9a54cdfb1c780d5d44639 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f525e9e93a991480fce9a54cdfb1c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Aug 31 22:37:53 2023 +0200 ci: Run the tests on a 32 bit Linux system. --- gitlab/README | 8 ++++---- gitlab/build.yml | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/gitlab/README b/gitlab/README index b04a3c8f..ef4d0bed 100644 --- a/gitlab/README +++ b/gitlab/README @@ -11,10 +11,10 @@ testing, and uploads it to the GitLab container registry. The Docker script is in the file image.docker. The file build.yml contains the actual testing targets. Currently -vkd3d is tested on Linux x86-64, with two different Vulkan drivers -(both from Mesa): llvmpipe (a software implementation) and RADV (a -hardware implementation backed by an AMD GPU). The testing logs are -available as CI artifacts. +vkd3d is tested on Linux, on x86-64 and i386, each architecture with +two different Vulkan drivers (both from Mesa): llvmpipe (a software +implementation) and RADV (a hardware implementation backed by an AMD +GPU). The testing logs are available as CI artifacts. Some custom runner configuration is required in order to run the tests on an AMD GPU. Specifically, a runner tagged with `amd-gpu' must be diff --git a/gitlab/build.yml b/gitlab/build.yml index c10d64a6..780d645b 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -25,15 +25,30 @@ paths: - artifacts -build-radv: +build-radv-64: extends: .build tags: - amd-gpu variables: VK_LOADER_DRIVERS_SELECT: 'radeon_*' -build-llvmpipe: +build-llvmpipe-64: extends: .build allow_failure: true variables: VK_LOADER_DRIVERS_SELECT: 'lvp_*' + +build-radv-32: + extends: .build + tags: + - amd-gpu + variables: + VK_LOADER_DRIVERS_SELECT: 'radeon_*' + CC: 'gcc -m32' + +build-llvmpipe-32: + extends: .build + allow_failure: true + variables: + VK_LOADER_DRIVERS_SELECT: 'lvp_*' + CC: 'gcc -m32'

1 0

Dmitry Timoshkov : kerberos: Add ISC_REQ_DELEGATE to the list of supported flags.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 73c9bb07100aedc5353aa4f84121707de116a4f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/73c9bb07100aedc5353aa4f8412170… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 10 14:20:20 2022 +0300 kerberos: Add ISC_REQ_DELEGATE to the list of supported flags. Both ISC_REQ_DELEGATE and ISC_RET_DELEGATE are properly translated by the Unix side. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0cd44b9ca96..ae68c4b90c2 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -477,7 +477,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE | - ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION; + ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION | ISC_REQ_DELEGATE; char *target = NULL; NTSTATUS status; ULONG exptime;

1 0

Jinoh Kang : loader: Fix calculation of thread_data address in Linux x86-64 preloader.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 81f7329f4c5cefb2be4e0badcb52bb9019b5485d URL: https://gitlab.winehq.org/wine/wine/-/commit/81f7329f4c5cefb2be4e0badcb52bb… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Sep 2 17:50:56 2023 +0900 loader: Fix calculation of thread_data address in Linux x86-64 preloader. Fixes: ac1761d1dae8bf114a05e28ed6886deba6c2c860 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55508 --- loader/preloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 635e85ee7cb..42959bcb49a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -353,7 +353,7 @@ __ASM_GLOBAL_FUNC(_start, "movq %rsp,%rax\n\t" "leaq -144(%rsp),%rsp\n\t" /* allocate some space for extra aux values */ "movq %rax,(%rsp)\n\t" /* orig stack pointer */ - "movq thread_data(%rip),%rsi\n\t" + "leaq thread_data(%rip),%rsi\n\t" "movq $0x1002,%rdi\n\t" /* ARCH_SET_FS */ "movq $158,%rax\n\t" /* SYS_arch_prctl */ "syscall\n\t"

1 0

Jinoh Kang : loader: Don't return from __stack_chk_fail() stub in preloader.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: da74da2939183cbfa06324114135b3e769b7c40a URL: https://gitlab.winehq.org/wine/wine/-/commit/da74da2939183cbfa06324114135b3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Sep 2 18:24:49 2023 +0900 loader: Don't return from __stack_chk_fail() stub in preloader. GCC expects __stack_chk_fail() to be noreturn[1]. Returning from __stack_chk_fail() can thus lead to subtle failures. When crashing, use a volatile NULL pointer dereference. Ideally we would like to "abort()" here, but doing so would require two more syscall definitions just for a cold function. After all, the function isn't even used at all if -fno-stack-protector is specified. Also, don't say "stack smashing" (unlike glibc). The preloader currently initializes the stack canary value to a fixed value (0), which serves little value in protecting against actual buffer overrun attacks. [1]: https://gcc.gnu.org/onlinedocs/gcc-9.1.0/gccint/Stack-Smashing-Protection.h… --- loader/preloader.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 42959bcb49a..d0551bae63a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -175,11 +175,6 @@ struct wld_auxv */ void __bb_init_func(void) { return; } -/* similar to the above but for -fstack-protector */ -void *__stack_chk_guard = 0; -void __stack_chk_fail_local(void) { return; } -void __stack_chk_fail(void) { return; } - #ifdef __i386__ /* data for setting up the glibc-style thread-local storage in %gs */ @@ -759,6 +754,33 @@ static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char wld_exit(1); } +/* + * The __stack_chk_* symbols are only used when file is compiled with gcc flags + * "-fstack-protector". This function is normally provided by libc's startup + * files, but since we build the preloader with "-nostartfiles -nodefaultlibs", + * we have to provide our own version to keep the linker happy. + */ +unsigned long __stack_chk_guard = 0; + +void __attribute__((noreturn)) __stack_chk_fail(void) +{ + static const char message[] = "preloader: stack overrun detected, crashing\n"; + + /* Avoid using non-syscall functions that can re-enter this function */ + wld_write(2, message, sizeof(message) - 1); + + /* Deliberate induce crash and possibly dump core */ + *(volatile char *)0; + + /* Last resort if the zero page turns out to be actually readable */ + wld_exit(1); +} + +void __attribute__((noreturn)) __stack_chk_fail_local(void) +{ + __stack_chk_fail(); +} + #ifdef DUMP_AUX_INFO /* * Dump interesting bits of the ELF auxv_t structure that is passed

1 0

Alex Henrie : msctf: Use CRT allocation functions.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 161f1b7b6f0c21d46900176fa3890240805980c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/161f1b7b6f0c21d46900176fa38902… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 1 21:13:34 2023 -0600 msctf: Use CRT allocation functions. --- dlls/msctf/categorymgr.c | 8 ++++---- dlls/msctf/compartmentmgr.c | 22 +++++++++++----------- dlls/msctf/context.c | 26 +++++++++++++------------- dlls/msctf/displayattributemgr.c | 4 ++-- dlls/msctf/documentmgr.c | 8 ++++---- dlls/msctf/inputprocessor.c | 22 +++++++++++----------- dlls/msctf/langbarmgr.c | 5 ++--- dlls/msctf/msctf.c | 27 +++++++++++++-------------- dlls/msctf/range.c | 4 ++-- dlls/msctf/threadmgr.c | 34 +++++++++++++++++----------------- 10 files changed, 79 insertions(+), 81 deletions(-)

1 0