June 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : include: Add touch and pointer input related winuser.h declarations.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: 834ade753ef763b6dc9c20717c18ccef0564c93e URL: https://source.winehq.org/git/wine.git/?a=commit;h=834ade753ef763b6dc9c2071… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 21 14:57:46 2021 +0200 include: Add touch and pointer input related winuser.h declarations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/winuser.h | 368 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 362 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=834ade753ef763b6dc9c…

1 0

Jacek Caban : winemac: Move wine_notify_icon implementation to dllmain.c.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: 340d1b7a8f2bb3bb85993d4136b1b2b54c483c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=340d1b7a8f2bb3bb85993d41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 02:26:27 2022 +0200 winemac: Move wine_notify_icon implementation to dllmain.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 7 +++++++ dlls/winemac.drv/macdrv.h | 4 ++++ dlls/winemac.drv/macdrv_main.c | 1 + dlls/winemac.drv/systray.c | 8 +++++--- dlls/winemac.drv/unixlib.h | 8 ++++++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 60ca50474d7..23a1e6e2218 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -21,6 +21,7 @@ #include "config.h" #include <stdarg.h> #include "macdrv.h" +#include "shellapi.h" HMODULE macdrv_module = 0; @@ -63,3 +64,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) macdrv_module = instance; return process_attach(); } + +int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) +{ + struct notify_icon_params params = { .msg = msg, .data = data }; + return MACDRV_CALL(notify_icon, &params); +} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 39aff4d6a9f..a4736b2d315 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -294,6 +294,10 @@ extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; +/* unixlib interface */ + +extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; + /* user helpers */ static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index adcf6f73fc7..6ab7b108909 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -610,6 +610,7 @@ BOOL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, const unixlib_entry_t __wine_unix_call_funcs[] = { macdrv_init, + macdrv_notify_icon, }; C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index a5ea7e55d79..c1901ae0036 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -245,12 +245,14 @@ static BOOL delete_icon(struct tray_icon *icon) * * Driver-side implementation of Shell_NotifyIcon. */ -int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) +NTSTATUS macdrv_notify_icon(void *arg) { + struct notify_icon_params *params = arg; + NOTIFYICONDATAW *data = params->data; BOOL ret = FALSE; struct tray_icon *icon; - switch (msg) + switch (params->msg) { case NIM_ADD: ret = add_icon(data); @@ -272,7 +274,7 @@ int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) } break; default: - FIXME("unhandled tray message: %u\n", msg); + FIXME("unhandled tray message: %u\n", params->msg); break; } return ret; diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 9f8cd4e0acb..c24f8192142 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -22,6 +22,7 @@ enum macdrv_funcs { unix_init, + unix_notify_icon, unix_funcs_count }; @@ -41,3 +42,10 @@ struct init_params { struct localized_string *strings; }; + +/* macdrv_notify_icon params */ +struct notify_icon_params +{ + DWORD msg; + struct _NOTIFYICONDATAW *data; +};

1 0

