April 2009 - Wine-commits - list.winehq.org

Christian Costa : mciqtz32: Use opened state to avoid device to be closed several times.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 1506e226632596ff5ba12db3ed1828296111780b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1506e226632596ff5ba12db3e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 16 20:29:00 2009 +0200 mciqtz32: Use opened state to avoid device to be closed several times. --- dlls/mciqtz32/mciqtz.c | 12 ++++++------ dlls/mciqtz32/mciqtz_private.h | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 0cd973b..da3e09a 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -185,6 +185,8 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, goto err; } + wma->opened = TRUE; + return 0; err: @@ -215,14 +217,12 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP if (!wma) return MCIERR_INVALID_DEVICE_ID; - if (wma->pgraph) + if (wma->opened) { IGraphBuilder_Release(wma->pgraph); - wma->pgraph = NULL; - if (wma->pmctrl) IMediaControl_Release(wma->pmctrl); - wma->pmctrl = NULL; - - CoUninitialize(); + CoUninitialize(); + wma->opened = FALSE; + } return 0; } diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index cbcece0..23945a4 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -27,6 +27,7 @@ typedef struct { MCIDEVICEID wDevID; + BOOL opened; IGraphBuilder* pgraph; IMediaControl* pmctrl; BOOL started;

1 0

Vitaliy Margolen : dinput: Make EnumDevices and GetObjectInfo consistent about GUIDs.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: fc4f1607a6928e7fa36140bf6c753a69e96f92b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4f1607a6928e7fa36140bf6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 19 20:33:22 2009 -0600 dinput: Make EnumDevices and GetObjectInfo consistent about GUIDs. guidInstance should be the same from both places. --- dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linux.c | 2 ++ dlls/dinput/joystick_osx.c | 2 ++ dlls/dinput/joystick_private.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 6e7e7ef..fbf05ec 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -332,7 +332,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( } /* Return joystick */ - pdidi->guidInstance = GUID_Joystick; + pdidi->guidInstance = This->guidInstance; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; @@ -365,7 +365,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( } /* Return joystick */ - pdidi->guidInstance = GUID_Joystick; + pdidi->guidInstance = This->guidInstance; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index afabebe..fcf1552 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -379,6 +379,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di return DIERR_DEVICENOTREG; } + newDevice->generic.guidInstance = DInput_Wine_Joystick_GUID; + newDevice->generic.guidInstance.Data3 = index; newDevice->generic.guidProduct = DInput_Wine_Joystick_GUID; newDevice->generic.joy_polldev = joy_polldev; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index d5a5f17..7305bb9 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -650,6 +650,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di newDevice->id = index; + newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; + newDevice->generic.guidInstance.Data3 = index; newDevice->generic.guidProduct = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.joy_polldev = poll_osx_device_state; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index b61406f..803e0dd 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -41,6 +41,7 @@ typedef struct JoystickGenericImpl DIDEVCAPS devcaps; DIJOYSTATE2 js; /* wine data */ GUID guidProduct; + GUID guidInstance; char *name; joy_polldev_handler *joy_polldev;

1 0

