February 2013 - Wine-commits

Daniel Jelinski : comctl32/listview: Always use large icon size when calculating icon spacing.
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: aeefa821858a1db188a59646345197b20a3e38f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeefa821858a1db188a596463… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:46:30 2013 +0100 comctl32/listview: Always use large icon size when calculating icon spacing. --- dlls/comctl32/listview.c | 35 ++++++++--------------------------- dlls/comctl32/tests/listview.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cee1154..96863f9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8586,18 +8586,18 @@ static DWORD LISTVIEW_SetHoverTime(LISTVIEW_INFO *infoPtr, DWORD dwHoverTime) */ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) { + INT iconWidth = 0, iconHeight = 0; DWORD oldspacing = MAKELONG(infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy); TRACE("requested=(%d,%d)\n", cx, cy); - - /* this is supported only for LVS_ICON style */ - if (infoPtr->uView != LV_VIEW_ICON) return oldspacing; - + /* set to defaults, if instructed to */ if (cx == -1 && cy == -1) { - cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + infoPtr->iconSize.cx; - cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + infoPtr->iconSize.cy; + if (infoPtr->himlNormal) + ImageList_GetIconSize(infoPtr->himlNormal, &iconWidth, &iconHeight); + cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + iconWidth; + cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + iconHeight; } /* if 0 then keep width */ if (cx != 0) @@ -9054,7 +9054,6 @@ static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL unicode) */ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) { - SIZE oldIconSize = infoPtr->iconSize; HIMAGELIST himl; if (infoPtr->uView == nView) return 1; @@ -9080,14 +9079,6 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) switch (nView) { case LV_VIEW_ICON: - if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy)) - { - TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", - oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, -1, -1); - } - LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); - break; case LV_VIEW_SMALLICON: LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); break; @@ -11016,7 +11007,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (uNewView != uOldView) { - SIZE oldIconSize = infoPtr->iconSize; HIMAGELIST himl; SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0); @@ -11027,17 +11017,8 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, himl = (uNewView == LVS_ICON ? infoPtr->himlNormal : infoPtr->himlSmall); set_icon_size(&infoPtr->iconSize, himl, uNewView != LVS_ICON); - - if (uNewView == LVS_ICON) - { - if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy)) - { - TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", - oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, -1, -1); - } - } - else if (uNewView == LVS_REPORT) + + if (uNewView == LVS_REPORT) { HDLAYOUT hl; WINDOWPOS wp; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2347bfa..c46fe42 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4656,6 +4656,16 @@ static void test_getitemspacing(void) expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); + /* spacing does not depend on selected view type */ + ret = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); + expect(0, ret); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* spacing + icon size returned */ + expect(cx + 40, LOWORD(ret)); + expect(cy + 40, HIWORD(ret)); + + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); ImageList_Destroy(himl40); DestroyWindow(hwnd); /* LVS_REPORT */

1 0

Alexandre Julliard : gdi32: Return the correct module handle for the initial display driver load.
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: 0d7108c6299588c047edb93b69ee9ad43f441a93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7108c6299588c047edb93b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 12:21:33 2013 +0100 gdi32: Return the correct module handle for the initial display driver load. --- dlls/gdi32/driver.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 82706c3..70208fb 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -100,11 +100,7 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) HMODULE module = 0; HKEY hkey; - if (display_driver) - { - *module_ret = display_driver->module; - return display_driver->funcs; /* already loaded */ - } + if (display_driver) goto done; strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -140,6 +136,8 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) FreeLibrary( driver->module ); HeapFree( GetProcessHeap(), 0, driver ); } +done: + *module_ret = display_driver->module; return display_driver->funcs; }

1 0

