wine-commits April 2023

wine-commits@winehq.org

1 participants
817 discussions

Alex Henrie : wintrust: Annotate WINTRUST_Alloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 654651bf23ee8ef4e3e9d72cc1a16815b6789b09 URL: https://gitlab.winehq.org/wine/wine/-/commit/654651bf23ee8ef4e3e9d72cc1a168… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 8 20:00:05 2022 -0700 wintrust: Annotate WINTRUST_Alloc with __WINE_(DEALLOC|MALLOC). --- dlls/wintrust/wintrust_priv.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 66c925ade5f..08025dbba9e 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -18,8 +18,9 @@ #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN; +void * WINAPI WINTRUST_Alloc(DWORD cb) + __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(WINTRUST_Free) __WINE_MALLOC DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr) DECLSPEC_HIDDEN;

1 0

Hugh McMaster : kernel32/tests: Test GetConsoleOriginalTitleW() with an empty title.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: d350af24554ccf7253bf02984650b65ae1847a20 URL: https://gitlab.winehq.org/wine/wine/-/commit/d350af24554ccf7253bf02984650b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 30 22:28:37 2023 +1100 kernel32/tests: Test GetConsoleOriginalTitleW() with an empty title. --- dlls/kernel32/tests/console.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9e42c5b6c3b..8d569ad6410 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4283,6 +4283,15 @@ static void test_GetConsoleOriginalTitleW(void) ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } +static void test_GetConsoleOriginalTitleW_empty(void) +{ + WCHAR buf[64]; + DWORD ret; + + ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); + ok(!ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); +} + static void test_GetConsoleOriginalTitle(void) { STARTUPINFOA si = { sizeof(si) }; @@ -4299,6 +4308,14 @@ static void test_GetConsoleOriginalTitle(void) CloseHandle(info.hThread); wait_child_process(info.hProcess); CloseHandle(info.hProcess); + + strcat(buf, " empty"); + title[0] = 0; + ret = CreateProcessA(NULL, buf, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); + ok(ret, "CreateProcess failed: %lu\n", GetLastError()); + CloseHandle(info.hThread); + wait_child_process(info.hProcess); + CloseHandle(info.hProcess); } static void test_GetConsoleTitleA(void) @@ -4944,10 +4961,15 @@ START_TEST(console) ExitProcess(exit_code); } - if (argc == 3 && !strcmp(argv[2], "title_test")) + if (argc >= 3 && !strcmp(argv[2], "title_test")) { - test_GetConsoleOriginalTitleA(); - test_GetConsoleOriginalTitleW(); + if (argc == 3) + { + test_GetConsoleOriginalTitleA(); + test_GetConsoleOriginalTitleW(); + } + else + test_GetConsoleOriginalTitleW_empty(); return; }

1 0

Hugh McMaster : kernelbase: Implement GetConsoleOriginalTitleA().
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 30f1c1be740174052bb727b82ef226d112501c42 URL: https://gitlab.winehq.org/wine/wine/-/commit/30f1c1be740174052bb727b82ef226… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 21:49:14 2023 +1100 kernelbase: Implement GetConsoleOriginalTitleA(). --- dlls/kernel32/tests/console.c | 12 ++++++------ dlls/kernelbase/console.c | 14 +++++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index fbf773ec7d9..9e42c5b6c3b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4238,17 +4238,17 @@ static void test_GetConsoleOriginalTitleA(void) ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); - todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); - todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = SetConsoleTitleA("test"); ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); - todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); - todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } static void test_GetConsoleOriginalTitleW(void) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 0f72106e425..cd5fdb7d9f7 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -914,9 +914,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleA( LPSTR title, DWORD size ) { - FIXME( ": (%p, %lu) stub!\n", title, size ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); + DWORD ret; + + if (!ptr) return 0; + + ret = GetConsoleOriginalTitleW( ptr, size ); + if (ret) + WideCharToMultiByte( GetConsoleOutputCP(), 0, ptr, -1, title, size, NULL, NULL); + + HeapFree( GetProcessHeap(), 0, ptr ); + return ret; }

1 0