Vitaliy Margolen : dinput: Remove redundant stuff.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: aee42377984ab01c4aef0885780a707b606ec333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee42377984ab01c4aef08857… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 19 20:33:25 2009 -0600 dinput: Remove redundant stuff. --- dlls/dinput/joystick.c | 34 ---------------------------------- dlls/dinput/joystick_linux.c | 6 +++--- dlls/dinput/joystick_osx.c | 8 ++++---- dlls/dinput/joystick_private.h | 4 ---- 4 files changed, 7 insertions(+), 45 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index fbf05ec..d57ef7b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -32,40 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); /****************************************************************************** - * Acquire : gets exclusive control of the joystick - */ -HRESULT WINAPI JoystickAGenericImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; - - TRACE("(%p)\n",This); - - if (This->base.acquired) { - WARN("already acquired\n"); - return S_FALSE; - } - - This->base.acquired = 1; - - return DI_OK; -} - -/****************************************************************************** - * Unacquire : frees the joystick - */ -HRESULT WINAPI JoystickAGenericImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; - HRESULT res; - - TRACE("(%p)\n",This); - - if ((res = IDirectInputDevice2AImpl_Unacquire(iface)) != DI_OK) return res; - - return DI_OK; -} - -/****************************************************************************** * SetProperty : change input device properties */ HRESULT WINAPI JoystickAGenericImpl_SetProperty( diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index fcf1552..c7facab 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -611,7 +611,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) TRACE("(%p)\n",This); - res = JoystickAGenericImpl_Acquire(iface); + res = IDirectInputDevice2AImpl_Acquire(iface); if (res != DI_OK) return res; @@ -622,7 +622,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) This->joyfd=open(This->dev,O_RDONLY); if (This->joyfd==-1) { ERR("open(%s) failed: %s\n", This->dev, strerror(errno)); - JoystickAGenericImpl_Unacquire(iface); + IDirectInputDevice2AImpl_Unacquire(iface); return DIERR_NOTFOUND; } } @@ -640,7 +640,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) TRACE("(%p)\n",This); - res = JoystickAGenericImpl_Unacquire(iface); + res = IDirectInputDevice2AImpl_Unacquire(iface); if (res != DI_OK) return res; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 7305bb9..1446b6e 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -865,8 +865,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_EnumObjects, JoystickAGenericImpl_GetProperty, JoystickAGenericImpl_SetProperty, - JoystickAGenericImpl_Acquire, - JoystickAGenericImpl_Unacquire, + IDirectInputDevice2AImpl_Acquire, + IDirectInputDevice2AImpl_Unacquire, JoystickAGenericImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, @@ -907,8 +907,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)JoystickAGenericImpl_GetProperty, XCAST(SetProperty)JoystickAGenericImpl_SetProperty, - XCAST(Acquire)JoystickAGenericImpl_Acquire, - XCAST(Unacquire)JoystickAGenericImpl_Unacquire, + XCAST(Acquire)IDirectInputDevice2AImpl_Acquire, + XCAST(Unacquire)IDirectInputDevice2AImpl_Unacquire, XCAST(GetDeviceState)JoystickAGenericImpl_GetDeviceState, XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 803e0dd..d1f1666 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -79,8 +79,4 @@ HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface); HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr); -HRESULT WINAPI JoystickAGenericImpl_Acquire(LPDIRECTINPUTDEVICE8A iface); - -HRESULT WINAPI JoystickAGenericImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface); - #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Vitaliy Margolen : dinput: Make props array a part of the generic joystick struct.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 3223798d30d7ff81b57ec3a598ab7270be87c599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3223798d30d7ff81b57ec3a59… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 19 20:33:27 2009 -0600 dinput: Make props array a part of the generic joystick struct. It's much easier to free it on release. --- dlls/dinput/joystick_linux.c | 6 ------ dlls/dinput/joystick_osx.c | 6 ------ dlls/dinput/joystick_private.h | 4 +++- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index c7facab..3a8487b 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -462,11 +462,6 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di } newDevice->generic.base.data_format.wine_df = df; - /* create default properties */ - newDevice->generic.props = HeapAlloc(GetProcessHeap(),0,c_dfDIJoystick2.dwNumObjs*sizeof(ObjProps)); - if (newDevice->generic.props == 0) - goto FAILED; - /* initialize default properties */ for (i = 0; i < c_dfDIJoystick2.dwNumObjs; i++) { newDevice->generic.props[i].lDevMin = -32767; @@ -510,7 +505,6 @@ FAILED1: release_DataFormat(&newDevice->generic.base.data_format); HeapFree(GetProcessHeap(),0,newDevice->axis_map); HeapFree(GetProcessHeap(),0,newDevice->generic.name); - HeapFree(GetProcessHeap(),0,newDevice->generic.props); HeapFree(GetProcessHeap(),0,newDevice); *pdev = 0; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 1446b6e..8d7f209 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -724,11 +724,6 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di } newDevice->generic.base.data_format.wine_df = df; - /* create default properties */ - newDevice->generic.props = HeapAlloc(GetProcessHeap(),0,c_dfDIJoystick2.dwNumObjs*sizeof(ObjProps)); - if (newDevice->generic.props == 0) - goto FAILED; - /* initialize default properties */ get_osx_device_elements_props(newDevice); @@ -761,7 +756,6 @@ FAILED: HeapFree(GetProcessHeap(), 0, df); release_DataFormat(&newDevice->generic.base.data_format); HeapFree(GetProcessHeap(),0,newDevice->generic.name); - HeapFree(GetProcessHeap(),0,newDevice->generic.props); HeapFree(GetProcessHeap(),0,newDevice); *pdev = 0; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index d1f1666..265c7f0 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -29,6 +29,8 @@ #include "dinput_private.h" #include "device_private.h" +/* Number of objects in the default data format */ +#define MAX_PROPS 164 struct JoystickGenericImpl; typedef void joy_polldev_handler(struct JoystickGenericImpl *This); @@ -37,7 +39,7 @@ typedef struct JoystickGenericImpl { struct IDirectInputDevice2AImpl base; - ObjProps *props; + ObjProps props[MAX_PROPS]; DIDEVCAPS devcaps; DIJOYSTATE2 js; /* wine data */ GUID guidProduct;

