wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Akihiro Sagawa : server: Prevent unloading a registry hive while the key is in use.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 70c77cdfee49c44542347b222d77bcb95ba7fdaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c77cdfee49c44542347b22… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 12 20:30:14 2021 +0900 server: Prevent unloading a registry hive while the key is in use. Otherwise, RegUnLoadKey(HKEY_USERS, "S-1-5-21-0-0-0-1000") erases all HKCU registry. The call is actually done by a certain installer. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 9b9295b1b68..74da4d1d9a4 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2261,7 +2261,10 @@ DECL_HANDLER(unload_registry) get_req_path( &name, !req->parent ); if ((key = open_key( parent, &name, access, req->attributes ))) { - delete_key( key, 1 ); /* FIXME */ + if (key->obj.handle_count) + set_error( STATUS_CANNOT_DELETE ); + else + delete_key( key, 1 ); /* FIXME */ release_object( key ); } release_object( parent );

1 0

Akihiro Sagawa : ntdll: ObjectName should also be used in NtUnloadKey.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: d6d99e59e350de4c7a545059b925acbc33660998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d99e59e350de4c7a545059… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 12 20:30:12 2021 +0900 ntdll: ObjectName should also be used in NtUnloadKey. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/registry.c | 14 +++----------- dlls/ntdll/unix/registry.c | 8 +++++++- include/wine/server_protocol.h | 7 +++++-- server/protocol.def | 4 +++- server/registry.c | 17 +++++++++++++---- server/request.h | 5 +++-- server/trace.c | 4 +++- 7 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 574bf2f56b7..2ed5e268119 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2349,24 +2349,16 @@ LSTATUS WINAPI RegRestoreKeyA( HKEY hkey, LPCSTR lpFile, DWORD dwFlags ) */ LSTATUS WINAPI RegUnLoadKeyW( HKEY hkey, LPCWSTR lpSubKey ) { - DWORD ret; - HKEY shkey; OBJECT_ATTRIBUTES attr; UNICODE_STRING subkey; TRACE("(%p,%s)\n",hkey, debugstr_w(lpSubKey)); - ret = RegOpenKeyExW( hkey, lpSubKey, 0, MAXIMUM_ALLOWED, &shkey ); - if( ret ) - return ERROR_INVALID_PARAMETER; + if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; RtlInitUnicodeString(&subkey, lpSubKey); - InitializeObjectAttributes(&attr, &subkey, OBJ_CASE_INSENSITIVE, shkey, NULL); - ret = RtlNtStatusToDosError(NtUnloadKey(&attr)); - - RegCloseKey(shkey); - - return ret; + InitializeObjectAttributes(&attr, &subkey, OBJ_CASE_INSENSITIVE, hkey, NULL); + return RtlNtStatusToDosError( NtUnloadKey(&attr) ); } diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index c0897033609..b52811b05e7 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -677,9 +677,15 @@ NTSTATUS WINAPI NtUnloadKey( OBJECT_ATTRIBUTES *attr ) TRACE( "(%p)\n", attr ); + if (!attr || !attr->ObjectName) return STATUS_ACCESS_VIOLATION; + if (attr->Length != sizeof(*attr)) return STATUS_INVALID_PARAMETER; + if (attr->ObjectName->Length & 1) return STATUS_OBJECT_NAME_INVALID; + SERVER_START_REQ( unload_registry ) { - req->hkey = wine_server_obj_handle( attr->RootDirectory ); + req->parent = wine_server_obj_handle( attr->RootDirectory ); + req->attributes = attr->Attributes; + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); ret = wine_server_call(req); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index bd231c54e74..277b1a1c33a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2356,7 +2356,10 @@ struct load_registry_reply struct unload_registry_request { struct request_header __header; - obj_handle_t hkey; + obj_handle_t parent; + unsigned int attributes; + /* VARARG(name,unicode_str); */ + char __pad_20[4]; }; struct unload_registry_reply { @@ -6223,7 +6226,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 681 +#define SERVER_PROTOCOL_VERSION 682 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index c56c3ee7b2d..fa19bb41bb4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1812,7 +1812,9 @@ struct process_info /* UnLoad a registry branch from a file */ @REQ(unload_registry) - obj_handle_t hkey; /* root key to unload to */ + obj_handle_t parent; /* handle to the parent key */ + unsigned int attributes; /* object attributes */ + VARARG(name,unicode_str); /* key name */ @END diff --git a/server/registry.c b/server/registry.c index 76ef7aeb65d..9b9295b1b68 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2244,7 +2244,9 @@ DECL_HANDLER(load_registry) DECL_HANDLER(unload_registry) { - struct key *key; + struct key *key, *parent; + struct unicode_str name; + unsigned int access = 0; if (!thread_single_check_privilege( current, &SeRestorePrivilege )) { @@ -2252,10 +2254,17 @@ DECL_HANDLER(unload_registry) return; } - if ((key = get_hkey_obj( req->hkey, 0 ))) + if (!is_wow64_thread( current )) access = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY; + + if ((parent = get_parent_hkey_obj( req->parent ))) { - delete_key( key, 1 ); /* FIXME */ - release_object( key ); + get_req_path( &name, !req->parent ); + if ((key = open_key( parent, &name, access, req->attributes ))) + { + delete_key( key, 1 ); /* FIXME */ + release_object( key ); + } + release_object( parent ); } } diff --git a/server/request.h b/server/request.h index ef5b16d2722..23308ed49e6 100644 --- a/server/request.h +++ b/server/request.h @@ -1231,8 +1231,9 @@ C_ASSERT( FIELD_OFFSET(struct delete_key_value_request, hkey) == 12 ); C_ASSERT( sizeof(struct delete_key_value_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct load_registry_request, file) == 12 ); C_ASSERT( sizeof(struct load_registry_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct unload_registry_request, hkey) == 12 ); -C_ASSERT( sizeof(struct unload_registry_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct unload_registry_request, parent) == 12 ); +C_ASSERT( FIELD_OFFSET(struct unload_registry_request, attributes) == 16 ); +C_ASSERT( sizeof(struct unload_registry_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct save_registry_request, hkey) == 12 ); C_ASSERT( FIELD_OFFSET(struct save_registry_request, file) == 16 ); C_ASSERT( sizeof(struct save_registry_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 031237429ca..2737cb16499 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2417,7 +2417,9 @@ static void dump_load_registry_request( const struct load_registry_request *req static void dump_unload_registry_request( const struct unload_registry_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); + fprintf( stderr, " parent=%04x", req->parent ); + fprintf( stderr, ", attributes=%08x", req->attributes ); + dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_save_registry_request( const struct save_registry_request *req )

1 0

Rémi Bernon : user32/tests: Add tests for SetKeyboardState / GetKeyState interactions.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 9942948097ff6d83010f5ae6d574e95bc6d6676d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9942948097ff6d83010f5ae6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 11:00:29 2021 +0100 user32/tests: Add tests for SetKeyboardState / GetKeyState interactions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index be274414eea..9d75daa0bd5 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3777,11 +3777,18 @@ static DWORD WINAPI get_key_state_thread(void *arg) todo_wine_if(!has_queue) ok(!result, "%d: expected that keystate is not set, got %#x\n", i, result); + result = keystate['C']; + ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + result = GetKeyState('X'); if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + result = GetKeyState('C'); + ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); + memset(keystate, 0, sizeof(keystate)); ret = GetKeyboardState(keystate); ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); @@ -3789,6 +3796,9 @@ static DWORD WINAPI get_key_state_thread(void *arg) if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); + result = keystate['C']; + ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); @@ -3801,10 +3811,17 @@ static DWORD WINAPI get_key_state_thread(void *arg) if (!has_queue) ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); + result = keystate['C']; + ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + result = GetKeyState('X'); ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + result = GetKeyState('C'); + ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); + memset(keystate, 0, sizeof(keystate)); ret = GetKeyboardState(keystate); ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); @@ -3812,6 +3829,9 @@ static DWORD WINAPI get_key_state_thread(void *arg) if (!has_queue) ok(!result || broken(result) /* w2008 */, "%d: expected that keystate is unset, got %#x\n", i, result); else todo_wine ok(result || broken(!result) /* w2008 */, "%d: expected that keystate is set, got %#x\n", i, result); + result = keystate['C']; + ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + return 0; } @@ -3820,6 +3840,7 @@ static void test_GetKeyState(void) struct get_key_state_thread_params params; HANDLE thread; DWORD result; + BYTE keystate[256]; HWND hwnd; MSG msg; int i; @@ -3831,6 +3852,7 @@ static void test_GetKeyState(void) return; } + memset(keystate, 0, sizeof(keystate)); params.semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); ok(params.semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); params.semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); @@ -3864,8 +3886,12 @@ static void test_GetKeyState(void) ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); keybd_event('X', 0, 0, 0); + keystate['C'] = 0xff; + SetKeyboardState(keystate); if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + result = GetKeyState('C'); + ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); result = GetKeyState('X'); if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); @@ -3877,8 +3903,12 @@ static void test_GetKeyState(void) ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + keystate['C'] = 0x00; + SetKeyboardState(keystate); if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + result = GetKeyState('C'); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); result = GetKeyState('X'); ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result);

