February 2013 - Wine-Commits

Ken Thomases : winemac: Implement VkKeyScanEx().
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

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 MapVirtualKeyEx().
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

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

Alexandre Julliard : explorer: Return a simple boolean instead of a window in the wine_create_desktop entry point .
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

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 : explorer: Retrieve the graphics driver module from gdi32.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

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

Daniel Jelinski : comctl32/listview: Always use large icon size when calculating icon spacing.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

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

Daniel Jelinski : comctl32/listview: Correct icon spacing calculation when set to 0 or -1.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: cb77ab1a004be9092590414212fb7bd109d9236a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb77ab1a004be909259041421… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:42:44 2013 +0100 comctl32/listview: Correct icon spacing calculation when set to 0 or -1. --- dlls/comctl32/listview.c | 40 ++++++++++-------------- dlls/comctl32/tests/listview.c | 65 ++++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8031d37..cee1154 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8,6 +8,7 @@ * Copyright 2002 Dimitrie O. Paun * Copyright 2009-2013 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers + * Copyright 2012-2013 Daniel Jelinski * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -8593,28 +8594,21 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) if (infoPtr->uView != LV_VIEW_ICON) return oldspacing; /* set to defaults, if instructed to */ - if (cx == -1) cx = GetSystemMetrics(SM_CXICONSPACING); - if (cy == -1) cy = GetSystemMetrics(SM_CYICONSPACING); - - /* if 0 then compute width - * FIXME: computed cx and cy is not matching native behaviour */ - if (cx == 0) { - cx = GetSystemMetrics(SM_CXICONSPACING); - if (infoPtr->iconSize.cx + ICON_LR_PADDING > cx) - cx = infoPtr->iconSize.cx + ICON_LR_PADDING; + 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 0 then keep width */ + if (cx != 0) + infoPtr->iconSpacing.cx = cx; - /* if 0 then compute height */ - if (cy == 0) - cy = infoPtr->iconSize.cy + 2 * infoPtr->ntmHeight + - ICON_BOTTOM_PADDING + ICON_TOP_PADDING + LABEL_VERT_PADDING; - - - infoPtr->iconSpacing.cx = cx; - infoPtr->iconSpacing.cy = cy; + /* if 0 then keep height */ + if (cy != 0) + infoPtr->iconSpacing.cy = cy; TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%d,%d), ntmH=%d\n", - LOWORD(oldspacing), HIWORD(oldspacing), cx, cy, + LOWORD(oldspacing), HIWORD(oldspacing), infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy, infoPtr->ntmHeight); @@ -8666,7 +8660,7 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himl; if (infoPtr->uView == LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); break; case LVSIL_SMALL: @@ -9090,7 +9084,7 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) { TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); } LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); break; @@ -9389,8 +9383,8 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->bRedraw = TRUE; infoPtr->bNoItemMetrics = TRUE; infoPtr->bDoChangeNotify = TRUE; - infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING); - infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING); + infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); + infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); infoPtr->nEditLabelItem = -1; infoPtr->nLButtonDownItem = -1; infoPtr->dwHoverTime = HOVER_DEFAULT; /* default system hover time */ @@ -11040,7 +11034,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, { TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); } } else if (uNewView == LVS_REPORT) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2fb7cb5..2347bfa 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4598,9 +4598,7 @@ static void test_getitemspacing(void) HWND hwnd; DWORD ret; INT cx, cy; - HIMAGELIST himl; - HBITMAP hbmp; - LVITEMA itema; + HIMAGELIST himl40, himl80; cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); @@ -4608,56 +4606,71 @@ static void test_getitemspacing(void) /* LVS_ICON */ hwnd = create_listview_control(LVS_ICON); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + /* now try with icons */ - himl = ImageList_Create(40, 40, 0, 4, 4); - ok(himl != NULL, "failed to create imagelist\n"); - hbmp = CreateBitmap(40, 40, 1, 1, NULL); - ok(hbmp != NULL, "failed to create bitmap\n"); - ret = ImageList_Add(himl, hbmp, 0); - expect(0, ret); - ret = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); + himl40 = ImageList_Create(40, 40, 0, 4, 4); + ok(himl40 != NULL, "failed to create imagelist\n"); + himl80 = ImageList_Create(80, 80, 0, 4, 4); + ok(himl80 != NULL, "failed to create imagelist\n"); + ret = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); expect(0, ret); - itema.mask = LVIF_IMAGE; - itema.iImage = 0; - itema.iItem = 0; - itema.iSubItem = 0; - ret = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM)&itema); - expect(0, ret); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret)); expect(cy + 40, HIWORD(ret)); -} + /* try changing icon size */ + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl80); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* spacing + icon size returned */ + expect(cx + 80, LOWORD(ret)); + expect(cy + 80, HIWORD(ret)); + + /* set own icon spacing */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(100, 100)); + expect(cx + 80, LOWORD(ret)); + expect(cy + 80, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* set size returned */ + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + /* now change image list - icon spacing should be unaffected */ + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); + + 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(himl80); DestroyWindow(hwnd); /* LVS_SMALLICON */ hwnd = create_listview_control(LVS_SMALLICON); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + + ImageList_Destroy(himl40); DestroyWindow(hwnd); /* LVS_REPORT */ hwnd = create_listview_control(LVS_REPORT); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + DestroyWindow(hwnd); /* LVS_LIST */ hwnd = create_listview_control(LVS_LIST); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + DestroyWindow(hwnd); }

1 0

