- wine-devel - winehq.org

[PATCH 1/5] configure: Check for SDL_JoystickRumble presence.
by Rémi Bernon 24 Sep '21

24 Sep '21

It's been introduced in SDL2 2.0.9, released on 2018/11/31. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 4 +++- dlls/winebus.sys/bus_sdl.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 15b7c2add2a..4d87d516bd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1701,7 +1701,9 @@ if test "x$with_sdl" != "xno" then WINE_PACKAGE_FLAGS(SDL2,[sdl2],[-lSDL2],,, [AC_CHECK_HEADERS([SDL.h], - [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])])]) + [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])]) + WINE_CHECK_LIB_FUNCS([SDL_JoystickRumble], [$SDL2_LIBS]) + ]) fi WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.]) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 31915a9fa0d..6e7c359deea 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -102,7 +102,9 @@ MAKE_FUNCPTR(SDL_HapticRumbleSupported); MAKE_FUNCPTR(SDL_HapticRunEffect); MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_JoystickIsHaptic); +#ifdef HAVE_SDL_JOYSTICKRUMBLE MAKE_FUNCPTR(SDL_JoystickRumble); +#endif MAKE_FUNCPTR(SDL_memset); MAKE_FUNCPTR(SDL_GameControllerAddMapping); MAKE_FUNCPTR(SDL_RegisterEvents); @@ -181,8 +183,10 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) pSDL_HapticRumbleInit(impl->sdl_haptic); } +#ifdef HAVE_SDL_JOYSTICKRUMBLE if (!pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; +#endif if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) { @@ -365,8 +369,10 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, effect.leftright.small_magnitude = buzz_intensity; if (impl->sdl_haptic) pSDL_HapticStopAll(impl->sdl_haptic); +#ifdef HAVE_SDL_JOYSTICKRUMBLE if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); +#endif if (!effect.leftright.large_magnitude && !effect.leftright.small_magnitude) return STATUS_SUCCESS; @@ -383,11 +389,13 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, float magnitude = (effect.leftright.large_magnitude + effect.leftright.small_magnitude) / 2.0 / 32767.0; pSDL_HapticRumblePlay(impl->sdl_haptic, magnitude, effect.leftright.length); } +#ifdef HAVE_SDL_JOYSTICKRUMBLE else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) { pSDL_JoystickRumble(impl->sdl_joystick, effect.leftright.large_magnitude, effect.leftright.small_magnitude, -1); } +#endif return STATUS_SUCCESS; } @@ -658,7 +666,9 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_HapticRunEffect); LOAD_FUNCPTR(SDL_HapticStopAll); LOAD_FUNCPTR(SDL_JoystickIsHaptic); +#ifdef HAVE_SDL_JOYSTICKRUMBLE LOAD_FUNCPTR(SDL_JoystickRumble); +#endif LOAD_FUNCPTR(SDL_memset); LOAD_FUNCPTR(SDL_GameControllerAddMapping); LOAD_FUNCPTR(SDL_RegisterEvents); -- 2.33.0

2 7

[PATCH] winegcc: Add missing strarray initialization.
by Rémi Bernon 24 Sep '21