1 0

Rémi Bernon : user32/tests: Add tests for GetKeyState / GetKeyboardState interactions.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 70e67d1d20e11e81046c4e55cff3a4b4685b14fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=70e67d1d20e11e81046c4e55… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 11:00:28 2021 +0100 user32/tests: Add tests for GetKeyState / GetKeyboardState interactions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 696dbe12cb7..be274414eea 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3723,11 +3723,13 @@ struct get_key_state_test_desc struct get_key_state_test_desc get_key_state_tests[] = { - /* 0: not peeking in thread, no msg queue: GetKeyState misses key press */ + /* 0: not peeking in thread, no msg queue: GetKeyState / GetKeyboardState miss key press */ {FALSE, TRUE}, - /* 1: peeking on thread init, not in main: GetKeyState catches key press */ + /* 1: peeking on thread init, not in main: GetKeyState / GetKeyboardState catch key press */ + /* - GetKeyboardState misses key press if called before GetKeyState */ + /* - GetKeyboardState catches key press, if called after GetKeyState */ { TRUE, FALSE}, - /* 2: peeking on thread init, and in main: GetKeyState catches key press */ + /* 2: peeking on thread init, and in main: GetKeyState / GetKeyboardState catch key press */ { TRUE, TRUE}, }; @@ -3743,7 +3745,9 @@ static DWORD WINAPI get_key_state_thread(void *arg) struct get_key_state_test_desc* test; HANDLE *semaphores = params->semaphores; DWORD result; + BYTE keystate[256]; BOOL has_queue; + BOOL ret; MSG msg; int i = params->index; @@ -3766,20 +3770,48 @@ static DWORD WINAPI get_key_state_thread(void *arg) result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); + result = keystate['X']; + todo_wine_if(!has_queue) + ok(!result, "%d: expected that keystate is not set, got %#x\n", i, result); + result = GetKeyState('X'); if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); + result = keystate['X']; + if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); + else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); + /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); + result = keystate['X']; + if (!has_queue) ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); + else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); + result = GetKeyState('X'); ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); + result = keystate['X']; + if (!has_queue) ok(!result || broken(result) /* w2008 */, "%d: expected that keystate is unset, got %#x\n", i, result); + else todo_wine ok(result || broken(!result) /* w2008 */, "%d: expected that keystate is set, got %#x\n", i, result); + return 0; }