Alexandre Julliard : explorer: Retrieve the graphics driver module from gdi32.
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: 3e24a17c030d28c4e57376266b8c170fbb9f7570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e24a17c030d28c4e57376266… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 12:46:14 2013 +0100 explorer: Retrieve the graphics driver module from gdi32. --- programs/explorer/desktop.c | 24 ++++++++++++++++-------- programs/explorer/explorer_private.h | 2 +- programs/explorer/systray.c | 8 +++----- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 12888d8..a4f21bf 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -21,13 +21,14 @@ #include "config.h" #include "wine/port.h" #include <stdio.h> -#include "wine/unicode.h" #define OEMRESOURCE - #include <windows.h> #include <rpc.h> -#include <wine/debug.h> + +#include "wine/gdi_driver.h" +#include "wine/unicode.h" +#include "wine/debug.h" #include "explorer_private.h" WINE_DEFAULT_DEBUG_CHANNEL(explorer); @@ -35,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff +static HMODULE graphics_driver; static BOOL using_root; /* screen saver handler */ @@ -108,7 +110,6 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; - HMODULE x11drv = GetModuleHandleA( "winex11.drv" ); HDESK desktop; unsigned long xwin = 0; unsigned long (CDECL *create_desktop_func)(unsigned int, unsigned int); @@ -119,10 +120,10 @@ static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsi WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); ExitProcess( 1 ); } - /* magic: desktop "root" means use the X11 root window */ - if (x11drv && strcmpiW( name, rootW )) + /* magic: desktop "root" means use the root window */ + if (graphics_driver && strcmpiW( name, rootW )) { - create_desktop_func = (void *)GetProcAddress( x11drv, "wine_create_desktop" ); + create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); if (create_desktop_func) xwin = create_desktop_func( width, height ); } SetThreadDesktop( desktop ); @@ -260,8 +261,10 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { + static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; MSG msg; + HDC hdc; HWND hwnd, msg_hwnd; unsigned long xwin = 0; unsigned int width, height; @@ -293,6 +296,9 @@ void manage_desktop( WCHAR *arg ) if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } + hdc = CreateDCW( displayW, NULL, NULL, NULL ); + graphics_driver = __wine_get_driver_module( hdc ); + if (name && width && height) xwin = create_desktop( name, width, height ); if (!xwin) using_root = TRUE; /* using the root window */ @@ -308,6 +314,8 @@ void manage_desktop( WCHAR *arg ) msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); + DeleteDC( hdc ); + if (hwnd == GetDesktopWindow()) { HMODULE shell32; @@ -320,7 +328,7 @@ void manage_desktop( WCHAR *arg ) ClipCursor( NULL ); initialize_display_settings( hwnd ); initialize_appbar(); - initialize_systray( using_root ); + initialize_systray( graphics_driver, using_root ); if ((shell32 = LoadLibraryA( "shell32.dll" )) && (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index 44e0e39..74ca7f0 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -22,7 +22,7 @@ #define __WINE_EXPLORER_PRIVATE_H extern void manage_desktop( WCHAR *arg ); -extern void initialize_systray( BOOL using_root ); +extern void initialize_systray( HMODULE graphics_driver, BOOL using_root ); extern void initialize_appbar(void); #endif /* __WINE_EXPLORER_PRIVATE_H */ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 716335c..c15fbf0 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -629,14 +629,12 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l } /* this function creates the listener window */ -void initialize_systray( BOOL using_root ) +void initialize_systray( HMODULE graphics_driver, BOOL using_root ) { - HMODULE x11drv; WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - if ((x11drv = GetModuleHandleA( "winex11.drv" ))) - wine_notify_icon = (void *)GetProcAddress( x11drv, "wine_notify_icon" ); + wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER; @@ -651,7 +649,7 @@ void initialize_systray( BOOL using_root ) class.hIcon = LoadIconW(0, (LPCWSTR)IDI_WINLOGO); class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH) COLOR_WINDOW; - class.lpszClassName = (WCHAR *) &classname; + class.lpszClassName = classname; if (!RegisterClassExW(&class)) {

1 0