1 0

Vitaliy Margolen : dinput: Convert evdev joystick to new base class.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 649c762f524c3fd8d62ff97aed623fa495b7b1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649c762f524c3fd8d62ff97ae… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 19 20:33:29 2009 -0600 dinput: Convert evdev joystick to new base class. --- dlls/dinput/joystick_linuxinput.c | 313 +++++++++---------------------------- 1 files changed, 73 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=649c762f524c3fd8d62ff…

1 0

Vitaliy Margolen : dinput: Use more friendly name for the joystick than its device path.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 542b17943ff353bc3a2becec2c7ca7cf85ff8a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=542b17943ff353bc3a2becec2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 19 20:33:31 2009 -0600 dinput: Use more friendly name for the joystick than its device path. --- dlls/dinput/joystick_linuxinput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2a9db66..f9f6146 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -299,7 +299,7 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); strcpy(lpddi->tszInstanceName, joydevs[id].name); - strcpy(lpddi->tszProductName, joydevs[id].device); + strcpy(lpddi->tszProductName, joydevs[id].name); } static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) @@ -320,7 +320,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, joydevs[id].device, -1, lpddi->tszProductName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszProductName, MAX_PATH); } static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id)

1 0

Nikolay Sivov : comctl32/listview: Add a ListView_GetTextBkColor macro.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: ffb214a66b134134a0dbb311c395f826366b876d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb214a66b134134a0dbb311c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 20 07:36:31 2009 -0400 comctl32/listview: Add a ListView_GetTextBkColor macro. --- dlls/comctl32/listview.c | 1 - include/commctrl.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d594e51..c5261e1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -144,7 +144,6 @@ * -- ListView_GetISearchString * -- ListView_GetNumberOfWorkAreas * -- ListView_GetOrigin - * -- ListView_GetTextBkColor * -- ListView_GetUnicodeFormat, ListView_SetUnicodeFormat * -- ListView_GetWorkAreas, ListView_SetWorkAreas * diff --git a/include/commctrl.h b/include/commctrl.h index a3ec513..9dc7f9d 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3743,6 +3743,8 @@ typedef struct NMLVSCROLL (HWND)SNDMSGA((hwnd), LVM_GETEDITCONTROL, 0, 0) #define ListView_GetTextColor(hwnd) \ (COLORREF)SNDMSGA((hwnd), LVM_GETTEXTCOLOR, 0, 0) +#define ListView_GetTextBkColor(hwnd) \ + (COLORREF)SNDMSGA((hwnd), LVM_GETTEXTBKCOLOR, 0, 0) #define ListView_GetBkColor(hwnd) \ (COLORREF)SNDMSGA((hwnd), LVM_GETBKCOLOR, 0, 0) #define ListView_GetItemA(hwnd,pitem) \

1 0

Nikolay Sivov : comctl32/listview: Slightly enlarge rectangle when drawing checkbox.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 10a936150bb2ddcb63dae88f42a9536e0ebbb3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a936150bb2ddcb63dae88f4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 20 07:37:33 2009 -0400 comctl32/listview: Slightly enlarge rectangle when drawing checkbox. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c5261e1..26f9ef3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7209,7 +7209,7 @@ static HIMAGELIST LISTVIEW_CreateCheckBoxIL(const LISTVIEW_INFO *infoPtr) hbm_orig = SelectObject(hdc, hbm_mask); FillRect(hdc, &rc, hbr_white); - InflateRect(&rc, -3, -3); + InflateRect(&rc, -2, -2); FillRect(hdc, &rc, hbr_black); SelectObject(hdc, hbm_im);