24 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0cb5ae390de..8e72c6bcfee 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1475,6 +1475,7 @@ static void build(struct options* opts) { struct strarray tool, objcopy = build_tool_name(opts, TOOL_OBJCOPY); + tool = empty_strarray; strarray_addall( &tool, objcopy ); strarray_add(&tool, "--only-keep-debug"); strarray_add(&tool, output_path); -- 2.33.0

1 0

[PATCH v2 1/5] joy.cpl: Add a dedicated connected list for xinput devices.
by Rémi Bernon 24 Sep '21

24 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Rebased on top of upstream. dlls/joy.cpl/joy.h | 25 +++++++++++++---------- dlls/joy.cpl/joy.rc | 16 ++++++++------- dlls/joy.cpl/main.c | 50 +++++++++++++++++++++++++++++++++++++-------- 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h index ec7af4f7879..ffba9cd1220 100644 --- a/dlls/joy.cpl/joy.h +++ b/dlls/joy.cpl/joy.h @@ -41,6 +41,7 @@ struct Joystick { int num_buttons; int num_axes; BOOL forcefeedback; + BOOL is_xinput; int num_effects; int cur_effect; int chosen_effect; @@ -82,17 +83,19 @@ struct JoystickData { #define IDD_FORCEFEEDBACK 1002 #define IDC_JOYSTICKLIST 2000 -#define IDC_BUTTONDISABLE 2001 -#define IDC_BUTTONENABLE 2002 -#define IDC_DISABLEDLIST 2003 -#define IDC_TESTSELECTCOMBO 2004 -#define IDC_TESTGROUPXY 2005 -#define IDC_TESTGROUPRXRY 2006 -#define IDC_TESTGROUPZRZ 2007 -#define IDC_TESTGROUPPOV 2008 - -#define IDC_FFSELECTCOMBO 2009 -#define IDC_FFEFFECTLIST 2010 +#define IDC_DISABLEDLIST 2001 +#define IDC_XINPUTLIST 2002 +#define IDC_BUTTONDISABLE 2010 +#define IDC_BUTTONENABLE 2011 + +#define IDC_TESTSELECTCOMBO 2100 +#define IDC_TESTGROUPXY 2101 +#define IDC_TESTGROUPRXRY 2102 +#define IDC_TESTGROUPZRZ 2103 +#define IDC_TESTGROUPPOV 2104 + +#define IDC_FFSELECTCOMBO 2200 +#define IDC_FFEFFECTLIST 2201 #define ICO_MAIN 100 diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index a4a780276bb..d425ea76440 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -31,21 +31,23 @@ BEGIN IDS_CPL_INFO "Test and configure game controllers." END -IDD_LIST DIALOG 0, 0, 320, 220 +IDD_LIST DIALOG 0, 0, 320, 300 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Joysticks" FONT 8, "Ms Shell Dlg" { PUSHBUTTON "&Disable", IDC_BUTTONDISABLE, 200, 20, 60, 15 - PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 105, 60, 15 + PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 190, 60, 15 LTEXT "Connected", IDC_STATIC, 10, 10, 100, 10 LISTBOX IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "Disabled", IDC_STATIC, 10, 95, 100, 10 - LISTBOX IDC_DISABLEDLIST, 10, 105, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 175, 200, 25 + LTEXT "Connected (xinput device)", IDC_STATIC, 10, 90, 100, 10 + LISTBOX IDC_XINPUTLIST, 10, 100, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY + LTEXT "Disabled", IDC_STATIC, 10, 180, 100, 10 + LISTBOX IDC_DISABLEDLIST, 10, 190, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY + LTEXT "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 270, 200, 25 } -IDD_TEST DIALOG 0, 0, 320, 220 +IDD_TEST DIALOG 0, 0, 320, 300 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Test Joystick" FONT 8, "Ms Shell Dlg" @@ -58,7 +60,7 @@ FONT 8, "Ms Shell Dlg" GROUPBOX "", IDC_TESTGROUPPOV, 246, 30, 60, 60 } -IDD_FORCEFEEDBACK DIALOG 0, 0, 320, 220 +IDD_FORCEFEEDBACK DIALOG 0, 0, 320, 300 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Test Force Feedback" FONT 8, "Ms Shell Dlg" diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index dbe84963c5d..91280f2c2c5 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -63,6 +63,15 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef); static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *context) { + DIPROPGUIDANDPATH prop_guid_path = + { + .diph = + { + .dwSize = sizeof(DIPROPGUIDANDPATH), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; struct JoystickData *data = context; struct Joystick *joystick; DIPROPRANGE proprange; @@ -90,6 +99,9 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont joystick->forcefeedback = caps.dwFlags & DIDC_FORCEFEEDBACK; joystick->num_effects = 0; + IDirectInputDevice8_GetProperty(joystick->device, DIPROP_GUIDANDPATH, &prop_guid_path.diph); + joystick->is_xinput = wcsstr(prop_guid_path.wszPath, L"&IG_") != NULL; + if (joystick->forcefeedback) data->num_ff++; /* Set axis range to ease the GUI visualization */ @@ -233,9 +245,13 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0); SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); + SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_RESETCONTENT, 0, 0); for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy) - SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); + { + if (joy->is_xinput) SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); + else SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); + } /* Search for disabled joysticks */ get_app_key(&hkey, &appkey); @@ -262,7 +278,10 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) */ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + WCHAR instance_name[MAX_PATH] = {0}; static struct JoystickData *data; + int sel; + TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); switch (msg) { @@ -287,11 +306,14 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { case IDC_BUTTONDISABLE: { - int sel = SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETCURSEL, 0, 0); + if ((sel = SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETCURSEL, 0, 0)) >= 0) + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETTEXT, sel, (LPARAM)instance_name); + if ((sel = SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETCURSEL, 0, 0)) >= 0) + SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETTEXT, sel, (LPARAM)instance_name); - if (sel >= 0) + if (instance_name[0]) { - enable_joystick(data->joysticks[sel].instance.tszInstanceName, FALSE); + enable_joystick(instance_name, FALSE); refresh_joystick_list(hwnd, data); } } @@ -299,24 +321,34 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM case IDC_BUTTONENABLE: { - int sel = SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETCURSEL, 0, 0); + if ((sel = SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETCURSEL, 0, 0)) >= 0) + SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM)instance_name); - if (sel >= 0) + if (instance_name[0]) { - WCHAR text[MAX_PATH]; - SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM) text); - enable_joystick(text, TRUE); + enable_joystick(instance_name, TRUE); refresh_joystick_list(hwnd, data); } } break; case IDC_JOYSTICKLIST: + SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_SETCURSEL, -1, 0); + SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_SETCURSEL, -1, 0); + EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), TRUE); + break; + + case IDC_XINPUTLIST: + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_SETCURSEL, -1, 0); + SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_SETCURSEL, -1, 0); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), TRUE); break; case IDC_DISABLEDLIST: + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_SETCURSEL, -1, 0); + SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_SETCURSEL, -1, 0); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE); break; -- 2.33.0

1 4

[PATCH 1/5] joy.cpl: Add a dedicated connected list for xinput devices.
by Rémi Bernon 24 Sep '21

24 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/joy.cpl/joy.h | 25 +++++++++++++---------- dlls/joy.cpl/joy.rc | 16 ++++++++------- dlls/joy.cpl/main.c | 50 +++++++++++++++++++++++++++++++++++++-------- 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h index ec7af4f7879..ffba9cd1220 100644 --- a/dlls/joy.cpl/joy.h +++ b/dlls/joy.cpl/joy.h @@ -41,6 +41,7 @@ struct Joystick { int num_buttons; int num_axes; BOOL forcefeedback; + BOOL is_xinput; int num_effects; int cur_effect; int chosen_effect; @@ -82,17 +83,19 @@ struct JoystickData { #define IDD_FORCEFEEDBACK 1002 #define IDC_JOYSTICKLIST 2000 -#define IDC_BUTTONDISABLE 2001 -#define IDC_BUTTONENABLE 2002 -#define IDC_DISABLEDLIST 2003 -#define IDC_TESTSELECTCOMBO 2004 -#define IDC_TESTGROUPXY 2005 -#define IDC_TESTGROUPRXRY 2006 -#define IDC_TESTGROUPZRZ 2007 -#define IDC_TESTGROUPPOV 2008 - -#define IDC_FFSELECTCOMBO 2009 -#define IDC_FFEFFECTLIST 2010 +#define IDC_DISABLEDLIST 2001 +#define IDC_XINPUTLIST 2002 +#define IDC_BUTTONDISABLE 2010 +#define IDC_BUTTONENABLE 2011 + +#define IDC_TESTSELECTCOMBO 2100 +#define IDC_TESTGROUPXY 2101 +#define IDC_TESTGROUPRXRY 2102 +#define IDC_TESTGROUPZRZ 2103 +#define IDC_TESTGROUPPOV 2104 + +#define IDC_FFSELECTCOMBO 2200 +#define IDC_FFEFFECTLIST 2201 #define ICO_MAIN 100 diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index a4a780276bb..d425ea76440 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -31,21 +31,23 @@ BEGIN IDS_CPL_INFO "Test and configure game controllers." END -IDD_LIST DIALOG 0, 0, 320, 220 +IDD_LIST DIALOG 0, 0, 320, 300 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Joysticks" FONT 8, "Ms Shell Dlg" { PUSHBUTTON "&Disable", IDC_BUTTONDISABLE, 200, 20, 60, 15 - PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 105, 60, 15 + PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 190, 60, 15 LTEXT "Connected", IDC_STATIC, 10, 10, 100, 10 LISTBOX IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "Disabled", IDC_STATIC, 10, 95, 100, 10 - LISTBOX IDC_DISABLEDLIST, 10, 105, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 175, 200, 25 + LTEXT "Connected (xinput device)", IDC_STATIC, 10, 90, 100, 10 + LISTBOX IDC_XINPUTLIST, 10, 100, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY + LTEXT "Disabled", IDC_STATIC, 10, 180, 100, 10 + LISTBOX IDC_DISABLEDLIST, 10, 190, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY + LTEXT "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 270, 200, 25 } -IDD_TEST DIALOG 0, 0, 320, 220 +IDD_TEST DIALOG 0, 0, 320, 300 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Test Joystick" FONT 8, "Ms Shell Dlg" @@ -58,7 +60,7 @@ FONT 8, "Ms Shell Dlg" GROUPBOX "", IDC_TESTGROUPPOV, 246, 30, 60, 60 } -IDD_FORCEFEEDBACK DIALOG 0, 0, 320, 220 +IDD_FORCEFEEDBACK DIALOG 0, 0, 320, 300 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Test Force Feedback" FONT 8, "Ms Shell Dlg" diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index dbe84963c5d..91280f2c2c5 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -63,6 +63,15 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef); static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *context) { + DIPROPGUIDANDPATH prop_guid_path = + { + .diph = + { + .dwSize = sizeof(DIPROPGUIDANDPATH), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; struct JoystickData *data = context; struct Joystick *joystick; DIPROPRANGE proprange; @@ -90,6 +99,9 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont joystick->forcefeedback = caps.dwFlags & DIDC_FORCEFEEDBACK; joystick->num_effects = 0; + IDirectInputDevice8_GetProperty(joystick->device, DIPROP_GUIDANDPATH, &prop_guid_path.diph); + joystick->is_xinput = wcsstr(prop_guid_path.wszPath, L"&IG_") != NULL; + if (joystick->forcefeedback) data->num_ff++; /* Set axis range to ease the GUI visualization */ @@ -233,9 +245,13 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0); SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); + SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_RESETCONTENT, 0, 0); for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy) - SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); + { + if (joy->is_xinput) SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); + else SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); + } /* Search for disabled joysticks */ get_app_key(&hkey, &appkey); @@ -262,7 +278,10 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) */ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + WCHAR instance_name[MAX_PATH] = {0}; static struct JoystickData *data; + int sel; + TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); switch (msg) { @@ -287,11 +306,14 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { case IDC_BUTTONDISABLE: { - int sel = SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETCURSEL, 0, 0); + if ((sel = SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETCURSEL, 0, 0)) >= 0) + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETTEXT, sel, (LPARAM)instance_name); + if ((sel = SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETCURSEL, 0, 0)) >= 0) + SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETTEXT, sel, (LPARAM)instance_name); - if (sel >= 0) + if (instance_name[0]) { - enable_joystick(data->joysticks[sel].instance.tszInstanceName, FALSE); + enable_joystick(instance_name, FALSE); refresh_joystick_list(hwnd, data); } } @@ -299,24 +321,34 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM case IDC_BUTTONENABLE: { - int sel = SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETCURSEL, 0, 0); + if ((sel = SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETCURSEL, 0, 0)) >= 0) + SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM)instance_name); - if (sel >= 0) + if (instance_name[0]) { - WCHAR text[MAX_PATH]; - SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM) text); - enable_joystick(text, TRUE); + enable_joystick(instance_name, TRUE); refresh_joystick_list(hwnd, data); } } break; case IDC_JOYSTICKLIST: + SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_SETCURSEL, -1, 0); + SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_SETCURSEL, -1, 0); + EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), TRUE); + break; + + case IDC_XINPUTLIST: + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_SETCURSEL, -1, 0); + SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_SETCURSEL, -1, 0); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), TRUE); break; case IDC_DISABLEDLIST: + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_SETCURSEL, -1, 0); + SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_SETCURSEL, -1, 0); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE); break; -- 2.33.0

2 7

[PATCH] Revert "winegstreamer: Replace source pad interface with GstAppSrc."
by Zebediah Figura 24 Sep '21

24 Sep '21

This reverts commit 1aa359a100bae859b278007e8bf90673eebd7db0. appsrc suffers from a rather problematic race condition surrounding flushes [1]. Essentially, it's possible for a flushing seek to begin and end between wg_parser_get_next_read_request and wg_parser_push_data. The race condition is not easy to fix, and in light of it it's not clear if we want to use appsrc. [1] https://www.winehq.org/pipermail/wine-devel/2021-September/196043.html Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51774 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Since the bug won't be fixed before 6.18, and since the way forward may not use appsrc anyway, revert the patch for now. dlls/winegstreamer/wg_parser.c | 429 ++++++++++++++++++++++++--------- 1 file changed, 310 insertions(+), 119 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 6b6b033b879..f0815e37689 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -33,7 +33,6 @@ #include <gst/gst.h> #include <gst/video/video.h> #include <gst/audio/audio.h> -#include <gst/app/gstappsrc.h> /* GStreamer callbacks may be called on threads not created by Wine, and * therefore cannot access the Wine TEB. This means that we must use GStreamer @@ -50,20 +49,28 @@ struct wg_parser struct wg_parser_stream **streams; unsigned int stream_count; - GstElement *container, *appsrc, *decodebin; + GstElement *container, *decodebin; GstBus *bus; + GstPad *my_src, *their_sink; + + guint64 file_size, start_offset, next_offset, stop_offset; + guint64 next_pull_offset; + + pthread_t push_thread; pthread_mutex_t mutex; pthread_cond_t init_cond; bool no_more_pads, has_duration, error; - pthread_cond_t read_cond; + pthread_cond_t read_cond, read_done_cond; struct { + void *data; uint64_t offset; uint32_t size; - bool pending; + bool done; + bool ret; } read_request; bool flushing, sink_connected; @@ -515,7 +522,7 @@ static bool CDECL wg_parser_get_next_read_offset(struct wg_parser *parser, { pthread_mutex_lock(&parser->mutex); - while (parser->sink_connected && !parser->read_request.pending) + while (parser->sink_connected && !parser->read_request.data) pthread_cond_wait(&parser->read_cond, &parser->mutex); if (!parser->sink_connected) @@ -534,69 +541,15 @@ static bool CDECL wg_parser_get_next_read_offset(struct wg_parser *parser, static void CDECL wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size) { - GstMessage *message; - GstFlowReturn ret; - GstBuffer *buffer; - GError *error; - - if (!data) - { - pthread_mutex_lock(&parser->mutex); - - if (parser->sink_connected) - { - error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_FAILED, "WG-Parser client failed to read data at offset %" G_GUINT64_FORMAT, parser->read_request.offset); - message = gst_message_new_error(NULL, error, ""); - gst_bus_post(parser->bus, message); - parser->read_request.pending = false; - } - - pthread_mutex_unlock(&parser->mutex); - return; - } - - if (!size) - { - pthread_mutex_lock(&parser->mutex); - - if (parser->sink_connected) - g_signal_emit_by_name(G_OBJECT(parser->appsrc), "end-of-stream", &ret); - parser->read_request.pending = false; - - pthread_mutex_unlock(&parser->mutex); - return; - } - - /* We will always perform an extra blit here. We can avoid this in some - * cases by wrapping a client-allocated buffer using - * gst_buffer_new_wrapped(). However, releasing the memory is non-trivial, - * since GStreamer will hold onto a reference for an arbitrarily long - * period of time. Until there's evidence to suggest that the blit causes a - * performance problem, leave it alone. */ - buffer = gst_buffer_new_and_alloc(size); - gst_buffer_fill(buffer, 0, data, size); - pthread_mutex_lock(&parser->mutex); - - if (!parser->sink_connected) - { - pthread_mutex_unlock(&parser->mutex); - gst_buffer_unref(buffer); - return; - } - - assert(parser->read_request.pending); - - GST_BUFFER_OFFSET(buffer) = parser->read_request.offset; - g_signal_emit_by_name(G_OBJECT(parser->appsrc), "push-buffer", buffer, &ret); - - /* In random-access mode, GST_FLOW_EOS shouldn't be returned. */ - assert(ret == GST_FLOW_OK || ret == GST_FLOW_FLUSHING); - if (ret == GST_FLOW_OK) - parser->read_request.offset += size; - - parser->read_request.pending = false; + parser->read_request.size = size; + parser->read_request.done = true; + parser->read_request.ret = !!data; + if (data) + memcpy(parser->read_request.data, data, size); + parser->read_request.data = NULL; pthread_mutex_unlock(&parser->mutex); + pthread_cond_signal(&parser->read_done_cond); } static void CDECL wg_parser_set_unlimited_buffering(struct wg_parser *parser) @@ -1251,56 +1204,196 @@ static void pad_removed_cb(GstElement *element, GstPad *pad, gpointer user) g_free(name); } -static void src_need_data(GstElement *appsrc, guint length, gpointer user) +static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, + guint64 offset, guint size, GstBuffer **buffer) { - struct wg_parser *parser = user; - guint64 queued_bytes; + struct wg_parser *parser = gst_pad_get_element_private(pad); + GstBuffer *new_buffer = NULL; + GstMapInfo map_info; + bool ret; + + GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + + if (offset == GST_BUFFER_OFFSET_NONE) + offset = parser->next_pull_offset; + parser->next_pull_offset = offset + size; + + if (!*buffer) + *buffer = new_buffer = gst_buffer_new_and_alloc(size); + + gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); pthread_mutex_lock(&parser->mutex); - /* As of GStreamer 1.18, appsrc suffers from a race condition. When in - * random access mode (and when underlyingly in pull mode), appsrc may - * spuriously send multiple requests for the same offset and length. If it - * receives the same buffer twice (or consecutive buffers), it will blindly - * queue them and satisfy subsequent getrange requests from downstream - * elements with the wrong buffers. - * - * Internally, this function is called inside of a loop, which also pops - * buffers from the internal queue. Accordingly we can safely treat this - * request as spurious by checking if we have already sent data; since the - * data is consumed by this thread it will not have been consumed yet. - * - * The bug is documented in greater detail here: - * - * https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/937 - */ - g_object_get(G_OBJECT(appsrc), "current-level-bytes", &queued_bytes, NULL); - if (queued_bytes) - { - pthread_mutex_unlock(&parser->mutex); - return; - } - - parser->read_request.pending = true; - parser->read_request.size = length; - + assert(!parser->read_request.data); + parser->read_request.data = map_info.data; + parser->read_request.offset = offset; + parser->read_request.size = size; + parser->read_request.done = false; pthread_cond_signal(&parser->read_cond); + /* Note that we don't unblock this wait on GST_EVENT_FLUSH_START. We expect + * the upstream pin to flush if necessary. We should never be blocked on + * read_thread() not running. */ + + while (!parser->read_request.done) + pthread_cond_wait(&parser->read_done_cond, &parser->mutex); + + ret = parser->read_request.ret; + gst_buffer_set_size(*buffer, parser->read_request.size); + pthread_mutex_unlock(&parser->mutex); + + gst_buffer_unmap(*buffer, &map_info); + + GST_LOG("Request returned %d.", ret); + + if ((!ret || !size) && new_buffer) + gst_buffer_unref(new_buffer); + + if (ret) + return size ? GST_FLOW_OK : GST_FLOW_EOS; + return GST_FLOW_ERROR; } -static gboolean src_seek_data(GstElement *appsrc, guint64 offset, gpointer user) +static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) { - struct wg_parser *parser = user; + struct wg_parser *parser = gst_pad_get_element_private(pad); + GstFormat format; - pthread_mutex_lock(&parser->mutex); + GST_LOG("parser %p, type %s.", parser, GST_QUERY_TYPE_NAME(query)); - assert(!parser->read_request.pending); - parser->read_request.offset = offset; + switch (GST_QUERY_TYPE(query)) + { + case GST_QUERY_DURATION: + gst_query_parse_duration(query, &format, NULL); + if (format == GST_FORMAT_PERCENT) + { + gst_query_set_duration(query, GST_FORMAT_PERCENT, GST_FORMAT_PERCENT_MAX); + return TRUE; + } + else if (format == GST_FORMAT_BYTES) + { + gst_query_set_duration(query, GST_FORMAT_BYTES, parser->file_size); + return TRUE; + } + return FALSE; - pthread_mutex_unlock(&parser->mutex); + case GST_QUERY_SEEKING: + gst_query_parse_seeking (query, &format, NULL, NULL, NULL); + if (format != GST_FORMAT_BYTES) + { + GST_WARNING("Cannot seek using format \"%s\".", gst_format_get_name(format)); + return FALSE; + } + gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, parser->file_size); + return TRUE; - return true; + case GST_QUERY_SCHEDULING: + gst_query_set_scheduling(query, GST_SCHEDULING_FLAG_SEEKABLE, 1, -1, 0); + gst_query_add_scheduling_mode(query, GST_PAD_MODE_PUSH); + gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL); + return TRUE; + + default: + GST_WARNING("Unhandled query type %s.", GST_QUERY_TYPE_NAME(query)); + return FALSE; + } +} + +static void *push_data(void *arg) +{ + struct wg_parser *parser = arg; + GstBuffer *buffer; + guint max_size; + + GST_DEBUG("Starting push thread."); + + if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL))) + { + GST_ERROR("Failed to allocate memory."); + return NULL; + } + + max_size = parser->stop_offset ? parser->stop_offset : parser->file_size; + + for (;;) + { + ULONG size; + int ret; + + if (parser->next_offset >= max_size) + break; + size = min(16384, max_size - parser->next_offset); + + if ((ret = src_getrange_cb(parser->my_src, NULL, parser->next_offset, size, &buffer)) < 0) + { + GST_ERROR("Failed to read data, ret %s.", gst_flow_get_name(ret)); + break; + } + + parser->next_offset += size; + + buffer->duration = buffer->pts = -1; + if ((ret = gst_pad_push(parser->my_src, buffer)) < 0) + { + GST_ERROR("Failed to push data, ret %s.", gst_flow_get_name(ret)); + break; + } + } + + gst_buffer_unref(buffer); + + gst_pad_push_event(parser->my_src, gst_event_new_eos()); + + GST_DEBUG("Stopping push thread."); + + return NULL; +} + +static gboolean activate_push(GstPad *pad, gboolean activate) +{ + struct wg_parser *parser = gst_pad_get_element_private(pad); + + if (!activate) + { + if (parser->push_thread) + { + pthread_join(parser->push_thread, NULL); + parser->push_thread = 0; + } + } + else if (!parser->push_thread) + { + int ret; + + if ((ret = pthread_create(&parser->push_thread, NULL, push_data, parser))) + { + GST_ERROR("Failed to create push thread: %s", strerror(errno)); + parser->push_thread = 0; + return FALSE; + } + } + return TRUE; +} + +static gboolean src_activate_mode_cb(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) +{ + struct wg_parser *parser = gst_pad_get_element_private(pad); + + GST_DEBUG("%s source pad for parser %p in %s mode.", + activate ? "Activating" : "Deactivating", parser, gst_pad_mode_get_name(mode)); + + switch (mode) + { + case GST_PAD_MODE_PULL: + return TRUE; + case GST_PAD_MODE_PUSH: + return activate_push(pad, activate); + case GST_PAD_MODE_NONE: + break; + } + return FALSE; } static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer user) @@ -1347,11 +1440,89 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use return GST_BUS_DROP; } +static gboolean src_perform_seek(struct wg_parser *parser, GstEvent *event) +{ + BOOL thread = !!parser->push_thread; + GstSeekType cur_type, stop_type; + GstFormat seek_format; + GstEvent *flush_event; + GstSeekFlags flags; + gint64 cur, stop; + guint32 seqnum; + gdouble rate; + + gst_event_parse_seek(event, &rate, &seek_format, &flags, + &cur_type, &cur, &stop_type, &stop); + + if (seek_format != GST_FORMAT_BYTES) + { + GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(seek_format)); + return FALSE; + } + + seqnum = gst_event_get_seqnum(event); + + /* send flush start */ + if (flags & GST_SEEK_FLAG_FLUSH) + { + flush_event = gst_event_new_flush_start(); + gst_event_set_seqnum(flush_event, seqnum); + gst_pad_push_event(parser->my_src, flush_event); + if (thread) + gst_pad_set_active(parser->my_src, 1); + } + + parser->next_offset = parser->start_offset = cur; + + /* and prepare to continue streaming */ + if (flags & GST_SEEK_FLAG_FLUSH) + { + flush_event = gst_event_new_flush_stop(TRUE); + gst_event_set_seqnum(flush_event, seqnum); + gst_pad_push_event(parser->my_src, flush_event); + if (thread) + gst_pad_set_active(parser->my_src, 1); + } + + return TRUE; +} + +static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct wg_parser *parser = gst_pad_get_element_private(pad); + gboolean ret = TRUE; + + GST_LOG("parser %p, type \"%s\".", parser, GST_EVENT_TYPE_NAME(event)); + + switch (event->type) + { + case GST_EVENT_SEEK: + ret = src_perform_seek(parser, event); + break; + + case GST_EVENT_FLUSH_START: + case GST_EVENT_FLUSH_STOP: + case GST_EVENT_QOS: + case GST_EVENT_RECONFIGURE: + break; + + default: + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); + ret = FALSE; + break; + } + gst_event_unref(event); + return ret; +} + static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_size) { + GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", + GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); unsigned int i; int ret; + parser->file_size = file_size; parser->sink_connected = true; if (!parser->bus) @@ -1363,16 +1534,15 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s parser->container = gst_bin_new(NULL); gst_element_set_bus(parser->container, parser->bus); - if (!(parser->appsrc = create_element("appsrc", "base"))) - return E_FAIL; - gst_bin_add(GST_BIN(parser->container), parser->appsrc); + parser->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); + gst_pad_set_getrange_function(parser->my_src, src_getrange_cb); + gst_pad_set_query_function(parser->my_src, src_query_cb); + gst_pad_set_activatemode_function(parser->my_src, src_activate_mode_cb); + gst_pad_set_event_function(parser->my_src, src_event_cb); + gst_pad_set_element_private(parser->my_src, parser); - g_object_set(parser->appsrc, "stream-type", GST_APP_STREAM_TYPE_RANDOM_ACCESS, NULL); - g_object_set(parser->appsrc, "size", file_size, NULL); - g_signal_connect(parser->appsrc, "need-data", G_CALLBACK(src_need_data), parser); - g_signal_connect(parser->appsrc, "seek-data", G_CALLBACK(src_seek_data), parser); - - parser->read_request.offset = 0; + parser->start_offset = parser->next_offset = parser->stop_offset = 0; + parser->next_pull_offset = 0; parser->error = false; if (!parser->init_gst(parser)) @@ -1468,11 +1638,18 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s pthread_mutex_unlock(&parser->mutex); + parser->next_offset = 0; return S_OK; out: if (parser->container) gst_element_set_state(parser->container, GST_STATE_NULL); + if (parser->their_sink) + { + gst_pad_unlink(parser->my_src, parser->their_sink); + gst_object_unref(parser->their_sink); + parser->my_src = parser->their_sink = NULL; + } for (i = 0; i < parser->stream_count; ++i) free_stream(parser->streams[i]); @@ -1509,6 +1686,10 @@ static void CDECL wg_parser_disconnect(struct wg_parser *parser) pthread_mutex_unlock(&parser->mutex); gst_element_set_state(parser->container, GST_STATE_NULL); + gst_pad_unlink(parser->my_src, parser->their_sink); + gst_object_unref(parser->my_src); + gst_object_unref(parser->their_sink); + parser->my_src = parser->their_sink = NULL; pthread_mutex_lock(&parser->mutex); parser->sink_connected = false; @@ -1530,6 +1711,7 @@ static void CDECL wg_parser_disconnect(struct wg_parser *parser) static BOOL decodebin_parser_init_gst(struct wg_parser *parser) { GstElement *element; + int ret; if (!(element = create_element("decodebin", "base"))) return FALSE; @@ -1542,13 +1724,15 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_select_cb), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_cb), parser); + parser->their_sink = gst_element_get_static_pad(element, "sink"); + pthread_mutex_lock(&parser->mutex); parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); - if (!gst_element_link(parser->appsrc, parser->decodebin)) + if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link appsrc.\n"); + GST_ERROR("Failed to link pads, error %d.\n", ret); return FALSE; } @@ -1558,6 +1742,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) static BOOL avi_parser_init_gst(struct wg_parser *parser) { GstElement *element; + int ret; if (!(element = create_element("avidemux", "good"))) return FALSE; @@ -1568,13 +1753,15 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) g_signal_connect(element, "pad-removed", G_CALLBACK(pad_removed_cb), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_cb), parser); + parser->their_sink = gst_element_get_static_pad(element, "sink"); + pthread_mutex_lock(&parser->mutex); parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); - if (!gst_element_link(parser->appsrc, element)) + if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link appsrc.\n"); + GST_ERROR("Failed to link pads, error %d.\n", ret); return FALSE; } @@ -1592,9 +1779,10 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); - if (!gst_element_link(parser->appsrc, element)) + parser->their_sink = gst_element_get_static_pad(element, "sink"); + if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link appsrc.\n"); + GST_ERROR("Failed to link sink pads, error %d.\n", ret); return FALSE; } @@ -1625,9 +1813,10 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); - if (!gst_element_link(parser->appsrc, element)) + parser->their_sink = gst_element_get_static_pad(element, "sink"); + if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link appsrc.\n"); + GST_ERROR("Failed to link sink pads, error %d.\n", ret); return FALSE; } @@ -1658,6 +1847,7 @@ static struct wg_parser *wg_parser_create(void) pthread_mutex_init(&parser->mutex, NULL); pthread_cond_init(&parser->init_cond, NULL); pthread_cond_init(&parser->read_cond, NULL); + pthread_cond_init(&parser->read_done_cond, NULL); parser->flushing = true; GST_DEBUG("Created winegstreamer parser %p.\n", parser); @@ -1711,6 +1901,7 @@ static void CDECL wg_parser_destroy(struct wg_parser *parser) pthread_mutex_destroy(&parser->mutex); pthread_cond_destroy(&parser->init_cond); pthread_cond_destroy(&parser->read_cond); + pthread_cond_destroy(&parser->read_done_cond); free(parser); } -- 2.33.0

1 0

[PATCH 1/5] user32/tests: Fix existing winevents in test_SetWindowRgn() message sequences.
by Connor McAdams 24 Sep '21

24 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6825c1d74d4..63834725a54 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13340,7 +13340,7 @@ static const struct message WmSetWindowRgn[] = { { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0xf }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; @@ -13349,7 +13349,7 @@ static const struct message WmSetWindowRgn_no_redraw[] = { |SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0 }, { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0xf }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; @@ -13376,8 +13376,8 @@ static const struct message WmSetWindowRgn_clear[] = { { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Not always sent. */ { 0 } }; -- 2.25.1

2 7

[PATCH] gdi32: use 7-bit ascii for unhandled encodings
by Aurélien Inacio 23 Sep '21

23 Sep '21

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/gdi32/opentype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 10234c6d5aa..c206d6dae57 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -344,8 +344,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; case OPENTYPE_PLATFORM_WIN: @@ -366,8 +366,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_WIN_ENCODING_JOHAB: return 1361; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; default: -- 2.30.2

1 0

[PATCH v2 1/2] winex11.drv: Don't let the WM resize windows larger than the work area.
by Gabriel Ivăncescu 23 Sep '21

23 Sep '21

On Windows, Windows with WS_THICKFRAME can be resized and can be larger than the work area, if shown afterwards. However, it does not resize them to fit the work area, but keeps them at that large size. WMs on the other hand will try to resize the window if they can so that they fit in the work area, even if the window was larger prior. This generates ConfigureNotify events, and the window will receive size change messages after wine's X11 driver handles it, breaking some apps which don't expect them. The caveat is that this will prevent the user from resizing the window (by e.g. dragging the corner), unlike on Windows. However, in practice, it's often hard to resize such large windows anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51526 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Maybe a registry option would be more appropriate? Otherwise, some apps will always crash when managed by the WM. dlls/winex11.drv/window.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e856a4..8ad018f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -305,6 +305,31 @@ BOOL is_window_rect_full_screen( const RECT *rect ) return info.full_screen; } +/*********************************************************************** + * prevent_wm_resize + * + * Check if we should prevent the Window Manager from resizing the window. + * WMs tend to resize windows larger than the work area so that they fit + * within it, but Windows does not. This breaks some apps which don't + * expect the resize messages to happen (e.g. The Longest Five Minutes). + */ +static BOOL prevent_wm_resize( struct x11drv_win_data *data, DWORD style ) +{ + HMONITOR monitor; + MONITORINFO mi; + + if (!(style & WS_THICKFRAME)) + return !is_window_resizable( data, style ); + + monitor = MonitorFromWindow( data->hwnd, MONITOR_DEFAULTTOPRIMARY ); + if (!monitor) return FALSE; + + mi.cbSize = sizeof( mi ); + GetMonitorInfoW( monitor, &mi ); + return data->whole_rect.right - data->whole_rect.left > mi.rcWork.right - mi.rcWork.left || + data->whole_rect.bottom - data->whole_rect.top > mi.rcWork.bottom - mi.rcWork.top; +} + /*********************************************************************** * get_mwm_decorations */ @@ -713,7 +738,7 @@ static void set_size_hints( struct x11drv_win_data *data, DWORD style ) } else size_hints->win_gravity = NorthWestGravity; - if (!is_window_resizable( data, style )) + if (prevent_wm_resize( data, style )) { size_hints->max_width = data->whole_rect.right - data->whole_rect.left; size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; -- 2.31.1

2 2

[PATCH] wined3d: Add GPU information for AMD VANGOGH.
by Paul Gofman 23 Sep '21

23 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a39c6d75750..990164fd68d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -516,6 +516,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, + {HW_VENDOR_AMD, CARD_AMD_VANGOGH, "AMD VANGOGH", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 85e8261e840..97be4bd5e2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2933,6 +2933,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, + CARD_AMD_VANGOGH = 0x163f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, -- 2.31.1

2 1

[PATCH] wined3d: Fix typo in wined3d_texture_vk_download_data().
by Jan Sikorski 23 Sep '21

23 Sep '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 99a2efa1525..f9babc6e28f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5029,7 +5029,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, if (dst_bo->host_synced) { - vk_barrier.srcAccessMask |= VK_ACCESS_HOST_READ_BIT; + vk_barrier.dstAccessMask |= VK_ACCESS_HOST_READ_BIT; bo_stage_flags |= VK_PIPELINE_STAGE_HOST_BIT; } -- 2.30.2

2 1

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Store constant values as an array of unions.
by Zebediah Figura 23 Sep '21

23 Sep '21

This allows us to more easily manipulate individual elements in a type-agnostic way. For example, it allows easier implementation of constant swizzle folding. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 14 ++++++++------ libs/vkd3d-shader/hlsl.h | 14 +++++++------- libs/vkd3d-shader/hlsl.y | 17 +++++++++-------- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++---------- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 96473d057..8a2286c45 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -535,7 +535,7 @@ struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned i if (!(c = hlsl_alloc(ctx, sizeof(*c)))) return NULL; init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_UINT], loc); - c->value.u[0] = n; + c->value[0].u = n; return c; } @@ -1018,26 +1018,28 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl vkd3d_string_buffer_printf(buffer, "{"); for (x = 0; x < type->dimx; ++x) { + const union hlsl_constant_value *value = &constant->value[x]; + switch (type->base_type) { case HLSL_TYPE_BOOL: - vkd3d_string_buffer_printf(buffer, "%s ", constant->value.b[x] ? "true" : "false"); + vkd3d_string_buffer_printf(buffer, "%s ", value->b ? "true" : "false"); break; case HLSL_TYPE_DOUBLE: - vkd3d_string_buffer_printf(buffer, "%.16e ", constant->value.d[x]); + vkd3d_string_buffer_printf(buffer, "%.16e ", value->d); break; case HLSL_TYPE_FLOAT: - vkd3d_string_buffer_printf(buffer, "%.8e ", constant->value.f[x]); + vkd3d_string_buffer_printf(buffer, "%.8e ", value->f); break; case HLSL_TYPE_INT: - vkd3d_string_buffer_printf(buffer, "%d ", constant->value.i[x]); + vkd3d_string_buffer_printf(buffer, "%d ", value->i); break; case HLSL_TYPE_UINT: - vkd3d_string_buffer_printf(buffer, "%u ", constant->value.u[x]); + vkd3d_string_buffer_printf(buffer, "%u ", value->u); break; default: diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index ce1f1b756..7079171b8 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -374,14 +374,14 @@ struct hlsl_ir_store struct hlsl_ir_constant { struct hlsl_ir_node node; - union + union hlsl_constant_value { - unsigned u[4]; - int i[4]; - float f[4]; - double d[4]; - bool b[4]; - } value; + uint32_t u; + int32_t i; + float f; + double d; + bool b; + } value[4]; struct hlsl_reg reg; }; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2b381dc8a..2206d641d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -828,20 +828,21 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) case HLSL_IR_CONSTANT: { struct hlsl_ir_constant *constant = hlsl_ir_constant(node); + const union hlsl_constant_value *value = &constant->value[0]; switch (constant->node.data_type->base_type) { case HLSL_TYPE_UINT: - return constant->value.u[0]; + return value->u; case HLSL_TYPE_INT: - return constant->value.i[0]; + return value->i; case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - return constant->value.f[0]; + return value->f; case HLSL_TYPE_DOUBLE: - return constant->value.d[0]; + return value->d; case HLSL_TYPE_BOOL: - return constant->value.b[0]; + return value->b; default: assert(0); return 0; @@ -2770,7 +2771,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_FLOAT], @1); - c->value.f[0] = $1; + c->value[0].f = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; } @@ -2781,7 +2782,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_INT], @1); - c->value.i[0] = $1; + c->value[0].i = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; } @@ -2792,7 +2793,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_BOOL], @1); - c->value.b[0] = $1; + c->value[0].b = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 275920159..8bd9d1385 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -413,12 +413,12 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi { case HLSL_TYPE_INT: for (i = 0; i < dimx; ++i) - res->value.f[i] = arg1->value.i[i]; + res->value[i].f = arg1->value[i].i; break; case HLSL_TYPE_UINT: for (i = 0; i < dimx; ++i) - res->value.f[i] = arg1->value.u[i]; + res->value[i].f = arg1->value[i].u; break; default: @@ -443,17 +443,17 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi { case HLSL_OP1_NEG: for (i = 0; i < instr->data_type->dimx; ++i) - res->value.u[i] = -arg1->value.u[i]; + res->value[i].u = -arg1->value[i].u; break; case HLSL_OP2_ADD: for (i = 0; i < instr->data_type->dimx; ++i) - res->value.u[i] = arg1->value.u[i] + arg2->value.u[i]; + res->value[i].u = arg1->value[i].u + arg2->value[i].u; break; case HLSL_OP2_MUL: for (i = 0; i < instr->data_type->dimx; ++i) - res->value.u[i] = arg1->value.u[i] * arg2->value.u[i]; + res->value[i].u = arg1->value[i].u * arg2->value[i].u; break; default: @@ -920,28 +920,30 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list * { for (x = 0, i = 0; x < 4; ++x) { + const union hlsl_constant_value *value; float f; if (!(writemask & (1u << x))) continue; + value = &constant->value[i++]; switch (type->base_type) { case HLSL_TYPE_BOOL: - f = constant->value.b[i++]; + f = value->b; break; case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - f = constant->value.f[i++]; + f = value->f; break; case HLSL_TYPE_INT: - f = constant->value.i[i++]; + f = value->i; break; case HLSL_TYPE_UINT: - f = constant->value.u[i++]; + f = value->u; break; case HLSL_TYPE_DOUBLE: @@ -1208,7 +1210,7 @@ struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct ret.allocated = var->reg.allocated; ret.id = var->reg.id; if (offset_node) - offset = hlsl_ir_constant(offset_node)->value.u[0]; + offset = hlsl_ir_constant(offset_node)->value[0].u; ret.id += offset / 4; if (type_is_single_reg(var->data_type)) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index b347e3526..5558a1ff2 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -962,7 +962,7 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, instr.srcs[0].reg.idx[0] = constant->reg.id; instr.srcs[0].reg.idx_count = 1; for (i = 0; i < dimx; ++i) - instr.srcs[0].reg.immconst_uint[i] = constant->value.u[i]; + instr.srcs[0].reg.immconst_uint[i] = constant->value[i].u; instr.src_count = 1, write_sm4_instruction(buffer, &instr); -- 2.33.0

5 19

[PATCH 1/2] winex11.drv: Don't let the WM resize windows larger than the work area.
by Gabriel Ivăncescu 23 Sep '21

23 Sep '21

On Windows, Windows with WS_THICKFRAME can be resized and can be larger than the work area, if shown afterwards. However, it does not resize them to fit the work area, but keeps them at that large size. WMs on the other hand will try to resize the window if they can so that they fit in the work area, even if the window was larger prior. This generates ConfigureNotify events, and the window will receive size change messages after wine's X11 driver handles it, breaking some apps which don't expect them. The caveat is that this will prevent the user from resizing the window (by e.g. dragging the corner), unlike on Windows. However, in practice, it's often hard to resize such large windows anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51526 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Maybe a registry option would be more appropriate? Otherwise, some apps will always crash when managed by the WM. dlls/winex11.drv/window.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e856a4..8383c2c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -305,6 +305,31 @@ BOOL is_window_rect_full_screen( const RECT *rect ) return info.full_screen; } +/*********************************************************************** + * prevent_wm_resize + * + * Check if we should prevent the Window Manager from resizing the window. + * WMs tend to resize windows larger than the work area so that they fit + * within it, but Windows does not. This breaks some apps which don't + * expect the resize messages to happen (e.g. The Longest Five Minutes). + */ +static BOOL prevent_wm_resize( struct x11drv_win_data *data, DWORD style ) +{ + HMONITOR monitor; + MONITORINFO mi; + + if (!(style & WS_THICKFRAME)) + return !is_window_resizable( data, style ); + + monitor = MonitorFromWindow( data->hwnd, MONITOR_DEFAULTTOPRIMARY ); + if (!monitor) return FALSE; + + mi.cbSize = sizeof( mi ); + GetMonitorInfoW( monitor, &mi ); + return data->whole_rect.left <= mi.rcWork.left && data->whole_rect.right >= mi.rcWork.right && + data->whole_rect.top <= mi.rcWork.top && data->whole_rect.bottom >= mi.rcWork.bottom; +} + /*********************************************************************** * get_mwm_decorations */ @@ -713,7 +738,7 @@ static void set_size_hints( struct x11drv_win_data *data, DWORD style ) } else size_hints->win_gravity = NorthWestGravity; - if (!is_window_resizable( data, style )) + if (prevent_wm_resize( data, style )) { size_hints->max_width = data->whole_rect.right - data->whole_rect.left; size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; -- 2.31.1

2 3

[tools] winetest/build-patterns: Tweak the 'WineTest not run' tooltip.
by Francois Gouget 23 Sep '21

23 Sep '21

The reason why there is no test report could also be that it got rejected for being too big or having too many failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 386bf9784..d1d526134 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1025,7 +1025,7 @@ sub write_pattern_line($$$) { $symbol = "_"; $class = "W"; - $title = "WineTest was not run"; + $title = "WineTest was not run or the report was invalid"; } elsif ($build->{hastest}->{$test->{name}}) { -- 2.30.2

1 0

[PATCH v6 1/3] ntdll: Factor out get_vprot_range_size() function.
by Paul Gofman 23 Sep '21

23 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 40 ++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..41d878546bb 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -943,6 +943,24 @@ static BYTE get_page_vprot( const void *addr ) } +/*********************************************************************** + * get_vprot_range_size + * + * Return the size of the region with equal masked vprot byte. + * Also return the protections for the first page. + * The function assumes that base and size are page aligned and + * base + size does not wrap around. */ +static SIZE_T get_vprot_range_size( char *base, SIZE_T size, BYTE mask, BYTE *vprot ) +{ + char *addr; + + *vprot = get_page_vprot( base ); + for (addr = base + page_size; addr != base + size; addr += page_size) + if ((*vprot ^ get_page_vprot( addr )) & mask) break; + + return addr - base; +} + /*********************************************************************** * set_page_vprot * @@ -2047,18 +2065,21 @@ done: */ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot ) { - SIZE_T i, start; + SIZE_T offset; - start = ((char *)base - (char *)view->base) >> page_shift; - *vprot = get_page_vprot( base ); + base = ROUND_ADDR( base, page_mask ); + offset = (char *)base - (char *)view->base; if (view->protect & SEC_RESERVE) { SIZE_T ret = 0; + + *vprot = get_page_vprot( base ); + SERVER_START_REQ( get_mapping_committed_range ) { req->base = wine_server_client_ptr( view->base ); - req->offset = start << page_shift; + req->offset = offset; if (!wine_server_call( req )) { ret = reply->size; @@ -2072,9 +2093,8 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro SERVER_END_REQ; return ret; } - for (i = start + 1; i < view->size >> page_shift; i++) - if ((*vprot ^ get_page_vprot( (char *)view->base + (i << page_shift) )) & VPROT_COMMITTED) break; - return (i - start) << page_shift; + + return get_vprot_range_size( base, view->size - offset, VPROT_COMMITTED, vprot ); } @@ -4196,7 +4216,6 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, else { BYTE vprot; - char *ptr; SIZE_T range_size = get_committed_size( view, base, &vprot ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; @@ -4205,9 +4224,8 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; else info->Type = MEM_PRIVATE; - for (ptr = base; ptr < base + range_size; ptr += page_size) - if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; - info->RegionSize = ptr - base; + + info->RegionSize = get_vprot_range_size( base, range_size, ~VPROT_WRITEWATCH, &vprot ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); -- 2.31.1

1 2

[PATCH v5 1/3] ntdll: Factor out get_vprot_range_size() function.
by Paul Gofman 23 Sep '21

23 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 40 ++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..41d878546bb 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -943,6 +943,24 @@ static BYTE get_page_vprot( const void *addr ) } +/*********************************************************************** + * get_vprot_range_size + * + * Return the size of the region with equal masked vprot byte. + * Also return the protections for the first page. + * The function assumes that base and size are page aligned and + * base + size does not wrap around. */ +static SIZE_T get_vprot_range_size( char *base, SIZE_T size, BYTE mask, BYTE *vprot ) +{ + char *addr; + + *vprot = get_page_vprot( base ); + for (addr = base + page_size; addr != base + size; addr += page_size) + if ((*vprot ^ get_page_vprot( addr )) & mask) break; + + return addr - base; +} + /*********************************************************************** * set_page_vprot * @@ -2047,18 +2065,21 @@ done: */ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot ) { - SIZE_T i, start; + SIZE_T offset; - start = ((char *)base - (char *)view->base) >> page_shift; - *vprot = get_page_vprot( base ); + base = ROUND_ADDR( base, page_mask ); + offset = (char *)base - (char *)view->base; if (view->protect & SEC_RESERVE) { SIZE_T ret = 0; + + *vprot = get_page_vprot( base ); + SERVER_START_REQ( get_mapping_committed_range ) { req->base = wine_server_client_ptr( view->base ); - req->offset = start << page_shift; + req->offset = offset; if (!wine_server_call( req )) { ret = reply->size; @@ -2072,9 +2093,8 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro SERVER_END_REQ; return ret; } - for (i = start + 1; i < view->size >> page_shift; i++) - if ((*vprot ^ get_page_vprot( (char *)view->base + (i << page_shift) )) & VPROT_COMMITTED) break; - return (i - start) << page_shift; + + return get_vprot_range_size( base, view->size - offset, VPROT_COMMITTED, vprot ); } @@ -4196,7 +4216,6 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, else { BYTE vprot; - char *ptr; SIZE_T range_size = get_committed_size( view, base, &vprot ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; @@ -4205,9 +4224,8 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; else info->Type = MEM_PRIVATE; - for (ptr = base; ptr < base + range_size; ptr += page_size) - if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; - info->RegionSize = ptr - base; + + info->RegionSize = get_vprot_range_size( base, range_size, ~VPROT_WRITEWATCH, &vprot ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); -- 2.31.1

1 2

[PATCH] opencl: Fix compilation on MSVC targets.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/opencl/make_opencl | 6 +++--- dlls/opencl/opencl_types.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 5/5] winhttp/tests: Add redirect tests.
by Hans Leidekker 23 Sep '21

23 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 63 ++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ab8b444ad3f..7e46a43aa05 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2217,6 +2217,12 @@ static const char switchprotocols[] = "Upgrade: websocket\r\n" "Connection: Upgrade\r\n"; +static const char redirectmsg[] = +"HTTP/1.1 307 Temporary Redirect\r\n" +"Content-Length: 0\r\n" +"Location: /temporary\r\n" +"Connection: close\r\n\r\n"; + static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; static const char auth_unseen[] = "Auth Unseen"; @@ -2448,6 +2454,17 @@ static DWORD CALLBACK server_thread(LPVOID param) } else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } + else if (strstr(buffer, "POST /redirect")) + { + send(c, redirectmsg, sizeof redirectmsg - 1, 0); + } + else if (strstr(buffer, "POST /temporary")) + { + char buf[32]; + recv(c, buf, sizeof(buf), 0); + send(c, okmsg, sizeof okmsg - 1, 0); + send(c, page1, sizeof page1 - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -3099,6 +3116,51 @@ static void test_head_request(int port) WinHttpCloseHandle(ses); } +static void test_redirect(int port) +{ + HINTERNET ses, con, req; + char buf[128]; + DWORD size, len, count, status; + BOOL ret; + + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, L"localhost", port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, L"POST", L"/redirect", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, (void *)"data", sizeof("data"), sizeof("data"), 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, NULL); + ok(ret, "failed to get status code %u\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "got %u\n", status); + + count = 0; + ret = WinHttpQueryDataAvailable(req, &count); + ok(ret, "failed to query data available %u\n", GetLastError()); + ok(count == 128, "got %u\n", count); + + len = sizeof(buf); + count = 0; + ret = WinHttpReadData(req, buf, len, &count); + ok(ret, "failed to read data %u\n", GetLastError()); + ok(count == 128, "got %u\n", count); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_websocket(int port) { HINTERNET session, connection, request, socket, socket2; @@ -5522,6 +5584,7 @@ START_TEST (winhttp) test_request_path_escapes(si.port); test_passport_auth(si.port); test_websocket(si.port); + test_redirect(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, L"/quit"); -- 2.30.2

2 1

[PATCH 1/5] d3d10/effect: Forward to pool effect in GetVariableByName().
by Nikolay Sivov 23 Sep '21

23 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 13 ++++++++----- dlls/d3d10/tests/effect.c | 9 +++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9436d0277f2..ebcb5f4145b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3258,7 +3258,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, const char *name) { - struct d3d10_effect *This = impl_from_ID3D10Effect(iface); + struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -3269,9 +3269,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB return &null_variable.ID3D10EffectVariable_iface; } - for (i = 0; i < This->local_buffer_count; ++i) + for (i = 0; i < effect->local_buffer_count; ++i) { - struct d3d10_effect_variable *l = &This->local_buffers[i]; + struct d3d10_effect_variable *l = &effect->local_buffers[i]; unsigned int j; for (j = 0; j < l->type->member_count; ++j) @@ -3286,9 +3286,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB } } - for (i = 0; i < This->local_variable_count; ++i) + for (i = 0; i < effect->local_variable_count; ++i) { - struct d3d10_effect_variable *v = &This->local_variables[i]; + struct d3d10_effect_variable *v = &effect->local_variables[i]; if (v->name && !strcmp(v->name, name)) { @@ -3297,6 +3297,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB } } + if (effect->pool) + return effect->pool->lpVtbl->GetVariableByName(effect->pool, name); + WARN("Invalid name specified\n"); return &null_variable.ID3D10EffectVariable_iface; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 3243e7b2713..9fbf8b9e865 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6671,13 +6671,10 @@ todo_wine v = child_effect->lpVtbl->GetVariableByName(child_effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); - ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); - } + ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); +todo_wine + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR0"); hr = v->lpVtbl->GetDesc(v, &var_desc); -- 2.33.0

2 9

[PATCH 1/2] api-ms-win-core-psapi-l1-1-0: Add K32GetModuleBaseNameW and K32GetModuleInformation.
by Giovanni Mascellani 23 Sep '21

23 Sep '21

From: Thomas Crider <gloriouseggroll(a)gmail.com> Needed for Mass Effect Legendary Edition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51199 Signed-off-by: Thomas Crider <gloriouseggroll(a)gmail.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- .../api-ms-win-core-psapi-l1-1-0.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec index c54c1077843..3b8ad04963c 100644 --- a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec +++ b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec @@ -5,6 +5,8 @@ @ stdcall K32GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW @ stdcall K32GetDeviceDriverFileNameW(ptr ptr long) kernel32.K32GetDeviceDriverFileNameW @ stdcall K32GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW +@ stdcall K32GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW +@ stdcall K32GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation @ stdcall K32GetPerformanceInfo(ptr long) kernel32.K32GetPerformanceInfo @ stdcall K32GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall K32GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo -- 2.33.0

1 1

[PATCH 4/5] winhttp: Don't remove content-type/length headers in handle_redirect().
by Hans Leidekker 23 Sep '21

23 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50272 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0155d5780fe..2c064bb767b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2544,7 +2544,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) struct connect *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location = NULL; - int index; if ((ret = get_redirect_url( request, &location, &len_loc ))) return ret; @@ -2643,10 +2642,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) else request->path = strdupW( L"/" ); } - /* remove content-type/length headers */ - if ((index = get_header_index( request, L"Content-Type", 0, TRUE )) >= 0) delete_header( request, index ); - if ((index = get_header_index( request, L"Content-Length", 0, TRUE )) >= 0 ) delete_header( request, index ); - if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !wcscmp( request->verb, L"POST" )) { free( request->verb ); -- 2.30.2

1 0

[PATCH 3/5] winhttp: Fix return value for relative redirects.
by Hans Leidekker 23 Sep '21

23 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index dce3232c0e3..0155d5780fe 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2575,6 +2575,7 @@ static DWORD handle_redirect( struct request *request, DWORD status ) } free( request->path ); request->path = path; + ret = ERROR_SUCCESS; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); } -- 2.30.2

