August 2023 - Wine-commits - list.winehq.org

Biswapriyo Nath : include: Add xamlom.idl file.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 624c5870e7283abf818e6fd996f1c4433b0731a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/624c5870e7283abf818e6fd996f1c4… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 28 11:32:10 2023 +0300 include: Add xamlom.idl file. --- include/Makefile.in | 1 + include/xamlom.idl | 347 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 348 insertions(+)

1 0

Biswapriyo Nath : include: Add windows.ui.xaml.hosting.desktopwindowxamlsource.idl file.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 24e7055f1d3268a9f50cff2e9e40242ca187b540 URL: https://gitlab.winehq.org/wine/wine/-/commit/24e7055f1d3268a9f50cff2e9e4024… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 28 11:40:27 2023 +0300 include: Add windows.ui.xaml.hosting.desktopwindowxamlsource.idl file. --- include/Makefile.in | 1 + ...ows.ui.xaml.hosting.desktopwindowxamlsource.idl | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 708fd55367a..54b4ab5925e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -857,6 +857,7 @@ SOURCES = \ windows.ui.core.idl \ windows.ui.idl \ windows.ui.viewmanagement.idl \ + windows.ui.xaml.hosting.desktopwindowxamlsource.idl \ windowscontracts.idl \ windowsx.h \ wine/afd.h \ diff --git a/include/windows.ui.xaml.hosting.desktopwindowxamlsource.idl b/include/windows.ui.xaml.hosting.desktopwindowxamlsource.idl new file mode 100644 index 00000000000..fe726ac6f70 --- /dev/null +++ b/include/windows.ui.xaml.hosting.desktopwindowxamlsource.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2023 Biswapriyo Nath + * + * 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 + */ + +import "oaidl.idl"; + +[ + object, + uuid(3cbcf1bf-2f76-4e9c-96ab-e84b37972554), + local, + pointer_default(unique) +] +interface IDesktopWindowXamlSourceNative : IUnknown +{ + HRESULT AttachToWindow([in] HWND parent_wnd); + [propget] HRESULT WindowHandle([out, retval] HWND *wnd); +} + +[ + object, + uuid(e3dcd8c7-3057-4692-99c3-7b7720afda31), + local, + pointer_default(unique) +] +interface IDesktopWindowXamlSourceNative2 : IDesktopWindowXamlSourceNative +{ + HRESULT PreTranslateMessage([in] const MSG *message, [out, retval] BOOL *result); +}

1 0

