- Wine-Commits - list.winehq.org

Maxim Karasev : whoami: Refactor and add more commands.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: aa3beb88b346cd74568157d5c10a464a6995c7c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa3beb88b346cd74568157d5c10a46… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Mon Jul 24 22:15:34 2023 +0300 whoami: Refactor and add more commands. Particularly it implements '/logonid' and '/user' options, as well as adds stubs for '/upn' and '/fqdn'. --- programs/whoami/Makefile.in | 2 +- programs/whoami/main.c | 267 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 239 insertions(+), 30 deletions(-) diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in index 4898a96f456..5be08c702a8 100644 --- a/programs/whoami/Makefile.in +++ b/programs/whoami/Makefile.in @@ -1,5 +1,5 @@ MODULE = whoami.exe -IMPORTS = secur32 +IMPORTS = secur32 advapi32 EXTRADLLFLAGS = -mconsole -municode diff --git a/programs/whoami/main.c b/programs/whoami/main.c index 7e93de998ef..c98a553d32d 100644 --- a/programs/whoami/main.c +++ b/programs/whoami/main.c @@ -1,5 +1,6 @@ /* * Copyright 2020 Brendan Shanks for CodeWeavers + * Copyright 2023 Maxim Karasev <mxkrsv(a)etersoft.ru> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,9 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN #define SECURITY_WIN32 #include <windows.h> #include <security.h> +#include <sddl.h> +#include <stdarg.h> #include "wine/debug.h" @@ -27,67 +31,272 @@ WINE_DEFAULT_DEBUG_CHANNEL(whoami); static int output_write(const WCHAR* str, int len) { DWORD count; + + if (len < 0) + len = wcslen(str); + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL)) { DWORD lenA; - char* strA; + char *strA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall * back to WriteFile() with OEM code page. */ - lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, - NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, lenA); + lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); + strA = malloc(lenA); if (!strA) return 0; - WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, - NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); - HeapFree(GetProcessHeap(), 0, strA); + free(strA); } return count; } -int __cdecl wmain(int argc, WCHAR *argv[]) +static WCHAR *get_user_name(EXTENDED_NAME_FORMAT name_format) { - WCHAR *buf = NULL; ULONG size = 0; - BOOL result; + WCHAR *ret; - if (argc > 1) + if (GetUserNameExW(name_format, NULL, &size) || GetLastError() != ERROR_MORE_DATA) + return NULL; + + ret = malloc(size * sizeof(WCHAR)); + if (!ret) + return NULL; + + if (!GetUserNameExW(name_format, ret, &size)) { - int i; + free(ret); + return NULL; + } + + return ret; +} + +static void *get_token(TOKEN_INFORMATION_CLASS token_type) +{ + HANDLE token_handle; + void *ret; + /* GetTokenInformation wants a dword-aligned buffer */ + ULONG ret_size = sizeof(DWORD) * 256; + ULONG token_size; + + ret = malloc(ret_size); + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token_handle)) + return NULL; - WINE_FIXME("unsupported arguments:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + if (!GetTokenInformation(token_handle, token_type, ret, ret_size, &token_size)) + { + CloseHandle(token_handle); + return NULL; + } + + CloseHandle(token_handle); + return ret; +} + +static SID *get_process_sid(void) +{ + ULONG user_sid_len; + TOKEN_USER *token_user; + SID *ret; + + token_user = get_token(TokenUser); + if (!token_user) + return NULL; + + user_sid_len = GetLengthSid(token_user->User.Sid); + ret = malloc(user_sid_len); + if (!ret) + { + free(token_user); + return NULL; } - result = GetUserNameExW(NameSamCompatible, NULL, &size); - if (result || GetLastError() != ERROR_MORE_DATA) + if (!CopySid(user_sid_len, ret, token_user->User.Sid)) { - WINE_ERR("GetUserNameExW failed, result %d, error %ld\n", result, GetLastError()); + free(token_user); + free(ret); + return NULL; + } + + free(token_user); + return ret; +} + +static SID *get_logon_sid(void) +{ + TOKEN_GROUPS *token_groups; + DWORD group_token_len; + DWORD i; + SID *ret; + + token_groups = get_token(TokenGroups); + if (!token_groups) + return NULL; + + for (i = 0; i < token_groups->GroupCount; i++) + { + if ((token_groups->Groups[i].Attributes & SE_GROUP_LOGON_ID) == SE_GROUP_LOGON_ID) + { + group_token_len = GetLengthSid(token_groups->Groups[i].Sid); + ret = malloc(group_token_len); + if (!ret) + { + free(token_groups); + return NULL; + } + + if (!CopySid(group_token_len, ret, token_groups->Groups[i].Sid)) + { + free(token_groups); + free(ret); + return NULL; + } + + free(token_groups); + return ret; + } + } + + free(token_groups); + return NULL; +} + +static int simple(EXTENDED_NAME_FORMAT name_format) +{ + WCHAR *name; + + name = get_user_name(name_format); + if (!name) + { + ERR("get_user_name failed\n"); return 1; } - buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (!buf) + output_write(name, -1); + output_write(L"\n", 1); + + free(name); + + return 0; +} + +static int logon_id(void) +{ + PSID sid; + WCHAR *sid_string; + + sid = get_logon_sid(); + if (!sid) { - WINE_ERR("Memory allocation failed\n"); + ERR("get_logon_sid failed\n"); return 1; } - result = GetUserNameExW(NameSamCompatible, buf, &size); - if (result) + if (!ConvertSidToStringSidW(sid, &sid_string)) { - output_write(buf, size); - output_write(L"\r\n", 2); + ERR("ConvertSidToStringSidW failed, error %ld\n", GetLastError()); + return 1; + } + + output_write(sid_string, -1); + output_write(L"\n", 1); + + free(sid); + LocalFree(sid_string); + + return 0; +} + +static int user(void) +{ + PSID sid; + WCHAR *name; + WCHAR *sid_string; + ULONG i; + + name = get_user_name(NameSamCompatible); + if (!name) + { + ERR("get_user_name failed\n"); + return 1; + } + + sid = get_process_sid(); + if (!sid) + { + ERR("get_process_sid failed\n"); + return 1; } - else - WINE_ERR("GetUserNameExW failed, error %ld\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, buf); + if (!ConvertSidToStringSidW(sid, &sid_string)) + { + ERR("ConvertSidToStringSidW failed, error %ld\n", GetLastError()); + return 1; + } + + output_write(L"\nUSER INFORMATION\n----------------\n\n", -1); + output_write(L"User Name", -1); + for (i = 0; i <= max(wcslen(name), wcslen(L"User Name")) - wcslen(L"User Name"); i++) + output_write(L" ", 1); + output_write(L"SID\n", -1); + + for (i = 0; i < wcslen(name); i++) + output_write(L"=", 1); + output_write(L" ", 1); + for (i = 0; i < wcslen(sid_string); i++) + output_write(L"=", 1); + output_write(L"\n", 1); + + output_write(name, -1); + output_write(L" ", 1); + output_write(sid_string, -1); + output_write(L"\n", 1); + + free(name); + free(sid); + LocalFree(sid_string); + return 0; } + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + if (argv[1] == NULL) + { + + return simple(NameSamCompatible); + } + else + { + wcslwr(argv[1]); + + if (!wcscmp(argv[1], L"/upn")) + { + /* Not implemented as of now, therefore fails */ + return simple(NameUserPrincipal); + } + else if (!wcscmp(argv[1], L"/fqdn")) + { + /* Not implemented as of now, therefore fails */ + return simple(NameFullyQualifiedDN); + } + else if (!wcscmp(argv[1], L"/logonid")) + { + return logon_id(); + } + else if (!wcscmp(argv[1], L"/user")) + { + return user(); + } + else + { + FIXME("stub\n"); + return 0; + } + } +}