Alexandre Julliard : explorer: Return a simple boolean instead of a window in the wine_create_desktop entry point .
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: a73c5d5c8134ee87a98fc0ea7b7401a3518e08b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73c5d5c8134ee87a98fc0ea7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 12:49:41 2013 +0100 explorer: Return a simple boolean instead of a window in the wine_create_desktop entry point. --- dlls/winex11.drv/desktop.c | 10 ++++++---- programs/explorer/desktop.c | 17 +++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 8d9de20..5fbb860 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -130,7 +130,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) * * Create the X11 desktop window for the desktop mode. */ -Window CDECL X11DRV_create_desktop( UINT width, UINT height ) +BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) { XSetWindowAttributes win_attr; Window win; @@ -152,7 +152,9 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) win = XCreateWindow( display, DefaultRootWindow(display), 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); - if (win != None && width == screen_width && height == screen_height) + if (!win) return FALSE; + + if (width == screen_width && height == screen_height) { TRACE("setting desktop to fullscreen\n"); XChangeProperty( display, win, x11drv_atom(_NET_WM_STATE), XA_ATOM, 32, @@ -160,8 +162,8 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) 1); } XFlush( display ); - if (win != None) X11DRV_init_desktop( win, width, height ); - return win; + X11DRV_init_desktop( win, width, height ); + return TRUE; } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index a4f21bf..3e01f9f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -106,13 +106,13 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR } } -/* create the desktop and the associated X11 window, and make it the current desktop */ -static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) +/* create the desktop and the associated driver window, and make it the current desktop */ +static BOOL create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; HDESK desktop; - unsigned long xwin = 0; - unsigned long (CDECL *create_desktop_func)(unsigned int, unsigned int); + BOOL ret = FALSE; + BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); if (!desktop) @@ -124,10 +124,10 @@ static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsi if (graphics_driver && strcmpiW( name, rootW )) { create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); - if (create_desktop_func) xwin = create_desktop_func( width, height ); + if (create_desktop_func) ret = create_desktop_func( width, height ); } SetThreadDesktop( desktop ); - return xwin; + return ret; } /* parse the desktop size specification */ @@ -266,7 +266,6 @@ void manage_desktop( WCHAR *arg ) MSG msg; HDC hdc; HWND hwnd, msg_hwnd; - unsigned long xwin = 0; unsigned int width, height; WCHAR *cmdline = NULL; WCHAR *p = arg; @@ -299,9 +298,7 @@ void manage_desktop( WCHAR *arg ) hdc = CreateDCW( displayW, NULL, NULL, NULL ); graphics_driver = __wine_get_driver_module( hdc ); - if (name && width && height) xwin = create_desktop( name, width, height ); - - if (!xwin) using_root = TRUE; /* using the root window */ + if (name && width && height) using_root = !create_desktop( name, width, height ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL,

1 0

Alexandre Julliard : wintab32: Retrieve the graphics driver module from gdi32.
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: 0e5f84a148a33f60567bc29a8ae371ac572adc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5f84a148a33f60567bc29a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 13:19:43 2013 +0100 wintab32: Retrieve the graphics driver module from gdi32. --- dlls/wintab32/Makefile.in | 2 +- dlls/wintab32/wintab32.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 7425c7d..ab71e45 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -1,6 +1,6 @@ MODULE = wintab32.dll IMPORTLIB = wintab32 -IMPORTS = user32 +IMPORTS = user32 gdi32 C_SRCS = \ context.c \ diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 50daebd..51cba6a 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -25,8 +25,10 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" +#define NOFIX32 #include "wintab.h" #include "wintab_internal.h" +#include "wine/gdi_driver.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintab32); @@ -72,7 +74,6 @@ static VOID TABLET_Unregister(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { static const WCHAR name[] = {'T','a','b','l','e','t',0}; - HMODULE hx11drv; TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) @@ -80,16 +81,19 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) case DLL_PROCESS_ATTACH: TRACE("Initialization\n"); DisableThreadLibraryCalls(hInstDLL); - hx11drv = GetModuleHandleA("winex11.drv"); - if (hx11drv) + TABLET_Register(); + hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); + if (hwndDefault) { - pLoadTabletInfo = (void *)GetProcAddress(hx11drv, "LoadTabletInfo"); - pAttachEventQueueToTablet = (void *)GetProcAddress(hx11drv, "AttachEventQueueToTablet"); - pGetCurrentPacket = (void *)GetProcAddress(hx11drv, "GetCurrentPacket"); - pWTInfoW = (void *)GetProcAddress(hx11drv, "WTInfoW"); - TABLET_Register(); - hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, - WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); + HDC hdc = GetDC( hwndDefault ); + HMODULE module = __wine_get_driver_module( hdc ); + + pLoadTabletInfo = (void *)GetProcAddress(module, "LoadTabletInfo"); + pAttachEventQueueToTablet = (void *)GetProcAddress(module, "AttachEventQueueToTablet"); + pGetCurrentPacket = (void *)GetProcAddress(module, "GetCurrentPacket"); + pWTInfoW = (void *)GetProcAddress(module, "WTInfoW"); + ReleaseDC( hwndDefault, hdc ); } else return FALSE;