Jacek Caban : winemac: Use unixlib interface for IME calls.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: 8ed990164c5c5f9235cc71b89f67d37d6aca99c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ed990164c5c5f9235cc71b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 13:21:53 2022 +0200 winemac: Use unixlib interface for IME calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/ime.c | 11 +++++++++-- dlls/winemac.drv/keyboard.c | 17 +++++++++++------ dlls/winemac.drv/macdrv.h | 3 +-- dlls/winemac.drv/macdrv_main.c | 8 ++++++++ dlls/winemac.drv/unixlib.h | 13 +++++++++++++ 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 8b89c0089fc..d1d2002fc47 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -577,7 +577,7 @@ BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lp return FALSE; } - inIME = macdrv_using_input_method(); + inIME = MACDRV_CALL(ime_using_input_method, NULL); lpIMC = LockRealIMC(hIMC); if (lpIMC) { @@ -658,6 +658,7 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag) UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC) { + struct process_text_input_params params; UINT vkey; LPINPUTCONTEXT lpIMC; LPIMEPRIVATE myPrivate; @@ -690,7 +691,13 @@ UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, UnlockRealIMC(hIMC); TRACE("Processing Mac 0x%04x\n", vkey); - macdrv_process_text_input(uVKey, uScanCode, repeat, lpbKeyState, hIMC, &done); + params.vkey = uVKey; + params.scan = uScanCode; + params.repeat = repeat; + params.key_state = lpbKeyState; + params.himc = hIMC; + params.done = &done; + MACDRV_CALL(ime_process_text_input, &params); while (!done) MsgWaitForMultipleObjectsEx(0, NULL, INFINITE, QS_POSTMESSAGE | QS_SENDMESSAGE, 0); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 9574b2797b5..181e86afd4a 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1187,13 +1187,16 @@ void macdrv_hotkey_press(const macdrv_event *event) /*********************************************************************** * macdrv_process_text_input */ -void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, void *himc, int* done) +NTSTATUS macdrv_ime_process_text_input(void *arg) { + struct process_text_input_params *params = arg; struct macdrv_thread_data *thread_data = macdrv_thread_data(); + const BYTE *key_state = params->key_state; unsigned int flags; int keyc; - TRACE("vkey 0x%04x scan 0x%04x repeat %u himc %p\n", vkey, scan, repeat, himc); + TRACE("vkey 0x%04x scan 0x%04x repeat %u himc %p\n", params->vkey, params->scan, + params->repeat, params->himc); flags = thread_data->last_modifiers; if (key_state[VK_SHIFT] & 0x80) @@ -1215,17 +1218,19 @@ void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *ke /* Find the Mac keycode corresponding to the scan code */ for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) - if (thread_data->keyc2vkey[keyc] == vkey) break; + if (thread_data->keyc2vkey[keyc] == params->vkey) break; if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) { - *done = -1; - return; + *params->done = -1; + return 0; } TRACE("flags 0x%08x keyc 0x%04x\n", flags, keyc); - macdrv_send_text_input_event(((scan & 0x8000) == 0), flags, repeat, keyc, himc, done); + macdrv_send_text_input_event(((params->scan & 0x8000) == 0), flags, params->repeat, keyc, + params->himc, params->done); + return 0; } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a4736b2d315..2ea6cd638c3 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -287,8 +287,7 @@ extern NTSTATUS macdrv_init(void *arg) DECLSPEC_HIDDEN; * Mac IME driver */ -extern void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, - void *himc, int* done) DECLSPEC_HIDDEN; +extern NTSTATUS macdrv_ime_process_text_input(void *arg) DECLSPEC_HIDDEN; extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 6ab7b108909..4a183747796 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -607,8 +607,16 @@ BOOL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, } +static NTSTATUS macdrv_ime_using_input_method(void *arg) +{ + return macdrv_using_input_method(); +} + + const unixlib_entry_t __wine_unix_call_funcs[] = { + macdrv_ime_process_text_input, + macdrv_ime_using_input_method, macdrv_init, macdrv_notify_icon, }; diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index c24f8192142..dc1b314c8cb 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -21,6 +21,8 @@ enum macdrv_funcs { + unix_ime_process_text_input, + unix_ime_using_input_method, unix_init, unix_notify_icon, unix_funcs_count @@ -30,6 +32,17 @@ enum macdrv_funcs extern NTSTATUS unix_call(enum macdrv_funcs code, void *params) DECLSPEC_HIDDEN; #define MACDRV_CALL(func, params) unix_call( unix_ ## func, params ) +/* macdrv_ime_process_text_input params */ +struct process_text_input_params +{ + UINT vkey; + UINT scan; + UINT repeat; + const BYTE *key_state; + void *himc; + int *done; +}; + /* macdrv_init params */ struct localized_string {

1 0

Jacek Caban : winemac: Move DllMain to separated file.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: 1d56578e65e8a6558dbf85f6e02e72f88abdc484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d56578e65e8a6558dbf85f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 00:37:35 2022 +0200 winemac: Move DllMain to separated file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/dllmain.c | 65 +++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 2 ++ dlls/winemac.drv/macdrv_main.c | 82 ++++++++++++++++-------------------------- dlls/winemac.drv/unixlib.h | 43 ++++++++++++++++++++++ 5 files changed, 142 insertions(+), 51 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index e345249aac7..06c654344d1 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -9,6 +9,7 @@ EXTRADLLFLAGS = -mcygwin C_SRCS = \ clipboard.c \ display.c \ + dllmain.c \ dragdrop.c \ event.c \ gdi.c \ diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c new file mode 100644 index 00000000000..60ca50474d7 --- /dev/null +++ b/dlls/winemac.drv/dllmain.c @@ -0,0 +1,65 @@ +/* + * winemac.drv entry points + * + * Copyright 2022 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include "macdrv.h" + + +HMODULE macdrv_module = 0; + +static BOOL process_attach(void) +{ + struct init_params params; + + struct localized_string *str; + struct localized_string strings[] = { + { .id = STRING_MENU_WINE }, + { .id = STRING_MENU_ITEM_HIDE_APPNAME }, + { .id = STRING_MENU_ITEM_HIDE }, + { .id = STRING_MENU_ITEM_HIDE_OTHERS }, + { .id = STRING_MENU_ITEM_SHOW_ALL }, + { .id = STRING_MENU_ITEM_QUIT_APPNAME }, + { .id = STRING_MENU_ITEM_QUIT }, + + { .id = STRING_MENU_WINDOW }, + { .id = STRING_MENU_ITEM_MINIMIZE }, + { .id = STRING_MENU_ITEM_ZOOM }, + { .id = STRING_MENU_ITEM_ENTER_FULL_SCREEN }, + { .id = STRING_MENU_ITEM_BRING_ALL_TO_FRONT }, + + { .id = 0 } + }; + + for (str = strings; str->id; str++) + str->len = LoadStringW(macdrv_module, str->id, (WCHAR *)&str->str, 0); + params.strings = strings; + + return !MACDRV_CALL(init, &params); +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + if (reason != DLL_PROCESS_ATTACH) return TRUE; + + DisableThreadLibraryCalls(instance); + macdrv_module = instance; + return process_attach(); +} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 9cd0509a39c..39aff4d6a9f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -33,6 +33,7 @@ #include "ntgdi.h" #include "wine/debug.h" #include "wine/gdi_driver.h" +#include "unixlib.h" extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; @@ -280,6 +281,7 @@ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HI extern void check_retina_status(void) DECLSPEC_HIDDEN; extern void macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN; extern void init_user_driver(void) DECLSPEC_HIDDEN; +extern NTSTATUS macdrv_init(void *arg) DECLSPEC_HIDDEN; /************************************************************************** * Mac IME driver diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index a0dc9c494da..adcf6f73fc7 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -63,7 +63,6 @@ int cursor_clipping_locks_windows = TRUE; int use_precise_scrolling = TRUE; int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; int retina_enabled = FALSE; -HMODULE macdrv_module = 0; int enable_app_nap = FALSE; CFDictionaryRef localized_strings; @@ -396,25 +395,9 @@ static void setup_options(void) /*********************************************************************** * load_strings */ -static void load_strings(HINSTANCE instance) +static void load_strings(struct localized_string *str) { - static const unsigned int ids[] = { - STRING_MENU_WINE, - STRING_MENU_ITEM_HIDE_APPNAME, - STRING_MENU_ITEM_HIDE, - STRING_MENU_ITEM_HIDE_OTHERS, - STRING_MENU_ITEM_SHOW_ALL, - STRING_MENU_ITEM_QUIT_APPNAME, - STRING_MENU_ITEM_QUIT, - - STRING_MENU_WINDOW, - STRING_MENU_ITEM_MINIMIZE, - STRING_MENU_ITEM_ZOOM, - STRING_MENU_ITEM_ENTER_FULL_SCREEN, - STRING_MENU_ITEM_BRING_ALL_TO_FRONT, - }; CFMutableDictionaryRef dict; - int i; dict = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); @@ -424,21 +407,20 @@ static void load_strings(HINSTANCE instance) return; } - for (i = 0; i < ARRAY_SIZE(ids); i++) + while (str->id) { - LPCWSTR str; - int len = LoadStringW(instance, ids[i], (LPWSTR)&str, 0); - if (str && len) + if (str->str && str->len) { - CFNumberRef key = CFNumberCreate(NULL, kCFNumberIntType, &ids[i]); - CFStringRef value = CFStringCreateWithCharacters(NULL, (UniChar*)str, len); + CFNumberRef key = CFNumberCreate(NULL, kCFNumberIntType, &str->id); + CFStringRef value = CFStringCreateWithCharacters(NULL, (UniChar*)str->str, str->len); if (key && value) CFDictionarySetValue(dict, key, value); else - ERR("Failed to add string ID 0x%04x %s\n", ids[i], debugstr_wn(str, len)); + ERR("Failed to add string ID 0x%04x %s\n", str->id, debugstr_wn(str->str, str->len)); } else - ERR("Failed to load string ID 0x%04x\n", ids[i]); + ERR("Failed to load string ID 0x%04x\n", str->id); + str++; } localized_strings = dict; @@ -446,32 +428,33 @@ static void load_strings(HINSTANCE instance) /*********************************************************************** - * process_attach + * macdrv_init */ -static BOOL process_attach(void) +NTSTATUS macdrv_init(void *arg) { + struct init_params *params = arg; SessionAttributeBits attributes; OSStatus status; status = SessionGetInfo(callerSecuritySession, NULL, &attributes); if (status != noErr || !(attributes & sessionHasGraphicAccess)) - return FALSE; + return STATUS_UNSUCCESSFUL; init_win_context(); setup_options(); - load_strings(macdrv_module); + load_strings(params->strings); macdrv_err_on = ERR_ON(macdrv); - if (macdrv_start_cocoa_app(GetTickCount64())) + if (macdrv_start_cocoa_app(NtGetTickCount())) { ERR("Failed to start Cocoa app main loop\n"); - return FALSE; + return STATUS_UNSUCCESSFUL; } init_user_driver(); macdrv_init_display_devices(FALSE); - return TRUE; + return STATUS_SUCCESS; } @@ -559,24 +542,6 @@ struct macdrv_thread_data *macdrv_init_thread_data(void) } -/*********************************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) -{ - BOOL ret = TRUE; - - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - macdrv_module = hinst; - ret = process_attach(); - break; - } - return ret; -} - /*********************************************************************** * SystemParametersInfo (MACDRV.@) */ @@ -640,3 +605,18 @@ BOOL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, } return FALSE; } + + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + macdrv_init, +}; + +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + + +/* FIXME: Use __wine_unix_call instead */ +NTSTATUS unix_call(enum macdrv_funcs code, void *params) +{ + return __wine_unix_call_funcs[code]( params ); +} diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h new file mode 100644 index 00000000000..9f8cd4e0acb --- /dev/null +++ b/dlls/winemac.drv/unixlib.h @@ -0,0 +1,43 @@ +/* + * Copyright 2022 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ntuser.h" +#include "wine/unixlib.h" + +enum macdrv_funcs +{ + unix_init, + unix_funcs_count +}; + +/* FIXME: Use __wine_unix_call when the rest of the stack is ready */ +extern NTSTATUS unix_call(enum macdrv_funcs code, void *params) DECLSPEC_HIDDEN; +#define MACDRV_CALL(func, params) unix_call( unix_ ## func, params ) + +/* macdrv_init params */ +struct localized_string +{ + UINT id; + UINT len; + const WCHAR *str; +}; + +struct init_params +{ + struct localized_string *strings; +};

