- Wine-Devel - list.winehq.org

[PATCH] wininet: Handle empty expires for cookie setting.
by Jactry Zeng July 27, 2020

July 27, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wininet/cookie.c | 2 +- dlls/wininet/tests/internet.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1786b3d281..090653864a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -977,7 +977,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); - if(end_ptr - data.str < ARRAY_SIZE(buf)-1) { + if (data.str[0] && (end_ptr - data.str < ARRAY_SIZE(buf) - 1)) { memcpy(buf, data.str, data.len*sizeof(WCHAR)); buf[data.len] = 0; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e69b45a7e6..ef1adefd1a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -510,7 +510,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -524,16 +524,26 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", "A", buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); /* test persistent cookies */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + /* test invalid expires parameter */ + ret = InternetSetCookieA("http://testing.example.com", NULL, "Q=R; expires="); + ok(ret, "InternetSetCookie failed %#x.\n", GetLastError()); + len = 1024; + memset(buffer, 0xac, sizeof(buffer)); + ret = InternetGetCookieA("http://testing.example.com/", NULL, buffer, &len); + ok(ret, "InternetGetCookie failed %#x.\n", GetLastError()); + ok(len == 29, "got len %u.\n", len); + ok(!!strstr(buffer, "Q=R"), "cookie is not present.\n"); + len = sizeof(buffer); ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); - ok(ret, "got error %u\n", GetLastError()); - ok(len == 24, "got len %u\n", len); + ok(ret, "got error %#x\n", GetLastError()); + ok(len == 29, "got len %u\n", len); ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ -- 2.27.0

2 1

[PATCH 1/2] wbemprox/tests: Fix test failures.
by Gijs Vermeulen July 27, 2020

July 27, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wbemprox/tests/query.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index da47773da2..0fa091b739 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,8 +1144,10 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); IEnumWbemClassObject *result; IWbemClassObject *obj; - HRESULT hr; + CIMTYPE type; + VARIANT val; DWORD count; + HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) @@ -1154,21 +1156,39 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) return; } - hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - - if (count > 0) + for (;;) { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"BankLabel", VT_BSTR, CIM_STRING ); check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); - check_property( obj, L"PartNumber", VT_NULL, CIM_STRING ); - check_property( obj, L"SerialNumber", VT_NULL, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "PartNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "SerialNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); -- 2.27.0

2 3

[PATCH] sc.exe: Fake succes for the SdSet argument
by Louis Lenders July 27, 2020

July 27, 2020

https://bugs.winehq.org/show_bug.cgi?id=49620 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- programs/sc/sc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 1976c38a78..ad74cab74b 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,6 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR startW[] = {'s','t','a','r','t',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; + static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -328,6 +329,11 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } + else if (!wcsicmp( argv[1], sdsetW )) + { + WINE_FIXME("command not supported, just faking success for now\n"); + ret = TRUE; + } else WINE_FIXME("command not supported\n"); -- 2.28.0.rc2

1 0

[PATCH] fonts: Add initial version of Webdings font.
by Dmitry Timoshkov July 27, 2020

July 27, 2020

Some applications confusingly use Webdings instead of Marlett to draw non-client areas of their custom controls, this initial version of Webdings contains just a few glyphs copied from Marlett to make these apps happy. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/Makefile.in | 1 + fonts/webdings.sfd | 198 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 fonts/webdings.sfd diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 08c82646de..b802185198 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -10,4 +10,5 @@ FONT_SRCS = \ system.sfd \ tahoma.sfd \ tahomabd.sfd \ + webdings.sfd \ wingding.sfd diff --git a/fonts/webdings.sfd b/fonts/webdings.sfd new file mode 100644 index 0000000000..0a42dbe564 --- /dev/null +++ b/fonts/webdings.sfd @@ -0,0 +1,198 @@ +SplineFontDB: 3.0 +FontName: WineWebdings +FullName: Webdings +FamilyName: Webdings +Weight: Regular +Copyright: Copyright (C) 2020 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: 0 +UnderlineWidth: 0 +Ascent: 2048 +Descent: 0 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 0 +PfmFamily: 81 +TTFWeight: 500 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 0 0 0 0 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +Encoding: Symbol +Compacted: 1 +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -72 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 26 10 +TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 257 8 + +StartChar: f020 +Encoding: 0 61472 0 +AltUni2: 000000.ffffffff.0 +Width: 1024 +Flags: W +LayerCount: 2 +Fore +SplineSet +41 41 m 1,0,-1 + 819 41 l 1,1,-1 + 819 1324 l 1,2,-1 + 41 1324 l 1,3,-1 + 41 41 l 1,0,-1 +0 0 m 1,4,-1 + 0 1365 l 1,5,-1 + 860 1365 l 1,6,-1 + 860 0 l 1,7,-1 + 0 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: zero +Encoding: 48 48 1 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 256 m 1,0,-1 + 256 512 l 1,1,-1 + 1280 512 l 1,2,-1 + 1280 256 l 1,3,-1 + 256 256 l 1,0,-1 +EndSplineSet +EndChar + +StartChar: one +Encoding: 49 49 2 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 384 m 1,0,-1 + 1536 384 l 1,1,-1 + 1536 1408 l 1,2,-1 + 256 1408 l 1,3,-1 + 256 384 l 1,0,-1 +128 256 m 1,4,-1 + 128 1664 l 1,5,-1 + 1664 1664 l 1,6,-1 + 1664 256 l 1,7,-1 + 128 256 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: two +Encoding: 50 50 3 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +128 256 m 1,0,-1 + 128 1152 l 1,1,-1 + 512 1152 l 1,2,-1 + 512 1664 l 1,3,-1 + 1664 1664 l 1,4,-1 + 1664 768 l 1,5,-1 + 1280 768 l 1,6,-1 + 1280 256 l 1,7,-1 + 128 256 l 1,0,-1 +256 384 m 1,8,-1 + 1152 384 l 1,9,-1 + 1152 896 l 1,10,-1 + 256 896 l 1,11,-1 + 256 384 l 1,8,-1 +640 1152 m 1,12,-1 + 1280 1152 l 1,13,-1 + 1280 896 l 1,14,-1 + 1536 896 l 1,15,-1 + 1536 1408 l 1,16,-1 + 640 1408 l 1,17,-1 + 640 1152 l 1,12,-1 +EndSplineSet +EndChar + +StartChar: three +Encoding: 51 51 4 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1150 1726 m 25,0,-1 + 1150 446 l 25,1,-1 + 510 1086 l 25,2,-1 + 1150 1726 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: four +Encoding: 52 52 5 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +842 1732 m 25,0,-1 + 842 452 l 25,1,-1 + 1482 1092 l 25,2,-1 + 842 1732 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: five +Encoding: 53 53 6 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 768 m 25,0,-1 + 1600 768 l 25,1,-1 + 960 1408 l 25,2,-1 + 320 768 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: six +Encoding: 54 54 7 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 1282 m 25,0,-1 + 1600 1282 l 25,1,-1 + 960 642 l 25,2,-1 + 320 1282 l 25,0,-1 +EndSplineSet +EndChar +EndChars +EndSplineFont -- 2.26.2

3 3

[PATCH v3] gdi32/tests: Add duplicate face name test for EnumFontFamilies.
by Myah Caron July 27, 2020

July 27, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v3 doesn't consider a duplicate if the charset is the same. This should fix the test failure under Windows 10 Arabic. dlls/gdi32/tests/font.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad894dfdca..7f9e35ed5f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2869,7 +2869,7 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) struct enum_font_dataW efdw; LOGFONTA lf; HDC hdc; - int i, ret, ansi_charset, symbol_charset, russian_charset; + int i, ret, ansi_charset, symbol_charset, russian_charset, duplicates; if (*font_name && !is_truetype_font_installed(font_name)) { @@ -2903,6 +2903,20 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ok(russian_charset > 0 || broken(russian_charset == 0), /* NT4 */ "NULL family should enumerate RUSSIAN_CHARSET\n"); + + duplicates = 0; + for (i = 1; i < efdw.total; i++) { + ret = lstrcmpW(efdw.lf[i - 1].lfFaceName, efdw.lf[i].lfFaceName); + /* Windows 10 Arabic returns "Traditional Arabic" duplicated, but with the same charset (0) */ + if (!ret && efdw.lf[i - 1].lfCharSet != efdw.lf[i].lfCharSet) { + todo_wine ok(ret != 0, "duplicate font faces: (name: '%s', charset %i) (name: '%s', charset %i)\n", + wine_dbgstr_w(efdw.lf[i - 1].lfFaceName), efdw.lf[i - 1].lfCharSet, + wine_dbgstr_w(efdw.lf[i].lfFaceName), efdw.lf[i].lfCharSet); + duplicates++; + } + } + + todo_wine ok(duplicates == 0, "%i duplicate font faces returned\n", duplicates); } efdw.total = 0; -- 2.27.0