1 0

Rémi Bernon : user32/tests: Add more tests for GetKeyState from background thread.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: e10cf973d54b90e1e0c0ed47c45b819aa4837f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10cf973d54b90e1e0c0ed47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 11:00:27 2021 +0100 user32/tests: Add more tests for GetKeyState from background thread. It looks like that GetKeyState is supposed to catch key presses when called from a background thread even after its thread message queue and thread input structures have been created. This happens in Bioshock 2 Remaster, and causes the game to stay forever on a "Press space to continue" screen, as the thread checking for space key press calls GetKeyState repeatedly (and PeekMessage), although it's in background. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 145 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 111 insertions(+), 34 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1249f8cf5a1..696dbe12cb7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3715,74 +3715,151 @@ static void test_attach_input(void) DestroyWindow(Wnd2); } +struct get_key_state_test_desc +{ + BOOL peek_message; + BOOL peek_message_main; +}; + +struct get_key_state_test_desc get_key_state_tests[] = +{ + /* 0: not peeking in thread, no msg queue: GetKeyState misses key press */ + {FALSE, TRUE}, + /* 1: peeking on thread init, not in main: GetKeyState catches key press */ + { TRUE, FALSE}, + /* 2: peeking on thread init, and in main: GetKeyState catches key press */ + { TRUE, TRUE}, +}; + +struct get_key_state_thread_params +{ + HANDLE semaphores[2]; + int index; +}; + static DWORD WINAPI get_key_state_thread(void *arg) { - HANDLE *semaphores = arg; + struct get_key_state_thread_params *params = arg; + struct get_key_state_test_desc* test; + HANDLE *semaphores = params->semaphores; DWORD result; + BOOL has_queue; + MSG msg; + int i = params->index; + test = get_key_state_tests + i; + has_queue = test->peek_message; + + if (test->peek_message) + { + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + ok(!is_keyboard_message(msg.message), "%d: PeekMessageA got keyboard message.\n", i); + } + + /* initialization */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - result = GetKeyState('X'); - ok((result & 0x8000) || broken(!(result & 0x8000)), /* > Win 2003 */ - "expected that highest bit is set, got %x\n", result); + /* key pressed */ + ReleaseSemaphore(semaphores[0], 1, NULL); + result = WaitForSingleObject(semaphores[1], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - ok((SHORT)(result & 0x007e) == 0, - "expected that undefined bits are unset, got %x\n", result); + result = GetKeyState('X'); + if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); result = GetKeyState('X'); - ok(!(result & 0x8000), "expected that highest bit is unset, got %x\n", result); - - ok((SHORT)(result & 0x007e) == 0, - "expected that undefined bits are unset, got %x\n", result); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); return 0; } static void test_GetKeyState(void) { - HANDLE semaphores[2]; + struct get_key_state_thread_params params; HANDLE thread; DWORD result; HWND hwnd; + MSG msg; + int i; - semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); - semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + skip("skipping test with inconsistent results on non-us keyboard\n"); + return; + } + + params.semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(params.semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + params.semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(params.semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowA failed %u\n", GetLastError()); + empty_message_queue(); + + for (i = 0; i < ARRAY_SIZE(get_key_state_tests); ++i) + { + struct get_key_state_test_desc* test = get_key_state_tests + i; + + params.index = i; + thread = CreateThread(NULL, 0, get_key_state_thread, &params, 0, NULL); + ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); - thread = CreateThread(NULL, 0, get_key_state_thread, semaphores, 0, NULL); - ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + /* initialization */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - SetForegroundWindow(hwnd); - SetFocus(hwnd); - keybd_event('X', 0, 0, 0); + SetForegroundWindow(hwnd); + SetFocus(hwnd); + empty_message_queue(); - ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ReleaseSemaphore(params.semaphores[1], 1, NULL); - keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + /* key pressed */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(thread, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - CloseHandle(thread); + keybd_event('X', 0, 0, 0); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + result = GetKeyState('X'); + if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); + else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + /* key released */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + + keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + result = GetKeyState('X'); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + CloseHandle(thread); + } DestroyWindow(hwnd); - CloseHandle(semaphores[0]); - CloseHandle(semaphores[1]); + CloseHandle(params.semaphores[0]); + CloseHandle(params.semaphores[1]); } static void test_OemKeyScan(void)