Hugh McMaster : kernelbase: Implement GetConsoleOriginalTitleW().
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 887aa70e0884e78c7a97779200226e2f8566d29d URL: https://gitlab.winehq.org/wine/wine/-/commit/887aa70e0884e78c7a97779200226e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 21:37:59 2023 +1100 kernelbase: Implement GetConsoleOriginalTitleW(). --- dlls/kernel32/tests/console.c | 18 +++++++-------- dlls/kernelbase/console.c | 52 +++++++++++++++++++++++-------------------- programs/conhost/conhost.c | 12 ++++++---- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0786a7813ee..fbf773ec7d9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4264,23 +4264,23 @@ static void test_GetConsoleOriginalTitleW(void) ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); - todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); buf[ret] = 0; - todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = SetConsoleTitleW(L"test"); ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); - todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = GetConsoleOriginalTitleW(buf, 5); - todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } static void test_GetConsoleOriginalTitle(void) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index fa143857bc2..0f72106e425 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -202,6 +202,32 @@ static COORD get_console_font_size( HANDLE handle, DWORD index ) return c; } +/* helper function for GetConsoleTitle and GetConsoleOriginalTitle */ +static DWORD get_console_title( WCHAR *title, DWORD size, BOOL current_title ) +{ + struct condrv_title_params *params; + size_t max_size = sizeof(*params) + (size - 1) * sizeof(WCHAR); + + if (!title || !size) return 0; + + if (!(params = HeapAlloc( GetProcessHeap(), 0, max_size ))) + return 0; + + if (console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, + &current_title, sizeof(current_title), params, max_size, &size ) && + size >= sizeof(*params)) + { + size -= sizeof(*params); + memcpy( title, params->buffer, size ); + title[ size / sizeof(WCHAR) ] = 0; + size = params->title_len; + } + else size = 0; + + HeapFree( GetProcessHeap(), 0, params ); + return size; +} + static HANDLE create_console_server( void ) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; @@ -899,9 +925,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleA( LPSTR title, DWORD size */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleW( LPWSTR title, DWORD size ) { - FIXME( ": (%p, %lu) stub!\n", title, size ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + return get_console_title( title, size, FALSE ); } @@ -1046,27 +1070,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleA( LPSTR title, DWORD size ) */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) { - struct condrv_title_params *params; - size_t max_size = sizeof(*params) + (size - 1) * sizeof(WCHAR); - - if (!title || !size) return 0; - - if (!(params = HeapAlloc( GetProcessHeap(), 0, max_size ))) - return 0; - - if (console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, - NULL, 0, params, max_size, &size ) && - size >= sizeof(*params)) - { - size -= sizeof(*params); - memcpy( title, params->buffer, size ); - title[ size / sizeof(WCHAR) ] = 0; - size = params->title_len; - } - else size = 0; - - HeapFree( GetProcessHeap(), 0, params ); - return size; + return get_console_title( title, size, TRUE ); } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index f07164c698e..04a294fc31f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2726,15 +2726,19 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_GET_TITLE: { + BOOL current_title; + WCHAR *title; size_t title_len, str_size; struct condrv_title_params *params; - if (in_size) return STATUS_INVALID_PARAMETER; - title_len = console->title ? wcslen( console->title ) : 0; + if (in_size != sizeof(BOOL)) return STATUS_INVALID_PARAMETER; + current_title = *(BOOL *)in_data; + title = current_title ? console->title : console->title_orig; + title_len = title ? wcslen( title ) : 0; str_size = min( *out_size - sizeof(*params), title_len * sizeof(WCHAR) ); *out_size = sizeof(*params) + str_size; if (!(params = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; - TRACE( "returning title %s\n", debugstr_w(console->title) ); - if (str_size) memcpy( params->buffer, console->title, str_size ); + TRACE( "returning %s %s\n", current_title ? "title" : "original title", debugstr_w(title) ); + if (str_size) memcpy( params->buffer, title, str_size ); params->title_len = title_len; return STATUS_SUCCESS; }

1 0