1 0

[PATCH v2] winemac.drv: Fix warnings for constants deprecated by macOS 10.12.
by Brendan Shanks July 27, 2020

July 27, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.h | 35 +++++++++++++ dlls/winemac.drv/cocoa_app.m | 50 +++++++++--------- dlls/winemac.drv/cocoa_event.m | 7 ++- dlls/winemac.drv/cocoa_opengl.m | 3 +- dlls/winemac.drv/cocoa_status_item.m | 6 ++- dlls/winemac.drv/cocoa_window.m | 76 ++++++++++++++-------------- 6 files changed, 111 insertions(+), 66 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index c88b894b5cf..7abea0990e9 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -22,6 +22,41 @@ #include "macdrv_cocoa.h" +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ +#define NSCompositingOperationSourceOver NSCompositeSourceOver +#define NSEventMaskAny NSAnyEventMask +#define NSEventMaskLeftMouseDown NSLeftMouseDownMask +#define NSEventMaskOtherMouseDown NSOtherMouseDownMask +#define NSEventMaskRightMouseDown NSRightMouseDownMask +#define NSEventModifierFlagCommand NSCommandKeyMask +#define NSEventModifierFlagControl NSControlKeyMask +#define NSEventModifierFlagOption NSAlternateKeyMask +#define NSEventModifierFlagShift NSShiftKeyMask +#define NSEventTypeAppKitDefined NSAppKitDefined +#define NSEventTypeApplicationDefined NSApplicationDefined +#define NSEventTypeFlagsChanged NSFlagsChanged +#define NSEventTypeKeyDown NSKeyDown +#define NSEventTypeKeyUp NSKeyUp +#define NSEventTypeLeftMouseDown NSLeftMouseDown +#define NSEventTypeLeftMouseDragged NSLeftMouseDragged +#define NSEventTypeLeftMouseUp NSLeftMouseUp +#define NSEventTypeMouseMoved NSMouseMoved +#define NSEventTypeOtherMouseDown NSOtherMouseDown +#define NSEventTypeOtherMouseDragged NSOtherMouseDragged +#define NSEventTypeOtherMouseUp NSOtherMouseUp +#define NSEventTypeRightMouseDown NSRightMouseDown +#define NSEventTypeRightMouseUp NSRightMouseUp +#define NSEventTypeRightMouseDragged NSRightMouseDragged +#define NSEventTypeScrollWheel NSScrollWheel +#define NSWindowStyleMaskBorderless NSBorderlessWindowMask +#define NSWindowStyleMaskClosable NSClosableWindowMask +#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask +#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask +#define NSWindowStyleMaskResizable NSResizableWindowMask +#define NSWindowStyleMaskTitled NSTitledWindowMask +#define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask +#endif #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8e66721da11..b4dcbfff473 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -258,7 +258,7 @@ - (void) transformProcessToForeground item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_HIDE_OTHERS) action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption]; item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_SHOW_ALL) action:@selector(unhideAllApplications:) @@ -271,7 +271,7 @@ - (void) transformProcessToForeground else title = WineLocalizedString(STRING_MENU_ITEM_QUIT); item = [submenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption]; item = [[[NSMenuItem alloc] init] autorelease]; [item setTitle:WineLocalizedString(STRING_MENU_WINE)]; [item setSubmenu:submenu]; @@ -290,7 +290,9 @@ - (void) transformProcessToForeground item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) action:@selector(toggleFullScreen:) keyEquivalent:@"f"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask | NSControlKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | + NSEventModifierFlagOption | + NSEventModifierFlagControl]; } [submenu addItem:[NSMenuItem separatorItem]]; [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_BRING_ALL_TO_FRONT) @@ -317,7 +319,7 @@ - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(B if (processEvents) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask + NSEvent* event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:timeout inMode:NSDefaultRunLoopMode dequeue:YES]; @@ -1607,7 +1609,7 @@ - (void) handleWindowDrag:(NSEvent*)anEvent begin:(BOOL)begin - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; - BOOL drag = [anEvent type] != NSMouseMoved; + BOOL drag = [anEvent type] != NSEventTypeMouseMoved; if ([windowsBeingDragged count]) targetWindow = nil; @@ -1758,11 +1760,11 @@ - (void) handleMouseButton:(NSEvent*)theEvent WineWindow* windowBroughtForward = nil; BOOL process = FALSE; - if (type == NSLeftMouseUp && [windowsBeingDragged count]) + if (type == NSEventTypeLeftMouseUp && [windowsBeingDragged count]) [self handleWindowDrag:theEvent begin:NO]; if ([window isKindOfClass:[WineWindow class]] && - type == NSLeftMouseDown && + type == NSEventTypeLeftMouseDown && ![theEvent wine_commandKeyDown]) { NSWindowButton windowButton; @@ -1795,7 +1797,9 @@ - (void) handleMouseButton:(NSEvent*)theEvent if ([window isKindOfClass:[WineWindow class]]) { - BOOL pressed = (type == NSLeftMouseDown || type == NSRightMouseDown || type == NSOtherMouseDown); + BOOL pressed = (type == NSEventTypeLeftMouseDown || + type == NSEventTypeRightMouseDown || + type == NSEventTypeOtherMouseDown); CGPoint pt = CGEventGetLocation([theEvent CGEvent]); if (clippingCursor) @@ -1811,7 +1815,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; process = NSMouseInRect(nspoint, contentRect, NO); - if (process && [window styleMask] & NSResizableWindowMask) + if (process && [window styleMask] & NSWindowStyleMaskResizable) { // Ignore clicks in the grow box (resize widget). HIPoint origin = { 0, 0 }; @@ -1821,7 +1825,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent info.kind = kHIThemeGrowBoxKindNormal; info.direction = kThemeGrowRight | kThemeGrowDown; - if ([window styleMask] & NSUtilityWindowMask) + if ([window styleMask] & NSWindowStyleMaskUtilityWindow) info.size = kHIThemeGrowBoxSizeSmall; else info.size = kHIThemeGrowBoxSizeNormal; @@ -2063,27 +2067,27 @@ - (BOOL) handleEvent:(NSEvent*)anEvent BOOL ret = FALSE; NSEventType type = [anEvent type]; - if (type == NSFlagsChanged) + if (type == NSEventTypeFlagsChanged) self.lastFlagsChanged = anEvent; - else if (type == NSMouseMoved || type == NSLeftMouseDragged || - type == NSRightMouseDragged || type == NSOtherMouseDragged) + else if (type == NSEventTypeMouseMoved || type == NSEventTypeLeftMouseDragged || + type == NSEventTypeRightMouseDragged || type == NSEventTypeOtherMouseDragged) { [self handleMouseMove:anEvent]; ret = mouseCaptureWindow && ![windowsBeingDragged count]; } - else if (type == NSLeftMouseDown || type == NSLeftMouseUp || - type == NSRightMouseDown || type == NSRightMouseUp || - type == NSOtherMouseDown || type == NSOtherMouseUp) + else if (type == NSEventTypeLeftMouseDown || type == NSEventTypeLeftMouseUp || + type == NSEventTypeRightMouseDown || type == NSEventTypeRightMouseUp || + type == NSEventTypeOtherMouseDown || type == NSEventTypeOtherMouseUp) { [self handleMouseButton:anEvent]; ret = mouseCaptureWindow && ![windowsBeingDragged count]; } - else if (type == NSScrollWheel) + else if (type == NSEventTypeScrollWheel) { [self handleScrollWheel:anEvent]; ret = mouseCaptureWindow != nil; } - else if (type == NSKeyDown) + else if (type == NSEventTypeKeyDown) { // -[NSApplication sendEvent:] seems to consume presses of the Help // key (Insert key on PC keyboards), so we have to bypass it and @@ -2094,7 +2098,7 @@ - (BOOL) handleEvent:(NSEvent*)anEvent ret = TRUE; } } - else if (type == NSKeyUp) + else if (type == NSEventTypeKeyUp) { uint16_t keyCode = [anEvent keyCode]; if ([self isKeyPressed:keyCode]) @@ -2105,7 +2109,7 @@ - (BOOL) handleEvent:(NSEvent*)anEvent [window postKeyEvent:anEvent]; } } - else if (type == NSAppKitDefined) + else if (type == NSEventTypeAppKitDefined) { short subtype = [anEvent subtype]; @@ -2123,11 +2127,11 @@ - (void) didSendEvent:(NSEvent*)anEvent { NSEventType type = [anEvent type]; - if (type == NSKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) + if (type == NSEventTypeKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) { NSUInteger modifiers = [anEvent modifierFlags]; - if ((modifiers & NSCommandKeyMask) && - !(modifiers & (NSControlKeyMask | NSAlternateKeyMask))) + if ((modifiers & NSEventModifierFlagCommand) && + !(modifiers & (NSEventModifierFlagControl | NSEventModifierFlagOption))) { // Command-Tab and Command-Shift-Tab would normally be intercepted // by the system to switch applications. If we're seeing it, it's diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 40066ffda5e..868ce5a7813 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -44,7 +44,10 @@ @implementation NSEvent (WineExtensions) static BOOL wine_commandKeyDown(NSUInteger flags) { - return ((flags & (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)) == NSCommandKeyMask); + return ((flags & (NSEventModifierFlagShift | + NSEventModifierFlagControl | + NSEventModifierFlagOption | + NSEventModifierFlagCommand)) == NSEventModifierFlagCommand); } + (BOOL) wine_commandKeyDown @@ -754,7 +757,7 @@ void macdrv_set_query_done(macdrv_query *query) query->done = TRUE; macdrv_release_query(query); - event = [NSEvent otherEventWithType:NSApplicationDefined + event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined location:NSZeroPoint modifierFlags:0 timestamp:[[NSProcessInfo processInfo] systemUptime] diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 96e27b76e5d..ce8788b4269 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -23,6 +23,7 @@ #import "cocoa_opengl.h" #include "macdrv_cocoa.h" +#include "cocoa_app.h" #include "cocoa_event.h" @@ -53,7 +54,7 @@ + (NSView*) dummyView dispatch_once(&once, ^{ OnMainThread(^{ dummyWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) - styleMask:NSBorderlessWindowMask + styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]; }); diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 23d78059585..1ffdeb8048d 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -117,7 +117,9 @@ - (void) postMouseButtonEvent:(NSEvent*)nsevent; event = macdrv_create_event(STATUS_ITEM_MOUSE_BUTTON, nil); event->status_item_mouse_button.item = (macdrv_status_item)self; event->status_item_mouse_button.button = [nsevent buttonNumber]; - event->status_item_mouse_button.down = (typeMask & (NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask)) != 0; + event->status_item_mouse_button.down = (typeMask & (NSEventMaskLeftMouseDown | + NSEventMaskRightMouseDown | + NSEventMaskOtherMouseDown)) != 0; event->status_item_mouse_button.count = [nsevent clickCount]; event->status_item_mouse_button.x = floor(point.x); event->status_item_mouse_button.y = floor(point.y); @@ -147,7 +149,7 @@ - (void) drawRect:(NSRect)rect [image drawAtPoint:imageOrigin fromRect:NSZeroRect - operation:NSCompositeSourceOver + operation:NSCompositingOperationSourceOver fraction:1]; } } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9c2ffb1623d..b6c5386469c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -41,7 +41,7 @@ NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7, NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8, NSWindowFullScreenButton = 7, - NSFullScreenWindowMask = 1 << 14, + NSWindowStyleMaskFullScreen = 1 << 14, }; @interface NSWindow (WineFullScreenExtensions) @@ -64,13 +64,13 @@ static NSUInteger style_mask_for_features(const struct macdrv_window_features* w if (wf->title_bar) { - style_mask = NSTitledWindowMask; - if (wf->close_button) style_mask |= NSClosableWindowMask; - if (wf->minimize_button) style_mask |= NSMiniaturizableWindowMask; - if (wf->resizable || wf->maximize_button) style_mask |= NSResizableWindowMask; - if (wf->utility) style_mask |= NSUtilityWindowMask; + style_mask = NSWindowStyleMaskTitled; + if (wf->close_button) style_mask |= NSWindowStyleMaskClosable; + if (wf->minimize_button) style_mask |= NSWindowStyleMaskMiniaturizable; + if (wf->resizable || wf->maximize_button) style_mask |= NSWindowStyleMaskResizable; + if (wf->utility) style_mask |= NSWindowStyleMaskUtilityWindow; } - else style_mask = NSBorderlessWindowMask; + else style_mask = NSWindowStyleMaskBorderless; return style_mask; } @@ -1058,7 +1058,7 @@ - (void) dealloc - (BOOL) preventResizing { BOOL preventForClipping = cursor_clipping_locks_windows && [[WineApplicationController sharedController] clippingCursor]; - return ([self styleMask] & NSResizableWindowMask) && (disabled || !resizable || preventForClipping); + return ([self styleMask] & NSWindowStyleMaskResizable) && (disabled || !resizable || preventForClipping); } - (BOOL) allowsMovingWithMaximized:(BOOL)inMaximized @@ -1075,11 +1075,11 @@ - (void) adjustFeaturesForState { NSUInteger style = [self styleMask]; - if (style & NSClosableWindowMask) + if (style & NSWindowStyleMaskClosable) [[self standardWindowButton:NSWindowCloseButton] setEnabled:!self.disabled]; - if (style & NSMiniaturizableWindowMask) + if (style & NSWindowStyleMaskMiniaturizable) [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; - if (style & NSResizableWindowMask) + if (style & NSWindowStyleMaskResizable) [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; if ([self respondsToSelector:@selector(toggleFullScreen:)]) { @@ -1110,7 +1110,7 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior NSUInteger style = [self styleMask]; if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized && + style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && !(self.parentWindow || self.latentParentWindow)) { behavior |= NSWindowCollectionBehaviorFullScreenPrimary; @@ -1120,7 +1120,7 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior { behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; - if (style & NSFullScreenWindowMask) + if (style & NSWindowStyleMaskFullScreen) [super toggleFullScreen:nil]; } } @@ -1134,24 +1134,24 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { - static const NSUInteger usedStyles = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | - NSResizableWindowMask | NSUtilityWindowMask | NSBorderlessWindowMask; + static const NSUInteger usedStyles = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | + NSWindowStyleMaskResizable | NSWindowStyleMaskUtilityWindow | NSWindowStyleMaskBorderless; NSUInteger currentStyle = [self styleMask]; NSUInteger newStyle = style_mask_for_features(wf) | (currentStyle & ~usedStyles); if (newStyle != currentStyle) { NSString* title = [[[self title] copy] autorelease]; - BOOL showingButtons = (currentStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; - BOOL shouldShowButtons = (newStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; - if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSClosableWindowMask)) + BOOL showingButtons = (currentStyle & (NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable)) != 0; + BOOL shouldShowButtons = (newStyle & (NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable)) != 0; + if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSWindowStyleMaskClosable)) { - // -setStyleMask: is buggy on 10.7+ with respect to NSResizableWindowMask. - // If transitioning from NSTitledWindowMask | NSResizableWindowMask to - // just NSTitledWindowMask, the window buttons should disappear rather + // -setStyleMask: is buggy on 10.7+ with respect to NSWindowStyleMaskResizable. + // If transitioning from NSWindowStyleMaskTitled | NSWindowStyleMaskResizable to + // just NSWindowStyleMaskTitled, the window buttons should disappear rather // than just being disabled. But they don't. Similarly in reverse. - // The workaround is to also toggle NSClosableWindowMask at the same time. - [self setStyleMask:newStyle ^ NSClosableWindowMask]; + // The workaround is to also toggle NSWindowStyleMaskClosable at the same time. + [self setStyleMask:newStyle ^ NSWindowStyleMaskClosable]; } [self setStyleMask:newStyle]; @@ -1283,14 +1283,14 @@ - (void) setMacDrvState:(const struct macdrv_window_state*)state { if ([self wouldBeVisible]) { - if ([self styleMask] & NSFullScreenWindowMask) + if ([self styleMask] & NSWindowStyleMaskFullScreen) { [self postDidUnminimizeEvent]; discard &= ~event_mask_for_type(WINDOW_DID_UNMINIMIZE); } else { - [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; + [self setStyleMask:([self styleMask] | NSWindowStyleMaskMiniaturizable)]; [super miniaturize:nil]; discard |= event_mask_for_type(WINDOW_BROUGHT_FORWARD) | event_mask_for_type(WINDOW_GOT_FOCUS) | @@ -1765,7 +1765,7 @@ - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)a if (pendingMinimize) { - [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; + [self setStyleMask:([self styleMask] | NSWindowStyleMaskMiniaturizable)]; [super miniaturize:nil]; pendingMinimize = FALSE; } @@ -1814,7 +1814,7 @@ - (void) doOrderOut [parent grabDockIconSnapshotFromWindow:self force:NO]; [self becameIneligibleParentOrChild]; - if ([self isMiniaturized] || [self styleMask] & NSFullScreenWindowMask) + if ([self isMiniaturized] || [self styleMask] & NSWindowStyleMaskFullScreen) { fakingClose = TRUE; [self close]; @@ -1844,7 +1844,7 @@ - (void) doOrderOut - (void) updateFullscreen { NSRect contentRect = [self contentRectForFrameRect:self.wine_fractionalFrame]; - BOOL nowFullscreen = !([self styleMask] & NSFullScreenWindowMask) && screen_covered_by_rect(contentRect, [NSScreen screens]); + BOOL nowFullscreen = !([self styleMask] & NSWindowStyleMaskFullScreen) && screen_covered_by_rect(contentRect, [NSScreen screens]); if (nowFullscreen != fullscreen) { @@ -2077,7 +2077,7 @@ - (void) postKeyEvent:(NSEvent *)theEvent { [self flagsChanged:theEvent]; [self postKey:[theEvent keyCode] - pressed:[theEvent type] == NSKeyDown + pressed:[theEvent type] == NSEventTypeKeyDown modifiers:adjusted_modifiers_for_settings([theEvent modifierFlags]) event:theEvent]; } @@ -2120,9 +2120,9 @@ - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resi NSUInteger style = self.styleMask; if (isFullscreen) - style |= NSFullScreenWindowMask; + style |= NSWindowStyleMaskFullScreen; else - style &= ~NSFullScreenWindowMask; + style &= ~NSWindowStyleMaskFullScreen; frame = [[self class] contentRectForFrameRect:frame styleMask:style]; [[WineApplicationController sharedController] flipRect:&frame]; @@ -2302,7 +2302,7 @@ - (void) grabDockIconSnapshotFromWindow:(WineWindow*)window force:(BOOL)force CGContextDrawImage(cgcontext, rect, windowImage); [appImage drawInRect:NSMakeRect(156, 4, 96, 96) fromRect:NSZeroRect - operation:NSCompositeSourceOver + operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil]; @@ -2431,13 +2431,13 @@ - (void) sendEvent:(NSEvent*)event interface control. For example, Control-Tab switches focus among views. We want to bypass that feature, so directly route key-down events to -keyDown:. */ - if (type == NSKeyDown) + if (type == NSEventTypeKeyDown) [[self firstResponder] keyDown:event]; else { if (!draggingPhase && maximized && ![self isMovable] && ![self allowsMovingWithMaximized:YES] && [self allowsMovingWithMaximized:NO] && - type == NSLeftMouseDown && (self.styleMask & NSTitledWindowMask)) + type == NSEventTypeLeftMouseDown && (self.styleMask & NSWindowStyleMaskTitled)) { NSRect titleBar = self.frame; NSRect contentRect = [self contentRectForFrameRect:titleBar]; @@ -2480,7 +2480,7 @@ - (void) sendEvent:(NSEvent*)event } } } - else if (draggingPhase && (type == NSLeftMouseDragged || type == NSLeftMouseUp)) + else if (draggingPhase && (type == NSEventTypeLeftMouseDragged || type == NSEventTypeLeftMouseUp)) { if ([self isMovable]) { @@ -2502,7 +2502,7 @@ - (void) sendEvent:(NSEvent*)event [self setFrameTopLeftPoint:newTopLeft]; } - else if (draggingPhase == 1 && type == NSLeftMouseDragged) + else if (draggingPhase == 1 && type == NSEventTypeLeftMouseDragged) { macdrv_event* event; NSRect frame = [self contentRectForFrameRect:self.frame]; @@ -2518,7 +2518,7 @@ - (void) sendEvent:(NSEvent*)event draggingPhase = 2; } - if (type == NSLeftMouseUp) + if (type == NSEventTypeLeftMouseUp) [self endWindowDragging]; } @@ -2919,7 +2919,7 @@ - (void)windowDidResize:(NSNotification *)notification } [self postWindowFrameChanged:frame - fullscreen:([self styleMask] & NSFullScreenWindowMask) != 0 + fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 resizing:[self inLiveResize]]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; -- 2.26.2

