Module: wine Branch: master Commit: 78b86e34464a30d57d342b0beb3aede740b06b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b86e34464a30d57d342b0beb...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Oct 22 14:37:00 2012 +0200
explorer: Remove support for the old-style X11 desktop configuration key.
---
programs/explorer/desktop.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 84f6fa3..c646f2d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -255,7 +255,6 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; MSG msg; HWND hwnd, msg_hwnd; @@ -288,27 +287,6 @@ void manage_desktop( WCHAR *arg ) { if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } - else /* check for the X11 driver key for backwards compatibility (to be removed) */ - { - static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; - static const WCHAR x11_keyW[] = {'S','o','f','t','w','a','r','e','\','W','i','n','e','\', - 'X','1','1',' ','D','r','i','v','e','r',0}; - HKEY hkey; - WCHAR buffer[64]; - DWORD size = sizeof(buffer); - - width = height = 0; - /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ - if (!RegOpenKeyW( HKEY_CURRENT_USER, x11_keyW, &hkey )) - { - if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size )) - { - name = defaultW; - if (!parse_size( buffer, &width, &height )) width = height = 0; - } - RegCloseKey( hkey ); - } - }
if (name && width && height) xwin = create_desktop( name, width, height );