1 0

Nikolay Sivov : comctl32/listview: Switching to/from LVS_OWNERDATA isn' t allowed after creation.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 42bef95cbcce5c0530a888dc70fe70fffeccc560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42bef95cbcce5c0530a888dc7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 20 07:42:43 2009 -0400 comctl32/listview: Switching to/from LVS_OWNERDATA isn't allowed after creation. --- dlls/comctl32/listview.c | 34 +++++++++++++++- dlls/comctl32/tests/listview.c | 86 +++++++++++++++++++++++++++++++++++---- 2 files changed, 110 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 26f9ef3..870354c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9570,7 +9570,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (wStyleType != GWL_STYLE) return 0; /* FIXME: if LVS_NOSORTHEADER changed, update header */ - /* what if LVS_OWNERDATA changed? */ /* or LVS_SINGLESEL */ /* or LVS_SORT{AS,DES}CENDING */ @@ -9664,6 +9663,36 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, /*** * DESCRIPTION: + * Processes WM_STYLECHANGING messages. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] wStyleType : window style type (normal or extended) + * [I0] lpss : window style information + * + * RETURN: + * Zero + */ +static INT LISTVIEW_StyleChanging(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, + STYLESTRUCT *lpss) +{ + TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", + wStyleType, lpss->styleOld, lpss->styleNew); + + /* don't forward LVS_OWNERDATA only if not already set to */ + if ((lpss->styleNew ^ lpss->styleOld) & LVS_OWNERDATA) + { + if (lpss->styleOld & LVS_OWNERDATA) + lpss->styleNew |= LVS_OWNERDATA; + else + lpss->styleNew &= ~LVS_OWNERDATA; + } + + return 0; +} + +/*** + * DESCRIPTION: * Processes WM_SHOWWINDOW messages. * * PARAMETER(S): @@ -10164,6 +10193,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_STYLECHANGED: return LISTVIEW_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + case WM_STYLECHANGING: + return LISTVIEW_StyleChanging(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); return 0; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d08ca2f..5aa2f52 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -146,6 +146,12 @@ static const struct message listview_itempos_seq[] = { { 0 } }; +static const struct message listview_ownerdata_switchto_seq[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -223,6 +229,14 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa trace("listview: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + /* some debug output for style changing */ + if ((message == WM_STYLECHANGING || + message == WM_STYLECHANGED) && lParam) + { + STYLESTRUCT *style = (STYLESTRUCT*)lParam; + trace("\told style: 0x%08x, new style: 0x%08x\n", style->styleOld, style->styleNew); + } + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -237,7 +251,7 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa return ret; } -static HWND create_listview_control(void) +static HWND create_listview_control(DWORD style) { struct subclass_info *info; HWND hwnd; @@ -249,7 +263,7 @@ static HWND create_listview_control(void) GetClientRect(hwndparent, &rect); hwnd = CreateWindowExA(0, WC_LISTVIEW, "foo", - WS_CHILD | WS_BORDER | WS_VISIBLE | LVS_REPORT, + WS_CHILD | WS_BORDER | WS_VISIBLE | LVS_REPORT | style, 0, 0, rect.right, rect.bottom, hwndparent, NULL, GetModuleHandleA(NULL), NULL); ok(hwnd != NULL, "gle=%d\n", GetLastError()); @@ -957,7 +971,7 @@ static void test_redraw(void) { HWND hwnd, hwndheader; - hwnd = create_listview_control(); + hwnd = create_listview_control(0); hwndheader = subclass_header(hwnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1009,7 +1023,7 @@ static void test_customdraw(void) HWND hwnd; WNDPROC oldwndproc; - hwnd = create_listview_control(); + hwnd = create_listview_control(0); insert_column(hwnd, 0); insert_column(hwnd, 1); @@ -1081,7 +1095,7 @@ static void test_color(void) COLORREF color; COLORREF colors[4] = {RGB(0,0,0), RGB(100,50,200), CLR_NONE, RGB(255,255,255)}; - hwnd = create_listview_control(); + hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1127,7 +1141,7 @@ static void test_item_count(void) static CHAR item1text[] = "item1"; static CHAR item2text[] = "item2"; - hwnd = create_listview_control(); + hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1346,7 +1360,7 @@ static void test_multiselect(void) }; - hwnd = create_listview_control(); + hwnd = create_listview_control(0); for (i=0;i<items;i++) { insert_item(hwnd, 0); @@ -1403,7 +1417,7 @@ static void test_subitem_rect(void) RECT rect; /* test LVM_GETSUBITEMRECT for header */ - hwnd = create_listview_control(); + hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); /* add some columns */ memset(&col, 0, sizeof(LVCOLUMN)); @@ -1464,7 +1478,7 @@ static void test_sorting(void) LVITEMA item = {0}; DWORD r; - hwnd = create_listview_control(); + hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); /* insert some items */ @@ -1514,6 +1528,59 @@ static void test_sorting(void) DestroyWindow(hwnd); } +static void test_ownerdata(void) +{ + HWND hwnd; + LONG_PTR style, ret; + + /* it isn't possible to set LVS_OWNERDATA after creation */ + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_OWNERDATA) && style, "LVS_OWNERDATA isn't expected\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); + + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_OWNERDATA), "LVS_OWNERDATA isn't expected\n"); + DestroyWindow(hwnd); + + /* try to set LVS_OWNERDATA after creation just having it */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); + DestroyWindow(hwnd); + + /* try to remove LVS_OWNERDATA after creation just having it */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -1553,4 +1620,5 @@ START_TEST(listview) test_multiselect(); test_subitem_rect(); test_sorting(); + test_ownerdata(); }