1 0

Maxim Karasev : secur32: Add stub message for unimplemented name types in GetUserNameExW.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 5abe9de59fdc88a8c742f313f35cb175c60da98e URL: https://gitlab.winehq.org/wine/wine/-/commit/5abe9de59fdc88a8c742f313f35cb1… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Wed Aug 2 20:42:07 2023 +0300 secur32: Add stub message for unimplemented name types in GetUserNameExW. --- dlls/secur32/secur32.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 46a80c9a76c..bb723e90004 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1140,6 +1140,7 @@ BOOLEAN WINAPI GetUserNameExW( case NameCanonicalEx: case NameServicePrincipal: case NameDnsDomain: + FIXME("NameFormat %d not implemented\n", NameFormat); SetLastError(ERROR_NONE_MAPPED); return FALSE;

1 0

Alex Henrie : include: Annotate PALLOCATE_FUNCTION(_EX) with __WINE_ALLOC_SIZE.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 6bd87223bff8bd7a28e4206a3c5b5907cb73c1eb URL: https://gitlab.winehq.org/wine/wine/-/commit/6bd87223bff8bd7a28e4206a3c5b59… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PALLOCATE_FUNCTION(_EX) with __WINE_ALLOC_SIZE. --- include/ddk/wdm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 79c88315c2e..45503f48a4e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1407,8 +1407,8 @@ typedef struct _KLOCK_QUEUE_HANDLE { KIRQL OldIrql; } KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; -typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); -typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); +typedef void * (__WINE_ALLOC_SIZE(2) NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); +typedef void * (__WINE_ALLOC_SIZE(2) NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PFREE_FUNCTION)(void *); typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PCALLBACK_FUNCTION)(void *, void *, void *);