1 0

[PATCH 2/5] winhttp: Call drain_content() before clear_response_headers().
by Hans Leidekker 23 Sep '21

23 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e229bdbfd31..dce3232c0e3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2082,8 +2082,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; - clear_response_headers( request ); drain_content( request ); + clear_response_headers( request ); if (session->agent) process_header( request, L"User-Agent", session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); -- 2.30.2

1 0

[PATCH 1/5] winhttp: Call read_data() at least once in drain_content().
by Hans Leidekker 23 Sep '21

23 Sep '21

This ensures that response headers are processed even if there's no data to read. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50244 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8e390de549e..e229bdbfd31 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1877,11 +1877,8 @@ static void drain_content( struct request *request ) for (;;) { if (request->read_chunked) size = sizeof(buffer); - else - { - if (bytes_total >= bytes_left) return; - size = min( sizeof(buffer), bytes_left - bytes_total ); - } + else size = min( sizeof(buffer), bytes_left - bytes_total ); + if (read_data( request, buffer, size, &bytes_read, FALSE ) || !bytes_read) return; bytes_total += bytes_read; } -- 2.30.2

1 0

[PATCH 1/2] api-ms-win-core-psapi-ansi-l1-1-0: Add K32GetModuleBaseNameA.
by Giovanni Mascellani 23 Sep '21