1 0

Nikolay Sivov : comctl32/listview: Fix a regression caused by 9c1a0e468f5cfbe9d863852ed5a42390f2cbfeb4.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 0588ba7fefedddbf024c10ecc36d55291bee0da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0588ba7fefedddbf024c10ecc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 20 08:03:07 2009 -0400 comctl32/listview: Fix a regression caused by 9c1a0e468f5cfbe9d863852ed5a42390f2cbfeb4. --- dlls/comctl32/listview.c | 6 +----- dlls/comctl32/tests/listview.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 870354c..d249cff 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3565,7 +3565,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL if (uChanged & LVIF_STATE) { - if (lpItem && (stateMask & ~infoPtr->uCallbackMask & ~(LVIS_FOCUSED | LVIS_SELECTED))) + if (lpItem && (stateMask & ~infoPtr->uCallbackMask)) { lpItem->state &= ~stateMask; lpItem->state |= (lpLVItem->state & stateMask); @@ -3574,12 +3574,10 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL { if (infoPtr->dwStyle & LVS_SINGLESEL) LISTVIEW_DeselectAllSkipItem(infoPtr, lpLVItem->iItem); ranges_additem(infoPtr->selectionRanges, lpLVItem->iItem); - lpItem->state |= LVIS_SELECTED; } else if (stateMask & LVIS_SELECTED) { ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem); - lpItem->state &= ~LVIS_SELECTED; } /* if we are asked to change focus, and we manage it, do it */ if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) @@ -3597,13 +3595,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL LISTVIEW_SetItemState(infoPtr, infoPtr->nFocusedItem, &item); } - lpItem->state |= LVIS_FOCUSED; infoPtr->nFocusedItem = lpLVItem->iItem; LISTVIEW_EnsureVisible(infoPtr, lpLVItem->iItem, uView == LVS_LIST); } else if (infoPtr->nFocusedItem == lpLVItem->iItem) { - lpItem->state &= ~LVIS_FOCUSED; infoPtr->nFocusedItem = -1; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5aa2f52..5733668 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1532,6 +1532,8 @@ static void test_ownerdata(void) { HWND hwnd; LONG_PTR style, ret; + DWORD res; + LVITEMA item; /* it isn't possible to set LVS_OWNERDATA after creation */ hwnd = create_listview_control(0); @@ -1579,6 +1581,22 @@ static void test_ownerdata(void) style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); DestroyWindow(hwnd); + + /* try select an item */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(res != 0, "Expected LVM_SETITEMCOUNT to succeed\n"); + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(0, res); + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(1, res); + DestroyWindow(hwnd); } START_TEST(listview)

1 0