- Wine-Commits - list.winehq.org

Alexandros Frantzis : win32u: Store the full KBD vkey information in kbd_tables_init_vsc2vk.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: f5f62c945c2af93001ecf5bd2ad60110c9d25978 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5f62c945c2af93001ecf5bd2ad601… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 8 10:28:34 2024 +0300 win32u: Store the full KBD vkey information in kbd_tables_init_vsc2vk. --- dlls/win32u/input.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 38350861c6b..333c0c1e4f7 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -410,27 +410,27 @@ LONG global_key_state_counter = 0; BOOL grab_pointer = TRUE; BOOL grab_fullscreen = FALSE; -static void kbd_tables_init_vsc2vk( const KBDTABLES *tables, BYTE vsc2vk[0x300] ) +static void kbd_tables_init_vsc2vk( const KBDTABLES *tables, USHORT vsc2vk[0x300] ) { const VSC_VK *entry; WORD vsc; - memset( vsc2vk, 0, 0x300 ); + memset( vsc2vk, 0, 0x300 * sizeof(USHORT) ); for (vsc = 0; tables->pusVSCtoVK && vsc <= tables->bMaxVSCtoVK; ++vsc) { if (tables->pusVSCtoVK[vsc] == VK__none_) continue; - vsc2vk[vsc] = (BYTE)tables->pusVSCtoVK[vsc]; + vsc2vk[vsc] = tables->pusVSCtoVK[vsc]; } for (entry = tables->pVSCtoVK_E0; entry && entry->Vsc; entry++) { if (entry->Vk == VK__none_) continue; - vsc2vk[entry->Vsc + 0x100] = (BYTE)entry->Vk; + vsc2vk[entry->Vsc + 0x100] = entry->Vk; } for (entry = tables->pVSCtoVK_E1; entry && entry->Vsc; entry++) { if (entry->Vk == VK__none_) continue; - vsc2vk[entry->Vsc + 0x200] = (BYTE)entry->Vk; + vsc2vk[entry->Vsc + 0x200] = entry->Vk; } } @@ -1033,7 +1033,8 @@ WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ) */ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ) { - BYTE vsc2vk[0x300], vk2char[0x100]; + USHORT vsc2vk[0x300]; + BYTE vk2char[0x100]; const KBDTABLES *kbd_tables; UINT ret = 0; @@ -1066,7 +1067,7 @@ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ) } kbd_tables_init_vsc2vk( kbd_tables, vsc2vk ); - for (ret = 0; ret < ARRAY_SIZE(vsc2vk); ++ret) if (vsc2vk[ret] == code) break; + for (ret = 0; ret < ARRAY_SIZE(vsc2vk); ++ret) if ((vsc2vk[ret] & 0xff) == code) break; if (ret >= ARRAY_SIZE(vsc2vk)) ret = 0; if (type == MAPVK_VK_TO_VSC) @@ -1082,7 +1083,7 @@ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ) if (code & 0xe000) code -= 0xdf00; if (code >= ARRAY_SIZE(vsc2vk)) ret = 0; - else ret = vsc2vk[code]; + else ret = vsc2vk[code] & 0xff; if (type == MAPVK_VSC_TO_VK) { @@ -1130,15 +1131,15 @@ INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ) if (lparam & 0x2000000) { - BYTE vsc2vk[0x300]; + USHORT vsc2vk[0x300]; kbd_tables_init_vsc2vk( kbd_tables, vsc2vk ); - switch ((vkey = vsc2vk[code])) + switch ((vkey = vsc2vk[code] & 0xff)) { case VK_RSHIFT: case VK_RCONTROL: case VK_RMENU: for (code = 0; code < ARRAY_SIZE(vsc2vk); ++code) - if (vsc2vk[code] == (vkey - 1)) break; + if ((vsc2vk[code] & 0xff) == (vkey - 1)) break; break; } }

1 0