2 1

[PATCH 6/6] winex11.drv: Remove the old display settings handler interface.
by Zhiyi Zhang July 27, 2020

July 27, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 228 ------------------------------------ dlls/winex11.drv/x11drv.h | 16 --- 2 files changed, 244 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 57b7faba8e8..a64d1de6500 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -45,9 +45,6 @@ struct x11drv_display_setting DEVMODEW desired_mode; }; -static struct x11drv_mode_info *dd_modes = NULL; -static unsigned int dd_mode_count = 0; -static unsigned int dd_max_modes = 0; /* All Windows drivers seen so far either support 32 bit depths, or 24 bit depths, but never both. So if we have * a 32 bit framebuffer, report 32 bit bpps, otherwise 24 bit ones. */ @@ -55,90 +52,6 @@ static const unsigned int depths_24[] = {8, 16, 24}; static const unsigned int depths_32[] = {8, 16, 32}; const unsigned int *depths; -/* pointers to functions that actually do the hard stuff */ -static int (*pGetCurrentMode)(void); -static LONG (*pSetCurrentMode)(int mode); -static const char *handler_name; - -/* - * Set the handlers for resolution changing functions - * and initialize the master list of modes - */ -struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, - int (*pNewGCM)(void), - LONG (*pNewSCM)(int), - unsigned int nmodes, - int reserve_depths) -{ - handler_name = name; - pGetCurrentMode = pNewGCM; - pSetCurrentMode = pNewSCM; - TRACE("Resolution settings now handled by: %s\n", name); - if (reserve_depths) - /* leave room for other depths */ - dd_max_modes = (3+1)*(nmodes); - else - dd_max_modes = nmodes; - - if (dd_modes) - { - TRACE("Destroying old display modes array\n"); - HeapFree(GetProcessHeap(), 0, dd_modes); - } - dd_modes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dd_modes) * dd_max_modes); - dd_mode_count = 0; - TRACE("Initialized new display modes array\n"); - return dd_modes; -} - -/* Add one mode to the master list */ -void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) -{ - struct x11drv_mode_info *info = &dd_modes[dd_mode_count]; - DWORD dwBpp = screen_bpp; - if (dd_mode_count >= dd_max_modes) - { - ERR("Maximum modes (%d) exceeded\n", dd_max_modes); - return; - } - if (bpp == 0) bpp = dwBpp; - info->width = width; - info->height = height; - info->refresh_rate = freq; - info->bpp = bpp; - TRACE("initialized mode %d: %dx%dx%d @%d Hz (%s)\n", - dd_mode_count, width, height, bpp, freq, handler_name); - dd_mode_count++; -} - -/* copy all the current modes using the other color depths */ -void X11DRV_Settings_AddDepthModes(void) -{ - int i, j; - int existing_modes = dd_mode_count; - DWORD dwBpp = screen_bpp; - const DWORD *depths = screen_bpp == 32 ? depths_32 : depths_24; - - for (j=0; j<3; j++) - { - if (depths[j] != dwBpp) - { - for (i=0; i < existing_modes; i++) - { - X11DRV_Settings_AddOneMode(dd_modes[i].width, dd_modes[i].height, - depths[j], dd_modes[i].refresh_rate); - } - } - } -} - -/* return the number of modes that are initialized */ -unsigned int X11DRV_Settings_GetModeCount(void) -{ - return dd_mode_count; -} - -/* TODO: Remove the old display settings handler interface once all backends are migrated to the new interface */ static struct x11drv_settings_handler handler; /* Cached display modes for a device, protected by modes_section */ @@ -440,10 +353,6 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo UINT mode_count; ULONG_PTR id; - /* Use the new interface if it is available */ - if (!handler.name) - goto old_interface; - if (n == ENUM_REGISTRY_SETTINGS) { if (!read_registry_settings(name, devmode)) @@ -503,56 +412,6 @@ done: devmode->dmDriverVersion = DM_SPECVERSION; lstrcpyW(devmode->dmDeviceName, dev_name); return TRUE; - -old_interface: - devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); - devmode->dmSpecVersion = DM_SPECVERSION; - devmode->dmDriverVersion = DM_SPECVERSION; - memcpy(devmode->dmDeviceName, dev_name, sizeof(dev_name)); - devmode->dmDriverExtra = 0; - devmode->u2.dmDisplayFlags = 0; - devmode->dmDisplayFrequency = 0; - devmode->u1.s2.dmPosition.x = 0; - devmode->u1.s2.dmPosition.y = 0; - devmode->u1.s2.dmDisplayOrientation = 0; - devmode->u1.s2.dmDisplayFixedOutput = 0; - - if (n == ENUM_CURRENT_SETTINGS) - { - TRACE("mode %d (current) -- getting current mode (%s)\n", n, handler_name); - n = pGetCurrentMode(); - } - if (n == ENUM_REGISTRY_SETTINGS) - { - TRACE("mode %d (registry) -- getting default mode (%s)\n", n, handler_name); - return read_registry_settings(name, devmode); - } - if (n < dd_mode_count) - { - devmode->dmPelsWidth = dd_modes[n].width; - devmode->dmPelsHeight = dd_modes[n].height; - devmode->dmBitsPerPel = dd_modes[n].bpp; - devmode->dmDisplayFrequency = dd_modes[n].refresh_rate; - devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | - DM_DISPLAYFLAGS; - if (devmode->dmDisplayFrequency) - { - devmode->dmFields |= DM_DISPLAYFREQUENCY; - TRACE("mode %d -- %dx%dx%dbpp @%d Hz (%s)\n", n, - devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, - devmode->dmDisplayFrequency, handler_name); - } - else - { - TRACE("mode %d -- %dx%dx%dbpp (%s)\n", n, - devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, - handler_name); - } - return TRUE; - } - TRACE("mode %d -- not present (%s)\n", n, handler_name); - SetLastError(ERROR_NO_MORE_FILES); - return FALSE; } BOOL is_detached_mode(const DEVMODEW *mode) @@ -939,16 +798,8 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { struct x11drv_display_setting *displays; - WCHAR primary_adapter[CCHDEVICENAME]; - char bpp_buffer[16], freq_buffer[18]; INT display_idx, display_count; - DEVMODEW default_mode; LONG ret; - DWORD i; - - /* Use the new interface if it is available */ - if (!handler.name) - goto old_interface; ret = get_display_settings(&displays, &display_count, devname, devmode); if (ret != DISP_CHANGE_SUCCESSFUL) @@ -994,83 +845,4 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, X11DRV_DisplayDevices_Update(TRUE); heap_free(displays); return ret; - -old_interface: - if (!get_primary_adapter(primary_adapter)) - return DISP_CHANGE_FAILED; - - if (!devname && !devmode) - { - default_mode.dmSize = sizeof(default_mode); - if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) - { - ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); - return DISP_CHANGE_BADMODE; - } - - devname = primary_adapter; - devmode = &default_mode; - } - - if (is_detached_mode(devmode)) - { - FIXME("Detaching adapters is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - - for (i = 0; i < dd_mode_count; i++) - { - if (devmode->dmFields & DM_BITSPERPEL) - { - if (devmode->dmBitsPerPel != dd_modes[i].bpp) - continue; - } - if (devmode->dmFields & DM_PELSWIDTH) - { - if (devmode->dmPelsWidth != dd_modes[i].width) - continue; - } - if (devmode->dmFields & DM_PELSHEIGHT) - { - if (devmode->dmPelsHeight != dd_modes[i].height) - continue; - } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0 && devmode->dmDisplayFrequency != 1) - { - if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) - continue; - } - /* we have a valid mode */ - TRACE("Requested display settings match mode %d (%s)\n", i, handler_name); - - if (flags & CDS_UPDATEREGISTRY && !write_registry_settings(devname, devmode)) - { - ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); - return DISP_CHANGE_NOTUPDATED; - } - - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", - wine_dbgstr_w(devname)); - return DISP_CHANGE_SUCCESSFUL; - } - - if (!(flags & (CDS_TEST | CDS_NORESET))) - return pSetCurrentMode(i); - - return DISP_CHANGE_SUCCESSFUL; - } - - /* no valid modes found, only print the fields we were trying to matching against */ - bpp_buffer[0] = freq_buffer[0] = 0; - if (devmode->dmFields & DM_BITSPERPEL) - sprintf(bpp_buffer, "bpp=%u ", devmode->dmBitsPerPel); - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (devmode->dmDisplayFrequency != 0)) - sprintf(freq_buffer, "freq=%u ", devmode->dmDisplayFrequency); - ERR("No matching mode found: width=%d height=%d %s%s(%s)\n", - devmode->dmPelsWidth, devmode->dmPelsHeight, bpp_buffer, freq_buffer, handler_name); - - return DISP_CHANGE_BADMODE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e4015891369..375fd1465fd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -649,14 +649,6 @@ extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; -struct x11drv_mode_info -{ - unsigned int width; - unsigned int height; - unsigned int bpp; - unsigned int refresh_rate; -}; - #define DEPTH_COUNT 3 extern const unsigned int *depths DECLSPEC_HIDDEN; @@ -714,15 +706,7 @@ extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; -extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; -extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; -unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; void X11DRV_Settings_Init(void) DECLSPEC_HIDDEN; -struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, - int (*pNewGCM)(void), - LONG (*pNewSCM)(int), - unsigned int nmodes, - int reserve_depths) DECLSPEC_HIDDEN; void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH 5/6] winex11.drv: Migrate NoRes display settings handler to a new interface.
by Zhiyi Zhang July 27, 2020