1 0

Paul Gofman : opengl32: Skip debug callback messages called from native thread.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 51b671532715bd2a0486a2c7ddf23134d81ba688 URL: https://gitlab.winehq.org/wine/wine/-/commit/51b671532715bd2a0486a2c7ddf231… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 11 17:57:29 2023 -0600 opengl32: Skip debug callback messages called from native thread. --- dlls/opengl32/unix_wgl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index cf819e96df2..4cf12893541 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -903,8 +903,15 @@ static void gl_debug_message_callback( GLenum source, GLenum type, GLuint id, GL }; void *ret_ptr; ULONG ret_len; - struct wgl_handle *ptr = (struct wgl_handle *)userParam; + + if (!NtCurrentTeb()) + { + fprintf( stderr, "msg:gl_debug_message_callback called from native thread, severity %#x, message \"%.*s\".\n", + severity, length, message ); + return; + } + if (!(params.user_callback = ptr->u.context->debug_callback)) return; params.user_data = ptr->u.context->debug_user;

1 0

Alex Henrie : include: Annotate PERF_MEM_ALLOC with __WINE_ALLOC_SIZE.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 73883f918c2c43ed382ffbced55246e288827d46 URL: https://gitlab.winehq.org/wine/wine/-/commit/73883f918c2c43ed382ffbced55246… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PERF_MEM_ALLOC with __WINE_ALLOC_SIZE. --- include/perflib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/perflib.h b/include/perflib.h index 232ac308fce..188f26e3e74 100644 --- a/include/perflib.h +++ b/include/perflib.h @@ -23,7 +23,7 @@ extern "C" { #endif -typedef LPVOID (CDECL * PERF_MEM_ALLOC)(SIZE_T,LPVOID); +typedef void * (__WINE_ALLOC_SIZE(1) CDECL * PERF_MEM_ALLOC)(SIZE_T,void*); typedef void (CDECL * PERF_MEM_FREE)(LPVOID,LPVOID); typedef ULONG (WINAPI * PERFLIBREQUEST)(ULONG,PVOID,ULONG);

1 0