23 Sep '21

It is required by the Mass Effect Legendary Edition launcher. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- .../api-ms-win-core-psapi-ansi-l1-1-0.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec index e4f758581f6..340198c6edf 100644 --- a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec +++ b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec @@ -4,3 +4,4 @@ @ stdcall K32GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA @ stdcall K32GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA @ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) kernel32.QueryFullProcessImageNameA +@ stdcall K32GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA -- 2.33.0

3 4

[PATCH 07/10] ntdll: Directly use ntdll in remove_face_from_cache.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)

2 1

[PATCH v2 10/10] gdi32: Directly use ntdll in update_font_association_info.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4b3c93d9853..274c1d83aba 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2481,20 +2481,28 @@ static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl, int static void set_value_key(HKEY hkey, const char *name, const char *value) { if (value) - RegSetValueExA(hkey, name, 0, REG_SZ, (const BYTE *)value, strlen(value) + 1); + set_reg_ascii_value( hkey, name, value ); else if (name) - RegDeleteValueA(hkey, name); + { + WCHAR nameW[64]; + asciiz_to_unicode( nameW, name ); + reg_delete_value( hkey, nameW ); + } } static void update_font_association_info(UINT current_ansi_codepage) { + static const WCHAR associated_charsetW[] = + { 'A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t' }; + if (is_dbcs_ansi_cp(current_ansi_codepage)) { HKEY hkey; - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\FontAssoc", &hkey) == ERROR_SUCCESS) + if ((hkey = reg_create_key( NULL, font_assoc_keyW, sizeof(font_assoc_keyW), 0, NULL ))) { HKEY hsubkey; - if (RegCreateKeyW(hkey, L"Associated Charset", &hsubkey) == ERROR_SUCCESS) + if ((hsubkey = reg_create_key( hkey, associated_charsetW, sizeof(associated_charsetW), + 0, NULL ))) { switch (current_ansi_codepage) { @@ -2511,12 +2519,12 @@ static void update_font_association_info(UINT current_ansi_codepage) set_value_key(hsubkey, "SYMBOL(02)", "NO"); break; } - RegCloseKey(hsubkey); + NtClose( hsubkey ); } /* TODO: Associated DefaultFonts */ - RegCloseKey(hkey); + NtClose( hkey ); } } else -- 2.23.0

1 0

[PATCH v2 09/10] gdi32: Directly use ntdll in add_font_list.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1e3c70550a3..4b3c93d9853 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -132,6 +132,13 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static UINT asciiz_to_unicode( WCHAR *dst, const char *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return (p - dst) * sizeof(WCHAR); +} + static inline WCHAR facename_tolower( WCHAR c ) { if (c >= 'A' && c <= 'Z') return c - 'A' + 'a'; @@ -504,6 +511,13 @@ static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void * NtSetValueKey( hkey, &nameW, 0, type, value, count ); } +static void set_reg_ascii_value( HKEY hkey, const char *name, const char *value ) +{ + WCHAR nameW[64], valueW[128]; + asciiz_to_unicode( nameW, name ); + set_reg_value( hkey, nameW, REG_SZ, valueW, asciiz_to_unicode( valueW, value )); +} + static ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { @@ -2458,10 +2472,10 @@ static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl, int { const char *sserif = (dpi <= 108) ? fl->sserif_96 : fl->sserif_120; - RegSetValueExA(hkey, "Courier", 0, REG_SZ, (const BYTE *)fl->courier, strlen(fl->courier)+1); - RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)fl->serif, strlen(fl->serif)+1); - RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)sserif, strlen(sserif)+1); - RegSetValueExA(hkey, "Small Fonts", 0, REG_SZ, (const BYTE *)fl->small, strlen(fl->small)+1); + set_reg_ascii_value( hkey, "Courier", fl->courier ); + set_reg_ascii_value( hkey, "MS Serif", fl->serif ); + set_reg_ascii_value( hkey, "MS Sans Serif", sserif ); + set_reg_ascii_value( hkey, "Small Fonts", fl->small ); } static void set_value_key(HKEY hkey, const char *name, const char *value) -- 2.23.0