July 27, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 93 ++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 7c7d9507187..57b7faba8e8 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -169,30 +169,99 @@ void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handle * Default handlers if resolution switching is not enabled * */ -static int X11DRV_nores_GetCurrentMode(void) +static BOOL nores_get_id(const WCHAR *device_name, ULONG_PTR *id) { - return 0; + WCHAR primary_adapter[CCHDEVICENAME]; + + if (!get_primary_adapter( primary_adapter )) + return FALSE; + + *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + return TRUE; } -static LONG X11DRV_nores_SetCurrentMode(int mode) +static BOOL nores_get_modes(ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count) { - if (mode == 0) return DISP_CHANGE_SUCCESSFUL; - TRACE("Ignoring mode change request mode=%d\n", mode); - return DISP_CHANGE_FAILED; + RECT primary = get_host_primary_monitor_rect(); + DEVMODEW *modes; + + modes = heap_calloc(1, sizeof(*modes)); + if (!modes) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + modes[0].dmSize = sizeof(*modes); + modes[0].dmDriverExtra = 0; + modes[0].dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + modes[0].u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + modes[0].dmBitsPerPel = screen_bpp; + modes[0].dmPelsWidth = primary.right; + modes[0].dmPelsHeight = primary.bottom; + modes[0].u2.dmDisplayFlags = 0; + modes[0].dmDisplayFrequency = 60; + + *new_modes = modes; + *mode_count = 1; + return TRUE; +} + +static void nores_free_modes(DEVMODEW *modes) +{ + heap_free(modes); +} + +static BOOL nores_get_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + RECT primary = get_host_primary_monitor_rect(); + + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u2.dmDisplayFlags = 0; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); + mode->dmBitsPerPel = 0; + mode->dmPelsWidth = 0; + mode->dmPelsHeight = 0; + mode->dmDisplayFrequency = 0; + return TRUE; + } + + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = primary.right; + mode->dmPelsHeight = primary.bottom; + mode->dmDisplayFrequency = 60; + return TRUE; +} + +static LONG nores_set_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + WARN("NoRes settings handler, ignoring mode change request.\n"); + return DISP_CHANGE_SUCCESSFUL; } /* default handler only gets the current X desktop resolution */ void X11DRV_Settings_Init(void) { - RECT primary = get_host_primary_monitor_rect(); + struct x11drv_settings_handler nores_handler; depths = screen_bpp == 32 ? depths_32 : depths_24; - X11DRV_Settings_SetHandlers("NoRes", - X11DRV_nores_GetCurrentMode, - X11DRV_nores_SetCurrentMode, - 1, 0); - X11DRV_Settings_AddOneMode( primary.right - primary.left, primary.bottom - primary.top, 0, 60); + nores_handler.name = "NoRes"; + nores_handler.priority = 0; + nores_handler.get_id = nores_get_id; + nores_handler.get_modes = nores_get_modes; + nores_handler.free_modes = nores_free_modes; + nores_handler.get_current_mode = nores_get_current_mode; + nores_handler.set_current_mode = nores_set_current_mode; + X11DRV_Settings_SetHandler(&nores_handler); } static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) -- 2.25.1