Alex Henrie : include: Annotate CFP_(RE)ALLOCPROC with __WINE_ALLOC_SIZE.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: cf1c69c0852ecff192c95023e9056dddef90ddb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf1c69c0852ecff192c95023e9056d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate CFP_(RE)ALLOCPROC with __WINE_ALLOC_SIZE. --- include/fontsub.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/fontsub.h b/include/fontsub.h index aa83f034fcc..4eebe49706b 100644 --- a/include/fontsub.h +++ b/include/fontsub.h @@ -23,8 +23,8 @@ extern "C" { #endif -typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); -typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); +typedef void *(__WINE_ALLOC_SIZE(1) __cdecl *CFP_ALLOCPROC)(size_t); +typedef void *(__WINE_ALLOC_SIZE(2) __cdecl *CFP_REALLOCPROC)(void *, size_t); typedef void (__cdecl *CFP_FREEPROC)(void *); #define TTFCFP_SUBSET 0

1 0

Alex Henrie : include: Annotate PRTL_(AVL|GENERIC)_ALLOCATE_ROUTINE with __WINE_ALLOC_SIZE.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 6354cd9f56c4c02df87e68cd3b777767db0ac603 URL: https://gitlab.winehq.org/wine/wine/-/commit/6354cd9f56c4c02df87e68cd3b7777… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PRTL_(AVL|GENERIC)_ALLOCATE_ROUTINE with __WINE_ALLOC_SIZE. --- include/ddk/ntddk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 9072b9121a0..e8d9bb89ad4 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -163,7 +163,7 @@ typedef struct _RTL_SPLAY_LINKS struct _RTL_GENERIC_TABLE; typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_GENERIC_COMPARE_ROUTINE)(struct _RTL_GENERIC_TABLE *, void *, void *); -typedef void * (WINAPI *PRTL_GENERIC_ALLOCATE_ROUTINE)(struct _RTL_GENERIC_TABLE *, LONG); +typedef void * (__WINE_ALLOC_SIZE(2) WINAPI *PRTL_GENERIC_ALLOCATE_ROUTINE)(struct _RTL_GENERIC_TABLE *, LONG); typedef void (WINAPI *PRTL_GENERIC_FREE_ROUTINE)(struct _RTL_GENERIC_TABLE *Table, void *); typedef struct _RTL_GENERIC_TABLE @@ -193,7 +193,7 @@ struct _RTL_AVL_TABLE; typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); -typedef void * (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); +typedef void * (__WINE_ALLOC_SIZE(2) WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer);

1 0

Alex Henrie : include: Annotate PFLT_CONTEXT_ALLOCATE_CALLBACK with __WINE_ALLOC_SIZE.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: a4752dcf9fad0a8b517757fde13c92af2e20ae0a URL: https://gitlab.winehq.org/wine/wine/-/commit/a4752dcf9fad0a8b517757fde13c92… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PFLT_CONTEXT_ALLOCATE_CALLBACK with __WINE_ALLOC_SIZE. --- include/ddk/fltkernel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h index 8ebebfa2e81..49c9d55dbaa 100644 --- a/include/ddk/fltkernel.h +++ b/include/ddk/fltkernel.h @@ -585,7 +585,7 @@ typedef struct _FLT_CALLBACK_DATA KPROCESSOR_MODE RequestorMode; } FLT_CALLBACK_DATA, *PFLT_CALLBACK_DATA; -typedef void* (WINAPI *PFLT_CONTEXT_ALLOCATE_CALLBACK)(POOL_TYPE,SIZE_T,FLT_CONTEXT_TYPE); +typedef void* (__WINE_ALLOC_SIZE(2) WINAPI *PFLT_CONTEXT_ALLOCATE_CALLBACK)(POOL_TYPE,SIZE_T,FLT_CONTEXT_TYPE); typedef void (WINAPI *PFLT_CONTEXT_CLEANUP_CALLBACK)(PFLT_CONTEXT, FLT_CONTEXT_TYPE); typedef void (WINAPI *PFLT_CONTEXT_FREE_CALLBACK)(void *, FLT_CONTEXT_TYPE); typedef NTSTATUS (WINAPI *PFLT_FILTER_UNLOAD_CALLBACK)(FLT_FILTER_UNLOAD_FLAGS);

1 0

Alex Henrie : include: Annotate PLSA_ALLOCATE_(LSA_HEAP|SHARED_MEMORY) with __WINE_ALLOC_SIZE.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 69a92659c09dee0288c8a5d783154517eb6c5f83 URL: https://gitlab.winehq.org/wine/wine/-/commit/69a92659c09dee0288c8a5d7831545… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PLSA_ALLOCATE_(LSA_HEAP|SHARED_MEMORY) with __WINE_ALLOC_SIZE. --- include/ntsecpkg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 99b9ec7d407..609be585d24 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -179,7 +179,7 @@ typedef NTSTATUS (NTAPI *PLSA_ADD_CREDENTIAL)(PLUID, ULONG, PLSA_STRING, typedef NTSTATUS (NTAPI *PLSA_GET_CREDENTIALS)(PLUID, ULONG, PULONG, BOOLEAN, PLSA_STRING, PULONG, PLSA_STRING); typedef NTSTATUS (NTAPI *PLSA_DELETE_CREDENTIAL)(PLUID, ULONG, PLSA_STRING); -typedef PVOID (NTAPI *PLSA_ALLOCATE_LSA_HEAP)(ULONG); +typedef PVOID (__WINE_ALLOC_SIZE(1) NTAPI *PLSA_ALLOCATE_LSA_HEAP)(ULONG); typedef VOID (NTAPI *PLSA_FREE_LSA_HEAP)(PVOID); typedef NTSTATUS (NTAPI *PLSA_ALLOCATE_CLIENT_BUFFER)(PLSA_CLIENT_REQUEST, ULONG, PVOID*); @@ -213,7 +213,7 @@ typedef BOOLEAN (NTAPI *PLSA_GET_CALL_INFO)(PSECPKG_CALL_INFO); typedef NTSTATUS (NTAPI *PLSA_CALL_PACKAGEEX)(PUNICODE_STRING, PVOID, PVOID, ULONG, PVOID*, PULONG, PNTSTATUS); typedef PVOID (NTAPI *PLSA_CREATE_SHARED_MEMORY)(ULONG, ULONG); -typedef PVOID (NTAPI *PLSA_ALLOCATE_SHARED_MEMORY)(PVOID, ULONG); +typedef PVOID (__WINE_ALLOC_SIZE(2) NTAPI *PLSA_ALLOCATE_SHARED_MEMORY)(PVOID, ULONG); typedef VOID (NTAPI *PLSA_FREE_SHARED_MEMORY)(PVOID, PVOID); typedef BOOLEAN (NTAPI *PLSA_DELETE_SHARED_MEMORY)(PVOID); typedef NTSTATUS (NTAPI *PLSA_OPEN_SAM_USER)(PUNICODE_STRING, SECPKG_NAME_TYPE,

1 0

Alex Henrie : include: Annotate PFNALLOC with __WINE_ALLOC_SIZE.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 8f60004995dfc0830067d5d0450a30ef64c54b14 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f60004995dfc0830067d5d0450a30… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PFNALLOC with __WINE_ALLOC_SIZE. --- include/fdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fdi.h b/include/fdi.h index 2044c59bea6..a4928b06f95 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -203,7 +203,7 @@ typedef struct { /**********************************************************************/ -typedef void * (__cdecl *PFNALLOC)(ULONG cb); +typedef void * (__WINE_ALLOC_SIZE(1) __cdecl *PFNALLOC)(ULONG cb); #define FNALLOC(fn) void * __cdecl fn(ULONG cb) typedef void (__cdecl *PFNFREE)(void *pv);

1 0