Alexandros Frantzis : win32u: Allow drivers to send only the scan code for keyboard events.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: c288c28eafd6f8bbb3b2020a1b756c297f4a4923 URL: https://gitlab.winehq.org/wine/wine/-/commit/c288c28eafd6f8bbb3b2020a1b756c… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri May 3 15:43:08 2024 +0300 win32u: Allow drivers to send only the scan code for keyboard events. The implementation will map the scan code to a virtual key code internally. --- dlls/user32/tests/input.c | 31 +++++++++++++++++++++++-------- dlls/win32u/message.c | 23 ++++++++++++++++++++--- dlls/winewayland.drv/wayland_keyboard.c | 9 ++++----- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d84d543bed8..8fad3305f3e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1063,16 +1063,26 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W struct send_input_keyboard_test rshift_scan[] = { {.scan = 0x36, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80}, - .todo_state = {[0] = TRUE, [VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE}, - .expect = {KEY_HOOK(WM_KEYDOWN, 0x36, VK_RSHIFT, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0x36, VK_SHIFT, .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0x36, VK_RSHIFT), KEY_MSG(WM_KEYDOWN, 0x36, VK_SHIFT), {0}}}, {.scan = scan, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80, /*[vkey] = 0x80*/}, - .todo_state = {[0] = TRUE, [VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE, /*[vkey] = TRUE*/}, - .expect = {KEY_HOOK(WM_KEYDOWN, scan, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, scan, vkey, .todo_value = TRUE), WIN_MSG(WM_CHAR, wch_shift, MAKELONG(1, scan), .todo = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYDOWN, scan, vkey), KEY_MSG(WM_KEYDOWN, scan, vkey), WIN_MSG(WM_CHAR, wch_shift, MAKELONG(1, scan)), {0}}}, {.scan = scan, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80}, - .todo_state = {[VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE}, - .expect = {KEY_HOOK(WM_KEYUP, scan, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYUP, scan, vkey, .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, scan, vkey), KEY_MSG(WM_KEYUP, scan, vkey), {0}}}, {.scan = 0x36, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, - .expect = {KEY_HOOK(WM_KEYUP, 0x36, VK_RSHIFT, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0x36, VK_SHIFT, .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, 0x36, VK_RSHIFT), KEY_MSG(WM_KEYUP, 0x36, VK_SHIFT), {0}}}, + {0}, + }; + + struct send_input_keyboard_test rctrl_scan[] = + { + {.scan = 0xe01d, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_CONTROL] = 0x80, [VK_LCONTROL] = 0x80}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0x1d, VK_LCONTROL), KEY_MSG(WM_KEYDOWN, 0x1d, VK_CONTROL), {0}}}, + {.scan = 0xe01d, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, + .expect = {KEY_HOOK(WM_KEYUP, 0x1d, VK_LCONTROL), KEY_MSG(WM_KEYUP, 0x1d, VK_CONTROL), {0}}}, + {.scan = 0x1d, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_EXTENDEDKEY, .expect_state = {[VK_CONTROL] = 0x80, [VK_RCONTROL] = 0x80}, + .expect = {KEY_HOOK_(WM_KEYDOWN, 0x1d, VK_RCONTROL, LLKHF_EXTENDED, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0x11d, VK_CONTROL), {0}}}, + {.scan = 0x1d, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, + .expect = {KEY_HOOK_(WM_KEYUP, 0x1d, VK_RCONTROL, LLKHF_EXTENDED, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0x11d, VK_CONTROL), {0}}}, {0}, }; @@ -1179,7 +1189,6 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W lmenu_lcontrol_vkey[2].expect_state[vkey] = 0x80; shift_vkey[1].expect_state[vkey] = 0x80; rshift_scan[1].expect_state[vkey] = 0x80; - rshift_scan[1].todo_state[vkey] = TRUE; unicode_vkey[0].expect_state[vkey] = 0x80; /* test peeked messages */ @@ -1211,6 +1220,9 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W else check_send_input_keyboard_test( menu_ext_peeked, TRUE ); check_send_input_keyboard_test( lrshift_ext, TRUE ); check_send_input_keyboard_test( rshift_scan, TRUE ); + /* Skip on Korean layouts since they map the right control key to VK_HANJA */ + if (hkl == (HKL)0x04120412) skip( "skipping rctrl_scan test on Korean layout" ); + else check_send_input_keyboard_test( rctrl_scan, TRUE ); check_send_input_keyboard_test( unicode, TRUE ); check_send_input_keyboard_test( lmenu_unicode_peeked, TRUE ); check_send_input_keyboard_test( unicode_vkey, TRUE ); @@ -1251,6 +1263,9 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W else check_send_input_keyboard_test( menu_ext, FALSE ); check_send_input_keyboard_test( lrshift_ext, FALSE ); check_send_input_keyboard_test( rshift_scan, FALSE ); + /* Skip on Korean layouts since they map the right control key to VK_HANJA */ + if (hkl == (HKL)0x04120412) skip( "skipping rctrl_scan test on Korean layout" ); + else check_send_input_keyboard_test( rctrl_scan, FALSE ); check_send_input_keyboard_test( unicode, FALSE ); check_send_input_keyboard_test( lmenu_unicode, FALSE ); check_send_input_keyboard_test( unicode_vkey, FALSE ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 4a368ffb589..ddc9658f087 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3558,9 +3558,26 @@ NTSTATUS send_hardware_message( HWND hwnd, UINT flags, const INPUT *input, LPARA MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)); break; case INPUT_KEYBOARD: - req->input.kbd.vkey = input->ki.wVk; - req->input.kbd.scan = input->ki.wScan; - req->input.kbd.flags = input->ki.dwFlags; + if (input->ki.dwFlags & KEYEVENTF_SCANCODE) + { + UINT scan = input->ki.wScan; + /* TODO: Use the keyboard layout of the target hwnd, once + * NtUserGetKeyboardLayout supports non-current threads. */ + HKL layout = NtUserGetKeyboardLayout( 0 ); + if (flags & SEND_HWMSG_INJECTED) + { + scan = scan & 0xff; + if (input->ki.dwFlags & KEYEVENTF_EXTENDEDKEY) scan |= 0xe000; + } + req->input.kbd.vkey = NtUserMapVirtualKeyEx( scan, MAPVK_VSC_TO_VK_EX, layout ); + req->input.kbd.scan = input->ki.wScan & 0xff; + } + else + { + req->input.kbd.vkey = input->ki.wVk; + req->input.kbd.scan = input->ki.wScan; + } + req->input.kbd.flags = input->ki.dwFlags & ~KEYEVENTF_SCANCODE; req->input.kbd.time = input->ki.time; req->input.kbd.info = input->ki.dwExtraInfo; affects_key_state = TRUE; diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c index 04a1c0a9fc3..55b14b1dfd5 100644 --- a/dlls/winewayland.drv/wayland_keyboard.c +++ b/dlls/winewayland.drv/wayland_keyboard.c @@ -801,9 +801,8 @@ static void send_right_control(HWND hwnd, uint32_t state) { INPUT input = {0}; input.type = INPUT_KEYBOARD; - input.ki.wScan = key2scan(KEY_RIGHTCTRL); - input.ki.wVk = VK_RCONTROL; - input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY; + input.ki.wScan = 0xe000 | (key2scan(KEY_RIGHTCTRL) & 0xff); + input.ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_EXTENDEDKEY; if (state == WL_KEYBOARD_KEY_STATE_RELEASED) input.ki.dwFlags |= KEYEVENTF_KEYUP; NtUserSendHardwareInput(hwnd, 0, &input, 0); } @@ -824,8 +823,8 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard, if (key == KEY_RIGHTALT) send_right_control(hwnd, state); input.type = INPUT_KEYBOARD; - input.ki.wScan = scan & 0xff; - input.ki.wVk = NtUserMapVirtualKeyEx(scan, MAPVK_VSC_TO_VK_EX, keyboard_hkl); + input.ki.wScan = (scan & 0x300) ? scan + 0xdf00 : scan; + input.ki.dwFlags = KEYEVENTF_SCANCODE; if (scan & ~0xff) input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY; if (state == WL_KEYBOARD_KEY_STATE_RELEASED) input.ki.dwFlags |= KEYEVENTF_KEYUP;