1 0

Zebediah Figura : wined3d: Do not accelerate NOOVERWRITE maps if we cannot map persistently.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: d838cf70041863f6d316b15f89ceadf9a76d7c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d838cf70041863f6d316b15f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 30 20:10:07 2022 -0500 wined3d: Do not accelerate NOOVERWRITE maps if we cannot map persistently. I.e. if ARB_buffer_storage is not supported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0d9f6953de3..05e8c112388 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5231,6 +5231,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->fences = wined3d_fence_supported(gl_info); d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); d3d_info->filling_convention_offset = gl_info->filling_convention_offset; + d3d_info->persistent_map = !!gl_info->supported[ARB_BUFFER_STORAGE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cd1748afe90..3b87ab63ee5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2351,6 +2351,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->feature_level = feature_level_from_caps(&shader_caps); d3d_info->subpixel_viewport = true; d3d_info->fences = true; + d3d_info->persistent_map = true; /* Like GL, Vulkan doesn't explicitly specify a filling convention and only mandates that a * shared edge of two adjacent triangles generate a fragment for exactly one of the triangles. diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0d6550bf613..9b0d98139ce 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1008,11 +1008,13 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); + /* We are accessing buffer->resource.client from the CS thread, * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - buffer->resource.client.addr = addr; + if (context->d3d_info->persistent_map) + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e3888cd30d..7bfca0bcb88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -243,6 +243,7 @@ struct wined3d_d3d_info uint32_t pbo : 1; uint32_t subpixel_viewport : 1; uint32_t fences : 1; + uint32_t persistent_map : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Paul Gofman : winex11.drv: Avoid adding duplicate GPUs.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: 0d5c6d55bf36cbc712cc3585c6b2e13fbf49996d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d5c6d55bf36cbc712cc3585… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 31 19:28:28 2022 -0500 winex11.drv: Avoid adding duplicate GPUs. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 3fa6bad56c1..d3b96e3170b 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -633,7 +633,8 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) -static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProviderInfo *provider_info ) +static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProviderInfo *provider_info, + struct gdi_gpu *prev_gpus, int prev_gpu_count ) { static const char *extensions[] = { @@ -648,7 +649,7 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; - uint32_t device_count, device_idx, output_idx; + uint32_t device_count, device_idx, output_idx, i; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; VkInstanceCreateInfo create_info; @@ -703,6 +704,8 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid goto done; } + TRACE("provider name %s.\n", debugstr_a(provider_info->name)); + for (device_idx = 0; device_idx < device_count; ++device_idx) { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) @@ -720,7 +723,19 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid properties2.pNext = &id; pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); + for (i = 0; i < prev_gpu_count; ++i) + { + if (!memcmp( &prev_gpus[i].vulkan_uuid, &id.deviceUUID, sizeof(id.deviceUUID) )) + { + WARN( "device UUID %#x:%#x already assigned to GPU %u.\n", *((uint32_t *)id.deviceUUID + 1), + *(uint32_t *)id.deviceUUID, i ); + break; + } + } + if (i < prev_gpu_count) continue; + memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { @@ -808,7 +823,7 @@ static BOOL xrandr14_get_gpus2( struct gdi_gpu **new_gpus, int *count, BOOL get_ gpus[i].id = provider_resources->providers[i]; if (get_properties) { - if (!get_gpu_properties_from_vulkan( &gpus[i], provider_info )) + if (!get_gpu_properties_from_vulkan( &gpus[i], provider_info, gpus, i )) RtlUTF8ToUnicodeN( gpus[i].name, sizeof(gpus[i].name), &len, provider_info->name, strlen( provider_info->name ) + 1 ); /* FIXME: Add an alternate method of getting PCI IDs, for systems that don't support Vulkan */

1 0

Alexandre Julliard : kernelbase: Fix checks for valid locale in LCMapStringW/Ex.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: c2a455a20d7b5124bab0086df75178d8c53f27ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a455a20d7b5124bab0086d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 1 11:19:24 2022 +0200 kernelbase: Fix checks for valid locale in LCMapStringW/Ex. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 14 +++++--- dlls/kernelbase/locale.c | 86 +++++++++++++++++--------------------------- 2 files changed, 43 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4aada71bbb0..125d0c1f2ca 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2669,10 +2669,13 @@ static void test_LCMapStringW(void) SetLastError(0xdeadbeef); ret = LCMapStringW((LCID)-1, LCMAP_LOWERCASE, upper_case, -1, buf, ARRAY_SIZE(buf)); - todo_wine { ok(!ret, "LCMapStringW should fail with bad lcid\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %ld\n", GetLastError()); - } + + SetLastError(0xdeadbeef); + ret = LCMapStringW((LCID)0xdead, LCMAP_HIRAGANA, upper_case, -1, buf, ARRAY_SIZE(buf)); + ok(!ret, "LCMapStringW should fail with bad lcid\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %ld\n", GetLastError()); test_lcmapstring_unicode(LCMapStringW_wrapper, "LCMapStringW:"); } @@ -2698,10 +2701,13 @@ static void test_LCMapStringEx(void) SetLastError(0xdeadbeef); ret = pLCMapStringEx(invalidW, LCMAP_LOWERCASE, upper_case, -1, buf, ARRAY_SIZE(buf), NULL, NULL, 0); - todo_wine { ok(!ret, "LCMapStringEx should fail with bad locale name\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %ld\n", GetLastError()); - } + + SetLastError(0xdeadbeef); + ret = pLCMapStringEx(invalidW, LCMAP_HIRAGANA, + upper_case, -1, buf, ARRAY_SIZE(buf), NULL, NULL, 0); + ok(ret, "LCMapStringEx should not fail with bad locale name\n"); /* test reserved parameters */ ret = pLCMapStringEx(LOCALE_NAME_USER_DEFAULT, LCMAP_LOWERCASE, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 02532a7e10b..5a6022addc9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -672,7 +672,12 @@ static const struct sortguid *get_language_sort( const WCHAR *name ) name = locale_strings + user_locale->sname + 1; } - if (!(entry = find_lcname_entry( name ))) return NULL; + if (!(entry = find_lcname_entry( name ))) + { + WARN( "unknown locale %s\n", debugstr_w(name) ); + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } if ((ret = locale_sorts[entry - lcnames_index])) return ret; lcid = entry->id; @@ -686,22 +691,17 @@ static const struct sortguid *get_language_sort( const WCHAR *name ) if (!RegQueryValueExW( key, name, NULL, &type, (BYTE *)guidstr, &size ) && type == REG_SZ) { RtlInitUnicodeString( &str, guidstr ); - if (!RtlGUIDFromString( &str, &guid )) - { - ret = find_sortguid( &guid ); - goto done; - } + if (!RtlGUIDFromString( &str, &guid )) ret = find_sortguid( &guid ); break; } if (!name[0]) break; name = locale_strings + (SORTIDFROMLCID( lcid ) ? locale->sname : locale->sparent) + 1; if (!(locale = get_locale_by_name( name, &lcid ))) break; } + RegCloseKey( key ); } - ret = &sort.guids[0]; -done: - RegCloseKey( key ); - if (ret) locale_sorts[entry - lcnames_index] = ret; + if (!ret) ret = &sort.guids[0]; + locale_sorts[entry - lcnames_index] = ret; return ret; } @@ -4484,12 +4484,7 @@ INT WINAPI CompareStringEx( const WCHAR *locale, DWORD flags, const WCHAR *str1, return 0; } - if (!(sortid = get_language_sort( locale ))) - { - FIXME( "unknown locale %s\n", debugstr_w(locale) ); - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } + if (!(sortid = get_language_sort( locale ))) return 0; if (!str1 || !str2) { @@ -4971,12 +4966,7 @@ INT WINAPI DECLSPEC_HOTPATCH FindNLSStringEx( const WCHAR *locale, DWORD flags, SetLastError( ERROR_INVALID_PARAMETER ); return -1; } - if (!(sortid = get_language_sort( locale ))) - { - WARN( "unknown locale %s\n", debugstr_w(locale) ); - SetLastError( ERROR_INVALID_PARAMETER ); - return -1; - } + if (!(sortid = get_language_sort( locale ))) return -1; if (srclen == -1) srclen = lstrlenW(src); if (valuelen == -1) valuelen = lstrlenW(value); @@ -5634,11 +5624,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetNLSVersionEx( NLS_FUNCTION func, const WCHAR *l SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } - if (!(sortid = get_language_sort( locale ))) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } + + if (!(sortid = get_language_sort( locale ))) return FALSE; info->dwNLSVersion = info->dwDefinedVersion = sort.version; if (info->dwNLSVersionInfoSize >= sizeof(*info)) @@ -6329,13 +6316,10 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co if (!dstlen) dst = NULL; - if (flags & (LCMAP_LINGUISTIC_CASING | LCMAP_SORTKEY) && !(sortid = get_language_sort( locale ))) + if (flags & (LCMAP_LOWERCASE | LCMAP_UPPERCASE | LCMAP_SORTKEY)) { - FIXME( "unknown locale %s\n", debugstr_w(locale) ); - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; + if (!(sortid = get_language_sort( locale ))) return 0; } - if (flags & LCMAP_SORTKEY) { if (src == dst) @@ -6574,31 +6558,27 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringW( LCID lcid, DWORD flags, const WCHAR * WCHAR *dst, int dstlen ) { const WCHAR *locale = LOCALE_NAME_USER_DEFAULT; + const NLS_LOCALE_LCID_INDEX *entry; - if (flags & (LCMAP_LINGUISTIC_CASING | LCMAP_SORTKEY)) + switch (lcid) { - const NLS_LOCALE_LCID_INDEX *entry; - - switch (lcid) + case LOCALE_NEUTRAL: + case LOCALE_USER_DEFAULT: + case LOCALE_SYSTEM_DEFAULT: + case LOCALE_CUSTOM_DEFAULT: + case LOCALE_CUSTOM_UNSPECIFIED: + case LOCALE_CUSTOM_UI_DEFAULT: + break; + default: + if (lcid == user_lcid || lcid == system_lcid) break; + if (!(entry = find_lcid_entry( lcid ))) { - case LOCALE_NEUTRAL: - case LOCALE_USER_DEFAULT: - case LOCALE_SYSTEM_DEFAULT: - case LOCALE_CUSTOM_DEFAULT: - case LOCALE_CUSTOM_UNSPECIFIED: - case LOCALE_CUSTOM_UI_DEFAULT: - break; - default: - if (lcid == user_lcid || lcid == system_lcid) break; - if (!(entry = find_lcid_entry( lcid ))) - { - WARN( "unknown locale %04lx\n", lcid ); - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - locale = locale_strings + entry->name + 1; - break; + WARN( "unknown locale %04lx\n", lcid ); + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; } + locale = locale_strings + entry->name + 1; + break; } return LCMapStringEx( locale, flags, src, srclen, dst, dstlen, NULL, NULL, 0 );

1 0

Alexandre Julliard : kernelbase: Fix typo in null pointer check.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: 9990dc11df7212c81d39d06a2d188623d4a048dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9990dc11df7212c81d39d06a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 1 10:26:36 2022 +0200 kernelbase: Fix typo in null pointer check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53080 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 6ec80596355..02532a7e10b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3884,7 +3884,7 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH if (found != -1) { if ((flags & FIND_ENDSWITH) && found + foundlen != srclen) found = -1; - else if (*reslen) *reslen = foundlen; + else if (reslen) *reslen = foundlen; } free_sortkey_state( &s ); free_sortkey_state( &val );

1 0

Francois Gouget : testbot/build: Fix passing the BuildWine() target list in Reconfig.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: tools Branch: master Commit: 4eae017dd260871b8916671cd3000da7efb9c190 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4eae017dd260871b8916671… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 1 14:52:43 2022 +0200 testbot/build: Fix passing the BuildWine() target list in Reconfig. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 9e1043a..4f07eee 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -57,9 +57,9 @@ sub UpdateWineBuilds($$) my $Configure = "--without-x --without-freetype --disable-winetest"; return BuildWine($TaskMissions, $Flags, "exe32", - $Configure, "buildtests") && + $Configure, ["buildtests"]) && BuildWine($TaskMissions, $Flags, "exe64", - "$Configure --enable-win64", "buildtests"); + "$Configure --enable-win64", ["buildtests"]); }