1 0

[PATCH 4/6] winex11.drv: Migrate XVidMode display settings handler to a new interface.
by Zhiyi Zhang July 27, 2020

July 27, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xvidmode.c | 267 +++++++++++++++++++++++------------- 1 file changed, 173 insertions(+), 94 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index a5884543163..c449157f6b3 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -2,6 +2,7 @@ * DirectDraw XVidMode interface * * Copyright 2001 TransGaming Technologies, Inc. + * Copyright 2020 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,10 +22,14 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include <string.h> #include <stdio.h> #include <math.h> +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include "x11drv.h" #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H @@ -38,6 +43,7 @@ #include "wingdi.h" #include "wine/debug.h" #include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xvidmode); @@ -52,11 +58,6 @@ static int xf86vm_gammaramp_size; static BOOL xf86vm_use_gammaramp; #endif /* X_XF86VidModeSetGammaRamp */ -static struct x11drv_mode_info *dd_modes; -static unsigned int dd_mode_count; -static XF86VidModeModeInfo** real_xf86vm_modes; -static unsigned int real_xf86vm_mode_count; - #define MAKE_FUNCPTR(f) static typeof(f) * p##f; MAKE_FUNCPTR(XF86VidModeGetAllModeLines) MAKE_FUNCPTR(XF86VidModeGetModeLine) @@ -76,86 +77,182 @@ MAKE_FUNCPTR(XF86VidModeSetGammaRamp) #endif #undef MAKE_FUNCPTR - -static void convert_modeinfo( const XF86VidModeModeInfo *mode) -{ - int rate; - if (mode->htotal!=0 && mode->vtotal!=0) - rate = mode->dotclock * 1000 / (mode->htotal * mode->vtotal); - else - rate = 0; - X11DRV_Settings_AddOneMode(mode->hdisplay, mode->vdisplay, 0, rate); -} - -static void convert_modeline(int dotclock, const XF86VidModeModeLine *mode, - struct x11drv_mode_info *info, unsigned int bpp) -{ - info->width = mode->hdisplay; - info->height = mode->vdisplay; - if (mode->htotal!=0 && mode->vtotal!=0) - info->refresh_rate = dotclock * 1000 / (mode->htotal * mode->vtotal); - else - info->refresh_rate = 0; - TRACE(" width=%d, height=%d, refresh=%d\n", - info->width, info->height, info->refresh_rate); - info->bpp = bpp; -} - static int XVidModeErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { return 1; } -static int X11DRV_XF86VM_GetCurrentMode(void) +/* XF86VidMode display settings handler */ +static BOOL xf86vm_get_id(const WCHAR *device_name, ULONG_PTR *id) { - XF86VidModeModeLine line; - int dotclock; - unsigned int i; - struct x11drv_mode_info cmode; - DWORD dwBpp = screen_bpp; + WCHAR primary_adapter[CCHDEVICENAME]; - TRACE("Querying XVidMode current mode\n"); - pXF86VidModeGetModeLine(gdi_display, DefaultScreen(gdi_display), &dotclock, &line); - convert_modeline(dotclock, &line, &cmode, dwBpp); - for (i=0; i<dd_mode_count; i++) - if (memcmp(&dd_modes[i], &cmode, sizeof(cmode)) == 0) { - TRACE("mode=%d\n", i); - return i; + if (!get_primary_adapter( primary_adapter )) + return FALSE; + + /* XVidMode only supports changing the primary adapter settings. + * For non-primary adapters, an id is still provided but getting + * and changing non-primary adapters' settings will be ignored. */ + *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + return TRUE; +} + +static void add_xf86vm_mode(DEVMODEW *mode, DWORD depth, const XF86VidModeModeInfo *mode_info) +{ + mode->dmSize = sizeof(*mode); + mode->dmDriverExtra = sizeof(mode_info); + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS; + if (mode_info->htotal && mode_info->vtotal) + { + mode->dmFields |= DM_DISPLAYFREQUENCY; + mode->dmDisplayFrequency = mode_info->dotclock * 1000 / (mode_info->htotal * mode_info->vtotal); } - ERR("In unknown mode, returning default\n"); - return 0; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = depth; + mode->dmPelsWidth = mode_info->hdisplay; + mode->dmPelsHeight = mode_info->vdisplay; + mode->u2.dmDisplayFlags = 0; + memcpy((BYTE *)mode + sizeof(*mode), &mode_info, sizeof(mode_info)); } -static LONG X11DRV_XF86VM_SetCurrentMode(int mode) +static BOOL xf86vm_get_modes(ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count) { - DWORD dwBpp = screen_bpp; - /* only set modes from the original color depth */ - if (dwBpp != dd_modes[mode].bpp) - { - FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].bpp); - } - mode = mode % real_xf86vm_mode_count; + INT xf86vm_mode_idx, xf86vm_mode_count; + XF86VidModeModeInfo **xf86vm_modes; + UINT depth_idx, mode_idx = 0; + DEVMODEW *modes, *mode; + SIZE_T size; + BYTE *ptr; + Bool ret; - TRACE("Resizing X display to %dx%d\n", - real_xf86vm_modes[mode]->hdisplay, real_xf86vm_modes[mode]->vdisplay); - pXF86VidModeSwitchToMode(gdi_display, DefaultScreen(gdi_display), real_xf86vm_modes[mode]); -#if 0 /* it is said that SetViewPort causes problems with some X servers */ - pXF86VidModeSetViewPort(gdi_display, DefaultScreen(gdi_display), 0, 0); -#else - XWarpPointer(gdi_display, None, DefaultRootWindow(gdi_display), 0, 0, 0, 0, 0, 0); -#endif - XSync(gdi_display, False); - X11DRV_DisplayDevices_Update( TRUE ); - return DISP_CHANGE_SUCCESSFUL; + X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); + ret = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &xf86vm_mode_count, &xf86vm_modes); + if (X11DRV_check_error() || !ret || !xf86vm_mode_count) + return FALSE; + + /* Put a XF86VidModeModeInfo ** at the start to store the XF86VidMode modes pointer */ + size = sizeof(XF86VidModeModeInfo **); + /* Display modes in different color depth, with a XF86VidModeModeInfo * at the end of each + * DEVMODEW as driver private data */ + size += (xf86vm_mode_count * DEPTH_COUNT) * (sizeof(DEVMODEW) + sizeof(XF86VidModeModeInfo *)); + ptr = heap_alloc_zero(size); + if (!ptr) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + memcpy(ptr, &xf86vm_modes, sizeof(xf86vm_modes)); + modes = (DEVMODEW *)(ptr + sizeof(xf86vm_modes)); + + for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) + { + for (xf86vm_mode_idx = 0; xf86vm_mode_idx < xf86vm_mode_count; ++xf86vm_mode_idx) + { + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(DEVMODEW) + sizeof(XF86VidModeModeInfo *)) * mode_idx++); + add_xf86vm_mode(mode, depths[depth_idx], xf86vm_modes[xf86vm_mode_idx]); + } + } + + *new_modes = modes; + *mode_count = mode_idx; + return TRUE; } +static void xf86vm_free_modes(DEVMODEW *modes) +{ + XF86VidModeModeInfo **xf86vm_modes; + + if (modes) + { + assert(modes[0].dmDriverExtra == sizeof(XF86VidModeModeInfo *)); + memcpy(&xf86vm_modes, (BYTE *)modes - sizeof(xf86vm_modes), sizeof(xf86vm_modes)); + XFree(xf86vm_modes); + } + heap_free(modes); +} + +static BOOL xf86vm_get_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + XF86VidModeModeLine xf86vm_mode; + INT dotclock; + Bool ret; + + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u2.dmDisplayFlags = 0; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); + mode->dmBitsPerPel = 0; + mode->dmPelsWidth = 0; + mode->dmPelsHeight = 0; + mode->dmDisplayFrequency = 0; + return TRUE; + } + + X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); + ret = pXF86VidModeGetModeLine(gdi_display, DefaultScreen(gdi_display), &dotclock, &xf86vm_mode); + if (X11DRV_check_error() || !ret) + return FALSE; + + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = xf86vm_mode.hdisplay; + mode->dmPelsHeight = xf86vm_mode.vdisplay; + if (xf86vm_mode.htotal && xf86vm_mode.vtotal) + mode->dmDisplayFrequency = dotclock * 1000 / (xf86vm_mode.htotal * xf86vm_mode.vtotal); + else + mode->dmDisplayFrequency = 0; + + if (xf86vm_mode.privsize) + XFree(xf86vm_mode.private); + return TRUE; +} + +static LONG xf86vm_set_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + XF86VidModeModeInfo *xf86vm_mode; + Bool ret; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + + if (is_detached_mode(mode)) + { + FIXME("Detaching adapters is unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + + if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp) + WARN("Cannot change screen bit depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel); + + assert(mode->dmDriverExtra == sizeof(XF86VidModeModeInfo *)); + memcpy(&xf86vm_mode, (BYTE *)mode + sizeof(*mode), sizeof(xf86vm_mode)); + X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); + ret = pXF86VidModeSwitchToMode(gdi_display, DefaultScreen(gdi_display), xf86vm_mode); + if (X11DRV_check_error() || !ret) + return DISP_CHANGE_FAILED; +#if 0 /* it is said that SetViewPort causes problems with some X servers */ + pXF86VidModeSetViewPort(gdi_display, DefaultScreen(gdi_display), 0, 0); +#else + XWarpPointer(gdi_display, None, DefaultRootWindow(gdi_display), 0, 0, 0, 0, 0, 0); +#endif + XFlush(gdi_display); + return DISP_CHANGE_SUCCESSFUL; +} void X11DRV_XF86VM_Init(void) { + struct x11drv_settings_handler xf86vm_handler; void *xvidmode_handle; Bool ok; - int nmodes; - unsigned int i; if (xf86vm_major) return; /* already initialized? */ @@ -207,35 +304,17 @@ void X11DRV_XF86VM_Init(void) } #endif /* X_XF86VidModeSetGammaRamp */ - /* retrieve modes */ - if (usexvidmode && !is_virtual_desktop()) - { - X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); - ok = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); - if (X11DRV_check_error() || !ok) return; - } - else return; /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */ + if (!usexvidmode) + return; - TRACE("XVidMode modes: count=%d\n", nmodes); - - real_xf86vm_mode_count = nmodes; - - dd_modes = X11DRV_Settings_SetHandlers("XF86VidMode", - X11DRV_XF86VM_GetCurrentMode, - X11DRV_XF86VM_SetCurrentMode, - nmodes, 1); - - /* convert modes to x11drv_mode_info format */ - for (i=0; i<real_xf86vm_mode_count; i++) - { - convert_modeinfo(real_xf86vm_modes[i]); - } - /* add modes for different color depths */ - X11DRV_Settings_AddDepthModes(); - dd_mode_count = X11DRV_Settings_GetModeCount(); - - TRACE("Available DD modes: count=%d\n", dd_mode_count); - TRACE("Enabling XVidMode\n"); + xf86vm_handler.name = "XF86VidMode"; + xf86vm_handler.priority = 100; + xf86vm_handler.get_id = xf86vm_get_id; + xf86vm_handler.get_modes = xf86vm_get_modes; + xf86vm_handler.free_modes = xf86vm_free_modes; + xf86vm_handler.get_current_mode = xf86vm_get_current_mode; + xf86vm_handler.set_current_mode = xf86vm_set_current_mode; + X11DRV_Settings_SetHandler(&xf86vm_handler); return; sym_not_found: -- 2.25.1