1 0

[PATCH v2 08/10] gdi32: Directly use ntdll in load_system_links.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3419b18a242..1e3c70550a3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,18 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR system_link_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s',' ','N','T', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','F','o','n','t','L','i','n','k', + '\\','S','y','s','t','e','m','L','i','n','k' +}; + static const WCHAR font_substitutes_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -1470,34 +1482,33 @@ static void load_system_links(void) struct gdi_font_link *font_link, *system_font_link; struct gdi_font_face *face; - if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink", &hkey )) + if ((hkey = reg_open_key( NULL, system_link_keyW, sizeof(system_link_keyW) ))) { - WCHAR value[MAX_PATH], data[1024]; - DWORD type, val_len, data_len; + char buffer[4096]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + WCHAR value[MAX_PATH]; WCHAR *entry, *next; - val_len = ARRAY_SIZE(value); - data_len = sizeof(data); i = 0; - while (!RegEnumValueW( hkey, i++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len)) + while (reg_enum_value( hkey, i++, info, sizeof(buffer), value, sizeof(value) )) { /* Don't store fonts that are only substitutes for other fonts */ if (!get_gdi_font_subst( value, -1, NULL )) { + char *data = (char *)info + info->DataOffset; font_link = add_gdi_font_link( value ); - for (entry = data; (char *)entry < (char *)data + data_len && *entry; entry = next) + for (entry = (WCHAR *)data; (char *)entry < data + info->DataLength && *entry; entry = next) { const WCHAR *family_name = NULL; WCHAR *p; - TRACE("%s: %s\n", debugstr_w(value), debugstr_w(entry)); + TRACE( "%s: %s\n", debugstr_w(value), debugstr_w(entry) ); next = entry + lstrlenW(entry) + 1; if ((p = wcschr( entry, ',' ))) { *p++ = 0; - while (iswspace(*p)) p++; + while (*p == ' ' || *p == '\t') p++; if (!(family_name = get_gdi_font_subst( p, -1, NULL ))) family_name = p; } if ((face = find_face_from_filename( entry, family_name ))) @@ -1510,11 +1521,8 @@ static void load_system_links(void) } } else TRACE("%s: SystemLink entry for substituted font, ignoring\n", debugstr_w(value)); - - val_len = ARRAY_SIZE(value); - data_len = sizeof(data); } - RegCloseKey( hkey ); + NtClose( hkey ); } if ((shelldlg_name = get_gdi_font_subst( L"MS Shell Dlg", -1, NULL ))) -- 2.23.0

1 0