Jactry Zeng : shlwapi/tests: Test UrlUnescapeW() with independent data.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 75d0ab083906db13257e8f08ca5c6bae2ebc8917 URL: https://gitlab.winehq.org/wine/wine/-/commit/75d0ab083906db13257e8f08ca5c6b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Aug 5 02:34:25 2022 -0500 shlwapi/tests: Test UrlUnescapeW() with independent data. --- dlls/shlwapi/tests/url.c | 71 ++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 6870de4ee5f..3690bc1686c 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -407,7 +407,19 @@ static struct { {"file://%24%25foobar", "file://$%foobar"} }; -/* ################ */ +static struct +{ + const WCHAR *url; + const WCHAR *expect; + DWORD flags; +} TEST_URL_UNESCAPEW[] = +{ + { L"file://foo/bar", L"file://foo/bar" }, + { L"file://fo%20o%5Ca/bar", L"file://fo o\\a/bar" }, + { L"file://%24%25foobar", L"file://$%foobar" }, + { L"file:///C:/Program Files", L"file:///C:/Program Files" }, + { L"file:///C:/Program%20Files", L"file:///C:/Program Files" }, +}; static const struct { const char *path; @@ -1391,17 +1403,14 @@ static void test_UrlIs(void) static void test_UrlUnescape(void) { + WCHAR urlW[INTERNET_MAX_URL_LENGTH], bufferW[INTERNET_MAX_URL_LENGTH]; CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; - WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; - WCHAR *urlW, *expected_urlW; - DWORD dwEscaped; - size_t i; + DWORD dwEscaped, unescaped; static char inplace[] = "file:///C:/Program%20Files"; static char another_inplace[] = "file:///C:/Program%20Files"; static const char expected[] = "file:///C:/Program Files"; - static WCHAR inplaceW[] = L"file:///C:/Program Files"; - static WCHAR another_inplaceW[] = L"file:///C:/Program%20Files"; HRESULT res; + int i; for (i = 0; i < ARRAY_SIZE(TEST_URL_UNESCAPE); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; @@ -1418,21 +1427,30 @@ static void test_UrlUnescape(void) "UrlUnescapeA returned 0x%lx (expected E_INVALIDARG) for \"%s\"\n", res, TEST_URL_UNESCAPE[i].url); ok(strcmp(szReturnUrl,"")==0, "Expected empty string\n"); + } - dwEscaped = INTERNET_MAX_URL_LENGTH; - urlW = GetWideString(TEST_URL_UNESCAPE[i].url); - expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); - res = UrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0); - ok(res == S_OK, - "UrlUnescapeW returned 0x%lx (expected S_OK) for \"%s\"\n", - res, TEST_URL_UNESCAPE[i].url); - - WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); - ok(lstrcmpW(ret_urlW, expected_urlW)==0, - "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", - TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); - FreeWideString(urlW); - FreeWideString(expected_urlW); + for (i = 0; i < ARRAYSIZE(TEST_URL_UNESCAPEW); i++) + { + lstrcpyW(urlW, TEST_URL_UNESCAPEW[i].url); + + memset(bufferW, 0xff, sizeof(bufferW)); + unescaped = INTERNET_MAX_URL_LENGTH; + res = UrlUnescapeW(urlW, bufferW, &unescaped, TEST_URL_UNESCAPEW[i].flags); + ok(res == S_OK, "[%d]: returned %#lx.\n", i, res); + ok(unescaped == wcslen(TEST_URL_UNESCAPEW[i].expect), "[%d]: got unescaped %ld.\n", i, unescaped); + ok(!wcscmp(bufferW, TEST_URL_UNESCAPEW[i].expect), "[%d]: got result %s.\n", i, debugstr_w(bufferW)); + + /* Test with URL_UNESCAPE_INPLACE */ + unescaped = INTERNET_MAX_URL_LENGTH; + res = UrlUnescapeW(urlW, NULL, &unescaped, TEST_URL_UNESCAPEW[i].flags | URL_UNESCAPE_INPLACE); + ok(res == S_OK, "[%d]: returned %#lx.\n", i, res); + ok(unescaped == INTERNET_MAX_URL_LENGTH, "[%d]: got unescaped %ld.\n", i, unescaped); + ok(!wcscmp(urlW, TEST_URL_UNESCAPEW[i].expect), "[%d]: got result %s.\n", i, debugstr_w(urlW)); + + lstrcpyW(urlW, TEST_URL_UNESCAPEW[i].url); + unescaped = wcslen(TEST_URL_UNESCAPEW[i].expect) - 1; + res = UrlUnescapeW(urlW, bufferW, &unescaped, TEST_URL_UNESCAPEW[i].flags); + ok(res == E_POINTER, "[%d]: returned %#lx.\n", i, res); } dwEscaped = sizeof(inplace); @@ -1445,17 +1463,6 @@ static void test_UrlUnescape(void) res = UrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%lx (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); - - dwEscaped = sizeof(inplaceW); - res = UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); - ok(res == S_OK, "UrlUnescapeW returned 0x%lx (expected S_OK)\n", res); - ok(dwEscaped == 50, "got %ld expected 50\n", dwEscaped); - - /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ - res = UrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); - ok(res == S_OK, "UrlUnescapeW returned 0x%lx (expected S_OK)\n", res); - - ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); } static const struct parse_url_test_t {

1 0