Hugh McMaster : conhost: Save original console title on initialization.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 6891faf454f74a9b377e66a6e34a4bfd96e84707 URL: https://gitlab.winehq.org/wine/wine/-/commit/6891faf454f74a9b377e66a6e34a4b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sat Mar 18 22:54:42 2023 +1100 conhost: Save original console title on initialization. --- programs/conhost/conhost.c | 29 +++++++++++++++++++++++------ programs/conhost/conhost.h | 1 + 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 1bed7b8a03c..f07164c698e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2461,21 +2461,38 @@ static NTSTATUS scroll_output( struct screen_buffer *screen_buffer, const struct return STATUS_SUCCESS; } +static WCHAR *set_title( const WCHAR *in_title, size_t size ) +{ + WCHAR *title = NULL; + + title = malloc( size + sizeof(WCHAR) ); + if (!title) return NULL; + + memcpy( title, in_title, size ); + title[ size / sizeof(WCHAR) ] = 0; + + return title; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; TRACE( "%s\n", debugstr_wn(in_title, size / sizeof(WCHAR)) ); - if (size) - { - if (!(title = malloc( size + sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - memcpy( title, in_title, size ); - title[size / sizeof(WCHAR)] = 0; - } + if (!(title = set_title( in_title, size ))) + return STATUS_NO_MEMORY; + free( console->title ); console->title = title; + if (!console->title_orig && !(console->title_orig = set_title( in_title, size ))) + { + free( console->title ); + console->title = NULL; + return STATUS_NO_MEMORY; + } + if (console->tty_output) { size_t len; diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 4464f51032f..76d897e8800 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -93,6 +93,7 @@ struct console unsigned int key_state; struct console_window *window; WCHAR *title; /* console title */ + WCHAR *title_orig; /* original console title */ struct history_line **history; /* lines history */ unsigned int history_size; /* number of entries in history array */ unsigned int history_index; /* number of used entries in history array */

1 0

Hugh McMaster : kernel32/tests: Check return length of GetConsoleOriginalTitleA/W().
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: b1dc5a533b97840cfef5f914f330b63da9180fa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1dc5a533b97840cfef5f914f330b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 17 22:03:28 2023 +1100 kernel32/tests: Check return length of GetConsoleOriginalTitleA/W(). --- dlls/kernel32/tests/console.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f8e39c164d2..0786a7813ee 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4227,9 +4227,9 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_GetConsoleOriginalTitleA(void) { - char buf[64]; - DWORD ret; char title[] = "Original Console Title"; + char buf[64]; + DWORD ret, title_len = strlen(title); ret = GetConsoleOriginalTitleA(NULL, 0); ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); @@ -4240,6 +4240,7 @@ static void test_GetConsoleOriginalTitleA(void) ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = SetConsoleTitleA("test"); ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); @@ -4247,13 +4248,14 @@ static void test_GetConsoleOriginalTitleA(void) ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } static void test_GetConsoleOriginalTitleW(void) { - WCHAR buf[64]; - DWORD ret; WCHAR title[] = L"Original Console Title"; + WCHAR buf[64]; + DWORD ret, title_len = lstrlenW(title); ret = GetConsoleOriginalTitleW(NULL, 0); ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); @@ -4265,6 +4267,7 @@ static void test_GetConsoleOriginalTitleW(void) todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); buf[ret] = 0; todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = SetConsoleTitleW(L"test"); ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); @@ -4272,10 +4275,12 @@ static void test_GetConsoleOriginalTitleW(void) ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = GetConsoleOriginalTitleW(buf, 5); todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); todo_wine ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } static void test_GetConsoleOriginalTitle(void)

1 0