1 0

Alexandros Frantzis : win32u: Emit number characters for numpad virtual keys.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: c4e636425aeb6c3eed201c679666474864158652 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4e636425aeb6c3eed201c67966647… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri May 3 10:50:00 2024 +0300 win32u: Emit number characters for numpad virtual keys. --- dlls/win32u/input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 04532e7d015..38350861c6b 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -521,6 +521,7 @@ static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const if (vkey >= 'A' && vkey <= 'Z') return vkey - 'A' + 1; tables = &kbdus_tables; } + if (vkey >= VK_NUMPAD0 && vkey <= VK_NUMPAD9) tables = &kbdus_tables; mod = caps_mod = kbd_tables_get_mod_num( tables, state, FALSE ); if (caps) caps_mod = kbd_tables_get_mod_num( tables, state, TRUE );

1 0

Daniel Lehman : odbc32: Allow null handle for SQLSetEnvAttr.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: 2e13067cc6c28626c1f2b662ec7e2a8f9be5b42e URL: https://gitlab.winehq.org/wine/wine/-/commit/2e13067cc6c28626c1f2b662ec7e2a… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon May 20 20:18:21 2024 -0700 odbc32: Allow null handle for SQLSetEnvAttr. It can be null for SQL_ATTR_CONNECTION_POOLING. --- dlls/odbc32/proxyodbc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c1c43ab8641..d5c271bdfa2 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1273,9 +1273,7 @@ SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute, TRACE("(EnvironmentHandle %p, Attribute %d, Value %p, StringLength %d)\n", EnvironmentHandle, Attribute, Value, StringLength); - if (!handle) return SQL_INVALID_HANDLE; - - params.EnvironmentHandle = handle->unix_handle; + params.EnvironmentHandle = handle ? handle->unix_handle : 0; ret = ODBC_CALL( SQLSetEnvAttr, &params ); TRACE("Returning %d\n", ret); return ret;