Jactry Zeng : kernelbase: Implement URL_UNESCAPE_AS_UTF8 for UrlUnescapeW().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: d482010042fbc5aa0198a0f3777c02f9c443f5dd URL: https://gitlab.winehq.org/wine/wine/-/commit/d482010042fbc5aa0198a0f3777c02… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 8 23:04:34 2022 -0500 kernelbase: Implement URL_UNESCAPE_AS_UTF8 for UrlUnescapeW(). --- dlls/kernelbase/path.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 7eda9bd483c..40ddf840045 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2907,11 +2907,26 @@ HRESULT WINAPI UrlUnescapeA(char *url, char *unescaped, DWORD *unescaped_len, DW return hr; } +static int get_utf8_len(unsigned char code) +{ + if (code < 0x80) + return 1; + else if ((code & 0xe0) == 0xc0) + return 2; + else if ((code & 0xf0) == 0xe0) + return 3; + else if ((code & 0xf8) == 0xf0) + return 4; + return 0; +} + HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, DWORD flags) { + WCHAR *dst, next, utf16_buf[4]; BOOL stop_unescaping = FALSE; + int utf8_len, utf16_len, i; const WCHAR *src; - WCHAR *dst, next; + char utf8_buf[4]; DWORD needed; HRESULT hr; @@ -2930,6 +2945,7 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, for (src = url, needed = 0; *src; src++, needed++) { + utf16_len = 0; if (flags & URL_DONT_UNESCAPE_EXTRA_INFO && (*src == '#' || *src == '?')) { stop_unescaping = TRUE; @@ -2939,17 +2955,53 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, { INT ih; WCHAR buf[5] = L"0x"; + memcpy(buf + 2, src + 1, 2*sizeof(WCHAR)); buf[4] = 0; StrToIntExW(buf, STIF_SUPPORT_HEX, &ih); - next = (WCHAR) ih; src += 2; /* Advance to end of escape */ + + if (flags & URL_UNESCAPE_AS_UTF8) + { + utf8_buf[0] = ih; + utf8_len = get_utf8_len(ih); + for (i = 1; i < utf8_len && *(src + 1) == '%' && *(src + 2) && *(src + 3); i++) + { + memcpy(buf + 2, src + 2, 2 * sizeof(WCHAR)); + StrToIntExW(buf, STIF_SUPPORT_HEX, &ih); + /* Check if it is a valid continuation byte. */ + if ((ih & 0xc0) == 0x80) + { + utf8_buf[i] = ih; + src += 3; + } + else + break; + } + + utf16_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, + utf8_buf, i, utf16_buf, ARRAYSIZE(utf16_buf)); + if (utf16_len) + needed += utf16_len - 1; + else + next = 0xfffd; + } + else + next = (WCHAR) ih; } else next = *src; if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len) - *dst++ = next; + { + if (utf16_len) + { + memcpy(dst, utf16_buf, utf16_len * sizeof(*utf16_buf)); + dst += utf16_len; + } + else + *dst++ = next; + } } if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len)

1 0