Daniel Tang : wintypes: Declare exported functions in rometadataresolution.h.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 9a49c0a655240fe7ba0407e5fef59f8c07d01050 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a49c0a655240fe7ba0407e5fef59f… Author: Daniel Tang <danielzgtg.opensource(a)gmail.com> Date: Fri Mar 31 13:00:39 2023 -0400 wintypes: Declare exported functions in rometadataresolution.h. --- dlls/wintypes/main.c | 1 + include/Makefile.in | 1 + include/rometadataresolution.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index 7eb2c0c2cce..e48a1b487a6 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -27,6 +27,7 @@ #include "objbase.h" #include "activation.h" +#include "rometadataresolution.h" #define WIDL_using_Windows_Foundation_Metadata #include "windows.foundation.metadata.h" diff --git a/include/Makefile.in b/include/Makefile.in index f0c0da3ed93..dcf6c016313 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -645,6 +645,7 @@ SOURCES = \ rmxftmpl.x \ roapi.h \ roerrorapi.h \ + rometadataresolution.h \ roparameterizediid.idl \ row.idl \ rowchg.idl \ diff --git a/include/rometadataresolution.h b/include/rometadataresolution.h new file mode 100644 index 00000000000..90258ff5aa0 --- /dev/null +++ b/include/rometadataresolution.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2023 Daniel Tang + * + * 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 _ROMETADATARESOLUTION_H +#define _ROMETADATARESOLUTION_H + +#include <windef.h> +#include <hstring.h> + +HRESULT WINAPI RoIsApiContractMajorVersionPresent(const WCHAR *, UINT16, BOOL *); +HRESULT WINAPI RoResolveNamespace(HSTRING, HSTRING, DWORD, const HSTRING *, DWORD *, HSTRING **, DWORD *, HSTRING **); + +#endif /* _ROMETADATARESOLUTION_H */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 18358c474d12cc71fd8e2517846af9e060881cbe URL: https://gitlab.winehq.org/wine/wine/-/commit/18358c474d12cc71fd8e2517846af9… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Apr 1 17:38:21 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6aea984be9a..1aba70cc5d4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-02-13 23:59+0200\n" +"PO-Revision-Date: 2023-04-01 17:37+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -17261,17 +17261,19 @@ msgid "Error: Process self-termination is not permitted.\n" msgstr "Klaida: savo proceso priverstinis nutraukimas negalimas.\n" #: programs/taskkill/taskkill.rc:44 -#, fuzzy -#| msgid "Process with PID %1!u! was forcibly terminated.\n" msgid "" "The process with PID %1!u! (child process of PID %2!u!) has been " "terminated.\n" -msgstr "Procesas su PID %1!u! priverstinai nutrauktas.\n" +msgstr "" +"Procesas su PID %1!u! (pavaldus procesui su PID %2!u!) priverstinai " +"nutrauktas.\n" #: programs/taskkill/taskkill.rc:45 msgid "" "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n" msgstr "" +"Nusiųstas priverstinio nutraukimo signalas procesui su PID %1!u!, pavaldžiam " +"PID %2!u!.\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -18420,7 +18422,7 @@ msgstr "&Apipavidalinimas:" #: programs/winecfg/winecfg.rc:295 msgid "&WinRT app theme:" -msgstr "" +msgstr "&WinRT programos tema:" #: programs/winecfg/winecfg.rc:297 msgid "&Install theme..." @@ -18543,14 +18545,12 @@ msgid "Mono" msgstr "Monofoninis" #: programs/winecfg/winecfg.rc:98 -#, fuzzy -#| msgid "Right" msgid "Light" -msgstr "Dešininė" +msgstr "Šviesi" #: programs/winecfg/winecfg.rc:99 msgid "Dark" -msgstr "" +msgstr "Tamsi" #: programs/winecfg/winecfg.rc:53 msgid ""

1 0

Mohamad Al-Jaf : widl: Add support for composable attribute.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 712f87ee8e4e798193ca0ab6d8cfaba566a56709 URL: https://gitlab.winehq.org/wine/wine/-/commit/712f87ee8e4e798193ca0ab6d8cfab… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 31 20:43:25 2023 -0400 widl: Add support for composable attribute. Needed to build windows.ui.composition.idl. --- tools/widl/attribute.c | 1 + tools/widl/parser.l | 1 + tools/widl/parser.y | 17 +++++++++++++++++ tools/widl/widltypes.h | 1 + 4 files changed, 20 insertions(+) diff --git a/tools/widl/attribute.c b/tools/widl/attribute.c index c5bfbce716d..b9aa99c9228 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -145,6 +145,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "case" }, /* ATTR_CODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, + /* ATTR_COMPOSABLE */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "composable" }, /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, /* ATTR_CONTRACT */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, "contract" }, /* ATTR_CONTRACTVERSION */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "contractversion" }, diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 4f24929d5a4..445efd2d458 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -245,6 +245,7 @@ static void winrt_enable( int ns_prefix ) callback { return tCALLBACK; } code { return tCODE; } comm_status { return tCOMMSTATUS; } + composable { return token_winrt( tCOMPOSABLE, yytext, yylval ); } context_handle { return tCONTEXTHANDLE; } context_handle_noserialize { return tCONTEXTHANDLENOSERIALIZE; } context_handle_serialize { return tCONTEXTHANDLENOSERIALIZE; } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 29be784448d..9b81f9521fa 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -186,6 +186,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %token tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCHAR tCOCLASS tCODE tCOMMSTATUS +%token tCOMPOSABLE %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE %token tCONTEXTHANDLESERIALIZE %token tCONTRACT @@ -285,6 +286,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %token tWCHAR tWIREMARSHAL %token tAPARTMENT tNEUTRAL tSINGLE tFREE tBOTH +%type <attr> access_attr %type <attr> attribute acf_attribute %type <attr_list> m_attributes attributes attrib_list %type <attr_list> acf_attributes acf_attribute_list @@ -295,6 +297,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %type <expr> contract_req %type <expr> static_attr %type <expr> activatable_attr +%type <expr> composable_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -612,6 +615,19 @@ activatable_attr: | contract_req { $$ = $1; } /* activatable on the default activation factory */ ; +access_attr + : tPUBLIC { $$ = attr_int( @$, ATTR_PUBLIC, 0 ); } + | tPROTECTED { $$ = attr_int( @$, ATTR_PROTECTED, 0 ); } + ; + +composable_attr + : decl_spec ',' access_attr ',' contract_req + { if ($1->type->type_type != TYPE_INTERFACE) + error_loc( "type %s is not an interface\n", $1->type->name ); + $$ = make_exprt( EXPR_MEMBER, declare_var( append_attr( NULL, $3 ), $1, make_declarator( NULL ), 0 ), $5 ); + } + ; + attribute : %empty { $$ = NULL; } | tACTIVATABLE '(' activatable_attr ')' { $$ = attr_ptr( @$, ATTR_ACTIVATABLE, $3 ); } @@ -625,6 +641,7 @@ attribute | tCALLAS '(' ident ')' { $$ = attr_ptr( @$, ATTR_CALLAS, $3 ); } | tCASE '(' expr_list_int_const ')' { $$ = attr_ptr( @$, ATTR_CASE, $3 ); } | tCODE { $$ = attr_int( @$, ATTR_CODE, 0 ); } + | tCOMPOSABLE '(' composable_attr ')' { $$ = attr_ptr( @$, ATTR_COMPOSABLE, $3 ); } | tCOMMSTATUS { $$ = attr_int( @$, ATTR_COMMSTATUS, 0 ); } | tCONTEXTHANDLE { $$ = attr_int( @$, ATTR_CONTEXTHANDLE, 0 ); } | tCONTEXTHANDLENOSERIALIZE { $$ = attr_int( @$, ATTR_CONTEXTHANDLE, 0 ); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7b68b684c0b..ad6a4e0b7ec 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -84,6 +84,7 @@ enum attr_type ATTR_CASE, ATTR_CODE, ATTR_COMMSTATUS, + ATTR_COMPOSABLE, ATTR_CONTEXTHANDLE, ATTR_CONTRACT, ATTR_CONTRACTVERSION,