[PATCH v2 07/10] gdi32: Directly use ntdll in remove_face_from_cache.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a02e5b4207a..3419b18a242 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -523,6 +523,13 @@ static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORM return TRUE; } +static void reg_delete_value( HKEY hkey, const WCHAR *name ) +{ + unsigned int name_size = lstrlenW( name ) * sizeof(WCHAR); + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + NtDeleteValueKey( hkey, &nameW ); +} + static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) { char buffer[4096]; @@ -1273,20 +1280,25 @@ static void add_face_to_cache( struct gdi_font_face *face ) static void remove_face_from_cache( struct gdi_font_face *face ) { - HKEY hkey_family; + HKEY hkey_family, hkey; - if (RegOpenKeyExW( wine_fonts_cache_key, face->family->family_name, 0, KEY_ALL_ACCESS, &hkey_family )) + if (!(hkey_family = reg_open_key( wine_fonts_cache_key, face->family->family_name, + lstrlenW( face->family->family_name ) * sizeof(WCHAR) ))) return; if (!face->scalable) { WCHAR name[10]; swprintf( name, ARRAY_SIZE(name), L"%d", face->size.y_ppem ); - RegDeleteKeyW( hkey_family, name ); + if ((hkey = reg_open_key( hkey_family, name, lstrlenW( name ) * sizeof(WCHAR) ))) + { + NtDeleteKey( hkey ); + NtClose( hkey ); + } } - else RegDeleteValueW( hkey_family, face->style_name ); + else reg_delete_value( hkey_family, face->style_name ); - RegCloseKey( hkey_family ); + NtClose( hkey_family ); } /* font links */ -- 2.23.0

1 0

[PATCH v2 06/10] gdi32: Directly use ntdll in load_font_list_from_cache.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a8de47a2b59..a02e5b4207a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -492,6 +492,19 @@ static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void * NtSetValueKey( hkey, &nameW, 0, type, value, count ); } +static ULONG query_reg_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORMATION *info, ULONG size, WCHAR *name, ULONG name_size ) { @@ -1187,27 +1200,30 @@ static void load_face_from_cache( HKEY hkey_family, struct gdi_font_family *fami static void load_font_list_from_cache(void) { - DWORD size, family_index = 0; + WCHAR buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buffer; + KEY_NODE_INFORMATION *enum_info = (KEY_NODE_INFORMATION *)buffer; + DWORD family_index = 0, total_size; struct gdi_font_family *family; HKEY hkey_family; - WCHAR buffer[4096], second_name[LF_FACESIZE]; + WCHAR *second_name = (WCHAR *)info->Data; - size = sizeof(buffer); - while (!RegEnumKeyExW( wine_fonts_cache_key, family_index++, buffer, &size, NULL, NULL, NULL, NULL )) + while (!NtEnumerateKey( wine_fonts_cache_key, family_index++, KeyNodeInformation, enum_info, + sizeof(buffer), &total_size )) { - RegOpenKeyExW( wine_fonts_cache_key, buffer, 0, KEY_ALL_ACCESS, &hkey_family ); - TRACE("opened family key %s\n", debugstr_w(buffer)); - size = sizeof(second_name); - if (RegQueryValueExW( hkey_family, NULL, NULL, NULL, (BYTE *)second_name, &size )) + if (!(hkey_family = reg_open_key( wine_fonts_cache_key, enum_info->Name, + enum_info->NameLength ))) + continue; + TRACE( "opened family key %s\n", debugstr_wn(enum_info->Name, enum_info->NameLength / sizeof(WCHAR)) ); + if (!query_reg_value( hkey_family, NULL, info, sizeof(buffer) )) second_name[0] = 0; family = create_family( buffer, second_name ); load_face_from_cache( hkey_family, family, buffer, sizeof(buffer), TRUE ); - RegCloseKey( hkey_family ); + NtClose( hkey_family ); release_family( family ); - size = sizeof(buffer); } } -- 2.23.0

1 0

[PATCH v2 05/10] gdi32: Directly use ntdll in load_face_from_cache.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b78e5947f5e..a8de47a2b59 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1136,19 +1136,21 @@ struct cached_face static void load_face_from_cache( HKEY hkey_family, struct gdi_font_family *family, void *buffer, DWORD buffer_size, BOOL scalable ) { - DWORD type, size, needed, index = 0; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + KEY_NODE_INFORMATION *node_info = (KEY_NODE_INFORMATION *)buffer; + DWORD index = 0, total_size; struct gdi_font_face *face; HKEY hkey_strike; WCHAR name[256]; - struct cached_face *cached = (struct cached_face *)buffer; + struct cached_face *cached; - size = sizeof(name); - needed = buffer_size - sizeof(DWORD); - while (!RegEnumValueW( hkey_family, index++, name, &size, NULL, &type, buffer, &needed )) + while (reg_enum_value( hkey_family, index++, info, + buffer_size - sizeof(DWORD), name, sizeof(name) )) { - if (type == REG_BINARY && needed > sizeof(*cached)) + cached = (struct cached_face *)((char *)info + info->DataOffset); + if (info->Type == REG_BINARY && info->DataLength > sizeof(*cached)) { - ((DWORD *)buffer)[needed / sizeof(DWORD)] = 0; + ((DWORD *)cached)[info->DataLength / sizeof(DWORD)] = 0; if ((face = create_face( family, name, cached->full_name, cached->full_name + lstrlenW(cached->full_name) + 1, NULL, 0, cached->index, cached->fs, cached->ntmflags, cached->version, @@ -1167,22 +1169,19 @@ static void load_face_from_cache( HKEY hkey_family, struct gdi_font_family *fami release_face( face ); } } - size = sizeof(name); - needed = buffer_size - sizeof(DWORD); } /* load bitmap strikes */ index = 0; - needed = buffer_size; - while (!RegEnumKeyExW( hkey_family, index++, buffer, &needed, NULL, NULL, NULL, NULL )) + while (!NtEnumerateKey( hkey_family, index++, KeyNodeInformation, node_info, + buffer_size, &total_size )) { - if (!RegOpenKeyExW( hkey_family, buffer, 0, KEY_ALL_ACCESS, &hkey_strike )) + if ((hkey_strike = reg_open_key( hkey_family, node_info->Name, node_info->NameLength ))) { load_face_from_cache( hkey_strike, family, buffer, buffer_size, FALSE ); - RegCloseKey( hkey_strike ); + NtClose( hkey_strike ); } - needed = buffer_size; } } -- 2.23.0

1 0

[PATCH v2 04/10] gdi32: Directly use ntdll in add_face_to_cache.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c91ce3c8792..b78e5947f5e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -467,6 +467,31 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, + DWORD options, DWORD *disposition ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + return ret; +} + +static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void *value, DWORD count ) +{ + unsigned int name_size = lstrlenW( name ) * sizeof(WCHAR); + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + NtSetValueKey( hkey, &nameW, 0, type, value, count ); +} + static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORMATION *info, ULONG size, WCHAR *name, ULONG name_size ) { @@ -1193,21 +1218,22 @@ static void add_face_to_cache( struct gdi_font_face *face ) DWORD len, buffer[1024]; struct cached_face *cached = (struct cached_face *)buffer; - if (RegCreateKeyExW( wine_fonts_cache_key, face->family->family_name, 0, NULL, REG_OPTION_VOLATILE, - KEY_ALL_ACCESS, NULL, &hkey_family, NULL )) + if (!(hkey_family = reg_create_key( wine_fonts_cache_key, face->family->family_name, + lstrlenW( face->family->family_name ) * sizeof(WCHAR), + REG_OPTION_VOLATILE, NULL ))) return; if (face->family->second_name[0]) - RegSetValueExW( hkey_family, NULL, 0, REG_SZ, (BYTE *)face->family->second_name, - (lstrlenW( face->family->second_name ) + 1) * sizeof(WCHAR) ); + set_reg_value( hkey_family, NULL, REG_SZ, face->family->second_name, + (lstrlenW( face->family->second_name ) + 1) * sizeof(WCHAR) ); if (!face->scalable) { WCHAR name[10]; swprintf( name, ARRAY_SIZE(name), L"%d", face->size.y_ppem ); - RegCreateKeyExW( hkey_family, name, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, - NULL, &hkey_face, NULL); + hkey_face = reg_create_key( hkey_family, name, lstrlenW( name ) * sizeof(WCHAR), + REG_OPTION_VOLATILE, NULL ); } else hkey_face = hkey_family; @@ -1223,11 +1249,11 @@ static void add_face_to_cache( struct gdi_font_face *face ) lstrcpyW( cached->full_name + len, face->file ); len += lstrlenW( face->file ) + 1; - RegSetValueExW( hkey_face, face->style_name, 0, REG_BINARY, (BYTE *)cached, - offsetof( struct cached_face, full_name[len] )); + set_reg_value( hkey_face, face->style_name, REG_BINARY, cached, + offsetof( struct cached_face, full_name[len] )); - if (hkey_face != hkey_family) RegCloseKey( hkey_face ); - RegCloseKey( hkey_family ); + if (hkey_face != hkey_family) NtClose( hkey_face ); + NtClose( hkey_family ); } static void remove_face_from_cache( struct gdi_font_face *face ) -- 2.23.0

1 0

[PATCH v2 03/10] gdi32: Directly use ntdll in load_gdi_font_replacements.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6af91da7869..c91ce3c8792 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -792,21 +792,24 @@ static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace */ static void load_gdi_font_replacements(void) { + char buffer[2048]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; HKEY hkey; - DWORD i = 0, type, dlen, vlen; - WCHAR value[LF_FACESIZE], data[1024]; + DWORD i = 0; + WCHAR value[LF_FACESIZE]; + + static const WCHAR replacementsW[] = {'R','e','p','l','a','c','e','m','e','n','t','s'}; /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ - if (RegOpenKeyW( wine_fonts_key, L"Replacements", &hkey )) return; + if (!(hkey = reg_open_key( wine_fonts_key, replacementsW, sizeof(replacementsW) ))) return; - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)data, &dlen )) + while (reg_enum_value( hkey, i++, info, sizeof(buffer), value, sizeof(value) )) { + WCHAR *data = (WCHAR *)((char *)info + info->DataOffset); /* "NewName"="Oldname" */ if (!find_family_from_any_name( value )) { - if (type == REG_MULTI_SZ) + if (info->Type == REG_MULTI_SZ) { WCHAR *replace = data; while (*replace) @@ -815,15 +818,11 @@ static void load_gdi_font_replacements(void) replace += lstrlenW(replace) + 1; } } - else if (type == REG_SZ) add_family_replacement( value, data ); + else if (info->Type == REG_SZ) add_family_replacement( value, data ); } else TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); - - /* reset dlen and vlen */ - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); } - RegCloseKey( hkey ); + NtClose( hkey ); } static void dump_gdi_font_list(void) -- 2.23.0

1 0

[PATCH v2 02/10] gdi32: Directly use ntdll in load_gdi_font_subst.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 54 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3ba84b10955..6af91da7869 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,17 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR font_substitutes_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s',' ','N','T', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','F','o','n','t','S','u','b','s','t','i','t','u','t','e','s' +}; + static const WCHAR font_assoc_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -456,6 +467,24 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORMATION *info, + ULONG size, WCHAR *name, ULONG name_size ) +{ + ULONG full_size; + + if (NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + info, size, &full_size )) + return FALSE; + + if (name_size) + { + if (name_size < info->NameLength + sizeof(WCHAR)) return FALSE; + memcpy( name, info->Name, info->NameLength ); + name[info->NameLength / sizeof(WCHAR)] = 0; + } + return TRUE; +} + static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) { char buffer[4096]; @@ -541,20 +570,23 @@ static BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const static void load_gdi_font_subst(void) { + char buffer[512]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; HKEY hkey; - DWORD i = 0, type, dlen, vlen; - WCHAR value[64], data[64], *p; + DWORD i = 0; + WCHAR *data, *p, value[64]; - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", - &hkey)) return; + if (!(hkey = reg_open_key( NULL, font_substitutes_keyW, sizeof(font_substitutes_keyW) ))) + return; - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)data, &dlen )) + while (reg_enum_value( hkey, i++, info, sizeof(buffer), value, sizeof(value) )) { int from_charset = -1, to_charset = -1; - TRACE("Got %s=%s\n", debugstr_w(value), debugstr_w(data)); + if (info->Type != REG_SZ) continue; + data = (WCHAR *)((char *)info + info->DataOffset); + + TRACE( "Got %s=%s\n", debugstr_w(value), debugstr_w(data) ); if ((p = wcsrchr( value, ',' )) && p[1]) { *p++ = 0; @@ -570,12 +602,8 @@ static void load_gdi_font_subst(void) or mapping of DEFAULT_CHARSET */ if ((!from_charset || to_charset == from_charset) && to_charset != DEFAULT_CHARSET) add_gdi_font_subst( value, from_charset, data, to_charset ); - - /* reset dlen and vlen */ - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); } - RegCloseKey( hkey ); + NtClose( hkey ); } /* font families */ -- 2.23.0

1 0

[PATCH v2 01/10] gdi32: Directly use ntdll instead of RegDeleteTreeW.
by Huw Davies 23 Sep '21

23 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 11cec6b95ae..3ba84b10955 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,16 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR font_assoc_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','F','o','n','t','A','s','s','o','c' +}; + static UINT font_smoothing = GGO_BITMAP; static UINT subpixel_orientation = GGO_GRAY4_BITMAP; static BOOL antialias_fakes = TRUE; @@ -429,6 +439,41 @@ static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) if (file) lstrcatW( path, file ); } +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) +{ + char buffer[4096]; + KEY_NODE_INFORMATION *key_info = (KEY_NODE_INFORMATION *)buffer; + DWORD size; + HKEY key; + BOOL ret = TRUE; + + if (!(key = reg_open_key( parent, name, name_len ))) return FALSE; + + while (ret && !NtEnumerateKey( key, 0, KeyNodeInformation, key_info, sizeof(buffer), &size )) + ret = reg_delete_tree( key, key_info->Name, key_info->NameLength ); + + if (ret) ret = !NtDeleteKey( key ); + NtClose( key ); + return ret; +} + /* font substitutions */ struct gdi_font_subst @@ -2373,7 +2418,7 @@ static void update_font_association_info(UINT current_ansi_codepage) } } else - RegDeleteTreeW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\FontAssoc"); + reg_delete_tree( NULL, font_assoc_keyW, sizeof(font_assoc_keyW) ); } static void set_multi_value_key(HKEY hkey, const WCHAR *name, const WCHAR *value, DWORD len) -- 2.23.0

1 0

[PATCH 10/10] gdi32: Directly use ntdll in update_font_association_info.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

1 0

[PATCH 09/10] gdi32: Directly use ntdll in add_font_list.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)

1 0

[PATCH 08/10] gdi32: Directly use ntdll in load_system_links.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)

1 0

[PATCH 06/10] gdi32: Directly use ntdll in load_font_list_from_cache.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-)

1 0

[PATCH 05/10] gdi32: Directly use ntdll in load_face_from_cache.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)

1 0

[PATCH 04/10] gdi32: Directly use ntdll in add_face_to_cache.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-)

1 0

[PATCH 03/10] gdi32: Directly use ntdll in load_gdi_font_replacements.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)

1 0

[PATCH 02/10] gdi32: Directly use ntdll in load_gdi_font_subst.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 54 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 13 deletions(-)

1 0

[PATCH 01/10] gdi32: Directly use ntdll instead of RegDeleteTreeW.
by Jacek Caban 23 Sep '21

23 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6] joy.cpl: Use msvcrt memory allocation functions.
by Rémi Bernon 23 Sep '21

23 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- A bit of cleanup and improvements to joy.cpl to ultimately make it possible to override XInput / DInput HID device association with the registry DirectInput settings, and have it configurable through the control panel. dlls/joy.cpl/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3ea417843f4..226f36051a6 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -112,7 +112,7 @@ static void initialize_joysticks(struct JoystickData *data) data->num_joysticks = 0; data->cur_joystick = 0; IDirectInput8_EnumDevices(data->di, DI8DEVCLASS_GAMECTRL, enum_callback, data, DIEDFL_ATTACHEDONLY); - data->joysticks = HeapAlloc(GetProcessHeap(), 0, sizeof(struct Joystick) * data->num_joysticks); + data->joysticks = malloc(sizeof(struct Joystick) * data->num_joysticks); /* Get all the joysticks */ IDirectInput8_EnumDevices(data->di, DI8DEVCLASS_GAMECTRL, enum_callback, data, DIEDFL_ATTACHEDONLY); @@ -134,14 +134,14 @@ static void destroy_joysticks(struct JoystickData *data) if (data->joysticks[i].effects[j].effect) IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); - HeapFree(GetProcessHeap(), 0, data->joysticks[i].effects); + free(data->joysticks[i].effects); } IDirectInputDevice8_Unacquire(data->joysticks[i].device); IDirectInputDevice8_Release(data->joysticks[i].device); } - HeapFree(GetProcessHeap(), 0, data->joysticks); + free(data->joysticks); } static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data) @@ -823,7 +823,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp joy->num_effects = 0; joy->effects = NULL; IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void *) joy, 0); - joy->effects = HeapAlloc(GetProcessHeap(), 0, sizeof(struct Effect) * joy->num_effects); + joy->effects = malloc(sizeof(struct Effect) * joy->num_effects); joy->cur_effect = 0; IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void*) joy, 0); -- 2.33.0

1 5

[PATCH 01/11] jscript: Return the failure code if the value invoke failed.
by Gabriel Ivăncescu 23 Sep '21

23 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is needed for the mshtml builtin object behavior tests later to pass correctly (the `f(document, ["style"]);` test). It makes no sense to ignore it anyway. dlls/jscript/dispex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e5d711a..c7e4ba9 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2143,6 +2143,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W if(args != buf) heap_free(args); + if(FAILED(hres)) + return hres; if(!r) return S_OK; -- 2.31.1