1 0

Fabian Maurer : oleaut32: Handle cases where invoking a get-only property with INVOKE_PROPERTYPUT returns DISP_E_BADPARAMCOUNT.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 033cf797607a8a21f0851fcef3d19a73c6d6d70e URL: https://gitlab.winehq.org/wine/wine/-/commit/033cf797607a8a21f0851fcef3d19a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 15 23:50:32 2024 +0200 oleaut32: Handle cases where invoking a get-only property with INVOKE_PROPERTYPUT returns DISP_E_BADPARAMCOUNT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56666 --- dlls/oleaut32/tests/typelib.c | 12 ------------ dlls/oleaut32/typelib.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ce60e99aa9d..eb5407f034f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1241,49 +1241,41 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 0 params */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 1 param */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 0 params - NULL result passed */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on on HRESULT func(out int) - 1 params - NULL result passed */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 0 params */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 1 params */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 0 params - NULL result passed */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 1 param - NULL result passed */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 0 param - NULL result passed */ @@ -1299,7 +1291,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 2 params - NULL result passed */ dispparams.cArgs = 2; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 7, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 3 params - NULL result passed */ @@ -1320,7 +1311,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int, int) - 2 params - NULL result passed */ dispparams.cArgs = 2; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 8, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int, int) - 3 params - NULL result passed */ @@ -1346,7 +1336,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on int func(int, int) - 3 params - NULL result passed */ dispparams.cArgs = 3; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 9, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on void func(int, int) - 0 params - NULL result passed */ @@ -1367,7 +1356,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on void func(int, int) - 3 params - NULL result passed */ dispparams.cArgs = 3; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 10, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* If there's get and put, the put must work */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b1fbcdfed0a..196f059a587 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7547,6 +7547,28 @@ func_fail: return E_NOTIMPL; } + /* not found, check for special error cases */ + for (fdc = 0; fdc < This->typeattr.cFuncs; ++fdc) + { + const FUNCDESC *func_desc = &This->funcdescs[fdc].funcdesc; + if (memid == func_desc->memid) + { + if ((wFlags & INVOKE_PROPERTYPUT) && (func_desc->invkind & INVOKE_PROPERTYGET)) + { + int count_inputs = 0; + for (i = 0; i < func_desc->cParams; i++) + { + USHORT wParamFlags = func_desc->lprgelemdescParam[i].paramdesc.wParamFlags; + if (!(wParamFlags & PARAMFLAG_FRETVAL)) + count_inputs++; + } + + if (count_inputs == 0 || pDispParams->cArgs == count_inputs + 1) + return DISP_E_BADPARAMCOUNT; + } + } + } + /* not found, look for it in inherited interfaces */ ITypeInfo2_GetTypeKind(iface, &type_kind); if(type_kind == TKIND_INTERFACE || type_kind == TKIND_DISPATCH) {