1 0

Rémi Bernon : widl: Support WinRT parameterized interface type.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: d3c7aa291527f7d6c0d06ee13636c36f2633fdb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3c7aa291527f7d6c0d06ee1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:35 2021 +0100 widl: Support WinRT parameterized interface type. This allows parameterized interfaces to be instanciated in declare blocks, in the same way MIDL does, generating a new interface to the header from the parameterized type template, replacing its parameters with the given types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechsynthesis.idl | 24 +++ tools/widl/header.c | 7 +- tools/widl/parser.l | 1 + tools/widl/parser.y | 69 ++++++++- tools/widl/typetree.c | 243 ++++++++++++++++++++++++++++++ tools/widl/typetree.h | 5 + 6 files changed, 340 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3c7aa291527f7d6c0d0…

1 0

Rémi Bernon : widl: Support partially specialized parameterized type.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: d5bf8f4e8a0c6f87c18580d6699c2f91614a4bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5bf8f4e8a0c6f87c18580d6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:34 2021 +0100 widl: Support partially specialized parameterized type. This allows parameterized types to reference each other with a different set of parameters. This is required for instance for IIterable<T>, that needs to reference IIterator<T>. The partial specialization is recorded by adding a new parameterized type, referencing the original one as its template. The parameterized type chain will be resolved all at once when the type is declared. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 9 +++++++++ tools/widl/parser.y | 41 +++++++++++++++++++++++++++++++++++++++++ tools/widl/typetree.c | 41 ++++++++++++++++++++++++++++++++++++++--- tools/widl/typetree.h | 3 +++ tools/widl/widltypes.h | 1 + 5 files changed, 92 insertions(+), 3 deletions(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index ab7c4753c3b..5f7a49c38e4 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -127,6 +127,15 @@ namespace Windows { HRESULT GetMany([in] UINT32 count, [out] T *items, [out, retval] UINT32 *value); } + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(faa585ea-6214-4217-afda-7f46de5869b3) + ] + interface IIterable<T> : IInspectable + { + HRESULT First([out, retval] Windows.Foundation.Collections.IIterator<T> **value); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 31ee9405455..58ae8c624dc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -291,6 +291,9 @@ static typelib_t *current_typelib; %type <type> type unqualified_type qualified_type %type <type> type_parameter %type <typeref_list> type_parameters +%type <type> parameterized_type +%type <type> parameterized_type_arg +%type <typeref_list> parameterized_type_args %type <typeref> class_interface %type <typeref_list> class_interfaces %type <typeref_list> requires required_types @@ -912,6 +915,24 @@ qualified_type: | namespace_pfx typename { $$ = find_type_or_error($1, $2); } ; +parameterized_type: qualified_type '<' parameterized_type_args '>' + { $$ = find_parameterized_type($1, $3); } + ; + +parameterized_type_arg: + base_type { $$ = $1; } + | qualified_type { $$ = $1; } + | qualified_type '*' { $$ = type_new_pointer($1); } + | parameterized_type { $$ = $1; } + | parameterized_type '*' { $$ = type_new_pointer($1); } + ; + +parameterized_type_args: + parameterized_type_arg { $$ = append_typeref(NULL, make_typeref($1)); } + | parameterized_type_args ',' parameterized_type_arg + { $$ = append_typeref($1, make_typeref($3)); } + ; + coclass: tCOCLASS typename { $$ = type_coclass_declare($2); } ; @@ -968,6 +989,7 @@ dispinterfacedef: inherit: { $$ = NULL; } | ':' qualified_type { $$ = $2; } + | ':' parameterized_type { $$ = $2; } ; type_parameter: typename { $$ = get_type(TYPE_PARAMETER, $1, parameters_namespace, 0); } @@ -986,7 +1008,9 @@ interface: required_types: qualified_type { $$ = append_typeref(NULL, make_typeref($1)); } + | parameterized_type { $$ = append_typeref(NULL, make_typeref($1)); } | required_types ',' qualified_type { $$ = append_typeref($1, make_typeref($3)); } + | required_types ',' parameterized_type { $$ = append_typeref($1, make_typeref($3)); } requires: { $$ = NULL; } | tREQUIRES required_types { $$ = $2; } @@ -1210,6 +1234,7 @@ unqualified_type: type: unqualified_type | namespace_pfx typename { $$ = find_type_or_error($1, $2); } + | parameterized_type { $$ = $1; } ; typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list @@ -3255,3 +3280,19 @@ void init_loc_info(loc_info_t *i) i->line_number = line_number; i->near_text = parser_text; } + +type_t *find_parameterized_type(type_t *type, typeref_list_t *params) +{ + char *name = format_parameterized_type_name(type, params); + + if (parameters_namespace) + { + assert(type->type_type == TYPE_PARAMETERIZED_TYPE); + type = type_parameterized_type_specialize_partial(type, params); + } + /* FIXME: If not in another parameterized type, we'll have to look for the declared specialization. */ + else error_loc("parameterized type '%s' not declared\n", name); + + free(name); + return type; +} diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 3071307b353..a31bd383169 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -100,13 +100,40 @@ static size_t append_namespace(char **buf, size_t *len, size_t pos, struct names return n; } +static size_t append_namespaces(char **buf, size_t *len, size_t pos, struct namespace *namespace, const char *prefix, + const char *separator, const char *suffix, const char *abi_prefix) +{ + size_t n = 0; + n += strappend(buf, len, pos + n, "%s", prefix); + n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix); + n += strappend(buf, len, pos + n, "%s", suffix); + return n; +} + char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, const char *abi_prefix) +{ + size_t len = 0; + char *buf = NULL; + append_namespaces(&buf, &len, 0, namespace, prefix, separator, suffix, abi_prefix); + return buf; +} + +char *format_parameterized_type_name(type_t *type, typeref_list_t *params) { size_t len = 0, pos = 0; char *buf = NULL; - pos += strappend(&buf, &len, pos, "%s", prefix); - pos += append_namespace(&buf, &len, pos, namespace, separator, abi_prefix); - pos += strappend(&buf, &len, pos, "%s", suffix); + typeref_t *ref; + + pos += strappend(&buf, &len, pos, "%s<", type->name); + if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) + { + for (type = ref->type; type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) {} + pos += append_namespaces(&buf, &len, pos, type->namespace, "", "::", type->name, use_abi_namespace ? "ABI" : NULL); + for (type = ref->type; type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) pos += strappend(&buf, &len, pos, "*"); + if (list_next(params, &ref->entry)) pos += strappend(&buf, &len, pos, ","); + } + pos += strappend(&buf, &len, pos, ">"); + return buf; } @@ -642,6 +669,14 @@ type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, ty return type; } +type_t *type_parameterized_type_specialize_partial(type_t *type, typeref_list_t *params) +{ + type_t *new_type = duptype(type, 0); + new_type->details.parameterized.type = type; + new_type->details.parameterized.params = params; + return new_type; +} + int type_is_equal(const type_t *type1, const type_t *type2) { if (type1 == type2) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index a2185ae35ea..6408fc0e409 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -36,6 +36,8 @@ attr_list_t *check_interface_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); +type_t *find_parameterized_type(type_t *type, typeref_list_t *params); + type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(type_t *ref); type_t *type_new_alias(const decl_spec_t *t, const char *name); @@ -64,6 +66,7 @@ type_t *type_apicontract_declare(char *name, struct namespace *namespace); type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs); type_t *type_parameterized_interface_declare(char *name, struct namespace *namespace, typeref_list_t *params); type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires); +type_t *type_parameterized_type_specialize_partial(type_t *type, typeref_list_t *params); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); char *gen_name(void); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index e2f77fbadec..777aabc78ff 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -643,6 +643,7 @@ void init_loc_info(loc_info_t *); char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, const char *abi_prefix); +char *format_parameterized_type_name(type_t *type, typeref_list_t *params); static inline enum type_type type_get_type_detect_alias(const type_t *type) {

1 0

Rémi Bernon : widl: Replace type_list_t with typeref_list_t.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 94b5af4b3444f337186fa59d3fa6932aafefdc8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b5af4b3444f337186fa59d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:33 2021 +0100 widl: Replace type_list_t with typeref_list_t. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 14 +++++++------- tools/widl/header.c | 16 ++++++++-------- tools/widl/parser.y | 26 ++++---------------------- tools/widl/typegen.c | 12 ++++++------ tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 2 +- tools/widl/widltypes.h | 10 ++-------- tools/widl/write_msft.c | 10 +++++----- 8 files changed, 34 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94b5af4b3444f337186f…

1 0

Rémi Bernon : widl: Rename ifref_list_t to typeref_list_t.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 84966c9b5938841cb08625dba97a53518bd4b3cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=84966c9b5938841cb08625db… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:32 2021 +0100 widl: Rename ifref_list_t to typeref_list_t. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 10 +++++----- tools/widl/typetree.c | 10 +++++----- tools/widl/typetree.h | 16 ++++++++-------- tools/widl/widltypes.h | 8 ++++---- tools/widl/write_msft.c | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7579e84d6f3..7fec5da2726 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -57,7 +57,7 @@ static attr_t *make_custom_attr(UUID *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); -static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref); +static typeref_list_t *append_typeref(typeref_list_t *list, typeref_t *ref); static typeref_t *make_typeref(type_t *type); static var_list_t *append_var_list(var_list_t *list, var_list_t *vars); static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p); @@ -138,7 +138,7 @@ static typelib_t *current_typelib; warning_t *warning; warning_list_t *warning_list; typeref_t *typeref; - ifref_list_t *ifref_list; + typeref_list_t *typeref_list; char *str; UUID *uuid; unsigned int num; @@ -294,8 +294,8 @@ static typelib_t *current_typelib; %type <type> type_parameter %type <type_list> type_parameters %type <typeref> class_interface -%type <ifref_list> class_interfaces -%type <ifref_list> requires required_types +%type <typeref_list> class_interfaces +%type <typeref_list> requires required_types %type <var> arg ne_union_field union_field s_field case enum enum_member declaration %type <var> funcdef %type <var_list> m_args arg_list args dispint_meths @@ -1814,7 +1814,7 @@ static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, dec return var_list; } -static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref) +static typeref_list_t *append_typeref(typeref_list_t *list, typeref_t *ref) { if (!ref) return list; if (!list) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index d2a43a36c01..bafd8d9879f 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -425,7 +425,7 @@ type_t *type_interface_declare(char *name, struct namespace *namespace) return type; } -type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires) +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires) { if (iface->defined) error_loc("interface %s already defined at %s:%d\n", @@ -526,7 +526,7 @@ type_t *type_coclass_declare(char *name) return type; } -type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces) +type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, typeref_list_t *ifaces) { if (coclass->defined) error_loc("coclass %s already defined at %s:%d\n", @@ -546,10 +546,10 @@ type_t *type_runtimeclass_declare(char *name, struct namespace *namespace) return type; } -type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces) +type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typeref_list_t *ifaces) { typeref_t *ref, *required, *tmp; - ifref_list_t *requires; + typeref_list_t *requires; if (runtimeclass->defined) error_loc("runtimeclass %s already defined at %s:%d\n", @@ -614,7 +614,7 @@ type_t *type_parameterized_interface_declare(char *name, struct namespace *names return type; } -type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires) +type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires) { type_t *iface; if (type->defined) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 7c2e9d40026..aa08c299c20 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -53,17 +53,17 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); type_t *type_interface_declare(char *name, struct namespace *namespace); -type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires); +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires); type_t *type_dispinterface_declare(char *name); type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods); type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface); type_t *type_module_define(type_t* module, attr_list_t *attrs, statement_list_t *stmts); -type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces); -type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces); +type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, typeref_list_t *ifaces); +type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typeref_list_t *ifaces); type_t *type_apicontract_declare(char *name, struct namespace *namespace); type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs); type_t *type_parameterized_interface_declare(char *name, struct namespace *namespace, type_list_t *params); -type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires); +type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); char *gen_name(void); @@ -183,7 +183,7 @@ static inline type_t *type_iface_get_inherit(const type_t *type) return type->details.iface->inherit; } -static inline ifref_list_t *type_iface_get_requires(const type_t *type) +static inline typeref_list_t *type_iface_get_requires(const type_t *type) { type = type_get_real_type(type); assert(type_get_type(type) == TYPE_INTERFACE); @@ -341,14 +341,14 @@ static inline type_t *type_alias_get_aliasee_type(const type_t *type) return type->details.alias.aliasee.type; } -static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) +static inline typeref_list_t *type_coclass_get_ifaces(const type_t *type) { type = type_get_real_type(type); assert(type_get_type(type) == TYPE_COCLASS); return type->details.coclass.ifaces; } -static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) +static inline typeref_list_t *type_runtimeclass_get_ifaces(const type_t *type) { type = type_get_real_type(type); assert(type_get_type(type) == TYPE_RUNTIMECLASS); @@ -357,7 +357,7 @@ static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) { - ifref_list_t *ifaces = type_runtimeclass_get_ifaces(type); + typeref_list_t *ifaces = type_runtimeclass_get_ifaces(type); typeref_t *ref; if (!ifaces) return NULL; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 8e83fc059fb..e2b8608fabb 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -60,7 +60,7 @@ typedef struct list str_list_t; typedef struct list expr_list_t; typedef struct list var_list_t; typedef struct list declarator_list_t; -typedef struct list ifref_list_t; +typedef struct list typeref_list_t; typedef struct list user_type_list_t; typedef struct list context_handle_list_t; typedef struct list generic_handle_list_t; @@ -386,7 +386,7 @@ struct iface_details struct _type_t *inherit; struct _type_t *disp_inherit; struct _type_t *async_iface; - ifref_list_t *requires; + typeref_list_t *requires; }; struct module_details @@ -406,7 +406,7 @@ struct array_details struct coclass_details { - ifref_list_t *ifaces; + typeref_list_t *ifaces; }; struct basic_details @@ -433,7 +433,7 @@ struct alias_details struct runtimeclass_details { - ifref_list_t *ifaces; + typeref_list_t *ifaces; }; struct parameterized_details diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index fb532f7a227..49659123ddd 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2336,7 +2336,7 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) MSFT_RefRecord *ref, *first = NULL, *first_source = NULL; int have_default = 0, have_default_source = 0; const attr_t *attr; - ifref_list_t *ifaces; + typeref_list_t *ifaces; if (-1 < cls->typelib_idx) return;