3 29

[PATCH 1/3] ole32/tests: Add extendable tests for generic composite simplification.
by Nikolay Sivov 23 Sep '21

23 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 167 +++++++++++++++++++++---------------- 1 file changed, 96 insertions(+), 71 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index ef1d3869b63..5042f24320b 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -68,15 +68,6 @@ DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0); DEFINE_OLEGUID(CLSID_ClassMoniker, 0x31a, 0, 0); DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); -#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) -static void _expect_ref(IUnknown* obj, ULONG ref, int line) -{ - ULONG refcount; - IUnknown_AddRef(obj); - refcount = IUnknown_Release(obj); - ok_(__FILE__, line)(refcount == ref, "Unexpected got %u.\n", refcount); -} - #define TEST_MONIKER_TYPE_TODO(m,t) _test_moniker_type(m, t, TRUE, __LINE__) #define TEST_MONIKER_TYPE(m,t) _test_moniker_type(m, t, FALSE, __LINE__) static void _test_moniker_type(IMoniker *moniker, DWORD type, BOOL todo, int line) @@ -2902,9 +2893,65 @@ todo_wine IMoniker_Release(moniker2); } +static HRESULT create_moniker_from_desc(const char *desc, unsigned int *eaten, + IMoniker **moniker) +{ + IMoniker *left, *right; + WCHAR nameW[3]; + HRESULT hr; + + desc += *eaten; + + switch (*desc) + { + case 'I': + nameW[0] = desc[0]; + nameW[1] = desc[1]; + nameW[2] = 0; + *eaten += 2; + return CreateItemMoniker(L"!", nameW, moniker); + case 'A': + *eaten += 2; + *moniker = create_antimoniker(desc[1] - '0'); + return S_OK; + case 'C': + (*eaten)++; + hr = create_moniker_from_desc(desc, eaten, &left); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = create_moniker_from_desc(desc, eaten, &right); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CreateGenericComposite(left, right, moniker); + IMoniker_Release(left); + IMoniker_Release(right); + return hr; + default: + ok(0, "Unexpected description %s.\n", desc); + return E_NOTIMPL; + } +} + static void test_generic_composite_moniker(void) { - IMoniker *moniker, *inverse, *inverse2, *moniker1, *moniker2, *moniker3, *moniker4; + static const struct simplify_test + { + const char *left; + const char *right; + unsigned int result_type; + const WCHAR *name; + } + simplify_tests[] = + { + { "I1", "I2", MKSYS_GENERICCOMPOSITE, L"!I1!I2" }, + { "I1", "A2", MKSYS_ANTIMONIKER, L"\\.." }, + { "A1", "A1", MKSYS_GENERICCOMPOSITE, L"\\..\\.." }, + { "A2", "A1", MKSYS_GENERICCOMPOSITE, L"\\..\\..\\.." }, + { "CI1I2", "A1", MKSYS_ITEMMONIKER, L"!I1" }, + { "I1", "A1", MKSYS_NONE }, + { "CI1I2", "A2", MKSYS_NONE }, + { "CI1I2", "A3", MKSYS_ANTIMONIKER, L"\\.." }, + { "CI1I3", "CA1I2", MKSYS_GENERICCOMPOSITE, L"!I1!I2" }, + }; + IMoniker *moniker, *inverse, *moniker1, *moniker2; IEnumMoniker *enummoniker; IRunningObjectTable *rot; DWORD hash, cookie; @@ -2915,84 +2962,62 @@ static void test_generic_composite_moniker(void) IROTData *rotdata; IMarshal *marshal; IStream *stream; + unsigned int i; WCHAR *str; ULONG len; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); - hr = CreateItemMoniker(L"!", L"Test", &moniker1); - ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); - hr = CreateItemMoniker(L"#", L"Wine", &moniker2); - ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); - hr = CreateGenericComposite(moniker1, moniker2, &moniker); - ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(simplify_tests); ++i) + { + IMoniker *left, *right, *composite = NULL; + unsigned int moniker_type, eaten; + WCHAR *name; - /* Compose with itself. */ - EXPECT_REF(moniker1, 2); - hr = CreateGenericComposite(moniker1, moniker1, &moniker); - ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); - EXPECT_REF(moniker1, 4); - TEST_MONIKER_TYPE(moniker, MKSYS_GENERICCOMPOSITE); - IMoniker_Release(moniker); + winetest_push_context("simplify[%u]", i); - /* (I) + (A) -> () */ - hr = IMoniker_Inverse(moniker1, &inverse); - ok(hr == S_OK, "Failed to invert, hr %#x.\n", hr); - hr = CreateGenericComposite(moniker1, inverse, &moniker); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!moniker, "Unexpected pointer.\n"); + eaten = 0; + hr = create_moniker_from_desc(simplify_tests[i].left, &eaten, &left); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + eaten = 0; + hr = create_moniker_from_desc(simplify_tests[i].right, &eaten, &right); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CreateGenericComposite(left, right, &composite); + ok(hr == S_OK, "Failed to create a composite, hr %#x.\n", hr); - /* (I1,I2) + (A,A) -> (I1,I2+A,A) -> (I1,A) -> () */ - hr = CreateGenericComposite(moniker1, moniker2, &moniker); - ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); - hr = CreateGenericComposite(inverse, inverse, &moniker3); - ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); - TEST_MONIKER_TYPE(moniker3, MKSYS_GENERICCOMPOSITE); + if (composite) + { + hr = IMoniker_IsSystemMoniker(composite, &moniker_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(moniker_type == simplify_tests[i].result_type, "Unexpected result type %u.\n", moniker_type); - hr = CreateGenericComposite(moniker, moniker3, &moniker4); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!moniker4, "Unexpected pointer.\n"); + hr = IMoniker_GetDisplayName(composite, bindctx, NULL, &name); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(name, simplify_tests[i].name), "Unexpected result name %s.\n", wine_dbgstr_w(name)); + CoTaskMemFree(name); - IMoniker_Release(moniker); - IMoniker_Release(moniker3); + IMoniker_Release(composite); + } + else + ok(simplify_tests[i].result_type == MKSYS_NONE, "Unexpected result type.\n"); - /* (I1,I2) + (A2,A) -> (I1,I2+A2,A) -> (I1,A,A) -> (I1+A,A) -> (A) */ - hr = CreateGenericComposite(moniker1, moniker2, &moniker); - ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); - ok(!!moniker, "Unexpected pointer.\n"); - inverse2 = create_antimoniker(2); - hr = CreateGenericComposite(inverse2, inverse, &moniker3); - ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); - ok(!!moniker3, "Unexpected pointer.\n"); - IMoniker_Release(inverse2); + winetest_pop_context(); - hr = CreateGenericComposite(moniker, moniker3, &moniker4); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - TEST_MONIKER_TYPE(moniker4, MKSYS_ANTIMONIKER); - IMoniker_Release(moniker4); - IMoniker_Release(moniker); - IMoniker_Release(moniker3); + IMoniker_Release(left); + IMoniker_Release(right); + } - /* (I1,I2) + (A,I2) -> (I1,I2+A,I2) -> (I1,I2) */ + hr = CreateItemMoniker(L"!", L"Test", &moniker1); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + hr = CreateItemMoniker(L"#", L"Wine", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); hr = CreateGenericComposite(moniker1, moniker2, &moniker); - ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); - ok(!!moniker, "Unexpected pointer.\n"); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); - hr = CreateGenericComposite(inverse, moniker2, &moniker3); + hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); - ok(!!moniker3, "Unexpected pointer.\n"); - - hr = CreateGenericComposite(moniker, moniker3, &moniker4); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - TEST_MONIKER_TYPE(moniker4, MKSYS_GENERICCOMPOSITE); - - TEST_DISPLAY_NAME(moniker4, L"!Test#Wine"); - - IMoniker_Release(moniker4); - IMoniker_Release(moniker3); - - IMoniker_Release(inverse); + TEST_MONIKER_TYPE(moniker, MKSYS_GENERICCOMPOSITE); /* Generic composite is special, as it does not addref in this case. */ hr = IMoniker_QueryInterface(moniker, &CLSID_CompositeMoniker, (void **)&unknown); -- 2.33.0

1 2

[PATCH 1/8] dinput: Check data format dwObjSize in IDirectInputDevice2WImpl_SetDataFormat.
by Rémi Bernon 23 Sep '21

23 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 1 + dlls/dinput8/tests/hid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 17eaff69d50..2a3ed391919 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1094,6 +1094,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W ifac _dump_DIDATAFORMAT(df); if (df->dwSize != sizeof(DIDATAFORMAT)) return DIERR_INVALIDPARAM; + if (df->dwObjSize != sizeof(DIOBJECTDATAFORMAT)) return DIERR_INVALIDPARAM; if (This->acquired) return DIERR_ACQUIRED; EnterCriticalSection(&This->crit); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 371edc99251..e017e048a30 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4015,7 +4015,6 @@ static void test_simple_joystick(void) ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); dataformat.dwSize = sizeof(DIDATAFORMAT); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); dataformat.dwObjSize = sizeof(DIOBJECTDATAFORMAT); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); -- 2.33.0

1 7

[PATCH 1/5] winebus.sys: Factor out HID report buffers allocation.
by Rémi Bernon 23 Sep '21