1 0

Alexandre Julliard : msvcrt: Add helpers to abstract RVA accesses to RTTI data.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 3447792a5ad683000bd333d59aa0a10afeab00ec URL: https://gitlab.winehq.org/wine/wine/-/commit/3447792a5ad683000bd333d59aa0a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:31:34 2024 +0200 msvcrt: Add helpers to abstract RVA accesses to RTTI data. --- dlls/msvcp90/cxx.h | 40 ++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 54 ++++++++++++++----------------------------------- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/cxx.h | 40 ++++++++++++++++++++++++++++++++++-- 4 files changed, 92 insertions(+), 44 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index a7c7a86a899..c0b43f78256 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -16,8 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winternl.h" +#include "rtlsupportapi.h" #include "wine/asm.h" +#ifndef __x86_64__ +#undef RTTI_USE_RVA +#else +#define RTTI_USE_RVA 1 +#endif + #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" @@ -44,7 +53,7 @@ #endif /* _WIN64 */ -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA #define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ @@ -330,7 +339,7 @@ typedef struct int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ } this_ptr_offsets; -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA typedef struct _rtti_base_descriptor { @@ -445,6 +454,33 @@ typedef struct extern const vtable_ptr type_info_vtable; +#ifdef RTTI_USE_RVA + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + void *base; + return (uintptr_t)RtlPcToFileHeader( (void *)ptr, &base ); +} + +static inline void *rtti_rva( unsigned int rva, uintptr_t base ) +{ + return (void *)(base + rva); +} + +#else + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + return 0; +} + +static inline void *rtti_rva( const void *ptr, uintptr_t base ) +{ + return (void *)ptr; +} + +#endif + #define CREATE_TYPE_INFO_VTABLE \ DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 943f5936a19..b98dca4ee6c 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -65,62 +65,38 @@ static inline const rtti_object_locator *get_obj_locator( void *cppobj ) return (const rtti_object_locator *)vtable[-1]; } -#ifndef __x86_64__ -static void dump_obj_locator( const rtti_object_locator *ptr ) +static uintptr_t get_obj_locator_base( const rtti_object_locator *ptr ) { - int i; - const rtti_object_hierarchy *h = ptr->type_hierarchy; - - TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", - ptr, ptr->signature, ptr->base_class_offset, ptr->flags, - ptr->type_descriptor, dbgstr_type_info(ptr->type_descriptor), ptr->type_hierarchy ); - TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", - h->signature, h->attributes, h->array_len, h->base_classes ); - for (i = 0; i < h->array_len; i++) - { - TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", - h->base_classes->bases[i], - h->base_classes->bases[i]->num_base_classes, - h->base_classes->bases[i]->offsets.this_offset, - h->base_classes->bases[i]->offsets.vbase_descr, - h->base_classes->bases[i]->offsets.vbase_offset, - h->base_classes->bases[i]->attributes, - h->base_classes->bases[i]->type_descriptor, - dbgstr_type_info(h->base_classes->bases[i]->type_descriptor) ); - } +#ifdef RTTI_USE_RVA + if (ptr->signature) return (uintptr_t)ptr - ptr->object_locator; +#endif + return rtti_rva_base( ptr ); } -#else - static void dump_obj_locator( const rtti_object_locator *ptr ) { int i; - char *base = ptr->signature == 0 ? RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; - const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); - const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); + uintptr_t base = get_obj_locator_base( ptr ); + const rtti_object_hierarchy *h = rtti_rva( ptr->type_hierarchy, base ); + const type_info *type_descriptor = rtti_rva( ptr->type_descriptor, base ); TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", ptr, ptr->signature, ptr->base_class_offset, ptr->flags, type_descriptor, dbgstr_type_info(type_descriptor), h ); TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", - h->signature, h->attributes, h->array_len, base + h->base_classes ); + h->signature, h->attributes, h->array_len, rtti_rva(h->base_classes, base) ); for (i = 0; i < h->array_len; i++) { - const rtti_base_descriptor *bases = (rtti_base_descriptor*)(base + - ((const rtti_base_array*)(base + h->base_classes))->bases[i]); + const rtti_base_array *base_array = rtti_rva( h->base_classes, base ); + const rtti_base_descriptor *bases = rtti_rva( base_array->bases[i], base ); TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", - bases, - bases->num_base_classes, - bases->offsets.this_offset, - bases->offsets.vbase_descr, - bases->offsets.vbase_offset, - bases->attributes, - base + bases->type_descriptor, - dbgstr_type_info((const type_info*)(base + bases->type_descriptor)) ); + bases, bases->num_base_classes, bases->offsets.this_offset, + bases->offsets.vbase_descr, bases->offsets.vbase_offset, bases->attributes, + rtti_rva( bases->type_descriptor, base ), + dbgstr_type_info((const type_info*)(base + bases->type_descriptor)) ); } } -#endif /****************************************************************** * ??0exception@@QAE(a)ABQBD@Z (MSVCRT.@) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 48b370d1be6..adde30b6d15 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -28,7 +28,7 @@ #define CXX_FRAME_MAGIC_VC8 0x19930522 #define CXX_EXCEPTION 0xe06d7363 -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA #define CXX_EXCEPTION_PARAMS 4 #else #define CXX_EXCEPTION_PARAMS 3 diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index a7c7a86a899..c0b43f78256 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -16,8 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winternl.h" +#include "rtlsupportapi.h" #include "wine/asm.h" +#ifndef __x86_64__ +#undef RTTI_USE_RVA +#else +#define RTTI_USE_RVA 1 +#endif + #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" @@ -44,7 +53,7 @@ #endif /* _WIN64 */ -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA #define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ @@ -330,7 +339,7 @@ typedef struct int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ } this_ptr_offsets; -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA typedef struct _rtti_base_descriptor { @@ -445,6 +454,33 @@ typedef struct extern const vtable_ptr type_info_vtable; +#ifdef RTTI_USE_RVA + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + void *base; + return (uintptr_t)RtlPcToFileHeader( (void *)ptr, &base ); +} + +static inline void *rtti_rva( unsigned int rva, uintptr_t base ) +{ + return (void *)(base + rva); +} + +#else + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + return 0; +} + +static inline void *rtti_rva( const void *ptr, uintptr_t base ) +{ + return (void *)ptr; +} + +#endif + #define CREATE_TYPE_INFO_VTABLE \ DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \

1 0

Alexandre Julliard : msvcrt: Unify __RTDynamicCast implementation.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: df4c55624957f4d55ac394ed4445759b4d0d3366 URL: https://gitlab.winehq.org/wine/wine/-/commit/df4c55624957f4d55ac394ed444575… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:35:04 2024 +0200 msvcrt: Unify __RTDynamicCast implementation. --- dlls/msvcrt/cpp.c | 74 +++++-------------------------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 60a3da82773..08bed2d178c 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -781,7 +781,6 @@ const type_info* CDECL __RTtypeid(void *cppobj) * This function is usually called by compiler generated code as a result * of using one of the C++ dynamic cast statements. */ -#ifndef __x86_64__ void* CDECL __RTDynamicCast(void *cppobj, int unknown, type_info *src, type_info *dst, int do_throw) @@ -805,21 +804,23 @@ void* CDECL __RTDynamicCast(void *cppobj, int unknown, { int i; const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - const rtti_object_hierarchy *obj_bases = obj_locator->type_hierarchy; - const rtti_base_descriptor * const* base_desc = obj_bases->base_classes->bases; + uintptr_t base = get_obj_locator_base( obj_locator ); + const rtti_object_hierarchy *obj_bases = rtti_rva( obj_locator->type_hierarchy, base ); + const rtti_base_array *base_array = rtti_rva( obj_bases->base_classes, base ); if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); ret = NULL; for (i = 0; i < obj_bases->array_len; i++) { - const type_info *typ = base_desc[i]->type_descriptor; + const rtti_base_descriptor *base_desc = rtti_rva( base_array->bases[i], base ); + const type_info *typ = rtti_rva( base_desc->type_descriptor, base ); if (!strcmp(typ->mangled, dst->mangled)) { /* compute the correct this pointer for that base class */ void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; - ret = get_this_pointer( &base_desc[i]->offsets, this_ptr ); + ret = get_this_pointer( &base_desc->offsets, this_ptr ); break; } } @@ -844,69 +845,6 @@ void* CDECL __RTDynamicCast(void *cppobj, int unknown, return ret; } -#else - -void* CDECL __RTDynamicCast(void *cppobj, int unknown, - type_info *src, type_info *dst, - int do_throw) -{ - void *ret; - - if (!cppobj) return NULL; - - TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", - cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); - - __TRY - { - int i; - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - const rtti_object_hierarchy *obj_bases; - const rtti_base_array *base_array; - char *base; - - if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); - - if(obj_locator->signature == 0) - base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); - else - base = (char*)obj_locator - obj_locator->object_locator; - - obj_bases = (const rtti_object_hierarchy*)(base + obj_locator->type_hierarchy); - base_array = (const rtti_base_array*)(base + obj_bases->base_classes); - - ret = NULL; - for (i = 0; i < obj_bases->array_len; i++) - { - const rtti_base_descriptor *base_desc = (const rtti_base_descriptor*)(base + base_array->bases[i]); - const type_info *typ = (const type_info*)(base + base_desc->type_descriptor); - - if (!strcmp(typ->mangled, dst->mangled)) - { - void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; - ret = get_this_pointer( &base_desc->offsets, this_ptr ); - break; - } - } - if (!ret && do_throw) - { - const char *msg = "Bad dynamic_cast!"; - bad_cast e; - bad_cast_ctor( &e, &msg ); - _CxxThrowException( &e, &bad_cast_exception_type ); - } - } - __EXCEPT_PAGE_FAULT - { - __non_rtti_object e; - __non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - } - __ENDTRY - return ret; -} -#endif - /****************************************************************** * __RTCastToVoid (MSVCRT.@)