1 0

[PATCH 3/6] winex11.drv: Migrate XRandR 1.0 display settings handler to a new interface.
by Zhiyi Zhang July 27, 2020

July 27, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 304 +++++++++++++++++++++----------------- 1 file changed, 168 insertions(+), 136 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 67fd2851825..155bd85d811 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -83,11 +83,6 @@ MAKE_FUNCPTR(XRRFreeProviderInfo) #undef MAKE_FUNCPTR -static struct x11drv_mode_info *dd_modes; -static SizeID *xrandr10_modes; -static unsigned int xrandr_mode_count; -static int xrandr_current_mode = -1; - static int load_xrandr(void) { int r = 0; @@ -144,157 +139,187 @@ static int XRandRErrorHandler(Display *dpy, XErrorEvent *event, void *arg) return 1; } -static int xrandr10_get_current_mode(void) +/* XRandR 1.0 display settings handler */ +static BOOL xrandr10_get_id( const WCHAR *device_name, ULONG_PTR *id ) { - SizeID size; - Rotation rot; - XRRScreenConfiguration *sc; - short rate; - unsigned int i; - int res = -1; + WCHAR primary_adapter[CCHDEVICENAME]; - if (xrandr_current_mode != -1) - return xrandr_current_mode; + if (!get_primary_adapter( primary_adapter )) + return FALSE; - sc = pXRRGetScreenInfo (gdi_display, DefaultRootWindow( gdi_display )); - size = pXRRConfigCurrentConfiguration (sc, &rot); - rate = pXRRConfigCurrentRate (sc); - pXRRFreeScreenConfigInfo(sc); - - for (i = 0; i < xrandr_mode_count; ++i) - { - if (xrandr10_modes[i] == size && dd_modes[i].refresh_rate == rate) - { - res = i; - break; - } - } - if (res == -1) - { - ERR("In unknown mode, returning default\n"); - return 0; - } - - xrandr_current_mode = res; - return res; + /* RandR 1.0 only supports changing the primary adapter settings. + * For non-primary adapters, an id is still provided but getting + * and changing non-primary adapters' settings will be ignored. */ + *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + return TRUE; } -static LONG xrandr10_set_current_mode( int mode ) +static void add_xrandr10_mode( DEVMODEW *mode, DWORD depth, DWORD width, DWORD height, + DWORD frequency, SizeID size_id ) { - SizeID size; - Rotation rot; - Window root; - XRRScreenConfiguration *sc; - Status stat; + mode->dmSize = sizeof(*mode); + mode->dmDriverExtra = sizeof(SizeID); + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | + DM_PELSHEIGHT | DM_DISPLAYFLAGS; + if (frequency) + { + mode->dmFields |= DM_DISPLAYFREQUENCY; + mode->dmDisplayFrequency = frequency; + } + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = depth; + mode->dmPelsWidth = width; + mode->dmPelsHeight = height; + mode->u2.dmDisplayFlags = 0; + memcpy( (BYTE *)mode + sizeof(*mode), &size_id, sizeof(size_id) ); +} + +static BOOL xrandr10_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *new_mode_count ) +{ + INT size_idx, depth_idx, rate_idx, mode_idx = 0; + INT size_count, rate_count, mode_count = 0; + DEVMODEW *modes, *mode; + XRRScreenSize *sizes; + short *rates; + + sizes = pXRRSizes( gdi_display, DefaultScreen( gdi_display ), &size_count ); + if (size_count <= 0) + return FALSE; + + for (size_idx = 0; size_idx < size_count; ++size_idx) + { + rates = pXRRRates( gdi_display, DefaultScreen( gdi_display ), size_idx, &rate_count ); + if (rate_count) + mode_count += rate_count; + else + ++mode_count; + } + + /* Allocate space for reported modes in three depths, and put an SizeID at the end of DEVMODEW as + * driver private data */ + modes = heap_calloc( mode_count * DEPTH_COUNT, sizeof(*modes) + sizeof(SizeID) ); + if (!modes) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + for (size_idx = 0; size_idx < size_count; ++size_idx) + { + for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) + { + rates = pXRRRates( gdi_display, DefaultScreen( gdi_display ), size_idx, &rate_count ); + if (!rate_count) + { + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*mode) + sizeof(SizeID)) * mode_idx++); + add_xrandr10_mode( mode, depths[depth_idx], sizes[size_idx].width, + sizes[size_idx].height, 0, size_idx ); + continue; + } + + for (rate_idx = 0; rate_idx < rate_count; ++rate_idx) + { + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*mode) + sizeof(SizeID)) * mode_idx++); + add_xrandr10_mode( mode, depths[depth_idx], sizes[size_idx].width, + sizes[size_idx].height, rates[rate_idx], size_idx ); + } + } + } + + *new_modes = modes; + *new_mode_count = mode_idx; + return TRUE; +} + +static void xrandr10_free_modes( DEVMODEW *modes ) +{ + heap_free( modes ); +} + +static BOOL xrandr10_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + XRRScreenConfiguration *screen_config; + XRRScreenSize *sizes; + Rotation rotation; + SizeID size_id; + INT size_count; short rate; - root = DefaultRootWindow( gdi_display ); - sc = pXRRGetScreenInfo (gdi_display, root); - pXRRConfigCurrentConfiguration (sc, &rot); - mode = mode % xrandr_mode_count; + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u2.dmDisplayFlags = 0; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; - TRACE("Changing Resolution to %dx%d @%d Hz\n", - dd_modes[mode].width, - dd_modes[mode].height, - dd_modes[mode].refresh_rate); - - size = xrandr10_modes[mode]; - rate = dd_modes[mode].refresh_rate; - - if (rate) - stat = pXRRSetScreenConfigAndRate( gdi_display, sc, root, size, rot, rate, CurrentTime ); - else - stat = pXRRSetScreenConfig( gdi_display, sc, root, size, rot, CurrentTime ); - - pXRRFreeScreenConfigInfo(sc); - - if (stat == RRSetConfigSuccess) + if (id != 1) { - xrandr_current_mode = mode; - X11DRV_DisplayDevices_Update( TRUE ); + FIXME("Non-primary adapters are unsupported.\n"); + mode->dmBitsPerPel = 0; + mode->dmPelsWidth = 0; + mode->dmPelsHeight = 0; + mode->dmDisplayFrequency = 0; + return TRUE; + } + + sizes = pXRRSizes( gdi_display, DefaultScreen( gdi_display ), &size_count ); + if (size_count <= 0) + return FALSE; + + screen_config = pXRRGetScreenInfo( gdi_display, DefaultRootWindow( gdi_display ) ); + size_id = pXRRConfigCurrentConfiguration( screen_config, &rotation ); + rate = pXRRConfigCurrentRate( screen_config ); + pXRRFreeScreenConfigInfo( screen_config ); + + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = sizes[size_id].width; + mode->dmPelsHeight = sizes[size_id].height; + mode->dmDisplayFrequency = rate; + return TRUE; +} + +static LONG xrandr10_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + XRRScreenConfiguration *screen_config; + Rotation rotation; + SizeID size_id; + Window root; + Status stat; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); return DISP_CHANGE_SUCCESSFUL; } - ERR("Resolution change not successful -- perhaps display has changed?\n"); - return DISP_CHANGE_FAILED; -} - -static void xrandr10_init_modes(void) -{ - XRRScreenSize *sizes; - int sizes_count; - int i, j, nmodes = 0; - - sizes = pXRRSizes( gdi_display, DefaultScreen(gdi_display), &sizes_count ); - if (sizes_count <= 0) return; - - TRACE("XRandR: found %d sizes.\n", sizes_count); - for (i = 0; i < sizes_count; ++i) + if (is_detached_mode(mode)) { - int rates_count; - short *rates; - - rates = pXRRRates( gdi_display, DefaultScreen(gdi_display), i, &rates_count ); - TRACE("- at %d: %dx%d (%d rates):", i, sizes[i].width, sizes[i].height, rates_count); - if (rates_count) - { - nmodes += rates_count; - for (j = 0; j < rates_count; ++j) - { - if (j > 0) - TRACE(","); - TRACE(" %d", rates[j]); - } - } - else - { - ++nmodes; - TRACE(" <default>"); - } - TRACE(" Hz\n"); + FIXME("Detaching adapters is unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; } - TRACE("XRandR modes: count=%d\n", nmodes); + if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp) + WARN("Cannot change screen bit depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel); - if (!(xrandr10_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr10_modes) * nmodes ))) - { - ERR("Failed to allocate xrandr mode info array.\n"); - return; - } + root = DefaultRootWindow( gdi_display ); + screen_config = pXRRGetScreenInfo( gdi_display, root ); + pXRRConfigCurrentConfiguration( screen_config, &rotation ); - dd_modes = X11DRV_Settings_SetHandlers( "XRandR 1.0", - xrandr10_get_current_mode, - xrandr10_set_current_mode, - nmodes, 1 ); + assert( mode->dmDriverExtra == sizeof(SizeID) ); + memcpy( &size_id, (BYTE *)mode + sizeof(*mode), sizeof(size_id) ); - xrandr_mode_count = 0; - for (i = 0; i < sizes_count; ++i) - { - int rates_count; - short *rates; + if (mode->dmFields & DM_DISPLAYFREQUENCY && mode->dmDisplayFrequency) + stat = pXRRSetScreenConfigAndRate( gdi_display, screen_config, root, size_id, rotation, + mode->dmDisplayFrequency, CurrentTime ); + else + stat = pXRRSetScreenConfig( gdi_display, screen_config, root, size_id, rotation, CurrentTime ); + pXRRFreeScreenConfigInfo( screen_config ); - rates = pXRRRates( gdi_display, DefaultScreen(gdi_display), i, &rates_count ); + if (stat != RRSetConfigSuccess) + return DISP_CHANGE_FAILED; - if (rates_count) - { - for (j = 0; j < rates_count; ++j) - { - X11DRV_Settings_AddOneMode( sizes[i].width, sizes[i].height, 0, rates[j] ); - xrandr10_modes[xrandr_mode_count++] = i; - } - } - else - { - X11DRV_Settings_AddOneMode( sizes[i].width, sizes[i].height, 0, 0 ); - xrandr10_modes[xrandr_mode_count++] = i; - } - } - - X11DRV_Settings_AddDepthModes(); - nmodes = X11DRV_Settings_GetModeCount(); - - TRACE("Available DD modes: count=%d\n", nmodes); - TRACE("Enabling XRandR\n"); + XFlush( gdi_display ); + return DISP_CHANGE_SUCCESSFUL; } #ifdef HAVE_XRRGETPROVIDERRESOURCES @@ -1432,7 +1457,14 @@ void X11DRV_XRandR_Init(void) TRACE("Found XRandR %d.%d.\n", major, minor); - xrandr10_init_modes(); + settings_handler.name = "XRandR 1.0"; + settings_handler.priority = 200; + settings_handler.get_id = xrandr10_get_id; + settings_handler.get_modes = xrandr10_get_modes; + settings_handler.free_modes = xrandr10_free_modes; + settings_handler.get_current_mode = xrandr10_get_current_mode; + settings_handler.set_current_mode = xrandr10_set_current_mode; + X11DRV_Settings_SetHandler( &settings_handler ); #ifdef HAVE_XRRGETPROVIDERRESOURCES if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) -- 2.25.1

1 0