1 0

Rémi Bernon : widl: Rename ifref_t to typeref_t.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 7987c6f9ba920ac678f968a8b2a7023b07a982c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7987c6f9ba920ac678f968a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:31 2021 +0100 widl: Rename ifref_t to typeref_t. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 34 +++++++++++++++++----------------- tools/widl/typetree.c | 14 +++++++------- tools/widl/typetree.h | 8 ++++---- tools/widl/widltypes.h | 5 ++--- tools/widl/write_msft.c | 6 +++--- 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 05ca81737d5..7579e84d6f3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -57,8 +57,8 @@ static attr_t *make_custom_attr(UUID *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); -static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface); -static ifref_t *make_ifref(type_t *iface); +static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref); +static typeref_t *make_typeref(type_t *type); static var_list_t *append_var_list(var_list_t *list, var_list_t *vars); static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p); static declarator_t *make_declarator(var_t *var); @@ -137,7 +137,7 @@ static typelib_t *current_typelib; statement_list_t *stmt_list; warning_t *warning; warning_list_t *warning_list; - ifref_t *ifref; + typeref_t *typeref; ifref_list_t *ifref_list; char *str; UUID *uuid; @@ -293,7 +293,7 @@ static typelib_t *current_typelib; %type <type> type unqualified_type qualified_type %type <type> type_parameter %type <type_list> type_parameters -%type <ifref> class_interface +%type <typeref> class_interface %type <ifref_list> class_interfaces %type <ifref_list> requires required_types %type <var> arg ne_union_field union_field s_field case enum enum_member declaration @@ -939,12 +939,12 @@ namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } ; class_interfaces: { $$ = NULL; } - | class_interfaces class_interface { $$ = append_ifref( $1, $2 ); } + | class_interfaces class_interface { $$ = append_typeref( $1, $2 ); } ; class_interface: - m_attributes interfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } - | m_attributes dispinterfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } + m_attributes interfaceref ';' { $$ = make_typeref($2); $$->attrs = $1; } + | m_attributes dispinterfaceref ';' { $$ = make_typeref($2); $$->attrs = $1; } ; dispinterface: tDISPINTERFACE typename { $$ = type_dispinterface_declare($2); } @@ -987,8 +987,8 @@ interface: ; required_types: - qualified_type { $$ = append_ifref(NULL, make_ifref($1)); } - | required_types ',' qualified_type { $$ = append_ifref($1, make_ifref($3)); } + qualified_type { $$ = append_typeref(NULL, make_typeref($1)); } + | required_types ',' qualified_type { $$ = append_typeref($1, make_typeref($3)); } requires: { $$ = NULL; } | tREQUIRES required_types { $$ = $2; } @@ -1814,24 +1814,24 @@ static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, dec return var_list; } -static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface) +static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref) { - if (!iface) return list; + if (!ref) return list; if (!list) { list = xmalloc( sizeof(*list) ); list_init( list ); } - list_add_tail( list, &iface->entry ); + list_add_tail( list, &ref->entry ); return list; } -static ifref_t *make_ifref(type_t *type) +static typeref_t *make_typeref(type_t *type) { - ifref_t *l = xmalloc(sizeof(ifref_t)); - l->type = type; - l->attrs = NULL; - return l; + typeref_t *ref = xmalloc(sizeof(typeref_t)); + ref->type = type; + ref->attrs = NULL; + return ref; } static type_list_t *append_type(type_list_t *list, type_t *type) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 2f49a92511a..d2a43a36c01 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -548,7 +548,7 @@ type_t *type_runtimeclass_declare(char *name, struct namespace *namespace) type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces) { - ifref_t *ifref, *required, *tmp; + typeref_t *ref, *required, *tmp; ifref_list_t *requires; if (runtimeclass->defined) @@ -560,24 +560,24 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref if (!type_runtimeclass_get_default_iface(runtimeclass)) error_loc("missing default interface on runtimeclass %s\n", runtimeclass->name); - LIST_FOR_EACH_ENTRY(ifref, ifaces, ifref_t, entry) + LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) { /* FIXME: this should probably not be allowed, here or in coclass, */ /* but for now there's too many places in Wine IDL where it is to */ /* even print a warning. */ - if (!(ifref->type->defined)) continue; - if (!(requires = type_iface_get_requires(ifref->type))) continue; - LIST_FOR_EACH_ENTRY(required, requires, ifref_t, entry) + if (!(ref->type->defined)) continue; + if (!(requires = type_iface_get_requires(ref->type))) continue; + LIST_FOR_EACH_ENTRY(required, requires, typeref_t, entry) { int found = 0; - LIST_FOR_EACH_ENTRY(tmp, ifaces, ifref_t, entry) + LIST_FOR_EACH_ENTRY(tmp, ifaces, typeref_t, entry) if ((found = type_is_equal(tmp->type, required->type))) break; if (!found) error_loc("interface '%s' also requires interface '%s', " "but runtimeclass '%s' does not implement it.\n", - ifref->type->name, required->type->name, runtimeclass->name); + ref->type->name, required->type->name, runtimeclass->name); } } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 186f42307f4..7c2e9d40026 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -358,12 +358,12 @@ static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) { ifref_list_t *ifaces = type_runtimeclass_get_ifaces(type); - ifref_t *entry; + typeref_t *ref; if (!ifaces) return NULL; - LIST_FOR_EACH_ENTRY(entry, ifaces, ifref_t, entry) - if (is_attr(entry->attrs, ATTR_DEFAULT)) - return entry->type; + LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) + if (is_attr(ref->attrs, ATTR_DEFAULT)) + return ref->type; return NULL; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index f31d40cad91..8e83fc059fb 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -43,7 +43,7 @@ typedef struct _type_t type_t; typedef struct _var_t var_t; typedef struct _decl_spec_t decl_spec_t; typedef struct _declarator_t declarator_t; -typedef struct _ifref_t ifref_t; +typedef struct _typeref_t typeref_t; typedef struct _typelib_entry_t typelib_entry_t; typedef struct _importlib_t importlib_t; typedef struct _importinfo_t importinfo_t; @@ -537,7 +537,7 @@ struct _declarator_t { struct list entry; }; -struct _ifref_t { +struct _typeref_t { type_t *type; attr_list_t *attrs; @@ -601,7 +601,6 @@ struct _statement_t { enum statement_type type; union { - ifref_t iface; type_t *type; const char *str; var_t *var; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 63635cec011..fb532f7a227 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2331,7 +2331,7 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) { msft_typeinfo_t *msft_typeinfo; - ifref_t *iref; + typeref_t *iref; int num_ifaces = 0, offset, i; MSFT_RefRecord *ref, *first = NULL, *first_source = NULL; int have_default = 0, have_default_source = 0; @@ -2345,13 +2345,13 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) msft_typeinfo = create_msft_typeinfo(typelib, TKIND_COCLASS, cls->name, cls->attrs); ifaces = type_coclass_get_ifaces(cls); - if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, ifref_t, entry ) num_ifaces++; + if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, typeref_t, entry ) num_ifaces++; offset = msft_typeinfo->typeinfo->datatype1 = ctl2_alloc_segment(typelib, MSFT_SEG_REFERENCES, num_ifaces * sizeof(*ref), 0); i = 0; - if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, ifref_t, entry ) { + if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, typeref_t, entry ) { if(iref->type->typelib_idx == -1) add_interface_typeinfo(typelib, iref->type); ref = (MSFT_RefRecord*) (typelib->typelib_segment_data[MSFT_SEG_REFERENCES] + offset + i * sizeof(*ref));

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
92
Older →

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 February 2021