1 0

Alexandre Julliard : msvcrt: Unify __RTtypeid implementation.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: 04755e4aac432de9c2dad9e0a252ff8e98b8dc47 URL: https://gitlab.winehq.org/wine/wine/-/commit/04755e4aac432de9c2dad9e0a252ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:33:54 2024 +0200 msvcrt: Unify __RTtypeid implementation. --- dlls/msvcrt/cpp.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b98dca4ee6c..60a3da82773 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -731,7 +731,6 @@ void CDECL unexpected(void) * This function is usually called by compiler generated code as a result * of using one of the C++ dynamic cast statements. */ -#ifndef __x86_64__ const type_info* CDECL __RTtypeid(void *cppobj) { const type_info *ret; @@ -746,42 +745,9 @@ const type_info* CDECL __RTtypeid(void *cppobj) __TRY { const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - ret = obj_locator->type_descriptor; - } - __EXCEPT_PAGE_FAULT - { - __non_rtti_object e; - __non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - } - __ENDTRY - return ret; -} + uintptr_t base = get_obj_locator_base( obj_locator ); -#else - -const type_info* CDECL __RTtypeid(void *cppobj) -{ - const type_info *ret; - - if (!cppobj) - { - bad_typeid e; - bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); - } - - __TRY - { - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - char *base; - - if(obj_locator->signature == 0) - base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); - else - base = (char*)obj_locator - obj_locator->object_locator; - - ret = (type_info*)(base + obj_locator->type_descriptor); + ret = rtti_rva( obj_locator->type_descriptor, base ); } __EXCEPT_PAGE_FAULT { @@ -792,7 +758,6 @@ const type_info* CDECL __RTtypeid(void *cppobj) __ENDTRY return ret; } -#endif /****************************************************************** * __RTDynamicCast (MSVCRT.@)