1 0

Mohamad Al-Jaf : widl: Add support for protected attribute.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: a7e1c707f166fc6ff59774af8023ac35ad282238 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7e1c707f166fc6ff59774af8023ac… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 04:33:58 2023 -0400 widl: Add support for protected attribute. --- tools/widl/attribute.c | 1 + tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + 4 files changed, 5 insertions(+) diff --git a/tools/widl/attribute.c b/tools/widl/attribute.c index 92c6f1a44fa..c5bfbce716d 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -215,6 +215,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_PROPGET */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propget" }, /* ATTR_PROPPUT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propput" }, /* ATTR_PROPPUTREF */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propputref" }, + /* ATTR_PROTECTED */ { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "protected" }, /* ATTR_PROXY */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "proxy" }, /* ATTR_PUBLIC */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "public" }, /* ATTR_RANGE */ { 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "range" }, diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3ea03a7a26f..4f24929d5a4 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -319,6 +319,7 @@ static void winrt_enable( int ns_prefix ) propget { return tPROPGET; } propput { return tPROPPUT; } propputref { return tPROPPUTREF; } + protected { return tPROTECTED; } proxy { return tPROXY; } ptr { return tPTR; } public { return tPUBLIC; } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9c07536eac1..29be784448d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -249,6 +249,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %token tPRAGMA_WARNING %token tPROGID tPROPERTIES %token tPROPGET tPROPPUT tPROPPUTREF +%token tPROTECTED %token tPROXY tPTR %token tPUBLIC %token tRANGE @@ -703,6 +704,7 @@ attribute | tPROPGET { $$ = attr_int( @$, ATTR_PROPGET, 0 ); } | tPROPPUT { $$ = attr_int( @$, ATTR_PROPPUT, 0 ); } | tPROPPUTREF { $$ = attr_int( @$, ATTR_PROPPUTREF, 0 ); } + | tPROTECTED { $$ = attr_int( @$, ATTR_PROTECTED, 0 ); } | tPROXY { $$ = attr_int( @$, ATTR_PROXY, 0 ); } | tPUBLIC { $$ = attr_int( @$, ATTR_PUBLIC, 0 ); } | tRANGE '(' expr_int_const ',' expr_int_const ')' diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 652c0d822ee..7b68b684c0b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -154,6 +154,7 @@ enum attr_type ATTR_PROPGET, ATTR_PROPPUT, ATTR_PROPPUTREF, + ATTR_PROTECTED, ATTR_PROXY, ATTR_PUBLIC, ATTR_RANGE,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2023