Frédéric Delanoy : msi: Fix memory leak (coverity ).
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 72989b5b0335d203aa0afc478982acf9e0466b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72989b5b0335d203aa0afc478… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 2 09:56:53 2013 +0100 msi: Fix memory leak (coverity). --- dlls/msi/msi.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 6a623e7..c1f4fcc 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3178,7 +3178,11 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, msi_free( version ); return GetLastError(); } - if (!verbuf && !verlen && !langbuf && !langlen) return ERROR_SUCCESS; + if (!verbuf && !verlen && !langbuf && !langlen) + { + msi_free( version ); + return ERROR_SUCCESS; + } if (verlen) { if (VerQueryValueW( version, szVersionResource, (LPVOID *)&ffi, &len ) && len > 0)

1 0

Alistair Leslie-Hughes : fusion: Return correct error for null public token .
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 575571c9fcd64a0f5276aff6b6401a659eafef72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=575571c9fcd64a0f5276aff6b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 31 16:08:38 2013 +1100 fusion: Return correct error for null public token. --- dlls/fusion/asmname.c | 4 ++++ dlls/fusion/tests/asmcache.c | 19 +++++++++++++++++++ include/corerror.h | 1 + 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 162a76b..fa84e53 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -561,6 +561,10 @@ static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) { int i; BYTE val; + static const WCHAR nullstr[] = {'n','u','l','l',0}; + + if(lstrcmpiW(pubkey, nullstr) == 0) + return FUSION_E_PRIVATE_ASM_DISALLOWED; if (lstrlenW(pubkey) < CHARS_PER_PUBKEY) return FUSION_E_INVALID_NAME; diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index e97cfbe..320a938 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1016,6 +1016,13 @@ static void test_QueryAssemblyInfo(void) 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=', '2','d','0','3','6','1','7','b','1','c','3','1','e','2','f','5',',', 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; + static const WCHAR nullpublickey[] = { + 'm','s','c','o','r','l','i','b','.','d','l','l',',','v','e','r','s','i','o','n','=','0','.','0','.', + '0','.','0',',','c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','l','l',0}; + static const WCHAR nullpublickey1[] = { + 'm','s','c','o','r','l','i','b','.','d','l','l',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','L','l',0}; size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, asmpath, &size); @@ -1386,6 +1393,18 @@ static void test_QueryAssemblyInfo(void) "Assembly path was changed\n"); ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); + /* display name is "mscorlib.dll,version=0.0.0.0,culture=neutral,publicKeyToken=null" */ + INIT_ASM_INFO(); + lstrcpyW(name, nullpublickey); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == FUSION_E_PRIVATE_ASM_DISALLOWED, "got %08x\n", hr); + + /* display name is "mscorlib.dll,publicKeyToken=nuLl" */ + INIT_ASM_INFO(); + lstrcpyW(name, nullpublickey1); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == FUSION_E_PRIVATE_ASM_DISALLOWED, "got %08x\n", hr); + /* display name is "wine, Culture=neutral" */ INIT_ASM_INFO(); lstrcpyW(name, wine); diff --git a/include/corerror.h b/include/corerror.h index 1537f93..3ddfe47 100644 --- a/include/corerror.h +++ b/include/corerror.h @@ -119,6 +119,7 @@ #define COR_E_HOSTPROTECTION EMAKEHR(0x1640) #define COR_E_ILLEGAL_REENTRANCY EMAKEHR(0x1641) +#define FUSION_E_PRIVATE_ASM_DISALLOWED EMAKEHR(0x1044) #define FUSION_E_INVALID_NAME EMAKEHR(0x1047) #define CLDB_E_FILE_OLDVER EMAKEHR(0x1107)

1 0

Michael Stefaniuc : wined3d: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 50a9fb579c592b56ec3ec0ff0a00d671cde46bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a9fb579c592b56ec3ec0ff0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 5 15:49:14 2013 +0100 wined3d: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/wined3d/ati_fragment_shader.c | 4 +--- dlls/wined3d/buffer.c | 5 ----- dlls/wined3d/context.c | 3 --- dlls/wined3d/device.c | 4 +--- dlls/wined3d/directx.c | 3 --- dlls/wined3d/glsl_shader.c | 3 --- dlls/wined3d/palette.c | 3 --- dlls/wined3d/query.c | 3 --- dlls/wined3d/sampler.c | 3 --- dlls/wined3d/shader.c | 12 ------------ dlls/wined3d/shader_sm1.c | 3 --- dlls/wined3d/stateblock.c | 3 --- dlls/wined3d/surface.c | 3 --- dlls/wined3d/swapchain.c | 3 --- dlls/wined3d/texture.c | 3 --- dlls/wined3d/vertexdeclaration.c | 3 --- dlls/wined3d/view.c | 3 --- dlls/wined3d/volume.c | 1 - 18 files changed, 2 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50a9fb579c592b56ec3ec…

1 0

Marcus Meissner : comdlg32: Free files on errorpath (Coverity).
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: fd9becb9073026107346e042908dfc4a906a8739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9becb9073026107346e0429… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 31 18:26:47 2013 +0100 comdlg32: Free files on errorpath (Coverity). --- dlls/comdlg32/itemdlg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 96ee5dc..33398b5 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -407,7 +407,7 @@ static HRESULT on_default_action(FileDialogImpl *This) IShellFolder *psf_parent, *psf_desktop; LPITEMIDLIST *pidla; LPITEMIDLIST current_folder; - LPWSTR fn_iter, files, tmp_files; + LPWSTR fn_iter, files = NULL, tmp_files; UINT file_count = 0, len, i; int open_action; HRESULT hr, ret = E_FAIL; @@ -425,6 +425,7 @@ static HRESULT on_default_action(FileDialogImpl *This) if(FAILED(hr)) { ERR("Failed to get pidl for current directory.\n"); + HeapFree(GetProcessHeap(), 0, files); return hr; }

1 0