1 0

Francois Gouget : testbot/TestWTBS: Provide finer grained support for 32-/64-bit reports.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: tools Branch: master Commit: 09d37a93c95116c37a23cf1921f3f05b1080ff7a URL: https://source.winehq.org/git/tools.git/?a=commit;h=09d37a93c95116c37a23cf1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 1 14:52:20 2022 +0200 testbot/TestWTBS: Provide finer grained support for 32-/64-bit reports. This allows specifying different expected errors for 32-bit and 64-bit report files. This is in particular needed when trying to match Wine exception messages since they contain the bitness. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e5cd448..139f011 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -337,7 +337,7 @@ sub LoadTestInfo($) foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}}) { my $GroupName = lcfirst($RawGroupName); - if ($GroupName =~ s/^(tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.(report|log|testbot)\.//) + if ($GroupName =~ s/^(tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.(win32|wow32|wow64|report|log|testbot)\.//) { my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {}); push @{$ErrInfo->{ErrGroupNames}}, $GroupName; @@ -381,8 +381,8 @@ sub LoadTestInfo($) if (ref($SrcVal) eq "HASH" and $Field !~ /\.errors$/) { # Simply propagating hashtable references would result in changes to - # win32 to impact the parent win / test parent which is not what we - # want. So subsets of properties are not supported. + # win32 to impact the win / test parent which is not what we want. + # So subsets of properties are not supported. # .errors properties are the exception because their values are a # LoadLogErrors() structure. As a result they are read-only, and are # not merged. @@ -445,7 +445,7 @@ sub LoadTestInfo($) foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", "wine", "wine:build", "wine:test", "wine:module") { - foreach my $LogType ("report", "log", "testbot") + foreach my $LogType ("win32", "wow32", "wow64", "report", "log", "testbot") { my $Array = $TestInfo->{$TaskType}->{"$LogType.$GrepType"}; next if (!defined $Array); @@ -483,6 +483,30 @@ sub LoadTestInfo($) SetDefault($TestInfo, "webpatch", "Status", $Status); } + # Propagate the 'report.*' settings to win32, wow32 and wow64 + foreach my $TaskType ("wine", "wine:build", "wine:test", "wine:module") + { + my $TaskInfo = $TestInfo->{$TaskType}; + foreach my $ReportField (keys %$TaskInfo) + { + next if (!$ReportField =~ /^report\./); + if (ref($TaskInfo->{$ReportField}) eq "HASH" and + $ReportField !~ /\.errors$/) + { + # See the previous task-type propagation comment. + fail("internal error: $TaskType.$ReportField should not be a hash in $FileName"); + next; + } + foreach my $LogType ("win32", "wow32", "wow64") + { + my $LogField = $ReportField; + $LogField =~ s/^report/$LogType/; + next if (defined $TaskInfo->{$LogField}); + $TaskInfo->{$LogField} = $TaskInfo->{$ReportField}; + } + } + } + return $TestInfo; } @@ -643,13 +667,14 @@ sub IsTimeoutError($$) } =pod -=item <tasks.(report|log|testbot).groupname> +=item <tasks.(win32|wow32|wow64|report|log|testbot).groupname> Verifies the presence of new errors in the specified error log or report of the tasks in the specified category. For this, list the group and errors that are expected to appear; where the group name is prefixed by the task -category and either 'report' for the test reports, 'log' for 'task.log', or -'testbot' for 'testbot.log'. +category and either 'win32' for 'win32.report', 'wow32' for 'wow32.report', +'wow64' for 'wow64.report', 'report' for any of the test reports, +'log' for 'task.log', or 'testbot' for 'testbot.log'. For instance: g 0 tests.report.kernel32 @@ -678,7 +703,7 @@ Finally, note that while the error directives are inherited by subcategories, they are not merged. So if both win and win32 have error-matching directives, win32 will not inherit anything from the win category. -=item <tasks.(report|log|testbot).Errors> +=item <tasks.(win32|wow32|wow64|report|log|testbot).Errors> Inheritance of the reference error lists cannot be prevented but can be ignored by setting this property to 'ignore'. @@ -856,8 +881,8 @@ depend on whether the test was the last one run by the task (in the Wine case). By default this check is skipped and timeout errors are reported like any other unexpected error. -=item <tasks.(report|log|testbot).Grep> -=item <tasks.(report|log|testbot).GrepV> +=item <tasks.(win32|wow32|wow64|report|log|testbot).Grep> +=item <tasks.(win32|wow32|wow64|report|log|testbot).GrepV> Verifies the presence or absence of specific regular expressions in the specified error log or reports of the tasks in the specified category. @@ -940,7 +965,9 @@ sub CheckTask($$$$) my $LogType = "log"; if ($LogName =~ /\.report$/) { - $LogType = "report"; + $LogType = $LogName =~ /^wow32/ ? "wow32" : + $LogName =~ /^wow64/ ? "wow64" : + "win32"; $ReportCount++; ok($ReportTypes{$LogName}, "Check that $LogName is expected");

1 0