Jactry Zeng : shlwapi/tests: Test UrlUnescapeW() with URL_UNESCAPE_AS_UTF8.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 9cef334800848bf910734eabbe88c2f141e05189 URL: https://gitlab.winehq.org/wine/wine/-/commit/9cef334800848bf910734eabbe88c2… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 8 23:05:04 2022 -0500 shlwapi/tests: Test UrlUnescapeW() with URL_UNESCAPE_AS_UTF8. --- dlls/shlwapi/tests/url.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3690bc1686c..160f7696cc2 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -28,6 +28,7 @@ #include "shlwapi.h" #include "wininet.h" #include "intshcut.h" +#include "winternl.h" static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; @@ -418,7 +419,20 @@ static struct { L"file://fo%20o%5Ca/bar", L"file://fo o\\a/bar" }, { L"file://%24%25foobar", L"file://$%foobar" }, { L"file:///C:/Program Files", L"file:///C:/Program Files" }, + { L"file:///C:/Program Files", L"file:///C:/Program Files", URL_UNESCAPE_AS_UTF8 }, { L"file:///C:/Program%20Files", L"file:///C:/Program Files" }, + { L"file:///C:/Program%20Files", L"file:///C:/Program Files", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%E4%B8%AD%E6%96%87/bar", L"file://foo/\xe4\xb8\xad\xe6\x96\x87/bar" }, /* with 3 btyes utf-8 */ + { L"file://foo/%E4%B8%AD%E6%96%87/bar", L"file://foo/\x4e2d\x6587/bar", URL_UNESCAPE_AS_UTF8 }, + /* mix corrupt and good utf-8 */ + { L"file://foo/%E4%AD%E6%96%87/bar", L"file://foo/\xfffd\x6587/bar", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%F0%9F%8D%B7/bar", L"file://foo/\xf0\x9f\x8d\xb7/bar" }, /* with 4 btyes utf-8 */ + { L"file://foo/%F0%9F%8D%B7/bar", L"file://foo/\xd83c\xdf77/bar", URL_UNESCAPE_AS_UTF8 }, + /* non-escaped chars between multi-byte escaped chars */ + { L"file://foo/%E4%B8%ADabc%E6%96%87/bar", L"file://foo/\x4e2d""abc""\x6587/bar", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%E4B8%AD/bar", L"file://foo/\xfffd""B8\xfffd/bar", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%E4%G8%AD/bar", L"file://foo/\xfffd""%G8\xfffd/bar", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%G4%B8%AD/bar", L"file://foo/%G4\xfffd\xfffd/bar", URL_UNESCAPE_AS_UTF8 }, }; static const struct { @@ -1406,6 +1420,7 @@ static void test_UrlUnescape(void) WCHAR urlW[INTERNET_MAX_URL_LENGTH], bufferW[INTERNET_MAX_URL_LENGTH]; CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; DWORD dwEscaped, unescaped; + BOOL utf8_support = TRUE; static char inplace[] = "file:///C:/Program%20Files"; static char another_inplace[] = "file:///C:/Program%20Files"; static const char expected[] = "file:///C:/Program Files"; @@ -1429,8 +1444,21 @@ static void test_UrlUnescape(void) ok(strcmp(szReturnUrl,"")==0, "Expected empty string\n"); } + unescaped = INTERNET_MAX_URL_LENGTH; + lstrcpyW(urlW, L"%F0%9F%8D%B7"); + res = UrlUnescapeW(urlW, NULL, &unescaped, URL_UNESCAPE_AS_UTF8 | URL_UNESCAPE_INPLACE); + ok(res == S_OK, "Got %#lx.\n", res); + if (!wcscmp(urlW, L"\xf0\x9f\x8d\xb7")) + { + utf8_support = FALSE; + win_skip("Skip URL_UNESCAPE_AS_UTF8 tests for pre-win7 systems.\n"); + } + for (i = 0; i < ARRAYSIZE(TEST_URL_UNESCAPEW); i++) { + if (TEST_URL_UNESCAPEW[i].flags & URL_UNESCAPE_AS_UTF8 && !utf8_support) + continue; + lstrcpyW(urlW, TEST_URL_UNESCAPEW[i].url); memset(bufferW, 0xff, sizeof(bufferW));

1 0

Jactry Zeng : mshtml: Call UrlUnescapeW() with URL_UNESCAPE_AS_UTF8 in is_gecko_path().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: a3068d7bd90b7dd224ba234059e9b018c187b328 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3068d7bd90b7dd224ba234059e9b0… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Aug 9 01:55:21 2022 -0500 mshtml: Call UrlUnescapeW() with URL_UNESCAPE_AS_UTF8 in is_gecko_path(). This fixes an issue when the path includes non-ASCII characters. --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 21ddb3cb38f..4154fa711f7 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1297,7 +1297,7 @@ BOOL is_gecko_path(const char *path) *ptr = '/'; } - UrlUnescapeW(buf, NULL, NULL, URL_UNESCAPE_INPLACE); + UrlUnescapeW(buf, NULL, NULL, URL_UNESCAPE_INPLACE | URL_UNESCAPE_AS_UTF8); buf[gecko_path_len] = 0; ret = !wcsicmp(buf, gecko_path);

1 0

Alex Henrie : include: Annotate PFNALLOC with __WINE_ALLOC_SIZE.
by Alexandre Julliard 14 Aug '23

14 Aug '23

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

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

14 Aug '23

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 PLSA_ALLOCATE_(LSA_HEAP|SHARED_MEMORY) with __WINE_ALLOC_SIZE.
by Alexandre Julliard 14 Aug '23

14 Aug '23

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 PERF_MEM_ALLOC with __WINE_ALLOC_SIZE.
by Alexandre Julliard 14 Aug '23

14 Aug '23

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