1 0

Michael Stefaniuc : ieframe: Let C look like C.
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: 0c183c4e7917c1c560d4b5e5da51a84ec2b7bdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c183c4e7917c1c560d4b5e5d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 10:59:50 2013 +0100 ieframe: Let C look like C. --- dlls/ieframe/intshcut.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 71373c7..d4b71a7 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -613,7 +613,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, STGM_READ|STGM_SHARE_EXCLUSIVE, &pPropStgRead); - if SUCCEEDED(hr) + if (SUCCEEDED(hr)) { hr = IPropertyStorage_ReadMultiple(pPropStgRead, 2, ps, pvread); if (hr == S_FALSE) @@ -622,7 +622,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam hr = S_OK; IPropertyStorage_Release(pPropStgRead); } - else if SUCCEEDED(hr) + else if (SUCCEEDED(hr)) { char indexString[50]; len = WideCharToMultiByte(CP_UTF8, 0, pvread[0].u.pwszVal, -1, NULL, 0, 0, 0); @@ -819,7 +819,7 @@ static InternetShortcut *create_shortcut(void) newshortcut->refCount = 1; hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); - if FAILED(hr) + if (FAILED(hr)) { TRACE("Failed to create the storage object needed for the shortcut.\n"); heap_free(newshortcut); @@ -827,7 +827,7 @@ static InternetShortcut *create_shortcut(void) } hr = IPropertySetStorage_Create(newshortcut->property_set_storage, &FMTID_Intshcut, NULL, PROPSETFLAG_DEFAULT, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &dummy); - if FAILED(hr) + if (FAILED(hr)) { TRACE("Failed to create the property object needed for the shortcut.\n"); IPropertySetStorage_Release(newshortcut->property_set_storage);

1 0

Ken Thomases : winemac: Implement Beep().
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: 3fcb69b7ca0c2f301b278949f80d3e09f904e18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fcb69b7ca0c2f301b278949f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:36:49 2013 -0600 winemac: Implement Beep(). --- dlls/winemac.drv/cocoa_app.m | 12 ++++++++++++ dlls/winemac.drv/keyboard.c | 9 +++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index cd09f95..3853ec9 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -373,3 +373,15 @@ CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard_type, return result; } + +/*********************************************************************** + * macdrv_beep + * + * Play the beep sound configured by the user in System Preferences. + */ +void macdrv_beep(void) +{ + OnMainThreadAsync(^{ + NSBeep(); + }); +} diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index b41f55a..d67a20c 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -765,6 +765,15 @@ void macdrv_keyboard_changed(const macdrv_event *event) /*********************************************************************** + * Beep (MACDRV.@) + */ +void CDECL macdrv_Beep(void) +{ + macdrv_beep(); +} + + +/*********************************************************************** * ToUnicodeEx (MACDRV.@) * * The ToUnicode function translates the specified virtual-key code and keyboard diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 62bc996..242a78e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -115,6 +115,7 @@ extern int macdrv_err_on; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_beep(void) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index a227187..f4502ea 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -4,6 +4,7 @@ # USER driver +@ cdecl Beep() macdrv_Beep @ cdecl CreateDesktopWindow(long) macdrv_CreateDesktopWindow @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyWindow(long) macdrv_DestroyWindow

1 0

Ken Thomases : winemac: Implement MapVirtualKeyEx().
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: a649d845ed52903cac6c3f1e459c5f74befd11b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a649d845ed52903cac6c3f1e4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:36:52 2013 -0600 winemac: Implement MapVirtualKeyEx(). --- dlls/winemac.drv/keyboard.c | 125 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index d67a20c..e969359 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -774,6 +774,131 @@ void CDECL macdrv_Beep(void) /*********************************************************************** + * MapVirtualKeyEx (MACDRV.@) + */ +UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) +{ + struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); + UINT ret = 0; + int keyc; + + TRACE("wCode=0x%x, wMapType=%d, hkl %p\n", wCode, wMapType, hkl); + + switch (wMapType) + { + case MAPVK_VK_TO_VSC: /* vkey-code to scan-code */ + case MAPVK_VK_TO_VSC_EX: + switch (wCode) + { + case VK_SHIFT: wCode = VK_LSHIFT; break; + case VK_CONTROL: wCode = VK_LCONTROL; break; + case VK_MENU: wCode = VK_LMENU; break; + } + + /* vkey -> keycode -> scan */ + for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + { + if (thread_data->keyc2vkey[keyc] == wCode) + { + ret = thread_data->keyc2scan[keyc] & 0xFF; + break; + } + } + break; + + case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */ + case MAPVK_VSC_TO_VK_EX: + /* scan -> keycode -> vkey */ + for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + if ((thread_data->keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) + { + ret = thread_data->keyc2vkey[keyc]; + /* Only stop if it's not a numpad vkey; otherwise keep + looking for a potential better vkey. */ + if (ret && (ret < VK_NUMPAD0 || VK_DIVIDE < ret)) + break; + } + + if (wMapType == MAPVK_VSC_TO_VK) + switch (ret) + { + case VK_LSHIFT: + case VK_RSHIFT: + ret = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + ret = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + ret = VK_MENU; break; + } + + break; + + case MAPVK_VK_TO_CHAR: /* vkey-code to character */ + { + /* vkey -> keycode -> (UCKeyTranslate) wide char */ + struct macdrv_thread_data *thread_data = macdrv_thread_data(); + const UCKeyboardLayout *uchr; + UniChar s[10]; + OSStatus status; + UInt32 deadKeyState; + UniCharCount len; + BOOL deadKey = FALSE; + + if ((VK_PRIOR <= wCode && wCode <= VK_HELP) || + (VK_F1 <= wCode && wCode <= VK_F24)) + break; + + if (!thread_data || !thread_data->keyboard_layout_uchr) + { + WARN("No keyboard layout uchr data\n"); + break; + } + + uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); + + /* Find the Mac keycode corresponding to the vkey */ + for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + if (thread_data->keyc2vkey[keyc] == wCode) break; + + if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + { + WARN("Unknown virtual key %X\n", wCode); + break; + } + + TRACE("Found keycode %u\n", keyc); + + deadKeyState = 0; + status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, 0, + thread_data->keyboard_type, 0, &deadKeyState, + sizeof(s)/sizeof(s[0]), &len, s); + if (status == noErr && !len && deadKeyState) + { + deadKey = TRUE; + deadKeyState = 0; + status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, 0, + thread_data->keyboard_type, kUCKeyTranslateNoDeadKeysMask, + &deadKeyState, sizeof(s)/sizeof(s[0]), &len, s); + } + + if (status == noErr && len) + ret = toupperW(s[0]) | (deadKey ? 0x80000000 : 0); + + break; + } + default: /* reserved */ + FIXME("Unknown wMapType %d\n", wMapType); + break; + } + + TRACE("returning 0x%04x\n", ret); + return ret; +} + + +/*********************************************************************** * ToUnicodeEx (MACDRV.@) * * The ToUnicode function translates the specified virtual-key code and keyboard diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index f4502ea..0d91bd8 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -10,6 +10,7 @@ @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo +@ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx @ cdecl ScrollDC(long long long ptr ptr long ptr) macdrv_ScrollDC @ cdecl SetFocus(long) macdrv_SetFocus

1 0

Ken Thomases : winemac: Implement VkKeyScanEx().
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: 80baa3a0e9389c0a79731c70d42645ff885b0b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80baa3a0e9389c0a79731c70d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:36:57 2013 -0600 winemac: Implement VkKeyScanEx(). --- dlls/winemac.drv/keyboard.c | 73 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index e969359..ecd89fc 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1087,3 +1087,76 @@ done: TRACE_(key)("returning %d / %s\n", ret, debugstr_wn(bufW, abs(ret))); return ret; } + + +/*********************************************************************** + * VkKeyScanEx (MACDRV.@) + * + * Note: Windows ignores HKL parameter and uses current active layout instead + */ +SHORT CDECL macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl) +{ + struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); + SHORT ret = -1; + int state; + const UCKeyboardLayout *uchr; + + TRACE("%04x, %p\n", wChar, hkl); + + uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); + if (!uchr) + { + TRACE("no keyboard layout UCHR data; returning -1\n"); + return -1; + } + + for (state = 0; state < 8; state++) + { + UInt32 modifierKeyState = 0; + int keyc; + + if (state & 1) + modifierKeyState |= (shiftKey >> 8); + if ((state & 6) == 6) + modifierKeyState |= (optionKey >> 8); + else + { + if (state & 2) + modifierKeyState |= (controlKey >> 8); + if (state & 4) + modifierKeyState |= (cmdKey >> 8); + } + + for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0]); keyc++) + { + UInt32 deadKeyState = 0; + UniChar uchar; + UniCharCount len; + OSStatus status; + + if (!thread_data->keyc2vkey[keyc]) continue; + + status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, modifierKeyState, + thread_data->keyboard_type, 0, &deadKeyState, + 1, &len, &uchar); + if (status == noErr && len == 1 && uchar == wChar) + { + WORD vkey = thread_data->keyc2vkey[keyc]; + + ret = vkey | (state << 8); + if ((VK_NUMPAD0 <= vkey && vkey <= VK_DIVIDE) || + keyc == kVK_ANSI_KeypadClear || keyc == kVK_ANSI_KeypadEnter || + keyc == kVK_ANSI_KeypadEquals) + { + /* Keep searching for a non-numpad match, which is preferred. */ + } + else + goto done; + } + } + } + +done: + TRACE(" -> 0x%04x\n", ret); + return ret; +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 0d91bd8..754f697 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -22,6 +22,7 @@ @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow +@ cdecl VkKeyScanEx(long long) macdrv_VkKeyScanEx @ cdecl WindowMessage(long long long long) macdrv_WindowMessage @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) macdrv_WindowPosChanged @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) macdrv_WindowPosChanging