1 0

Brendan Shanks : ntdll: Don't warn on macOS and FreeBSD when xattr doesn't exist.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: ed9ec141d527839160d9b6272e53967777887db1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed9ec141d527839160d9b6272e5396… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 20 12:20:30 2024 -0700 ntdll: Don't warn on macOS and FreeBSD when xattr doesn't exist. --- dlls/ntdll/unix/file.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d292d934efa..d1a6573ed69 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1595,6 +1595,9 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret; +#endif +#ifdef ENOATTR + if (errno == ENOATTR) return ret; #endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", errno, strerror( errno ) ); @@ -1694,6 +1697,9 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret; +#endif +#ifdef ENOATTR + if (errno == ENOATTR) return ret; #endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", path, errno, strerror( errno ) );

1 0

Alexandre Julliard : msvcrt: Unify _is_exception_typeof implementation.
by Alexandre Julliard May 20, 2024

May 20, 2024

Module: wine Branch: master Commit: f7e2ac9546b808aab55535a7fed206a8761d2916 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7e2ac9546b808aab55535a7fed206… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:37:15 2024 +0200 msvcrt: Unify _is_exception_typeof implementation. --- dlls/msvcrt/cpp.c | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index c941be8fd36..7e0d3f69396 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -904,42 +904,6 @@ void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z * ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z */ -#ifndef __x86_64__ -int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) -{ - int ret = -1; - - TRACE("(%p %p)\n", ti, ep); - - __TRY - { - EXCEPTION_RECORD *rec = ep->ExceptionRecord; - - if (is_cxx_exception( rec )) - { - const cxx_type_info_table *tit = ((cxx_exception_type*)rec->ExceptionInformation[2])->type_info_table; - int i; - - for (i=0; i<tit->count; i++) { - if (ti==tit->info[i]->type_info || !strcmp(ti->mangled, tit->info[i]->type_info->mangled)) - { - ret = 1; - break; - } - } - - if (i == tit->count) - ret = 0; - } - } - __EXCEPT_PAGE_FAULT - __ENDTRY - - if(ret == -1) - terminate(); - return ret; -} -#else int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) { int ret = -1; @@ -953,12 +917,14 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) if (is_cxx_exception( rec )) { const cxx_exception_type *et = (cxx_exception_type*)rec->ExceptionInformation[2]; - const cxx_type_info_table *tit = (const cxx_type_info_table*)(rec->ExceptionInformation[3]+et->type_info_table); + uintptr_t base = (CXX_EXCEPTION_PARAMS == 4) ? rec->ExceptionInformation[3] : 0; + const cxx_type_info_table *tit = rtti_rva( et->type_info_table, base ); int i; - for (i=0; i<tit->count; i++) { - const cxx_type_info *cti = (const cxx_type_info*)(rec->ExceptionInformation[3]+tit->info[i]); - const type_info *except_ti = (const type_info*)(rec->ExceptionInformation[3]+cti->type_info); + for (i=0; i<tit->count; i++) + { + const cxx_type_info *cti = rtti_rva( tit->info[i], base ); + const type_info *except_ti = rtti_rva( cti->type_info, base ); if (ti==except_ti || !strcmp(ti->mangled, except_ti->mangled)) { ret = 1; @@ -977,7 +943,6 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) terminate(); return ret; } -#endif /********************************************************************* * __clean_type_info_names_internal (MSVCR80.@)

1 0