23 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 44 ++++++++----------------- dlls/winebus.sys/bus_udev.c | 58 ++++++++------------------------- dlls/winebus.sys/hid.c | 27 ++++++++++++++- dlls/winebus.sys/unix_private.h | 6 ++++ 4 files changed, 59 insertions(+), 76 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index e6b67fae3c0..6adb0fe913d 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -123,9 +123,6 @@ struct sdl_device SDL_GameController *sdl_controller; SDL_JoystickID id; - int buffer_length; - BYTE *report_buffer; - SDL_Haptic *sdl_haptic; int haptic_effect_id; }; @@ -153,8 +150,8 @@ static void set_button_value(struct sdl_device *impl, int index, int value) int bit_index = index % 8; BYTE mask = 1 << bit_index; if (index >= state->button_count) return; - if (value) impl->report_buffer[byte_index] |= mask; - else impl->report_buffer[byte_index] &= ~mask; + if (value) state->report_buf[byte_index] |= mask; + else state->report_buf[byte_index] &= ~mask; } static void set_axis_value(struct sdl_device *impl, int index, short value) @@ -163,7 +160,7 @@ static void set_axis_value(struct sdl_device *impl, int index, short value) USHORT offset = state->abs_axis_start; if (index >= state->abs_axis_count) return; offset += index * sizeof(DWORD); - *(DWORD *)&impl->report_buffer[offset] = LE_DWORD(value); + *(DWORD *)&state->report_buf[offset] = LE_DWORD(value); } static void set_ball_value(struct sdl_device *impl, int index, int value1, int value2) @@ -172,8 +169,8 @@ static void set_ball_value(struct sdl_device *impl, int index, int value1, int v USHORT offset = state->rel_axis_start; if (index >= state->rel_axis_count) return; offset += index * sizeof(DWORD); - *(DWORD *)&impl->report_buffer[offset] = LE_DWORD(value1); - *(DWORD *)&impl->report_buffer[offset + sizeof(DWORD)] = LE_DWORD(value2); + *(DWORD *)&state->report_buf[offset] = LE_DWORD(value1); + *(DWORD *)&state->report_buf[offset + sizeof(DWORD)] = LE_DWORD(value2); } static void set_hat_value(struct sdl_device *impl, int index, int value) @@ -202,7 +199,7 @@ static void set_hat_value(struct sdl_device *impl, int index, int value) default: return; } - impl->report_buffer[offset] = val; + state->report_buf[offset] = val; } static BOOL descriptor_add_haptic(struct sdl_device *impl) @@ -287,9 +284,6 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) if (!hid_device_end_report_descriptor(iface)) return STATUS_NO_MEMORY; - impl->buffer_length = iface->hid_device_state.report_len; - if (!(impl->report_buffer = calloc(1, impl->buffer_length))) goto failed; - /* Initialize axis in the report */ for (i = 0; i < axis_count; i++) set_axis_value(impl, i, pSDL_JoystickGetAxis(impl->sdl_joystick, i)); @@ -297,10 +291,6 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) set_hat_value(impl, i, pSDL_JoystickGetHat(impl->sdl_joystick, i)); return STATUS_SUCCESS; - -failed: - free(impl->report_buffer); - return STATUS_NO_MEMORY; } static SHORT compose_dpad_value(SDL_GameController *joystick) @@ -366,19 +356,12 @@ static NTSTATUS build_controller_report_descriptor(struct unix_device *iface) if (!hid_device_end_report_descriptor(iface)) return STATUS_NO_MEMORY; - impl->buffer_length = impl->unix_device.hid_device_state.report_len; - if (!(impl->report_buffer = calloc(1, impl->buffer_length))) goto failed; - /* Initialize axis in the report */ for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) set_axis_value(impl, i, pSDL_GameControllerGetAxis(impl->sdl_controller, i)); set_hat_value(impl, 0, compose_dpad_value(impl->sdl_controller)); return STATUS_SUCCESS; - -failed: - free(impl->report_buffer); - return STATUS_NO_MEMORY; } static void sdl_device_destroy(struct unix_device *iface) @@ -477,6 +460,7 @@ static const struct hid_device_vtbl sdl_device_vtbl = static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *event) { struct unix_device *iface = &impl->unix_device; + struct hid_device_state *state = &iface->hid_device_state; if (impl->sdl_controller) return TRUE; /* use controller events instead */ @@ -488,8 +472,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e SDL_JoyButtonEvent *ie = &event->jbutton; set_button_value(impl, ie->button, ie->state); - - bus_event_queue_input_report(&event_queue, iface, impl->report_buffer, impl->buffer_length); + bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); break; } case SDL_JOYAXISMOTION: @@ -499,7 +482,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e if (ie->axis < 6) { set_axis_value(impl, ie->axis, ie->value); - bus_event_queue_input_report(&event_queue, iface, impl->report_buffer, impl->buffer_length); + bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); } break; } @@ -508,7 +491,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e SDL_JoyBallEvent *ie = &event->jball; set_ball_value(impl, ie->ball, ie->xrel, ie->yrel); - bus_event_queue_input_report(&event_queue, iface, impl->report_buffer, impl->buffer_length); + bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); break; } case SDL_JOYHATMOTION: @@ -516,7 +499,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e SDL_JoyHatEvent *ie = &event->jhat; set_hat_value(impl, ie->hat, ie->value); - bus_event_queue_input_report(&event_queue, iface, impl->report_buffer, impl->buffer_length); + bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); break; } default: @@ -528,6 +511,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e static BOOL set_report_from_controller_event(struct sdl_device *impl, SDL_Event *event) { struct unix_device *iface = &impl->unix_device; + struct hid_device_state *state = &iface->hid_device_state; switch(event->type) { @@ -555,7 +539,7 @@ static BOOL set_report_from_controller_event(struct sdl_device *impl, SDL_Event } set_button_value(impl, button, ie->state); - bus_event_queue_input_report(&event_queue, iface, impl->report_buffer, impl->buffer_length); + bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); break; } case SDL_CONTROLLERAXISMOTION: @@ -563,7 +547,7 @@ static BOOL set_report_from_controller_event(struct sdl_device *impl, SDL_Event SDL_ControllerAxisEvent *ie = &event->caxis; set_axis_value(impl, ie->axis, ie->value); - bus_event_queue_input_report(&event_queue, iface, impl->report_buffer, impl->buffer_length); + bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); break; } default: diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 9f3b731364d..cd7eadf7ec0 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -122,11 +122,6 @@ struct lnxev_device { struct base_device base; - int buffer_length; - BYTE *last_report_buffer; - BYTE *current_report_buffer; - enum { FIRST, NORMAL, DROPPED } report_state; - BYTE abs_map[HID_ABS_MAX]; BYTE rel_map[HID_REL_MAX]; BYTE hat_map[8]; @@ -338,8 +333,8 @@ static void set_button_value(struct lnxev_device *impl, int index, int value) int bit_index = index % 8; BYTE mask = 1 << bit_index; if (index >= state->button_count) return; - if (value) impl->current_report_buffer[byte_index] |= mask; - else impl->current_report_buffer[byte_index] &= ~mask; + if (value) state->report_buf[byte_index] |= mask; + else state->report_buf[byte_index] &= ~mask; } static void set_abs_axis_value(struct lnxev_device *impl, int code, int value) @@ -387,7 +382,7 @@ static void set_abs_axis_value(struct lnxev_device *impl, int code, int value) offset = state->hatswitch_start; if (index >= state->hatswitch_count) return; offset += index; - impl->current_report_buffer[offset] = value; + state->report_buf[offset] = value; } else if (code < HID_ABS_MAX && ABS_TO_HID_MAP[code][0] != 0) { @@ -395,7 +390,7 @@ static void set_abs_axis_value(struct lnxev_device *impl, int code, int value) offset = state->abs_axis_start; if (index >= state->abs_axis_count) return; offset += index * sizeof(DWORD); - *(DWORD *)&impl->current_report_buffer[offset] = LE_DWORD(value); + *(DWORD *)&state->report_buf[offset] = LE_DWORD(value); } } @@ -409,7 +404,7 @@ static void set_rel_axis_value(struct lnxev_device *impl, int code, int value) offset = state->rel_axis_start; if (index >= state->rel_axis_count) return; offset += index * sizeof(DWORD); - *(DWORD *)&impl->current_report_buffer[offset] = LE_DWORD(value); + *(DWORD *)&state->report_buf[offset] = LE_DWORD(value); } } @@ -530,48 +525,25 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d if (!hid_device_end_report_descriptor(iface)) return STATUS_NO_MEMORY; - impl->buffer_length = iface->hid_device_state.report_len; - if (!(impl->current_report_buffer = calloc(1, impl->buffer_length))) goto failed; - if (!(impl->last_report_buffer = calloc(1, impl->buffer_length))) goto failed; - impl->report_state = FIRST; - /* Initialize axis in the report */ for (i = 0; i < HID_ABS_MAX; i++) if (test_bit(absbits, i)) set_abs_axis_value(impl, i, abs_info[i].value); return STATUS_SUCCESS; - -failed: - free(impl->current_report_buffer); - free(impl->last_report_buffer); - return STATUS_NO_MEMORY; } -static BOOL set_report_from_event(struct lnxev_device *impl, struct input_event *ie) +static BOOL set_report_from_event(struct unix_device *iface, struct input_event *ie) { + struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); switch(ie->type) { #ifdef EV_SYN case EV_SYN: switch (ie->code) { - case SYN_REPORT: - if (impl->report_state == NORMAL) - { - memcpy(impl->last_report_buffer, impl->current_report_buffer, impl->buffer_length); - return TRUE; - } - else - { - if (impl->report_state == DROPPED) - memcpy(impl->current_report_buffer, impl->last_report_buffer, impl->buffer_length); - impl->report_state = NORMAL; - } - break; - case SYN_DROPPED: - TRACE_(hid_report)("received SY_DROPPED\n"); - impl->report_state = DROPPED; + case SYN_REPORT: return hid_device_sync_report(iface); + case SYN_DROPPED: hid_device_drop_report(iface); break; } return FALSE; #endif @@ -785,10 +757,6 @@ static const struct raw_device_vtbl hidraw_device_vtbl = static void lnxev_device_destroy(struct unix_device *iface) { struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); - - free(impl->current_report_buffer); - free(impl->last_report_buffer); - udev_device_unref(impl->base.udev_device); } @@ -818,20 +786,20 @@ static void lnxev_device_stop(struct unix_device *iface) static void lnxev_device_read_report(struct unix_device *iface) { + struct hid_device_state *state = &iface->hid_device_state; struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); struct input_event ie; int size; - if (!impl->current_report_buffer || impl->buffer_length == 0) - return; + if (!state->report_buf || !state->report_len) return; size = read(impl->base.device_fd, &ie, sizeof(ie)); if (size == -1) TRACE_(hid_report)("Read failed. Likely an unplugged device\n"); else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); - else if (set_report_from_event(impl, &ie)) - bus_event_queue_input_report(&event_queue, iface, impl->current_report_buffer, impl->buffer_length); + else if (set_report_from_event(iface, &ie)) + bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); } static void lnxev_device_set_output_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index acf0c52cfa8..ba49c010532 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -89,12 +89,15 @@ BOOL hid_device_begin_report_descriptor(struct unix_device *iface, USAGE usage_p BOOL hid_device_end_report_descriptor(struct unix_device *iface) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; + struct hid_device_state *state = &iface->hid_device_state; static const BYTE template[] = { END_COLLECTION, }; - iface->hid_device_state.report_len = (iface->hid_device_state.bit_size + 7) / 8; + state->report_len = (state->bit_size + 7) / 8; + if (!(state->report_buf = calloc(1, state->report_len))) return FALSE; + if (!(state->last_report_buf = calloc(1, state->report_len))) return FALSE; return hid_report_descriptor_append(desc, template, sizeof(template)); } @@ -307,6 +310,8 @@ static void hid_device_destroy(struct unix_device *iface) { iface->hid_vtbl->destroy(iface); free(iface->hid_report_descriptor.data); + free(iface->hid_device_state.report_buf); + free(iface->hid_device_state.last_report_buf); } static NTSTATUS hid_device_start(struct unix_device *iface) @@ -363,3 +368,23 @@ void *hid_device_create(const struct hid_device_vtbl *vtbl, SIZE_T size) return impl; } + +BOOL hid_device_sync_report(struct unix_device *iface) +{ + BOOL dropped; + + if (!(dropped = iface->hid_device_state.dropped)) + memcpy(iface->hid_device_state.last_report_buf, iface->hid_device_state.report_buf, + iface->hid_device_state.report_len); + else + memcpy(iface->hid_device_state.report_buf, iface->hid_device_state.last_report_buf, + iface->hid_device_state.report_len); + iface->hid_device_state.dropped = FALSE; + + return !dropped; +} + +void hid_device_drop_report(struct unix_device *iface) +{ + iface->hid_device_state.dropped = TRUE; +} diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index ec0568faa6f..dbec779c67e 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -69,6 +69,9 @@ struct hid_device_state USHORT button_start; USHORT button_count; USHORT report_len; + BYTE *report_buf; + BYTE *last_report_buf; + BOOL dropped; }; struct unix_device @@ -116,6 +119,9 @@ extern BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usa extern BOOL hid_device_add_haptics(struct unix_device *iface) DECLSPEC_HIDDEN; +extern BOOL hid_device_sync_report(struct unix_device *iface) DECLSPEC_HIDDEN; +extern void hid_device_drop_report(struct unix_device *iface) DECLSPEC_HIDDEN; + BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; #endif /* __WINEBUS_UNIX_PRIVATE_H */ -- 2.33.0

1 4

[PATCH v4] gdi32: Add a semi-stub for D3DKMTOpenAdapterFromDeviceName().
by Paul Gofman 23 Sep '21

23 Sep '21

Fixes non functional setting page in Resident Evil Village. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/driver.c | 20 ++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/Makefile.in | 2 +- dlls/gdi32/tests/driver.c | 99 ++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 1 + 5 files changed, 122 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f4a9b09eae5..09e369bf27f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -989,6 +989,26 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) return status; } +/****************************************************************************** + * NtGdiDdDDIOpenAdapterFromDeviceName (win32u.@) + */ +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ) +{ + D3DKMT_OPENADAPTERFROMLUID desc_luid; + NTSTATUS status; + + FIXME( "desc %p stub.\n", desc ); + + if (!desc || !desc->pDeviceName) return STATUS_INVALID_PARAMETER; + + memset( &desc_luid, 0, sizeof( desc_luid )); + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &desc_luid ))) return status; + + desc->AdapterLuid = desc_luid.AdapterLuid; + desc->hAdapter = desc_luid.hAdapter; + return STATUS_SUCCESS; +} + /****************************************************************************** * NtGdiDdDDIOpenAdapterFromLuid (win32u.@) */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6dbc8a9bf12..94a5cefdfa4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory @ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice @ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape +@ stdcall D3DKMTOpenAdapterFromDeviceName(ptr) NtGdiDdDDIOpenAdapterFromDeviceName @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc @ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 876f6a376a2..3eb478ff765 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = gdi32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = setupapi user32 gdi32 advapi32 C_SRCS = \ bitmap.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index eb0da18b32e..54144c44e1c 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -29,16 +29,22 @@ #include "winternl.h" #include "dwmapi.h" #include "ddk/d3dkmthk.h" +#include "initguid.h" +#include "setupapi.h" +#include "ntddvdeo.h" #include "wine/test.h" static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFROMDEVICENAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); @@ -789,6 +795,97 @@ static void test_D3DKMTCheckOcclusion(void) DestroyWindow(hwnd); } +static void test_D3DKMTOpenAdapterFromDeviceName_deviface(const GUID *devinterface_guid, + NTSTATUS expected_status, BOOL todo) +{ + BYTE iface_detail_buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + 256 * sizeof(WCHAR)]; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_data; + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DEVPROPTYPE type; + NTSTATUS status; + unsigned int i; + HDEVINFO set; + LUID luid; + BOOL ret; + + set = SetupDiGetClassDevsW(devinterface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed, error %u.\n", GetLastError()); + + iface_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_data->cbSize = sizeof(*iface_data); + device_name.pDeviceName = iface_data->DevicePath; + + i = 0; + while (SetupDiEnumDeviceInterfaces(set, NULL, devinterface_guid, i, &iface)) + { + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, iface_data, + sizeof(iface_detail_buffer), NULL, &device_data ); + ok(ret, "Got unexpected ret %d, GetLastError() %u.\n", ret, GetLastError()); + + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + todo_wine_if(todo) ok(status == expected_status, "Got status %#x, expected %#x.\n", status, expected_status); + + if (!status) + { + ret = SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0); + ok(ret || GetLastError() == ERROR_NOT_FOUND, "Got unexpected ret %d, GetLastError() %u.\n", + ret, GetLastError()); + + if (ret) + { + ret = RtlEqualLuid( &luid, &device_name.AdapterLuid); + todo_wine ok(ret, "Luid does not match.\n"); + } + else + { + skip("Luid not found.\n"); + } + + close_adapter_desc.hAdapter = device_name.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(!status, "Got unexpected status %#x.\n", status); + } + ++i; + } + if (!i) + win_skip("No devices found.\n"); + + SetupDiDestroyDeviceInfoList( set ); +} + +static void test_D3DKMTOpenAdapterFromDeviceName(void) +{ + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + NTSTATUS status; + + /* Make sure display devices are initialized. */ + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + + status = pD3DKMTOpenAdapterFromDeviceName(NULL); + if (status == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("D3DKMTOpenAdapterFromDeviceName() is not supported.\n"); + return; + } + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + memset(&device_name, 0, sizeof(device_name)); + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + winetest_push_context("GUID_DEVINTERFACE_DISPLAY_ADAPTER"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DEVINTERFACE_DISPLAY_ADAPTER, STATUS_INVALID_PARAMETER, TRUE); + winetest_pop_context(); + + winetest_push_context("GUID_DISPLAY_DEVICE_ARRIVAL"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DISPLAY_DEVICE_ARRIVAL, STATUS_SUCCESS, FALSE); + winetest_pop_context(); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -799,6 +896,7 @@ START_TEST(driver) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); + pD3DKMTOpenAdapterFromDeviceName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromDeviceName"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); @@ -814,6 +912,7 @@ START_TEST(driver) test_D3DKMTCheckVidPnExclusiveOwnership(); test_D3DKMTSetVidPnSourceOwner(); test_D3DKMTCheckOcclusion(); + test_D3DKMTOpenAdapterFromDeviceName(); FreeLibrary(dwmapi); } diff --git a/include/ntgdi.h b/include/ntgdi.h index e1f31a6bb9d..05fe0191f39 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -442,6 +442,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); NTSTATUS WINAPI NtGdiDdDDIEscape( const D3DKMT_ESCAPE *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromHdc( D3DKMT_OPENADAPTERFROMHDC *desc ); +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ); NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); -- 2.31.1

3 2

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-devel