1 0

Ken Thomases : winemac: Implement GetKeyNameText().
by Alexandre Julliard 06 Feb '13

06 Feb '13

Module: wine Branch: master Commit: 2b4d95cd477da28ead3caa970a46d3a4fa249e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4d95cd477da28ead3caa970… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:37:00 2013 -0600 winemac: Implement GetKeyNameText(). --- dlls/winemac.drv/keyboard.c | 171 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index ecd89fc..ae8df76 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -312,6 +312,88 @@ static const struct { }; +static const struct { + DWORD vkey; + const char *name; +} vkey_names[] = { + { VK_ADD, "Num +" }, + { VK_BACK, "Backspace" }, + { VK_CAPITAL, "Caps Lock" }, + { VK_CONTROL, "Ctrl" }, + { VK_DECIMAL, "Num Del" }, + { VK_DELETE | 0x100, "Delete" }, + { VK_DIVIDE | 0x100, "Num /" }, + { VK_DOWN | 0x100, "Down" }, + { VK_END | 0x100, "End" }, + { VK_ESCAPE, "Esc" }, + { VK_F1, "F1" }, + { VK_F2, "F2" }, + { VK_F3, "F3" }, + { VK_F4, "F4" }, + { VK_F5, "F5" }, + { VK_F6, "F6" }, + { VK_F7, "F7" }, + { VK_F8, "F8" }, + { VK_F9, "F9" }, + { VK_F10, "F10" }, + { VK_F11, "F11" }, + { VK_F12, "F12" }, + { VK_F13, "F13" }, + { VK_F14, "F14" }, + { VK_F15, "F15" }, + { VK_F16, "F16" }, + { VK_F17, "F17" }, + { VK_F18, "F18" }, + { VK_F19, "F19" }, + { VK_F20, "F20" }, + { VK_F21, "F21" }, + { VK_F22, "F22" }, + { VK_F23, "F23" }, + { VK_F24, "F24" }, + { VK_HELP | 0x100, "Help" }, + { VK_HOME | 0x100, "Home" }, + { VK_INSERT | 0x100, "Insert" }, + { VK_LCONTROL, "Ctrl" }, + { VK_LEFT | 0x100, "Left" }, + { VK_LMENU, "Alt" }, + { VK_LSHIFT, "Shift" }, + { VK_LWIN | 0x100, "Win" }, + { VK_MENU, "Alt" }, + { VK_MULTIPLY, "Num *" }, + { VK_NEXT | 0x100, "Page Down" }, + { VK_NUMLOCK | 0x100, "Num Lock" }, + { VK_NUMPAD0, "Num 0" }, + { VK_NUMPAD1, "Num 1" }, + { VK_NUMPAD2, "Num 2" }, + { VK_NUMPAD3, "Num 3" }, + { VK_NUMPAD4, "Num 4" }, + { VK_NUMPAD5, "Num 5" }, + { VK_NUMPAD6, "Num 6" }, + { VK_NUMPAD7, "Num 7" }, + { VK_NUMPAD8, "Num 8" }, + { VK_NUMPAD9, "Num 9" }, + { VK_OEM_CLEAR, "Num Clear" }, + { VK_OEM_NEC_EQUAL | 0x100, "Num =" }, + { VK_PRIOR | 0x100, "Page Up" }, + { VK_RCONTROL | 0x100, "Right Ctrl" }, + { VK_RETURN, "Return" }, + { VK_RETURN | 0x100, "Num Enter" }, + { VK_RIGHT | 0x100, "Right" }, + { VK_RMENU | 0x100, "Right Alt" }, + { VK_RSHIFT, "Right Shift" }, + { VK_RWIN | 0x100, "Right Win" }, + { VK_SEPARATOR, "Num ," }, + { VK_SHIFT, "Shift" }, + { VK_SPACE, "Space" }, + { VK_SUBTRACT, "Num -" }, + { VK_TAB, "Tab" }, + { VK_UP | 0x100, "Up" }, + { VK_VOLUME_DOWN | 0x100, "Volume Down" }, + { VK_VOLUME_MUTE | 0x100, "Mute" }, + { VK_VOLUME_UP | 0x100, "Volume Up" }, +}; + + static BOOL char_matches_string(WCHAR wchar, UniChar *string, BOOL ignore_diacritics) { BOOL ret; @@ -774,6 +856,95 @@ void CDECL macdrv_Beep(void) /*********************************************************************** + * GetKeyNameText (MACDRV.@) + */ +INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) +{ + struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); + int scan, keyc; + + scan = (lparam >> 16) & 0x1FF; + for (keyc = 0; keyc < sizeof(thread_data->keyc2scan)/sizeof(thread_data->keyc2scan[0]); keyc++) + { + if (thread_data->keyc2scan[keyc] == scan) + { + static const WCHAR dead[] = {' ','d','e','a','d',0}; + const UCKeyboardLayout *uchr; + UInt32 deadKeyState = 0; + UniCharCount len; + OSStatus status; + + uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); + status = UCKeyTranslate(uchr, keyc, kUCKeyActionDisplay, 0, thread_data->keyboard_type, + 0, &deadKeyState, size - 1, &len, (UniChar*)buffer); + if (status != noErr) + len = 0; + if (len && isgraphW(buffer[0])) + buffer[len] = 0; + else + { + DWORD vkey = thread_data->keyc2vkey[keyc]; + int i; + + if (scan & 0x100) vkey |= 0x100; + + if (lparam & (1 << 25)) + { + /* Caller doesn't care about distinctions between left and + right keys. */ + switch (vkey) + { + case VK_LSHIFT: + case VK_RSHIFT: + vkey = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + vkey = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + vkey = VK_MENU; break; + } + } + + len = 0; + for (i = 0; i < sizeof(vkey_names) / sizeof(vkey_names[0]); i++) + { + if (vkey_names[i].vkey == vkey) + { + len = MultiByteToWideChar(CP_UTF8, 0, vkey_names[i].name, -1, buffer, size); + if (len) len--; + break; + } + } + + if (!len) + { + static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; + snprintfW(buffer, size, format, vkey); + len = strlenW(buffer); + } + } + + if (!len) + break; + + if (status == noErr && deadKeyState) + { + lstrcpynW(buffer + len, dead, size - len); + len = strlenW(buffer); + } + + TRACE("lparam 0x%08x -> %s\n", lparam, debugstr_w(buffer)); + return len; + } + } + + WARN("found no name for lparam 0x%08x\n", lparam); + return 0; +} + + +/*********************************************************************** * MapVirtualKeyEx (MACDRV.@) */ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 754f697..1bb7d8c 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -9,6 +9,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors +@ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx

1 0